From 266045e8edcff3bac873862345829e7fbdb751d6 Mon Sep 17 00:00:00 2001
From: YuraIz <7516890@gmail.com>
Date: Sat, 19 Nov 2022 21:06:18 +0300
Subject: [PATCH 1/4] chat-info-members: Add GtkListBox with chat members

---
 data/resources/ui/content-chat-info-window.ui | 135 ++++++++++++------
 src/session/content/chat_info_window.rs       | 126 +++++++++++++++-
 2 files changed, 216 insertions(+), 45 deletions(-)

diff --git a/data/resources/ui/content-chat-info-window.ui b/data/resources/ui/content-chat-info-window.ui
index 91d7c5001..a57eaf26b 100644
--- a/data/resources/ui/content-chat-info-window.ui
+++ b/data/resources/ui/content-chat-info-window.ui
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <template class="ContentChatInfoWindow" parent="AdwWindow">
-    <property name="default-width">360</property>
+    <property name="default-width">400</property>
+    <property name="default-height">600</property>
     <property name="modal">True</property>
     <style>
       <class name="chat-info"/>
@@ -12,10 +13,11 @@
           <object class="GtkBox">
             <property name="orientation">vertical</property>
             <child>
-              <object class="GtkHeaderBar">
+              <object class="AdwHeaderBar">
+                <property name="centering-policy">strict</property>
                 <property name="title-widget">
-                  <object class="AdwWindowTitle">
-                    <property name="visible">False</property>
+                  <object class="AdwViewSwitcherTitle" id="title">
+                    <property name="stack">stack</property>
                   </object>
                 </property>
                 <style>
@@ -24,46 +26,97 @@
               </object>
             </child>
             <child>
-              <object class="AdwClamp">
-                <property name="child">
-                  <object class="GtkBox">
-                    <property name="orientation">vertical</property>
-                    <style>
-                      <class name="main-page"/>
-                    </style>
-                    <child>
-                      <object class="ComponentsAvatar">
-                        <property name="size">128</property>
-                        <binding name="item">
-                          <lookup name="chat">ContentChatInfoWindow</lookup>
-                        </binding>
+              <object class="AdwViewStack" id="stack">
+                <property name="vexpand">true</property>
+                <child>
+                  <object class="AdwViewStackPage">
+                    <property name="name">info</property>
+                    <property name="title" translatable="yes">Info</property>
+                    <property name="icon-name">help-about-symbolic</property>
+                    <property name="child">
+                      <object class="GtkScrolledWindow">
+                        <property name="child">
+                          <object class="AdwClamp">
+                            <property name="child">
+                              <object class="GtkBox">
+                                <property name="orientation">vertical</property>
+                                <style>
+                                  <class name="main-page"/>
+                                </style>
+                                <child>
+                                  <object class="ComponentsAvatar">
+                                    <property name="size">128</property>
+                                    <binding name="item">
+                                      <lookup name="chat">ContentChatInfoWindow</lookup>
+                                    </binding>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="name_label">
+                                    <property name="wrap">True</property>
+                                    <property name="justify">center</property>
+                                    <style>
+                                      <class name="title-1"/>
+                                    </style>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkInscription" id="subtitle_label">
+                                    <property name="text-overflow">ellipsize-end</property>
+                                    <property name="xalign">0.5</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkListBox" id="info_list">
+                                    <property name="selection-mode">none</property>
+                                    <style>
+                                      <class name="boxed-list"/>
+                                    </style>
+                                  </object>
+                                </child>
+                              </object>
+                            </property>
+                          </object>
+                        </property>
                       </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="name_label">
-                        <property name="wrap">True</property>
-                        <property name="justify">center</property>
-                        <style>
-                          <class name="title-1"/>
-                        </style>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkInscription" id="subtitle_label">
-                        <property name="text-overflow">ellipsize-middle</property>
-                        <property name="xalign">0.5</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkListBox" id="info_list">
-                        <property name="selection-mode">none</property>
-                        <style>
-                          <class name="boxed-list"/>
-                        </style>
+                    </property>
+                  </object>
+                </child>
+                <child>
+                  <object class="AdwViewStackPage" id="members_page">
+                    <property name="name">members</property>
+                    <property name="title" translatable="yes">Members</property>
+                    <property name="icon-name">avatar-default-symbolic</property>
+                    <property name="visible">false</property>
+                    <property name="child">
+                      <object class="GtkScrolledWindow">
+                        <property name="child">
+                          <object class="AdwClamp">
+                            <property name="maximum-size">440</property>
+                            <property name="tightening-threshold">200</property>
+                            <property name="child">
+                              <object class="GtkListBox" id="members_list">
+                                <property name="valign">center</property>
+                                <property name="selection-mode">none</property>
+                                <style>
+                                  <class name="boxed-list"/>
+                                </style>
+                              </object>
+                            </property>
+                          </object>
+                        </property>
                       </object>
-                    </child>
+                    </property>
                   </object>
-                </property>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="AdwViewSwitcherBar">
+                <property name="stack">stack</property>
+                <binding name="reveal">
+                  <lookup name="title-visible">title</lookup>
+                </binding>
               </object>
             </child>
           </object>
diff --git a/src/session/content/chat_info_window.rs b/src/session/content/chat_info_window.rs
index bf1a3e3d2..5d29ecbd2 100644
--- a/src/session/content/chat_info_window.rs
+++ b/src/session/content/chat_info_window.rs
@@ -3,9 +3,11 @@ use gettextrs::gettext;
 use glib::{clone, closure};
 use gtk::subclass::prelude::*;
 use gtk::{glib, CompositeTemplate};
-use tdlib::enums::UserType;
+use tdlib::enums::ChatMembers::ChatMembers as TdChatMembers;
+use tdlib::enums::User::User as TdUser;
+use tdlib::enums::{ChatMemberStatus, MessageSender, UserType};
 use tdlib::functions;
-use tdlib::types::{BasicGroupFullInfo, SupergroupFullInfo};
+use tdlib::types::{BasicGroupFullInfo, ChatMember, ChatMembers, SupergroupFullInfo};
 
 use crate::i18n::ngettext_f;
 use crate::tdlib::{BasicGroup, BoxedUserStatus, Chat, ChatType, Supergroup, User};
@@ -29,6 +31,10 @@ mod imp {
         pub(super) subtitle_label: TemplateChild<gtk::Inscription>,
         #[template_child]
         pub(super) info_list: TemplateChild<gtk::ListBox>,
+        #[template_child]
+        pub(super) members_page: TemplateChild<adw::ViewStackPage>,
+        #[template_child]
+        pub(super) members_list: TemplateChild<gtk::ListBox>,
     }
 
     #[glib::object_subclass]
@@ -208,6 +214,11 @@ impl ChatInfoWindow {
             imp.info_list.append(&row);
         }
 
+        imp.members_page.set_visible(true);
+        spawn(clone!(@weak self as obj => async move {
+            obj.append_members(basic_group_full_info.members).await;
+        }));
+
         self.update_info_list_visibility();
     }
 
