リモートで投票を見たりしたりできるように (#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
This commit is contained in:
@ -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,
|
||||
|
20
src/remote/activitypub/renderer/question.ts
Normal file
20
src/remote/activitypub/renderer/question.ts
Normal file
@ -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;
|
||||
}
|
Reference in New Issue
Block a user