sim1222/test1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix #4546 (#4548)

Browse Source 
* Refactor download

* emoji type
This commit is contained in:
MeiMei
2019-03-21 04:50:44 +09:00
committed by syuilo
parent 1c79e30436
commit 7bebea087c
12 changed files with 151 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/api/endpoints/admin/emoji/add.ts
View File

@ -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 {

6
src/server/api/endpoints/admin/emoji/update.ts
View File

@ -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,
}
});