Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-14 08:19:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Glitch] Fix hashtags not being picked up when full-width hash sign is used

Browse Source 
Port 779a1f8448 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
This commit is contained in:
Eugen Rochko
2025-10-27 18:18:01 +01:00
committed by Claire
parent 48ec31bec8
commit 0565eb62d6
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/javascript/flavours/glitch/actions/compose.js
View File

@@ -653,6 +653,7 @@ export function fetchComposeSuggestions(token) {
fetchComposeSuggestionsEmojis(dispatch, getState, token); fetchComposeSuggestionsEmojis(dispatch, getState, token);
break; break;
case '#': case '#':
case '＃':
fetchComposeSuggestionsTags(dispatch, getState, token); fetchComposeSuggestionsTags(dispatch, getState, token);
break; break;
default: default:
@@ -694,11 +695,11 @@ export function selectComposeSuggestion(position, token, suggestion, path) {
dispatch(useEmoji(suggestion)); dispatch(useEmoji(suggestion));
} else if (suggestion.type === 'hashtag') { } else if (suggestion.type === 'hashtag') {
completion = `#${suggestion.name}`; completion = suggestion.name.slice(token.length - 1);
startPosition = position - 1; startPosition = position + token.length;
} else if (suggestion.type === 'account') { } else if (suggestion.type === 'account') {
completion = getState().getIn(['accounts', suggestion.id, 'acct']); completion = `@${getState().getIn(['accounts', suggestion.id, 'acct'])}`;
startPosition = position; startPosition = position - 1;
} }
// We don't want to replace hashtags that vary only in case due to accessibility, but we need to fire off an event so that // We don't want to replace hashtags that vary only in case due to accessibility, but we need to fire off an event so that

2
app/javascript/flavours/glitch/components/autosuggest_input.jsx
View File

@@ -61,7 +61,7 @@ export default class AutosuggestInput extends ImmutablePureComponent {
static defaultProps = { static defaultProps = {
autoFocus: true, autoFocus: true,
searchTokens: ['@', ':', '#'], searchTokens: ['@', '＠', ':', '#', '＃'],
}; };
state = { state = {

2
app/javascript/flavours/glitch/components/autosuggest_textarea.jsx
View File

@@ -25,7 +25,7 @@ const textAtCursorMatchesToken = (str, caretPosition) => {
word = str.slice(left, right + caretPosition); word = str.slice(left, right + caretPosition);
} }
if (!word || word.trim().length < 3 || ['@', ':', '#'].indexOf(word[0]) === -1) { if (!word || word.trim().length < 3 || ['@', '＠', ':', '#', '＃'].indexOf(word[0]) === -1) {
return [null, null]; return [null, null];
} }

2
app/javascript/flavours/glitch/utils/hashtag.js
View File

@@ -1,6 +1,6 @@
export function recoverHashtags (recognizedTags, text) { 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] : null; return matched_hashtag ? matched_hashtag[1] : null;
}, },