moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Activity: all_by_object_ap_id/1 → get_all_by_object_ap_id/1

This commit is contained in:
Haelwenn (lanodan) Monnier 2019-01-21 06:29:05 +01:00
parent 52006f8f8a
commit b82c6dc536
No known key found for this signature in database
GPG Key ID: D5B7A8E43C997DEE
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/pleroma/activity.ex
View File

@ -67,8 +67,7 @@ def all_non_create_by_object_ap_id_q(ap_id) do
) )
end end
# Wrong name plz fix thx def get_all_by_object_ap_id(ap_id) do
def all_by_object_ap_id(ap_id) do
Repo.all(all_by_object_ap_id_q(ap_id)) Repo.all(all_by_object_ap_id_q(ap_id))
end end

2
lib/pleroma/web/activity_pub/utils.ex
View File

@ -198,7 +198,7 @@ def update_object_in_activities(%{data: %{"id" => id}} = object) do
# Update activities that already had this. Could be done in a seperate process. # 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 # Alternatively, just don't do this and fetch the current object each time. Most
# could probably be taken from cache. # could probably be taken from cache.
relevant_activities = Activity.all_by_object_ap_id(id) relevant_activities = Activity.get_all_by_object_ap_id(id)
Enum.map(relevant_activities, fn activity -> Enum.map(relevant_activities, fn activity ->
new_activity_data = activity.data |> Map.put("object", object.data) new_activity_data = activity.data |> Map.put("object", object.data)

2
test/activity_test.exs
View File

@ -16,7 +16,7 @@ test "returns an activity by it's AP id" do
test "returns activities by it's objects AP ids" do test "returns activities by it's objects AP ids" do
activity = insert(:note_activity) activity = insert(:note_activity)
[found_activity] = Activity.all_by_object_ap_id(activity.data["object"]["id"]) [found_activity] = Activity.get_all_by_object_ap_id(activity.data["object"]["id"])
assert activity == found_activity assert activity == found_activity
end end

2
test/web/activity_pub/activity_pub_test.exs
View File

@ -330,7 +330,7 @@ test "adds a like activity to the db" do
assert like_activity == same_like_activity assert like_activity == same_like_activity
assert object.data["likes"] == [user.ap_id] assert object.data["likes"] == [user.ap_id]
[note_activity] = Activity.all_by_object_ap_id(object.data["id"]) [note_activity] = Activity.get_all_by_object_ap_id(object.data["id"])
assert note_activity.data["object"]["like_count"] == 1 assert note_activity.data["object"]["like_count"] == 1
{:ok, _like_activity, object} = ActivityPub.like(user_two, object) {:ok, _like_activity, object} = ActivityPub.like(user_two, object)