Mastodon/mastodon-app-ufficiale-iphone-ios
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon-ios.git synced 2025-02-03 10:47:35 +01:00
Code Issues Projects Releases Wiki Activity

Show profile on tap

Browse Source 
Bridge account to user as long as Profile-screen doesn't work with Mastodon.Entity.Account, but MastodonUser
This commit is contained in:
Nathan Mattes 2023-10-23 13:57:50 +02:00
parent 0951e658a2
commit d15181dcb6
7 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Mastodon/Protocol/Provider/DataSourceFacade+Profile.swift
View File

@ -8,6 +8,7 @@
import UIKit
import CoreDataStack
import MastodonCore
import MastodonSDK
extension DataSourceFacade {
@ -54,6 +55,30 @@ extension DataSourceFacade {
)
}
@MainActor
static func coordinateToProfileScene(
provider: ViewControllerWithDependencies & AuthContextProvider,
account: Mastodon.Entity.Account
) async {
provider.coordinator.showLoading()
guard let domain = account.domain else { return provider.coordinator.hideLoading() }
Task {
do {
let user = try await provider.context.apiService.fetchUser(username: account.username,
domain: domain,
authenticationBox: provider.authContext.mastodonAuthenticationBox)
provider.coordinator.hideLoading()
if let user {
await coordinateToProfileScene(provider: provider, user: user.asRecord)
}
} catch {
provider.coordinator.hideLoading()
}
}
}
}
extension DataSourceFacade {

3
Mastodon/Protocol/Provider/DataSourceFacade+SearchHistory.swift
View File

@ -17,7 +17,8 @@ extension DataSourceFacade {
item: DataSourceItem
) async {
switch item {
case .status:
case .status, .account(_, _):
break // not create search history for status
case .user(let record):
let authenticationBox = provider.authContext.mastodonAuthenticationBox

2
Mastodon/Protocol/Provider/DataSourceProvider+UITableViewDelegate.swift
View File

@ -21,6 +21,8 @@ extension UITableViewDelegate where Self: DataSourceProvider & AuthContextProvid
return
}
switch item {
case .account(let account, relationship: _):
await DataSourceFacade.coordinateToProfileScene(provider: self, account: account)
case .status(let status):
await DataSourceFacade.coordinateToStatusThreadScene(
provider: self,

1
Mastodon/Protocol/Provider/DataSourceProvider.swift
View File

@ -16,6 +16,7 @@ enum DataSourceItem: Hashable {
case user(record: ManagedObjectRecord<MastodonUser>)
case hashtag(tag: TagKind)
case notification(record: ManagedObjectRecord<Notification>)
case account(account: Mastodon.Entity.Account, relationship: Mastodon.Entity.Relationship?)
}
extension DataSourceItem {

2
Mastodon/Scene/Profile/Following/FollowingListViewController+DataSourceProvider.swift
View File

@ -20,6 +20,8 @@ extension FollowingListViewController: DataSourceProvider {
}
switch item {
case .account(let account, let relationship):
return .account(account: account, relationship: relationship)
case .user(let record):
return .user(record: record)
default:

3
Mastodon/Scene/Search/SearchDetail/SearchResult/SearchResultViewController+DataSourceProvider.swift
View File

@ -52,6 +52,9 @@ extension SearchResultViewController {
)
switch item {
case .account(account: _, relationship: _):
// do nothing
break
case .status(let status):
await DataSourceFacade.coordinateToStatusThreadScene(
provider: self,

8
MastodonSDK/Sources/MastodonSDK/Entity/Mastodon+Entity+Account.swift
View File

@ -91,11 +91,15 @@ extension Mastodon.Entity.Account {
}
return acct
}
}
extension Mastodon.Entity.Account {
public var verifiedLink: Mastodon.Entity.Field? {
let firstVerified = fields?.first(where: { $0.verifiedAt != nil })
return firstVerified
}
public var domain: String? {
guard let components = URLComponents(string: url) else { return nil }
return components.host
}
}