Reconcile changes between staging and master

Author: AllenAnthes

pybot/endpoints/slack/actions.py

@@ -17,7 +17,7 @@ async def claimed(action: Action, app: SirBot):
     attachments = action['original_message']['attachments']
 
     for index, attachment in enumerate(attachments):
-        if attachment['callback_id'] == 'claimed':
+        if 'callback_id' in attachment and attachment['callback_id'] == 'claimed':
             attachments[index] = claimed_attachment(user_id)
     response['attachments'] = attachments
 
@@ -34,7 +34,7 @@ async def reset_claim(action: Action, app: SirBot):
 
     attachments = action['original_message']['attachments']
     for index, attachment in enumerate(attachments):
-        if attachment['callback_id'] == 'claimed':
+        if 'callback_id' in attachment and attachment['callback_id'] == 'claimed':
             attachments[index] = not_claimed_attachment()
 
     response['attachments'] = attachments

pybot/endpoints/slack/actions/general_actions.py

@@ -1,5 +1,3 @@
-import json
-
 from sirbot import SirBot
 from slack import methods
 from slack.actions import Action

pybot/endpoints/slack/actions/help_ticket.py

@@ -26,7 +26,7 @@ def create_endpoints(plugin: SlackPlugin):
     plugin.on_command('/repeat', slash_repeat, wait=False)
     plugin.on_command('/report', slash_report, wait=False)
     plugin.on_command('/ticket', slash_ticket, wait=False)
-    plugin.on_command('/mentor', slash_mentor, wait=False)
+    # plugin.on_command('/mentor', slash_mentor, wait=False)
 
 
 async def slash_mentor(command: Command, app: SirBot):