diff options
| author | kaniini <nenolod@gmail.com> | 2018-09-03 12:33:36 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-09-03 12:33:36 +0000 |
| commit | 1c9e539b47ff594d75c9548a04e64cb0c61cff8c (patch) | |
| tree | 26936ac9208ea802e17c78e31689480ff004cd3f /lib/pleroma/web/mastodon_api/mastodon_socket.ex | |
| parent | 8fdddc255ce4fea3060904d27634022718597133 (diff) | |
| parent | 6973b77e9462475361772907ddd690a960041b64 (diff) | |
| download | pleroma-1c9e539b47ff594d75c9548a04e64cb0c61cff8c.tar.gz | |
Merge branch 'feature/mastodon_api_2.4.x' into 'develop'
Add/Fix Mastodon endpoints for 2.4.3 compatibility
See merge request pleroma/pleroma!266
Diffstat (limited to 'lib/pleroma/web/mastodon_api/mastodon_socket.ex')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/mastodon_socket.ex | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/pleroma/web/mastodon_api/mastodon_socket.ex b/lib/pleroma/web/mastodon_api/mastodon_socket.ex index 174293906..bc628ba56 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_socket.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_socket.ex @@ -23,16 +23,18 @@ defmodule Pleroma.Web.MastodonAPI.MastodonSocket do "public:local:media", "user", "direct", - "list" + "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 |