moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix elixir 1.8 vs 1.7 format conflict

This commit is contained in:
Karen Konou 2019-03-09 16:31:53 +01:00
parent fe4c1d26fc
commit aa71139e4a
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/pleroma/web/streamer.ex
View File

@ -204,8 +204,7 @@ def push_to_socket(topics, topic, %Activity{data: %{"type" => "Announce"}} = ite
parent = Object.normalize(item.data["object"]) parent = Object.normalize(item.data["object"])
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 not ActivityPub.contain_activity(item, user) or parent.data["actor"] in blocks or
parent.data["actor"] in blocks or
parent.data["actor"] in mutes do parent.data["actor"] in mutes do
send(socket.transport_pid, {:text, represent_update(item, user)}) send(socket.transport_pid, {:text, represent_update(item, user)})
end end