From e66d7babc5ae477d7a60628e5599f9c390426c81 Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 18 Jun 2018 14:28:43 +0900 Subject: yatta --- src/remote/activitypub/kernel/accept/index.ts | 4 ++-- src/remote/activitypub/kernel/announce/index.ts | 4 ++-- src/remote/activitypub/kernel/announce/note.ts | 4 ++-- src/remote/activitypub/kernel/create/image.ts | 2 +- src/remote/activitypub/kernel/create/note.ts | 2 +- src/remote/activitypub/kernel/delete/index.ts | 3 ++- src/remote/activitypub/kernel/reject/index.ts | 4 ++-- src/remote/activitypub/kernel/undo/index.ts | 4 ++-- 8 files changed, 14 insertions(+), 13 deletions(-) (limited to 'src/remote/activitypub/kernel') diff --git a/src/remote/activitypub/kernel/accept/index.ts b/src/remote/activitypub/kernel/accept/index.ts index 2f9d646d14..572a254d9a 100644 --- a/src/remote/activitypub/kernel/accept/index.ts +++ b/src/remote/activitypub/kernel/accept/index.ts @@ -3,7 +3,7 @@ import * as debug from 'debug'; import Resolver from '../../resolver'; import { IRemoteUser } from '../../../../models/user'; import acceptFollow from './follow'; -import { IAccept } from '../../type'; +import { IAccept, IFollow } from '../../type'; const log = debug('misskey:activitypub'); @@ -25,7 +25,7 @@ export default async (actor: IRemoteUser, activity: IAccept): Promise => { switch (object.type) { case 'Follow': - acceptFollow(actor, object); + acceptFollow(actor, object as IFollow); break; default: diff --git a/src/remote/activitypub/kernel/announce/index.ts b/src/remote/activitypub/kernel/announce/index.ts index a2cf2d5762..612b5dee84 100644 --- a/src/remote/activitypub/kernel/announce/index.ts +++ b/src/remote/activitypub/kernel/announce/index.ts @@ -3,7 +3,7 @@ import * as debug from 'debug'; import Resolver from '../../resolver'; import { IRemoteUser } from '../../../../models/user'; import announceNote from './note'; -import { IAnnounce } from '../../type'; +import { IAnnounce, INote } from '../../type'; const log = debug('misskey:activitypub'); @@ -25,7 +25,7 @@ export default async (actor: IRemoteUser, activity: IAnnounce): Promise => switch (object.type) { case 'Note': - announceNote(resolver, actor, activity, object); + announceNote(resolver, actor, activity, object as INote); break; default: diff --git a/src/remote/activitypub/kernel/announce/note.ts b/src/remote/activitypub/kernel/announce/note.ts index e258567389..7aa6aa5707 100644 --- a/src/remote/activitypub/kernel/announce/note.ts +++ b/src/remote/activitypub/kernel/announce/note.ts @@ -2,7 +2,7 @@ import * as debug from 'debug'; import Resolver from '../../resolver'; import post from '../../../../services/note/create'; -import { IRemoteUser } from '../../../../models/user'; +import { IRemoteUser, IUser } from '../../../../models/user'; import { IAnnounce, INote } from '../../type'; import { fetchNote, resolveNote } from '../../models/note'; import { resolvePerson } from '../../models/person'; @@ -36,7 +36,7 @@ export default async function(resolver: Resolver, actor: IRemoteUser, activity: //#region Visibility let visibility = 'public'; - let visibleUsers = []; + let visibleUsers: IUser[] = []; if (!note.to.includes('https://www.w3.org/ns/activitystreams#Public')) { if (note.cc.includes('https://www.w3.org/ns/activitystreams#Public')) { visibility = 'home'; diff --git a/src/remote/activitypub/kernel/create/image.ts b/src/remote/activitypub/kernel/create/image.ts index 2a55522220..9c19abbcc4 100644 --- a/src/remote/activitypub/kernel/create/image.ts +++ b/src/remote/activitypub/kernel/create/image.ts @@ -1,6 +1,6 @@ import { IRemoteUser } from '../../../../models/user'; import { createImage } from '../../models/image'; -export default async function(actor: IRemoteUser, image): Promise { +export default async function(actor: IRemoteUser, image: any): Promise { await createImage(image.url, actor); } diff --git a/src/remote/activitypub/kernel/create/note.ts b/src/remote/activitypub/kernel/create/note.ts index ed9fb6e54c..0f874b9fbf 100644 --- a/src/remote/activitypub/kernel/create/note.ts +++ b/src/remote/activitypub/kernel/create/note.ts @@ -5,7 +5,7 @@ import { createNote, fetchNote } from '../../models/note'; /** * 投稿作成アクティビティを捌きます */ -export default async function(resolver: Resolver, actor: IRemoteUser, note, silent = false): Promise { +export default async function(resolver: Resolver, actor: IRemoteUser, note: any, silent = false): Promise { const exist = await fetchNote(note); if (exist == null) { await createNote(note); diff --git a/src/remote/activitypub/kernel/delete/index.ts b/src/remote/activitypub/kernel/delete/index.ts index 10b47dc4ca..5d7a23584f 100644 --- a/src/remote/activitypub/kernel/delete/index.ts +++ b/src/remote/activitypub/kernel/delete/index.ts @@ -2,11 +2,12 @@ import Resolver from '../../resolver'; import deleteNote from './note'; import Note from '../../../../models/note'; import { IRemoteUser } from '../../../../models/user'; +import { IDelete } from '../../type'; /** * 削除アクティビティを捌きます */ -export default async (actor: IRemoteUser, activity): Promise => { +export default async (actor: IRemoteUser, activity: IDelete): Promise => { if ('actor' in activity && actor.uri !== activity.actor) { throw new Error('invalid actor'); } diff --git a/src/remote/activitypub/kernel/reject/index.ts b/src/remote/activitypub/kernel/reject/index.ts index a82c3fd61e..d89985c238 100644 --- a/src/remote/activitypub/kernel/reject/index.ts +++ b/src/remote/activitypub/kernel/reject/index.ts @@ -3,7 +3,7 @@ import * as debug from 'debug'; import Resolver from '../../resolver'; import { IRemoteUser } from '../../../../models/user'; import rejectFollow from './follow'; -import { IReject } from '../../type'; +import { IReject, IFollow } from '../../type'; const log = debug('misskey:activitypub'); @@ -25,7 +25,7 @@ export default async (actor: IRemoteUser, activity: IReject): Promise => { switch (object.type) { case 'Follow': - rejectFollow(actor, object); + rejectFollow(actor, object as IFollow); break; default: diff --git a/src/remote/activitypub/kernel/undo/index.ts b/src/remote/activitypub/kernel/undo/index.ts index 71f547aeb9..5d9535403b 100644 --- a/src/remote/activitypub/kernel/undo/index.ts +++ b/src/remote/activitypub/kernel/undo/index.ts @@ -1,7 +1,7 @@ import * as debug from 'debug'; import { IRemoteUser } from '../../../../models/user'; -import { IUndo } from '../../type'; +import { IUndo, IFollow } from '../../type'; import unfollow from './follow'; import Resolver from '../../resolver'; @@ -29,7 +29,7 @@ export default async (actor: IRemoteUser, activity: IUndo): Promise => { switch (object.type) { case 'Follow': - unfollow(actor, object); + unfollow(actor, object as IFollow); break; } -- cgit v1.2.3-freya