diff options
| author | tamaina <tamaina@hotmail.co.jp> | 2018-09-15 22:15:56 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-15 22:15:56 +0900 |
| commit | 8f8c67ad6d33eb9ced1844bb372d517204df6c6f (patch) | |
| tree | bcaedee83bb5960a6b63291795dd95f9ed603a99 /src/server/api/endpoints/meta.ts | |
| parent | fix mk-media darkmode (diff) | |
| parent | 8.41.0 (diff) | |
| download | misskey-8f8c67ad6d33eb9ced1844bb372d517204df6c6f.tar.gz misskey-8f8c67ad6d33eb9ced1844bb372d517204df6c6f.tar.bz2 misskey-8f8c67ad6d33eb9ced1844bb372d517204df6c6f.zip | |
Merge branch 'develop' into improve-media
Diffstat (limited to 'src/server/api/endpoints/meta.ts')
| -rw-r--r-- | src/server/api/endpoints/meta.ts | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/server/api/endpoints/meta.ts b/src/server/api/endpoints/meta.ts index b0876eaafd..18b0882f76 100644 --- a/src/server/api/endpoints/meta.ts +++ b/src/server/api/endpoints/meta.ts @@ -4,6 +4,7 @@ import * as os from 'os'; import config from '../../../config'; import Meta from '../../../models/meta'; +import { ILocalUser } from '../../../models/user'; const pkg = require('../../../../package.json'); const client = require('../../../../built/client/meta.json'); @@ -11,7 +12,7 @@ const client = require('../../../../built/client/meta.json'); /** * Show core info */ -export default () => new Promise(async (res, rej) => { +export default (params: any, me: ILocalUser) => new Promise(async (res, rej) => { const meta: any = (await Meta.findOne()) || {}; res({ @@ -33,8 +34,10 @@ export default () => 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 + swPublickey: config.sw ? config.sw.public_key : null, + hidedTags: (me && me.isAdmin) ? meta.hidedTags : undefined }); }); |