Merge pull request #15 from MoonlightSmile/main

isaced · web-flow · commit 6402da1fe08e · 2022-10-09T01:22:25.000+08:00
diff --git a/V2exOS/Views/TopicDetail/CommentListView.swift b/V2exOS/Views/TopicDetail/CommentListView.swift
@@ -57,6 +57,12 @@ struct CommentListView: View {
               
               Markdown(
                 comment.content
+                  .replacingOccurrences(
+                    of: #"https?.*"#,
+                    with: "[$0]($0)",
+                    options: .regularExpression,
+                    range: nil
+                  )
                   .replacingOccurrences(
                     of: #"@(\w+)"#,
                     with: "[$0](https://www.v2ex.com/member/$1)",
diff --git a/V2exOS/Views/TopicDetail/TopicDetailView.swift b/V2exOS/Views/TopicDetail/TopicDetailView.swift
@@ -46,6 +46,10 @@ struct TopicDetailView: View {
               Text(Date(timeIntervalSince1970: TimeInterval(created)).fromNow())
             }
           }
+          Link(destination: URL(string: "https://www.v2ex.com/t/\(topic.id)")!) {
+            Image(systemName: "safari")
+            Text("在网页中打开")
+          }
           
         }.foregroundColor(Color(NSColor.secondaryLabelColor))
         

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,10 @@ struct TopicDetailView: View {`
`46`	`46`	`Text(Date(timeIntervalSince1970: TimeInterval(created)).fromNow())`
`47`	`47`	`}`
`48`	`48`	`}`
	`49`	`+ Link(destination: URL(string: "https://www.v2ex.com/t/\(topic.id)")!) {`
	`50`	`+ Image(systemName: "safari")`
	`51`	`+ Text("在网页中打开")`
	`52`	`+ }`
`49`	`53`
`50`	`54`	`}.foregroundColor(Color(NSColor.secondaryLabelColor))`
`51`	`55`