diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2017-05-28 20:12:22 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2017-05-28 20:12:22 +0900 |
| commit | dff15d74cb30923a74be2b6cd8f8164f755897c3 (patch) | |
| tree | 04cbb5f3c706dffb538e7a1dc88e459a4044c384 /src | |
| parent | [api:endpoints/posts/create] translate '二重repostです' into English (diff) | |
| download | sharkey-dff15d74cb30923a74be2b6cd8f8164f755897c3.tar.gz sharkey-dff15d74cb30923a74be2b6cd8f8164f755897c3.tar.bz2 sharkey-dff15d74cb30923a74be2b6cd8f8164f755897c3.zip | |
Add some reactions
Diffstat (limited to 'src')
| -rw-r--r-- | src/api/endpoints/posts/reactions/create.ts | 5 | ||||
| -rw-r--r-- | src/web/app/common/tags/reaction-icon.tag | 4 | ||||
| -rw-r--r-- | src/web/app/common/tags/reaction-picker.tag | 5 | ||||
| -rw-r--r-- | src/web/assets/reactions/angry.png | bin | 0 -> 5875 bytes | |||
| -rw-r--r-- | src/web/assets/reactions/confused.png | bin | 0 -> 7255 bytes | |||
| -rw-r--r-- | src/web/assets/reactions/pudding.png | bin | 0 -> 7652 bytes |
6 files changed, 13 insertions, 1 deletions
diff --git a/src/api/endpoints/posts/reactions/create.ts b/src/api/endpoints/posts/reactions/create.ts index a3b25baa6a..ba5b69ada3 100644 --- a/src/api/endpoints/posts/reactions/create.ts +++ b/src/api/endpoints/posts/reactions/create.ts @@ -26,7 +26,10 @@ module.exports = (params, user) => new Promise(async (res, rej) => { 'laugh', 'hmm', 'surprise', - 'congrats' + 'congrats', + 'angry', + 'confused', + 'pudding' ]).$; if (reactionErr) return rej('invalid reaction param'); diff --git a/src/web/app/common/tags/reaction-icon.tag b/src/web/app/common/tags/reaction-icon.tag index 922148a0aa..0127293917 100644 --- a/src/web/app/common/tags/reaction-icon.tag +++ b/src/web/app/common/tags/reaction-icon.tag @@ -5,6 +5,10 @@ <virtual if={ opts.reaction == 'hmm' }><img src="/assets/reactions/hmm.png" alt="%i18n:common.reactions.hmm%"></virtual> <virtual if={ opts.reaction == 'surprise' }><img src="/assets/reactions/surprise.png" alt="%i18n:common.reactions.surprise%"></virtual> <virtual if={ opts.reaction == 'congrats' }><img src="/assets/reactions/congrats.png" alt="%i18n:common.reactions.congrats%"></virtual> + <virtual if={ opts.reaction == 'angry' }><img src="/assets/reactions/angry.png" alt="%i18n:common.reactions.angry%"></virtual> + <virtual if={ opts.reaction == 'confused' }><img src="/assets/reactions/confused.png" alt="%i18n:common.reactions.confused%"></virtual> + <virtual if={ opts.reaction == 'pudding' }><img src="/assets/reactions/pudding.png" alt="%i18n:common.reactions.pudding%"></virtual> + <style> :scope display inline diff --git a/src/web/app/common/tags/reaction-picker.tag b/src/web/app/common/tags/reaction-picker.tag index 244956810d..635ae29082 100644 --- a/src/web/app/common/tags/reaction-picker.tag +++ b/src/web/app/common/tags/reaction-picker.tag @@ -9,6 +9,9 @@ <button onclick={ react.bind(null, 'hmm') } onmouseover={ onmouseover } onmouseout={ onmouseout } tabindex="4" title="%i18n:common.reactions.hmm%"><mk-reaction-icon reaction='hmm'></mk-reaction-icon></button> <button onclick={ react.bind(null, 'surprise') } onmouseover={ onmouseover } onmouseout={ onmouseout } tabindex="5" title="%i18n:common.reactions.surprise%"><mk-reaction-icon reaction='surprise'></mk-reaction-icon></button> <button onclick={ react.bind(null, 'congrats') } onmouseover={ onmouseover } onmouseout={ onmouseout } tabindex="6" title="%i18n:common.reactions.congrats%"><mk-reaction-icon reaction='congrats'></mk-reaction-icon></button> + <button onclick={ react.bind(null, 'angry') } onmouseover={ onmouseover } onmouseout={ onmouseout } tabindex="4" title="%i18n:common.reactions.angry%"><mk-reaction-icon reaction='angry'></mk-reaction-icon></button> + <button onclick={ react.bind(null, 'confused') } onmouseover={ onmouseover } onmouseout={ onmouseout } tabindex="5" title="%i18n:common.reactions.confused%"><mk-reaction-icon reaction='confused'></mk-reaction-icon></button> + <button onclick={ react.bind(null, 'pudding') } onmouseover={ onmouseover } onmouseout={ onmouseout } tabindex="6" title="%i18n:common.reactions.pudding%"><mk-reaction-icon reaction='pudding'></mk-reaction-icon></button> </div> </div> <style> @@ -76,6 +79,8 @@ > div padding 4px + width 240px + text-align center > button width 40px diff --git a/src/web/assets/reactions/angry.png b/src/web/assets/reactions/angry.png Binary files differnew file mode 100644 index 0000000000..d81c431a25 --- /dev/null +++ b/src/web/assets/reactions/angry.png diff --git a/src/web/assets/reactions/confused.png b/src/web/assets/reactions/confused.png Binary files differnew file mode 100644 index 0000000000..cfaa60146f --- /dev/null +++ b/src/web/assets/reactions/confused.png diff --git a/src/web/assets/reactions/pudding.png b/src/web/assets/reactions/pudding.png Binary files differnew file mode 100644 index 0000000000..27a6b048e8 --- /dev/null +++ b/src/web/assets/reactions/pudding.png |