mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Glitch] Fallback to previous, more approximative hashtag RE on older browsers 

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
pull/1397/head
Thibaut Girka 2020-08-04 21:22:05 +02:00 committed by ThibG
parent 13501f7393
commit a3806ec6ba
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/javascript/flavours/glitch/features/compose/containers/warning_container.js
View File

@ -6,10 +6,12 @@ import { FormattedMessage } from 'react-intl';
import { me } from 'flavours/glitch/util/initial_state'; import { me } from 'flavours/glitch/util/initial_state';
import { profileLink, termsLink } from 'flavours/glitch/util/backend_links'; import { profileLink, termsLink } from 'flavours/glitch/util/backend_links';
const buildHashtagRE = () => {
try {
const HASHTAG_SEPARATORS = "_\\u00b7\\u200c"; const HASHTAG_SEPARATORS = "_\\u00b7\\u200c";
const ALPHA = '\\p{L}\\p{M}'; const ALPHA = '\\p{L}\\p{M}';
const WORD = '\\p{L}\\p{M}\\p{N}\\p{Pc}'; const WORD = '\\p{L}\\p{M}\\p{N}\\p{Pc}';
const APPROX_HASHTAG_RE = new RegExp( return new RegExp(
'(?:^|[^\\/\\)\\w])#((' + '(?:^|[^\\/\\)\\w])#((' +
'[' + WORD + '_]' + '[' + WORD + '_]' +
'[' + WORD + HASHTAG_SEPARATORS + ']*' + '[' + WORD + HASHTAG_SEPARATORS + ']*' +
@ -22,6 +24,12 @@ const APPROX_HASHTAG_RE = new RegExp(
'[' + WORD + '_]*' + '[' + WORD + '_]*' +
'))', 'iu' '))', 'iu'
); );
} catch {
return /(?:^|[^\/\)\w])#(\w*[a-zA-Z·]\w*)/i;
}
};
const APPROX_HASHTAG_RE = buildHashtagRE();
const mapStateToProps = state => ({ const mapStateToProps = state => ({
needsLockWarning: state.getIn(['compose', 'privacy']) === 'private' && !state.getIn(['accounts', me, 'locked']), needsLockWarning: state.getIn(['compose', 'privacy']) === 'private' && !state.getIn(['accounts', me, 'locked']),