yume/yumechi-no-kuni
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

fix?

Browse source
This commit is contained in:
tamaina 2024-03-05 05:15:56 +00:00
parent 15782f7f47
commit 0082f6f8e8
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/backend/src/core/AccountUpdateService.ts
View file

@ -30,6 +30,8 @@ export class AccountUpdateService implements OnModuleInit {
} }
async onModuleInit() { async onModuleInit() {
// Circular dependency
// AccountUpdateService - ApDeliverManagerSevice( - DeliverManager) - UserKeypairService - AccountUpdateService
this.apDeliverManagerService = this.moduleRef.get(ApDeliverManagerService.name); this.apDeliverManagerService = this.moduleRef.get(ApDeliverManagerService.name);
} }

5
packages/backend/src/core/UserKeypairService.ts
View file

@ -13,6 +13,7 @@ import type { MiUserKeypair } from '@/models/UserKeypair.js';
import { DI } from '@/di-symbols.js'; import { DI } from '@/di-symbols.js';
import { bindThis } from '@/decorators.js'; import { bindThis } from '@/decorators.js';
import { GlobalEventService, GlobalEvents } from '@/core/GlobalEventService.js'; import { GlobalEventService, GlobalEvents } from '@/core/GlobalEventService.js';
import { AccountUpdateService } from '@/core/AccountUpdateService.js';
@Injectable() @Injectable()
export class UserKeypairService implements OnApplicationShutdown { export class UserKeypairService implements OnApplicationShutdown {
@ -27,6 +28,7 @@ export class UserKeypairService implements OnApplicationShutdown {
private userKeypairsRepository: UserKeypairsRepository, private userKeypairsRepository: UserKeypairsRepository,
private globalEventService: GlobalEventService, private globalEventService: GlobalEventService,
private accountUpdateService: AccountUpdateService,
) { ) {
this.cache = new RedisKVCache<MiUserKeypair>(this.redisClient, 'userKeypair', { this.cache = new RedisKVCache<MiUserKeypair>(this.redisClient, 'userKeypair', {
lifetime: 1000 * 60 * 60 * 24, // 24h lifetime: 1000 * 60 * 60 * 24, // 24h
@ -54,12 +56,15 @@ export class UserKeypairService implements OnApplicationShutdown {
await this.refresh(userId); await this.refresh(userId);
const keypair = await this.cache.fetch(userId); const keypair = await this.cache.fetch(userId);
if (keypair.ed25519PublicKey != null) return; if (keypair.ed25519PublicKey != null) return;
const ed25519 = await genEd25519KeyPair(); const ed25519 = await genEd25519KeyPair();
await this.userKeypairsRepository.update({ userId }, { await this.userKeypairsRepository.update({ userId }, {
ed25519PublicKey: ed25519.publicKey, ed25519PublicKey: ed25519.publicKey,
ed25519PrivateKey: ed25519.privateKey, ed25519PrivateKey: ed25519.privateKey,
}); });
this.globalEventService.publishInternalEvent('userKeypairUpdated', { userId }); this.globalEventService.publishInternalEvent('userKeypairUpdated', { userId });
// リモートに配信
await this.accountUpdateService.publishToFollowers(userId, true);
} }
@bindThis @bindThis

8
packages/backend/src/core/activitypub/ApDeliverManagerService.ts
View file

@ -13,7 +13,6 @@ import { bindThis } from '@/decorators.js';
import type { IActivity } from '@/core/activitypub/type.js'; import type { IActivity } from '@/core/activitypub/type.js';
import { ThinUser } from '@/queue/types.js'; import { ThinUser } from '@/queue/types.js';
import { UserKeypairService } from '../UserKeypairService.js'; import { UserKeypairService } from '../UserKeypairService.js';
import { AccountUpdateService } from '@/core/AccountUpdateService.js';
interface IRecipe { interface IRecipe {
type: string; type: string;
@ -51,7 +50,6 @@ class DeliverManager {
private userKeypairService: UserKeypairService, private userKeypairService: UserKeypairService,
private followingsRepository: FollowingsRepository, private followingsRepository: FollowingsRepository,
private queueService: QueueService, private queueService: QueueService,
private accountUpdateService: AccountUpdateService,
actor: { id: MiUser['id']; host: null; }, actor: { id: MiUser['id']; host: null; },
activity: IActivity | null, activity: IActivity | null,
@ -113,8 +111,6 @@ class DeliverManager {
* ed25519の署名がなければ追加する * ed25519の署名がなければ追加する
*/ */
await this.userKeypairService.refreshAndprepareEd25519KeyPair(this.actor.id); await this.userKeypairService.refreshAndprepareEd25519KeyPair(this.actor.id);
// リモートに配信
await this.accountUpdateService.publishToFollowers(this.actor.id, true);
} }
//#endregion //#endregion
@ -169,7 +165,6 @@ export class ApDeliverManagerService {
private userKeypairService: UserKeypairService, private userKeypairService: UserKeypairService,
private queueService: QueueService, private queueService: QueueService,
private accountUpdateService: AccountUpdateService,
) { ) {
} }
@ -185,7 +180,6 @@ export class ApDeliverManagerService {
this.userKeypairService, this.userKeypairService,
this.followingsRepository, this.followingsRepository,
this.queueService, this.queueService,
this.accountUpdateService,
actor, actor,
activity, activity,
); );
@ -205,7 +199,6 @@ export class ApDeliverManagerService {
this.userKeypairService, this.userKeypairService,
this.followingsRepository, this.followingsRepository,
this.queueService, this.queueService,
this.accountUpdateService,
actor, actor,
activity, activity,
); );
@ -219,7 +212,6 @@ export class ApDeliverManagerService {
this.userKeypairService, this.userKeypairService,
this.followingsRepository, this.followingsRepository,
this.queueService, this.queueService,
this.accountUpdateService,
actor, actor,
activity, activity,
); );