diff options
| author | Namekuji <11836635+nmkj-io@users.noreply.github.com> | 2023-04-11 20:13:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-12 09:13:58 +0900 |
| commit | da833222005ddf712db2c40bcf3848874f7ee3f2 (patch) | |
| tree | a8b45580a94a212fa5f05e056fcc59c9db7a7b73 /packages/backend/src/core/UserFollowingService.ts | |
| parent | Update CHANGELOG.md (#10591) (diff) | |
| download | sharkey-da833222005ddf712db2c40bcf3848874f7ee3f2.tar.gz sharkey-da833222005ddf712db2c40bcf3848874f7ee3f2.tar.bz2 sharkey-da833222005ddf712db2c40bcf3848874f7ee3f2.zip | |
feat: queueing bulk follow/unfollow and block/unblock (#10544)
* wrap follow/unfollow and block/unblock as job queue
* create import job to follow in each iteration
* make relationship jobs concurrent
* replace to job queue if called repeatedly
* use addBulk to import
* omit stream when importing
* fix job caller
* use ThinUser instead of User to reduce redis memory consumption
* createImportFollowingToDbJobの呼び出し方を変える, 型補強
* Force ThinUser
* オブジェクト操作のみのメソッド名はgenerate...Data
* Force ThinUser in generateRelationshipJobData
* silent bulk unfollow at admin api endpoint
---------
Co-authored-by: tamaina <tamaina@hotmail.co.jp>
Diffstat (limited to 'packages/backend/src/core/UserFollowingService.ts')
| -rw-r--r-- | packages/backend/src/core/UserFollowingService.ts | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/packages/backend/src/core/UserFollowingService.ts b/packages/backend/src/core/UserFollowingService.ts index d7bb8f3920..dacaa7263a 100644 --- a/packages/backend/src/core/UserFollowingService.ts +++ b/packages/backend/src/core/UserFollowingService.ts @@ -43,7 +43,7 @@ export class UserFollowingService implements OnModuleInit { constructor( private moduleRef: ModuleRef, - + @Inject(DI.usersRepository) private usersRepository: UsersRepository, @@ -79,7 +79,7 @@ export class UserFollowingService implements OnModuleInit { } @bindThis - public async follow(_follower: { id: User['id'] }, _followee: { id: User['id'] }, requestId?: string): Promise<void> { + public async follow(_follower: { id: User['id'] }, _followee: { id: User['id'] }, requestId?: string, silent = false): Promise<void> { const [follower, followee] = await Promise.all([ this.usersRepository.findOneByOrFail({ id: _follower.id }), this.usersRepository.findOneByOrFail({ id: _followee.id }), @@ -139,7 +139,7 @@ export class UserFollowingService implements OnModuleInit { } } - await this.insertFollowingDoc(followee, follower); + await this.insertFollowingDoc(followee, follower, silent); if (this.userEntityService.isRemoteUser(follower) && this.userEntityService.isLocalUser(followee)) { const content = this.apRendererService.addContext(this.apRendererService.renderAccept(this.apRendererService.renderFollow(follower, followee, requestId), followee)); @@ -155,6 +155,7 @@ export class UserFollowingService implements OnModuleInit { follower: { id: User['id']; host: User['host']; uri: User['host']; inbox: User['inbox']; sharedInbox: User['sharedInbox'] }, + silent = false, ): Promise<void> { if (follower.id === followee.id) return; @@ -233,7 +234,7 @@ export class UserFollowingService implements OnModuleInit { this.perUserFollowingChart.update(follower, followee, true); // Publish follow event - if (this.userEntityService.isLocalUser(follower)) { + if (this.userEntityService.isLocalUser(follower) && !silent) { this.userEntityService.pack(followee.id, follower, { detail: true, }).then(async packed => { |