Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/expressions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ pub(crate) fn chat_display_name(chat_expression: &gtk::Expression) -> gtk::Expre
let is_deleted = args[3].get::<bool>().unwrap();
if chat.is_own_chat() {
gettext("Saved Messages")
} else if chat.is_replies_chat() {
gettext("Replies")
} else if is_deleted {
gettext("Deleted Account")
} else {
Expand Down
4 changes: 4 additions & 0 deletions src/model/chat.rs
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,10 @@ impl Chat {
self.chat_type().user() == Some(self.session_().me_())
}

pub(crate) fn is_replies_chat(&self) -> bool {
self.id() == 1271266957 || self.id() == 708513
}

fn set_permissions(&self, permissions: model::BoxedChatPermissions) {
if self.permissions() == permissions {
return;
Expand Down
2 changes: 1 addition & 1 deletion src/model/message.rs
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ impl Message {
}

pub(crate) fn sender_display_name_expression(&self) -> gtk::Expression {
if self.chat_().is_own_chat() {
if self.chat_().is_own_chat() || self.chat_().is_replies_chat() {
self.forward_info()
.map(|forward_info| forward_info.origin())
.map(|forward_origin| match forward_origin {
Expand Down
5 changes: 4 additions & 1 deletion src/ui/components/avatar.rs
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,9 @@ impl Avatar {
if chat.is_own_chat() {
imp.avatar.set_icon_name(Some("user-bookmarks-symbolic"));
imp.avatar.set_show_initials(false);
} else if chat.is_replies_chat() {
imp.avatar.set_icon_name(Some("mail-reply-sender-symbolic"));
imp.avatar.set_show_initials(false);
} else {
self.load_image(chat.avatar(), chat.session_());
}
Expand All @@ -209,7 +212,7 @@ impl Avatar {
imp.avatar
.set_text(Some(&strings::user_display_name(user, true)));
} else if let Some(chat) = item.downcast_ref::<model::Chat>() {
if chat.is_own_chat() {
if chat.is_own_chat() || chat.is_replies_chat() {
imp.avatar.set_text(Some("-"));
} else {
imp.avatar.set_text(Some(chat.title().as_ref()));
Expand Down
8 changes: 8 additions & 0 deletions src/ui/session/content/chat_action_bar.rs
Original file line number Diff line number Diff line change
Expand Up @@ -767,6 +767,14 @@ impl ChatActionBar {
imp.action_bar_stack.set_visible_child_name("entry");
} else if is_blocked {
imp.action_bar_stack.set_visible_child_name("unblock");
} else if chat.is_replies_chat() {
imp.action_bar_stack.set_visible_child_name("mute");

if self.is_chat_muted() {
imp.mute_button.set_label(&gettext("Unmute"));
} else {
imp.mute_button.set_label(&gettext("Mute"));
}
} else {
imp.action_bar_stack.set_visible_child_name("entry");
}
Expand Down
2 changes: 1 addition & 1 deletion src/ui/session/content/message_row/bubble.rs
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ impl MessageBubble {

let show_sender = if force_hide_sender {
None
} else if message.chat_().is_own_chat() {
} else if message.chat_().is_own_chat() || message.chat_().is_replies_chat() {
if message.is_outgoing() {
None
} else {
Expand Down
4 changes: 2 additions & 2 deletions src/ui/session/content/message_row/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ impl Row {
if let Some(message) = message.downcast_ref::<model::Message>() {
let show_avatar = if message.is_outgoing() {
false
} else if message.chat_().is_own_chat() {
} else if message.chat_().is_own_chat() || message.chat_().is_replies_chat() {
message.forward_info().is_some()
} else {
match message.chat_().chat_type() {
Expand Down Expand Up @@ -236,7 +236,7 @@ impl Row {
}
};

if message.chat_().is_own_chat() {
if message.chat_().is_own_chat() || message.chat_().is_replies_chat() {
match message.forward_info().unwrap().origin() {
model::MessageForwardOrigin::User(user) => {
avatar.set_custom_text(None);
Expand Down
2 changes: 1 addition & 1 deletion src/ui/session/sidebar/row.rs
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,7 @@ fn sender_label(message: model::Message) -> Option<String> {
_ => return None,
}

if message.chat_().is_own_chat() {
if message.chat_().is_own_chat() || message.chat_().is_replies_chat() {
if message.is_outgoing() {
None
} else {
Expand Down