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

Receive Flag (#6331)

Browse source
This commit is contained in:
MeiMei 2020-05-09 08:25:23 +09:00 • committed by GitHub
parent 070f1f3c6e
commit d6a8889d84
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 40 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/remote/activitypub/kernel/flag/index.ts Normal file
View file

@ -0,0 +1,28 @@
import { IRemoteUser } from '../../../../models/entities/user';
import config from '../../../../config';
import { IFlag, getApIds } from '../../type';
import { AbuseUserReports, Users } from '../../../../models';
import { In } from 'typeorm';
import { genId } from '../../../../misc/gen-id';
export default async (actor: IRemoteUser, activity: IFlag): Promise<string> => {
// objectは `(User|Note) | (User|Note)[]` だけど、全パターンDBスキーマと対応させられないので
// 対象ユーザーは一番最初のユーザー として あとはコメントとして格納する
const uris = getApIds(activity.object);
const userIds = uris.filter(uri => uri.startsWith(config.url + '/users/')).map(uri => uri.split('/').pop());
const users = await Users.find({
id: In(userIds)
});
if (users.length < 1) return `skip`;
await AbuseUserReports.insert({
id: genId(),
createdAt: new Date(),
userId: users[0].id,
reporterId: actor.id,
comment: `${activity.content}\n${JSON.stringify(uris, null, 2)}`
});
return `ok`;
};

5
src/remote/activitypub/kernel/index.ts
View file

@ -1,4 +1,4 @@
import { IObject, isCreate, isDelete, isUpdate, isRead, isFollow, isAccept, isReject, isAdd, isRemove, isAnnounce, isLike, isUndo, isBlock, isCollectionOrOrderedCollection, isCollection } from '../type';
import { IObject, isCreate, isDelete, isUpdate, isRead, isFollow, isAccept, isReject, isAdd, isRemove, isAnnounce, isLike, isUndo, isBlock, isCollectionOrOrderedCollection, isCollection, isFlag } from '../type';
import { IRemoteUser } from '../../../models/entities/user';
import create from './create';
import performDeleteActivity from './delete';
@ -13,6 +13,7 @@ import reject from './reject';
import add from './add';
import remove from './remove';
import block from './block';
import flag from './flag';
import { apLogger } from '../logger';
import Resolver from '../resolver';
import { toArray } from '../../../prelude/array';
@ -62,6 +63,8 @@ async function performOneActivity(actor: IRemoteUser, activity: IObject): Promis
await undo(actor, activity);
} else if (isBlock(activity)) {
await block(actor, activity);
} else if (isFlag(activity)) {
await flag(actor, activity);
} else {
apLogger.warn(`unknown activity type: ${(activity as any).type}`);
}