X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fmastodon_api%2Fmastodon_socket.ex;h=f3c13d1aa3f55eee73f65d5f0eedae9e0b25659d;hb=c443c9bd72b04b8a24d904bc20fde0d4ffca71d7;hp=f9c8cec321e6e4def2ef35d04d19118346550f71;hpb=87dee3902ad84599479f4e4a6b3109551651fb71;p=akkoma

diff --git a/lib/pleroma/web/mastodon_api/mastodon_socket.ex b/lib/pleroma/web/mastodon_api/mastodon_socket.ex
index f9c8cec32..f3c13d1aa 100644
--- a/lib/pleroma/web/mastodon_api/mastodon_socket.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_socket.ex
@@ -1,33 +1,79 @@
 defmodule Pleroma.Web.MastodonAPI.MastodonSocket do
   use Phoenix.Socket
 
-  transport :streaming, Phoenix.Transports.WebSocket.Raw,
-    timeout: :infinity # We never receive data.
-
-  def connect(params, socket) do
-    if params["stream"] == "public" do
-      socket = socket
-      |> assign(:topic, params["stream"])
-      Pleroma.Web.Streamer.add_socket(params["stream"], socket)
+  alias Pleroma.Web.OAuth.Token
+  alias Pleroma.{User, Repo}
+
+  transport(
+    :streaming,
+    Phoenix.Transports.WebSocket.Raw,
+    # We never receive data.
+    timeout: :infinity
+  )
+
+  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 [
+                "public",
+                "public:local",
+                "public:media",
+                "public:local:media",
+                "user",
+                "direct",
+                "list",
+                "hashtag"
+              ] <- params["stream"] do
+      topic =
+        case stream do
+          "hashtag" -> "hashtag:#{params["tag"]}"
+          "list" -> "list:#{params["list"]}"
+          _ -> stream
+        end
+
+      socket =
+        socket
+        |> assign(:topic, topic)
+        |> assign(:user, user)
+
+      Pleroma.Web.Streamer.add_socket(topic, socket)
+      {:ok, socket}
+    else
+      _e -> :error
+    end
+  end
+
+  def connect(%{"stream" => stream} = params, socket)
+      when stream in ["public", "public:local", "hashtag"] do
+    topic =
+      case stream do
+        "hashtag" -> "hashtag:#{params["tag"]}"
+        _ -> stream
+      end
+
+    with socket =
+           socket
+           |> assign(:topic, topic) do
+      Pleroma.Web.Streamer.add_socket(topic, socket)
       {:ok, socket}
     else
-      :error
+      _e -> :error
     end
   end
 
-  def id(socket), do: nil
+  def id(_), do: nil
 
-  def handle(:text, message, state) do
-    IO.inspect message
-    #| :ok
-    #| state
-    #| {:text, message}
-    #| {:text, message, state}
-    #| {:close, "Goodbye!"}
+  def handle(:text, message, _state) do
+    # | :ok
+    # | state
+    # | {:text, message}
+    # | {:text, message, state}
+    # | {:close, "Goodbye!"}
     {:text, message}
   end
 
-  def handle(:closed, reason, %{socket: socket}) do
+  def handle(:closed, _, %{socket: socket}) do
     topic = socket.assigns[:topic]
     Pleroma.Web.Streamer.remove_socket(topic, socket)
   end