rename JSONRPCChatType to JsonrpcChatType

Author: Simon-Laux

deltachat-jsonrpc/src/api/types/chat.rs

@@ -45,7 +45,7 @@ pub struct FullChat {
     archived: bool,
     pinned: bool,
     // subtitle  - will be moved to frontend because it uses translation functions
-    chat_type: JSONRPCChatType,
+    chat_type: JsonrpcChatType,
     is_unpromoted: bool,
     is_self_talk: bool,
     contacts: Vec<ContactObject>,
@@ -191,7 +191,7 @@ pub struct BasicChat {
     profile_image: Option<String>, //BLOBS ?
     archived: bool,
     pinned: bool,
-    chat_type: JSONRPCChatType,
+    chat_type: JsonrpcChatType,
     is_unpromoted: bool,
     is_self_talk: bool,
     color: String,
@@ -276,34 +276,34 @@ impl JsonrpcChatVisibility {
 
 #[derive(Clone, Serialize, Deserialize, PartialEq, TypeDef, schemars::JsonSchema)]
 #[serde(rename = "ChatType")]
-pub enum JSONRPCChatType {
+pub enum JsonrpcChatType {
     Single,
     Group,
     Mailinglist,
     OutBroadcast,
     InBroadcast,
 }
 
-impl From<Chattype> for JSONRPCChatType {
+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,
+            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 {
+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,
+            JsonrpcChatType::Single => Chattype::Single,
+            JsonrpcChatType::Group => Chattype::Group,
+            JsonrpcChatType::Mailinglist => Chattype::Mailinglist,
+            JsonrpcChatType::OutBroadcast => Chattype::OutBroadcast,
+            JsonrpcChatType::InBroadcast => Chattype::InBroadcast,
         }
     }
 }

deltachat-jsonrpc/src/api/types/chat_list.rs

@@ -11,7 +11,7 @@ use num_traits::cast::ToPrimitive;
 use serde::Serialize;
 use typescript_type_def::TypeDef;
 
-use super::chat::JSONRPCChatType;
+use super::chat::JsonrpcChatType;
 use super::color_int_to_hex_string;
 use super::message::MessageViewtype;
 
@@ -24,7 +24,7 @@ pub enum ChatListItemFetchResult {
         name: String,
         avatar_path: Option<String>,
         color: String,
-        chat_type: JSONRPCChatType,
+        chat_type: JsonrpcChatType,
         last_updated: Option<i64>,
         summary_text1: String,
         summary_text2: String,

deltachat-jsonrpc/src/api/types/events.rs

@@ -2,7 +2,7 @@ use deltachat::{Event as CoreEvent, EventType as CoreEventType};
 use serde::Serialize;
 use typescript_type_def::TypeDef;
 
-use super::chat::JSONRPCChatType;
+use super::chat::JsonrpcChatType;
 
 #[derive(Serialize, TypeDef, schemars::JsonSchema)]
 #[serde(rename_all = "camelCase")]
@@ -308,7 +308,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: JsonrpcChatType,
         /// ID of the chat in case of success.
         chat_id: u32,
 

deltachat-jsonrpc/src/api/types/message.rs

@@ -16,7 +16,7 @@ use num_traits::cast::ToPrimitive;
 use serde::{Deserialize, Serialize};
 use typescript_type_def::TypeDef;
 
-use super::chat::JSONRPCChatType;
+use super::chat::JsonrpcChatType;
 use super::color_int_to_hex_string;
 use super::contact::ContactObject;
 use super::reactions::JsonrpcReactions;
@@ -532,8 +532,7 @@ pub struct MessageSearchResult {
     chat_profile_image: Option<String>,
     chat_color: String,
     chat_name: String,
-    chat_type: u32,
-    chat_type: JSONRPCChatType,
+    chat_type: JsonrpcChatType,
     is_chat_contact_request: bool,
     is_chat_archived: bool,
     message: String,