projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'features/s3-uploader-digital-ocean' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
streamer.ex
diff --git
a/lib/pleroma/web/streamer.ex
b/lib/pleroma/web/streamer.ex
index a04ee1b6ebf934815b9ba3c4540c6dc50aef1671..592749b42eb3df465a14b0271dbc916dff110fd1 100644
(file)
--- a/
lib/pleroma/web/streamer.ex
+++ b/
lib/pleroma/web/streamer.ex
@@
-10,9
+10,9
@@
defmodule Pleroma.Web.Streamer do
alias Pleroma.Object
alias Pleroma.Repo
alias Pleroma.User
alias Pleroma.Object
alias Pleroma.Repo
alias Pleroma.User
+ alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.ActivityPub.Visibility
alias Pleroma.Web.MastodonAPI.NotificationView
alias Pleroma.Web.ActivityPub.Visibility
alias Pleroma.Web.MastodonAPI.NotificationView
- alias Pleroma.Web.ActivityPub.ActivityPub
@keepalive_interval :timer.seconds(30)
@keepalive_interval :timer.seconds(30)
@@
-200,12
+200,13
@@
defmodule Pleroma.Web.Streamer do
user = User.get_cached_by_ap_id(socket.assigns[:user].ap_id)
blocks = user.info.blocks || []
mutes = user.info.mutes || []
user = User.get_cached_by_ap_id(socket.assigns[:user].ap_id)
blocks = user.info.blocks || []
mutes = user.info.mutes || []
+ reblog_mutes = user.info.muted_reblogs || []
- parent = Object.normalize(item
.data["object"]
)
+ parent = Object.normalize(item)
unless is_nil(parent) or item.actor in blocks or item.actor in mutes or
unless is_nil(parent) or item.actor in blocks or item.actor in mutes or
-
not ActivityPub.contain_activity(item, user) or parent.data["actor"] in blocks
or
- parent.data["actor"] in mutes do
+
item.actor in reblog_mutes or not ActivityPub.contain_activity(item, user)
or
+ parent.data["actor"] in
blocks or parent.data["actor"] in
mutes do
send(socket.transport_pid, {:text, represent_update(item, user)})
end
else
send(socket.transport_pid, {:text, represent_update(item, user)})
end
else