Set user type correctly for OC controlled bots (#6494)

open-chat-labs · Oct 1, 2024 · 9cd595b · 9cd595b
1 parent e37f30c
commit 9cd595b
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 3 deletions.
diff --git a/backend/canisters/user/CHANGELOG.md b/backend/canisters/user/CHANGELOG.md
@@ -19,6 +19,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Return owned values from `EventsMap` in prep for switch to stable memory ([#6469](https://github.com/open-chat-labs/open-chat/pull/6469))
 - Add serde default attribute in preparation for skipping serialization if default ([#6475](https://github.com/open-chat-labs/open-chat/pull/6475))
 
+### Fixed
+
+- Set user type correctly for OC controlled bots ([#6494](https://github.com/open-chat-labs/open-chat/pull/6494))
+
 ## [[2.0.1357](https://github.com/open-chat-labs/open-chat/releases/tag/v2.0.1357-user)] - 2024-09-20
 
 ### Added

diff --git a/backend/canisters/user/impl/src/lifecycle/post_upgrade.rs b/backend/canisters/user/impl/src/lifecycle/post_upgrade.rs
@@ -1,8 +1,10 @@
 use crate::lifecycle::{init_env, init_state};
 use crate::memory::get_upgrades_memory;
 use crate::{mutate_state, Data};
+use candid::Principal;
 use canister_logger::LogEntry;
 use canister_tracing_macros::trace;
+use chat_events::OPENCHAT_BOT_USER_ID;
 use ic_cdk::post_upgrade;
 use stable_memory::get_reader;
 use tracing::info;
@@ -23,9 +25,20 @@ fn post_upgrade(args: Args) {
 
     info!(version = %args.wasm_version, "Post-upgrade complete");
 
+    let oc_controlled_bots = [
+        OPENCHAT_BOT_USER_ID,                                                // OC Bot
+        Principal::from_text("62rh2-kiaaa-aaaaf-bmy5q-cai").unwrap().into(), // AirdropBot
+        Principal::from_text("iywa7-ayaaa-aaaaf-aemga-cai").unwrap().into(), // ProposalsBot
+    ];
+
     mutate_state(|state| {
         for chat in state.data.direct_chats.iter_mut() {
             chat.events.populate_search_index();
         }
+
+        state
+            .data
+            .direct_chats
+            .set_user_type_for_oc_controlled_bots(&oc_controlled_bots);
     });
 }
diff --git a/backend/canisters/user/impl/src/model/direct_chat.rs b/backend/canisters/user/impl/src/model/direct_chat.rs
@@ -19,13 +19,15 @@ pub struct DirectChat {
     pub read_by_them_up_to: Timestamped<Option<MessageIndex>>,
     pub notifications_muted: Timestamped<bool>,
     pub archived: Timestamped<bool>,
-    pub is_bot: bool,
-    #[serde(default)]
     pub user_type: UserType,
     pub unconfirmed: Vec<SendMessageArgs>,
 }
 
 impl DirectChat {
+    pub fn set_user_as_ic_controlled_bot(&mut self) {
+        self.user_type = UserType::OcControlledBot;
+    }
+
     pub fn new(
         them: UserId,
         user_type: UserType,
@@ -42,7 +44,6 @@ impl DirectChat {
             read_by_them_up_to: Timestamped::new(None, now),
             notifications_muted: Timestamped::new(false, now),
             archived: Timestamped::new(false, now),
-            is_bot: user_type.is_bot(),
             user_type,
             unconfirmed: Vec::new(),
         }

diff --git a/backend/canisters/user/impl/src/model/direct_chats.rs b/backend/canisters/user/impl/src/model/direct_chats.rs
@@ -14,6 +14,14 @@ pub struct DirectChats {
 }
 
 impl DirectChats {
+    pub fn set_user_type_for_oc_controlled_bots(&mut self, oc_controlled_bots: &[UserId]) {
+        for user_id in oc_controlled_bots {
+            if let Some(chat) = self.direct_chats.get_mut(&ChatId::from(*user_id)) {
+                chat.set_user_as_ic_controlled_bot();
+            }
+        }
+    }
+
     pub fn get(&self, chat_id: &ChatId) -> Option<&DirectChat> {
         self.direct_chats.get(chat_id)
     }