diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-07-12 16:48:15 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-07-12 16:48:15 +0000 |
| commit | d93789dfde3c44c76a56732088a897ddddfe9716 (patch) | |
| tree | a34142fbbd4fccd2e30fbaeed1b18bbf646e3652 /lib/pleroma/web/streamer.ex | |
| parent | ceffb910650a4653512e82ce2ac35314b8eb63cd (diff) | |
| parent | 7c63e70de1b92ab8119732fe92040dea7f545b3d (diff) | |
| download | pleroma-d93789dfde3c44c76a56732088a897ddddfe9716.tar.gz | |
Merge branch 'feature/object-normalization' into 'develop'
object normalization
See merge request pleroma/pleroma!238
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)}) |