Browse Source

little fix

features/emoji_reactions_list
Alexander Strizhakov 3 years ago
parent
commit
46dab37351
No known key found for this signature in database GPG Key ID: 22896A53AEF1381
3 changed files with 20 additions and 3 deletions
  1. +1
    -0
      lib/pleroma/activity.ex
  2. +16
    -0
      test/pleroma/activity_test.exs
  3. +3
    -3
      test/pleroma/web/activity_pub/activity_pub_controller_test.exs

+ 1
- 0
lib/pleroma/activity.ex View File

@@ -362,6 +362,7 @@ defmodule Pleroma.Activity do
ap_id
|> Queries.by_object_id()
|> with_preloaded_object()
|> first()
|> Repo.one()
end



+ 16
- 0
test/pleroma/activity_test.exs View File

@@ -231,4 +231,20 @@ defmodule Pleroma.ActivityTest do

assert [%Activity{id: ^id1}, %Activity{id: ^id2}] = activities
end

test "get_by_object_ap_id_with_object/1" do
user = insert(:user)
another = insert(:user)

{:ok, %{id: id, object: %{data: %{"id" => obj_id}}}} =
Pleroma.Web.CommonAPI.post(user, %{status: "cofe"})

Pleroma.Web.CommonAPI.favorite(another, id)

assert obj_id
|> Pleroma.Activity.Queries.by_object_id()
|> Repo.aggregate(:count, :id) == 2

assert %{id: ^id} = Activity.get_by_object_ap_id_with_object(obj_id)
end
end

+ 3
- 3
test/pleroma/web/activity_pub/activity_pub_controller_test.exs View File

@@ -882,10 +882,12 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
actor = insert(:user, local: false)
remote_domain = URI.parse(actor.ap_id).host
remote_actor = "https://#{remote_domain}/actor"
reported_user = insert(:user)
[reported_user, another] = insert_list(2, :user)

note = insert(:note_activity, user: reported_user)

Pleroma.Web.CommonAPI.favorite(another, note.id)

mock_json_body =
"test/fixtures/mastodon/application_actor.json"
|> File.read!()
@@ -920,8 +922,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do

ObanHelpers.perform(all_enqueued(worker: ReceiverWorker))

assert Pleroma.Repo.aggregate(Activity, :count, :id) == 2

flag_activity = "Flag" |> Pleroma.Activity.Queries.by_type() |> Pleroma.Repo.one()
reported_user_ap_id = reported_user.ap_id



Loading…
Cancel
Save