remove group tracking not working with pgp-contacts

Author: link2xt

python/examples/group_tracking.py

@@ -1,10 +1,7 @@
 import echo_and_quit
-import group_tracking
 import py
 import pytest
 
-from deltachat.events import FFIEventLogger
-
 
 @pytest.fixture(scope="session")
 def datadir():
@@ -37,54 +34,3 @@ def test_echo_quit_plugin(acfactory, lp):
     bot_chat.send_text("/quit")
     botproc.wait()
 
-
-def test_group_tracking_plugin(acfactory, lp):
-    lp.sec("creating one group-tracking bot and two temp accounts")
-    botproc = acfactory.run_bot_process(group_tracking)
-
-    ac1, ac2 = acfactory.get_online_accounts(2)
-
-    ac1.add_account_plugin(FFIEventLogger(ac1))
-    ac2.add_account_plugin(FFIEventLogger(ac2))
-
-    lp.sec("creating bot test group with bot")
-    bot_chat = ac1.qr_setup_contact(botproc.qr)
-    ac1._evtracker.wait_securejoin_joiner_progress(1000)
-    bot_contact = bot_chat.get_contacts()[0]
-    ch = ac1.create_group_chat("bot test group")
-    ch.add_contact(bot_contact)
-    ch.send_text("hello")
-
-    botproc.fnmatch_lines(
-        """
-        *ac_chat_modified*bot test group*
-    """,
-    )
-
-    lp.sec("adding third member {}".format(ac2.get_config("addr")))
-    contact3 = ac1.create_contact(ac2)
-    ch.add_contact(contact3)
-
-    reply = ac1._evtracker.wait_next_incoming_message()
-    assert "hello" in reply.text
-
-    lp.sec("now looking at what the bot received")
-    botproc.fnmatch_lines(
-        """
-        *ac_member_added {}*from*{}*
-    """.format(
-            contact3.addr,
-            ac1.get_config("addr"),
-        ),
-    )
-
-    lp.sec("contact successfully added, now removing")
-    ch.remove_contact(contact3)
-    botproc.fnmatch_lines(
-        """
-        *ac_member_removed {}*from*{}*
-    """.format(
-            contact3.addr,
-            ac1.get_config("addr"),
-        ),
-    )

python/examples/test_examples.py

@@ -13,7 +13,6 @@
 from .capi import ffi, lib
 from .cutil import from_optional_dc_charpointer
 from .hookspec import account_hookimpl
-from .message import map_system_message
 
 
 def get_dc_event_name(integer, _DC_EVENTNAME_MAP={}):
@@ -304,21 +303,15 @@ def _map_ffi_event(self, ffi_event: FFIEvent):
         elif name == "DC_EVENT_INCOMING_MSG":
             msg = account.get_message_by_id(ffi_event.data2)
             if msg is not None:
-                yield map_system_message(msg) or ("ac_incoming_message", {"message": msg})
+                yield ("ac_incoming_message", {"message": msg})
         elif name == "DC_EVENT_MSGS_CHANGED":
             if ffi_event.data2 != 0:
                 msg = account.get_message_by_id(ffi_event.data2)
                 if msg is not None:
                     if msg.is_outgoing():
-                        res = map_system_message(msg)
-                        if res and res[0].startswith("ac_member"):
-                            yield res
                         yield "ac_outgoing_message", {"message": msg}
                     elif msg.is_in_fresh():
-                        yield map_system_message(msg) or (
-                            "ac_incoming_message",
-                            {"message": msg},
-                        )
+                        yield "ac_incoming_message", {"message": msg}
         elif name == "DC_EVENT_REACTIONS_CHANGED":
             assert ffi_event.data1 > 0
             msg = account.get_message_by_id(ffi_event.data2)

python/src/deltachat/events.py

@@ -2,7 +2,6 @@
 
 import json
 import os
-import re
 from datetime import datetime, timezone
 from typing import Optional, Union
 
@@ -504,56 +503,3 @@ def get_viewtype_code_from_name(view_type_name):
     raise ValueError(
         f"message typecode not found for {view_type_name!r}, available {list(_view_type_mapping.keys())!r}",
     )
-
-
-#
-# some helper code for turning system messages into hook events
-#
-
-
-def map_system_message(msg):
-    if msg.is_system_message():
-        res = parse_system_add_remove(msg.text)
-        if not res:
-            return None
-        action, affected, actor = res
-        affected = msg.account.get_contact_by_addr(affected)
-        actor = None if actor == "me" else msg.account.get_contact_by_addr(actor)
-        d = {"chat": msg.chat, "contact": affected, "actor": actor, "message": msg}
-        return "ac_member_" + res[0], d
-
-
-def extract_addr(text):
-    m = re.match(r".*\((.+@.+)\)", text)
-    if m:
-        text = m.group(1)
-    text = text.rstrip(".")
-    return text.strip()
-
-
-def parse_system_add_remove(text):
-    """return add/remove info from parsing the given system message text.
-
-    returns a (action, affected, actor) triple
-    """
-    # You removed member a@b.
-    # You added member a@b.
-    # Member Me (x@y) removed by a@b.
-    # Member x@y added by a@b
-    # Member With space ([email protected]) removed by [email protected].
-    # Member With space ([email protected]) removed by Another member ([email protected]).",
-    # Group left by some one ([email protected]).
-    # Group left by [email protected].
-    text = text.lower()
-    m = re.match(r"member (.+) (removed|added) by (.+)", text)
-    if m:
-        affected, action, actor = m.groups()
-        return action, extract_addr(affected), extract_addr(actor)
-    m = re.match(r"you (removed|added) member (.+)", text)
-    if m:
-        action, affected = m.groups()
-        return action, extract_addr(affected), "me"
-    if text.startswith("group left by "):
-        addr = extract_addr(text[13:])
-        if addr:
-            return "removed", addr, addr