Fix User usages after refactor

Author: Lonami

lib/grammers-client/src/types/chat/mod.rs

@@ -105,17 +105,16 @@ impl Chat {
 
     pub(crate) fn unpack(packed: PackedChat) -> Self {
         match packed.ty {
-            PackedType::User => {
-                let mut user = User::from_raw(tl::types::UserEmpty { id: packed.id }.into());
-                user.raw.access_hash = packed.access_hash;
-                Chat::User(user)
-            }
-            PackedType::Bot => {
-                let mut user = User::from_raw(tl::types::UserEmpty { id: packed.id }.into());
-                user.raw.access_hash = packed.access_hash;
-                user.raw.bot = true;
-                Chat::User(user)
-            }
+            PackedType::User => Chat::User(User::empty_with_hash_and_bot(
+                packed.id,
+                packed.access_hash,
+                false,
+            )),
+            PackedType::Bot => Chat::User(User::empty_with_hash_and_bot(
+                packed.id,
+                packed.access_hash,
+                true,
+            )),
             PackedType::Chat => Chat::Group(Group::from_raw(
                 tl::types::ChatEmpty { id: packed.id }.into(),
             )),
@@ -180,9 +179,12 @@ impl Chat {
     // is missing).
     pub(crate) fn get_min_hash_ref(&mut self) -> Option<(&mut bool, &mut i64)> {
         match self {
-            Self::User(user) => match (&mut user.raw.min, user.raw.access_hash.as_mut()) {
-                (m @ true, Some(ah)) => Some((m, ah)),
-                _ => None,
+            Self::User(user) => match &mut user.raw {
+                tl::enums::User::User(raw) => match (&mut raw.min, raw.access_hash.as_mut()) {
+                    (m @ true, Some(ah)) => Some((m, ah)),
+                    _ => None,
+                },
+                tl::enums::User::Empty(_) => None,
             },
             // Small group chats don't have an `access_hash` to begin with.
             Self::Group(_group) => None,

lib/grammers-client/src/types/chat/user.rs

@@ -77,7 +77,57 @@ impl User {
         Self { raw: user }
     }
 
-    fn user(&self) -> Option<&tl::types::User> {
+    pub(crate) fn empty_with_hash_and_bot(id: i64, access_hash: Option<i64>, bot: bool) -> Self {
+        Self {
+            raw: tl::enums::User::User(tl::types::User {
+                is_self: false,
+                contact: false,
+                mutual_contact: false,
+                deleted: false,
+                bot,
+                bot_chat_history: false,
+                bot_nochats: false,
+                verified: false,
+                restricted: false,
+                min: false, // not min because the input hash is not a min hash
+                bot_inline_geo: false,
+                support: false,
+                scam: false,
+                apply_min_photo: false,
+                fake: false,
+                bot_attach_menu: false,
+                premium: false,
+                attach_menu_enabled: false,
+                bot_can_edit: false,
+                close_friend: false,
+                stories_hidden: false,
+                stories_unavailable: true,
+                contact_require_premium: false,
+                bot_business: false,
+                bot_has_main_app: false,
+                id,
+                access_hash,
+                first_name: None,
+                last_name: None,
+                username: None,
+                phone: None,
+                photo: None,
+                status: None,
+                bot_info_version: None,
+                restriction_reason: None,
+                bot_inline_placeholder: None,
+                lang_code: None,
+                emoji_status: None,
+                usernames: None,
+                stories_max_id: None,
+                color: None,
+                profile_color: None,
+                bot_active_users: None,
+            }),
+        }
+    }
+
+    pub(crate) fn user(&self) -> Option<&tl::types::User> {
         match &self.raw {
             tl::enums::User::User(u) => Some(u),
             tl::enums::User::Empty(_) => None,