Merge branch 'formatting-fixes' 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 f9c8cec321e6e4def2ef35d04d19118346550f71..1d276e64abfa2409cf2a0911d888179c5d9ed7c1 100644 (file)
--- a/lib/pleroma/web/mastodon_api/mastodon_socket.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_socket.ex
@@ -1,17 +1,24 @@
 defmodule Pleroma.Web.MastodonAPI.MastodonSocket do
   use Phoenix.Socket
 
+  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
-    if params["stream"] == "public" do
+    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
-      :error
+      _e -> :error
     end
   end