git status

git status
suggestions implemented

Author: Dishant1804

backend/apps/ai/common/constants.py

@@ -5,3 +5,4 @@
 DEFAULT_SIMILARITY_THRESHOLD = 0.4
 DELIMITER = "\n\n"
 MIN_REQUEST_INTERVAL_SECONDS = 1.2
+QUEUE_RESPONSE_TIME_MINUTES = 1

backend/apps/slack/MANIFEST.yaml

@@ -108,6 +108,7 @@ oauth_config:
       - mpim:read
       - users:read
     bot:
+      - app_mentions:read
       - channels:read
       - chat:write
       - commands
@@ -129,6 +130,7 @@ settings:
       - team_join
     bot_events:
       - app_home_opened
+      - app_mention
       - member_joined_channel
       - message.channels
       - team_join

backend/apps/slack/events/__init__.py

@@ -3,6 +3,7 @@ def configure_slack_events():
     from apps.slack.apps import SlackConfig
     from apps.slack.events import (
         app_home_opened,
+        app_mention,
         message_posted,
         team_join,
         url_verification,

backend/apps/slack/events/app_mention.py

@@ -0,0 +1,42 @@
+"""Slack app mention event handler."""
+
+import logging
+
+from apps.slack.common.handlers.ai import get_blocks
+from apps.slack.events.event import EventBase
+
+logger = logging.getLogger(__name__)
+
+
+class AppMention(EventBase):
+    """Handles app mention events when the bot is mentioned in a channel."""
+
+    event_type = "app_mention"
+
+    def handle_event(self, event, client):
+        """Handle an incoming app mention event."""
+        channel_id = event.get("channel")
+        text = event.get("text", "")
+
+        query = text
+        for mention in event.get("blocks", []):
+            if mention.get("type") == "rich_text":
+                for element in mention.get("elements", []):
+                    if element.get("type") == "rich_text_section":
+                        for text_element in element.get("elements", []):
+                            if text_element.get("type") == "text":
+                                query = text_element.get("text", "").strip()
+                                break
+
+        if not query:
+            logger.warning("No query found in app mention")
+            return
+
+        logger.info("Handling app mention")
+
+        client.chat_postMessage(
+            channel=channel_id,
+            blocks=get_blocks(query=query),
+            text=query,
+            thread_ts=event.get("ts"),
+        )

backend/apps/slack/events/message_posted.py

@@ -5,7 +5,7 @@
 
 import django_rq
 
-from apps.slack.common.handlers.ai import get_blocks
+from apps.ai.common.constants import QUEUE_RESPONSE_TIME_MINUTES
 from apps.slack.common.question_detector import QuestionDetector
 from apps.slack.events.event import EventBase
 from apps.slack.models import Conversation, Member, Message
@@ -22,33 +22,26 @@ class MessagePosted(EventBase):
     def __init__(self):
         """Initialize MessagePosted event handler."""
         self.question_detector = QuestionDetector()
-        self.bot_user_id = None
 
     def handle_event(self, event, client):
         """Handle an incoming message event."""
-        if event.get("subtype") or event.get("bot_id") or event.get("thread_ts"):
+        if event.get("subtype") or event.get("bot_id"):
             logger.info("Ignored message due to subtype, bot_id, or thread_ts.")
             return
 
-        if not self.bot_user_id:
-            auth_response = client.auth_test()
-            self.bot_user_id = auth_response.get("user_id")
+        if event.get("thread_ts"):
+            try:
+                Message.objects.get(
+                    slack_message_id=event.get("thread_ts"),
+                    conversation__slack_channel_id=event.get("channel"),
+                ).update(has_replies=True)
+            except Message.DoesNotExist:
+                logger.warning("Thread message not found.")
+            return
 
         channel_id = event.get("channel")
         user_id = event.get("user")
         text = event.get("text", "")
-        bot_mention_string = f"<@{self.bot_user_id}>"
-
-        if bot_mention_string in text:
-            query = text.replace(bot_mention_string, "").strip()
-
-            client.chat_postMessage(
-                channel=channel_id,
-                blocks=get_blocks(query=query),
-                text=query,
-                thread_ts=event.get("ts"),
-            )
-            return
 
         try:
             conversation = Conversation.objects.get(
@@ -64,14 +57,17 @@ def handle_event(self, event, client):
 
         try:
             author = Member.objects.get(slack_user_id=user_id, workspace=conversation.workspace)
-            message = Message.update_data(
-                data=event, conversation=conversation, author=author, save=True
-            )
-
-            django_rq.get_queue("default").enqueue_in(
-                timedelta(minutes=1), generate_ai_reply_if_unanswered, message.id
-            )
-
         except Member.DoesNotExist:
-            logger.warning("Could not find Member")
-            return
+            user_info = client.users_info(user=user_id)
+            author = Member.update_data(user_info["user"], conversation.workspace, save=True)
+            logger.info("Created new member")
+
+        message = Message.update_data(
+            data=event, conversation=conversation, author=author, save=True
+        )
+
+        django_rq.get_queue("ai").enqueue_in(
+            timedelta(minutes=QUEUE_RESPONSE_TIME_MINUTES),
+            generate_ai_reply_if_unanswered,
+            message.id,
+        )

backend/apps/slack/services/message_auto_reply.py

@@ -12,7 +12,7 @@
 logger = logging.getLogger(__name__)
 
 
-@job("default")
+@job("ai")
 def generate_ai_reply_if_unanswered(message_id: int):
     """Check if a message is still unanswered and generate AI reply."""
     try:

backend/apps/slack/templates/commands/ai.jinja

@@ -5,8 +5,7 @@ Use this command to ask questions about OWASP projects, OWASP chapters, and comm
 *Examples:*
 • `{{ COMMAND }} What are the OWASP Top 10 vulnerabilities?`
 • `{{ COMMAND }} How do I contribute to an OWASP project?`
-• `{{ COMMAND }} Tell me about OWASP ZAP`
-• `{{ COMMAND }} What is secure coding?`
+• `{{ COMMAND }} When is the next OWASP appsec days event?`
 
 {{ DIVIDER }}