Merge branch 'unify-mastodon-oauth' 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 fe71ea271841ccec8d3ccf265d2dec5fb05e456f..bc628ba566fb6a858d3c458a07fb9e711d7e4427 100644 (file)
--- a/lib/pleroma/web/mastodon_api/mastodon_socket.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_socket.ex
@@ -4,18 +4,37 @@ defmodule Pleroma.Web.MastodonAPI.MastodonSocket do
   alias Pleroma.Web.OAuth.Token
   alias Pleroma.{User, Repo}
 
-  transport :streaming, Phoenix.Transports.WebSocket.Raw,
-    timeout: :infinity # We never receive data.
+  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),
          %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)
+         stream
+         when stream in [
+                "public",
+                "public:local",
+                "public:media",
+                "public:local:media",
+                "user",
+                "direct",
+                "list",
+                "hashtag"
+              ] <- params["stream"] do
+      topic = if stream == "list", do: "list:#{params["list"]}", else: stream
+      socket_stream = if stream == "hashtag", do: "hashtag:#{params["tag"]}", else: stream
+
+      socket =
+        socket
+        |> assign(:topic, topic)
+        |> assign(:user, user)
+
+      Pleroma.Web.Streamer.add_socket(socket_stream, socket)
       {:ok, socket}
     else
       _e -> :error
@@ -25,12 +44,11 @@ defmodule Pleroma.Web.MastodonAPI.MastodonSocket do
   def id(_), do: nil
 
   def handle(:text, message, _state) do
-    IO.inspect message
-    #| :ok
-    #| state
-    #| {:text, message}
-    #| {:text, message, state}
-    #| {:close, "Goodbye!"}
+    # | :ok
+    # | state
+    # | {:text, message}
+    # | {:text, message, state}
+    # | {:close, "Goodbye!"}
     {:text, message}
   end