summaryrefslogtreecommitdiff
path: root/src/remote/activitypub/renderer/note.ts
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2019-01-21 13:27:19 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-01-21 13:27:19 +0900
commit4a57482216c80e38b17158834b5c8d8a47bc73cf (patch)
treef64e6f1aba85a5037cb0ceec55a4d742d70c7424 /src/remote/activitypub/renderer/note.ts
parent[Server] Fix #3528 (diff)
downloadmisskey-4a57482216c80e38b17158834b5c8d8a47bc73cf.tar.gz
misskey-4a57482216c80e38b17158834b5c8d8a47bc73cf.tar.bz2
misskey-4a57482216c80e38b17158834b5c8d8a47bc73cf.zip
リモートで投票を見たりしたりできるように (#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
Diffstat (limited to 'src/remote/activitypub/renderer/note.ts')
-rw-r--r--src/remote/activitypub/renderer/note.ts15
1 files changed, 13 insertions, 2 deletions
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,