Skip to content

Commit bac3bea

Browse files
yuraizyuraiz
committed
chat-info-members: Add GtkListBox with chat members
1 parent ee55310 commit bac3bea

File tree

2 files changed

+215
-45
lines changed

2 files changed

+215
-45
lines changed

‎data/resources/ui/content-chat-info-window.ui‎

Lines changed: 94 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<interface>
33
<template class="ContentChatInfoWindow" parent="AdwWindow">
4-
<property name="default-width">360</property>
4+
<property name="default-width">400</property>
5+
<property name="default-height">600</property>
56
<property name="modal">True</property>
67
<style>
78
<class name="chat-info"/>
@@ -12,10 +13,11 @@
1213
<object class="GtkBox">
1314
<property name="orientation">vertical</property>
1415
<child>
15-
<object class="GtkHeaderBar">
16+
<object class="AdwHeaderBar">
17+
<property name="centering-policy">strict</property>
1618
<property name="title-widget">
17-
<object class="AdwWindowTitle">
18-
<property name="visible">False</property>
19+
<object class="AdwViewSwitcherTitle" id="title">
20+
<property name="stack">stack</property>
1921
</object>
2022
</property>
2123
<style>
@@ -24,46 +26,97 @@
2426
</object>
2527
</child>
2628
<child>
27-
<object class="AdwClamp">
28-
<property name="child">
29-
<object class="GtkBox">
30-
<property name="orientation">vertical</property>
31-
<style>
32-
<class name="main-page"/>
33-
</style>
34-
<child>
35-
<object class="ComponentsAvatar">
36-
<property name="size">128</property>
37-
<binding name="item">
38-
<lookup name="chat">ContentChatInfoWindow</lookup>
39-
</binding>
29+
<object class="AdwViewStack" id="stack">
30+
<property name="vexpand">true</property>
31+
<child>
32+
<object class="AdwViewStackPage">
33+
<property name="name">info</property>
34+
<property name="title" translatable="yes">Info</property>
35+
<property name="icon-name">help-about-symbolic</property>
36+
<property name="child">
37+
<object class="GtkScrolledWindow">
38+
<property name="child">
39+
<object class="AdwClamp">
40+
<property name="child">
41+
<object class="GtkBox">
42+
<property name="orientation">vertical</property>
43+
<style>
44+
<class name="main-page"/>
45+
</style>
46+
<child>
47+
<object class="ComponentsAvatar">
48+
<property name="size">128</property>
49+
<binding name="item">
50+
<lookup name="chat">ContentChatInfoWindow</lookup>
51+
</binding>
52+
</object>
53+
</child>
54+
<child>
55+
<object class="GtkLabel" id="name_label">
56+
<property name="wrap">True</property>
57+
<property name="justify">center</property>
58+
<style>
59+
<class name="title-1"/>
60+
</style>
61+
</object>
62+
</child>
63+
<child>
64+
<object class="GtkLabel" id="subtitle_label">
65+
<property name="wrap">True</property>
66+
<property name="justify">center</property>
67+
</object>
68+
</child>
69+
<child>
70+
<object class="GtkListBox" id="info_list">
71+
<property name="selection-mode">none</property>
72+
<style>
73+
<class name="boxed-list"/>
74+
</style>
75+
</object>
76+
</child>
77+
</object>
78+
</property>
79+
</object>
80+
</property>
4081
</object>
41-
</child>
42-
<child>
43-
<object class="GtkLabel" id="name_label">
44-
<property name="wrap">True</property>
45-
<property name="justify">center</property>
46-
<style>
47-
<class name="title-1"/>
48-
</style>
49-
</object>
50-
</child>
51-
<child>
52-
<object class="GtkLabel" id="subtitle_label">
53-
<property name="wrap">True</property>
54-
<property name="justify">center</property>
55-
</object>
56-
</child>
57-
<child>
58-
<object class="GtkListBox" id="info_list">
59-
<property name="selection-mode">none</property>
60-
<style>
61-
<class name="boxed-list"/>
62-
</style>
82+
</property>
83+
</object>
84+
</child>
85+
<child>
86+
<object class="AdwViewStackPage" id="members_page">
87+
<property name="name">members</property>
88+
<property name="title" translatable="yes">Members</property>
89+
<property name="icon-name">avatar-default-symbolic</property>
90+
<property name="visible">false</property>
91+
<property name="child">
92+
<object class="GtkScrolledWindow">
93+
<property name="child">
94+
<object class="AdwClamp">
95+
<property name="maximum-size">440</property>
96+
<property name="tightening-threshold">200</property>
97+
<property name="child">
98+
<object class="GtkListBox" id="members_list">
99+
<property name="valign">center</property>
100+
<property name="selection-mode">none</property>
101+
<style>
102+
<class name="boxed-list"/>
103+
</style>
104+
</object>
105+
</property>
106+
</object>
107+
</property>
63108
</object>
64-
</child>
109+
</property>
65110
</object>
66-
</property>
111+
</child>
112+
</object>
113+
</child>
114+
<child>
115+
<object class="AdwViewSwitcherBar">
116+
<property name="stack">stack</property>
117+
<binding name="reveal">
118+
<lookup name="title-visible">title</lookup>
119+
</binding>
67120
</object>
68121
</child>
69122
</object>

