summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/remote/activitypub/misc/get-emoji-names.ts6
-rw-r--r--src/remote/activitypub/renderer/note.ts10
2 files changed, 4 insertions, 12 deletions
diff --git a/src/remote/activitypub/misc/get-emoji-names.ts b/src/remote/activitypub/misc/get-emoji-names.ts
deleted file mode 100644
index 7dd634a65e..0000000000
--- a/src/remote/activitypub/misc/get-emoji-names.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import parse from '../../../mfm/parse';
-
-export default function(text: string) {
- if (!text) return [];
- return parse(text).filter(t => t.type === 'emoji' && t.name).map(t => (t as any).name);
-}
diff --git a/src/remote/activitypub/renderer/note.ts b/src/remote/activitypub/renderer/note.ts
index b38d47130a..2b834f9d28 100644
--- a/src/remote/activitypub/renderer/note.ts
+++ b/src/remote/activitypub/renderer/note.ts
@@ -138,12 +138,10 @@ async function getEmojis(names: string[]): Promise<IEmoji[]> {
if (names == null || names.length < 1) return [];
const emojis = await Promise.all(
- names.map(async name => {
- return await Emoji.findOne({
- name,
- host: null
- });
- })
+ names.map(name => Emoji.findOne({
+ name,
+ host: null
+ }))
);
return emojis.filter(emoji => emoji != null);