graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-12-23 13:53:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

refactor mfm extract (#7434)

Browse source 
* refactor extractCustomEmojisFromMfm()

* refactor extract-hashtags

* refactor extract-mentions

* refactor extract-hashtags

* refactor extract-url-from-mfm

* refactor extract-mentions
This commit is contained in:
marihachi 2021-04-10 17:50:18 +09:00 committed by GitHub
parent 56a28923ca
commit 3a6331693a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 34 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/client/components/post-form.vue
View file

@ -61,7 +61,7 @@ import XNotePreview from './note-preview.vue';
import * as mfm from 'mfm-js';
import { host, url } from '@client/config';
import { erase, unique } from '../../prelude/array';
import extractMentions from '@/misc/extract-mentions';
import { extractMentions } from '@/misc/extract-mentions';
import getAcct from '@/misc/acct/render';
import { formatTimeString } from '@/misc/format-time-string';
import { Autocomplete } from '@client/scripts/autocomplete';

2
src/client/ui/chat/post-form.vue
View file

@ -56,7 +56,7 @@ import { toASCII } from 'punycode/';
import * as mfm from 'mfm-js';
import { host, url } from '@client/config';
import { erase, unique } from '../../../prelude/array';
import extractMentions from '@/misc/extract-mentions';
import { extractMentions } from '@/misc/extract-mentions';
import getAcct from '@/misc/acct/render';
import { formatTimeString } from '@/misc/format-time-string';
import { Autocomplete } from '@client/scripts/autocomplete';

14
src/misc/extract-custom-emojis-from-mfm.ts
View file

@ -2,17 +2,13 @@ import * as mfm from 'mfm-js';
import { unique } from '@/prelude/array';
export function extractCustomEmojisFromMfm(nodes: mfm.MfmNode[]): string[] {
const emojiNodes = [] as mfm.MfmEmojiCode[];
const emojis = [] as string[];
function scan(nodes: mfm.MfmNode[]) {
for (const node of nodes) {
if (node.type === 'emojiCode') emojiNodes.push(node);
else if (node.children) scan(node.children);
mfm.inspect(nodes, (node) => {
if (node.type === 'emojiCode' && node.props.name.length <= 100) {
emojis.push(node.props.name);
}
}
});
scan(nodes);
const emojis = emojiNodes.filter(x => x.props.name.length <= 100).map(x => x.props.name!);
return unique(emojis);
}

16
src/misc/extract-hashtags.ts
View file

@ -1,18 +1,14 @@
import * as mfm from 'mfm-js';
import { unique } from '@/prelude/array';
export default function(nodes: mfm.MfmNode[]): string[] {
const hashtagNodes = [] as mfm.MfmHashtag[];
export function extractHashtags(nodes: mfm.MfmNode[]): string[] {
const hashtags = [] as string[];
function scan(nodes: mfm.MfmNode[]) {
for (const node of nodes) {
if (node.type === 'hashtag') hashtagNodes.push(node);
else if (node.children) scan(node.children);
mfm.inspect(nodes, (node) => {
if (node.type === 'hashtag') {
hashtags.push(node.props.hashtag);
}
}
});
scan(nodes);
const hashtags = hashtagNodes.map(x => x.props.hashtag);
return unique(hashtags);
}

17
src/misc/extract-mentions.ts
View file

@ -2,18 +2,15 @@
import * as mfm from 'mfm-js';
export default function(nodes: mfm.MfmNode[]): mfm.MfmMention['props'][] {
export function extractMentions(nodes: mfm.MfmNode[]): mfm.MfmMention['props'][] {
// TODO: 重複を削除
const mentionNodes = [] as mfm.MfmMention[];
const mentions = [] as mfm.MfmMention['props'][];
function scan(nodes: mfm.MfmNode[]) {
for (const node of nodes) {
if (node.type === 'mention') mentionNodes.push(node);
else if (node.children) scan(node.children);
mfm.inspect(nodes, (node) => {
if (node.type === 'mention') {
mentions.push(node.props);
}
}
});
scan(nodes);
return mentionNodes.map(x => x.props);
return mentions;
}

28
src/misc/extract-url-from-mfm.ts
View file

@ -6,29 +6,21 @@ import { unique } from '@/prelude/array';
const removeHash = (x: string) => x.replace(/#[^#]*$/, '');
export function extractUrlFromMfm(nodes: mfm.MfmNode[], respectSilentFlag = true): string[] {
const urlNodes = [] as (mfm.MfmUrl | mfm.MfmLink)[];
let urls = [] as string[];
function scan(nodes: mfm.MfmNode[]) {
for (const node of nodes) {
if (node.type === 'url') {
urlNodes.push(node);
} else if (node.type === 'link') {
if (!respectSilentFlag || !node.props.silent) {
urlNodes.push(node);
}
} else if (node.children) {
scan(node.children);
}
mfm.inspect(nodes, (node) => {
if (node.type === 'url') {
urls.push(node.props.url);
} else if (node.type === 'link' && (!respectSilentFlag || !node.props.silent)) {
urls.push(node.props.url);
}
}
});
scan(nodes);
const urls = unique(urlNodes.map(x => x.props.url));
urls = unique(urls);
return urls.reduce((array, url) => {
const removed = removeHash(url);
if (!array.map(x => removeHash(x)).includes(removed)) array.push(url);
const urlWithoutHash = removeHash(url);
if (!array.map(x => removeHash(x)).includes(urlWithoutHash)) array.push(url);
return array;
}, [] as string[]);
}

2
src/server/api/endpoints/i/update.ts
View file

@ -6,7 +6,7 @@ import acceptAllFollowRequests from '../../../../services/following/requests/acc
import { publishToFollowers } from '../../../../services/i/update';
import define from '../../define';
import { extractCustomEmojisFromMfm } from '@/misc/extract-custom-emojis-from-mfm';
import extractHashtags from '@/misc/extract-hashtags';
import { extractHashtags } from '@/misc/extract-hashtags';
import * as langmap from 'langmap';
import { updateUsertags } from '../../../../services/update-hashtag';
import { ApiError } from '../../error';

4
src/services/note/create.ts
View file

@ -12,9 +12,9 @@ import { updateHashtags } from '../update-hashtag';
import { concat } from '../../prelude/array';
import insertNoteUnread from './unread';
import { registerOrFetchInstanceDoc } from '../register-or-fetch-instance-doc';
import extractMentions from '@/misc/extract-mentions';
import { extractMentions } from '@/misc/extract-mentions';
import { extractCustomEmojisFromMfm } from '@/misc/extract-custom-emojis-from-mfm';
import extractHashtags from '@/misc/extract-hashtags';
import { extractHashtags } from '@/misc/extract-hashtags';
import { Note, IMentionedRemoteUsers } from '../../models/entities/note';
import { Mutings, Users, NoteWatchings, Notes, Instances, UserProfiles, Antennas, Followings, MutedNotes, Channels, ChannelFollowings } from '../../models';
import { DriveFile } from '../../models/entities/drive-file';

2
test/extract-mentions.ts
View file

@ -1,6 +1,6 @@
import * as assert from 'assert';
import extractMentions from '../src/misc/extract-mentions';
import { extractMentions } from '../src/misc/extract-mentions';
import { parse } from 'mfm-js';
describe('Extract mentions', () => {