Revert "api!(jsonrpc): chat_type now contains a variant of a string enum/union. Affected places: FullChat.chat_type, BasicChat.chat_type, ChatListItemFetchResult::ChatListItem.chat_type, Event:: SecurejoinInviterProgress.chat_type and MessageSearchResult.chat_type (#7285)"

iequidoo · iequidoo · commit 8f6ce74b43c7 · 2025-11-22T06:23:14.000-03:00
This reverts commit a3328ea.
diff --git a/deltachat-jsonrpc/src/api/types/chat.rs b/deltachat-jsonrpc/src/api/types/chat.rs
@@ -6,6 +6,7 @@ use deltachat::chat::{Chat, ChatId};
 use deltachat::constants::Chattype;
 use deltachat::contact::{Contact, ContactId};
 use deltachat::context::Context;
+use num_traits::cast::ToPrimitive;
 use serde::{Deserialize, Serialize};
 use typescript_type_def::TypeDef;
 
@@ -45,7 +46,7 @@ pub struct FullChat {
     archived: bool,
     pinned: bool,
     // subtitle  - will be moved to frontend because it uses translation functions
-    chat_type: JsonrpcChatType,
+    chat_type: u32,
     is_unpromoted: bool,
     is_self_talk: bool,
     contacts: Vec<ContactObject>,
@@ -129,7 +130,7 @@ impl FullChat {
             profile_image, //BLOBS ?
             archived: chat.get_visibility() == chat::ChatVisibility::Archived,
             pinned: chat.get_visibility() == chat::ChatVisibility::Pinned,
-            chat_type: chat.get_type().into(),
+            chat_type: chat.get_type().to_u32().context("unknown chat type id")?,
             is_unpromoted: chat.is_unpromoted(),
             is_self_talk: chat.is_self_talk(),
             contacts,
@@ -191,7 +192,7 @@ pub struct BasicChat {
     profile_image: Option<String>, //BLOBS ?
     archived: bool,
     pinned: bool,
-    chat_type: JsonrpcChatType,
+    chat_type: u32,
     is_unpromoted: bool,
     is_self_talk: bool,
     color: String,
@@ -219,7 +220,7 @@ impl BasicChat {
             profile_image, //BLOBS ?
             archived: chat.get_visibility() == chat::ChatVisibility::Archived,
             pinned: chat.get_visibility() == chat::ChatVisibility::Pinned,
-            chat_type: chat.get_type().into(),
+            chat_type: chat.get_type().to_u32().context("unknown chat type id")?,
             is_unpromoted: chat.is_unpromoted(),
             is_self_talk: chat.is_self_talk(),
             color,
@@ -273,37 +274,3 @@ impl JsonrpcChatVisibility {
         }
     }
 }
-
-#[derive(Clone, Serialize, Deserialize, PartialEq, TypeDef, schemars::JsonSchema)]
-#[serde(rename = "ChatType")]
-pub enum JsonrpcChatType {
-    Single,
-    Group,
-    Mailinglist,
-    OutBroadcast,
-    InBroadcast,
-}
-
-impl From<Chattype> for JsonrpcChatType {
-    fn from(chattype: Chattype) -> Self {
-        match chattype {
-            Chattype::Single => JsonrpcChatType::Single,
-            Chattype::Group => JsonrpcChatType::Group,
-            Chattype::Mailinglist => JsonrpcChatType::Mailinglist,
-            Chattype::OutBroadcast => JsonrpcChatType::OutBroadcast,
-            Chattype::InBroadcast => JsonrpcChatType::InBroadcast,
-        }
-    }
-}
-
-impl From<JsonrpcChatType> for Chattype {
-    fn from(chattype: JsonrpcChatType) -> Self {
-        match chattype {
-            JsonrpcChatType::Single => Chattype::Single,
-            JsonrpcChatType::Group => Chattype::Group,
-            JsonrpcChatType::Mailinglist => Chattype::Mailinglist,
-            JsonrpcChatType::OutBroadcast => Chattype::OutBroadcast,
-            JsonrpcChatType::InBroadcast => Chattype::InBroadcast,
-        }
-    }
-}
diff --git a/deltachat-jsonrpc/src/api/types/chat_list.rs b/deltachat-jsonrpc/src/api/types/chat_list.rs
@@ -11,7 +11,6 @@ use num_traits::cast::ToPrimitive;
 use serde::Serialize;
 use typescript_type_def::TypeDef;
 
-use super::chat::JsonrpcChatType;
 use super::color_int_to_hex_string;
 use super::message::MessageViewtype;
 
@@ -24,7 +23,7 @@ pub enum ChatListItemFetchResult {
         name: String,
         avatar_path: Option<String>,
         color: String,
-        chat_type: JsonrpcChatType,
+        chat_type: u32,
         last_updated: Option<i64>,
         summary_text1: String,
         summary_text2: String,
@@ -152,7 +151,7 @@ pub(crate) async fn get_chat_list_item_by_id(
         name: chat.get_name().to_owned(),
         avatar_path,
         color,
-        chat_type: chat.get_type().into(),
+        chat_type: chat.get_type().to_u32().context("unknown chat type id")?,
         last_updated,
         summary_text1,
         summary_text2,
diff --git a/deltachat-jsonrpc/src/api/types/events.rs b/deltachat-jsonrpc/src/api/types/events.rs
@@ -1,9 +1,8 @@
 use deltachat::{Event as CoreEvent, EventType as CoreEventType};
+use num_traits::ToPrimitive;
 use serde::Serialize;
 use typescript_type_def::TypeDef;
 
-use super::chat::JsonrpcChatType;
-
 #[derive(Serialize, TypeDef, schemars::JsonSchema)]
 #[serde(rename_all = "camelCase")]
 pub struct Event {
@@ -308,7 +307,7 @@ pub enum EventType {
         /// The type of the joined chat.
         /// This can take the same values
         /// as `BasicChat.chatType` ([`crate::api::types::chat::BasicChat::chat_type`]).
-        chat_type: JsonrpcChatType,
+        chat_type: u32,
         /// ID of the chat in case of success.
         chat_id: u32,
 
@@ -571,7 +570,7 @@ impl From<CoreEventType> for EventType {
                 progress,
             } => SecurejoinInviterProgress {
                 contact_id: contact_id.to_u32(),
-                chat_type: chat_type.into(),
+                chat_type: chat_type.to_u32().unwrap_or(0),
                 chat_id: chat_id.to_u32(),
                 progress,
             },
diff --git a/deltachat-jsonrpc/src/api/types/message.rs b/deltachat-jsonrpc/src/api/types/message.rs
@@ -16,7 +16,6 @@ use num_traits::cast::ToPrimitive;
 use serde::{Deserialize, Serialize};
 use typescript_type_def::TypeDef;
 
-use super::chat::JsonrpcChatType;
 use super::color_int_to_hex_string;
 use super::contact::ContactObject;
 use super::reactions::JsonrpcReactions;
@@ -532,7 +531,7 @@ pub struct MessageSearchResult {
     chat_profile_image: Option<String>,
     chat_color: String,
     chat_name: String,
-    chat_type: JsonrpcChatType,
+    chat_type: u32,
     is_chat_contact_request: bool,
     is_chat_archived: bool,
     message: String,
@@ -570,7 +569,7 @@ impl MessageSearchResult {
             chat_id: chat.id.to_u32(),
             chat_name: chat.get_name().to_owned(),
             chat_color,
-            chat_type: chat.get_type().into(),
+            chat_type: chat.get_type().to_u32().context("unknown chat type id")?,
             chat_profile_image,
             is_chat_contact_request: chat.is_contact_request(),
             is_chat_archived: chat.get_visibility() == ChatVisibility::Archived,
diff --git a/deltachat-jsonrpc/typescript/scripts/generate-constants.js b/deltachat-jsonrpc/typescript/scripts/generate-constants.js
@@ -45,30 +45,15 @@ const constants = data
       key.startsWith("DC_SOCKET_") ||
       key.startsWith("DC_LP_AUTH_") ||
       key.startsWith("DC_PUSH_") ||
-      key.startsWith("DC_TEXT1_") ||
-      key.startsWith("DC_CHAT_TYPE")
+      key.startsWith("DC_TEXT1_")
     );
   })
   .map((row) => {
-    return `  export const ${row.key} = ${row.value};`;
+    return `  ${row.key}: ${row.value}`;
   })
-  .join("\n");
+  .join(",\n");
 
 writeFileSync(
   resolve(__dirname, "../generated/constants.ts"),
-  `// Generated!
-
-export namespace C {
-${constants}
-  /** @deprecated 10-8-2025 compare string directly with \`== "Group"\` */
-  export const DC_CHAT_TYPE_GROUP = "Group";
-  /** @deprecated 10-8-2025 compare string directly with \`== "InBroadcast"\`*/
-  export const DC_CHAT_TYPE_IN_BROADCAST = "InBroadcast";
-  /** @deprecated 10-8-2025 compare string directly with \`== "Mailinglist"\` */
-  export const DC_CHAT_TYPE_MAILINGLIST = "Mailinglist";
-  /** @deprecated 10-8-2025 compare string directly with \`== "OutBroadcast"\` */
-  export const DC_CHAT_TYPE_OUT_BROADCAST = "OutBroadcast";
-  /** @deprecated 10-8-2025 compare string directly with \`== "Single"\` */
-  export const DC_CHAT_TYPE_SINGLE = "Single";
-}\n`,
+  `// Generated!\n\nexport enum C {\n${constants.replace(/:/g, " =")},\n}\n`,
 );
diff --git a/deltachat-rpc-client/src/deltachat_rpc_client/const.py b/deltachat-rpc-client/src/deltachat_rpc_client/const.py
@@ -91,17 +91,19 @@ class ChatId(IntEnum):
     LAST_SPECIAL = 9
 
 
-class ChatType(str, Enum):
+class ChatType(IntEnum):
     """Chat type."""
 
-    SINGLE = "Single"
+    UNDEFINED = 0
+
+    SINGLE = 100
     """1:1 chat, i.e. a direct chat with a single contact"""
 
-    GROUP = "Group"
+    GROUP = 120
 
-    MAILINGLIST = "Mailinglist"
+    MAILINGLIST = 140
 
-    OUT_BROADCAST = "OutBroadcast"
+    OUT_BROADCAST = 160
     """Outgoing broadcast channel, called "Channel" in the UI.
 
     The user can send into this channel,
@@ -113,7 +115,7 @@ class ChatType(str, Enum):
     which would make it hard to grep for it.
     """
 
-    IN_BROADCAST = "InBroadcast"
+    IN_BROADCAST = 165
     """Incoming broadcast channel, called "Channel" in the UI.
 
     This channel is read-only,
