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

Refactor

Browse source
This commit is contained in:
syuilo 2018-04-07 16:14:35 +09:00
parent 7dc06b3d43
commit 93f631e358
8 changed files with 58 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/remote/activitypub/act/create/image.ts
View file

@ -1,13 +1,12 @@
import * as debug from 'debug';
import Resolver from '../../resolver';
import uploadFromUrl from '../../../../services/drive/upload-from-url';
import { IRemoteUser } from '../../../../models/user';
import { IDriveFile } from '../../../../models/drive-file';
const log = debug('misskey:activitypub');
export default async function(resolver: Resolver, actor: IRemoteUser, image): Promise<IDriveFile> {
export default async function(actor: IRemoteUser, image): Promise<IDriveFile> {
if ('attributedTo' in image && actor.account.uri !== image.attributedTo) {
log(`invalid image: ${JSON.stringify(image, null, 2)}`);
throw new Error('invalid image');

5
src/remote/activitypub/act/create/index.ts
View file

@ -4,10 +4,11 @@ import Resolver from '../../resolver';
import { IRemoteUser } from '../../../../models/user';
import createNote from './note';
import createImage from './image';
import { ICreate } from '../../type';
const log = debug('misskey:activitypub');
export default async (actor: IRemoteUser, activity): Promise<void> => {
export default async (actor: IRemoteUser, activity: ICreate): Promise<void> => {
if ('actor' in activity && actor.account.uri !== activity.actor) {
throw new Error('invalid actor');
}
@ -29,7 +30,7 @@ export default async (actor: IRemoteUser, activity): Promise<void> => {
switch (object.type) {
case 'Image':
createImage(resolver, actor, object);
createImage(actor, object);
break;
case 'Note':

2
src/remote/activitypub/act/create/note.ts
View file

@ -43,7 +43,7 @@ export default async function createNote(resolver: Resolver, actor: IRemoteUser,
// TODO: attachmentは必ずしも配列ではない
// TODO: ループの中でawaitはすべきでない
note.attachment.forEach(async media => {
const created = await createImage(resolver, note.actor, media);
const created = await createImage(note.actor, media);
media.push(created);
});
}