1
1
mirror of https://github.com/kokonect-link/cherrypick synced 2024-12-11 13:18:54 +09:00
This commit is contained in:
syuilo 2018-11-02 14:53:55 +09:00
parent 9b94ddff0a
commit 60e95ac2ac
No known key found for this signature in database
GPG Key ID: BDC4C49D06AB9D69
3 changed files with 0 additions and 35 deletions

View File

@ -15,24 +15,4 @@ export type IMeta = {
disableLocalTimeline?: boolean; disableLocalTimeline?: boolean;
hidedTags?: string[]; hidedTags?: string[];
bannerUrl?: string; bannerUrl?: string;
/**
*
*/
emojis?: {
/**
* (: thinking_ai)
*/
name: string;
/**
*
*/
aliases?: string[];
/**
* URL
*/
url: string;
}[];
}; };

View File

@ -18,13 +18,6 @@ export const meta = {
} }
}, },
emojis: {
validator: $.arr($.obj()).optional,
desc: {
'ja-JP': 'カスタム絵文字定義'
}
},
disableRegistration: { disableRegistration: {
validator: $.bool.optional.nullable, validator: $.bool.optional.nullable,
desc: { desc: {
@ -62,10 +55,6 @@ export default define(meta, (ps) => new Promise(async (res, rej) => {
set.broadcasts = ps.broadcasts; set.broadcasts = ps.broadcasts;
} }
if (ps.emojis) {
set.emojis = ps.emojis;
}
if (typeof ps.disableRegistration === 'boolean') { if (typeof ps.disableRegistration === 'boolean') {
set.disableRegistration = ps.disableRegistration; set.disableRegistration = ps.disableRegistration;
} }

View File

@ -2,7 +2,6 @@ import $ from 'cafy';
import * as os from 'os'; import * as os from 'os';
import config from '../../../config'; import config from '../../../config';
import Meta from '../../../models/meta'; import Meta from '../../../models/meta';
import Emoji from '../../../models/emoji';
import define from '../define'; import define from '../define';
const pkg = require('../../../../package.json'); const pkg = require('../../../../package.json');
@ -29,8 +28,6 @@ export const meta = {
export default define(meta, (ps, me) => new Promise(async (res, rej) => { export default define(meta, (ps, me) => new Promise(async (res, rej) => {
const met: any = (await Meta.findOne()) || {}; const met: any = (await Meta.findOne()) || {};
const emojis = await Emoji.find({ host: null });
res({ res({
maintainer: config.maintainer, maintainer: config.maintainer,
@ -59,7 +56,6 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
hidedTags: (me && me.isAdmin) ? met.hidedTags : undefined, hidedTags: (me && me.isAdmin) ? met.hidedTags : undefined,
bannerUrl: met.bannerUrl, bannerUrl: met.bannerUrl,
maxNoteTextLength: config.maxNoteTextLength, maxNoteTextLength: config.maxNoteTextLength,
emojis: emojis,
features: ps.detail ? { features: ps.detail ? {
registration: !met.disableRegistration, registration: !met.disableRegistration,