From 40c0ca0da04f3f141095191c8e84f6c3710c79e8 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 11 Aug 2018 21:08:34 +0900 Subject: [PATCH] =?UTF-8?q?Add=20new=20reaction:=20rip=20=F0=9F=98=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locales/ja.yml | 1 + src/client/app/common/views/components/reaction-icon.vue | 1 + src/client/app/common/views/components/reaction-picker.vue | 7 ++++--- .../app/common/views/components/reactions-viewer.vue | 1 + src/client/assets/reactions/rip.png | 3 +++ src/misc/get-reaction-emoji.ts | 1 + src/models/note-reaction.ts | 1 + 7 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 src/client/assets/reactions/rip.png diff --git a/locales/ja.yml b/locales/ja.yml index ecde1bb6a..98397212d 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -70,6 +70,7 @@ common: congrats: "おめでとう" angry: "おこ" confused: "こまこまのこまり" + rip: "RIP" pudding: "Pudding" note-placeholders: diff --git a/src/client/app/common/views/components/reaction-icon.vue b/src/client/app/common/views/components/reaction-icon.vue index 2d5391a21..46886b8ab 100644 --- a/src/client/app/common/views/components/reaction-icon.vue +++ b/src/client/app/common/views/components/reaction-icon.vue @@ -8,6 +8,7 @@ %i18n:common.reactions.congrats% %i18n:common.reactions.angry% %i18n:common.reactions.confused% + %i18n:common.reactions.rip% diff --git a/src/client/assets/reactions/rip.png b/src/client/assets/reactions/rip.png new file mode 100644 index 000000000..c7d597e7c --- /dev/null +++ b/src/client/assets/reactions/rip.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d63b08fb104a3c4700cfd76128ff07f5e03e598b2c088886989de9251870be1 +size 6793 diff --git a/src/misc/get-reaction-emoji.ts b/src/misc/get-reaction-emoji.ts index c66120537..9d6956c4a 100644 --- a/src/misc/get-reaction-emoji.ts +++ b/src/misc/get-reaction-emoji.ts @@ -8,6 +8,7 @@ export default function(reaction: string): string { case 'congrats': return '🎉'; case 'angry': return '💢'; case 'confused': return '😥'; + case 'rip': return '😇'; case 'pudding': return '🍮'; default: return ''; } diff --git a/src/models/note-reaction.ts b/src/models/note-reaction.ts index 915dc0cf9..a710fef36 100644 --- a/src/models/note-reaction.ts +++ b/src/models/note-reaction.ts @@ -26,6 +26,7 @@ export const validateReaction = $.str.or([ 'congrats', 'angry', 'confused', + 'rip', 'pudding' ]);