summaryrefslogtreecommitdiff
path: root/lib/pleroma/web/mastodon_api/controllers/status_controller.ex
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2021-01-04 13:38:31 +0100
committerlain <lain@soykaf.club>2021-01-04 13:38:31 +0100
commite1e7e4d379a67779a799049728d143eee2b88a7e (patch)
tree7506ca5b79a1eb8437a9f5f125f428532aa074b1 /lib/pleroma/web/mastodon_api/controllers/status_controller.ex
parentafe9c152ab757237313cc15d97855ae39768ddc1 (diff)
Object: Rework how Object.normalize works
Now it defaults to not fetching, and the option is named.
Diffstat (limited to 'lib/pleroma/web/mastodon_api/controllers/status_controller.ex')
-rw-r--r--lib/pleroma/web/mastodon_api/controllers/status_controller.ex4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/status_controller.ex b/lib/pleroma/web/mastodon_api/controllers/status_controller.ex
index 9e3a584f0..acca9d3b2 100644
--- a/lib/pleroma/web/mastodon_api/controllers/status_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/status_controller.ex
@@ -318,7 +318,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusController do
with true <- Pleroma.Config.get([:instance, :show_reactions]),
%Activity{} = activity <- Activity.get_by_id_with_object(id),
{:visible, true} <- {:visible, Visibility.visible_for_user?(activity, user)},
- %Object{data: %{"likes" => likes}} <- Object.normalize(activity) do
+ %Object{data: %{"likes" => likes}} <- Object.normalize(activity, fetch: false) do
users =
User
|> Ecto.Query.where([u], u.ap_id in ^likes)
@@ -339,7 +339,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusController do
with %Activity{} = activity <- Activity.get_by_id_with_object(id),
{:visible, true} <- {:visible, Visibility.visible_for_user?(activity, user)},
%Object{data: %{"announcements" => announces, "id" => ap_id}} <-
- Object.normalize(activity) do
+ Object.normalize(activity, fetch: false) do
announces =
"Announce"
|> Activity.Queries.by_type()