monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Preserve hashtags in threaded mode (fixes #584)

This commit is contained in:
Thibaut Girka 2018-07-23 18:35:17 +02:00 committed by ThibG
parent 28a59e4e80
commit 93d4e9a58d
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/javascript/flavours/glitch/reducers/compose.js
View File

@ -113,6 +113,12 @@ function apiStatusToTextMentions (state, status) {
)).join(''); )).join('');
} }
function apiStatusToTextHashtags (state, status) {
return ImmutableOrderedSet([]).union(status.tags.map(
({ name }) => `#${name} `
)).join('');
}
function clearAll(state) { function clearAll(state) {
return state.withMutations(map => { return state.withMutations(map => {
map.set('text', ''); map.set('text', '');
@ -133,7 +139,9 @@ function clearAll(state) {
function continueThread (state, status) { function continueThread (state, status) {
return state.withMutations(function (map) { return state.withMutations(function (map) {
map.set('text', apiStatusToTextMentions(state, status)); let text = apiStatusToTextMentions(state, status);
text = text + apiStatusToTextHashtags(state, status);
map.set('text', text);
if (status.spoiler_text) { if (status.spoiler_text) {
map.set('spoiler', true); map.set('spoiler', true);
map.set('spoiler_text', status.spoiler_text); map.set('spoiler_text', status.spoiler_text);