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

Try to fix domain (IOS-192)

Browse Source
This commit is contained in:
Nathan Mattes 2023-12-14 14:07:58 +01:00
parent f373506aa3
commit 6cc069ec5b
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Mastodon/Scene/Profile/ProfileViewController.swift
View File

@ -298,9 +298,9 @@ extension ProfileViewController {
// header
#warning("TODO: Implement")
let headerViewModel = profileHeaderViewController.viewModel!
// viewModel.$account
// .assign(to: \.account, on: headerViewModel)
// .store(in: &disposeBag)
viewModel.$account
.assign(to: \.account, on: headerViewModel)
.store(in: &disposeBag)
viewModel.$isEditing
.assign(to: \.isEditing, on: headerViewModel)
.store(in: &disposeBag)
@ -378,11 +378,11 @@ extension ProfileViewController {
profileHeaderViewController.profileHeaderView.viewModel.viewDidAppear
)
.sink { [weak self] (user, _) in
guard let self else { return }
guard let self, let domain = user.domainFromAcct else { return }
Task {
_ = try await self.context.apiService.fetchUser(
username: user.username,
domain: "user.domainFromAcct",
domain: domain,
authenticationBox: self.authContext.mastodonAuthenticationBox
)
}

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

@ -178,4 +178,15 @@ extension Mastodon.Entity.Account {
return !displayName.isEmpty ? displayName : username
}
public var domainFromAcct: String? {
if acct.contains("@") {
return domain
} else if let domain = acct.split(separator: "@").last {
return String(domain)
} else {
return nil
}
}
}