Refactor

2 files changed, 40 insertions, 5 deletions

diff --git a/src/server/api/mastodon/emoji.ts b/src/server/api/mastodon/emoji.ts
new file mode 100644
index 0000000000..df19c6e758
--- /dev/null
+++ b/src/server/api/mastodon/emoji.ts
@@ -0,0 +1,35 @@
+export type IMastodonEmoji = {
+	shortcode: string,
+	url: string,
+	static_url: string,
+	visible_in_picker: boolean
+};
+
+export async function toMastodonEmojis(emoji: any): Promise<IMastodonEmoji[]> {
+	return [{
+		shortcode: emoji.name,
+		url: emoji.url,
+		static_url: emoji.url, // TODO: Implement ensuring static emoji
+		visible_in_picker: true
+	}, ...(emoji.aliases as string[] || []).map(x => ({
+		shortcode: x,
+		url: emoji.url,
+		static_url: emoji.url,
+		visible_in_picker: true
+	}))];
+}
+
+export function toMisskeyEmojiSync(emoji: IMastodonEmoji) {
+	return {
+		name: emoji.shortcode,
+		url: emoji.url
+	};
+}
+
+export function toMisskeyEmojiWithAliasesSync(emoji: IMastodonEmoji, ...aliases: string[]) {
+	return {
+		name: emoji.shortcode,
+		aliases,
+		url: emoji.url
+	};
+}
diff --git a/src/server/api/mastodon.ts b/src/server/api/mastodon/index.ts
index e08fbc6f57..9e8a6f505f 100644
--- a/src/server/api/mastodon.ts
+++ b/src/server/api/mastodon/index.ts
@@ -1,11 +1,11 @@
 import * as Router from 'koa-router';
-import User from '../../models/user';
+import User from '../../../models/user';
 import { toASCII } from 'punycode';
-import config from '../../config';
-import Meta from '../../models/meta';
+import config from '../../../config';
+import Meta from '../../../models/meta';
 import { ObjectID } from 'bson';
-import Emoji from '../../models/emoji';
-import { toMastodonEmojis } from '../../models/mastodon/emoji';
+import Emoji from '../../../models/emoji';
+import { toMastodonEmojis } from './emoji';
 const pkg = require('../../../package.json');
 
 // Init router