summaryrefslogtreecommitdiff
path: root/src/server/api
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2019-12-31 17:23:47 +0900
committerGitHub <noreply@github.com>2019-12-31 17:23:47 +0900
commitb0bb5d8dfcf06e1df2a51d3e541894a7fbede6a2 (patch)
treec16f145b58e8b1e10882527c8c184e74d2b62170 /src/server/api
parentUpdate README.md [AUTOGEN] (#5664) (diff)
downloadsharkey-b0bb5d8dfcf06e1df2a51d3e541894a7fbede6a2.tar.gz
sharkey-b0bb5d8dfcf06e1df2a51d3e541894a7fbede6a2.tar.bz2
sharkey-b0bb5d8dfcf06e1df2a51d3e541894a7fbede6a2.zip
期限切れ/未保存リモートファイルのローカルプロキシ (#5655)
* Media Proxy を実装 * サンプルを追加 * https://github.com/syuilo/misskey/pull/5649#discussion_r359967471 の修正 * https://github.com/syuilo/misskey/pull/5649#discussion_r359967966 の修正 * https://github.com/syuilo/misskey/pull/5649#discussion_r359968219 の修正 * 期限切れ/未保存リモートファイルのローカルプロキシ * 設定 * 説明 * comment out * fix Co-authored-by: 和風ドレッシング <37681609+CookieRamen@users.noreply.github.com>
Diffstat (limited to 'src/server/api')
-rw-r--r--src/server/api/endpoints/admin/update-meta.ts11
-rw-r--r--src/server/api/endpoints/meta.ts1
2 files changed, 12 insertions, 0 deletions
diff --git a/src/server/api/endpoints/admin/update-meta.ts b/src/server/api/endpoints/admin/update-meta.ts
index 05a1e25c01..bc37228d0a 100644
--- a/src/server/api/endpoints/admin/update-meta.ts
+++ b/src/server/api/endpoints/admin/update-meta.ts
@@ -151,6 +151,13 @@ export const meta = {
}
},
+ proxyRemoteFiles: {
+ validator: $.optional.bool,
+ desc: {
+ 'ja-JP': 'ローカルにないリモートのファイルをプロキシするか否か'
+ }
+ },
+
enableRecaptcha: {
validator: $.optional.bool,
desc: {
@@ -478,6 +485,10 @@ export default define(meta, async (ps, me) => {
set.cacheRemoteFiles = ps.cacheRemoteFiles;
}
+ if (ps.proxyRemoteFiles !== undefined) {
+ set.proxyRemoteFiles = ps.proxyRemoteFiles;
+ }
+
if (ps.enableRecaptcha !== undefined) {
set.enableRecaptcha = ps.enableRecaptcha;
}
diff --git a/src/server/api/endpoints/meta.ts b/src/server/api/endpoints/meta.ts
index 6df6362a6f..b71c35946e 100644
--- a/src/server/api/endpoints/meta.ts
+++ b/src/server/api/endpoints/meta.ts
@@ -143,6 +143,7 @@ export default define(meta, async (ps, me) => {
driveCapacityPerLocalUserMb: instance.localDriveCapacityMb,
driveCapacityPerRemoteUserMb: instance.remoteDriveCapacityMb,
cacheRemoteFiles: instance.cacheRemoteFiles,
+ proxyRemoteFiles: instance.proxyRemoteFiles,
enableRecaptcha: instance.enableRecaptcha,
recaptchaSiteKey: instance.recaptchaSiteKey,
swPublickey: instance.swPublicKey,