aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/feed/feed_view.ex
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2021-01-07 11:09:18 +0000
committerlain <lain@soykaf.club>2021-01-07 11:09:18 +0000
commitcf0eb0c1c5c945c660295f51c99fe157b2b8229c (patch)
tree9b9ad23ec0f83628db7f7878498e0382bec4cb1d /lib/pleroma/web/feed/feed_view.ex
parent4d56aca9040f87708e38a050071aa9d3dc977c45 (diff)
parentd44850d7a5d1303c1c9d185fc5eb6642823b3ec4 (diff)
downloadpleroma-cf0eb0c1c5c945c660295f51c99fe157b2b8229c.tar.gz
Merge branch 'object-normalize-refactor' into 'develop'
Object: Rework how Object.normalize works See merge request pleroma/pleroma!3229
Diffstat (limited to 'lib/pleroma/web/feed/feed_view.ex')
-rw-r--r--lib/pleroma/web/feed/feed_view.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/feed/feed_view.ex b/lib/pleroma/web/feed/feed_view.ex
index 30e0a2a55..bc0114e26 100644
--- a/lib/pleroma/web/feed/feed_view.ex
+++ b/lib/pleroma/web/feed/feed_view.ex
@@ -23,7 +23,7 @@ defmodule Pleroma.Web.Feed.FeedView do
def pub_date(%DateTime{} = date), do: Timex.format!(date, "{RFC822}")
def prepare_activity(activity, opts \\ []) do
- object = Object.normalize(activity)
+ object = Object.normalize(activity, fetch: false)
actor =
if opts[:actor] do