diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2019-03-21 04:50:44 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-03-21 04:50:44 +0900 |
| commit | 7bebea087cc35b95c4065c1dd9f554a8ec002771 (patch) | |
| tree | b8aea8cff25858cb9061eeeca11df83464cb42f9 /src/server/api | |
| parent | Fix NoteReaction (#4547) (diff) | |
| download | sharkey-7bebea087cc35b95c4065c1dd9f554a8ec002771.tar.gz sharkey-7bebea087cc35b95c4065c1dd9f554a8ec002771.tar.bz2 sharkey-7bebea087cc35b95c4065c1dd9f554a8ec002771.zip | |
Fix #4546 (#4548)
* Refactor download
* emoji type
Diffstat (limited to 'src/server/api')
| -rw-r--r-- | src/server/api/endpoints/admin/emoji/add.ts | 6 | ||||
| -rw-r--r-- | src/server/api/endpoints/admin/emoji/update.ts | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/server/api/endpoints/admin/emoji/add.ts b/src/server/api/endpoints/admin/emoji/add.ts index 99439f89a6..c126c8380f 100644 --- a/src/server/api/endpoints/admin/emoji/add.ts +++ b/src/server/api/endpoints/admin/emoji/add.ts @@ -1,6 +1,7 @@ import $ from 'cafy'; import Emoji from '../../../../../models/emoji'; import define from '../../../define'; +import { detectUrlMine } from '../../../../../misc/detect-url-mine'; export const meta = { desc: { @@ -29,12 +30,15 @@ export const meta = { }; export default define(meta, async (ps) => { + const type = await detectUrlMine(ps.url); + const emoji = await Emoji.insert({ updatedAt: new Date(), name: ps.name, host: null, aliases: ps.aliases, - url: ps.url + url: ps.url, + type, }); return { diff --git a/src/server/api/endpoints/admin/emoji/update.ts b/src/server/api/endpoints/admin/emoji/update.ts index 38d90c65a3..8b1c07be9e 100644 --- a/src/server/api/endpoints/admin/emoji/update.ts +++ b/src/server/api/endpoints/admin/emoji/update.ts @@ -2,6 +2,7 @@ import $ from 'cafy'; import Emoji from '../../../../../models/emoji'; import define from '../../../define'; import ID from '../../../../../misc/cafy-id'; +import { detectUrlMine } from '../../../../../misc/detect-url-mine'; export const meta = { desc: { @@ -39,12 +40,15 @@ export default define(meta, async (ps) => { if (emoji == null) throw new Error('emoji not found'); + const type = await detectUrlMine(ps.url); + await Emoji.update({ _id: emoji._id }, { $set: { updatedAt: new Date(), name: ps.name, aliases: ps.aliases, - url: ps.url + url: ps.url, + type, } }); |