Custom typing indicators

Author: TaeHagen

src/imessage/aps_client.rs

@@ -236,7 +236,7 @@ impl IMClient {
                 cv_name: None,
                 sender_guid: None,
                 after_guid: None,
-            }), Message::Typing(true)).ok())
+            }), Message::Typing(true, None)).ok())
         }
 
         // errors

src/imessage/messages.rs

@@ -1589,6 +1589,12 @@ impl SetTranscriptBackgroundMessage {
     }
 }
 
+#[derive(Clone)]
+pub struct TypingApp {
+    pub bundle_id: String,
+    pub icon: Vec<u8>,
+}
+
 #[repr(C)]
 #[derive(Clone)]
 pub enum Message {
@@ -1598,7 +1604,7 @@ pub enum Message {
     React(ReactMessage),
     Delivered,
     Read,
-    Typing(bool),
+    Typing(bool, Option<TypingApp>),
     Unsend(UnsendMessage),
     Edit(EditMessage),
     IconChange(IconChangeMessage),
@@ -1652,7 +1658,7 @@ impl Message {
             Self::ChangeParticipants(_) => 190,
             Self::Delivered => 101,
             Self::Read => 102,
-            Self::Typing(_) => 100,
+            Self::Typing(_, _) => 100,
             Self::Edit(_) => 118,
             Self::Unsend(_) => 118,
             Self::IconChange(_) => 190,
@@ -1730,7 +1736,7 @@ impl Message {
             return Some(true)
         }
         match self {
-            Self::Typing(_) => Some(true),
+            Self::Typing(_, _) => Some(true),
             Self::Delivered => Some(true),
             Self::Edit(_) => Some(true),
             Self::Unsend(_) => Some(true),
@@ -1772,7 +1778,7 @@ impl fmt::Display for Message {
             Message::Delivered => {
                 write!(f, "delivered")
             },
-            Message::Typing(typing) => {
+            Message::Typing(typing, _) => {
                 write!(f, "{}", if *typing { "typing" } else { "stopped typing" })
             },
             Message::Edit(e) => {
@@ -1932,7 +1938,7 @@ impl MessageInst {
         match &self.message {
             Message::Read => false,
             Message::Delivered => false,
-            Message::Typing(typing) => self.conversation.as_ref().is_some_and(|a| a.participants.len() > 2) || !*typing,
+            Message::Typing(typing, app) => self.conversation.as_ref().is_some_and(|a| a.participants.len() > 2) || app.is_some() || !*typing,
             Message::MessageReadOnDevice => false,
             Message::PeerCacheInvalidate => false,
             Message::Unschedule => false,
@@ -1943,7 +1949,7 @@ impl MessageInst {
 
     pub fn get_ex(&self) -> Option<u32> {
         match &self.message {
-            Message::Typing(_) => Some(0),
+            Message::Typing(_, _) => Some(0),
             _ => None
         }
     }
@@ -1964,7 +1970,7 @@ impl MessageInst {
 
     pub fn get_send_participants(&self, my_handles: &[String]) -> Vec<String> {
         let mut target_participants = self.conversation.as_ref().unwrap().participants.clone();
-        if let Message::Delivered | Message::Typing(_) = self.message {
+        if let Message::Delivered | Message::Typing(_, _) = self.message {
             // do not send delivery reciepts to other devices on same acct
             target_participants.retain(|p| {
                 !my_handles.contains(p)
@@ -2127,16 +2133,18 @@ impl MessageInst {
                 };
                 plist_to_bin(&raw).unwrap()
             },
-            Message::Typing(typing) => {
+            Message::Typing(typing, app) => {
                 let raw = RawEncryptedTyping {
-                    participants: conversation.participants.clone(),
+                    participants: Some(conversation.participants.clone()),
                     sender_guid: conversation.sender_guid.clone(),
                     pv: 0,
                     gv: "8".to_string(),
                     v: if !*typing { Some("1".to_string()) } else { None },
                     cv_name: conversation.cv_name.clone(),
                     gt: if conversation.participants.len() > 2 { Some(true) } else { None },
                     u: if *typing { Some(true) } else { None },
+                    bundle_id: app.as_ref().map(|a| a.bundle_id.clone()),
+                    icon: app.as_ref().map(|a| gzip_normal(&a.icon).unwrap().into()),
                     ..Default::default()
                 };
 
@@ -2508,12 +2516,16 @@ impl MessageInst {
         }
         if wrapper.is_typing == Some(0) {
             if let Ok(loaded) = plist::from_value::<RawEncryptedTyping>(&value) {
+                debug!("Got typing");
                 return wrapper.to_message(Some(ConversationData { 
-                    participants: loaded.participants.clone(),
+                    participants: loaded.participants.clone().unwrap_or(vec![wrapper.sender.clone().expect("No sender?"), wrapper.target.clone().expect("No target?")]),
                     cv_name: loaded.cv_name.clone(),
                     sender_guid: loaded.sender_guid.clone(),
                     after_guid: None,
-                }), Message::Typing(loaded.u == Some(true)));
+                }), Message::Typing(loaded.u == Some(true), if let (Some(bid), Some(icon)) = (&loaded.bundle_id, loaded.icon) { Some(TypingApp { 
+                    bundle_id: bid.clone(), 
+                    icon: ungzip(icon.as_ref())?, 
+                }) } else { None }));
             }
         }
         if let Ok(loaded) = plist::from_value::<RawSmsDeactivateMessage>(&value) {

src/imessage/rawmessages.rs

@@ -370,7 +370,11 @@ struct RawMMCSBalloon {
 struct RawEncryptedTyping {
     pv: u32,
     #[serde(rename = "p")]
-    participants: Vec<String>,
+    participants: Option<Vec<String>>,
+    #[serde(rename = "tic")]
+    icon: Option<Data>,
+    #[serde(rename = "bid")]
+    bundle_id: Option<String>,
     u: Option<bool>,
     gt: Option<bool>,
     #[serde(rename = "gid")]

src/lib.rs

@@ -33,7 +33,7 @@ use async_trait::async_trait;
 pub use mmcs::{FileContainer, prepare_put};
 pub use omnisette::AnisetteProvider;
 use icloud_auth::LoginClientInfo;
-pub use imessage::messages::{SetTranscriptBackgroundMessage, UpdateProfileMessage, UpdateProfileSharingMessage, MessageInst, ShareProfileMessage, SharedPoster, ScheduleMode, PermanentDeleteMessage, OperatedChat, DeleteTarget, MoveToRecycleBinMessage, TextFormat, TextEffect, TextFlags, LinkMeta, LPLinkMetadata, ReactMessageType, ErrorMessage, Reaction, UnsendMessage, EditMessage, UpdateExtensionMessage, PartExtension, ReactMessage, ChangeParticipantMessage, LPImageMetadata, RichLinkImageAttachmentSubstitute, LPIconMetadata, AttachmentType, ExtensionApp, BalloonLayout, Balloon, ConversationData, Message, MessageType, Attachment, NormalMessage, RenameMessage, IconChangeMessage, MessageParts, MessagePart, MMCSFile, IndexedMessagePart};
+pub use imessage::messages::{TypingApp, SetTranscriptBackgroundMessage, UpdateProfileMessage, UpdateProfileSharingMessage, MessageInst, ShareProfileMessage, SharedPoster, ScheduleMode, PermanentDeleteMessage, OperatedChat, DeleteTarget, MoveToRecycleBinMessage, TextFormat, TextEffect, TextFlags, LinkMeta, LPLinkMetadata, ReactMessageType, ErrorMessage, Reaction, UnsendMessage, EditMessage, UpdateExtensionMessage, PartExtension, ReactMessage, ChangeParticipantMessage, LPImageMetadata, RichLinkImageAttachmentSubstitute, LPIconMetadata, AttachmentType, ExtensionApp, BalloonLayout, Balloon, ConversationData, Message, MessageType, Attachment, NormalMessage, RenameMessage, IconChangeMessage, MessageParts, MessagePart, MMCSFile, IndexedMessagePart};
 pub use imessage::aps_client::{IMClient, MADRID_SERVICE};
 use util::encode_hex;
 pub use util::{NSArrayClass, ResourceState, NSDictionaryClass, NSURL, NSArray, ResourceFailure};