Increase timeout for login requests

lib/matrix_client/client.ex

@@ -78,7 +78,7 @@ defmodule M51.MatrixClient.Client do
         # Check the server supports password login
         url = base_url <> "/_matrix/client/r0/login"
         Logger.debug("(raw) GET #{url}")
-        response = httpoison.get!(url)
+        response = httpoison.get!(url, [], timeout: @timeout)
         Logger.debug(Kernel.inspect(response))
 
         case response do
@@ -111,7 +111,7 @@ defmodule M51.MatrixClient.Client do
 
                 url = base_url <> "/_matrix/client/r0/login"
                 Logger.debug("(raw) POST #{url} " <> Kernel.inspect(body))
-                response = httpoison.post!(url, body)
+                response = httpoison.post!(url, body, [], timeout: @timeout)
                 Logger.debug(Kernel.inspect(response))
 
                 case response do

lib/matrix_client/poller.ex

@@ -1157,6 +1157,9 @@ defmodule M51.MatrixClient.Poller do
   end
 
   # Sends self JOIN, RPL_TOPIC/RPL_NOTOPIC, RPL_NAMREPLY
+  #
+  # Returns whether the announce was actually sent (ie. if the channel has a canonical
+  # alias, or was allowed to be sent without a canonical alias)
   defp send_channel_welcome(
          sup_pid,
          room_id,
@@ -1172,15 +1175,20 @@ defmodule M51.MatrixClient.Poller do
 
     supports_channel_rename = Enum.member?(capabilities, :channel_rename)
 
-    if old_canonical_alias == nil || !supports_channel_rename do
-      announce_new_channel(
-        M51.IrcConn.Supervisor,
-        sup_pid,
-        room_id,
-        write,
-        event
-      )
-    end
+    announced_new_channel =
+      if old_canonical_alias == nil || !supports_channel_rename do
+        announce_new_channel(
+          M51.IrcConn.Supervisor,
+          sup_pid,
+          room_id,
+          write,
+          event
+        )
+
+        true
+      else
+        false
+      end
 
     if old_canonical_alias != nil do
       if supports_channel_rename do
@@ -1197,6 +1205,8 @@ defmodule M51.MatrixClient.Poller do
           command: "RENAME",
           params: [old_canonical_alias, new_canonical_alias, "Canonical alias changed"]
         })
+
+        true
       else
         close_renamed_channel(
           sup_pid,
@@ -1205,6 +1215,8 @@ defmodule M51.MatrixClient.Poller do
           canonical_alias_sender,
           old_canonical_alias
         )
+
+        announced_new_channel
       end
     end
   end

test/matrix_client/client_test.exs

@@ -22,6 +22,8 @@ defmodule M51.MatrixClient.ClientTest do
   setup :set_mox_from_context
   setup :verify_on_exit!
 
+  @timeout 65000
+
   setup do
     start_supervised!({M51.MatrixClient.State, {self()}})
 
@@ -36,8 +38,10 @@ defmodule M51.MatrixClient.ClientTest do
       assert url == "https://matrix.example.org/.well-known/matrix/client"
       {:ok, %HTTPoison.Response{status_code: 404, body: "Error 404"}}
     end)
-    |> expect(:get!, fn url ->
+    |> expect(:get!, fn url, headers, options ->
       assert url == "https://matrix.example.org/_matrix/client/r0/login"
+      assert headers == []
+      assert options == [timeout: @timeout]
 
       %HTTPoison.Response{
         status_code: 200,
@@ -46,8 +50,10 @@ defmodule M51.MatrixClient.ClientTest do
         """
       }
     end)
-    |> expect(:post!, fn url, body ->
+    |> expect(:post!, fn url, body, headers, options ->
       assert url == "https://matrix.example.org/_matrix/client/r0/login"
+      assert headers == []
+      assert options == [timeout: @timeout]
 
       assert Jason.decode!(body) == %{
                "type" => "m.login.password",
@@ -95,8 +101,10 @@ defmodule M51.MatrixClient.ClientTest do
          """
        }}
     end)
-    |> expect(:get!, fn url ->
+    |> expect(:get!, fn url, headers, options ->
       assert url == "https://example.org/_matrix/client/r0/login"
+      assert headers == []
+      assert options == [timeout: @timeout]
 
       %HTTPoison.Response{
         status_code: 404,
@@ -134,8 +142,10 @@ defmodule M51.MatrixClient.ClientTest do
          """
        }}
     end)
-    |> expect(:get!, fn url ->
+    |> expect(:get!, fn url, headers, options ->
       assert url == "https://matrix.example.org/_matrix/client/r0/login"
+      assert headers == []
+      assert options == [timeout: @timeout]
 
       %HTTPoison.Response{
         status_code: 200,
@@ -150,8 +160,10 @@ defmodule M51.MatrixClient.ClientTest do
         """
       }
     end)
-    |> expect(:post!, fn url, body ->
+    |> expect(:post!, fn url, body, headers, options ->
       assert url == "https://matrix.example.org/_matrix/client/r0/login"
+      assert headers == []
+      assert options == [timeout: @timeout]
 
       assert Jason.decode!(body) == %{
                "type" => "m.login.password",
@@ -213,8 +225,10 @@ defmodule M51.MatrixClient.ClientTest do
          """
        }}
     end)
-    |> expect(:get!, fn url ->
+    |> expect(:get!, fn url, headers, options ->
       assert url == "https://matrix.example.com/_matrix/client/r0/login"
+      assert headers == []
+      assert options == [timeout: @timeout]
 
       %HTTPoison.Response{
         status_code: 200,
@@ -232,8 +246,10 @@ defmodule M51.MatrixClient.ClientTest do
         """
       }
     end)
-    |> expect(:post!, fn url, body ->
+    |> expect(:post!, fn url, body, headers, options ->
       assert url == "https://matrix.example.com/_matrix/client/r0/login"
+      assert headers == []
+      assert options == [timeout: @timeout]
 
       assert Jason.decode!(body) == %{
                "type" => "m.login.password",
@@ -293,8 +309,10 @@ defmodule M51.MatrixClient.ClientTest do
          """
        }}
     end)
-    |> expect(:get!, fn url ->
+    |> expect(:get!, fn url, headers, options ->
       assert url == "https://matrix.example.org/_matrix/client/r0/login"
+      assert headers == []
+      assert options == [timeout: @timeout]
 
       %HTTPoison.Response{
         status_code: 200,
@@ -338,8 +356,10 @@ defmodule M51.MatrixClient.ClientTest do
          """
        }}
     end)
-    |> expect(:get!, fn url ->
+    |> expect(:get!, fn url, headers, options ->
       assert url == "https://matrix.example.org/_matrix/client/r0/login"
+      assert headers == []
+      assert options == [timeout: @timeout]
 
       %HTTPoison.Response{
         status_code: 200,
@@ -354,8 +374,10 @@ defmodule M51.MatrixClient.ClientTest do
         """
       }
     end)
-    |> expect(:post!, fn url, body ->
+    |> expect(:post!, fn url, body, headers, options ->
       assert url == "https://matrix.example.org/_matrix/client/r0/login"
+      assert headers == []
+      assert options == [timeout: @timeout]
 
       assert Jason.decode!(body) == %{
                "type" => "m.login.password",