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 46648c366ccf1d29400eba1d1708f853941fe558..bc628ba566fb6a858d3c458a07fb9e711d7e4427 100644 (file)
--- a/lib/pleroma/web/mastodon_api/mastodon_socket.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_socket.ex
@@ -15,16 +15,26 @@ defmodule Pleroma.Web.MastodonAPI.MastodonSocket 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", "direct", "list"] <-
-           params["stream"] do
+         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(params["stream"], socket)
+      Pleroma.Web.Streamer.add_socket(socket_stream, socket)
       {:ok, socket}
     else
       _e -> :error