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

web/timeline: add big emojis

Browse source
This commit is contained in:
Tulir Asokan 2024-10-27 18:40:43 +02:00
parent fdec12a7a3
commit 976d1ae9cb
7 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
go.mod
View file

@ -16,7 +16,7 @@ require (
github.com/tidwall/gjson v1.18.0 github.com/tidwall/gjson v1.18.0
github.com/tidwall/sjson v1.2.5 github.com/tidwall/sjson v1.2.5
github.com/yuin/goldmark v1.7.7 github.com/yuin/goldmark v1.7.7
go.mau.fi/util v0.8.2-0.20241018231932-9da45c4e6e04 go.mau.fi/util v0.8.2-0.20241027163518-38d54fc87ee3
go.mau.fi/zeroconfig v0.1.3 go.mau.fi/zeroconfig v0.1.3
golang.org/x/crypto v0.28.0 golang.org/x/crypto v0.28.0
golang.org/x/image v0.21.0 golang.org/x/image v0.21.0

4
go.sum
View file

@ -61,8 +61,8 @@ github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=
github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28= github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=
github.com/yuin/goldmark v1.7.7 h1:5m9rrB1sW3JUMToKFQfb+FGt1U7r57IHu5GrYrG2nqU= github.com/yuin/goldmark v1.7.7 h1:5m9rrB1sW3JUMToKFQfb+FGt1U7r57IHu5GrYrG2nqU=
github.com/yuin/goldmark v1.7.7/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E= github.com/yuin/goldmark v1.7.7/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
go.mau.fi/util v0.8.2-0.20241018231932-9da45c4e6e04 h1:sfTKol1VyOfKb/QilgmtTT8GlZcL790IPWX60W1EEKU= go.mau.fi/util v0.8.2-0.20241027163518-38d54fc87ee3 h1:9dDTNcVc3y9oU9bYvjpc3xsCupwGzfyYhrppaLy6l9k=
go.mau.fi/util v0.8.2-0.20241018231932-9da45c4e6e04/go.mod h1:T1u/rD2rzidVrBLyaUdPpZiJdP/rsyi+aTzn0D+Q6wc= go.mau.fi/util v0.8.2-0.20241027163518-38d54fc87ee3/go.mod h1:T1u/rD2rzidVrBLyaUdPpZiJdP/rsyi+aTzn0D+Q6wc=
go.mau.fi/zeroconfig v0.1.3 h1:As9wYDKmktjmNZW5i1vn8zvJlmGKHeVxHVIBMXsm4kM= go.mau.fi/zeroconfig v0.1.3 h1:As9wYDKmktjmNZW5i1vn8zvJlmGKHeVxHVIBMXsm4kM=
go.mau.fi/zeroconfig v0.1.3/go.mod h1:NcSJkf180JT+1IId76PcMuLTNa1CzsFFZ0nBygIQM70= go.mau.fi/zeroconfig v0.1.3/go.mod h1:NcSJkf180JT+1IId76PcMuLTNa1CzsFFZ0nBygIQM70=
golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=

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

@ -291,6 +291,7 @@ 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"` WasPlaintext bool `json:"was_plaintext,omitempty"`
BigEmoji bool `json:"big_emoji,omitempty"`
} }
type Event struct { type Event struct {

6
pkg/hicli/sync.go
View file

@ -18,6 +18,7 @@ import (
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/tidwall/gjson" "github.com/tidwall/gjson"
"github.com/tidwall/sjson" "github.com/tidwall/sjson"
"go.mau.fi/util/emojirunes"
"go.mau.fi/util/exzerolog" "go.mau.fi/util/exzerolog"
"go.mau.fi/util/jsontime" "go.mau.fi/util/jsontime"
"maunium.net/go/mautrix" "maunium.net/go/mautrix"
@ -366,7 +367,7 @@ func (h *HiClient) calculateLocalContent(ctx context.Context, dbEvt *database.Ev
} }
if content != nil { if content != nil {
var sanitizedHTML string var sanitizedHTML string
var wasPlaintext bool var wasPlaintext, bigEmoji bool
var inlineImages []id.ContentURI var inlineImages []id.ContentURI
if content.Format == event.FormatHTML && content.FormattedBody != "" { if content.Format == event.FormatHTML && content.FormattedBody != "" {
var err error var err error
@ -395,6 +396,8 @@ func (h *HiClient) calculateLocalContent(ctx context.Context, dbEvt *database.Ev
builder.Grow(len(content.Body) + builderPreallocBuffer) builder.Grow(len(content.Body) + builderPreallocBuffer)
linkifyAndWriteBytes(&builder, []byte(content.Body)) linkifyAndWriteBytes(&builder, []byte(content.Body))
sanitizedHTML = builder.String() sanitizedHTML = builder.String()
} else if len(content.Body) < 100 && emojirunes.IsOnlyEmojis(content.Body) {
bigEmoji = true
} }
wasPlaintext = true wasPlaintext = true
} }
@ -402,6 +405,7 @@ func (h *HiClient) calculateLocalContent(ctx context.Context, dbEvt *database.Ev
SanitizedHTML: sanitizedHTML, SanitizedHTML: sanitizedHTML,
HTMLVersion: CurrentHTMLSanitizerVersion, HTMLVersion: CurrentHTMLSanitizerVersion,
WasPlaintext: wasPlaintext, WasPlaintext: wasPlaintext,
BigEmoji: bigEmoji,
}, inlineImages }, inlineImages
} }
return nil, nil return nil, nil

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

@ -83,6 +83,7 @@ export interface LocalContent {
sanitized_html?: TrustedHTML sanitized_html?: TrustedHTML
html_version?: number html_version?: number
was_plaintext?: boolean was_plaintext?: boolean
big_emoji?: boolean
} }
export interface BaseDBEvent { export interface BaseDBEvent {

9
web/src/ui/timeline/content/TextMessageBody.tsx
View file

@ -33,11 +33,14 @@ const TextMessageBody = ({ event, sender }: EventContentProps) => {
classNames.push("emote-message") classNames.push("emote-message")
eventSenderName = sender?.content?.displayname || event.sender eventSenderName = sender?.content?.displayname || event.sender
} }
if (event.local_content?.sanitized_html) { if (event.local_content?.big_emoji) {
classNames.push("html-body") classNames.push("big-emoji-body")
if (event.local_content.was_plaintext) { }
if (event.local_content?.was_plaintext) {
classNames.push("plaintext-body") classNames.push("plaintext-body")
} }
if (event.local_content?.sanitized_html) {
classNames.push("html-body")
return <div return <div
onClick={onClickHTML} onClick={onClickHTML}
className={classNames.join(" ")} className={classNames.join(" ")}

4
web/src/ui/timeline/content/index.css
View file

@ -35,6 +35,10 @@ div.message-text {
white-space: pre-wrap; white-space: pre-wrap;
} }
&.big-emoji-body {
font-size: 3rem;
}
&.notice-message { &.notice-message {
opacity: .6; opacity: .6;
} }