natty
/
calckey
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

add local move follower migration

This commit is contained in:
cutestnekoaqua 2022-12-12 21:09:31 +01:00
parent 25fc88afd6
commit 5a2bd3d379
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/backend/src/remote/activitypub/kernel/move/index.ts
View File

@ -58,9 +58,6 @@ export default async (actor: CacheableRemoteUser, activity: IMove): Promise<stri
followeeId: followee.id, followeeId: followee.id,
}); });
//TODO remove this
console.log(followings);
followings.forEach(async following => { followings.forEach(async following => {
//if follower is local //if follower is local
if (!following.followerHost) { if (!following.followerHost) {
@ -71,13 +68,7 @@ export default async (actor: CacheableRemoteUser, activity: IMove): Promise<stri
await deleteFollowing(follower!, followee); await deleteFollowing(follower!, followee);
try { try {
await create(follower!, followeeNew); await create(follower!, followeeNew);
} catch (e) { } catch (e) { /* empty */ }
if (e instanceof IdentifiableError) {
if (e.id === '710e8fb0-b8c3-4922-be49-d5d93d8e6a6e') return meta.errors.blocking;
if (e.id === '3338392a-f764-498d-8855-db939dcf8c48') return meta.errors.blocked;
}
return e;
}
} }
}); });

28
packages/backend/src/server/api/endpoints/i/move.ts
View File

@ -7,7 +7,10 @@ import { genId } from '@/misc/gen-id.js';
import define from '../../define.js'; import define from '../../define.js';
import { ApiError } from '../../error.js'; import { ApiError } from '../../error.js';
import { apiLogger } from '../../logger.js'; import { apiLogger } from '../../logger.js';
import { Users } from '@/models/index.js'; import deleteFollowing from '@/services/following/delete.js';
import create from '@/services/following/create.js';
import { getUser } from '@/server/api/common/getters.js';
import { Followings, Users } from '@/models/index.js';
import { UserProfiles } from '@/models/index.js'; import { UserProfiles } from '@/models/index.js';
import config from '@/config/index.js'; import config from '@/config/index.js';
import { publishMainStream } from '@/services/stream.js'; import { publishMainStream } from '@/services/stream.js';
@ -44,6 +47,11 @@ export const meta = {
code: 'NOT_ADMIN_FORBIDDEN', code: 'NOT_ADMIN_FORBIDDEN',
id: '4362e8dc-731f-4ad8-a694-be2a88922a24', id: '4362e8dc-731f-4ad8-a694-be2a88922a24',
}, },
noSuchUser: {
message: 'No such user.',
code: 'NO_SUCH_USER',
id: 'fcd2eef9-a9b2-4c4f-8624-038099e90aa5',
},
}, },
} as const; } as const;
@ -121,5 +129,23 @@ export default define(meta, paramDef, async (ps, user) => {
// Publish meUpdated event // Publish meUpdated event
publishMainStream(user.id, 'meUpdated', iObj); publishMainStream(user.id, 'meUpdated', iObj);
const followings = await Followings.findBy({
followeeId: user.id,
});
followings.forEach(async following => {
//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!, user);
try {
await create(follower!, moveTo);
} catch (e) { /* empty */ }
}
});
return iObj; return iObj;
}); });