Mastodon
/
IceCubes
mirror of https://github.com/Dimillian/IceCubesApp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix hasConnection (#470) close #375

This commit is contained in:
David Walter 2023-01-28 18:41:04 +01:00 committed by GitHub
parent 171e3998c8
commit 11d4a84bd8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Packages/Network/Sources/Network/Client.swift
View File

@ -50,7 +50,13 @@ public class Client: ObservableObject, Equatable {
public func hasConnection(with url: URL) -> Bool { public func hasConnection(with url: URL) -> Bool {
guard let host = url.host else { return false } guard let host = url.host else { return false }
return connections.contains(host) if let rootHost = host.split(separator: ".", maxSplits: 1).last {
// Sometimes the connection is with the root host instead of a subdomain
// eg. Mastodon runs on mastdon.domain.com but the connection is with domain.com
return connections.contains(host) || connections.contains(String(rootHost))
} else {
return connections.contains(host)
}
} }
private func makeURL(scheme: String = "https", endpoint: Endpoint, forceVersion: Version? = nil) -> URL { private func makeURL(scheme: String = "https", endpoint: Endpoint, forceVersion: Version? = nil) -> URL {