Mastodon
/
Bubble
mirror of https://github.com/lumaa-dev/BubbleApp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Deep link fixed

This commit is contained in:
lumaa-dev 2024-09-26 00:58:52 +02:00
parent 0ca62fb0a2
commit e6ebb3a139
6 changed files with 138 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
Bubble/Data/URLNavigator.swift
View File

@ -4,52 +4,144 @@ import Foundation
import SwiftUI
extension Navigator {
public func handle(url: URL) -> OpenURLAction.Result {
/// Handles the tapping links in posts, bios, etc...
/// - Parameter uni: Defines if the function is triggered by the ``UniversalNavigator``.
public func handle(url: URL, uni: Bool = false) -> OpenURLAction.Result {
print("\(url.absoluteString) TAPPED")
guard let client = self.client else { return .systemAction }
let path: String = url.absoluteString.replacingOccurrences(of: AppInfo.scheme, with: "") // remove all path
let urlPath: URL = URL(string: path)!
let server: String = urlPath.host() ?? client.server
let lastIndex = urlPath.pathComponents.count - 1
let actionType = urlPath.pathComponents[lastIndex - 1]
let urlPath: URL = URL(string: path) ?? URL(string: "https://example.com/")!
if !url.absoluteString.starts(with: AppInfo.scheme) {
if client.isAuth && client.hasConnection(with: url) {
if urlPath.lastPathComponent.starts(with: "@") {
guard let actionType = urlPath.getActionType() else { fatalError("Couldn't get URLNav actionType") }
let server: String = urlPath.host() ?? client.server
print("actionType: \(actionType)")
if actionType == .account {
Task {
do {
print("\(urlPath.lastPathComponent)@\(server.replacingOccurrences(of: "www.", with: ""))")
print("search acct: \(urlPath.lastPathComponent)@\(server.replacingOccurrences(of: "www.", with: ""))")
let search: SearchResults = try await client.get(endpoint: Search.search(query: "\(urlPath.lastPathComponent)@\(server.replacingOccurrences(of: "www.", with: ""))", type: "accounts", offset: nil, following: nil), forceVersion: .v2)
print(search)
let acc: Account = search.accounts.first ?? .placeholder()
if let acc: Account = search.accounts.first, !search.accounts.isEmpty {
guard !uni else { return OpenURLAction.Result.discarded }
self.navigate(to: .account(acc: acc))
} else {
guard uni else { return OpenURLAction.Result.discarded }
self.presentedSheet = .safari(url: url)
}
} catch {
print(error)
}
}
return OpenURLAction.Result.handled
}
} else if actionType == .tag {
Task {
do {
let tag: String = urlPath.lastPathComponent
let search: SearchResults = try await client.get(endpoint: Search.search(query: "#\(tag)", type: "hashtags", offset: nil, following: nil), forceVersion: .v2)
print(search)
if let tgg: Tag = search.hashtags.first, !search.hashtags.isEmpty {
guard !uni else { return OpenURLAction.Result.discarded }
self.navigate(to: .timeline(timeline: .hashtag(tag: tgg.name, accountId: nil)))
} else {
guard uni else { return OpenURLAction.Result.discarded }
self.presentedSheet = .safari(url: url)
}
} catch {
print(error)
}
return OpenURLAction.Result.handled
}
} else {
self.presentedSheet = .safari(url: url)
}
} else {
print("clicked isn't handled properly")
Task {
do {
let connections: [String] = try await client.get(endpoint: Instances.peers)
client.addConnections(connections)
if client.hasConnection(with: url) {
_ = self.handle(url: url)
_ = self.handle(url: url, uni: uni)
} else {
guard uni else { return OpenURLAction.Result.discarded }
print("clicked isn't connection")
self.presentedSheet = .safari(url: url)
}
} catch {
guard uni else { return OpenURLAction.Result.discarded }
self.presentedSheet = .safari(url: url)
}
return OpenURLAction.Result.handled
}
}
} else {
print("deeplink detected")
let actions: [String] = path.split(separator: /\/+/).map({ $0.lowercased().replacing(/\?(.)+$/, with: "") })
if !actions.isEmpty, let mainAction: String = actions.first {
if mainAction == "update" {
guard uni else { return OpenURLAction.Result.discarded }
self.presentedSheet = .update
} else if mainAction == "new" {
guard uni else { return OpenURLAction.Result.discarded }
var newContent: String = ""
if let queries: [String : String] = urlPath.getQueryParameters() {
newContent = queries["text"] ?? ""
}
self.presentedSheet = .post(content: newContent, replyId: nil, editId: nil)
}
}
}
return OpenURLAction.Result.handled
}
return OpenURLAction.Result.handled
}
private extension URL {
func getActionType() -> String.ActionType? {
let pathComponents = self.pathComponents
let subLinks = pathComponents.filter { $0 != "/" && !$0.isEmpty }
return subLinks.first?.getRecognizer()
}
func getQueryParameters() -> [String: String]? {
guard let components = URLComponents(url: self, resolvingAgainstBaseURL: false), let queryItems = components.queryItems else {
print("Invalid URL or no query items")
return nil
}
// Convert query items into a dictionary
var queryDict = [String: String]()
for item in queryItems {
queryDict[item.name] = item.value
}
return queryDict
}
}
private extension String {
func getRecognizer() -> String.ActionType? {
if self.starts(with: "@") {
return .account
} else if self.starts(with: "tags") {
return .tag
}
return nil
}
enum ActionType: String {
case account = "account"
case tag = "tag"
}
}

16
Bubble/Views/ContentView.swift
View File

@ -78,11 +78,18 @@ struct ContentView: View {
}
}
}
.onOpenURL(perform: { url in
guard preferences.browserType == .inApp else { return }
uniNavigator.presentedSheet = .safari(url: url)
let handled = uniNavigator.handle(url: url)
.environment(\.openURL, OpenURLAction { url in
return self.openURL(url)
})
.onOpenURL(perform: { url in
_ = openURL(url)
})
}
private func openURL(_ url: URL) -> OpenURLAction.Result {
_ = uniNavigator.handle(url: url, uni: true)
_ = Navigator.shared.handle(url: url, uni: false)
return .handled
}
func recognizeAccount() async {
@ -92,6 +99,7 @@ struct ContentView: View {
} else {
let cli = Client(server: appAccount!.server, oauthToken: appAccount!.oauthToken)
accountManager.setClient(cli)
navigator.client = cli
uniNavigator.client = cli
// Check if token is still working

6
Bubble/Views/Post/TimelineView.swift
View File

@ -137,12 +137,6 @@ struct TimelineView: View {
}
}
}
.environment(\.openURL, OpenURLAction { url in
// Open internal URL.
// guard preferences.browserType == .inApp else { return .systemAction }
let handled = navigator.handle(url: url)
return handled
})
.environmentObject(navigator)
.background(Color.appBackground)
.toolbarBackground(Color.appBackground, for: .navigationBar)

5
Bubble/Views/Profile/AccountView.swift
View File

@ -20,11 +20,6 @@ struct AccountView: View {
}
}
}
.environment(\.openURL, OpenURLAction { url in
// Open internal URL.
let handled = navigator.handle(url: url)
return handled
})
.environmentObject(navigator)
}
}

7
Bubble/Views/Tabs/DiscoveryView.swift
View File

@ -91,13 +91,6 @@ struct DiscoveryView: View {
.withAppRouter(navigator)
.navigationTitle(Text("discovery"))
}
.environment(\.openURL, OpenURLAction { url in
// Open internal URL.
return .systemAction
// guard preferences.browserType == .inApp else { return .systemAction }
// let handled = navigator.handle(url: url)
// return handled
})
.environmentObject(navigator)
.task {
await fetchTrending()

6
Bubble/Views/Tabs/NotificationsView.swift
View File

@ -94,12 +94,6 @@ struct NotificationsView: View {
}
}
}
.environment(\.openURL, OpenURLAction { url in
// Open internal URL.
// guard preferences.browserType == .inApp else { return .systemAction }
let handled = navigator.handle(url: url)
return handled
})
.environmentObject(navigator)
.task {
loadingNotifs = true