projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fe4c1d2
)
Fix elixir 1.8 vs 1.7 format conflict
author
Karen Konou
<konoukaren@gmail.com>
Sat, 9 Mar 2019 15:31:53 +0000
(16:31 +0100)
committer
Karen Konou
<konoukaren@gmail.com>
Fri, 15 Mar 2019 13:18:53 +0000
(14:18 +0100)
lib/pleroma/web/streamer.ex
patch
|
blob
|
history
diff --git
a/lib/pleroma/web/streamer.ex
b/lib/pleroma/web/streamer.ex
index bd91e1f50d9737533bd32593d70d16ef3ffd8a5d..a04ee1b6ebf934815b9ba3c4540c6dc50aef1671 100644
(file)
--- a/
lib/pleroma/web/streamer.ex
+++ b/
lib/pleroma/web/streamer.ex
@@
-204,8
+204,7
@@
defmodule Pleroma.Web.Streamer do
parent = Object.normalize(item.data["object"])
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
+ 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