@@ -245,7 +256,7 @@ impl ChatInfoWindow {
             let result = functions::get_supergroup_full_info(supergroup_id, client_id).await;
             match result {
                 Ok(tdlib::enums::SupergroupFullInfo::SupergroupFullInfo(full_info)) => {
-                    obj.setup_supergroup_full_info(full_info);
+                    obj.setup_supergroup_full_info(supergroup_id, full_info);
                 }
                 Err(e) => {
                     log::warn!("Failed to get supergroup full info: {e:?}");
@@ -254,7 +265,12 @@ impl ChatInfoWindow {
         }));
     }
 
-    fn setup_supergroup_full_info(&self, supergroup_full_info: SupergroupFullInfo) {
+    fn setup_supergroup_full_info(
+        &self,
+        supergroup_id: i64,
+        supergroup_full_info: SupergroupFullInfo,
+    ) {
+        let client_id = self.chat().unwrap().session().client_id();
         let imp = self.imp();
 
         // Description
@@ -267,9 +283,111 @@ impl ChatInfoWindow {
             imp.info_list.append(&row);
         }
 
+        if supergroup_full_info.can_get_members {
+            imp.members_page.set_visible(true);
+            spawn(clone!(@weak self as obj => async move {
+                let limit = 200;
+                let mut offset = 0;
+                while let Ok(TdChatMembers(ChatMembers {members, total_count})) = functions::get_supergroup_members(
+                    supergroup_id,
+                    None,
+                    offset,
+                    limit,
+                    client_id,
+                ).await
+                {
+                    if offset > total_count {
+                        break;
+                    }
+
+                    obj.append_members(members).await;
+
+                    offset += limit;
+                }
+            }));
+        }
+
         self.update_info_list_visibility();
     }
 
+    async fn append_members(&self, members: Vec<ChatMember>) {
+        let session = self.chat().unwrap().session();
+        let client_id = session.client_id();
+
+        let members_list = &self.imp().members_list;
+
+        for member in members {
+            if let MessageSender::User(user) = member.member_id {
+                if let Ok(TdUser(user)) = functions::get_user(user.user_id, client_id).await {
+                    let user_row = adw::ActionRow::new();
+                    user_row.set_title_lines(1);
+                    user_row.set_subtitle_lines(1);
+
+                    let user = User::from_td_object(user, &session);
+
+                    let user_expression = gtk::ObjectExpression::new(&user);
+                    let name_expression = expressions::user_display_name(&user_expression);
+                    name_expression.bind(&user_row, "title", Some(&user));
+
+                    User::this_expression("status")
+                        .chain_closure::<String>(closure!(
+                            |_: Option<glib::Object>, status: BoxedUserStatus| {
+                                strings::user_status(&status.0)
+                            }
+                        ))
+                        .bind(&user_row, "subtitle", Some(&user));
+
+                    if let UserType::Bot(_) = user.type_().0 {
+                        user_row.set_subtitle(&gettext("bot"));
+                    } else {
+                        User::this_expression("status")
+                            .chain_closure::<String>(closure!(
+                                |_: Option<glib::Object>, status: BoxedUserStatus| {
+                                    strings::user_status(&status.0)
+                                }
+                            ))
+                            .bind(&user_row, "subtitle", Some(&user));
+                    };
+
+                    let avatar = crate::session::components::Avatar::new();
+
+                    avatar.set_item(Some(user.upcast()));
+                    avatar.set_size(32);
+                    user_row.add_prefix(&avatar);
+
+                    let status = match member.status {
+                        ChatMemberStatus::Creator(owner) => {
+                            let title = if owner.custom_title.is_empty() {
+                                gettext("Owner")
+                            } else {
+                                owner.custom_title
+                            };
+                            Some(title)
+                        }
+                        ChatMemberStatus::Administrator(admin) => {
+                            let title = if admin.custom_title.is_empty() {
+                                gettext("Admin")
+                            } else {
+                                admin.custom_title
+                            };
+                            Some(title)
+                        }
+                        _ => None,
+                    };
+
+                    if let Some(text) = status {
+                        let owner_label = gtk::Label::new(Some(&text));
+                        owner_label.set_yalign(0.2);
+                        owner_label.set_css_classes(&["caption", "accent"]);
+                        user_row.add_suffix(&owner_label);
+                    }
+
+                    members_list.append(&user_row);
+                }
+            }
+        }
+    }
+
     fn update_info_list_visibility(&self) {
         let info_list = &self.imp().info_list;
         info_list.set_visible(info_list.first_child().is_some());

From ede80af6ee136e3ce267fd98f094f4bbe77bb668 Mon Sep 17 00:00:00 2001
From: YuraIz <7516890@gmail.com>
Date: Sun, 8 Jan 2023 19:31:54 +0300
Subject: [PATCH 2/4] chat-info-members: Use GtkListView instead of GtkListBox

---
 data/resources/resources.gresource.xml        |   1 +
 data/resources/style.css                      |   4 +
 .../ui/components-chat-member-row.ui          |  50 +++++++
 data/resources/ui/content-chat-info-window.ui |  17 ++-
 src/session/components/chat_member_row.rs     |  91 ++++++++++++
 src/session/components/mod.rs                 |   2 +
 src/session/content/chat_info_window.rs       | 135 ++++++++----------
 src/tdlib/chat_member.rs                      |  62 ++++++++
 src/tdlib/mod.rs                              |   2 +
 9 files changed, 280 insertions(+), 84 deletions(-)
 create mode 100644 data/resources/ui/components-chat-member-row.ui
 create mode 100644 src/session/components/chat_member_row.rs
 create mode 100644 src/tdlib/chat_member.rs

diff --git a/data/resources/resources.gresource.xml b/data/resources/resources.gresource.xml
index a036852a8..b221ac773 100644
--- a/data/resources/resources.gresource.xml
+++ b/data/resources/resources.gresource.xml
@@ -13,6 +13,7 @@
     <file compressed="true" preprocess="xml-stripblanks">ui/add-account-row.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/avatar-with-selection.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/components-avatar.ui</file>
+    <file compressed="true" preprocess="xml-stripblanks">ui/components-chat-member-row.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/components-message-entry.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/content.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/content-chat-action-bar.ui</file>
diff --git a/data/resources/style.css b/data/resources/style.css
index 0efaeb116..0b5390d14 100644
--- a/data/resources/style.css
+++ b/data/resources/style.css
@@ -298,3 +298,7 @@ window.chat-info .main-page > avatar {
 window.chat-info .main-page > list {
   margin-top: 12px;
 }
+
+chatmember {
+  padding: 6px 0px;
+}
diff --git a/data/resources/ui/components-chat-member-row.ui b/data/resources/ui/components-chat-member-row.ui
new file mode 100644
index 000000000..04776af6b
--- /dev/null
+++ b/data/resources/ui/components-chat-member-row.ui
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <template class="ComponentsChatMemberRow" parent="GtkBox">
+    <property name="spacing">12</property>
+    <child>
+      <object class="ComponentsAvatar" id="avatar">
+        <property name="size">40</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkBox">
+        <property name="orientation">vertical</property>
+        <property name="valign">center</property>
+        <child>
+          <object class="GtkBox">
+            <property name="hexpand">True</property>
+            <child>
+              <object class="GtkLabel" id="user_name_label">
+                <style>
+                  <class name="heading"/>
+                </style>
+                <property name="ellipsize">end</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel" id="member_status_label">
+                <style>
+                  <class name="accent"/>
+                  <class name="caption"/>
+                </style>
+                <property name="hexpand">True</property>
+                <property name="xalign">1</property>
+                <property name="ellipsize">end</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkInscription" id="user_status_label">
+            <style>
+              <class name="dim-label"/>
+            </style>
+            <property name="xalign">0</property>
+            <property name="text-overflow">ellipsize-end</property>
+          </object>
+        </child>
+      </object>
+    </child>
+  </template>
+</interface>
diff --git a/data/resources/ui/content-chat-info-window.ui b/data/resources/ui/content-chat-info-window.ui
index a57eaf26b..5db9547d3 100644
--- a/data/resources/ui/content-chat-info-window.ui
+++ b/data/resources/ui/content-chat-info-window.ui
@@ -17,17 +17,15 @@
                 <property name="centering-policy">strict</property>
                 <property name="title-widget">
                   <object class="AdwViewSwitcherTitle" id="title">
+                    <property name="title" translatable="yes">Info</property>
                     <property name="stack">stack</property>
                   </object>
                 </property>
-                <style>
-                  <class name="flat"/>
-                </style>
               </object>
             </child>
             <child>
               <object class="AdwViewStack" id="stack">
-                <property name="vexpand">true</property>
+                <property name="vexpand">True</property>
                 <child>
                   <object class="AdwViewStackPage">
                     <property name="name">info</property>
@@ -91,15 +89,16 @@
                     <property name="child">
                       <object class="GtkScrolledWindow">
                         <property name="child">
-                          <object class="AdwClamp">
+                          <object class="AdwClampScrollable">
                             <property name="maximum-size">440</property>
                             <property name="tightening-threshold">200</property>
                             <property name="child">
-                              <object class="GtkListBox" id="members_list">
-                                <property name="valign">center</property>
-                                <property name="selection-mode">none</property>
+                              <object class="GtkListView" id="members_list">
+                                <property name="model">
+                                  <object class="GtkNoSelection" id="selection"/>
+                                </property>
                                 <style>
-                                  <class name="boxed-list"/>
+                                  <class name="navigation-sidebar"/>
                                 </style>
                               </object>
                             </property>
diff --git a/src/session/components/chat_member_row.rs b/src/session/components/chat_member_row.rs
new file mode 100644
index 000000000..27414f0d2
--- /dev/null
+++ b/src/session/components/chat_member_row.rs
@@ -0,0 +1,91 @@
+use crate::tdlib::ChatMember;
+use gettextrs::gettext;
+use gtk::prelude::*;
+use gtk::subclass::prelude::*;
+use gtk::{glib, CompositeTemplate};
+
+use super::Avatar;
+use crate::{expressions, strings};
+use tdlib::enums::{UserStatus, UserType};
+
+mod imp {
+    use super::*;
+    #[derive(Debug, Default, CompositeTemplate)]
+    #[template(resource = "/com/github/melix99/telegrand/ui/components-chat-member-row.ui")]
+    pub(crate) struct ChatMemberRow {
+        #[template_child]
+        pub(super) avatar: TemplateChild<Avatar>,
+        #[template_child]
+        pub(super) user_name_label: TemplateChild<gtk::Label>,
+        #[template_child]
+        pub(super) member_status_label: TemplateChild<gtk::Label>,
+        #[template_child]
+        pub(super) user_status_label: TemplateChild<gtk::Inscription>,
+    }
+
+    #[glib::object_subclass]
+    impl ObjectSubclass for ChatMemberRow {
+        const NAME: &'static str = "ComponentsChatMemberRow";
+        type Type = super::ChatMemberRow;
+        type ParentType = gtk::Box;
+
+        fn class_init(klass: &mut Self::Class) {
+            Self::bind_template(klass);
+            klass.set_css_name("chatmember");
+        }
+
+        fn instance_init(obj: &glib::subclass::InitializingObject<Self>) {
+            obj.init_template();
+        }
+    }
+
+    impl ObjectImpl for ChatMemberRow {
+        fn dispose(&self) {
+            self.avatar.unparent();
+            self.user_status_label.parent().unwrap().unparent();
+        }
+    }
+    
+    impl WidgetImpl for ChatMemberRow {}
+
+    impl BoxImpl for ChatMemberRow {}
+}
+
+glib::wrapper! {
+    pub(crate) struct ChatMemberRow(ObjectSubclass<imp::ChatMemberRow>)
+        @extends gtk::Widget;
+}
+
+impl ChatMemberRow {
+    pub fn new() -> Self {
+        glib::Object::new(&[])
+    }
+    pub fn bind_member(&self, member: ChatMember) {
+        let imp = self.imp();
+
+        let user = member.user();
+
+        let user_expression = gtk::ObjectExpression::new(&user);
+        let name_expression = expressions::user_display_name(&user_expression);
+        name_expression.bind(&*imp.user_name_label, "label", Some(&user));
+
+        if let UserType::Bot(_) = user.type_().0 {
+            imp.user_status_label.set_text(Some(&gettext("bot")));
+        } else {
+            let status = user.status().0;
+            let status_label = &*imp.user_status_label;
+
+            match status {
+                UserStatus::Online(_) => status_label.set_css_classes(&["accent"]),
+                _ => status_label.set_css_classes(&["dim-label"]),
+            }
+
+            let status = strings::user_status(&status);
+            imp.user_status_label.set_text(Some(&status));
+        };
+
+        imp.member_status_label.set_label(&member.status());
+
+        imp.avatar.set_item(Some(user.upcast()));
+    }
+}
diff --git a/src/session/components/mod.rs b/src/session/components/mod.rs
index f8cd1d9a5..82ef20a76 100644
--- a/src/session/components/mod.rs
+++ b/src/session/components/mod.rs
@@ -1,7 +1,9 @@
 mod avatar;
+mod chat_member_row;
 mod message_entry;
 mod snow;
 
 pub(crate) use self::avatar::Avatar;
+pub(crate) use self::chat_member_row::ChatMemberRow;
 pub(crate) use self::message_entry::MessageEntry;
 pub(crate) use self::snow::Snow;
diff --git a/src/session/content/chat_info_window.rs b/src/session/content/chat_info_window.rs
index 5d29ecbd2..66b3946ec 100644
--- a/src/session/content/chat_info_window.rs
+++ b/src/session/content/chat_info_window.rs
@@ -5,12 +5,15 @@ use gtk::subclass::prelude::*;
 use gtk::{glib, CompositeTemplate};
 use tdlib::enums::ChatMembers::ChatMembers as TdChatMembers;
 use tdlib::enums::User::User as TdUser;
-use tdlib::enums::{ChatMemberStatus, MessageSender, UserType};
+use tdlib::enums::{MessageSender, UserType};
 use tdlib::functions;
-use tdlib::types::{BasicGroupFullInfo, ChatMember, ChatMembers, SupergroupFullInfo};
+use tdlib::types::{
+    BasicGroupFullInfo, ChatMember as TdChatMember, ChatMembers, SupergroupFullInfo,
+};
 
 use crate::i18n::ngettext_f;
-use crate::tdlib::{BasicGroup, BoxedUserStatus, Chat, ChatType, Supergroup, User};
+use crate::session::components::ChatMemberRow;
+use crate::tdlib::{BasicGroup, BoxedUserStatus, Chat, ChatMember, ChatType, Supergroup, User};
 use crate::utils::spawn;
 use crate::{expressions, strings};
 
@@ -34,7 +37,7 @@ mod imp {
         #[template_child]
         pub(super) members_page: TemplateChild<adw::ViewStackPage>,
         #[template_child]
-        pub(super) members_list: TemplateChild<gtk::ListBox>,
+        pub(super) members_list: TemplateChild<gtk::ListView>,
     }
 
     #[glib::object_subclass]
@@ -310,81 +313,63 @@ impl ChatInfoWindow {
         self.update_info_list_visibility();
     }
 
-    async fn append_members(&self, members: Vec<ChatMember>) {
-        let session = self.chat().unwrap().session();
-        let client_id = session.client_id();
+    async fn append_members(&self, members: Vec<TdChatMember>) {
+        let members: Vec<_> = {
+            let mut users: Vec<User> = vec![];
 
-        let members_list = &self.imp().members_list;
+            let session = self.chat().unwrap().session();
+            let client_id = session.client_id();
 
-        for member in members {
-            if let MessageSender::User(user) = member.member_id {
-                if let Ok(TdUser(user)) = functions::get_user(user.user_id, client_id).await {
-                    let user_row = adw::ActionRow::new();
-                    user_row.set_title_lines(1);
-                    user_row.set_subtitle_lines(1);
-
-                    let user = User::from_td_object(user, &session);
-
-                    let user_expression = gtk::ObjectExpression::new(&user);
-                    let name_expression = expressions::user_display_name(&user_expression);
-                    name_expression.bind(&user_row, "title", Some(&user));
-
-                    User::this_expression("status")
-                        .chain_closure::<String>(closure!(
-                            |_: Option<glib::Object>, status: BoxedUserStatus| {
-                                strings::user_status(&status.0)
-                            }
-                        ))
-                        .bind(&user_row, "subtitle", Some(&user));
-
-                    if let UserType::Bot(_) = user.type_().0 {
-                        user_row.set_subtitle(&gettext("bot"));
-                    } else {
-                        User::this_expression("status")
-                            .chain_closure::<String>(closure!(
-                                |_: Option<glib::Object>, status: BoxedUserStatus| {
-                                    strings::user_status(&status.0)
-                                }
-                            ))
-                            .bind(&user_row, "subtitle", Some(&user));
-                    };
-
-                    let avatar = crate::session::components::Avatar::new();
-
-                    avatar.set_item(Some(user.upcast()));
-                    avatar.set_size(32);
-                    user_row.add_prefix(&avatar);
-
-                    let status = match member.status {
-                        ChatMemberStatus::Creator(owner) => {
-                            let title = if owner.custom_title.is_empty() {
-                                gettext("Owner")
-                            } else {
-                                owner.custom_title
-                            };
-                            Some(title)
-                        }
-                        ChatMemberStatus::Administrator(admin) => {
-                            let title = if admin.custom_title.is_empty() {
-                                gettext("Admin")
-                            } else {
-                                admin.custom_title
-                            };
-                            Some(title)
-                        }
-                        _ => None,
-                    };
-
-                    if let Some(text) = status {
-                        let owner_label = gtk::Label::new(Some(&text));
-                        owner_label.set_yalign(0.2);
-                        owner_label.set_css_classes(&["caption", "accent"]);
-                        user_row.add_suffix(&owner_label);
+            for member in &members {
+                let user = match member.member_id {
+                    MessageSender::User(ref user) => {
+                        let TdUser(user) =
+                            functions::get_user(user.user_id, client_id).await.unwrap();
+                        User::from_td_object(user, &session)
                     }
-
-                    members_list.append(&user_row);
-                }
+                    MessageSender::Chat(_) => unreachable!(),
+                };
+                users.push(user);
             }
+
+            members
+                .into_iter()
+                .zip(users.into_iter())
+                .map(|(member, user)| ChatMember::new(member, user))
+                .collect()
+        };
+
+        let members_list = &self.imp().members_list;
+
+        let selection_model: gtk::NoSelection = members_list.model().unwrap().downcast().unwrap();
+
+        let model: gtk::gio::ListStore = if let Some(model) = selection_model.model() {
+            model.downcast().unwrap()
+        } else {
+            let model = gtk::gio::ListStore::new(ChatMember::static_type());
+            selection_model.set_model(Some(&model));
+            model
+        };
+
+        model.extend_from_slice(&members);
+
+        if members_list.factory().is_none() {
+            let factory = gtk::SignalListItemFactory::new();
+
+            factory.connect_setup(move |_, list_item| {
+                list_item.set_property("child", ChatMemberRow::new());
+            });
+
+            factory.connect_bind(move |_, list_item| {
+                let list_item: &gtk::ListItem = list_item.downcast_ref().unwrap();
+
+                let user_row: ChatMemberRow = list_item.child().unwrap().downcast().unwrap();
+                let member: ChatMember = list_item.item().unwrap().downcast().unwrap();
+
+                user_row.bind_member(member);
+            });
+
+            members_list.set_factory(Some(&factory));
         }
     }
 
diff --git a/src/tdlib/chat_member.rs b/src/tdlib/chat_member.rs
new file mode 100644
index 000000000..26b42e69b
--- /dev/null
+++ b/src/tdlib/chat_member.rs
@@ -0,0 +1,62 @@
+use super::User;
+use gettextrs::gettext;
+use glib::subclass::prelude::*;
+use gtk::glib;
+use tdlib::enums::ChatMemberStatus;
+use tdlib::types::ChatMember as TdChatMember;
+
+mod imp {
+    use super::*;
+    use glib::once_cell::sync::OnceCell;
+
+    #[derive(Default)]
+    pub(crate) struct ChatMember {
+        pub(super) member: OnceCell<TdChatMember>,
+        pub(super) user: OnceCell<User>,
+    }
+
+    #[glib::object_subclass]
+    impl ObjectSubclass for ChatMember {
+        const NAME: &'static str = "ChatMember";
+        type Type = super::ChatMember;
+    }
+
+    impl ObjectImpl for ChatMember {}
+}
+
+glib::wrapper! {
+    pub(crate) struct ChatMember(ObjectSubclass<imp::ChatMember>);
+}
+
+impl ChatMember {
+    pub fn new(member: TdChatMember, user: User) -> Self {
+        let obj: Self = glib::Object::new(&[]);
+        obj.imp().member.set(member).unwrap();
+        obj.imp().user.set(user).unwrap();
+        obj
+    }
+
+    pub fn status(&self) -> String {
+        match self.imp().member.get().unwrap().status {
+            ChatMemberStatus::Creator(ref owner) => {
+                if owner.custom_title.is_empty() {
+                    gettext("Owner")
+                } else {
+                    owner.custom_title.to_owned()
+                }
+            }
+            ChatMemberStatus::Administrator(ref admin) => {
+                if admin.custom_title.is_empty() {
+                    gettext("Admin")
+                } else {
+                    admin.custom_title.to_owned()
+                }
+            }
+            _ => "".to_string(),
+        }
+    }
+
+    pub fn user(&self) -> User {
+        self.imp().user.get().unwrap().clone()
+    }
+}
diff --git a/src/tdlib/mod.rs b/src/tdlib/mod.rs
index 0a9edaf37..9623ddcc7 100644
--- a/src/tdlib/mod.rs
+++ b/src/tdlib/mod.rs
@@ -6,6 +6,7 @@ mod chat_action_list;
 mod chat_history;
 mod chat_history_item;
 mod chat_list;
+mod chat_member;
 mod country_info;
 mod country_list;
 mod message;
@@ -24,6 +25,7 @@ use self::chat_history::ChatHistory;
 pub(crate) use self::chat_history::ChatHistoryError;
 pub(crate) use self::chat_history_item::{ChatHistoryItem, ChatHistoryItemType};
 pub(crate) use self::chat_list::ChatList;
+pub(crate) use self::chat_member::ChatMember;
 pub(crate) use self::country_info::CountryInfo;
 pub(crate) use self::country_list::CountryList;
 pub(crate) use self::message::{Message, MessageSender};

From 43bd7381fbe1a66e106efabee594d5adce021c79 Mon Sep 17 00:00:00 2001
From: YuraIz <7516890@gmail.com>
Date: Tue, 3 Jan 2023 17:17:13 +0300
Subject: [PATCH 3/4] chat-info-members: Load additional members on scrolling

---
 src/session/content/chat_info_window.rs | 66 +++++++++++++++++++------
 1 file changed, 52 insertions(+), 14 deletions(-)

diff --git a/src/session/content/chat_info_window.rs b/src/session/content/chat_info_window.rs
index 66b3946ec..c5b43046a 100644
--- a/src/session/content/chat_info_window.rs
+++ b/src/session/content/chat_info_window.rs
@@ -21,10 +21,12 @@ mod imp {
     use super::*;
     use adw::subclass::prelude::AdwWindowImpl;
     use once_cell::sync::{Lazy, OnceCell};
+    use std::cell::Cell;
 
     #[derive(Debug, Default, CompositeTemplate)]
     #[template(resource = "/com/github/melix99/telegrand/ui/content-chat-info-window.ui")]
     pub(crate) struct ChatInfoWindow {
+        pub(super) loading: Cell<bool>,
         pub(super) chat: OnceCell<Chat>,
         #[template_child]
         pub(super) toast_overlay: TemplateChild<adw::ToastOverlay>,
@@ -288,26 +290,62 @@ impl ChatInfoWindow {
 
         if supergroup_full_info.can_get_members {
             imp.members_page.set_visible(true);
-            spawn(clone!(@weak self as obj => async move {
-                let limit = 200;
-                let mut offset = 0;
-                while let Ok(TdChatMembers(ChatMembers {members, total_count})) = functions::get_supergroup_members(
+
+            let limit = 100;
+
+            spawn(clone!(@to-owned imp => async move {
+                imp.loading.set(true);
+                let result = functions::get_supergroup_members(
                     supergroup_id,
                     None,
-                    offset,
+                    0,
                     limit,
                     client_id,
-                ).await
-                {
-                    if offset > total_count {
-                        break;
-                    }
-
-                    obj.append_members(members).await;
-
-                    offset += limit;
+                    ).await;
+                if let Ok(TdChatMembers(ChatMembers {members, ..})) = result {
+                    imp.obj().append_members(members).await;
                 }
+                imp.loading.set(false);
             }));
+
+            imp.members_list
+                .vadjustment()
+                .unwrap()
+                .connect_value_changed(clone!(@to-owned imp => move |vadjustment| {
+                    if !imp.loading.get() {
+
+                        let value = vadjustment.value() + vadjustment.page_size();
+                        let upper = vadjustment.upper();
+
+                        let offset = imp.members_list.model().unwrap().n_items() as i32;
+
+                        if value / upper > 0.8 && upper - value < 2000.0 {
+
+                            imp.loading.set(true);
+
+                            spawn(clone!(@to-owned imp => async move {
+                                let result = functions::get_supergroup_members(
+                                    supergroup_id,
+                                    None,
+                                    offset,
+                                    limit,
+                                    client_id,
+                                    ).await;
+                                if let Ok(TdChatMembers(ChatMembers {members, total_count})) = result {
+                                    if offset >= total_count {
+                                        // remove callback
+                                    }
+
+                                    imp.obj().append_members(members).await;
+
+                                    imp.loading.set(false);
+                                } else {
+                                    log::error!("can't load members {result:?}");
+                                }
+                            }))
+                        }
+                    }
+                }));
         }
 
         self.update_info_list_visibility();

From 85ab7c35dc2132eb277f58c6b59ca0b33d77ba9f Mon Sep 17 00:00:00 2001
From: YuraIz <7516890@gmail.com>
Date: Sun, 8 Jan 2023 19:54:36 +0300
Subject: [PATCH 4/4] chat-info-members: Put members list in a separate widget

also move MemberRow inside chat_info_window module
---
 data/resources/resources.gresource.xml        |   2 +-
 ...row.ui => content-chat-info-member-row.ui} |   8 +-
 data/resources/ui/content-chat-info-window.ui |  26 +-
 src/session/components/mod.rs                 |   2 -
 .../chat_info_window/member_row.rs}           |  26 +-
 .../content/chat_info_window/members_page.rs  | 266 ++++++++++++++++++
 .../mod.rs}                                   | 156 +---------
 7 files changed, 305 insertions(+), 181 deletions(-)
 rename data/resources/ui/{components-chat-member-row.ui => content-chat-info-member-row.ui} (87%)
 rename src/session/{components/chat_member_row.rs => content/chat_info_window/member_row.rs} (80%)
 create mode 100644 src/session/content/chat_info_window/members_page.rs
 rename src/session/content/{chat_info_window.rs => chat_info_window/mod.rs} (63%)

diff --git a/data/resources/resources.gresource.xml b/data/resources/resources.gresource.xml
index b221ac773..475399083 100644
--- a/data/resources/resources.gresource.xml
+++ b/data/resources/resources.gresource.xml
@@ -13,11 +13,11 @@
     <file compressed="true" preprocess="xml-stripblanks">ui/add-account-row.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/avatar-with-selection.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/components-avatar.ui</file>
-    <file compressed="true" preprocess="xml-stripblanks">ui/components-chat-member-row.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/components-message-entry.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/content.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/content-chat-action-bar.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/content-chat-history.ui</file>
+    <file compressed="true" preprocess="xml-stripblanks">ui/content-chat-info-member-row.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/content-chat-info-window.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/content-event-row.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/content-message-document.ui</file>
diff --git a/data/resources/ui/components-chat-member-row.ui b/data/resources/ui/content-chat-info-member-row.ui
similarity index 87%
rename from data/resources/ui/components-chat-member-row.ui
rename to data/resources/ui/content-chat-info-member-row.ui
index 04776af6b..e539e16df 100644
--- a/data/resources/ui/components-chat-member-row.ui
+++ b/data/resources/ui/content-chat-info-member-row.ui
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <template class="ComponentsChatMemberRow" parent="GtkBox">
-    <property name="spacing">12</property>
+  <template class="ContentChatInfoMemberRow" parent="GtkWidget">
+    <property name="layout-manager">
+      <object class="GtkBoxLayout">
+        <property name="spacing">12</property>
+      </object>
+    </property>
     <child>
       <object class="ComponentsAvatar" id="avatar">
         <property name="size">40</property>
diff --git a/data/resources/ui/content-chat-info-window.ui b/data/resources/ui/content-chat-info-window.ui
index 5db9547d3..f084210d7 100644
--- a/data/resources/ui/content-chat-info-window.ui
+++ b/data/resources/ui/content-chat-info-window.ui
@@ -85,25 +85,15 @@
                     <property name="name">members</property>
                     <property name="title" translatable="yes">Members</property>
                     <property name="icon-name">avatar-default-symbolic</property>
-                    <property name="visible">false</property>
+                    <property name="visible">False</property>
+                    <binding name="visible">
+                      <lookup name="visible">members_list</lookup>
+                    </binding>
                     <property name="child">
-                      <object class="GtkScrolledWindow">
-                        <property name="child">
-                          <object class="AdwClampScrollable">
-                            <property name="maximum-size">440</property>
-                            <property name="tightening-threshold">200</property>
-                            <property name="child">
-                              <object class="GtkListView" id="members_list">
-                                <property name="model">
-                                  <object class="GtkNoSelection" id="selection"/>
-                                </property>
-                                <style>
-                                  <class name="navigation-sidebar"/>
-                                </style>
-                              </object>
-                            </property>
-                          </object>
-                        </property>
+                      <object class="ContentChatInfoMembers" id="members_list">
+                        <binding name="chat">
+                          <lookup name="chat">ContentChatInfoWindow</lookup>
+                        </binding>
                       </object>
                     </property>
                   </object>
diff --git a/src/session/components/mod.rs b/src/session/components/mod.rs
index 82ef20a76..f8cd1d9a5 100644
--- a/src/session/components/mod.rs
+++ b/src/session/components/mod.rs
@@ -1,9 +1,7 @@
 mod avatar;
-mod chat_member_row;
 mod message_entry;
 mod snow;
 
 pub(crate) use self::avatar::Avatar;
-pub(crate) use self::chat_member_row::ChatMemberRow;
 pub(crate) use self::message_entry::MessageEntry;
 pub(crate) use self::snow::Snow;
diff --git a/src/session/components/chat_member_row.rs b/src/session/content/chat_info_window/member_row.rs
similarity index 80%
rename from src/session/components/chat_member_row.rs
rename to src/session/content/chat_info_window/member_row.rs
index 27414f0d2..f339a0aad 100644
--- a/src/session/components/chat_member_row.rs
+++ b/src/session/content/chat_info_window/member_row.rs
@@ -4,15 +4,15 @@ use gtk::prelude::*;
 use gtk::subclass::prelude::*;
 use gtk::{glib, CompositeTemplate};
 
-use super::Avatar;
+use crate::session::components::Avatar;
 use crate::{expressions, strings};
 use tdlib::enums::{UserStatus, UserType};
 
 mod imp {
     use super::*;
     #[derive(Debug, Default, CompositeTemplate)]
-    #[template(resource = "/com/github/melix99/telegrand/ui/components-chat-member-row.ui")]
-    pub(crate) struct ChatMemberRow {
+    #[template(resource = "/com/github/melix99/telegrand/ui/content-chat-info-member-row.ui")]
+    pub(crate) struct MemberRow {
         #[template_child]
         pub(super) avatar: TemplateChild<Avatar>,
         #[template_child]
@@ -24,10 +24,10 @@ mod imp {
     }
 
     #[glib::object_subclass]
-    impl ObjectSubclass for ChatMemberRow {
-        const NAME: &'static str = "ComponentsChatMemberRow";
-        type Type = super::ChatMemberRow;
-        type ParentType = gtk::Box;
+    impl ObjectSubclass for MemberRow {
+        const NAME: &'static str = "ContentChatInfoMemberRow";
+        type Type = super::MemberRow;
+        type ParentType = gtk::Widget;
 
         fn class_init(klass: &mut Self::Class) {
             Self::bind_template(klass);
@@ -39,24 +39,24 @@ mod imp {
         }
     }
 
-    impl ObjectImpl for ChatMemberRow {
+    impl ObjectImpl for MemberRow {
         fn dispose(&self) {
             self.avatar.unparent();
             self.user_status_label.parent().unwrap().unparent();
         }
     }
-    
-    impl WidgetImpl for ChatMemberRow {}
 
-    impl BoxImpl for ChatMemberRow {}
+    impl WidgetImpl for MemberRow {}
+
+    impl BoxImpl for MemberRow {}
 }
 
 glib::wrapper! {
-    pub(crate) struct ChatMemberRow(ObjectSubclass<imp::ChatMemberRow>)
+    pub(crate) struct MemberRow(ObjectSubclass<imp::MemberRow>)
         @extends gtk::Widget;
 }
 
-impl ChatMemberRow {
+impl MemberRow {
     pub fn new() -> Self {
         glib::Object::new(&[])
     }
diff --git a/src/session/content/chat_info_window/members_page.rs b/src/session/content/chat_info_window/members_page.rs
new file mode 100644
index 000000000..2f85cdbd4
--- /dev/null
+++ b/src/session/content/chat_info_window/members_page.rs
@@ -0,0 +1,266 @@
+use super::member_row::MemberRow;
+
+use adw::prelude::*;
+use adw::subclass::prelude::*;
+use glib::clone;
+use gtk::{glib, CompositeTemplate};
+use tdlib::enums::BasicGroupFullInfo::BasicGroupFullInfo as TdBasicGroupFullInfo;
+use tdlib::enums::ChatMembers::ChatMembers as TdChatMembers;
+use tdlib::enums::MessageSender;
+use tdlib::enums::SupergroupFullInfo::SupergroupFullInfo as TdSupergroupFullInfo;
+use tdlib::enums::User::User as TdUser;
+use tdlib::functions;
+use tdlib::types::{ChatMember as TdChatMember, ChatMembers};
+
+use crate::tdlib::{BasicGroup, Chat, ChatMember, ChatType, Supergroup, User};
+use crate::utils::spawn;
+
+mod imp {
+    use super::*;
+    use once_cell::sync::{Lazy, OnceCell};
+    use std::cell::Cell;
+
+    #[derive(Debug, Default, CompositeTemplate)]
+    #[template(string = r#"
+    <interface>
+      <template class="ContentChatInfoMembers" parent="AdwBin">
+        <property name="child">
+          <object class="GtkScrolledWindow">
+            <property name="child">
+              <object class="AdwClampScrollable">
+                <property name="maximum-size">440</property>
+                <property name="tightening-threshold">200</property>
+                <property name="child">
+                  <object class="GtkListView" id="members_list">
+                    <property name="model">
+                      <object class="GtkNoSelection" id="selection"/>
+                    </property>
+                    <style>
+                      <class name="navigation-sidebar"/>
+                    </style>
+                  </object>
+                </property>
+              </object>
+            </property>
+          </object>
+        </property>
+      </template>
+    </interface>
+    "#)]
+    pub(crate) struct ChatInfoMembers {
+        pub(super) loading: Cell<bool>,
+        pub(super) chat: OnceCell<Chat>,
+        #[template_child]
+        pub(super) members_list: TemplateChild<gtk::ListView>,
+    }
+
+    #[glib::object_subclass]
+    impl ObjectSubclass for ChatInfoMembers {
+        const NAME: &'static str = "ContentChatInfoMembers";
+        type Type = super::ChatInfoMembers;
+        type ParentType = adw::Bin;
+
+        fn class_init(klass: &mut Self::Class) {
+            klass.bind_template();
+        }
+
+        fn instance_init(obj: &glib::subclass::InitializingObject<Self>) {
+            obj.init_template();
+        }
+    }
+
+    impl ObjectImpl for ChatInfoMembers {
+        fn properties() -> &'static [glib::ParamSpec] {
+            static PROPERTIES: Lazy<Vec<glib::ParamSpec>> = Lazy::new(|| {
+                vec![glib::ParamSpecObject::builder::<Chat>("chat")
+                    // .construct_only()
+                    .build()]
+            });
+            PROPERTIES.as_ref()
+        }
+
+        fn set_property(&self, _id: usize, value: &glib::Value, pspec: &glib::ParamSpec) {
+            match pspec.name() {
+                "chat" => {
+                    if let Some(chat) = value.get().unwrap() {
+                        self.chat.set(chat).unwrap();
+                        self.obj().setup_page();
+                    }
+                }
+                _ => unimplemented!(),
+            }
+        }
+
+        fn property(&self, _id: usize, pspec: &glib::ParamSpec) -> glib::Value {
+            let obj = self.obj();
+
+            match pspec.name() {
+                "chat" => obj.chat().to_value(),
+                _ => unimplemented!(),
+            }
+        }
+    }
+
+    impl WidgetImpl for ChatInfoMembers {}
+    impl BinImpl for ChatInfoMembers {}
+}
+
+glib::wrapper! {
+    pub(crate) struct ChatInfoMembers(ObjectSubclass<imp::ChatInfoMembers>)
+        @extends gtk::Widget;
+}
+
+impl ChatInfoMembers {
+    fn setup_page(&self) {
+        match self.chat().unwrap().type_() {
+            ChatType::BasicGroup(basic_group) => {
+                self.setup_basic_group_info(basic_group);
+            }
+            ChatType::Supergroup(supergroup) => {
+                self.setup_supergroup_info(supergroup);
+            }
+            _ => {
+                self.set_visible(false);
+            }
+        }
+    }
+
+    fn setup_basic_group_info(&self, basic_group: &BasicGroup) {
+        let client_id = self.chat().unwrap().session().client_id();
+        let basic_group_id = basic_group.id();
+
+        spawn(clone!(@weak self as obj => async move {
+            let result = functions::get_basic_group_full_info(basic_group_id, client_id).await;
+            if let Ok(TdBasicGroupFullInfo(full_info)) = result {
+                obj.append_members(full_info.members).await;
+            }
+        }));
+    }
+
+    fn setup_supergroup_info(&self, supergroup: &Supergroup) {
+        let client_id = self.chat().unwrap().session().client_id();
+        let supergroup_id = supergroup.id();
+
+        spawn(clone!(@weak self as obj => async move {
+            let imp = obj.imp();
+            let result = functions::get_supergroup_full_info(supergroup_id, client_id).await;
+            if let Ok(TdSupergroupFullInfo(full_info)) = result {
+                if full_info.can_get_members {
+                    imp.loading.set(true);
+                    let result = functions::get_supergroup_members(
+                                    supergroup_id,
+                                    None,
+                                    0,
+                                    200,
+                                    client_id,
+                                ).await;
+                    if let Ok(TdChatMembers(ChatMembers {members, total_count})) = result {
+                        obj.append_members(members).await;
+
+                        if total_count > 200 {
+                            obj.imp().members_list.vadjustment().unwrap()
+                            .connect_changed(clone!(@weak  obj => move |adj| {
+                                obj.load_more_members(adj, supergroup_id);
+                            }));
+                        }
+                    }
+                    imp.loading.set(false);
+                }
+            }
+        }));
+    }
+
+    fn load_more_members(&self, adj: &gtk::Adjustment, supergroup_id: i64) {
+        let imp = self.imp();
+        if imp.loading.get() {
+            return;
+        }
+        imp.loading.set(true);
+
+        if adj.value() > adj.page_size() * 2.0 || adj.upper() >= adj.page_size() * 2.0 {
+            let offset = imp.members_list.model().unwrap().n_items() as i32;
+            let limit = 200;
+            let client_id = self.chat().unwrap().session().client_id();
+
+            spawn(clone!(@weak self as obj => async move {
+                let result = functions::get_supergroup_members(
+                                supergroup_id,
+                                None,
+                                offset,
+                                limit,
+                                client_id,
+                            ).await;
+                if let Ok(TdChatMembers(ChatMembers {members, ..})) = result {
+                    obj.append_members(members).await;
+                    obj.imp().loading.set(false);
+                } else {
+                    log::error!("can't load members {result:?}");
+                }
+            }));
+        }
+    }
+
+    async fn append_members(&self, members: Vec<TdChatMember>) {
+        let members: Vec<_> = {
+            let mut users: Vec<User> = vec![];
+
+            let session = self.chat().unwrap().session();
+            let client_id = session.client_id();
+
+            for member in &members {
+                let user = match member.member_id {
+                    MessageSender::User(ref user) => {
+                        let TdUser(user) =
+                            functions::get_user(user.user_id, client_id).await.unwrap();
+                        User::from_td_object(user, &session)
+                    }
+                    MessageSender::Chat(_) => unreachable!(),
+                };
+                users.push(user);
+            }
+
+            members
+                .into_iter()
+                .zip(users.into_iter())
+                .map(|(member, user)| ChatMember::new(member, user))
+                .collect()
+        };
+
+        let members_list = &self.imp().members_list;
+
+        let selection_model: gtk::NoSelection = members_list.model().unwrap().downcast().unwrap();
+
+        let model: gtk::gio::ListStore = if let Some(model) = selection_model.model() {
+            model.downcast().unwrap()
+        } else {
+            let model = gtk::gio::ListStore::new(ChatMember::static_type());
+            selection_model.set_model(Some(&model));
+            model
+        };
+
+        model.extend_from_slice(&members);
+
+        if members_list.factory().is_none() {
+            let factory = gtk::SignalListItemFactory::new();
+
+            factory.connect_setup(move |_, list_item| {
+                list_item.set_property("child", MemberRow::new());
+            });
+
+            factory.connect_bind(move |_, list_item| {
+                let list_item: &gtk::ListItem = list_item.downcast_ref().unwrap();
+
+                let user_row: MemberRow = list_item.child().unwrap().downcast().unwrap();
+                let member: ChatMember = list_item.item().unwrap().downcast().unwrap();
+
+                user_row.bind_member(member);
+            });
+
+            members_list.set_factory(Some(&factory));
+        }
+    }
+
+    pub(crate) fn chat(&self) -> Option<&Chat> {
+        self.imp().chat.get()
+    }
+}
diff --git a/src/session/content/chat_info_window.rs b/src/session/content/chat_info_window/mod.rs
similarity index 63%
rename from src/session/content/chat_info_window.rs
rename to src/session/content/chat_info_window/mod.rs
index c5b43046a..1e8a942de 100644
--- a/src/session/content/chat_info_window.rs
+++ b/src/session/content/chat_info_window/mod.rs
@@ -1,19 +1,19 @@
+mod member_row;
+mod members_page;
+
+use self::members_page::ChatInfoMembers;
+
 use adw::prelude::*;
 use gettextrs::gettext;
 use glib::{clone, closure};
 use gtk::subclass::prelude::*;
 use gtk::{glib, CompositeTemplate};
-use tdlib::enums::ChatMembers::ChatMembers as TdChatMembers;
-use tdlib::enums::User::User as TdUser;
-use tdlib::enums::{MessageSender, UserType};
+use tdlib::enums::UserType;
 use tdlib::functions;
-use tdlib::types::{
-    BasicGroupFullInfo, ChatMember as TdChatMember, ChatMembers, SupergroupFullInfo,
-};
+use tdlib::types::{BasicGroupFullInfo, SupergroupFullInfo};
 
 use crate::i18n::ngettext_f;
-use crate::session::components::ChatMemberRow;
-use crate::tdlib::{BasicGroup, BoxedUserStatus, Chat, ChatMember, ChatType, Supergroup, User};
+use crate::tdlib::{BasicGroup, BoxedUserStatus, Chat, ChatType, Supergroup, User};
 use crate::utils::spawn;
 use crate::{expressions, strings};
 
@@ -21,12 +21,10 @@ mod imp {
     use super::*;
     use adw::subclass::prelude::AdwWindowImpl;
     use once_cell::sync::{Lazy, OnceCell};
-    use std::cell::Cell;
 
     #[derive(Debug, Default, CompositeTemplate)]
     #[template(resource = "/com/github/melix99/telegrand/ui/content-chat-info-window.ui")]
     pub(crate) struct ChatInfoWindow {
-        pub(super) loading: Cell<bool>,
         pub(super) chat: OnceCell<Chat>,
         #[template_child]
         pub(super) toast_overlay: TemplateChild<adw::ToastOverlay>,
@@ -37,9 +35,7 @@ mod imp {
         #[template_child]
         pub(super) info_list: TemplateChild<gtk::ListBox>,
         #[template_child]
-        pub(super) members_page: TemplateChild<adw::ViewStackPage>,
-        #[template_child]
-        pub(super) members_list: TemplateChild<gtk::ListView>,
+        pub(super) members_list: TemplateChild<ChatInfoMembers>,
     }
 
     #[glib::object_subclass]
@@ -219,11 +215,6 @@ impl ChatInfoWindow {
             imp.info_list.append(&row);
         }
 
-        imp.members_page.set_visible(true);
-        spawn(clone!(@weak self as obj => async move {
-            obj.append_members(basic_group_full_info.members).await;
-        }));
-
         self.update_info_list_visibility();
     }
 
@@ -261,7 +252,7 @@ impl ChatInfoWindow {
             let result = functions::get_supergroup_full_info(supergroup_id, client_id).await;
             match result {
                 Ok(tdlib::enums::SupergroupFullInfo::SupergroupFullInfo(full_info)) => {
-                    obj.setup_supergroup_full_info(supergroup_id, full_info);
+                    obj.setup_supergroup_full_info(full_info);
                 }
                 Err(e) => {
                     log::warn!("Failed to get supergroup full info: {e:?}");
@@ -270,12 +261,7 @@ impl ChatInfoWindow {
         }));
     }
 
-    fn setup_supergroup_full_info(
-        &self,
-        supergroup_id: i64,
-        supergroup_full_info: SupergroupFullInfo,
-    ) {
-        let client_id = self.chat().unwrap().session().client_id();
+    fn setup_supergroup_full_info(&self, supergroup_full_info: SupergroupFullInfo) {
         let imp = self.imp();
 
         // Description
@@ -288,129 +274,9 @@ impl ChatInfoWindow {
             imp.info_list.append(&row);
         }
 
-        if supergroup_full_info.can_get_members {
-            imp.members_page.set_visible(true);
-
-            let limit = 100;
-
-            spawn(clone!(@to-owned imp => async move {
-                imp.loading.set(true);
-                let result = functions::get_supergroup_members(
-                    supergroup_id,
-                    None,
-                    0,
-                    limit,
-                    client_id,
-                    ).await;
-                if let Ok(TdChatMembers(ChatMembers {members, ..})) = result {
-                    imp.obj().append_members(members).await;
-                }
-                imp.loading.set(false);
-            }));
-
-            imp.members_list
-                .vadjustment()
-                .unwrap()
-                .connect_value_changed(clone!(@to-owned imp => move |vadjustment| {
-                    if !imp.loading.get() {
-
-                        let value = vadjustment.value() + vadjustment.page_size();
-                        let upper = vadjustment.upper();
-
-                        let offset = imp.members_list.model().unwrap().n_items() as i32;
-
-                        if value / upper > 0.8 && upper - value < 2000.0 {
-
-                            imp.loading.set(true);
-
-                            spawn(clone!(@to-owned imp => async move {
-                                let result = functions::get_supergroup_members(
-                                    supergroup_id,
-                                    None,
-                                    offset,
-                                    limit,
-                                    client_id,
-                                    ).await;
-                                if let Ok(TdChatMembers(ChatMembers {members, total_count})) = result {
-                                    if offset >= total_count {
-                                        // remove callback
-                                    }
-
-                                    imp.obj().append_members(members).await;
-
-                                    imp.loading.set(false);
-                                } else {
-                                    log::error!("can't load members {result:?}");
-                                }
-                            }))
-                        }
-                    }
-                }));
-        }
-
         self.update_info_list_visibility();
     }
 
-    async fn append_members(&self, members: Vec<TdChatMember>) {
-        let members: Vec<_> = {
-            let mut users: Vec<User> = vec![];
-
-            let session = self.chat().unwrap().session();
-            let client_id = session.client_id();
-
-            for member in &members {
-                let user = match member.member_id {
-                    MessageSender::User(ref user) => {
-                        let TdUser(user) =
-                            functions::get_user(user.user_id, client_id).await.unwrap();
-                        User::from_td_object(user, &session)
-                    }
-                    MessageSender::Chat(_) => unreachable!(),
-                };
-                users.push(user);
-            }
-
-            members
-                .into_iter()
-                .zip(users.into_iter())
-                .map(|(member, user)| ChatMember::new(member, user))
-                .collect()
-        };
-
-        let members_list = &self.imp().members_list;
-
-        let selection_model: gtk::NoSelection = members_list.model().unwrap().downcast().unwrap();
-
-        let model: gtk::gio::ListStore = if let Some(model) = selection_model.model() {
-            model.downcast().unwrap()
-        } else {
-            let model = gtk::gio::ListStore::new(ChatMember::static_type());
-            selection_model.set_model(Some(&model));
-            model
-        };
-
-        model.extend_from_slice(&members);
-
-        if members_list.factory().is_none() {
-            let factory = gtk::SignalListItemFactory::new();
-
-            factory.connect_setup(move |_, list_item| {
-                list_item.set_property("child", ChatMemberRow::new());
-            });
-
-            factory.connect_bind(move |_, list_item| {
-                let list_item: &gtk::ListItem = list_item.downcast_ref().unwrap();
-
-                let user_row: ChatMemberRow = list_item.child().unwrap().downcast().unwrap();
-                let member: ChatMember = list_item.item().unwrap().downcast().unwrap();
-
-                user_row.bind_member(member);
-            });
-
-            members_list.set_factory(Some(&factory));
-        }
-    }
-
     fn update_info_list_visibility(&self) {
         let info_list = &self.imp().info_list;
         info_list.set_visible(info_list.first_child().is_some());