From 62f019252a4bfc7b09432e85e536c5f4dfcf369e Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 6 Mar 2025 11:00:33 +0100
Subject: [PATCH] Change hashtag suggestion to prefer personal history
capitalization (#34070)
---
app/javascript/mastodon/reducers/compose.js | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index 4e16c5b35..bfa2ec6a0 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -254,12 +254,26 @@ const expiresInFromExpiresAt = expires_at => {
const mergeLocalHashtagResults = (suggestions, prefix, tagHistory) => {
prefix = prefix.toLowerCase();
+
if (suggestions.length < 4) {
const localTags = tagHistory.filter(tag => tag.toLowerCase().startsWith(prefix) && !suggestions.some(suggestion => suggestion.type === 'hashtag' && suggestion.name.toLowerCase() === tag.toLowerCase()));
- return suggestions.concat(localTags.slice(0, 4 - suggestions.length).toJS().map(tag => ({ type: 'hashtag', name: tag })));
- } else {
- return suggestions;
+ suggestions = suggestions.concat(localTags.slice(0, 4 - suggestions.length).toJS().map(tag => ({ type: 'hashtag', name: tag })));
}
+
+ // Prefer capitalization from personal history, unless personal history is all lower-case
+ const fixSuggestionCapitalization = (suggestion) => {
+ if (suggestion.type !== 'hashtag')
+ return suggestion;
+
+ const tagFromHistory = tagHistory.find((tag) => tag.localeCompare(suggestion.name, undefined, { sensitivity: 'accent' }) === 0);
+
+ if (!tagFromHistory || tagFromHistory.toLowerCase() === tagFromHistory)
+ return suggestion;
+
+ return { ...suggestion, name: tagFromHistory };
+ };
+
+ return suggestions.map(fixSuggestionCapitalization);
};
const normalizeSuggestions = (state, { accounts, emojis, tags, token }) => {