n/nyxmuks
1
0
Fork 0
forked from Mirrors/gomuks
Code Pull requests Activity

web/timeline: fix newlines in plaintext messages

Browse source
This commit is contained in:
Tulir Asokan 2024-10-18 12:56:38 +03:00
parent 8d201642c8
commit 3dd7f9a4bd
4 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkg/hicli/database/event.go
View file

@ -282,6 +282,7 @@ func (m EventRowID) GetMassInsertValues() [1]any {
type LocalContent struct { type LocalContent struct {
SanitizedHTML string `json:"sanitized_html,omitempty"` SanitizedHTML string `json:"sanitized_html,omitempty"`
HTMLVersion int `json:"html_version,omitempty"` HTMLVersion int `json:"html_version,omitempty"`
WasPlaintext bool `json:"was_plaintext,omitempty"`
} }
type Event struct { type Event struct {

10
pkg/hicli/sync.go
View file

@ -344,14 +344,20 @@ func (h *HiClient) calculateLocalContent(ctx context.Context, dbEvt *database.Ev
} }
if content != nil { if content != nil {
var sanitizedHTML string var sanitizedHTML string
if content.Format == event.FormatHTML { var wasPlaintext bool
if content.Format == event.FormatHTML && content.FormattedBody != "" {
sanitizedHTML, _ = sanitizeAndLinkifyHTML(content.FormattedBody) sanitizedHTML, _ = sanitizeAndLinkifyHTML(content.FormattedBody)
} else { } else {
var builder strings.Builder var builder strings.Builder
linkifyAndWriteBytes(&builder, []byte(content.Body)) linkifyAndWriteBytes(&builder, []byte(content.Body))
sanitizedHTML = builder.String() sanitizedHTML = builder.String()
wasPlaintext = true
}
return &database.LocalContent{
SanitizedHTML: sanitizedHTML,
HTMLVersion: CurrentHTMLSanitizerVersion,
WasPlaintext: wasPlaintext,
} }
return &database.LocalContent{SanitizedHTML: sanitizedHTML, HTMLVersion: CurrentHTMLSanitizerVersion}
} }
return nil return nil
} }

2
web/src/api/types/hitypes.ts
View file

@ -79,6 +79,8 @@ export enum UnreadType {
export interface LocalContent { export interface LocalContent {
sanitized_html?: TrustedHTML sanitized_html?: TrustedHTML
html_version?: number
was_plaintext?: boolean
} }
export interface BaseDBEvent { export interface BaseDBEvent {

6
web/src/ui/timeline/content/MessageBody.tsx
View file

@ -31,7 +31,11 @@ const onClickHTML = (evt: React.MouseEvent<HTMLDivElement>) => {
export const TextMessageBody = ({ event }: EventContentProps) => { export const TextMessageBody = ({ event }: EventContentProps) => {
const content = event.content as MessageEventContent const content = event.content as MessageEventContent
if (event.local_content?.sanitized_html) { if (event.local_content?.sanitized_html) {
return <div onClick={onClickHTML} className="message-text html-body" dangerouslySetInnerHTML={{ const classNames = ["message-text", "html-body"]
if (event.local_content.was_plaintext) {
classNames.push("plaintext-body")
}
return <div onClick={onClickHTML} className={classNames.join(" ")} dangerouslySetInnerHTML={{
__html: event.local_content!.sanitized_html!, __html: event.local_content!.sanitized_html!,
}}/> }}/>
} }