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

Make Profile-image upload work again (again) (#1277)

Browse Source 
Only set edit-stuff once (#1276)
This commit is contained in:
Nathan Mattes 2024-04-30 09:23:51 +02:00 committed by GitHub
parent c2d0701062
commit b759c207f6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Mastodon/Scene/Profile/Header/ProfileHeaderViewModel.swift
View File

@ -51,30 +51,24 @@ final class ProfileHeaderViewModel {
self.account = account
self.me = me
self.relationship = relationship
$accountForEdit
.receive(on: DispatchQueue.main)
.sink { [weak self] account in
guard let self = self else { return }
guard let account = account else { return }
// banner
self.profileInfo.header = nil
self.profileInfoEditing.header = nil
// avatar
self.profileInfo.avatar = nil
self.profileInfoEditing.avatar = nil
// name
let name = account.displayNameWithFallback
self.profileInfo.name = name
self.profileInfoEditing.name = name
// bio
let note = ProfileHeaderViewModel.normalize(note: account.note)
self.profileInfo.note = note
self.profileInfoEditing.note = note
}
.store(in: &disposeBag)
}
public func setProfileInfo(accountForEdit: Mastodon.Entity.Account) {
// banner
profileInfo.header = nil
profileInfoEditing.header = nil
// avatar
profileInfo.avatar = nil
profileInfoEditing.avatar = nil
let name = account.displayNameWithFallback
profileInfo.name = name
profileInfoEditing.name = name
// bio
let note = ProfileHeaderViewModel.normalize(note: account.note)
profileInfo.note = note
profileInfoEditing.note = note
}
}
extension ProfileHeaderViewModel {

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

@ -794,8 +794,9 @@ extension ProfileViewController: ProfileHeaderViewControllerDelegate {
profileAboutViewModel.isEditing = true
}
} receiveValue: { [weak self] response in
guard let self = self else { return }
self.viewModel.accountForEdit = response.value
guard let self else { return }
self.profileHeaderViewController.viewModel.setProfileInfo(accountForEdit: response.value)
}
.store(in: &disposeBag)
} else if isEdited == false {