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

Note refs Question

This commit is contained in:
mei23 2019-01-20 11:40:16 +09:00
parent f026c78e11
commit 15460d5b53
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/remote/activitypub/renderer/note.ts
View File

@ -5,9 +5,10 @@ import renderEmoji from './emoji';
import config from '../../../config'; import config from '../../../config';
import DriveFile, { IDriveFile } from '../../../models/drive-file'; import DriveFile, { IDriveFile } from '../../../models/drive-file';
import Note, { INote } from '../../../models/note'; import Note, { INote } from '../../../models/note';
import User from '../../../models/user'; import User, { ILocalUser } from '../../../models/user';
import toHtml from '../misc/get-note-html'; import toHtml from '../misc/get-note-html';
import Emoji, { IEmoji } from '../../../models/emoji'; import Emoji, { IEmoji } from '../../../models/emoji';
import renderQuestion from './question';
export default async function renderNote(note: INote, dive = true): Promise<any> { export default async function renderNote(note: INote, dive = true): Promise<any> {
const promisedFiles: Promise<IDriveFile[]> = note.fileIds const promisedFiles: Promise<IDriveFile[]> = note.fileIds
@ -93,11 +94,14 @@ export default async function renderNote(note: INote, dive = true): Promise<any>
let text = note.text; let text = note.text;
const questions = [];
if (note.poll != null) { if (note.poll != null) {
if (text == null) text = ''; if (text == null) text = '';
const url = `${config.url}/notes/${note._id}`; const url = `${config.url}/notes/${note._id}`;
// TODO: i18n // TODO: i18n
text += `\n\n[投票を見る](${url})`; text += `\n\n[投票を見る](${url})`;
questions.push(await renderQuestion(user as ILocalUser, note));
} }
let apText = text; let apText = text;
@ -120,6 +124,7 @@ export default async function renderNote(note: INote, dive = true): Promise<any>
...hashtagTags, ...hashtagTags,
...mentionTags, ...mentionTags,
...apemojis, ...apemojis,
...questions,
]; ];
return { return {