From 2aafa5b4e7a83ce8195cd739f1233a52ab060db7 Mon Sep 17 00:00:00 2001
From: David Sterry <davesterry@gmail.com>
Date: Wed, 15 Dec 2021 14:47:19 -0800
Subject: [PATCH] ignore hashtag suggestions if they vary only in case (#16460)
* ignore hashtag suggestions if they vary only in case
* remove console.logs and unused args
* consistently add space when dismissing suggestions
* linting
---
app/javascript/mastodon/actions/compose.js | 27 +++++++++++++++------
app/javascript/mastodon/reducers/compose.js | 14 +++++++++++
2 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js
index 4ffdf75d9d..9b37085cb3 100644
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@ -37,6 +37,7 @@ export const THUMBNAIL_UPLOAD_PROGRESS = 'THUMBNAIL_UPLOAD_PROGRESS';
export const COMPOSE_SUGGESTIONS_CLEAR = 'COMPOSE_SUGGESTIONS_CLEAR';
export const COMPOSE_SUGGESTIONS_READY = 'COMPOSE_SUGGESTIONS_READY';
export const COMPOSE_SUGGESTION_SELECT = 'COMPOSE_SUGGESTION_SELECT';
+export const COMPOSE_SUGGESTION_IGNORE = 'COMPOSE_SUGGESTION_IGNORE';
export const COMPOSE_SUGGESTION_TAGS_UPDATE = 'COMPOSE_SUGGESTION_TAGS_UPDATE';
export const COMPOSE_TAG_HISTORY_UPDATE = 'COMPOSE_TAG_HISTORY_UPDATE';
@@ -534,13 +535,25 @@ export function selectComposeSuggestion(position, token, suggestion, path) {
startPosition = position;
}
- dispatch({
- type: COMPOSE_SUGGESTION_SELECT,
- position: startPosition,
- token,
- completion,
- path,
- });
+ // 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
+ // the suggestions are dismissed and the cursor moves forward.
+ if (suggestion.type !== 'hashtag' || token.slice(1).localeCompare(suggestion.name, undefined, { sensitivity: 'accent' }) !== 0) {
+ dispatch({
+ type: COMPOSE_SUGGESTION_SELECT,
+ position: startPosition,
+ token,
+ completion,
+ path,
+ });
+ } else {
+ dispatch({
+ type: COMPOSE_SUGGESTION_IGNORE,
+ position: startPosition,
+ token,
+ completion,
+ path,
+ });
+ }
};
};
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index 34c7c4deaa..06a908e9d4 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -21,6 +21,7 @@ import {
COMPOSE_SUGGESTIONS_CLEAR,
COMPOSE_SUGGESTIONS_READY,
COMPOSE_SUGGESTION_SELECT,
+ COMPOSE_SUGGESTION_IGNORE,
COMPOSE_SUGGESTION_TAGS_UPDATE,
COMPOSE_TAG_HISTORY_UPDATE,
COMPOSE_SENSITIVITY_CHANGE,
@@ -165,6 +166,17 @@ const insertSuggestion = (state, position, token, completion, path) => {
});
};
+const ignoreSuggestion = (state, position, token, completion, path) => {
+ return state.withMutations(map => {
+ map.updateIn(path, oldText => `${oldText.slice(0, position + token.length)} ${oldText.slice(position + token.length)}`);
+ map.set('suggestion_token', null);
+ map.set('suggestions', ImmutableList());
+ map.set('focusDate', new Date());
+ map.set('caretPosition', position + token.length + 1);
+ map.set('idempotencyKey', uuid());
+ });
+};
+
const sortHashtagsByUse = (state, tags) => {
const personalHistory = state.get('tagHistory');
@@ -398,6 +410,8 @@ export default function compose(state = initialState, action) {
return state.set('suggestions', ImmutableList(normalizeSuggestions(state, action))).set('suggestion_token', action.token);
case COMPOSE_SUGGESTION_SELECT:
return insertSuggestion(state, action.position, action.token, action.completion, action.path);
+ case COMPOSE_SUGGESTION_IGNORE:
+ return ignoreSuggestion(state, action.position, action.token, action.completion, action.path);
case COMPOSE_SUGGESTION_TAGS_UPDATE:
return updateSuggestionTags(state, action.token);
case COMPOSE_TAG_HISTORY_UPDATE:
--
GitLab