diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2019-09-27 04:58:28 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-09-27 04:58:28 +0900 |
| commit | e14509574d534a74fcebf9515146b028bbdec153 (patch) | |
| tree | c49aa610bb703ce9b7903059235e69fec3eead11 /src/remote/activitypub/kernel/announce | |
| parent | Use mk-frac (diff) | |
| download | sharkey-e14509574d534a74fcebf9515146b028bbdec153.tar.gz sharkey-e14509574d534a74fcebf9515146b028bbdec153.tar.bz2 sharkey-e14509574d534a74fcebf9515146b028bbdec153.zip | |
AP featured collectionの修正 / Collection Activityの対応 / typeの修正など (#5460)
* resolver type / fix updateFeatured
* type ApObject
* fix strange type
* AP Activity
* Collection Activityが失敗したらとりあえず無視
Diffstat (limited to 'src/remote/activitypub/kernel/announce')
| -rw-r--r-- | src/remote/activitypub/kernel/announce/index.ts | 4 | ||||
| -rw-r--r-- | src/remote/activitypub/kernel/announce/note.ts | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/remote/activitypub/kernel/announce/index.ts b/src/remote/activitypub/kernel/announce/index.ts index 68fce52e17..a9447840b7 100644 --- a/src/remote/activitypub/kernel/announce/index.ts +++ b/src/remote/activitypub/kernel/announce/index.ts @@ -1,7 +1,7 @@ import Resolver from '../../resolver'; import { IRemoteUser } from '../../../../models/entities/user'; import announceNote from './note'; -import { IAnnounce, INote, validPost, getApId } from '../../type'; +import { IAnnounce, validPost, getApId } from '../../type'; import { apLogger } from '../../logger'; const logger = apLogger; @@ -23,7 +23,7 @@ export default async (actor: IRemoteUser, activity: IAnnounce): Promise<void> => } if (validPost.includes(object.type)) { - announceNote(resolver, actor, activity, object as INote); + announceNote(resolver, actor, activity, object); } else { logger.warn(`Unknown announce type: ${object.type}`); } diff --git a/src/remote/activitypub/kernel/announce/note.ts b/src/remote/activitypub/kernel/announce/note.ts index f0594a57b7..a5db5b8ca7 100644 --- a/src/remote/activitypub/kernel/announce/note.ts +++ b/src/remote/activitypub/kernel/announce/note.ts @@ -1,7 +1,7 @@ import Resolver from '../../resolver'; import post from '../../../../services/note/create'; import { IRemoteUser, User } from '../../../../models/entities/user'; -import { IAnnounce, INote, getApId, getApIds } from '../../type'; +import { IAnnounce, IObject, getApId, getApIds } from '../../type'; import { fetchNote, resolveNote } from '../../models/note'; import { resolvePerson } from '../../models/person'; import { apLogger } from '../../logger'; @@ -14,7 +14,7 @@ const logger = apLogger; /** * アナウンスアクティビティを捌きます */ -export default async function(resolver: Resolver, actor: IRemoteUser, activity: IAnnounce, note: INote): Promise<void> { +export default async function(resolver: Resolver, actor: IRemoteUser, activity: IAnnounce, note: IObject): Promise<void> { const uri = getApId(activity); // アナウンサーが凍結されていたらスキップ |