diff options
| author | kaniini <nenolod@gmail.com> | 2018-08-16 15:23:04 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-08-16 15:23:04 +0000 |
| commit | f2fa09c50fde8db4e619872ef6121e90a69324a6 (patch) | |
| tree | 4d34037c5fc6d1a3c05a0b061f5279caef1bd671 /lib/pleroma/web/streamer.ex | |
| parent | 718882b326f00c8315bca5acc439b92aa37bf021 (diff) | |
| parent | 5fbb14f5ecbbd9feeed2a303c2619fbbba07d70e (diff) | |
| download | pleroma-f2fa09c50fde8db4e619872ef6121e90a69324a6.tar.gz | |
Merge branch 'develop' into 'patch-2'
# Conflicts:
# mix.exs
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)}) |