mirror/cherrypick
1
1
Fork 0
mirror of https://github.com/kokonect-link/cherrypick synced 2024-12-02 00:38:25 +09:00
Code

Merge branch 'develop' of https://github.com/syuilo/misskey into develop

Browse Source
This commit is contained in:
syuilo 2018-11-09 14:15:52 +09:00
commit 5b4205bdbc
No known key found for this signature in database
GPG Key ID: BDC4C49D06AB9D69
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/prelude/array.ts
View File

@ -18,8 +18,12 @@ export function erase<T>(x: T, xs: T[]): T[] {
return xs.filter(y => x !== y);
}
export function setDifference<T>(xs: T[], ys: T[]): T[] {
return xs.filter(x => !ys.includes(x));
/**
* Finds the array of all elements in the first array not contained in the second array.
* The order of result values are determined by the first array.
*/
export function difference<T>(includes: T[], excludes: T[]): T[] {
return includes.filter(x => !excludes.includes(x));
}
export function unique<T>(xs: T[]): T[] {

4
src/remote/activitypub/models/note.ts
View File

@ -13,7 +13,7 @@ import htmlToMFM from '../../../mfm/html-to-mfm';
import Emoji from '../../../models/emoji';
import { ITag } from './tag';
import { toUnicode } from 'punycode';
import { unique, concat, setDifference } from '../../../prelude/array';
import { unique, concat, difference } from '../../../prelude/array';
const log = debug('misskey:activitypub');
@ -181,7 +181,7 @@ async function extractEmojis(tags: ITag[], host_: string) {
async function extractMentionedUsers(actor: IRemoteUser, to: string[], cc: string[], resolver: Resolver) {
const ignoreUris = ['https://www.w3.org/ns/activitystreams#Public', `${actor.uri}/followers`];
const uris = setDifference(unique(concat([to || [], cc || []])), ignoreUris);
const uris = difference(unique(concat([to || [], cc || []])), ignoreUris);
const users = await Promise.all(
uris.map(async uri => await resolvePerson(uri, null, resolver).catch(() => null))