リモートで投票を見たりしたりできるように (#3940)

* fix type

* expose Question

* Note refs Question

* rename

* wip

* リモート投票の場合リプライ送信

* voteの実装をservicesに移動

* 投票受信

* debug

* つくる

* Revert "つくる"

This reverts commit 0c9245886680b7d3b93a0278642f4cf6a43b5cb2.

* APIの実装はもどし

* Send Update

* AP type

* Recv Update

* Revert "Recv Update"

This reverts commit ffda39c0936d8e023f64603edabeb8e0eb9fc370.

* Revert "AP type"

This reverts commit 63d8bbe29dd6f326773214346350607cc4381996.

* Revert "Send Update"

This reverts commit 171b046de549f1478e928dee3177eeefab341fcf.

* リモートで投票を見る

* 投票はDM

* Provides choices as text for AP

* 絵文字

* fix error

* revert

* APからには不要な処理を削除

* Revert "APからには不要な処理を削除"

This reverts commit 8b5d8af9b0cc4d4ad0cf21de59827ff21df99560.

* てぬき

* めんどい

* ちっ

* remove unused code

5 files changed, 70 insertions, 2 deletions

diff --git a/src/remote/activitypub/models/note.ts b/src/remote/activitypub/models/note.ts
index bee2d943a0..dd0083340c 100644
--- a/src/remote/activitypub/models/note.ts
+++ b/src/remote/activitypub/models/note.ts
@@ -14,6 +14,8 @@ import Emoji, { IEmoji } from '../../../models/emoji';
 import { ITag } from './tag';
 import { toUnicode } from 'punycode';
 import { unique, concat, difference } from '../../../prelude/array';
+import { extractPollFromQuestion } from './question';
+import vote from '../../../services/note/polls/vote';
 
 const log = debug('misskey:activitypub');
 
@@ -110,6 +112,16 @@ export async function createNote(value: any, resolver?: Resolver, silent = false
 	// テキストのパース
 	const text = note._misskey_content ? note._misskey_content : htmlToMFM(note.content);
 
+	// vote
+	if (reply && reply.poll && text != null) {
+		const m = text.match(/([0-9])$/);
+		if (m) {
+			log(`vote from AP: actor=${actor.username}@${actor.host}, note=${note.id}, choice=${m[0]}`);
+			await vote(actor, reply, Number(m[1]));
+			return null;
+		}
+	}
+
 	const emojis = await extractEmojis(note.tag, actor.host).catch(e => {
 		console.log(`extractEmojis: ${e}`);
 		return [] as IEmoji[];
@@ -117,6 +129,9 @@ export async function createNote(value: any, resolver?: Resolver, silent = false
 
 	const apEmojis = emojis.map(emoji => emoji.name);
 
+	const questionUri = note._misskey_question;
+	const poll = questionUri ? await extractPollFromQuestion(questionUri).catch(() => undefined) : undefined;
+
 	// ユーザーの情報が古かったらついでに更新しておく
 	if (actor.lastFetchedAt == null || Date.now() - actor.lastFetchedAt.getTime() > 1000 * 60 * 60 * 24) {
 		updatePerson(note.attributedTo);
@@ -137,6 +152,8 @@ export async function createNote(value: any, resolver?: Resolver, silent = false
 		apMentions,
 		apHashtags,
 		apEmojis,
+		questionUri,
+		poll,
 		uri: note.id
 	}, silent);
 }
diff --git a/src/remote/activitypub/models/question.ts b/src/remote/activitypub/models/question.ts
new file mode 100644
index 0000000000..53892a409e
--- /dev/null
+++ b/src/remote/activitypub/models/question.ts
@@ -0,0 +1,19 @@
+import { IChoice, IPoll } from '../../../models/note';
+import Resolver from '../resolver';
+
+export async function extractPollFromQuestion(questionUri: string): Promise<IPoll> {
+	const resolver = new Resolver();
+	const question = await resolver.resolve(questionUri) as any;
+
+	const choices: IChoice[] = question.oneOf.map((x: any, i: number) => {
+			return {
+				id: i,
+				text: x.name,
+				votes: x._misskey_votes || 0,
+			} as IChoice;
+	});
+
+	return {
+		choices
+	};
+}
diff --git a/src/remote/activitypub/renderer/note.ts b/src/remote/activitypub/renderer/note.ts
index 4bb2281dad..190e01838b 100644
--- a/src/remote/activitypub/renderer/note.ts
+++ b/src/remote/activitypub/renderer/note.ts
@@ -93,17 +93,27 @@ export default async function renderNote(note: INote, dive = true): Promise<any>
 
 	let text = note.text;
 
+	let question: string;
 	if (note.poll != null) {
 		if (text == null) text = '';
 		const url = `${config.url}/notes/${note._id}`;
 		// TODO: i18n
-		text += `\n\n[投票を見る](${url})`;
+		text += `\n\n[リモートで投票を見る](${url})`;
+
+		question = `${config.url}/questions/${note._id}`;
 	}
 
 	let apText = text;
+	if (apText == null) apText = '';
+
+	// Provides choices as text for AP
+	if (note.poll != null) {
+		const cs = note.poll.choices.map(c => `${c.id}: ${c.text}`);
+		apText += '\n';
+		apText += cs.join('\n');
+	}
 
 	if (quote) {
-		if (apText == null) apText = '';
 		apText += `\n\nRE: ${quote}`;
 	}
 
@@ -130,6 +140,7 @@ export default async function renderNote(note: INote, dive = true): Promise<any>
 		content,
 		_misskey_content: text,
 		_misskey_quote: quote,
+		_misskey_question: question,
 		published: note.createdAt.toISOString(),
 		to,
 		cc,
diff --git a/src/remote/activitypub/renderer/question.ts b/src/remote/activitypub/renderer/question.ts
new file mode 100644
index 0000000000..9df4daca3b
--- /dev/null
+++ b/src/remote/activitypub/renderer/question.ts
@@ -0,0 +1,20 @@
+import config from '../../../config';
+import { ILocalUser } from '../../../models/user';
+import { INote } from '../../../models/note';
+
+export default async function renderQuestion(user: ILocalUser, note: INote) {
+	const question =  {
+		type: 'Question',
+		id: `${config.url}/questions/${note._id}`,
+		actor: `${config.url}/users/${user._id}`,
+		content:  note.text != null ? note.text : '',
+		oneOf: note.poll.choices.map(c => {
+			return {
+				name: c.text,
+				_misskey_votes: c.votes,
+			};
+		}),
+	};
+
+	return question;
+}
diff --git a/src/remote/activitypub/type.ts b/src/remote/activitypub/type.ts
index 9ffe73a670..b902abea23 100644
--- a/src/remote/activitypub/type.ts
+++ b/src/remote/activitypub/type.ts
@@ -42,6 +42,7 @@ export interface INote extends IObject {
 	type: 'Note';
 	_misskey_content: string;
 	_misskey_quote: string;
+	_misskey_question: string;
 }
 
 export interface IPerson extends IObject {