‎src/session/content/chat_info_window.rs‎

Lines changed: 121 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ use gettextrs::gettext;
33
use glib::{clone, closure};
44
use gtk::subclass::prelude::*;
55
use gtk::{glib, CompositeTemplate};
6-
use tdlib::enums::UserType;
6+
use tdlib::enums::{ChatMemberStatus, MessageSender, UserType};
7+
use tdlib::enums::{ChatMembers::ChatMembers as TdChatMembers, User::User as TdUser};
78
use tdlib::functions;
8-
use tdlib::types::{BasicGroupFullInfo, SupergroupFullInfo};
9+
use tdlib::types::{BasicGroupFullInfo, ChatMember, ChatMembers, SupergroupFullInfo};
910

1011
use crate::i18n::ngettext_f;
1112
use crate::tdlib::{BasicGroup, BoxedUserStatus, Chat, ChatType, Supergroup, User};
@@ -29,6 +30,10 @@ mod imp {
2930
pub(super) subtitle_label: TemplateChild<gtk::Label>,
3031
#[template_child]
3132
pub(super) info_list: TemplateChild<gtk::ListBox>,
33+
#[template_child]
34+
pub(super) members_page: TemplateChild<adw::ViewStackPage>,
35+
#[template_child]
36+
pub(super) members_list: TemplateChild<gtk::ListBox>,
3237
}
3338

3439
#[glib::object_subclass]
@@ -214,6 +219,11 @@ impl ChatInfoWindow {
214219
imp.info_list.append(&row);
215220
}
216221

222+
imp.members_page.set_visible(true);
223+
spawn(clone!(@weak self as obj => async move {
224+
obj.append_members(basic_group_full_info.members).await;
225+
}));
226+
217227
self.update_info_list_visibility();
218228
}
219229

@@ -251,7 +261,7 @@ impl ChatInfoWindow {
251261
let result = functions::get_supergroup_full_info(supergroup_id, client_id).await;
252262
match result {
253263
Ok(tdlib::enums::SupergroupFullInfo::SupergroupFullInfo(full_info)) => {
254-
obj.setup_supergroup_full_info(full_info);
264+
obj.setup_supergroup_full_info(supergroup_id, full_info);
255265
}
256266
Err(e) => {
257267
log::warn!("Failed to get supergroup full info: {e:?}");
@@ -260,7 +270,12 @@ impl ChatInfoWindow {
260270
}));
261271
}
262272

