From ff0a05a2d67f45ec9ff06d50c5be821d559c2528 Mon Sep 17 00:00:00 2001 From: Aya Morisawa Date: Fri, 7 Sep 2018 00:10:03 +0900 Subject: [PATCH] Add unique function (#2644) --- src/prelude/array.ts | 4 ++++ src/services/note/create.ts | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/prelude/array.ts b/src/prelude/array.ts index a2a6bbd4c..abef6ca03 100644 --- a/src/prelude/array.ts +++ b/src/prelude/array.ts @@ -17,3 +17,7 @@ export function intersperse(sep: T, xs: T[]): T[] { export function erase(x: T, xs: T[]): T[] { return xs.filter(y => x !== y); } + +export function unique(xs: T[]): T[] { + return [...new Set(xs)]; +} diff --git a/src/services/note/create.ts b/src/services/note/create.ts index 4759497c6..c08836c94 100644 --- a/src/services/note/create.ts +++ b/src/services/note/create.ts @@ -24,7 +24,7 @@ import isQuote from '../../misc/is-quote'; import { TextElementMention } from '../../mfm/parse/elements/mention'; import { TextElementHashtag } from '../../mfm/parse/elements/hashtag'; import { updateNoteStats } from '../update-chart'; -import { erase } from '../../prelude/array'; +import { erase, unique } from '../../prelude/array'; type NotificationType = 'reply' | 'renote' | 'quote' | 'mention'; @@ -385,7 +385,7 @@ function extractHashtags(tokens: ReturnType): string[] { .map(t => (t as TextElementHashtag).hashtag) .filter(tag => tag.length <= 100); - return [...new Set(hashtags)]; + return unique(hashtags); } function index(note: INote) { @@ -542,12 +542,12 @@ function incNotesCount(user: IUser) { async function extractMentionedUsers(tokens: ReturnType): Promise { if (tokens == null) return []; - const mentionTokens = [...new Set( + const mentionTokens = unique( tokens .filter(t => t.type == 'mention') as TextElementMention[] - )]; + ); - const mentionedUsers = [...new Set( + const mentionedUsers = unique( erase(null, await Promise.all(mentionTokens.map(async m => { try { return await resolveUser(m.username, m.host); @@ -555,7 +555,7 @@ async function extractMentionedUsers(tokens: ReturnType): Promise< return null; } }))) - )]; + ); return mentionedUsers; }