hotfix: delete duplicated edit/delete detection and check for bot deletions

Author: AllenAnthes

pybot/endpoints/slack/events.py

@@ -11,8 +11,6 @@
 
 def create_endpoints(plugin):
     plugin.on_event("team_join", team_join, wait=False)
-    plugin.on_message(".*", message_changed, subtype="message_changed")
-    plugin.on_message(".*", message_deleted, subtype="message_deleted")
 
 
 async def team_join(event: Event, app: SirBot) -> None:
@@ -30,25 +28,3 @@ async def team_join(event: Event, app: SirBot) -> None:
 
     await asyncio.sleep(30)
     await asyncio.wait(futures)
-
-
-async def message_changed(event, app):
-        try:
-            logger.info(event)
-            logger.info(
-                f'user_id: {event["user"]} has performed {event["subtype"]} on  message: {event["ts"]} for user: {event["previous_message"]["user"]}')
-
-        except Exception as E:
-            logger.exception(E)
-            logger.debug(event)
-
-
-async def message_deleted(event, app):
-    try:
-        logger.info(event)
-        logger.info(
-            f'message deleted: {event["ts"]} for user: {event["previous_message"]["user"]}')
-
-    except Exception as E:
-        logger.exception(E)
-        logger.debug(event)

pybot/endpoints/slack/messages.py

@@ -15,6 +15,10 @@ def not_bot_message(event: Message):
     return 'message' not in event or 'subtype' not in event['message'] or event['message']['subtype'] != 'bot_message'
 
 
+def not_bot_delete(event: Message):
+    return 'previous_message' not in event or 'bot_id' not in event['previous_message']
+
+
 async def message_changed(event: Message, app: SirBot):
     """
     Logs all message edits not made by a bot.
@@ -33,7 +37,7 @@ async def message_deleted(event: Message, app: SirBot):
     """
     Logs all message deletions not made by a bot.
     """
-    if not_bot_message(event):
+    if not_bot_delete(event):
         try:
             logger.info(
                 f'CHANGE_LOGGING: deleted: {event["ts"]} for user: {event["previous_message"]["user"]}\n{event}')