From 775fc0113db0630da2b5d8420ba8f04cab9b27c5 Mon Sep 17 00:00:00 2001 From: AkiraFukushima Date: Sun, 19 Aug 2018 16:03:25 +0900 Subject: [PATCH] refs #520 Control CW in favourite notification --- .../Contents/Cards/Notification/Favourite.vue | 45 +++++++++++++++++-- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Favourite.vue b/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Favourite.vue index c75035ae..0b29c0ba 100644 --- a/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Favourite.vue +++ b/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Favourite.vue @@ -29,7 +29,18 @@ {{ parseDatetime(message.status.created_at) }} -
+
+
+ + + {{ $t('cards.toot.show_more') }} + + + {{ $t('cards.toot.hide')}} + +
+
+
@@ -42,6 +53,7 @@ import moment from 'moment' import { shell } from 'electron' import { findAccount, findLink, isTag } from '../../../../utils/link' +import emojify from '~/src/renderer/utils/emojify' export default { name: 'favourite', @@ -55,6 +67,11 @@ export default { default: '' } }, + data () { + return { + showContent: false + } + }, methods: { username (account) { if (account.display_name !== '') { @@ -101,6 +118,18 @@ export default { }, filtered (message) { return this.filter.length > 0 && message.status.content.search(this.filter) >= 0 + }, + spoilered (message) { + return message.spoiler_text.length > 0 + }, + isShowContent (message) { + return !this.spoilered(message) || this.showContent + }, + status (message) { + return emojify(message.content, message.emojis) + }, + spoilerText (message) { + return emojify(message.spoiler_text, message.emojis) } } } @@ -178,9 +207,19 @@ export default { } } - .content { + .content-wrapper /deep/ { font-size: var(--base-font-size); - margin: 4px 0 8px; + + .content { + font-size: var(--base-font-size); + margin: 4px 0 8px; + word-wrap: break-word; + } + + .emojione { + width: 20px; + height: 20px; + } } } }