Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

newUriを外に出す

Browse source
This commit is contained in:
tamaina 2023-04-20 20:55:00 +00:00
parent 51a867473b
commit 0995c36c1a
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
packages/backend/src/core/UserFollowingService.ts
View file

@ -151,13 +151,14 @@ export class UserFollowingService implements OnModuleInit {
movedFollower = await this.apPersonService.fetchPerson(movedFollower.uri) ?? follower; movedFollower = await this.apPersonService.fetchPerson(movedFollower.uri) ?? follower;
} }
const newUri = this.userEntityService.isLocalUser(movedFollower) ? movedFollower.uri : `${this.config.url}/users/${movedFollower.id}`;
if (movedFollower.alsoKnownAs) { if (movedFollower.alsoKnownAs) {
for (const oldUri of movedFollower.alsoKnownAs) { for (const oldUri of movedFollower.alsoKnownAs) {
try { try {
let oldAccount = await this.apPersonService.fetchPerson(oldUri); let oldAccount = await this.apPersonService.fetchPerson(oldUri);
if (!oldAccount) continue; // oldAccountを探してもこのサーバーに存在しない場合はフォロー関係もないということなのでスルー if (!oldAccount) continue; // oldAccountを探してもこのサーバーに存在しない場合はフォロー関係もないということなのでスルー
let newUri: string;
if (this.userEntityService.isRemoteUser(movedFollower)) { if (this.userEntityService.isRemoteUser(movedFollower)) {
if ((new Date()).getTime() - (oldAccount.lastFetchedAt?.getTime() ?? 0) > 10 * 1000) { if ((new Date()).getTime() - (oldAccount.lastFetchedAt?.getTime() ?? 0) > 10 * 1000) {
@ -165,9 +166,6 @@ export class UserFollowingService implements OnModuleInit {
} }
oldAccount = await this.apPersonService.fetchPerson(oldUri) ?? oldAccount; oldAccount = await this.apPersonService.fetchPerson(oldUri) ?? oldAccount;
newUri = movedFollower.uri;
} else {
newUri = `${this.config.url}/users/${movedFollower.id}`;
} }
autoAccept = oldAccount.movedToUri === newUri && await this.followingsRepository.exist({ autoAccept = oldAccount.movedToUri === newUri && await this.followingsRepository.exist({