ShariVegas/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity

Activity: create_activity_by_object_id_query/1 → create_by_object_ap_id/1 when is_list

Browse source
This commit is contained in:
Haelwenn (lanodan) Monnier 2019-01-21 07:07:54 +01:00
parent f8ab1b7427
commit 2fdbd4d137
No known key found for this signature in database
GPG key ID: D5B7A8E43C997DEE
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/activity.ex
View file

@ -63,7 +63,7 @@ def by_object_ap_id(ap_id) do
) )
end end
def create_activity_by_object_id_query(ap_ids) do def create_by_object_ap_id(ap_ids) when is_list(ap_ids) do
from( from(
activity in Activity, activity in Activity,
where: where:
@ -82,7 +82,7 @@ def get_all_create_by_object_ap_id(ap_id) do
end end
def get_create_activity_by_object_ap_id(ap_id) when is_binary(ap_id) do def get_create_activity_by_object_ap_id(ap_id) when is_binary(ap_id) do
create_activity_by_object_id_query([ap_id]) create_by_object_ap_id(ap_id)
|> Repo.one() |> Repo.one()
end end

2
lib/pleroma/web/mastodon_api/views/status_view.ex
View file

@ -25,7 +25,7 @@ defp get_replied_to_activities(activities) do
nil nil
end) end)
|> Enum.filter(& &1) |> Enum.filter(& &1)
|> Activity.create_activity_by_object_id_query() |> Activity.create_by_object_ap_id()
|> Repo.all() |> Repo.all()
|> Enum.reduce(%{}, fn activity, acc -> |> Enum.reduce(%{}, fn activity, acc ->
Map.put(acc, activity.data["object"]["id"], activity) Map.put(acc, activity.data["object"]["id"], activity)