Ensure user has never joined a group or community before marking empty

open-chat-labs · Aug 2, 2024 · 32ea3b9 · 32ea3b9
1 parent 936748a
commit 32ea3b9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/backend/canisters/user/impl/src/lifecycle/post_upgrade.rs b/backend/canisters/user/impl/src/lifecycle/post_upgrade.rs
@@ -34,6 +34,8 @@ fn post_upgrade(args: Args) {
             && state.data.communities.len() == 0
             && state.data.diamond_membership_expires_at.is_none()
             && state.data.unique_person_proof.is_none()
+            && state.data.group_chats.removed_len() == 0
+            && state.data.communities.removed_len() == 0
         {
             let now = state.env.now();
             if state.data.user_created + SIX_MONTHS < now && state.data.chit_events.last_updated() + SIX_MONTHS < now {

diff --git a/backend/canisters/user/impl/src/model/communities.rs b/backend/canisters/user/impl/src/model/communities.rs
@@ -98,6 +98,10 @@ impl Communities {
         self.communities.len()
     }
 
+    pub fn removed_len(&self) -> usize {
+        self.removed.len()
+    }
+
     fn next_index(&self) -> u32 {
         self.communities.values().map(|c| c.index.value).max().unwrap_or_default() + 1
     }

diff --git a/backend/canisters/user/impl/src/model/group_chats.rs b/backend/canisters/user/impl/src/model/group_chats.rs
@@ -97,6 +97,10 @@ impl GroupChats {
         self.group_chats.len()
     }
 
+    pub fn removed_len(&self) -> usize {
+        self.removed.len()
+    }
+
     pub fn pin(&mut self, chat_id: ChatId, now: TimestampMillis) {
         if !self.pinned.value.contains(&chat_id) {
             self.pinned.timestamp = now;