diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2019-03-18 00:03:57 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-03-18 00:03:57 +0900 |
| commit | 26845416932ecf0ce035240ce934d2afb77bf550 (patch) | |
| tree | 41992508c56c9ac05c481f76af524f5a3f14ca31 /src/client/app/admin/views | |
| parent | Change default dark theme (diff) | |
| download | sharkey-26845416932ecf0ce035240ce934d2afb77bf550.tar.gz sharkey-26845416932ecf0ce035240ce934d2afb77bf550.tar.bz2 sharkey-26845416932ecf0ce035240ce934d2afb77bf550.zip | |
Custom reaction (#4517)
* Custom reaction
* increase limit of reactions/delete
* リアクションの場合は OS標準の絵文字を使用 を迂回する
* カスタムリアクションを無効にする設定
* fix
* disableCustomReaction --> enableEmojiReaction
* Avoid MFM rendering
* :art:
* :art:
* Auto accept
* custom emoji reaction
* Improve usability
* Extract emojiRegex
* Fix
* Clean up
* :art:
* :art:
* toDbReaction で reaction は必須に
あとフォールバックは like に
* Clean up
* Make required
* https://github.com/syuilo/misskey/pull/4517/commits/3eb08748feeaab9ee5c5b505c870f97d7edbeb0d#r266241728
* Refactor
* Allow null
Diffstat (limited to 'src/client/app/admin/views')
| -rw-r--r-- | src/client/app/admin/views/instance.vue | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/client/app/admin/views/instance.vue b/src/client/app/admin/views/instance.vue index 8b3ec0cb26..ab337f1871 100644 --- a/src/client/app/admin/views/instance.vue +++ b/src/client/app/admin/views/instance.vue @@ -25,6 +25,7 @@ <ui-switch v-model="disableLocalTimeline">{{ $t('disable-local-timeline') }}</ui-switch> <ui-switch v-model="disableGlobalTimeline">{{ $t('disable-global-timeline') }}</ui-switch> <ui-info>{{ $t('disabling-timelines-info') }}</ui-info> + <ui-switch v-model="enableEmojiReaction">{{ $t('enable-emoji-reaction') }}</ui-switch> </section> <section class="fit-bottom"> <header><fa icon="cloud"/> {{ $t('drive-config') }}</header> @@ -155,6 +156,7 @@ export default Vue.extend({ disableRegistration: false, disableLocalTimeline: false, disableGlobalTimeline: false, + enableEmojiReaction: true, mascotImageUrl: null, bannerUrl: null, errorImageUrl: null, @@ -206,6 +208,7 @@ export default Vue.extend({ this.disableRegistration = meta.disableRegistration; this.disableLocalTimeline = meta.disableLocalTimeline; this.disableGlobalTimeline = meta.disableGlobalTimeline; + this.enableEmojiReaction = meta.enableEmojiReaction; this.mascotImageUrl = meta.mascotImageUrl; this.bannerUrl = meta.bannerUrl; this.errorImageUrl = meta.errorImageUrl; @@ -267,6 +270,7 @@ export default Vue.extend({ disableRegistration: this.disableRegistration, disableLocalTimeline: this.disableLocalTimeline, disableGlobalTimeline: this.disableGlobalTimeline, + enableEmojiReaction: this.enableEmojiReaction, mascotImageUrl: this.mascotImageUrl, bannerUrl: this.bannerUrl, errorImageUrl: this.errorImageUrl, |