Skip to content

Fix HTML entities not decoded in comment just added #35054

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Pytal merged 3 commits into from
Nov 10, 2022
Merged

Fix HTML entities not decoded in comment just added #35054

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
924c090
Extract "decodeHtmlEntities" function to its own file
danxuliu Nov 7, 2022
5442f8e
Fix HTML entities not decoded in comment just added
danxuliu Nov 7, 2022
99b1d00
Compile assets
nextcloud-command Nov 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix HTML entities not decoded in comment just added 
The XML data received from the comments endpoint has an inconsistent
encoding; some entities are encoded once and others are encoded twice.
When the comment list is loaded the comments are fetched using
GetComments, which handles all that, and therefore shows the messages
and author names as expected.

However, when a new comment is posted the list is not got again; instead
the new comment is loaded from the comment data returned after posting
it. This is done in NewComment, which did not decode the messages nor
the author names, and therefore showed, for example, "&" instead of
"&".

To solve that now the same decoding logic used in GetComments is applied
too in NewComment.

Signed-off-by: Daniel Calviño Sánchez <[email protected]>
  • Loading branch information
@danxuliu
danxuliu committed Nov 10, 2022
commit 5442f8efd6c9cb2b75ccc077bee9a619084194c7
8 changes: 8 additions & 0 deletions apps/comments/src/services/NewComment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

import { getCurrentUser } from '@nextcloud/auth'
import { getRootPath } from '../utils/davUtils'
import { decodeHtmlEntities } from '../utils/decodeHtmlEntities'
import axios from '@nextcloud/axios'
import client from './DavClient'

Expand Down Expand Up @@ -55,5 +56,12 @@ export default async function(commentsType, ressourceId, message) {
details: true,
})

const props = comment.data.props
// Decode twice to handle potentially double-encoded entities
// FIXME Remove this once https://github.com/nextcloud/server/issues/29306
// is resolved
props.actorDisplayName = decodeHtmlEntities(props.actorDisplayName, 2)
props.message = decodeHtmlEntities(props.message, 2)

return comment.data
}