[INTPROD-9643] Add thread support for reaction message handlers

omnibot/processor.py

@@ -149,8 +149,13 @@ def _process_reaction_message_handlers(reaction: Reaction):
     handler_called = False
     item_channel = reaction.item_channel
     item_ts = reaction.item_ts
+    item_user = reaction.item_user
 
-    if not _is_message_from_bot(bot, item_channel, item_ts):
+    if item_user is not None:
+        if item_user != bot.user_id:
+            statsd.incr("event.ignored")
+            return
+    elif not _is_message_from_bot(bot, item_channel, item_ts):  # Fallback check
         statsd.incr("event.ignored")
         return
 
@@ -179,8 +184,11 @@ def _is_message_from_bot(bot: Bot, channel: str, ts: str):
     Some events, like reactions, do not have all the ids we need to determine who wrote the message.
     """
     message = get_message(bot, channel, ts)
-    if not message or "bot_id" not in message:
-        logger.warning("Failed to retrieve valid message or 'bot_id' is missing")
+    if not message:
+        logger.warning("Failed to retrieve valid message")
+        return False
+    elif "bot_id" not in message:
+        logger.debug("Message is not from a bot")
         return False
     # There can be multiple bot_ids for the same bot
     bot_info = get_bot_info(bot, message["bot_id"])

omnibot/services/slack/reaction.py

@@ -21,7 +21,7 @@ def __init__(self, bot: Bot, event: dict, event_trace: dict):
             self._payload["emoji_name"] = event["reaction"]
         except Exception:
             logger.error(
-                "Reaction event is missing reaction attribute.",
+                "Reaction event is missing reaction attribute",
                 extra=self.event_trace,
             )
             raise
@@ -31,10 +31,11 @@ def __init__(self, bot: Bot, event: dict, event_trace: dict):
             self._payload["item_ts"] = event["item"]["ts"]
         except Exception:
             logger.error(
-                "Reaction event is missing a item attribute.",
+                "Reaction event is missing item attribute",
                 extra=self.event_trace,
             )
             raise
+        self._payload["item_user"] = event.get("item_user")
         self._payload["channel_id"] = self.item_channel
 
     def _check_unsupported(self):
@@ -75,6 +76,14 @@ def item_ts(self):
         """
         return self._payload["item_ts"]
 
+    @property
+    def item_user(self):
+        """
+        The user who created the item (e.g. "message", "file", etc.) that was reacted to.
+        This is not always present, such as in reaction events to slack command responses.
+        """
+        return self._payload["item_user"]
+
     @property
     def emoji_name(self):
         """