mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-04-29 03:23:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor(client): monitor the thread subscriptions catchup task

Browse Source
This commit is contained in:
Benjamin Bouvier
2026-03-04 15:44:21 +01:00
parent 1825cd5816
commit 1edbad0bd8
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
crates/matrix-sdk/src/client/thread_subscriptions.rs
View File

@@ -22,10 +22,9 @@ use std::{
use matrix_sdk_base::{
StateStoreDataKey, StateStoreDataValue, ThreadSubscriptionCatchupToken,
executor::AbortOnDrop,
store::{StoredThreadSubscription, ThreadSubscriptionStatus},
task_monitor::BackgroundTaskHandle,
};
use matrix_sdk_common::executor::spawn;
use ruma::{
EventId, OwnedEventId, OwnedRoomId, RoomId,
api::client::threads::get_thread_subscriptions_changes::unstable::{
@@ -113,7 +112,7 @@ impl GuardedStoreAccess {
pub struct ThreadSubscriptionCatchup {
/// The task catching up thread subscriptions in the background.
_task: OnceLock<AbortOnDrop<()>>,
_task: OnceLock<BackgroundTaskHandle>,
/// Whether the known list of thread subscriptions is outdated or not, i.e.
/// all thread subscriptions have been caught up
@@ -153,9 +152,10 @@ impl ThreadSubscriptionCatchup {
// subscriptions.
let _ = this._task.get_or_init(|| {
let that = this.clone();
let client_clone = client.clone();
AbortOnDrop::new(spawn(async move {
match client.enabled_thread_subscriptions().await {
client.task_monitor().spawn_background_task("client::thread_subscriptions_catchup", async move {
match client_clone.enabled_thread_subscriptions().await {
Ok(enabled) => {
if !enabled {
debug!("Thread subscriptions catchup not enabled, not starting the catchup task");
@@ -173,7 +173,7 @@ impl ThreadSubscriptionCatchup {
that,
ping_receiver,
).await
}))
}).abort_on_drop()
});
this