fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-12-28 03:13:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'features/column_media_streaming' into 'develop'

Browse source 
Add streaming to media tabs of federated and local TLs

See merge request pleroma/pleroma!225
This commit is contained in:
lambda 2018-06-19 09:50:05 +00:00
parent be800d7936 b670d4d683
commit 90cf75f4a7
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/pleroma/web/activity_pub/activity_pub.ex
View file

@ -65,6 +65,14 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
if activity.local do
Pleroma.Web.Streamer.stream("public:local", activity)
end
if activity.data["object"]["attachment"] != [] do
Pleroma.Web.Streamer.stream("public:media", activity)
if activity.local do
Pleroma.Web.Streamer.stream("public:local:media", activity)
end
end
else
if !Enum.member?(activity.data["cc"] || [], public) &&
!Enum.member?(

12
lib/pleroma/web/mastodon_api/mastodon_socket.ex
View file

@ -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
stream
when stream in [
"public",
"public:local",
"public:media",
"public:local:media",
"user",
"direct",
"list"
] <- params["stream"] do
topic = if stream == "list", do: "list:#{params["list"]}", else: stream
socket =