hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/develop' into shigusegubu

Browse source 
* origin/develop:
  entity_normalizer: Escape name when parsing user
This commit is contained in:
Henry Jameson 2021-11-16 19:49:37 +02:00
commit 67efa635c5
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/settings_modal/tabs/profile_tab.js
View file

@ -24,7 +24,7 @@ library.add(
const ProfileTab = {
data () {
return {
newName: this.$store.state.users.currentUser.name,
newName: this.$store.state.users.currentUser.name_unescaped,
newBio: unescape(this.$store.state.users.currentUser.description),
newLocked: this.$store.state.users.currentUser.locked,
newNoRichText: this.$store.state.users.currentUser.no_rich_text,

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

@ -55,8 +55,9 @@ export const parseUser = (data) => {
}
output.emoji = data.emojis
output.name = data.display_name
output.name_html = escape(data.display_name)
output.name = escape(data.display_name)
output.name_html = output.name
output.name_unescaped = data.display_name
output.description = data.note
// TODO cleanup this shit, output.description is overriden with source data