Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-03 21:36:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat: Add strings 'You left the channel.' and 'Scan to join Channel' (#7266)

Browse Source 
Close https://github.com/chatmail/core/issues/7233

Part of https://github.com/chatmail/core/issues/6884
This commit is contained in:
Hocuri
2025-10-02 16:57:24 +02:00
committed by GitHub
parent d509b0cf5c
commit 9ec0332483
6 changed files with 46 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/chat.rs
View File

@@ -4207,7 +4207,7 @@ pub async fn remove_contact_from_chat(
if chat.typ == Chattype::Group && chat.is_promoted() {
let addr = contact.get_addr();
let res = send_member_removal_msg(context, chat_id, contact_id, addr).await;
let res = send_member_removal_msg(context, &chat, contact_id, addr).await;
if contact_id == ContactId::SELF {
res?;
@@ -4231,7 +4231,7 @@ pub async fn remove_contact_from_chat(
// For incoming broadcast channels, it's not possible to remove members,
// but it's possible to leave:
let self_addr = context.get_primary_self_addr().await?;
send_member_removal_msg(context, chat_id, contact_id, &self_addr).await?;
send_member_removal_msg(context, &chat, contact_id, &self_addr).await?;
} else {
bail!("Cannot remove members from non-group chats.");
}
@@ -4241,14 +4241,18 @@ pub async fn remove_contact_from_chat(
async fn send_member_removal_msg(
context: &Context,
chat_id: ChatId,
chat: &Chat,
contact_id: ContactId,
addr: &str,
) -> Result<MsgId> {
let mut msg = Message::new(Viewtype::Text);
if contact_id == ContactId::SELF {
msg.text = stock_str::msg_group_left_local(context, ContactId::SELF).await;
if chat.typ == Chattype::InBroadcast {
msg.text = stock_str::msg_you_left_broadcast(context).await;
} else {
msg.text = stock_str::msg_group_left_local(context, ContactId::SELF).await;
}
} else {
msg.text = stock_str::msg_del_member_local(context, contact_id, ContactId::SELF).await;
}
@@ -4258,7 +4262,7 @@ async fn send_member_removal_msg(
msg.param
.set(Param::ContactAddedRemoved, contact_id.to_u32());
send_msg(context, chat_id, &mut msg).await
send_msg(context, chat.id, &mut msg).await
}
async fn set_group_explicitly_left(context: &Context, grpid: &str) -> Result<()> {