From 016c328d28f2f23b6cd059bbe82190ef01602653 Mon Sep 17 00:00:00 2001 From: cutestnekoaqua Date: Thu, 8 Dec 2022 19:28:48 +0100 Subject: [PATCH] fix queue? maybe pls debug log fixed stupidness again fix ?? fix import im a idiot lol make remote mig work --- .../remote/activitypub/kernel/move/index.ts | 54 ++++++++++--------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/packages/backend/src/remote/activitypub/kernel/move/index.ts b/packages/backend/src/remote/activitypub/kernel/move/index.ts index 1b7f02b7a..bdd82d9be 100644 --- a/packages/backend/src/remote/activitypub/kernel/move/index.ts +++ b/packages/backend/src/remote/activitypub/kernel/move/index.ts @@ -7,6 +7,7 @@ import { Followings, Users } from '@/models/index.js'; import { makePaginationQuery } from '@/server/api/common/make-pagination-query.js'; import deleteFollowing from '@/services/following/delete.js'; import create from '@/services/following/create.js'; +import { getUser } from '@/server/api/common/getters.js'; import { IdentifiableError } from '@/misc/identifiable-error.js'; import { ApiError } from '@/server/api/error.js'; import { meta } from '@/server/api/endpoints/following/create.js'; @@ -21,52 +22,55 @@ export default async (actor: CacheableRemoteUser, activity: IMove): Promiseactivity.target) as IActor; - let old_acc = actor; - if (!old_acc) actor_old = await resolver.resolve(activity.actor) as IActor; - if ((!new_acc || new_acc.uri === null) && (!actor_new || actor_new.id === null)) { return 'move: new acc not found'; } - if ((!old_acc || old_acc.uri === null) && (!actor_old || actor_old.id === null)) { - return 'move: old acc not found'; - } let newUri: string | null | undefined - let oldUri: string | null | undefined newUri = new_acc ? new_acc.uri : actor_new?.url?.toString(); - oldUri = old_acc ? old_acc.uri : - actor_old?.url?.toString(); - if(newUri === null || newUri === undefined) return 'move: new acc not found #2'; - if(oldUri === null || oldUri === undefined) return 'move: old acc not found #2'; await updatePerson(newUri); - await updatePerson(oldUri); + await updatePerson(actor.uri!); - new_acc = await getRemoteUser(newUri); - old_acc = await getRemoteUser(oldUri); + new_acc = await dbResolver.getUserFromApId(newUri); + let old = await dbResolver.getUserFromApId(actor.uri!); - 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') - .where('following.followeeId = :userId', { userId: old_acc.id }); + const followee = await getUser(actor.id).catch(e => { + if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser); + throw e; + }); - const followings = await query - .getMany(); + const followeeNew = await getUser(new_acc.id).catch(e => { + if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser); + throw e; + }); + + const followings = await Followings.findBy({ + followeeId: followee.id, + }); + + //TODO remove this + console.log(followings); followings.forEach(async following => { - if (following.follower?.host) { - const follower = following.follower; - await deleteFollowing(follower!, old_acc!); + //if follower is local + if (!following.followerHost) { + const follower = await getUser(following.followerId).catch(e => { + if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser); + throw e; + }); + await deleteFollowing(follower!, followee); try { - await create(follower!, new_acc!); + await create(follower!, followeeNew); } catch (e) { if (e instanceof IdentifiableError) { if (e.id === '710e8fb0-b8c3-4922-be49-d5d93d8e6a6e') return meta.errors.blocking;