Merge branch 'feld-varnish' into 'develop'

[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 c27d025c488f7348936275ab007558519634598e..c3bae59354688223c7e91175b72c9df712e147b1 100644 (file)
--- a/lib/pleroma/web/mastodon_api/mastodon_socket.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_socket.ex
@@ -1,18 +1,30 @@
 defmodule Pleroma.Web.MastodonAPI.MastodonSocket do
   use Phoenix.Socket
 
-  transport :streaming, Phoenix.Transports.WebSocket.Raw
+  alias Pleroma.Web.OAuth.Token
+  alias Pleroma.{User, Repo}
+
+  transport :streaming, Phoenix.Transports.WebSocket.Raw,
+    timeout: :infinity # We never receive data.
 
   def connect(params, socket) do
-    IO.inspect(params)
-    Pleroma.Web.Streamer.add_socket(params["stream"], socket)
-    {:ok, socket}
+    with token when not is_nil(token) <- params["access_token"],
+         %Token{user_id: user_id} <- Repo.get_by(Token, token: token),
+         %User{} = user <- Repo.get(User, user_id),
+         stream when stream in ["public", "public:local", "user"] <- params["stream"] do
+      socket = socket
+      |> assign(:topic, params["stream"])
+      |> assign(:user, user)
+      Pleroma.Web.Streamer.add_socket(params["stream"], socket)
+      {:ok, socket}
+    else
+      _e -> :error
+    end
   end
 
-  def id(socket), do: nil
+  def id(_), do: nil
 
-  def handle(:text, message, state) do
-    IO.inspect message
+  def handle(:text, message, _state) do
     #| :ok
     #| state
     #| {:text, message}
@@ -21,7 +33,8 @@ defmodule Pleroma.Web.MastodonAPI.MastodonSocket do
     {:text, message}
   end
 
-  def handle(:closed, reason, _state) do
-    IO.inspect reason
+  def handle(:closed, _, %{socket: socket}) do
+    topic = socket.assigns[:topic]
+    Pleroma.Web.Streamer.remove_socket(topic, socket)
   end
 end