Merge branch 'staging' of https://github.com/OperationCode/operationcode-pybot into staging

# Conflicts:
#	pybot/endpoints/slack/commands.py
#	pybot/endpoints/slack/events.py
#	pybot/endpoints/slack/messages.py

Author: wimo7083

pybot/endpoints/slack/commands.py

@@ -5,7 +5,7 @@
 from slack import methods
 from slack.commands import Command
 
-from pybot.endpoints.slack.utils import PYBACK_HOST, PYBACK_PORT, PYBACK_TOKEN, REPORT_CHANNEL
+from pybot.endpoints.slack.utils import PYBACK_HOST, PYBACK_PORT, PYBACK_TOKEN, REPORT_CHANNEL, YELP_TOKEN
 from pybot.endpoints.slack.utils.action_messages import not_claimed_attachment
 from pybot.endpoints.slack.utils.command_utils import get_slash_here_messages, get_slash_repeat_messages, response_type
 from pybot.endpoints.slack.utils.slash_lunch import LunchCommand

pybot/endpoints/slack/messages.py

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