Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts: # packages/frontend/src/components/MkAbuseReport.vue
This commit is contained in:
commit
cc69717f0d
28 changed files with 163 additions and 6 deletions
|
|
@ -93,9 +93,11 @@ export class Autocomplete {
|
|||
return;
|
||||
}
|
||||
|
||||
const afterLastMfmParam = text.split(/\$\[[a-zA-Z]+/).pop();
|
||||
|
||||
const isMention = mentionIndex !== -1;
|
||||
const isHashtag = hashtagIndex !== -1;
|
||||
const isMfmParam = mfmParamIndex !== -1 && text.split(/\$\[[a-zA-Z]+/).pop()?.includes('.');
|
||||
const isMfmParam = mfmParamIndex !== -1 && afterLastMfmParam?.includes('.') && !afterLastMfmParam?.includes(' ');
|
||||
const isMfmTag = mfmTagIndex !== -1 && !isMfmParam;
|
||||
const isEmoji = emojiIndex !== -1 && text.split(/:[a-z0-9_+\-]+:/).pop()!.includes(':');
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue