summaryrefslogtreecommitdiff
path: root/src/server/api/endpoints/notes
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2019-03-18 00:03:57 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-03-18 00:03:57 +0900
commit26845416932ecf0ce035240ce934d2afb77bf550 (patch)
tree41992508c56c9ac05c481f76af524f5a3f14ca31 /src/server/api/endpoints/notes
parentChange default dark theme (diff)
downloadsharkey-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/server/api/endpoints/notes')
-rw-r--r--src/server/api/endpoints/notes/reactions/create.ts3
-rw-r--r--src/server/api/endpoints/notes/reactions/delete.ts2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/server/api/endpoints/notes/reactions/create.ts b/src/server/api/endpoints/notes/reactions/create.ts
index 291e10bbd0..299ed30278 100644
--- a/src/server/api/endpoints/notes/reactions/create.ts
+++ b/src/server/api/endpoints/notes/reactions/create.ts
@@ -1,7 +1,6 @@
import $ from 'cafy';
import ID, { transform } from '../../../../../misc/cafy-id';
import createReaction from '../../../../../services/note/reaction/create';
-import { validateReaction } from '../../../../../models/note-reaction';
import define from '../../../define';
import { getNote } from '../../../common/getters';
import { ApiError } from '../../../error';
@@ -30,7 +29,7 @@ export const meta = {
},
reaction: {
- validator: $.str.pipe(validateReaction.ok),
+ validator: $.str,
desc: {
'ja-JP': 'リアクションの種類'
}
diff --git a/src/server/api/endpoints/notes/reactions/delete.ts b/src/server/api/endpoints/notes/reactions/delete.ts
index 2ccfb93293..08442226c5 100644
--- a/src/server/api/endpoints/notes/reactions/delete.ts
+++ b/src/server/api/endpoints/notes/reactions/delete.ts
@@ -20,7 +20,7 @@ export const meta = {
limit: {
duration: ms('1hour'),
- max: 5,
+ max: 60,
minInterval: ms('3sec')
},