Activity: get_all_by_object_ap_id/1 → get_all_create_by_object_ap_id/1
This commit is contained in:
parent
4ad5a0abb9
commit
f8ab1b7427
@ -63,10 +63,6 @@ defmodule Pleroma.Activity do
|
||||
)
|
||||
end
|
||||
|
||||
def get_all_by_object_ap_id(ap_id) do
|
||||
Repo.all(create_by_object_ap_id(ap_id))
|
||||
end
|
||||
|
||||
def create_activity_by_object_id_query(ap_ids) do
|
||||
from(
|
||||
activity in Activity,
|
||||
@ -81,6 +77,10 @@ defmodule Pleroma.Activity do
|
||||
)
|
||||
end
|
||||
|
||||
def get_all_create_by_object_ap_id(ap_id) do
|
||||
Repo.all(create_by_object_ap_id(ap_id))
|
||||
end
|
||||
|
||||
def get_create_activity_by_object_ap_id(ap_id) when is_binary(ap_id) do
|
||||
create_activity_by_object_id_query([ap_id])
|
||||
|> Repo.one()
|
||||
|
@ -198,7 +198,7 @@ defmodule Pleroma.Web.ActivityPub.Utils do
|
||||
# Update activities that already had this. Could be done in a seperate process.
|
||||
# Alternatively, just don't do this and fetch the current object each time. Most
|
||||
# could probably be taken from cache.
|
||||
relevant_activities = Activity.get_all_by_object_ap_id(id)
|
||||
relevant_activities = Activity.get_all_create_by_object_ap_id(id)
|
||||
|
||||
Enum.map(relevant_activities, fn activity ->
|
||||
new_activity_data = activity.data |> Map.put("object", object.data)
|
||||
|
@ -16,7 +16,7 @@ defmodule Pleroma.ActivityTest do
|
||||
|
||||
test "returns activities by it's objects AP ids" do
|
||||
activity = insert(:note_activity)
|
||||
[found_activity] = Activity.get_all_by_object_ap_id(activity.data["object"]["id"])
|
||||
[found_activity] = Activity.get_all_create_by_object_ap_id(activity.data["object"]["id"])
|
||||
|
||||
assert activity == found_activity
|
||||
end
|
||||
|
@ -330,7 +330,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
|
||||
assert like_activity == same_like_activity
|
||||
assert object.data["likes"] == [user.ap_id]
|
||||
|
||||
[note_activity] = Activity.get_all_by_object_ap_id(object.data["id"])
|
||||
[note_activity] = Activity.get_all_create_by_object_ap_id(object.data["id"])
|
||||
assert note_activity.data["object"]["like_count"] == 1
|
||||
|
||||
{:ok, _like_activity, object} = ActivityPub.like(user_two, object)
|
||||
|
Loading…
Reference in New Issue
Block a user