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

AP featured collectionの修正 / Collection Activityの対応 / typeの修正など (#5460)

Browse source 
* resolver type / fix updateFeatured

* type ApObject

* fix strange type

* AP Activity

* Collection Activityが失敗したらとりあえず無視
This commit is contained in:
MeiMei 2019-09-27 04:58:28 +09:00 • committed by syuilo
parent 3a093f8bd7
commit e14509574d
10 changed files with 85 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/remote/activitypub/kernel/announce/index.ts
View file

@ -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}`);
}

4
src/remote/activitypub/kernel/announce/note.ts
View file

@ -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);
// アナウンサーが凍結されていたらスキップ