summaryrefslogtreecommitdiff
path: root/src/remote/activitypub/misc/get-note-html.ts
diff options
context:
space:
mode:
authortamaina <tamaina@hotmail.co.jp>2018-09-15 22:15:56 +0900
committerGitHub <noreply@github.com>2018-09-15 22:15:56 +0900
commit8f8c67ad6d33eb9ced1844bb372d517204df6c6f (patch)
treebcaedee83bb5960a6b63291795dd95f9ed603a99 /src/remote/activitypub/misc/get-note-html.ts
parentfix mk-media darkmode (diff)
parent8.41.0 (diff)
downloadmisskey-8f8c67ad6d33eb9ced1844bb372d517204df6c6f.tar.gz
misskey-8f8c67ad6d33eb9ced1844bb372d517204df6c6f.tar.bz2
misskey-8f8c67ad6d33eb9ced1844bb372d517204df6c6f.zip
Merge branch 'develop' into improve-media
Diffstat (limited to 'src/remote/activitypub/misc/get-note-html.ts')
-rw-r--r--src/remote/activitypub/misc/get-note-html.ts3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/remote/activitypub/misc/get-note-html.ts b/src/remote/activitypub/misc/get-note-html.ts
index 8df440930b..f92e91c34e 100644
--- a/src/remote/activitypub/misc/get-note-html.ts
+++ b/src/remote/activitypub/misc/get-note-html.ts
@@ -4,9 +4,8 @@ import parse from '../../../mfm/parse';
import config from '../../../config';
export default function(note: INote) {
- if (note.text == null) return null;
-
let html = toHtml(parse(note.text), note.mentionedRemoteUsers);
+ if (html == null) html = '';
if (note.poll != null) {
const url = `${config.url}/notes/${note._id}`;