Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-06 07:32:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1410 from deltachat/remove_addremove

Browse Source 
remove all member_added/remove_events
This commit is contained in:
bjoern
2020-04-23 00:59:09 +02:00
committed by GitHub
parent b1c524d4a3 70c082a1b1
commit 30be5e33d7
7 changed files with 7 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
python/src/deltachat/const.py
View File

@@ -11,6 +11,7 @@ from os.path import join as joinpath
DC_GCL_ARCHIVED_ONLY = 0x01
DC_GCL_NO_SPECIALS = 0x02
DC_GCL_ADD_ALLDONE_HINT = 0x04
DC_GCL_FOR_FORWARDING = 0x08
DC_GCL_VERIFIED_ONLY = 0x01
DC_GCL_ADD_SELF = 0x02
DC_QR_ASK_VERIFYCONTACT = 200
@@ -98,9 +99,6 @@ DC_EVENT_IMEX_PROGRESS = 2051
DC_EVENT_IMEX_FILE_WRITTEN = 2052
DC_EVENT_SECUREJOIN_INVITER_PROGRESS = 2060
DC_EVENT_SECUREJOIN_JOINER_PROGRESS = 2061
DC_EVENT_SECUREJOIN_MEMBER_ADDED = 2062
DC_EVENT_MEMBER_ADDED = 2063
DC_EVENT_MEMBER_REMOVED = 2064
DC_EVENT_FILE_COPIED = 2055
DC_EVENT_IS_OFFLINE = 2081
DC_EVENT_GET_STRING = 2091

7
python/tests/test_account.py
View File

@@ -1209,11 +1209,6 @@ class TestOnlineAccount:
ac1._evtracker.get_matching("DC_EVENT_IMAP_MESSAGE_DELETED")
ac2._evtracker.get_matching("DC_EVENT_IMAP_MESSAGE_DELETED")
wait_securejoin_inviter_progress(ac1, 1000)
ac1._evtracker.get_matching("DC_EVENT_MEMBER_ADDED")
ch.remove_contact(ac1.get_self_contact())
ac2._evtracker.get_matching("DC_EVENT_MEMBER_REMOVED")
ac1._evtracker.get_matching("DC_EVENT_MEMBER_REMOVED")
def test_qr_verified_group_and_chatting(self, acfactory, lp):
ac1, ac2 = acfactory.get_two_online_accounts()
@@ -1225,7 +1220,6 @@ class TestOnlineAccount:
chat2 = ac2.qr_join_chat(qr)
assert chat2.id >= 10
wait_securejoin_inviter_progress(ac1, 1000)
ac1._evtracker.get_matching("DC_EVENT_MEMBER_ADDED")
lp.sec("ac2: read member added message")
msg = ac2._evtracker.wait_next_incoming_message()
@@ -1547,7 +1541,6 @@ class TestGroupStressTests:
to_remove = contacts[-1]
msg.chat.remove_contact(to_remove)
ac2._evtracker.get_matching("DC_EVENT_MEMBER_REMOVED")
lp.sec("ac1: receiving system message about contact removal")
sysmsg = ac1._evtracker.wait_next_incoming_message()