Only respond in a thread for same room destination

Author: vanstee

lib/cog/chat/message_metadata.ex

@@ -2,4 +2,5 @@ defmodule Cog.Chat.MessageMetadata do
   use Conduit
 
   field :thread_id, :string, required: false
+  field :originating_room_id, :string, required: false
 end

lib/cog/chat/slack/connector.ex

@@ -301,7 +301,7 @@ defmodule Cog.Chat.Slack.Connector do
         else
           {:chat_message, %Message{id: Cog.Events.Util.unique_id, room: room,
               user: user, text: text, provider: @provider_name,
-              metadata: %MessageMetadata{thread_id: ts},
+              metadata: %MessageMetadata{thread_id: ts, originating_room_id: room.id},
               bot_name: "@#{state.me.name}", edited: false}}
         end
     end

lib/cog/chat/slack/provider.ex

@@ -109,7 +109,7 @@ defmodule Cog.Chat.Slack.Provider do
   end
   # Old template processing
   def handle_call({:send_message, target, message, metadata}, _from, %__MODULE__{connector: connector, token: token}=state) when is_binary(message) do
-    metadata = maybe_remove_thread_id(metadata, state.enable_threaded_response)
+    metadata = maybe_remove_thread_id(metadata, state.enable_threaded_response, target)
     result = Connector.call(connector, token, :send_message, %{target: target, message: message, metadata: metadata})
     case result["ok"] do
       true ->
@@ -121,7 +121,7 @@ defmodule Cog.Chat.Slack.Provider do
   # New template processing
   def handle_call({:send_message, target, message, metadata}, _from, %__MODULE__{connector: connector, token: token}=state) do
     {text, attachments} = SlackRenderer.render(message)
-    metadata = maybe_remove_thread_id(metadata, state.enable_threaded_response)
+    metadata = maybe_remove_thread_id(metadata, state.enable_threaded_response, target)
     result = Connector.call(connector, token, :send_message, %{target: target, message: text, metadata: metadata, attachments: attachments})
     case result["ok"] do
       true ->
@@ -140,8 +140,8 @@ defmodule Cog.Chat.Slack.Provider do
     {:noreply, state}
   end
 
-  defp maybe_remove_thread_id(metadata, true),
+  defp maybe_remove_thread_id(%Cog.Chat.MessageMetadata{originating_room_id: target_room_id} = metadata, true, target_room_id),
     do: metadata
-  defp maybe_remove_thread_id(metadata, _),
+  defp maybe_remove_thread_id(metadata, _disabled, _taget_room_id),
     do: %{metadata | thread_id: nil}
 end