e2net/iceshrimp-legacy
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Activity

fix queue?

Browse source
This commit is contained in:
cutestnekoaqua 2022-12-08 19:28:48 +01:00
parent cce58503e4
commit 964fdefdae
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
packages/backend/src/remote/activitypub/kernel/move/index.ts
View file

@ -48,15 +48,15 @@ export default async (actor: CacheableRemoteUser, activity: IMove): Promise<stri
await updatePerson(newUri); await updatePerson(newUri);
await updatePerson(oldUri); await updatePerson(oldUri);
new_acc = await getRemoteUser(newUri); new_acc = await dbResolver.getUserFromApId(newUri);
old_acc = await getRemoteUser(oldUri); let old = await dbResolver.getUserFromApId(oldUri);
if (old_acc === null || old_acc.uri === null || !new_acc.alsoKnownAs?.includes(old_acc.uri)) return 'move: accounts invalid'; if (old === null || old.uri === null || !new_acc?.alsoKnownAs?.includes(old.uri)) return 'move: accounts invalid';
old_acc.movedToUri = new_acc.uri; old.movedToUri = new_acc.uri;
const query = Followings.createQueryBuilder('following') const query = Followings.createQueryBuilder('following')
.where('following.followeeId = :userId', { userId: old_acc.id }); .where('following.followeeId = :userId', { userId: old.id });
const followings = await query const followings = await query
.getMany(); .getMany();
@ -64,7 +64,7 @@ export default async (actor: CacheableRemoteUser, activity: IMove): Promise<stri
followings.forEach(async following => { followings.forEach(async following => {
if (following.follower?.host) { if (following.follower?.host) {
const follower = following.follower; const follower = following.follower;
await deleteFollowing(follower!, old_acc!); await deleteFollowing(follower!, old!);
try { try {
await create(follower!, new_acc!); await create(follower!, new_acc!);
} catch (e) { } catch (e) {