This commit is contained in:
syuilo 2018-04-07 06:44:29 +09:00
parent 765a10c8da
commit de620c822a
2 changed files with 28 additions and 5 deletions

View file

@ -1,18 +1,35 @@
import Resolver from '../../resolver'; import Resolver from '../../resolver';
import deleteNote from './note'; import deleteNote from './note';
import Post from '../../../../models/post';
/**
*
*/
export default async (actor, activity): Promise<void> => { export default async (actor, activity): Promise<void> => {
if ('actor' in activity && actor.account.uri !== activity.actor) { if ('actor' in activity && actor.account.uri !== activity.actor) {
throw new Error(); throw new Error('invalid actor');
} }
const resolver = new Resolver(); const resolver = new Resolver();
const object = await resolver.resolve(activity); const object = await resolver.resolve(activity.object);
const uri = (object as any).id;
switch (object.type) { switch (object.type) {
case 'Note': case 'Note':
deleteNote(object); deleteNote(uri);
break;
case 'Tombstone':
const post = await Post.findOne({ uri });
if (post != null) {
deleteNote(uri);
}
break;
default:
console.warn(`Unknown type: ${object.type}`);
break; break;
} }
}; };

View file

@ -1,8 +1,14 @@
import * as debug from 'debug';
import Post from '../../../../models/post'; import Post from '../../../../models/post';
import { createDb } from '../../../../queue'; import { createDb } from '../../../../queue';
export default async function(note) { const log = debug('misskey:activitypub');
const post = await Post.findOneAndDelete({ uri: note.id });
export default async function(uri: string) {
log(`Deleting the Note: ${uri}`);
const post = await Post.findOneAndDelete({ uri });
createDb({ createDb({
type: 'deletePostDependents', type: 'deletePostDependents',