misty.cafe/mistykey
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

process account migrations on the relationship queue

Browse source
This commit is contained in:
Hazelnoot 2025-09-14 09:52:47 -04:00
parent 8089a67b4e
commit 3fb2b38c92
5 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
packages/backend/src/core/AccountMoveService.ts
View file

@ -128,8 +128,7 @@ export class AccountMoveService {
to: { id: followeeId }, to: { id: followeeId },
})), process.env.NODE_ENV === 'test' ? 10000 : 1000 * 60 * 60 * 24); })), process.env.NODE_ENV === 'test' ? 10000 : 1000 * 60 * 60 * 24);
// TODO add this to relationship queue await this.queueService.createMoveJob(src, dst);
await this.postMoveProcess(src, dst);
return iObj; return iObj;
} }

8
packages/backend/src/core/QueueService.ts
View file

@ -706,7 +706,13 @@ export class QueueService implements OnModuleInit {
} }
@bindThis @bindThis
private generateRelationshipJobData(name: 'follow' | 'unfollow' | 'block' | 'unblock', data: RelationshipJobData, opts: Bull.JobsOptions = {}): { public createMoveJob(from: ThinUser, to: ThinUser) {
const job = this.generateRelationshipJobData('move', { from, to });
return this.relationshipQueue.add(job.name, job.data, job.opts);
}
@bindThis
private generateRelationshipJobData(name: 'follow' | 'unfollow' | 'block' | 'unblock' | 'move', data: RelationshipJobData, opts: Bull.JobsOptions = {}): {
name: string, name: string,
data: RelationshipJobData, data: RelationshipJobData,
opts: Bull.JobsOptions, opts: Bull.JobsOptions,

2
packages/backend/src/core/activitypub/models/ApPersonService.ts
View file

@ -988,7 +988,7 @@ export class ApPersonService implements OnModuleInit {
return 'skip: alsoKnownAs does not include from.uri'; return 'skip: alsoKnownAs does not include from.uri';
} }
await this.accountMoveService.postMoveProcess(src, dst); await this.queueService.createMoveJob(src, dst);
return 'ok'; return 'ok';
} }

1
packages/backend/src/queue/QueueProcessorService.ts
View file

@ -423,6 +423,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
case 'unfollow': return this.relationshipProcessorService.processUnfollow(job); case 'unfollow': return this.relationshipProcessorService.processUnfollow(job);
case 'block': return this.relationshipProcessorService.processBlock(job); case 'block': return this.relationshipProcessorService.processBlock(job);
case 'unblock': return this.relationshipProcessorService.processUnblock(job); case 'unblock': return this.relationshipProcessorService.processUnblock(job);
case 'move': return this.relationshipProcessorService.processMove(job);
default: throw new Error(`unrecognized job type ${job.name} for relationship`); default: throw new Error(`unrecognized job type ${job.name} for relationship`);
} }
}; };

16
packages/backend/src/queue/processors/RelationshipProcessorService.ts
View file

@ -7,6 +7,8 @@ import { Inject, Injectable } from '@nestjs/common';
import { UserFollowingService } from '@/core/UserFollowingService.js'; import { UserFollowingService } from '@/core/UserFollowingService.js';
import { UserBlockingService } from '@/core/UserBlockingService.js'; import { UserBlockingService } from '@/core/UserBlockingService.js';
import { CacheService } from '@/core/CacheService.js';
import { AccountMoveService } from '@/core/AccountMoveService.js';
import { bindThis } from '@/decorators.js'; import { bindThis } from '@/decorators.js';
import type Logger from '@/logger.js'; import type Logger from '@/logger.js';
@ -28,8 +30,10 @@ export class RelationshipProcessorService {
private queueLoggerService: QueueLoggerService, private queueLoggerService: QueueLoggerService,
private userFollowingService: UserFollowingService, private userFollowingService: UserFollowingService,
private userBlockingService: UserBlockingService, private userBlockingService: UserBlockingService,
private readonly cacheService: CacheService,
private readonly accountMoveService: AccountMoveService,
) { ) {
this.logger = this.queueLoggerService.logger.createSubLogger('follow-block'); this.logger = this.queueLoggerService.logger.createSubLogger('relationship');
} }
@bindThis @bindThis
@ -75,4 +79,14 @@ export class RelationshipProcessorService {
await this.userBlockingService.unblock(blockee, blocker); await this.userBlockingService.unblock(blockee, blocker);
return 'ok'; return 'ok';
} }
public async processMove(job: Bull.Job<RelationshipJobData>): Promise<string> {
this.logger.info(`${job.data.from.id} is trying to migrate to ${job.data.to.id}`);
const [src, dst] = await Promise.all([
this.cacheService.findUserById(job.data.from.id),
this.cacheService.findUserById(job.data.to.id),
]);
await this.accountMoveService.postMoveProcess(src, dst);
return 'ok';
}
} }