projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c62220c
)
streamer: use the preloaded object if possible
author
William Pitcock
<nenolod@dereferenced.org>
Sat, 23 Mar 2019 02:27:52 +0000
(
02:27
+0000)
committer
William Pitcock
<nenolod@dereferenced.org>
Sat, 23 Mar 2019 02:29:01 +0000
(
02:29
+0000)
lib/pleroma/web/streamer.ex
patch
|
blob
|
history
diff --git
a/lib/pleroma/web/streamer.ex
b/lib/pleroma/web/streamer.ex
index 7425bfb540e5e7100f037ff52c55645542804c6c..592749b42eb3df465a14b0271dbc916dff110fd1 100644
(file)
--- a/
lib/pleroma/web/streamer.ex
+++ b/
lib/pleroma/web/streamer.ex
@@
-202,7
+202,7
@@
defmodule Pleroma.Web.Streamer do
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
item.actor in reblog_mutes or not ActivityPub.contain_activity(item, user) or