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

mimeparser: set is_system_message for "group image changed" messages

Browse Source
This commit is contained in:
link2xt
2022-07-24 00:18:15 +00:00
parent 5920c5c136
commit d72cf3fb43
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -6,6 +6,7 @@
- refactorings #3437 - refactorings #3437
### Fixes ### Fixes
- mark "group image changed" as system message on receiver side #3517
## 1.90.0 ## 1.90.0

5
python/tests/test_1_online.py
View File

@@ -1581,8 +1581,9 @@ def test_set_get_group_image(acfactory, data, lp):
lp.sec("ac2: wait for receiving message from ac1") lp.sec("ac2: wait for receiving message from ac1")
msg1 = ac2._evtracker.wait_next_incoming_message() msg1 = ac2._evtracker.wait_next_incoming_message()
assert msg1.is_system_message() # Member added
msg2 = ac2._evtracker.wait_next_incoming_message() msg2 = ac2._evtracker.wait_next_incoming_message()
assert msg1.text == "hi" or msg2.text == "hi" assert msg2.text == "hi"
assert msg1.chat.id == msg2.chat.id assert msg1.chat.id == msg2.chat.id
lp.sec("ac2: see if chat now has got the profile image") lp.sec("ac2: see if chat now has got the profile image")
@@ -1596,6 +1597,8 @@ def test_set_get_group_image(acfactory, data, lp):
lp.sec("ac2: delete profile image from chat") lp.sec("ac2: delete profile image from chat")
msg1.chat.remove_profile_image() msg1.chat.remove_profile_image()
msg_back = ac1._evtracker.wait_next_incoming_message() msg_back = ac1._evtracker.wait_next_incoming_message()
assert msg_back.text == "Group image deleted by {}.".format(ac2.get_config("addr"))
assert msg_back.is_system_message()
assert msg_back.chat == chat assert msg_back.chat == chat
assert chat.get_profile_image() is None assert chat.get_profile_image() is None

6
src/mimeparser.rs
View File

@@ -417,6 +417,8 @@ impl MimeMessage {
self.is_system_message = SystemMessage::ChatProtectionEnabled; self.is_system_message = SystemMessage::ChatProtectionEnabled;
} else if value == "protection-disabled" { } else if value == "protection-disabled" {
self.is_system_message = SystemMessage::ChatProtectionDisabled; self.is_system_message = SystemMessage::ChatProtectionDisabled;
} else if value == "group-avatar-changed" {
self.is_system_message = SystemMessage::GroupImageChanged;
} }
} else if self.get_header(HeaderDef::ChatGroupMemberRemoved).is_some() { } else if self.get_header(HeaderDef::ChatGroupMemberRemoved).is_some() {
self.is_system_message = SystemMessage::MemberRemovedFromGroup; self.is_system_message = SystemMessage::MemberRemovedFromGroup;
@@ -424,10 +426,6 @@ impl MimeMessage {
self.is_system_message = SystemMessage::MemberAddedToGroup; self.is_system_message = SystemMessage::MemberAddedToGroup;
} else if self.get_header(HeaderDef::ChatGroupNameChanged).is_some() { } else if self.get_header(HeaderDef::ChatGroupNameChanged).is_some() {
self.is_system_message = SystemMessage::GroupNameChanged; self.is_system_message = SystemMessage::GroupNameChanged;
} else if let Some(value) = self.get_header(HeaderDef::ChatContent) {
if value == "group-avatar-changed" {
self.is_system_message = SystemMessage::GroupImageChanged;
}
} }
} }