aboutsummaryrefslogtreecommitdiff
path: root/Hotline/macOS
diff options
context:
space:
mode:
Diffstat (limited to 'Hotline/macOS')
-rw-r--r--Hotline/macOS/ChatView.swift6
-rw-r--r--Hotline/macOS/MessageBoardView.swift4
-rw-r--r--Hotline/macOS/MessageView.swift2
3 files changed, 6 insertions, 6 deletions
diff --git a/Hotline/macOS/ChatView.swift b/Hotline/macOS/ChatView.swift
index 5bd626f..98fb852 100644
--- a/Hotline/macOS/ChatView.swift
+++ b/Hotline/macOS/ChatView.swift
@@ -47,7 +47,7 @@ struct ChatView: View {
ScrollView(.vertical) {
HStack {
Spacer()
- Text(msg.text.convertToAttributedStringWithLinks(relaxed: false))
+ Text(msg.text.convertToAttributedStringWithLinks())
.font(.system(size: 12))
.fontDesign(.monospaced)
.textSelection(.enabled)
@@ -122,7 +122,7 @@ struct ChatView: View {
// }
// }
// else {
- Text(LocalizedStringKey("**\(username):** \(msg.text)".convertLinksToMarkdown()))
+ Text(LocalizedStringKey("**\(username):** \(msg.text)".convertingLinksToMarkdown()))
.lineSpacing(4)
.multilineTextAlignment(.leading)
.textSelection(.enabled)
@@ -130,7 +130,7 @@ struct ChatView: View {
// }
}
else {
- Text(LocalizedStringKey(msg.text.convertLinksToMarkdown()))
+ Text(msg.text)
.lineSpacing(4)
.multilineTextAlignment(.leading)
.textSelection(.enabled)
diff --git a/Hotline/macOS/MessageBoardView.swift b/Hotline/macOS/MessageBoardView.swift
index 660ca05..2bd3713 100644
--- a/Hotline/macOS/MessageBoardView.swift
+++ b/Hotline/macOS/MessageBoardView.swift
@@ -12,8 +12,8 @@ struct MessageBoardView: View {
if model.access?.contains(.canReadMessageBoard) != false {
ScrollView {
LazyVStack(alignment: .leading) {
- ForEach(model.messageBoard, id: \.self) {
- Text(LocalizedStringKey($0.convertLinksToMarkdown()))
+ ForEach(model.messageBoard, id: \.self) { msg in
+ Text(LocalizedStringKey(msg))
.tint(Color("Link Color"))
.lineLimit(100)
.lineSpacing(4)
diff --git a/Hotline/macOS/MessageView.swift b/Hotline/macOS/MessageView.swift
index 94d3d2e..61e640e 100644
--- a/Hotline/macOS/MessageView.swift
+++ b/Hotline/macOS/MessageView.swift
@@ -26,7 +26,7 @@ struct MessageView: View {
Spacer()
}
- Text(LocalizedStringKey(msg.text.convertLinksToMarkdown()))
+ Text(LocalizedStringKey(msg.text))
.lineSpacing(4)
.multilineTextAlignment(.leading)
.textSelection(.enabled)