Skip to content

Commit 7a163c1

Browse files
committed
refactor(sdk): Rename RoomEventCacheInner::sender to update_sender.
This patch renames the `sender` field of `RoomEventCacheInner` to `update_sender` to clarify what the sender is about.
1 parent cf881ab commit 7a163c1

File tree

4 files changed

+19
-16
lines changed

4 files changed

+19
-16
lines changed

crates/matrix-sdk/src/event_cache/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ impl EventCache {
421421
// However, better safe than sorry, and it's cheap to send an update here,
422422
// so let's do it!
423423
if !diffs.is_empty() {
424-
let _ = room.inner.sender.send(
424+
let _ = room.inner.update_sender.send(
425425
RoomEventCacheUpdate::UpdateTimelineEvents {
426426
diffs,
427427
origin: EventsOrigin::Cache,
@@ -951,7 +951,7 @@ impl EventCacheInner {
951951
let mut state_guard = state_guard?;
952952
let updates_as_vector_diffs = state_guard.reset().await?;
953953

954-
let _ = room.inner.sender.send(RoomEventCacheUpdate::UpdateTimelineEvents {
954+
let _ = room.inner.update_sender.send(RoomEventCacheUpdate::UpdateTimelineEvents {
955955
diffs: updates_as_vector_diffs,
956956
origin: EventsOrigin::Cache,
957957
});

crates/matrix-sdk/src/event_cache/pagination.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -243,11 +243,12 @@ impl RoomPagination {
243243
reached_start,
244244
} => {
245245
if !timeline_event_diffs.is_empty() {
246-
let _ =
247-
self.inner.sender.send(RoomEventCacheUpdate::UpdateTimelineEvents {
246+
let _ = self.inner.update_sender.send(
247+
RoomEventCacheUpdate::UpdateTimelineEvents {
248248
diffs: timeline_event_diffs,
249249
origin: EventsOrigin::Cache,
250-
});
250+
},
251+
);
251252

252253
// Send a room event cache generic update.
253254
let _ =
@@ -311,7 +312,7 @@ impl RoomPagination {
311312
.await?
312313
{
313314
if !timeline_event_diffs.is_empty() {
314-
let _ = self.inner.sender.send(RoomEventCacheUpdate::UpdateTimelineEvents {
315+
let _ = self.inner.update_sender.send(RoomEventCacheUpdate::UpdateTimelineEvents {
315316
diffs: timeline_event_diffs,
316317
origin: EventsOrigin::Pagination,
317318
});

crates/matrix-sdk/src/event_cache/redecryptor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ impl EventCache {
319319
// been queued up. We need to send them out to our subscribers now.
320320
let diffs = state.room_linked_chunk().updates_as_vector_diffs();
321321

322-
let _ = room_cache.inner.sender.send(RoomEventCacheUpdate::UpdateTimelineEvents {
322+
let _ = room_cache.inner.update_sender.send(RoomEventCacheUpdate::UpdateTimelineEvents {
323323
diffs,
324324
origin: EventsOrigin::Cache,
325325
});

crates/matrix-sdk/src/event_cache/room/mod.rs

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ impl RoomEventCache {
207207
let previous_subscriber_count = subscriber_count.fetch_add(1, Ordering::SeqCst);
208208
trace!("added a room event cache subscriber; new count: {}", previous_subscriber_count + 1);
209209

210-
let recv = self.inner.sender.subscribe();
210+
let recv = self.inner.update_sender.subscribe();
211211
let subscriber = RoomEventCacheSubscriber {
212212
recv,
213213
room_id: self.inner.room_id.clone(),
@@ -383,7 +383,7 @@ impl RoomEventCache {
383383
let updates_as_vector_diffs = self.inner.state.write().await?.reset().await?;
384384

385385
// Notify observers about the update.
386-
let _ = self.inner.sender.send(RoomEventCacheUpdate::UpdateTimelineEvents {
386+
let _ = self.inner.update_sender.send(RoomEventCacheUpdate::UpdateTimelineEvents {
387387
diffs: updates_as_vector_diffs,
388388
origin: EventsOrigin::Cache,
389389
});
@@ -428,7 +428,7 @@ pub(super) struct RoomEventCacheInner {
428428
pub weak_room: WeakRoom,
429429

430430
/// Sender part for subscribers to this room.
431-
pub sender: Sender<RoomEventCacheUpdate>,
431+
pub update_sender: Sender<RoomEventCacheUpdate>,
432432

433433
/// State for this room's event cache.
434434
pub state: RoomEventCacheStateLock,
@@ -463,13 +463,14 @@ impl RoomEventCacheInner {
463463
auto_shrink_sender: mpsc::Sender<AutoShrinkChannelPayload>,
464464
generic_update_sender: Sender<RoomEventCacheGenericUpdate>,
465465
) -> Self {
466-
let sender = Sender::new(32);
466+
let update_sender = Sender::new(32);
467467
let weak_room = WeakRoom::new(client, room_id);
468+
468469
Self {
469470
room_id: weak_room.room_id().to_owned(),
470471
weak_room,
471472
state,
472-
sender,
473+
update_sender,
473474
pagination_batch_token_notifier: Default::default(),
474475
auto_shrink_sender,
475476
pagination_status,
@@ -498,7 +499,7 @@ impl RoomEventCacheInner {
498499
handled_read_marker = true;
499500

500501
// Propagate to observers. (We ignore the error if there aren't any.)
501-
let _ = self.sender.send(RoomEventCacheUpdate::MoveReadMarkerTo {
502+
let _ = self.update_sender.send(RoomEventCacheUpdate::MoveReadMarkerTo {
502503
event_id: ev.content.event_id,
503504
});
504505
}
@@ -567,7 +568,7 @@ impl RoomEventCacheInner {
567568
// The order matters here: first send the timeline event diffs, then only the
568569
// related events (read receipts, etc.).
569570
if !timeline_event_diffs.is_empty() {
570-
let _ = self.sender.send(RoomEventCacheUpdate::UpdateTimelineEvents {
571+
let _ = self.update_sender.send(RoomEventCacheUpdate::UpdateTimelineEvents {
571572
diffs: timeline_event_diffs,
572573
origin: EventsOrigin::Sync,
573574
});
@@ -579,12 +580,13 @@ impl RoomEventCacheInner {
579580

580581
if !ephemeral_events.is_empty() {
581582
let _ = self
582-
.sender
583+
.update_sender
583584
.send(RoomEventCacheUpdate::AddEphemeralEvents { events: ephemeral_events });
584585
}
585586

586587
if !ambiguity_changes.is_empty() {
587-
let _ = self.sender.send(RoomEventCacheUpdate::UpdateMembers { ambiguity_changes });
588+
let _ =
589+
self.update_sender.send(RoomEventCacheUpdate::UpdateMembers { ambiguity_changes });
588590
}
589591

590592
Ok(())

0 commit comments

Comments
 (0)