summaryrefslogtreecommitdiff
path: root/src/client/app/common/views
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2018-06-19 07:53:32 +0900
committerGitHub <noreply@github.com>2018-06-19 07:53:32 +0900
commitfb211d59a8fb4893008fc6cbb3b2fec95b752cfc (patch)
treeeaddd68db3a172f7d8721bbd0461ca8ceca248d1 /src/client/app/common/views
parentNew translations ja.yml (Polish) (diff)
parent4.3.0 (diff)
downloadmisskey-fb211d59a8fb4893008fc6cbb3b2fec95b752cfc.tar.gz
misskey-fb211d59a8fb4893008fc6cbb3b2fec95b752cfc.tar.bz2
misskey-fb211d59a8fb4893008fc6cbb3b2fec95b752cfc.zip
Merge branch 'master' into l10n_master
Diffstat (limited to 'src/client/app/common/views')
-rw-r--r--src/client/app/common/views/components/reaction-icon.vue5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/client/app/common/views/components/reaction-icon.vue b/src/client/app/common/views/components/reaction-icon.vue
index 7d24f4f9e9..2d5391a21e 100644
--- a/src/client/app/common/views/components/reaction-icon.vue
+++ b/src/client/app/common/views/components/reaction-icon.vue
@@ -8,7 +8,10 @@
<img v-if="reaction == 'congrats'" src="/assets/reactions/congrats.png" alt="%i18n:common.reactions.congrats%">
<img v-if="reaction == 'angry'" src="/assets/reactions/angry.png" alt="%i18n:common.reactions.angry%">
<img v-if="reaction == 'confused'" src="/assets/reactions/confused.png" alt="%i18n:common.reactions.confused%">
- <img v-if="reaction == 'pudding'" src="/assets/reactions/pudding.png" alt="%i18n:common.reactions.pudding%">
+ <template v-if="reaction == 'pudding'">
+ <img v-if="$store.getters.isSignedIn && $store.state.settings.iLikeSushi" src="/assets/reactions/sushi.png" alt="%i18n:common.reactions.pudding%">
+ <img v-else src="/assets/reactions/pudding.png" alt="%i18n:common.reactions.pudding%">
+ </template>
</span>
</template>