mirror of
https://github.com/mastodon/mastodon-ios.git
synced 2025-02-02 18:36:44 +01:00
Make Profile-image upload work again (again) (#1277)
Only set edit-stuff once (#1276)
This commit is contained in:
parent
c2d0701062
commit
b759c207f6
@ -51,30 +51,24 @@ final class ProfileHeaderViewModel {
|
|||||||
self.account = account
|
self.account = account
|
||||||
self.me = me
|
self.me = me
|
||||||
self.relationship = relationship
|
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 {
|
extension ProfileHeaderViewModel {
|
||||||
|
@ -794,8 +794,9 @@ extension ProfileViewController: ProfileHeaderViewControllerDelegate {
|
|||||||
profileAboutViewModel.isEditing = true
|
profileAboutViewModel.isEditing = true
|
||||||
}
|
}
|
||||||
} receiveValue: { [weak self] response in
|
} receiveValue: { [weak self] response in
|
||||||
guard let self = self else { return }
|
guard let self else { return }
|
||||||
self.viewModel.accountForEdit = response.value
|
|
||||||
|
self.profileHeaderViewController.viewModel.setProfileInfo(accountForEdit: response.value)
|
||||||
}
|
}
|
||||||
.store(in: &disposeBag)
|
.store(in: &disposeBag)
|
||||||
} else if isEdited == false {
|
} else if isEdited == false {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user