Skip to content

Display m.notice messages with proper markdown parsing #115

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

Open
glasfisch3000 wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Display m.notice messages with proper markdown parsing #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6d812a2
fix x mark when creating new threads
glasfisch3000 Jul 22, 2026
c989357
fix timeline equatable implementation
glasfisch3000 Jul 22, 2026
ce771ec
fix thread messages not loading
glasfisch3000 Jul 23, 2026
87dfb59
fix green text in verification request view
glasfisch3000 Jul 23, 2026
6501e56
Merge branch '71'
glasfisch3000 Jul 24, 2026
3793eb8
Merge branch 'viktorstrate:main' into main
glasfisch3000 Jul 24, 2026
a00b2f6
display m.notice events as markdown
glasfisch3000 Jul 30, 2026
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
6 changes: 1 addition & 5 deletions Mactrix/Views/ChatView/ChatMessageView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,9 @@ struct ChatMessageView: View, UI.MessageEventActions {
case let .gallery(content: content):
Text("Gallery: \(content.body)").textSelection(.enabled)
case let .notice(content: content):
Text(content.body.formatAsMarkdown)
.textSelection(.enabled)
.foregroundColor(.secondary)
.fixedSize(horizontal: false, vertical: true)
FormattedBodyView(messageContent: content, color: .secondaryLabelColor)
case let .text(content: content):
FormattedBodyView(messageContent: content)
//Text(content.body.formatAsMarkdown)
case let .location(content: content):
Text("Location: \(content.body) \(content.geoUri)").textSelection(.enabled)
case let .other(msgtype: msgtype, body: body):
Expand Down
39 changes: 29 additions & 10 deletions Mactrix/Views/ChatView/FormattedBodyView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,45 @@ struct FormattedBodyView: View {
@AppStorage("fontSize") private var fontSize = 13

let rawBody: String
let htmlBody: String?
var formattedBody: NSAttributedString? = nil
var color: NSColor? = nil

init(messageContent: some MessageContent) {
init(messageContent: some MessageContent) {
self.rawBody = messageContent.body

if let formatted = messageContent.formatted, formatted.format == .html {
self.formattedBody = parseFormattedBody(formatted.body, baseFontSize: CGFloat(fontSize))
}
}

// accepts a custom foreground color (for use in grayed out messages)
init(messageContent: some MessageContent, color: NSColor) {
self.rawBody = messageContent.body
self.color = color

if let formatted = messageContent.formatted, formatted.format == .html {
self.htmlBody = formatted.body
} else {
self.htmlBody = nil
if let formatted = messageContent.formatted, formatted.format == .html {
let parsed = parseFormattedBody(formatted.body, baseFontSize: CGFloat(fontSize))

let mutable = NSMutableAttributedString(attributedString: parsed)
mutable.addAttribute(.foregroundColor, value: color, range: NSRange(location: 0, length: mutable.length))

self.formattedBody = mutable
}
}

var body: some View {
if let htmlBody {
AttributedTextView(attributedString: parseFormattedBody(htmlBody, baseFontSize: CGFloat(fontSize)))
if let formattedBody {
AttributedTextView(attributedString: formattedBody)
.fixedSize(horizontal: false, vertical: true)
} else {
} else if let color {
Text(rawBody)
.textSelection(.enabled)
.fixedSize(horizontal: false, vertical: true)
}
.foregroundStyle(Color(nsColor: color))
} else {
Text(rawBody)
.textSelection(.enabled)
.fixedSize(horizontal: false, vertical: true)
}
}
}
Loading