hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

test for Pleroma.Web.CommonAPI.Utils.get_by_id_or_ap_id

Browse source
This commit is contained in:
Maksim 2019-07-31 18:35:15 +00:00 • committed by kaniini
commit 6eb33e7303
4 changed files with 41 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/pleroma/web/common_api/utils.ex
View file

@ -24,7 +24,12 @@ defmodule Pleroma.Web.CommonAPI.Utils do
# This is a hack for twidere.
def get_by_id_or_ap_id(id) do
activity =
Activity.get_by_id_with_object(id) || Activity.get_create_by_object_ap_id_with_object(id)
with true <- Pleroma.FlakeId.is_flake_id?(id),
%Activity{} = activity <- Activity.get_by_id_with_object(id) do
activity
else
_ -> Activity.get_create_by_object_ap_id_with_object(id)
end
activity &&
if activity.data["type"] == "Create" do