X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Factivity.ex;h=07982331257d5c27ae22b324a6af9d9b07342812;hb=ee221277b05d2f682c340c1e1b81fbce4931735a;hp=8559ae6a97a388dd5356b3d1869310156f2b65ee;hpb=ecd1ef8cb5afa16dba5158e9e278a18c0856ca3e;p=akkoma diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex index 8559ae6a9..079823312 100644 --- a/lib/pleroma/activity.ex +++ b/lib/pleroma/activity.ex @@ -194,6 +194,19 @@ defmodule Pleroma.Activity do end end + def get_by_id_with_user_actor(id) do + case FlakeId.flake_id?(id) do + true -> + Activity + |> where([a], a.id == ^id) + |> with_preloaded_user_actor() + |> Repo.one() + + _ -> + nil + end + end + def get_by_id_with_object(id) do Activity |> where(id: ^id)