pleroma

commit: b982ced92c8fcade3f4a0eceee60e92d132258f8
parent: 617aff4f0c86de298439f64df43d7e95364530c0
Author: kaniini <nenolod@gmail.com>
Date:   Sun, 11 Nov 2018 13:41:48 +0000

Merge branch 'fix-list-streaming' into 'develop'

Mastodon API: Fix list streaming

See merge request pleroma/pleroma!442
Diffstat:
M
lib/pleroma/web/mastodon_api/mastodon_socket.ex
10
+++++++---

1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/lib/pleroma/web/mastodon_api/mastodon_socket.ex b/lib/pleroma/web/mastodon_api/mastodon_socket.ex
@@ -26,15 +26,19 @@ defmodule Pleroma.Web.MastodonAPI.MastodonSocket do
                 "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
+      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(socket_stream, socket)
+      Pleroma.Web.Streamer.add_socket(topic, socket)
       {:ok, socket}
     else
       _e -> :error