logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe git clone https://hacktivis.me/git/pleroma-fe.git
commit: 5970ddf9ac5ed7b7a855ed4c025a2f5f62e256fa
parent 20ce6468520e76b0fb2931a5fac368157d950b1d
Author: Henry Jameson <me@hjkos.com>
Date:   Mon,  7 Jun 2021 12:22:15 +0300

fix escaped apostrophes

Diffstat:

Msrc/components/rich_content/rich_content.jsx9+++------
1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/components/rich_content/rich_content.jsx b/src/components/rich_content/rich_content.jsx @@ -1,9 +1,6 @@ import Vue from 'vue' -import { mapGetters } from 'vuex' -import { processHtml } from 'src/services/tiny_post_html_processor/tiny_post_html_processor.service.js' +import { unescape } from 'lodash' import { convertHtml, getTagName, processTextForEmoji, getAttrs } from 'src/services/mini_html_converter/mini_html_converter.service.js' -import { mentionMatchesUrl, extractTagFromUrl } from 'src/services/matcher/matcher.service.js' -import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator' import StillImage from 'src/components/still-image/still-image.vue' import './rich_content.scss' @@ -29,7 +26,7 @@ export default Vue.component('RichContent', { if (typeof item === 'string') { if (item.includes(':')) { return processTextForEmoji( - item, + unescape(item), this.emoji, ({ shortcode, url }) => { return <StillImage @@ -41,7 +38,7 @@ export default Vue.component('RichContent', { } ) } else { - return item + return unescape(item) } } if (Array.isArray(item)) {