Fix bugs with reblogged statuses

Including: Attachments not showing up, 3d touch peek/pop not working,
favorite/reblog not working
pixelfed
Shadowfacts 4 years ago
parent 7eb377ec6b
commit aaddae1ecb
Signed by: shadowfacts
GPG Key ID: 94A5AB95422746E5
  1. 1
      Tusker/MastodonCache.swift
  2. 22
      Tusker/Views/Status/StatusTableViewCell.swift

@ -27,6 +27,7 @@ class MastodonCache {
statuses[id] = status
add(account: status.account)
if let reblog = status.reblog {
add(status: reblog)
add(account: reblog.account)
}
}

@ -32,6 +32,7 @@ class StatusTableViewCell: UITableViewCell, PreferencesAdaptive {
var statusID: String!
var accountID: String!
var reblogStatusID: String?
var rebloggerID: String?
var favorited: Bool = false {
@ -74,21 +75,22 @@ class StatusTableViewCell: UITableViewCell, PreferencesAdaptive {
}
func updateUI(for statusID: String) {
self.statusID = statusID
guard let status = MastodonCache.status(for: statusID) else { fatalError("Missing cached status \(statusID)") }
guard var status = MastodonCache.status(for: statusID) else { fatalError("Missing cached status \(statusID)") }
let account: Account
if let reblog = status.reblog {
account = reblog.account
if let reblogID = status.reblog?.id,
let reblog = MastodonCache.status(for: reblogID) {
reblogStatusID = statusID
rebloggerID = status.account.id
status = reblog
reblogLabel.isHidden = false
} else {
account = status.account
reblogLabel.isHidden = true
reblogStatusID = nil
rebloggerID = nil
reblogLabel.isHidden = true
}
let account = status.account
self.accountID = account.id
self.statusID = status.id
updateUIForPreferences()
@ -292,7 +294,7 @@ extension StatusTableViewCell: TableViewSwipeActionProvider {
}
completion(true)
MastodonCache.add(status: status)
self.updateUI(for: self.statusID)
self.updateUI(for: self.reblogStatusID ?? self.statusID)
}
})
}
@ -320,7 +322,7 @@ extension StatusTableViewCell: TableViewSwipeActionProvider {
}
completion(true)
MastodonCache.add(status: status)
self.updateUI(for: self.statusID)
self.updateUI(for: self.reblogStatusID ?? self.statusID)
}
})
}

Loading…
Cancel
Save