summaryrefslogtreecommitdiff
path: root/src/server/api
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-09-12 02:48:19 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-09-12 02:48:19 +0900
commit046976dffc1aa8bc02259ab4a65e74b1216a0ec3 (patch)
tree344d0594ffdfaab1b2144ade816e728454f42666 /src/server/api
parentFix wrong indentation (diff)
downloadsharkey-046976dffc1aa8bc02259ab4a65e74b1216a0ec3.tar.gz
sharkey-046976dffc1aa8bc02259ab4a65e74b1216a0ec3.tar.bz2
sharkey-046976dffc1aa8bc02259ab4a65e74b1216a0ec3.zip
Resolve #2691
Diffstat (limited to 'src/server/api')
-rw-r--r--src/server/api/endpoints/admin/update-meta.ts10
-rw-r--r--src/server/api/endpoints/meta.ts1
2 files changed, 11 insertions, 0 deletions
diff --git a/src/server/api/endpoints/admin/update-meta.ts b/src/server/api/endpoints/admin/update-meta.ts
index f903628774..3f5cd56b2f 100644
--- a/src/server/api/endpoints/admin/update-meta.ts
+++ b/src/server/api/endpoints/admin/update-meta.ts
@@ -23,6 +23,12 @@ export const meta = {
}
}),
+ disableLocalTimeline: $.bool.optional.nullable.note({
+ desc: {
+ 'ja-JP': 'ローカルタイムライン(とソーシャルタイムライン)を無効にするか否か'
+ }
+ }),
+
hidedTags: $.arr($.str).optional.nullable.note({
desc: {
'ja-JP': '統計などで無視するハッシュタグ'
@@ -45,6 +51,10 @@ export default (params: any) => new Promise(async (res, rej) => {
set.disableRegistration = ps.disableRegistration;
}
+ if (typeof ps.disableLocalTimeline === 'boolean') {
+ set.disableLocalTimeline = ps.disableLocalTimeline;
+ }
+
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 4472d8d779..18b0882f76 100644
--- a/src/server/api/endpoints/meta.ts
+++ b/src/server/api/endpoints/meta.ts
@@ -34,6 +34,7 @@ export default (params: any, me: ILocalUser) => new Promise(async (res, rej) =>
},
broadcasts: meta.broadcasts,
disableRegistration: meta.disableRegistration,
+ disableLocalTimeline: meta.disableLocalTimeline,
driveCapacityPerLocalUserMb: config.localDriveCapacityMb,
recaptchaSitekey: config.recaptcha ? config.recaptcha.site_key : null,
swPublickey: config.sw ? config.sw.public_key : null,