summaryrefslogtreecommitdiff
path: root/packages/backend/src/core
diff options
context:
space:
mode:
authorHazelnoot <acomputerdog@gmail.com>2025-05-01 12:07:38 -0400
committerHazelnoot <acomputerdog@gmail.com>2025-05-01 12:07:38 -0400
commit8dce293dfff6b38de5d47b580507ceb32be31bb1 (patch)
tree43420bde07b79a53b11dee698dd540b0cb3ec1a8 /packages/backend/src/core
parentMerge branch 'develop' into merge/2025-03-24 (diff)
downloadsharkey-8dce293dfff6b38de5d47b580507ceb32be31bb1.tar.gz
sharkey-8dce293dfff6b38de5d47b580507ceb32be31bb1.tar.bz2
sharkey-8dce293dfff6b38de5d47b580507ceb32be31bb1.zip
add setting to disable proxy account (resolves #766)
Diffstat (limited to 'packages/backend/src/core')
-rw-r--r--packages/backend/src/core/UserListService.ts7
1 files changed, 5 insertions, 2 deletions
diff --git a/packages/backend/src/core/UserListService.ts b/packages/backend/src/core/UserListService.ts
index a4c5eb5416..e7200ab1bf 100644
--- a/packages/backend/src/core/UserListService.ts
+++ b/packages/backend/src/core/UserListService.ts
@@ -6,7 +6,7 @@
import { Inject, Injectable, OnApplicationShutdown, OnModuleInit } from '@nestjs/common';
import * as Redis from 'ioredis';
import { ModuleRef } from '@nestjs/core';
-import type { UserListMembershipsRepository } from '@/models/_.js';
+import type { MiMeta, UserListMembershipsRepository } from '@/models/_.js';
import type { MiUser } from '@/models/User.js';
import type { MiUserList } from '@/models/UserList.js';
import type { MiUserListMembership } from '@/models/UserListMembership.js';
@@ -40,6 +40,9 @@ export class UserListService implements OnApplicationShutdown, OnModuleInit {
@Inject(DI.userListMembershipsRepository)
private userListMembershipsRepository: UserListMembershipsRepository,
+ @Inject(DI.meta)
+ private readonly meta: MiMeta,
+
private userEntityService: UserEntityService,
private idService: IdService,
private globalEventService: GlobalEventService,
@@ -110,7 +113,7 @@ export class UserListService implements OnApplicationShutdown, OnModuleInit {
this.globalEventService.publishUserListStream(list.id, 'userAdded', await this.userEntityService.pack(target));
// このインスタンス内にこのリモートユーザーをフォローしているユーザーがいなくても投稿を受け取るためにダミーのユーザーがフォローしたということにする
- if (this.userEntityService.isRemoteUser(target)) {
+ if (this.userEntityService.isRemoteUser(target) && this.meta.enableProxyAccount) {
const proxy = await this.systemAccountService.fetch('proxy');
this.queueService.createFollowJob([{ from: { id: proxy.id }, to: { id: target.id } }]);
}