luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-02 21:14:47 +00:00
Code Issues Projects Releases Wiki Activity

Fix hashtag processing when sending toots

Browse source 
This fixes crashes in pleroma when writing toots with a content warning,
since pleroma inserts a “nsfw” hashtag that isn't part of the toot's text.
This commit is contained in:
Thibaut Girka 2019-02-01 11:41:34 +01:00 committed by ThibG
parent 48d00ac0d9
commit 762e4fdf55
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/flavours/glitch/util/hashtag.js
View file

@ -2,7 +2,7 @@ export function recoverHashtags (recognizedTags, text) {
return recognizedTags.map(tag => { return recognizedTags.map(tag => {
const re = new RegExp(`(?:^|[^\/\)\w])#(${tag.name})`, 'i'); const re = new RegExp(`(?:^|[^\/\)\w])#(${tag.name})`, 'i');
const matched_hashtag = text.match(re); const matched_hashtag = text.match(re);
return matched_hashtag ? matched_hashtag[1] : tag; return matched_hashtag ? matched_hashtag[1] : null;
} }
); ).filter(x => x !== null);
} }