Use typed command in BotCommandClaims

Cargo.toml

@@ -1,8 +1,6 @@
 [workspace]
 members = [
     "backend/benchmarks",
-    "backend/bots/api",
-    "backend/bots/c2c_client",
     "backend/canisters/airdrop_bot/api",
     "backend/canisters/airdrop_bot/client",
     "backend/canisters/airdrop_bot/impl",
@@ -110,6 +108,8 @@ members = [
     "backend/external_canisters/sonic/api",
     "backend/external_canisters/sonic/c2c_client",
     "backend/integration_tests",
+    "backend/legacy_bots/api",
+    "backend/legacy_bots/c2c_client",
     "backend/libraries/activity_notification_state",
     "backend/libraries/candid_gen",
     "backend/libraries/canister_agent_utils",
@@ -191,6 +191,7 @@ futures = "0.3.30"
 getrandom = { version = "0.2.15", features = ["custom"] }
 hex = "0.4.3"
 hmac-sha256 = { version = "1.1.7", features = ["traits010"] }
+http = "1.1.0"
 ic-agent = "0.39.1"
 ic-canister-sig-creation = "1.1.0"
 ic-captcha = "1.0.0"
@@ -200,6 +201,7 @@ ic-cdk-macros = "0.17.0"
 ic-cdk-timers = "0.11.0"
 ic-certificate-verification = "2.4.0"
 ic-certification = "2.5.0"
+ic-http-certification = "2.5.0"
 ic-ledger-types = "0.14.0"
 ic_principal = "0.1.1"
 ic-stable-structures = "0.6.7"

backend/canisters/airdrop_bot/api/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bot_api = { path = "../../../bots/api" }
+legacy_bot_api = { path = "../../../legacy_bots/api" }
 candid = { workspace = true }
 candid_gen = { path = "../../../libraries/candid_gen" }
 serde = { workspace = true }

backend/canisters/airdrop_bot/api/src/updates/handle_direct_message.rs

@@ -1 +1 @@
-pub use bot_api::handle_direct_message::{Response::*, *};
+pub use legacy_bot_api::handle_direct_message::{Response::*, *};

backend/canisters/community/CHANGELOG.md

@@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Log response if `delete_channel` fails ([#7152](https://github.com/open-chat-labs/open-chat/pull/7152))
 - Introduce `StableMemoryMap` trait to simplify storing in stable memory ([#7176](https://github.com/open-chat-labs/open-chat/pull/7176))
 - When disappearing messages expire delete any linked files ([#7184](https://github.com/open-chat-labs/open-chat/pull/7184))
+- Use typed command in `BotCommandClaims` ([#7113](https://github.com/open-chat-labs/open-chat/pull/7113))
 
 ### Fixed
 

backend/canisters/community/impl/src/queries/c2c_can_issue_access_token_for_channel.rs

@@ -5,7 +5,7 @@ use canister_api_macros::query;
 use community_canister::c2c_can_issue_access_token_for_channel::*;
 use group_chat_core::{GroupChatCore, GroupRoleInternal};
 use types::{CheckAccessTokenType, VideoCallType};
-use utils::bots::can_execute_bot_command;
+use utils::bots::can_bot_execute_action;
 
 #[query(guard = "caller_is_local_user_index", msgpack = true)]
 fn c2c_can_issue_access_token_for_channel(args: Args) -> Response {
@@ -37,7 +37,7 @@ fn c2c_can_issue_access_token_for_channel_impl(args: Args, state: &RuntimeState)
                 return false;
             };
 
-            can_execute_bot_command(&c.permissions, granted_to_bot, &granted_to_user)
+            can_bot_execute_action(&c.permissions, granted_to_bot, &granted_to_user)
         }
     }
 }

backend/canisters/community/impl/src/updates/c2c_handle_bot_action.rs

@@ -7,7 +7,7 @@ use community_canister::c2c_handle_bot_action::*;
 use community_canister::send_message;
 use types::bot_actions::MessageContent;
 use types::{BotAction, BotCaller, Chat, HandleBotActionsError, MessageContentInitial};
-use utils::bots::can_execute_bot_command;
+use utils::bots::can_bot_execute_action;
 
 #[update(guard = "caller_is_local_user_index", msgpack = true)]
 #[trace]
@@ -22,7 +22,7 @@ fn c2c_handle_bot_action_impl(args: Args, state: &mut RuntimeState) -> Response
         return Err(HandleBotActionsError::Frozen);
     }
 
-    if !is_bot_permitted_to_execute_command(&args, state) {
+    if !is_bot_permitted_to_execute_action(&args, state) {
         return Err(HandleBotActionsError::NotAuthorized);
     }
 
@@ -62,7 +62,7 @@ fn c2c_handle_bot_action_impl(args: Args, state: &mut RuntimeState) -> Response
                 Some(BotCaller {
                     bot: args.bot.user_id,
                     initiator: args.initiator,
-                    command_text: args.command_text,
+                    command: args.command,
                     finalised: action.finalised,
                 }),
                 state,
@@ -74,7 +74,7 @@ fn c2c_handle_bot_action_impl(args: Args, state: &mut RuntimeState) -> Response
     }
 }
 
-fn is_bot_permitted_to_execute_command(args: &Args, state: &RuntimeState) -> bool {
+fn is_bot_permitted_to_execute_action(args: &Args, state: &RuntimeState) -> bool {
     let Chat::Channel(_, channel_id) = args.chat else {
         unreachable!()
     };
@@ -92,5 +92,5 @@ fn is_bot_permitted_to_execute_command(args: &Args, state: &RuntimeState) -> boo
     // Get the permissions required to execute the given action
     let permissions_required = args.action.permissions_required();
 
-    can_execute_bot_command(&permissions_required, granted_to_bot, &granted_to_user)
+    can_bot_execute_action(&permissions_required, granted_to_bot, &granted_to_user)
 }

backend/canisters/group/CHANGELOG.md

@@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Log error if tip fails due to recipient mismatch ([#7151](https://github.com/open-chat-labs/open-chat/pull/7151))
 - Introduce `StableMemoryMap` trait to simplify storing in stable memory ([#7176](https://github.com/open-chat-labs/open-chat/pull/7176))
 - When disappearing messages expire delete any linked files ([#7184](https://github.com/open-chat-labs/open-chat/pull/7184))
+- Use typed command in `BotCommandClaims` ([#7113](https://github.com/open-chat-labs/open-chat/pull/7113))
 
 ### Removed
 

backend/canisters/group/impl/src/queries/c2c_can_issue_access_token.rs

@@ -5,7 +5,7 @@ use canister_api_macros::query;
 use group_canister::c2c_can_issue_access_token::*;
 use group_chat_core::{GroupChatCore, GroupRoleInternal};
 use types::{CheckAccessTokenType, VideoCallType};
-use utils::bots::can_execute_bot_command;
+use utils::bots::can_bot_execute_action;
 
 #[query(guard = "caller_is_local_user_index", msgpack = true)]
 fn c2c_can_issue_access_token(args: Args) -> Response {
@@ -31,7 +31,7 @@ fn c2c_can_issue_access_token_impl(args: Args, state: &RuntimeState) -> bool {
                 return false;
             };
 
-            can_execute_bot_command(&c.permissions, granted_to_bot, &granted_to_user)
+            can_bot_execute_action(&c.permissions, granted_to_bot, &granted_to_user)
         }
     }
 }

backend/canisters/group/impl/src/updates/c2c_handle_bot_action.rs

@@ -8,7 +8,7 @@ use group_canister::send_message_v2;
 use types::bot_actions::MessageContent;
 use types::HandleBotActionsError;
 use types::{BotAction, BotCaller, MessageContentInitial};
-use utils::bots::can_execute_bot_command;
+use utils::bots::can_bot_execute_action;
 
 #[update(guard = "caller_is_local_user_index", msgpack = true)]
 #[trace]
@@ -23,7 +23,7 @@ fn c2c_handle_bot_action_impl(args: Args, state: &mut RuntimeState) -> Response
         return Err(HandleBotActionsError::Frozen);
     }
 
-    if !is_bot_permitted_to_execute_command(&args, state) {
+    if !is_bot_permitted_to_execute_action(&args, state) {
         return Err(HandleBotActionsError::NotAuthorized);
     }
 
@@ -58,7 +58,7 @@ fn c2c_handle_bot_action_impl(args: Args, state: &mut RuntimeState) -> Response
                 Some(BotCaller {
                     bot: args.bot.user_id,
                     initiator: args.initiator,
-                    command_text: args.command_text,
+                    command: args.command,
                     finalised: action.finalised,
                 }),
                 state,
@@ -70,7 +70,7 @@ fn c2c_handle_bot_action_impl(args: Args, state: &mut RuntimeState) -> Response
     }
 }
 
-fn is_bot_permitted_to_execute_command(args: &Args, state: &RuntimeState) -> bool {
+fn is_bot_permitted_to_execute_action(args: &Args, state: &RuntimeState) -> bool {
     // Get the permissions granted to the bot in this community
     let Some(granted_to_bot) = state.data.get_bot_permissions(&args.bot.user_id) else {
         return false;
@@ -84,5 +84,5 @@ fn is_bot_permitted_to_execute_command(args: &Args, state: &RuntimeState) -> boo
     // Get the permissions required to execute the given action
     let permissions_required = args.action.permissions_required();
 
-    can_execute_bot_command(&permissions_required, granted_to_bot, &granted_to_user)
+    can_bot_execute_action(&permissions_required, granted_to_bot, &granted_to_user)
 }

backend/canisters/local_user_index/CHANGELOG.md

@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 - Add optional `placeholder` field to `SlashCommandSchema` ([#7172](https://github.com/open-chat-labs/open-chat/pull/7172))
 - Introduce `StableMemoryMap` trait to simplify storing in stable memory ([#7176](https://github.com/open-chat-labs/open-chat/pull/7176))
+- Use typed command in `BotCommandClaims` ([#7113](https://github.com/open-chat-labs/open-chat/pull/7113))
 
 ## [[2.0.1547](https://github.com/open-chat-labs/open-chat/releases/tag/v2.0.1547-local_user_index)] - 2025-01-06
 

backend/canisters/local_user_index/api/src/updates/mod.rs

@@ -5,7 +5,7 @@ pub mod c2c_notify_user_events;
 pub mod c2c_notify_user_index_events;
 pub mod c2c_push_wasm_chunk;
 pub mod c2c_upgrade_user_canister_wasm;
-pub mod execute_bot_command;
+pub mod execute_bot_action;
 pub mod invite_users_to_channel;
 pub mod invite_users_to_community;
 pub mod invite_users_to_group;

backend/canisters/local_user_index/impl/src/lifecycle/inspect_message.rs

@@ -17,7 +17,7 @@ fn accept_if_valid(state: &RuntimeState) {
         | "join_community"
         | "join_group"
         | "report_message_v2" => state.is_caller_openchat_user(),
-        "register_user" | "execute_bot_command" => true,
+        "register_user" | "execute_bot_action" => true,
         _ => false,
     };
 

backend/canisters/local_user_index/impl/src/queries/access_token.rs

@@ -8,7 +8,7 @@ use rand::rngs::StdRng;
 use rand::SeedableRng;
 use serde::Serialize;
 use types::{
-    AccessTokenType, BotCommandClaims, ChannelId, Chat, ChatId, CheckAccessTokenType, CheckBotCommandArgs, CommunityId,
+    AccessTokenType, BotCommandClaims, ChannelId, Chat, ChatId, CheckAccessTokenBotCommand, CheckAccessTokenType, CommunityId,
     JoinOrEndVideoCallClaims, StartVideoCallClaims, UserId,
 };
 
@@ -69,9 +69,7 @@ async fn access_token(args: Args) -> Response {
                 chat: bc.chat.into(),
                 thread_root_message_index: bc.thread_root_message_index,
                 message_id: bc.message_id,
-                command_name: bc.command_name,
-                command_args: bc.command_args,
-                command_text: bc.command_text,
+                command: bc.command,
                 bot_api_gateway: state.env.canister_id(),
             };
             build_token(token_type_name, custom_claims, state)
@@ -105,23 +103,23 @@ fn prepare(args: &Args, state: &RuntimeState) -> Result<PrepareResult, Response>
         }
         AccessTokenType::JoinVideoCall => CheckAccessTokenType::JoinVideoCall,
         AccessTokenType::MarkVideoCallAsEnded => CheckAccessTokenType::MarkVideoCallAsEnded,
-        AccessTokenType::BotCommand(cmd) => {
+        AccessTokenType::BotCommand(access_token) => {
             let Some(permissions) = state
                 .data
                 .bots
-                .get(&cmd.bot)
-                .and_then(|b| b.commands.iter().find(|c| c.name == cmd.command_name))
+                .get(&access_token.bot)
+                .and_then(|b| b.commands.iter().find(|c| c.name == access_token.command.name))
                 .map(|c| c.permissions.clone())
             else {
                 return Err(Response::NotAuthorized);
             };
 
-            CheckAccessTokenType::BotCommand(CheckBotCommandArgs {
-                user_id: cmd.user_id,
-                bot: cmd.bot,
-                chat: cmd.chat,
-                thread_root_message_index: cmd.thread_root_message_index,
-                message_id: cmd.message_id,
+            CheckAccessTokenType::BotCommand(CheckAccessTokenBotCommand {
+                user_id: access_token.user_id,
+                bot: access_token.bot,
+                chat: access_token.chat,
+                thread_root_message_index: access_token.thread_root_message_index,
+                message_id: access_token.message_id,
                 permissions,
             })
         }