upgrade to deltachat2 v0.5.0 and add BotCli.after()

deltabot_cli/cli.py

@@ -39,10 +39,14 @@ def __init__(self, app_name: str, log_level: str = "info") -> None:
         self._start_hooks: Set[CliEventHook] = set()
         self._bot: Bot
 
-    def on(self, event: Union[type, EventFilter]) -> HookDecorator:  # noqa
+    def on(self, event: Union[type, EventFilter]) -> HookDecorator:
         """Register decorated function as listener for the given event."""
         return self._hooks.on(event)
 
+    def after(self, event: Union[type, EventFilter]) -> HookDecorator:
+        """Register decorated function as listener for the given event."""
+        return self._hooks.after(event)
+
     def on_init(self, func: CliEventHook) -> CliEventHook:
         """Register function to be called before the bot starts serving requests.
 

examples/echobot_advanced.py

@@ -43,9 +43,10 @@ def log_event(bot, accid, event):
             bot.rpc.send_msg(accid, chatid, reply)
 
 
-@cli.on(events.NewMessage(is_info=True))
-def delete_info_msgs(bot, accid, event):
-    bot.rpc.delete_messages(accid, [event.msg.id])
+@cli.on(events.NewMessage(command="/help"))
+def _help(bot, accid, event):
+    msg = event.msg
+    bot.rpc.send_msg(accid, msg.chat_id, MsgData(text="I will repeat anything you say to me"))
 
 
 @cli.on(events.NewMessage(is_info=False))
@@ -54,14 +55,11 @@ def echo(bot, accid, event):
         return
     msg = event.msg
     bot.rpc.send_msg(accid, msg.chat_id, MsgData(text=msg.text))
-    bot.rpc.delete_messages(accid, [msg.id])
 
 
-@cli.on(events.NewMessage(command="/help"))
-def _help(bot, accid, event):
-    msg = event.msg
-    bot.rpc.send_msg(accid, msg.chat_id, MsgData(text="I will repeat anything you say to me"))
-    bot.rpc.delete_messages(accid, [msg.id])
+@cli.after(events.NewMessage)
+def delete_msgs(bot, accid, event):
+    bot.rpc.delete_messages(accid, [event.msg.id])
 
 
 def test(_cli, bot, args):

pylama.ini

@@ -1,4 +1,4 @@
 [pylama]
 linters=mccabe,pyflakes,pylint,isort,mypy
 ignore=C0116,R0902,R0913,W1203,W0718
-skip=.*,build/*,tests/*,*/flycheck_*
+skip=.*,build/*,tests/*,*/_version.py,*/flycheck_*

pyproject.toml

@@ -19,7 +19,7 @@ classifiers = [
   "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
 ]
 dependencies = [
-    "deltachat2[full]>=0.4.0",
+    "deltachat2[full]>=0.5.0",
     "appdirs>=1.4.4",
     "rich>=12.6.0",
     "qrcode>=7.4.2",