therwi/sunkkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/develop' into themes-accent

Browse source 
* upstream/develop:
  Fix one click nsfw unhide on videos
  Escape HTML from display name and subject fields
This commit is contained in:
Henry Jameson 2020-02-11 10:03:34 +02:00
commit 786a695eb6
5 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/services/entity_normalizer/entity_normalizer.service.js
View file

@ -1,3 +1,5 @@
import escape from 'escape-html'
const qvitterStatusType = (status) => {
if (status.is_post_verb) {
return 'status'
@ -41,7 +43,7 @@ export const parseUser = (data) => {
}
output.name = data.display_name
output.name_html = addEmojis(data.display_name, data.emojis)
output.name_html = addEmojis(escape(data.display_name), data.emojis)
output.description = data.note
output.description_html = addEmojis(data.note, data.emojis)
@ -256,7 +258,7 @@ export const parseStatus = (data) => {
output.retweeted_status = parseStatus(data.reblog)
}
output.summary_html = addEmojis(data.spoiler_text, data.emojis)
output.summary_html = addEmojis(escape(data.spoiler_text), data.emojis)
output.external_url = data.url
output.poll = data.poll
output.pinned = data.pinned