diff options
| author | abcang <abcang1015@gmail.com> | 2017-04-16 23:33:38 +0900 |
|---|---|---|
| committer | Eugen <eugen@zeonfederated.com> | 2017-04-16 16:33:38 +0200 |
| commit | 90760eae4c044817728859e1adf6f57930d83b98 (patch) | |
| tree | 9e5d23fdf45621528fa602b3d708168cdbc9f816 /app/assets | |
| parent | fc34e0e19145f0f681f19e003060f3aa4ef122d4 (diff) | |
fix regex filter (#1845)
* fix regex filter * fixed br to linebreak and, stlip tags. * change to send raw content * changed to unescape in reducer
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/components/features/ui/containers/status_list_container.jsx | 6 | ||||
| -rw-r--r-- | app/assets/javascripts/components/reducers/statuses.jsx | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/app/assets/javascripts/components/features/ui/containers/status_list_container.jsx b/app/assets/javascripts/components/features/ui/containers/status_list_container.jsx index f249240d8..4c33f2b61 100644 --- a/app/assets/javascripts/components/features/ui/containers/status_list_container.jsx +++ b/app/assets/javascripts/components/features/ui/containers/status_list_container.jsx @@ -24,8 +24,10 @@ const makeGetStatusIds = () => createSelector([ if (columnSettings.getIn(['regex', 'body'], '').trim().length > 0) { try { - const regex = new RegExp(columnSettings.getIn(['regex', 'body']).trim(), 'i'); - showStatus = showStatus && !regex.test(statusForId.get('reblog') ? statuses.getIn([statusForId.get('reblog'), 'content']) : statusForId.get('content')); + if (showStatus) { + const regex = new RegExp(columnSettings.getIn(['regex', 'body']).trim(), 'i'); + showStatus = !regex.test(statusForId.get('reblog') ? statuses.getIn([statusForId.get('reblog'), 'unescaped_content']) : statusForId.get('unescaped_content')); + } } catch(e) { // Bad regex, don't affect filters } diff --git a/app/assets/javascripts/components/reducers/statuses.jsx b/app/assets/javascripts/components/reducers/statuses.jsx index ca8fa7a01..2002d2223 100644 --- a/app/assets/javascripts/components/reducers/statuses.jsx +++ b/app/assets/javascripts/components/reducers/statuses.jsx @@ -48,6 +48,9 @@ const normalizeStatus = (state, status) => { normalStatus.reblog = status.reblog.id; } + const linebreakComplemented = status.content.replace(/<br \/>/g, '\n').replace(/<\/p><p>/g, '\n\n'); + normalStatus.unescaped_content = new DOMParser().parseFromString(linebreakComplemented, 'text/html').documentElement.textContent; + return state.update(status.id, Immutable.Map(), map => map.mergeDeep(Immutable.fromJS(normalStatus))); }; |