Generalize slack delete_message handler

Author: AllenAnthes

pybot/endpoints/slack/actions/__init__.py

@@ -1,10 +1,9 @@
 from sirbot.plugins.slack import SlackPlugin
 
-from .general_actions import claimed, reset_claim
+from .general_actions import claimed, delete_message, reset_claim
 from .help_ticket import open_ticket, ticket_status
 from .mentor_request import (
     add_skillset,
-    cancel_mentor_request,
     claim_mentee,
     clear_mentor,
     clear_skillsets,
@@ -29,6 +28,7 @@ def create_endpoints(plugin: SlackPlugin):
     # simple actions that can be used in multiple scenarios
     plugin.on_action("claimed", claimed, name="claimed", wait=False)
     plugin.on_action("claimed", reset_claim, name="reset_claim", wait=False)
+    plugin.on_block("submission", delete_message, action_id="cancel_btn", wait=False)
 
     # new member interactive actions
     plugin.on_action("resource_buttons", resource_buttons, wait=False)
@@ -69,9 +69,6 @@ def create_endpoints(plugin: SlackPlugin):
     plugin.on_block(
         "submission", mentor_request_submit, action_id="submit_btn", wait=False
     )
-    plugin.on_block(
-        "submission", cancel_mentor_request, action_id="cancel_btn", wait=False
-    )
 
     # mentorship claims
     plugin.on_action("claim_mentee", claim_mentee, wait=False)

pybot/endpoints/slack/actions/general_actions.py

@@ -43,3 +43,10 @@ async def reset_claim(action: Action, app: SirBot):
 
     response["attachments"] = attachments
     await app.plugins["slack"].api.query(methods.CHAT_UPDATE, response)
+
+
+async def delete_message(action: Action, app: SirBot):
+    slack = app.plugins["slack"].api
+    params = {"ts": action["message"]["ts"], "channel": action["channel"]["id"]}
+
+    await slack.query(methods.CHAT_DELETE, params)

pybot/endpoints/slack/actions/mentor_request.py

@@ -36,12 +36,6 @@ async def mentor_request_submit(action: Action, app: SirBot):
         await request.submission_complete(slack)
 
 
-async def cancel_mentor_request(action: Action, app: SirBot):
-    slack = app.plugins["slack"].api
-    request = MentorRequest(action)
-    await request.delete_self(slack)
-
-
 async def mentor_details_submit(action: Action, app: SirBot):
     slack = app.plugins["slack"].api
     request = MentorRequest(action)

pybot/endpoints/slack/message_templates/mentor_request.py

@@ -217,10 +217,6 @@ def clear_skillsets(self) -> None:
     def clear_errors(self) -> None:
         self.attachments = []
 
-    async def delete_self(self, slack: SlackAPI) -> None:
-        params = {"ts": self.ts, "channel": self.channel}
-        await slack.query(methods.CHAT_DELETE, params)
-
     def update_message(self, slack: SlackAPI) -> Coroutine[Any, Any, dict]:
         return slack.query(methods.CHAT_UPDATE, self.update_params)