mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2024-11-23 00:40:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make appending new statuses safer

Browse source
This commit is contained in:
Thomas Ricouard 2023-01-30 22:11:55 +01:00
parent 4e76c367a5
commit d64d674389
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Packages/Timeline/Sources/Timeline/TimelineViewModel.swift
View file

@ -79,10 +79,10 @@ class TimelineViewModel: ObservableObject, StatusesFetcher {
} }
} else { } else {
newStatuses = newStatuses.filter { status in newStatuses = newStatuses.filter { status in
!pendingStatuses.contains(where: { $0.id == status.id }) !statuses.contains(where: { $0.id == status.id })
} }
pendingStatuses.insert(contentsOf: newStatuses, at: 0) pendingStatuses.insert(contentsOf: newStatuses, at: 0)
statuses.insert(contentsOf: pendingStatuses, at: 0) statuses.insert(contentsOf: newStatuses, at: 0)
withAnimation { withAnimation {
statusesState = .display(statuses: statuses, nextPageState: statuses.count < 20 ? .none : .hasNextPage) statusesState = .display(statuses: statuses, nextPageState: statuses.count < 20 ? .none : .hasNextPage)
} }
@ -143,8 +143,7 @@ class TimelineViewModel: ObservableObject, StatusesFetcher {
func handleEvent(event: any StreamEvent, currentAccount: CurrentAccount) { func handleEvent(event: any StreamEvent, currentAccount: CurrentAccount) {
if let event = event as? StreamEventUpdate, if let event = event as? StreamEventUpdate,
pendingStatusesEnabled, pendingStatusesEnabled,
!statuses.contains(where: { $0.id == event.status.id }), !statuses.contains(where: { $0.id == event.status.id })
!pendingStatuses.contains(where: { $0.id == event.status.id })
{ {
pendingStatuses.insert(event.status, at: 0) pendingStatuses.insert(event.status, at: 0)
statuses.insert(event.status, at: 0) statuses.insert(event.status, at: 0)