zelo72/mastodon-ios
2
2
Fork 1
mirror of https://github.com/mastodon/mastodon-ios synced 2025-04-11 22:58:02 +02:00
Code Issues 20 Releases Wiki Activity

Correctly track follow and reblog status in the notification view.

Browse Source 
This is a temporary fix, the datamodel will be changing with grouped notifications.
This commit is contained in:
shannon 2025-01-27 14:36:01 -05:00
parent 54861dcf6f
commit 999e74be47
6 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Mastodon/Protocol/Provider/DataSourceProvider+NotificationTableViewCellDelegate.swift
View File

@ -303,13 +303,13 @@ extension NotificationTableViewCellDelegate where Self: DataSourceProvider & Aut
assertionFailure("only works for status data provider")
return
}
guard let status = notification.status?.reblog ?? notification.status else {
guard let status = await notification.entity.latestStatus ?? notification.status?.entity else {
assertionFailure()
return
}
try await DataSourceFacade.responseToActionToolbar(
provider: self,
status: status,
status: MastodonStatus.fromEntity(status),
action: action,
sender: button
)

3
Mastodon/Scene/Notification/NotificationSection.swift
View File

@ -30,6 +30,7 @@ extension NotificationSection {
let filterContext: Mastodon.Entity.FilterContext?
}
@MainActor
static func diffableDataSource(
tableView: UITableView,
configuration: Configuration
@ -80,7 +81,7 @@ extension NotificationSection {
itemIdentifier: MastodonFeedItemIdentifier,
configuration: Configuration
) {
guard let authBox = AuthenticationServiceProvider.shared.currentActiveUser.value else { assertionFailure(); return }
guard AuthenticationServiceProvider.shared.currentActiveUser.value != nil else { assertionFailure(); return }
StatusSection.setupStatusPollDataSource(
authenticationBox: configuration.authenticationBox,
statusView: cell.notificationView.statusView

6
Mastodon/Scene/Notification/NotificationTimeline/NotificationTimelineViewController+DataSourceProvider.swift
View File

@ -64,9 +64,11 @@ extension NotificationTimelineViewController: DataSourceProvider {
}
func update(status: MastodonStatus, intent: MastodonStatus.UpdateIntent) {
Task {
await viewModel.loadLatest()
MastodonFeedItemCacheManager.shared.addToCache(status.entity)
if let reblog = status.entity.reblog {
MastodonFeedItemCacheManager.shared.addToCache(reblog)
}
viewModel.reloadData()
}
@MainActor

5
Mastodon/Scene/Notification/NotificationTimeline/NotificationTimelineViewModel.swift
View File

@ -119,6 +119,11 @@ extension NotificationTimelineViewModel {
extension NotificationTimelineViewModel {
func reloadData() {
guard let diffableDataSource else { return }
diffableDataSource.applySnapshotUsingReloadData(diffableDataSource.snapshot())
}
// load lastest
func loadLatest() async {
isLoadingLatest = true

6
Mastodon/Scene/Notification/NotificationView/NotificationView+Configuration.swift
View File

@ -33,7 +33,7 @@ extension NotificationView {
public func configure(notificationItem: MastodonFeedItemIdentifier) {
let item = MastodonFeedItemCacheManager.shared.cachedItem(notificationItem)
if let notification = item as? Mastodon.Entity.Notification {
configure(notificationType: notification.type, status: notification.status)
configure(notificationType: notification.type, status: notification.latestStatus)
configure(notification: notification)
} else if let notificationGroup = item as? Mastodon.Entity.NotificationGroup {
let status: Mastodon.Entity.Status?
@ -91,12 +91,12 @@ extension NotificationView {
case .followRequest:
setFollowRequestAdaptiveMarginContainerViewDisplay(isHidden: false)
case .mention, .status:
if let status = notification.status {
if let status = notification.latestStatus {
statusView.configure(status: status, contentDisplayMode: contentDisplayMode(status))
setStatusViewDisplay()
}
case .reblog, .favourite, .poll:
if let status = notification.status {
if let status = notification.latestStatus {
quoteStatusView.configure(status: status, contentDisplayMode: contentDisplayMode(status))
setQuoteStatusViewDisplay()
}

12
MastodonSDK/Sources/MastodonSDK/MastodonFeed.swift
View File

@ -313,3 +313,15 @@ public class MastodonFeedItemCacheManager {
}
}
}
extension Mastodon.Entity.Notification {
@MainActor
public var latestStatus: Mastodon.Entity.Status? {
var freshStatus: Mastodon.Entity.Status? = nil
if let statusID = status?.id {
freshStatus = MastodonFeedItemCacheManager.shared.cachedItem(.status(id: statusID)) as? Mastodon.Entity.Status
}
return freshStatus ?? status
}
}