summaryrefslogtreecommitdiff
path: root/src/server/api/endpoints
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/api/endpoints')
-rw-r--r--src/server/api/endpoints/admin/update-meta.ts11
-rw-r--r--src/server/api/endpoints/meta.ts5
-rw-r--r--src/server/api/endpoints/notes/reactions/create.ts3
-rw-r--r--src/server/api/endpoints/notes/reactions/delete.ts2
4 files changed, 18 insertions, 3 deletions
diff --git a/src/server/api/endpoints/admin/update-meta.ts b/src/server/api/endpoints/admin/update-meta.ts
index df7520917c..9afe90295e 100644
--- a/src/server/api/endpoints/admin/update-meta.ts
+++ b/src/server/api/endpoints/admin/update-meta.ts
@@ -41,6 +41,13 @@ export const meta = {
}
},
+ enableEmojiReaction: {
+ validator: $.optional.nullable.bool,
+ desc: {
+ 'ja-JP': '絵文字リアクションを有効にするか否か'
+ }
+ },
+
hidedTags: {
validator: $.optional.nullable.arr($.str),
desc: {
@@ -351,6 +358,10 @@ export default define(meta, async (ps) => {
set.disableGlobalTimeline = ps.disableGlobalTimeline;
}
+ if (typeof ps.enableEmojiReaction === 'boolean') {
+ set.enableEmojiReaction = ps.enableEmojiReaction;
+ }
+
if (Array.isArray(ps.hidedTags)) {
set.hidedTags = ps.hidedTags;
}
diff --git a/src/server/api/endpoints/meta.ts b/src/server/api/endpoints/meta.ts
index e3e9badff5..1759a3c2f0 100644
--- a/src/server/api/endpoints/meta.ts
+++ b/src/server/api/endpoints/meta.ts
@@ -70,6 +70,10 @@ export const meta = {
type: 'boolean',
description: 'Whether disabled GTL.',
},
+ enableEmojiReaction: {
+ type: 'boolean',
+ description: 'Whether enabled emoji reaction.',
+ },
}
}
};
@@ -107,6 +111,7 @@ export default define(meta, async (ps, me) => {
disableRegistration: instance.disableRegistration,
disableLocalTimeline: instance.disableLocalTimeline,
disableGlobalTimeline: instance.disableGlobalTimeline,
+ enableEmojiReaction: instance.enableEmojiReaction,
driveCapacityPerLocalUserMb: instance.localDriveCapacityMb,
driveCapacityPerRemoteUserMb: instance.remoteDriveCapacityMb,
cacheRemoteFiles: instance.cacheRemoteFiles,
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')
},