tewha/Tusker
1
0
Fork 0
forked from shadowfacts/Tusker
Code Issues Pull Requests Releases Wiki Activity

Fix crash when there are multiple follow notifications for the same account

Browse Source 
Only reproducible on Pixelfed
This commit is contained in:
Shadowfacts 2024-04-01 21:52:47 -04:00
parent e522e30ce5
commit 46b455c3d1
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Tusker/Screens/Notifications/ActionNotificationGroupCollectionViewCell.swift
View File

@ -135,9 +135,11 @@ class ActionNotificationGroupCollectionViewCell: UICollectionViewListCell {
updateTimestamp()
let people = group.notifications.compactMap {
mastodonController.persistentContainer.account(for: $0.account.id)
}
let people = group.notifications
.uniques(by: \.account.id)
.compactMap {
mastodonController.persistentContainer.account(for: $0.account.id)
}
let visibleAvatars = Array(people.lazy.compactMap(\.avatar).prefix(10))
for (index, avatarURL) in visibleAvatars.enumerated() {

6
Tusker/Screens/Notifications/FollowNotificationGroupCollectionViewCell.swift
View File

@ -109,7 +109,11 @@ class FollowNotificationGroupCollectionViewCell: UICollectionViewListCell {
}
self.group = group
let people = group.notifications.compactMap { mastodonController.persistentContainer.account(for: $0.account.id) }
let people = group.notifications
.uniques(by: \.account.id)
.compactMap {
mastodonController.persistentContainer.account(for: $0.account.id)
}
actionLabel.setEmojis(pairs: people.map {
($0.displayOrUserName, $0.emojis)

8
Tusker/Screens/Notifications/NotificationsCollectionViewController.swift
View File

@ -627,11 +627,11 @@ extension NotificationsCollectionViewController: UICollectionViewDelegate {
case .favourite, .reblog:
let type = group.kind == .favourite ? StatusActionAccountListViewController.ActionType.favorite : .reblog
let statusID = group.notifications.first!.status!.id
let accountIDs = group.notifications.map(\.account.id)
let accountIDs = group.notifications.map(\.account.id).uniques()
let vc = StatusActionAccountListViewController(actionType: type, statusID: statusID, statusState: .unknown, accountIDs: accountIDs, mastodonController: mastodonController)
show(vc)
case .follow:
let accountIDs = group.notifications.map(\.account.id)
let accountIDs = group.notifications.map(\.account.id).uniques()
switch accountIDs.count {
case 0:
collectionView.deselectItem(at: indexPath, animated: true)
@ -670,11 +670,11 @@ extension NotificationsCollectionViewController: UICollectionViewDelegate {
return UIContextMenuConfiguration(previewProvider: {
let type = group.kind == .favourite ? StatusActionAccountListViewController.ActionType.favorite : .reblog
let statusID = group.notifications.first!.status!.id
let accountIDs = group.notifications.map(\.account.id)
let accountIDs = group.notifications.map(\.account.id).uniques()
return StatusActionAccountListViewController(actionType: type, statusID: statusID, statusState: .unknown, accountIDs: accountIDs, mastodonController: self.mastodonController)
})
case .follow:
let accountIDs = group.notifications.map(\.account.id)
let accountIDs = group.notifications.map(\.account.id).uniques()
return UIContextMenuConfiguration {
if accountIDs.count == 1 {
return ProfileViewController(accountID: accountIDs.first!, mastodonController: self.mastodonController)