Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Fix remote actor follow count after subscription

Chocobozzz8f4ba035506a
diff --git a/packages/tests/src/api/server/follows.ts b/packages/tests/src/api/server/follows.ts
index 682c780c94..798dc93519 100644
--- a/packages/tests/src/api/server/follows.ts
+++ b/packages/tests/src/api/server/follows.ts
@@ -9,7 +9,6 @@ import { completeVideoCheck } from '@tests/shared/videos.js'
import { expect } from 'chai'
describe('Test follows', function () {
-
describe('Complex follow', function () {
let servers: PeerTubeServer[] = []
@@ -23,7 +22,6 @@ describe('Test follows', function () {
})
describe('Data propagation after follow', function () {
-
it('Should not have followers/followings', async function () {
for (const server of servers) {
const bodies = await Promise.all([
@@ -430,12 +428,12 @@ describe('Test follows', function () {
await expectChannelsFollows({ server: servers[0], handle: 'root_channel@' + servers[1].host, followers: 1, following: 0 })
await expectAccountFollows({ server: servers[0], handle: 'peertube@' + servers[2].host, followers: 1, following: 0 })
- await expectAccountFollows({ server: servers[1], handle: 'peertube@' + servers[0].host, followers: 0, following: 1 })
+ await expectAccountFollows({ server: servers[1], handle: 'peertube@' + servers[0].host, followers: 0, following: 0 })
await expectAccountFollows({ server: servers[1], handle: 'peertube@' + servers[1].host, followers: 0, following: 0 })
await expectAccountFollows({ server: servers[1], handle: 'root@' + servers[1].host, followers: 0, following: 0 })
await expectChannelsFollows({ server: servers[1], handle: 'root_channel@' + servers[1].host, followers: 1, following: 0 })
- await expectAccountFollows({ server: servers[2], handle: 'peertube@' + servers[0].host, followers: 0, following: 1 })
+ await expectAccountFollows({ server: servers[2], handle: 'peertube@' + servers[0].host, followers: 0, following: 2 })
await expectAccountFollows({ server: servers[2], handle: 'peertube@' + servers[2].host, followers: 1, following: 0 })
})
diff --git a/server/core/models/actor/actor-follow.ts b/server/core/models/actor/actor-follow.ts
index 47f6055c9d..4006151085 100644
--- a/server/core/models/actor/actor-follow.ts
+++ b/server/core/models/actor/actor-follow.ts
@@ -26,7 +26,8 @@ import {
ForeignKey,
Is,
IsInt,
- Max, Table,
+ Max,
+ Table,
UpdatedAt
} from 'sequelize-typescript'
import { logger } from '../../helpers/logger.js'
@@ -70,7 +71,6 @@ import { InstanceListFollowingQueryBuilder, ListFollowingOptions } from './sql/i
]
})
export class ActorFollowModel extends SequelizeModel<ActorFollowModel> {
-
@AllowNull(false)
@Column(DataType.ENUM(...Object.values(FOLLOW_STATES)))
state: FollowState
@@ -123,22 +123,44 @@ export class ActorFollowModel extends SequelizeModel<ActorFollowModel> {
ActorFollowing: Awaited<ActorModel>
@AfterCreate
- @AfterUpdate
static incrementFollowerAndFollowingCount (instance: ActorFollowModel, options: any) {
+ let by = 0
+
+ if (instance.state === 'accepted') by = 1
+
return afterCommitIfTransaction(options.transaction, () => {
return Promise.all([
- ActorModel.rebuildFollowsCount(instance.actorId, 'following'),
- ActorModel.rebuildFollowsCount(instance.targetActorId, 'followers')
+ ActorModel.recalculateFollowsCount({ ofId: instance.actorId, type: 'following', by }),
+ ActorModel.recalculateFollowsCount({ ofId: instance.targetActorId, type: 'followers', by })
+ ])
+ })
+ }
+
+ @AfterUpdate
+ static incrementOrDecrementFollowerAndFollowingCount (instance: ActorFollowModel, options: any) {
+ let by = 0
+
+ if (instance.previous('state') !== 'accepted' && instance.state === 'accepted') by = 1
+ else if (instance.previous('state') === 'accepted' && instance.state !== 'accepted') by = -1
+
+ return afterCommitIfTransaction(options.transaction, () => {
+ return Promise.all([
+ ActorModel.recalculateFollowsCount({ ofId: instance.actorId, type: 'following', by }),
+ ActorModel.recalculateFollowsCount({ ofId: instance.targetActorId, type: 'followers', by })
])
})
}
@AfterDestroy
static decrementFollowerAndFollowingCount (instance: ActorFollowModel, options: any) {
+ let by = 0
+
+ if (instance.state === 'accepted') by = -1
+
return afterCommitIfTransaction(options.transaction, () => {
return Promise.all([
- ActorModel.rebuildFollowsCount(instance.actorId, 'following'),
- ActorModel.rebuildFollowsCount(instance.targetActorId, 'followers')
+ ActorModel.recalculateFollowsCount({ ofId: instance.actorId, type: 'following', by }),
+ ActorModel.recalculateFollowsCount({ ofId: instance.targetActorId, type: 'followers', by })
])
})
}
@@ -157,7 +179,7 @@ export class ActorFollowModel extends SequelizeModel<ActorFollowModel> {
/*
* @deprecated Use `findOrCreateCustom` instead
- */
+ */
static findOrCreate (): any {
throw new Error('Must not be called')
}
@@ -169,7 +191,7 @@ export class ActorFollowModel extends SequelizeModel<ActorFollowModel> {
activityId: string
state: FollowState
transaction: Transaction
- }): Promise<[ MActorFollowActors, boolean ]> {
+ }): Promise<[MActorFollowActors, boolean]> {
const { byActor, targetActor, activityId, state, transaction } = options
let created = false
@@ -614,9 +636,9 @@ export class ActorFollowModel extends SequelizeModel<ActorFollowModel> {
static updateScore (inboxUrl: string, value: number, t?: Transaction) {
const query = `UPDATE "actorFollow" SET "score" = LEAST("score" + ${value}, ${ACTOR_FOLLOW_SCORE.MAX}) ` +
'WHERE id IN (' +
- 'SELECT "actorFollow"."id" FROM "actorFollow" ' +
- 'INNER JOIN "actor" ON "actor"."id" = "actorFollow"."actorId" ' +
- `WHERE "actor"."inboxUrl" = '${inboxUrl}' OR "actor"."sharedInboxUrl" = '${inboxUrl}'` +
+ 'SELECT "actorFollow"."id" FROM "actorFollow" ' +
+ 'INNER JOIN "actor" ON "actor"."id" = "actorFollow"."actorId" ' +
+ `WHERE "actor"."inboxUrl" = '${inboxUrl}' OR "actor"."sharedInboxUrl" = '${inboxUrl}'` +
')'
const options = {
@@ -635,10 +657,10 @@ export class ActorFollowModel extends SequelizeModel<ActorFollowModel> {
const query = `UPDATE "actorFollow" SET "score" = LEAST("score" + ${value}, ${ACTOR_FOLLOW_SCORE.MAX}) ` +
'WHERE id IN (' +
- 'SELECT "actorFollow"."id" FROM "actorFollow" ' +
- 'INNER JOIN "actor" ON "actor"."id" = "actorFollow"."targetActorId" ' +
- `WHERE "actorFollow"."actorId" = ${me.Account.actorId} ` + // I'm the follower
- `AND "actor"."serverId" IN (${serverIdsString})` + // Criteria on followings
+ 'SELECT "actorFollow"."id" FROM "actorFollow" ' +
+ 'INNER JOIN "actor" ON "actor"."id" = "actorFollow"."targetActorId" ' +
+ `WHERE "actorFollow"."actorId" = ${me.Account.actorId} ` + // I'm the follower
+ `AND "actor"."serverId" IN (${serverIdsString})` + // Criteria on followings
')'
const options = {
diff --git a/server/core/models/actor/actor.ts b/server/core/models/actor/actor.ts
index 65e4c57d91..72cd98c863 100644
--- a/server/core/models/actor/actor.ts
+++ b/server/core/models/actor/actor.ts
@@ -339,11 +339,11 @@ export class ActorModel extends SequelizeModel<ActorModel> {
// ---------------------------------------------------------------------------
- static async load (id: number): Promise<MActor> {
+ static async load (id: number, transaction?: Transaction): Promise<MActor> {
const actorServer = await getServerActor()
if (id === actorServer.id) return actorServer
- return ActorModel.unscoped().findByPk(id)
+ return ActorModel.unscoped().findByPk(id, { transaction })
}
static loadFull (id: number): Promise<MActorFull> {
@@ -489,11 +489,20 @@ export class ActorModel extends SequelizeModel<ActorModel> {
return ActorModel.scope(ScopeNames.FULL).findOne(query)
}
- static rebuildFollowsCount (ofId: number, type: 'followers' | 'following', transaction?: Transaction) {
+ // ---------------------------------------------------------------------------
+
+ static async recalculateFollowsCount (options: {
+ ofId: number
+ type: 'followers' | 'following'
+ by: number
+ transaction?: Transaction
+ }) {
+ const { transaction, ofId, type, by } = options
+
const sanitizedOfId = forceNumber(ofId)
const where = { id: sanitizedOfId }
- let columnToUpdate: string
+ let columnToUpdate: 'followersCount' | 'followingCount'
let columnOfCount: string
if (type === 'followers') {
@@ -504,11 +513,27 @@ export class ActorModel extends SequelizeModel<ActorModel> {
columnOfCount = 'actorId'
}
+ const actor = await this.load(ofId, transaction)
+
+ // Remote actor where we don't store all the actor follows
+ // So we just increment the counter
+ if (actor.serverId) {
+ if (!by) return
+
+ return ActorModel.increment(columnToUpdate, {
+ by,
+ where,
+ transaction
+ })
+ }
+
return ActorModel.update({
[columnToUpdate]: literal(`(SELECT COUNT(*) FROM "actorFollow" WHERE "${columnOfCount}" = ${sanitizedOfId} AND "state" = 'accepted')`)
}, { where, transaction })
}
+ // ---------------------------------------------------------------------------
+
static loadAccountActorByVideoId (videoId: number, transaction: Transaction): Promise<MActor> {
const query = {
include: [