natty
/
calckey
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Revert "Recv Update" 

This reverts commit ffda39c093.
This commit is contained in:
mei23 2019-01-21 04:54:43 +09:00
parent ffda39c093
commit 26b560664f
3 changed files with 10 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/queue/processors/http/process-inbox.ts
View File

@ -62,9 +62,9 @@ export default async (job: bq.Job, done: any): Promise<void> => {
}) as IRemoteUser; }) as IRemoteUser;
} }
// Update<Person> activityの場合は、ここで署名検証/更新処理まで実施して終了 // Update activityの場合は、ここで署名検証/更新処理まで実施して終了
if (activity.type === 'Update' if (activity.type === 'Update') {
&& activity.object && activity.object.type === 'Person') { if (activity.object && activity.object.type === 'Person') {
if (user == null) { if (user == null) {
console.warn('Update activity received, but user not registed.'); console.warn('Update activity received, but user not registed.');
} else if (!httpSignature.verifySignature(signature, user.publicKey.publicKeyPem)) { } else if (!httpSignature.verifySignature(signature, user.publicKey.publicKeyPem)) {
@ -72,6 +72,7 @@ export default async (job: bq.Job, done: any): Promise<void> => {
} else { } else {
updatePerson(activity.actor, null, activity.object); updatePerson(activity.actor, null, activity.object);
} }
}
done(); done();
return; return;
} }

5
src/remote/activitypub/kernel/index.ts
View File

@ -11,7 +11,6 @@ import reject from './reject';
import add from './add'; import add from './add';
import remove from './remove'; import remove from './remove';
import block from './block'; import block from './block';
import update from './update';
const self = async (actor: IRemoteUser, activity: Object): Promise<void> => { const self = async (actor: IRemoteUser, activity: Object): Promise<void> => {
switch (activity.type) { switch (activity.type) {
@ -59,10 +58,6 @@ const self = async (actor: IRemoteUser, activity: Object): Promise<void> => {
await block(actor, activity); await block(actor, activity);
break; break;
case 'Update':
await update(actor, activity);
break;
case 'Collection': case 'Collection':
case 'OrderedCollection': case 'OrderedCollection':
// TODO // TODO

34
src/remote/activitypub/kernel/update/index.ts
View File

@ -1,34 +0,0 @@
import { IRemoteUser } from '../../../../models/user';
import * as debug from 'debug';
import { IUpdate } from '../../type';
import { extractPollFromQuestion } from '../../models/question';
import Note from '../../../../models/note';
const log = debug('misskey:activitypub');
export default async (actor: IRemoteUser, activity: IUpdate): Promise<void> => {
const id = typeof activity.object == 'string' ? activity.object : activity.object.id;
const type = (activity.object as any).type;
log(`Update<${type}>: ${id}`);
switch (type) {
case 'Question':
const note = await Note.findOne({
questionUri: id
});
if (note === null) throw 'note not found';
const poll = await extractPollFromQuestion(id);
await Note.update({
_id: note._id
}, {
$set: {
poll
}
});
break;
}
};