diff options
| author | Tristan Mahé <gled@remote-shell.net> | 2018-07-13 11:14:37 -0700 |
|---|---|---|
| committer | Tristan Mahé <gled@remote-shell.net> | 2018-07-13 11:14:37 -0700 |
| commit | 5469fb9561bb886deb8434e545dfb711eb20f341 (patch) | |
| tree | 78ab675afd6169e2497b5c47882725cc1d2f2326 /lib/pleroma/web/streamer.ex | |
| parent | c06a5af386a3cdfeda0b2c21963d9200fb7d6c89 (diff) | |
| parent | d93789dfde3c44c76a56732088a897ddddfe9716 (diff) | |
| download | pleroma-5469fb9561bb886deb8434e545dfb711eb20f341.tar.gz | |
Merge remote-tracking branch 'upstream/develop' into feature/filter_exif
Diffstat (limited to 'lib/pleroma/web/streamer.ex')
| -rw-r--r-- | lib/pleroma/web/streamer.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/streamer.ex b/lib/pleroma/web/streamer.ex index ce38f3cc3..c61bad830 100644 --- a/lib/pleroma/web/streamer.ex +++ b/lib/pleroma/web/streamer.ex @@ -158,7 +158,7 @@ defmodule Pleroma.Web.Streamer do user = User.get_cached_by_ap_id(socket.assigns[:user].ap_id) blocks = user.info["blocks"] || [] - parent = Object.get_by_ap_id(item.data["object"]) + parent = Object.normalize(item.data["object"]) unless is_nil(parent) or item.actor in blocks or parent.data["actor"] in blocks do send(socket.transport_pid, {:text, represent_update(item, user)}) |