263-
fn setup_supergroup_full_info(&self, supergroup_full_info: SupergroupFullInfo) {
273+
fn setup_supergroup_full_info(
274+
&self,
275+
supergroup_id: i64,
276+
supergroup_full_info: SupergroupFullInfo,
277+
) {
278+
let client_id = self.chat().unwrap().session().client_id();
264279
let imp = self.imp();
265280

266281
// Description
@@ -273,9 +288,111 @@ impl ChatInfoWindow {
273288
imp.info_list.append(&row);
274289
}
275290

291+
if supergroup_full_info.can_get_members {
292+
imp.members_page.set_visible(true);
293+
spawn(clone!(@weak self as obj => async move {
294+
let limit = 200;
295+
let mut offset = 0;
296+
while let Ok(TdChatMembers(ChatMembers {members, total_count})) = functions::get_supergroup_members(
297+
supergroup_id,
298+
None,
299+
offset,
300+
limit,
301+
client_id,
302+
).await
303+
{
304+
if offset > total_count {
305+
break;
306+
}
307+
308+
obj.append_members(members).await;
309+
310+
offset += limit;
311+
}
312+
}));
313+
}
314+
276315
self.update_info_list_visibility();
277316
}
278317

318+
async fn append_members(&self, members: Vec<ChatMember>) {
319+
let session = self.chat().unwrap().session();
320+
let client_id = session.client_id();
321+
322+
let members_list = &self.imp().members_list;
323+
324+
for member in members {
325+
if let MessageSender::User(user) = member.member_id {
326+
if let Ok(TdUser(user)) = functions::get_user(user.user_id, client_id).await {
327+
let user_row = adw::ActionRow::new();
328+
user_row.set_title_lines(1);
329+
user_row.set_subtitle_lines(1);
330+
331+
let user = User::from_td_object(user, &session);
332+
333+
let user_expression = gtk::ObjectExpression::new(&user);
334+
let name_expression = expressions::user_display_name(&user_expression);
335+
name_expression.bind(&user_row, "title", Some(&user));
336+
337+
User::this_expression("status")
338+
.chain_closure::<String>(closure!(
339+
|_: Option<glib::Object>, status: BoxedUserStatus| {
340+
strings::user_status(&status.0)
341+
}
342+
))
343+
.bind(&user_row, "subtitle", Some(&user));
344+
345+
if let UserType::Bot(_) = user.type_().0 {
346+
user_row.set_subtitle(&gettext("bot"));
347+
} else {
348+
User::this_expression("status")
349+
.chain_closure::<String>(closure!(
350+
|_: Option<glib::Object>, status: BoxedUserStatus| {
351+
strings::user_status(&status.0)
352+
}
353+
))
354+
.bind(&user_row, "subtitle", Some(&user));
355+
};
356+
357+
let avatar = crate::session::components::Avatar::new();
358+
359+
avatar.set_item(Some(user.upcast()));
360+
avatar.set_size(32);
361+
user_row.add_prefix(&avatar);
362+
363+
let status = match member.status {
364+
ChatMemberStatus::Creator(owner) => {
365+
let title = if owner.custom_title.is_empty() {
366+
gettext("Owner")
367+
} else {
368+
owner.custom_title
369+
};
370+
Some(title)
371+
}
372+
ChatMemberStatus::Administrator(admin) => {
373+
let title = if admin.custom_title.is_empty() {
374+
gettext("Admin")
375+
} else {
376+
admin.custom_title
377+
};
378+
Some(title)
379+
}
380+
_ => None,
381+
};
382+
383+
if let Some(text) = status {
384+
let owner_label = gtk::Label::new(Some(&text));
385+
owner_label.set_yalign(0.2);
386+
owner_label.set_css_classes(&["caption", "accent"]);
387+
user_row.add_suffix(&owner_label);
388+
}
389+
390+
members_list.append(&user_row);
391+
}
392+
}
393+
}
394+
}
395+
279396
fn update_info_list_visibility(&self) {
280397
let info_list = &self.imp().info_list;
281398
info_list.set_visible(info_list.first_child().is_some());

0 commit comments

Comments
 (0)