ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Preserve hashtag casing in web UI hashtag history (#8394) 

Fix #8241
rebase/4.0.0rc2
Eugen Rochko 2018-08-23 21:21:15 +02:00 committed by GitHub
parent 248df68c36
commit f9b23a5d62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/javascript/mastodon/actions/compose.js
View File

@ -130,7 +130,7 @@ export function submitCompose() {
'Idempotency-Key': getState().getIn(['compose', 'idempotencyKey']), 'Idempotency-Key': getState().getIn(['compose', 'idempotencyKey']),
}, },
}).then(function (response) { }).then(function (response) {
dispatch(insertIntoTagHistory(response.data.tags)); dispatch(insertIntoTagHistory(response.data.tags, status));
dispatch(submitComposeSuccess({ ...response.data })); dispatch(submitComposeSuccess({ ...response.data }));
// To make the app more responsive, immediately get the status into the columns // To make the app more responsive, immediately get the status into the columns
@ -390,13 +390,13 @@ export function hydrateCompose() {
}; };
} }
function insertIntoTagHistory(tags) { function insertIntoTagHistory(recognizedTags, text) {
return (dispatch, getState) => { return (dispatch, getState) => {
const state = getState(); const state = getState();
const oldHistory = state.getIn(['compose', 'tagHistory']); const oldHistory = state.getIn(['compose', 'tagHistory']);
const me = state.getIn(['meta', 'me']); const me = state.getIn(['meta', 'me']);
const names = tags.map(({ name }) => name); const names = recognizedTags.map(tag => text.match(new RegExp(`#${tag.name}`, 'i'))[0].slice(1));
const intersectedOldHistory = oldHistory.filter(name => !names.includes(name)); const intersectedOldHistory = oldHistory.filter(name => names.findIndex(newName => newName.toLowerCase() === name.toLowerCase()) === -1);
names.push(...intersectedOldHistory.toJS()); names.push(...intersectedOldHistory.toJS());

2
app/javascript/mastodon/reducers/compose.js
View File

@ -131,7 +131,7 @@ const updateSuggestionTags = (state, token) => {
return state.merge({ return state.merge({
suggestions: state.get('tagHistory') suggestions: state.get('tagHistory')
.filter(tag => tag.startsWith(prefix)) .filter(tag => tag.toLowerCase().startsWith(prefix.toLowerCase()))
.slice(0, 4) .slice(0, 4)
.map(tag => '#' + tag), .map(tag => '#' + tag),
suggestion_token: token, suggestion_token: token,