feat(notifications platform): More robust message tab reply (#26581)

* feat(notifications platform): More robust message tab reply

Author: ceorourke

src/sentry/integrations/slack/event_endpoint.py

@@ -35,11 +35,9 @@ def on_message(self, request, integration, token, data):
         # that will cause an infinite loop of messages
         if data.get("bot_id"):
             return self.respond()
-
         access_token = self._get_access_token(integration)
         headers = {"Authorization": "Bearer %s" % access_token}
-        payload = {"channel": channel, **SlackEventMessageBuilder().build()}
-
+        payload = {"channel": channel, **SlackEventMessageBuilder(integration).build()}
         client = SlackClient()
         try:
             client.post("/chat.postMessage", headers=headers, data=payload, json=True)

src/sentry/integrations/slack/message_builder/base/block.py

@@ -32,6 +32,10 @@ def get_markdown_block(text: str) -> SlackBlock:
             "text": {"type": "mrkdwn", "text": text},
         }
 
+    @staticmethod
+    def get_divider() -> SlackBlock:
+        return {"type": "divider"}
+
     @staticmethod
     def get_action_block(actions: Sequence[Tuple[str, str, str]]) -> SlackBlock:
         return {

src/sentry/integrations/slack/message_builder/event.py

@@ -1,22 +1,70 @@
+from sentry import features
 from sentry.integrations.slack.message_builder import SlackBody
 from sentry.integrations.slack.message_builder.base.block import BlockSlackMessageBuilder
+from sentry.models import Integration
 
 EVENT_MESSAGE = (
     "Want to learn more about configuring alerts in Sentry? Check out our documentation."
 )
+HEADER_MESSAGE = "Here are the commands you can use. Commands not working? Re-install the app!"
+DM_COMMAND_HEADER = "*Direct Message Commands:*"
+CHANNEL_COMMANDS_HEADER = "*Channel Commands:*"
+GENERAL_MESSAGE = "Just want to learn more about Sentry? Check out our documentation."
+
+
+DM_COMMANDS = {
+    "link": "Link your Slack account to Sentry",
+    "unlink": "Unlink your Slack account from Sentry",
+    "help": "View this list of commands",
+}
+CHANNEL_COMMANDS = {
+    "link team": "Type this into the channel in which you want your team to receive issue alert notifications"
+}
+
+DM_COMMANDS_MESSAGE = "\n".join(
+    (
+        f"• `/sentry {command}`: {description}"
+        for command, description in sorted(tuple(DM_COMMANDS.items()))
+    )
+)
+
+CHANNEL_COMMANDS_MESSAGE = "\n".join(
+    (
+        f"• `/sentry {command}`: {description}"
+        for command, description in sorted(tuple(CHANNEL_COMMANDS.items()))
+    )
+)
 
 
 class SlackEventMessageBuilder(BlockSlackMessageBuilder):
+    def __init__(self, integration: Integration) -> None:
+        super().__init__()
+        self.integration = integration
+
     def build(self) -> SlackBody:
+        action_block = self.get_action_block(
+            [
+                (
+                    "Sentry Docs",
+                    "https://docs.sentry.io/product/alerts-notifications/alerts/",
+                    "sentry_docs_link_clicked",
+                )
+            ]
+        )
+        if not features.has(
+            "organizations:notification-platform", self.integration.organizations.all()
+        ):
+            return self._build_blocks(
+                self.get_markdown_block(EVENT_MESSAGE),
+                action_block,
+            )
         return self._build_blocks(
-            self.get_markdown_block(EVENT_MESSAGE),
-            self.get_action_block(
-                [
-                    (
-                        "Sentry Docs",
-                        "https://docs.sentry.io/product/alerts-notifications/alerts/",
-                        "sentry_docs_link_clicked",
-                    )
-                ]
-            ),
+            self.get_markdown_block(HEADER_MESSAGE),
+            self.get_markdown_block(DM_COMMAND_HEADER),
+            self.get_markdown_block(DM_COMMANDS_MESSAGE),
+            self.get_markdown_block(CHANNEL_COMMANDS_HEADER),
+            self.get_markdown_block(CHANNEL_COMMANDS_MESSAGE),
+            self.get_divider(),
+            self.get_markdown_block(GENERAL_MESSAGE),
+            action_block,
         )

src/sentry/integrations/slack/message_builder/help.py

@@ -3,19 +3,12 @@
 from sentry.integrations.slack.message_builder import SlackBody
 from sentry.integrations.slack.message_builder.base.base import SlackMessageBuilder
 
-AVAILABLE_COMMANDS = {
-    "help": "displays the available commands",
-    "link": "kicks off linking Slack and Sentry",
-    "unlink": "unlinks your identity",
-}
+from .event import DM_COMMANDS_MESSAGE
 
 
 def get_message(command: Optional[str] = None) -> str:
     unknown_command = f"Unknown command: `{command}`\n" if command else ""
-    commands_list = "\n".join(
-        f"• *{command}* - {description}" for command, description in AVAILABLE_COMMANDS.items()
-    )
-    return f"{unknown_command}Available Commands:\n{commands_list}"
+    return f"{unknown_command}Available Commands:\n{DM_COMMANDS_MESSAGE}"
 
 
 class SlackHelpMessageBuilder(SlackMessageBuilder):

tests/sentry/integrations/slack/test_event_endpoint.py

@@ -190,6 +190,21 @@ def test_user_message_im(self):
         )
         assert self.get_block_type_text("actions", data) == "Sentry Docs"
 
+    @responses.activate
+    def test_user_message_im_notification_platform(self):
+        responses.add(responses.POST, "https://slack.com/api/chat.postMessage", json={"ok": True})
+        with self.feature("organizations:notification-platform"):
+            resp = self.post_webhook(event_data=json.loads(MESSAGE_IM_EVENT))
+        assert resp.status_code == 200, resp.content
+        request = responses.calls[0].request
+        assert request.headers["Authorization"] == "Bearer xoxp-xxxxxxxxx-xxxxxxxxxx-xxxxxxxxxxxx"
+        data = json.loads(request.body)
+        assert (
+            self.get_block_type_text("section", data)
+            == "Here are the commands you can use. Commands not working? Re-install the app!"
+        )
+        assert self.get_block_type_text("actions", data) == "Sentry Docs"
+
     def test_bot_message_im(self):
         resp = self.post_webhook(event_data=json.loads(MESSAGE_IM_BOT_EVENT))
         assert resp.status_code == 200, resp.content