Skip to content

Fix opening and switching between threads in the sidebar #110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
viktorstrate merged 3 commits into from
Jul 23, 2026
Merged

Fix opening and switching between threads in the sidebar #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d812a2
fix x mark when creating new threads
glasfisch3000 Jul 22, 2026
c989357
fix timeline equatable implementation
glasfisch3000 Jul 22, 2026
ce771ec
fix thread messages not loading
glasfisch3000 Jul 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions Mactrix/Models/LiveTimeline.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,11 @@ public final class LiveTimeline {

await listenToTimelineChanges()

// Only main timelines can subscibe to back pagination status
if threadId == nil {
do {
try await listenToPaginationStatus()
} catch {
Logger.liveTimeline.error("Failed to listen to pagination status: \(error)")
}
}
do {
try await listenToPaginationStatus(threadId: threadId)
} catch {
Logger.liveTimeline.error("Failed to listen to pagination status: \(error)")
}
}

private func listenToTimelineChanges() async {
Expand All @@ -104,11 +101,17 @@ public final class LiveTimeline {
}
}

private func listenToPaginationStatus() async throws {
private func listenToPaginationStatus(threadId: String?) async throws {
guard let timeline else { return }

let listener = AsyncSDKListener<PaginationStatus>()
paginateHandle = try await timeline.subscribeToBackPaginationStatus(listener: listener)
// Only main timelines can subscibe to back pagination status
if threadId == nil {
paginateHandle = try await timeline.subscribeToBackPaginationStatus(listener: listener)
} else {
// if in a thread, instead push one initial status manually to kick off message fetching
listener.publishValue(.idle(hitTimelineStart: false))
}

Task { [weak self] in
for await status in listener {
Expand Down Expand Up @@ -201,6 +204,6 @@ extension LiveTimeline {

extension LiveTimeline: Equatable {
public nonisolated static func == (lhs: LiveTimeline, rhs: LiveTimeline) -> Bool {
lhs.room.id == rhs.room.id
lhs.room.id == rhs.room.id && lhs.focusedThreadId == rhs.focusedThreadId
}
}
2 changes: 1 addition & 1 deletion MactrixLibrary/Sources/UI/Timeline/ThreadTimelineHeader.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public struct ThreadTimelineHeader: View {
Divider()
HStack(alignment: .firstTextBaseline) {
Button(action: dismiss) {
Label("Close thread", systemImage: "x.circle.fill")
Label("Close thread", systemImage: "xmark.circle.fill")
}
.buttonStyle(.plain)
.labelStyle(.iconOnly)
Expand Down
Loading