Commit 90cf75f4 authored by lain's avatar lain

Merge branch 'features/column_media_streaming' into 'develop'

Add streaming to media tabs of federated and local TLs

See merge request pleroma/pleroma!225
parents be800d79 b670d4d6
......@@ -65,6 +65,14 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
if activity.local do"public:local", activity)
if["object"]["attachment"] != [] do"public:media", activity)
if activity.local do"public:local:media", activity)
if !Enum.member?(["cc"] || [], public) &&
......@@ -15,8 +15,16 @@ 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
when stream in [
] <- params["stream"] do
topic = if stream == "list", do: "list:#{params["list"]}", else: stream
socket =
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment