summaryrefslogtreecommitdiff
path: root/src/remote/activitypub/models/note.ts
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2019-01-31 20:42:45 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-01-31 20:42:45 +0900
commita6e7bbc306a93bd56bb1941e29d6fc474c9c36d5 (patch)
tree4ec964d4d2efc3b1c5ec82c097c6d3667c17c30f /src/remote/activitypub/models/note.ts
parentUpdate @types/koa-router requirement from 7.0.38 to 7.0.39 (#4052) (diff)
downloadsharkey-a6e7bbc306a93bd56bb1941e29d6fc474c9c36d5.tar.gz
sharkey-a6e7bbc306a93bd56bb1941e29d6fc474c9c36d5.tar.bz2
sharkey-a6e7bbc306a93bd56bb1941e29d6fc474c9c36d5.zip
send/receive user hashtags via AP (#4064)
Diffstat (limited to 'src/remote/activitypub/models/note.ts')
-rw-r--r--src/remote/activitypub/models/note.ts13
1 files changed, 1 insertions, 12 deletions
diff --git a/src/remote/activitypub/models/note.ts b/src/remote/activitypub/models/note.ts
index 0f2e515260..1b61435aa2 100644
--- a/src/remote/activitypub/models/note.ts
+++ b/src/remote/activitypub/models/note.ts
@@ -11,7 +11,7 @@ import { resolveImage } from './image';
import { IRemoteUser, IUser } from '../../../models/user';
import { fromHtml } from '../../../mfm/fromHtml';
import Emoji, { IEmoji } from '../../../models/emoji';
-import { ITag } from './tag';
+import { ITag, extractHashtags } from './tag';
import { toUnicode } from 'punycode';
import { unique, concat, difference } from '../../../prelude/array';
import { extractPollFromQuestion } from './question';
@@ -239,14 +239,3 @@ async function extractMentionedUsers(actor: IRemoteUser, to: string[], cc: strin
return users.filter(x => x != null);
}
-
-function extractHashtags(tags: ITag[]) {
- if (!tags) return [];
-
- const hashtags = tags.filter(tag => tag.type === 'Hashtag' && typeof tag.name == 'string');
-
- return hashtags.map(tag => {
- const m = tag.name.match(/^#(.+)/);
- return m ? m[1] : null;
- }).filter(x => x != null);
-}