Merge remote-tracking branch 'pleroma/develop' into cycles-base-url

2021-05-31 16:49:46 -05:00 · 2021-05-31 16:49:46 -05:00 · f2134e605b
commit f2134e605b
parent 51a9f97e87 a0ba44904a
186 changed files with 5816 additions and 1315 deletions
--- a/lib/pleroma/web/feed/feed_view.ex
+++ b/lib/pleroma/web/feed/feed_view.ex
@ -32,6 +32,7 @@ defmodule Pleroma.Web.Feed.FeedView do

    %{
      activity: activity,
+      object: object,
      data: Map.get(object, :data),
      actor: actor
    }