diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2018-11-01 11:51:49 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-01 11:51:49 +0900 |
| commit | c21caad1c505dda039817844681327b24e8a4e8f (patch) | |
| tree | eb99d74449371931679d29de3190911afd73891a /src/server | |
| parent | Fix bug (diff) | |
| download | sharkey-c21caad1c505dda039817844681327b24e8a4e8f.tar.gz sharkey-c21caad1c505dda039817844681327b24e8a4e8f.tar.bz2 sharkey-c21caad1c505dda039817844681327b24e8a4e8f.zip | |
Custom emoji (#3061)
* wip
* wip
* wip
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/api/endpoints/admin/update-meta.ts | 10 | ||||
| -rw-r--r-- | src/server/api/endpoints/meta.ts | 1 |
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 f0ebfbe936..f45efd7fe5 100644 --- a/src/server/api/endpoints/admin/update-meta.ts +++ b/src/server/api/endpoints/admin/update-meta.ts @@ -17,6 +17,12 @@ export const meta = { } }), + emojis: $.arr($.obj()).optional.note({ + desc: { + 'ja-JP': 'カスタム絵文字定義' + } + }), + disableRegistration: $.bool.optional.nullable.note({ desc: { 'ja-JP': '招待制か否か' @@ -53,6 +59,10 @@ export default (params: any) => new Promise(async (res, rej) => { set.broadcasts = ps.broadcasts; } + if (ps.emojis) { + set.emojis = ps.emojis; + } + if (typeof ps.disableRegistration === 'boolean') { set.disableRegistration = ps.disableRegistration; } diff --git a/src/server/api/endpoints/meta.ts b/src/server/api/endpoints/meta.ts index 0cd5842312..8bc0293832 100644 --- a/src/server/api/endpoints/meta.ts +++ b/src/server/api/endpoints/meta.ts @@ -50,6 +50,7 @@ export default (params: any, me: ILocalUser) => new Promise(async (res, rej) => hidedTags: (me && me.isAdmin) ? meta.hidedTags : undefined, bannerUrl: meta.bannerUrl, maxNoteTextLength: config.maxNoteTextLength, + emojis: meta.emojis, features: { registration: !meta.disableRegistration, |