summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2018-12-19 22:18:58 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2018-12-19 22:18:58 +0900
commit45c5e7b96737d437b3219bb0fe7077145d56fea4 (patch)
tree133609366d73e4ad575d8bfc0604a8caf9e449c2 /src
parentResolve #3676 (#3677) (diff)
downloadmisskey-45c5e7b96737d437b3219bb0fe7077145d56fea4.tar.gz
misskey-45c5e7b96737d437b3219bb0fe7077145d56fea4.tar.bz2
misskey-45c5e7b96737d437b3219bb0fe7077145d56fea4.zip
Hide hidden contents in welcome timeline (#3682)
Diffstat (limited to 'src')
-rw-r--r--src/client/app/common/views/components/welcome-timeline.vue2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/app/common/views/components/welcome-timeline.vue b/src/client/app/common/views/components/welcome-timeline.vue
index 84575b35d6..26be892e20 100644
--- a/src/client/app/common/views/components/welcome-timeline.vue
+++ b/src/client/app/common/views/components/welcome-timeline.vue
@@ -16,7 +16,7 @@
</div>
</header>
<div class="text">
- <misskey-flavored-markdown v-if="note.text" :text="note.text" :author="note.user" :custom-emojis="note.emojis"/>
+ <misskey-flavored-markdown v-if="note.text" :text="note.cw != null ? note.cw : note.text" :author="note.user" :custom-emojis="note.emojis"/>
</div>
</div>
</div>