From 26c20a4ec7868753b284670575f28f201a5cef9f Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Fri, 15 Jun 2018 21:31:08 +0200 Subject: [PATCH] [Glitch] Preserve newlines in delete & redraft and desktop notifications Port c75493755f482d0506884b1f7b7b44e5306a4d8b to glitch-soc --- app/javascript/flavours/glitch/reducers/compose.js | 7 ++++--- app/javascript/flavours/glitch/util/html.js | 3 +-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/javascript/flavours/glitch/reducers/compose.js b/app/javascript/flavours/glitch/reducers/compose.js index da75abbe3..a7ce71676 100644 --- a/app/javascript/flavours/glitch/reducers/compose.js +++ b/app/javascript/flavours/glitch/reducers/compose.js @@ -37,6 +37,7 @@ import { Map as ImmutableMap, List as ImmutableList, OrderedSet as ImmutableOrde import uuid from 'flavours/glitch/util/uuid'; import { me } from 'flavours/glitch/util/initial_state'; import { overwrite } from 'flavours/glitch/util/js_helpers'; +import { unescapeHTML } from 'flavours/glitch/util/html'; const totalElefriends = 3; @@ -229,14 +230,14 @@ const hydrate = (state, hydratedState) => { const domParser = new DOMParser(); -const htmlToText = status => { +const expandMentions = status => { const fragment = domParser.parseFromString(status.get('content'), 'text/html').documentElement; status.get('mentions').forEach(mention => { fragment.querySelector(`a[href="${mention.get('url')}"]`).textContent = `@${mention.get('acct')}`; }); - return fragment.textContent; + return fragment.innerHTML; }; export default function compose(state = initialState, action) { @@ -381,7 +382,7 @@ export default function compose(state = initialState, action) { return state.mergeIn(['doodle'], action.options); case REDRAFT: return state.withMutations(map => { - map.set('text', htmlToText(action.status)); + map.set('text', unescapeHTML(expandMentions(action.status))); map.set('in_reply_to', action.status.get('in_reply_to_id')); map.set('privacy', action.status.get('visibility')); map.set('media_attachments', action.status.get('media_attachments')); diff --git a/app/javascript/flavours/glitch/util/html.js b/app/javascript/flavours/glitch/util/html.js index 0b646ce58..5159df9db 100644 --- a/app/javascript/flavours/glitch/util/html.js +++ b/app/javascript/flavours/glitch/util/html.js @@ -1,6 +1,5 @@ export const unescapeHTML = (html) => { const wrapper = document.createElement('div'); - html = html.replace(/
|
|\n/g, ' '); - wrapper.innerHTML = html; + wrapper.innerHTML = html.replace(//g, '\n').replace(/<\/p>

/g, '\n\n').replace(/<[^>]*>/g, ''); return wrapper.textContent; };