More put_view.

[akkoma] / lib / pleroma / web / mastodon_api / mastodon_socket.ex

diff --git a/lib/pleroma/web/mastodon_api/mastodon_socket.ex b/lib/pleroma/web/mastodon_api/mastodon_socket.ex
index 46ec5ecd2c1b0bce538101327e1bcd307e6a82af..1b75897b530b63dfd102a9b17c8cd280a4504f85 100644 (file)
--- a/lib/pleroma/web/mastodon_api/mastodon_socket.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_socket.ex
@@ -4,16 +4,9 @@ defmodule Pleroma.Web.MastodonAPI.MastodonSocket do
   alias Pleroma.Web.OAuth.Token
   alias Pleroma.{User, Repo}
 
-  transport(
-    :streaming,
-    Phoenix.Transports.WebSocket.Raw,
-    # We never receive data.
-    timeout: :infinity
-  )
-
-  def connect(params, socket) do
-    with token when not is_nil(token) <- params["access_token"],
-         %Token{user_id: user_id} <- Repo.get_by(Token, token: token),
+  @spec connect(params :: map(), Phoenix.Socket.t()) :: {:ok, Phoenix.Socket.t()} | :error
+  def connect(%{"access_token" => token} = params, socket) do
+    with %Token{user_id: user_id} <- Repo.get_by(Token, token: token),
          %User{} = user <- Repo.get(User, user_id),
          stream
          when stream in [
@@ -53,16 +46,16 @@ defmodule Pleroma.Web.MastodonAPI.MastodonSocket do
         _ -> stream
       end
 
-    with socket =
-           socket
-           |> assign(:topic, topic) do
-      Pleroma.Web.Streamer.add_socket(topic, socket)
-      {:ok, socket}
-    else
-      _e -> :error
-    end
+    socket =
+      socket
+      |> assign(:topic, topic)
+
+    Pleroma.Web.Streamer.add_socket(topic, socket)
+    {:ok, socket}
   end
 
+  def connect(_params, _socket), do: :error
+
   def id(_), do: nil
 
   def handle(:text, message, _state) do