Remove entries from expiring members queue when channel deleted (#6924)

open-chat-labs · Nov 29, 2024 · 361d562 · 361d562
1 parent 3fb6db5
commit 361d562
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/backend/canisters/community/CHANGELOG.md b/backend/canisters/community/CHANGELOG.md
@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Changed
 
 - Remove channel links from being stored on each community member ([#6923](https://github.com/open-chat-labs/open-chat/pull/6923))
+- Remove entries from expiring members queue when channel deleted ([#6924](https://github.com/open-chat-labs/open-chat/pull/6924))
 
 ## [[2.0.1479](https://github.com/open-chat-labs/open-chat/releases/tag/v2.0.1479-community)] - 2024-11-28
 

diff --git a/backend/canisters/community/impl/src/updates/delete_channel.rs b/backend/canisters/community/impl/src/updates/delete_channel.rs
@@ -80,6 +80,10 @@ fn delete_channel_impl(channel_id: ChannelId, state: &mut RuntimeState) -> Respo
         state.data.members.mark_member_left_channel(*user_id, channel_id, true, now);
     }
 
+    if channel.chat.gate_config.value.is_some_and(|gc| gc.expiry.is_some()) {
+        state.data.expiring_members.remove_gate(Some(channel_id));
+    }
+
     handle_activity_notification(state);
 
     Success