Skip to content

fix: avoid duplicate DM entries and harden invalid batch token recovery #80

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

Open
tyreseluo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: avoid duplicate DM entries and harden invalid batch token recovery #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions src/home/rooms_list.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1091,13 +1091,15 @@ impl RoomsList {
for room_id in &self.all_known_rooms_order {
if let Some(jr) = self.all_joined_rooms.get(room_id) {
if should_display_room!(self, room_id, jr) {
seen_joined.insert(room_id.clone());
push_joined_room(room_id, jr);
if seen_joined.insert(room_id.clone()) {
push_joined_room(room_id, jr);
}
}
} else if let Some(ir) = invited_rooms_ref.get(room_id) {
if should_display_room!(self, room_id, ir) {
seen_invited.insert(room_id.clone());
new_displayed_invited_rooms.push(room_id.clone());
if seen_invited.insert(room_id.clone()) {
new_displayed_invited_rooms.push(room_id.clone());
}
}
}
}
Expand Down
59 changes: 36 additions & 23 deletions src/sliding_sync.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1298,36 +1298,49 @@ async fn matrix_worker_task(
timeline.paginate_backwards(num_events).await
};

if direction == PaginationDirection::Backwards
&& res
if direction == PaginationDirection::Backwards {
let room_id = timeline_kind.room_id().clone();
let mut invalid_batch_retry_count = 0usize;
while res
.as_ref()
.err()
.is_some_and(is_invalid_batch_token_timeline_error)
{
warning!(
"Detected an invalid cached batch token for {timeline_kind}; clearing the room event cache and retrying once."
);
let room_id = timeline_kind.room_id().clone();
if let Some(room) = client.and_then(|client| client.get_room(&room_id)) {
match room.event_cache().await {
Ok((room_event_cache, _drop_handles)) => {
match room_event_cache.clear().await {
Ok(()) => {
res = timeline.paginate_backwards(num_events).await;
}
Err(clear_error) => {
warning!(
"Failed to clear event cache for room {room_id} after invalid batch token: {clear_error}"
);
&& invalid_batch_retry_count < 3
{
invalid_batch_retry_count += 1;
warning!(
"Detected an invalid cached batch token for {timeline_kind}; clearing the room event cache and retrying (attempt {invalid_batch_retry_count}/3)."
);

let mut should_retry = false;
if let Some(room) = client.as_ref().and_then(|client| client.get_room(&room_id)) {
match room.event_cache().await {
Ok((room_event_cache, _drop_handles)) => {
match room_event_cache.clear().await {
Ok(()) => {
should_retry = true;
}
Err(clear_error) => {
warning!(
"Failed to clear event cache for room {room_id} after invalid batch token: {clear_error}"
);
}
}
}
}
Err(event_cache_error) => {
warning!(
"Failed to access room event cache for room {room_id} after invalid batch token: {event_cache_error}"
);
Err(event_cache_error) => {
warning!(
"Failed to access room event cache for room {room_id} after invalid batch token: {event_cache_error}"
);
}
}
}

if !should_retry {
break;
}

tokio::time::sleep(Duration::from_millis(250)).await;
res = timeline.paginate_backwards(num_events).await;
}
}

Expand Down
Loading