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

fix: use different member added/removal messages locally and on the network

Browse Source 
This commit adds new stock strings
"I added member ...",
"I removed member ..." and
"I left the group" that are sent over the network
and are visible in classic MUAs like Thunderbird.

Member name in these messages uses authname
instead of the display name,
so the name set locally does not get leaked when
a member is added or removed.
This commit is contained in:
link2xt
2023-07-02 01:15:46 +00:00
parent 578e47666f
commit 94c190e844
5 changed files with 201 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/mimefactory.rs
View File

@@ -918,6 +918,19 @@ impl<'a> MimeFactory<'a> {
match command {
SystemMessage::MemberRemovedFromGroup => {
let email_to_remove = self.msg.param.get(Param::Arg).unwrap_or_default();
if email_to_remove
== context
.get_config(Config::ConfiguredAddr)
.await?
.unwrap_or_default()
{
placeholdertext = Some(stock_str::msg_group_left_remote(context).await);
} else {
placeholdertext =
Some(stock_str::msg_del_member_remote(context, email_to_remove).await);
};
if !email_to_remove.is_empty() {
headers.protected.push(Header::new(
"Chat-Group-Member-Removed".into(),
@@ -927,6 +940,9 @@ impl<'a> MimeFactory<'a> {
}
SystemMessage::MemberAddedToGroup => {
let email_to_add = self.msg.param.get(Param::Arg).unwrap_or_default();
placeholdertext =
Some(stock_str::msg_add_member_remote(context, email_to_add).await);
if !email_to_add.is_empty() {
headers.protected.push(Header::new(
"Chat-Group-Member-Added".into(),
@@ -1138,11 +1154,8 @@ impl<'a> MimeFactory<'a> {
} else {
None
};
let final_text = if let Some(ref text) = placeholdertext {
text
} else {
&self.msg.text
};
let final_text = placeholdertext.as_deref().unwrap_or(&self.msg.text);
let mut quoted_text = self
.msg