From e5a738d465fa3cb16a5737b03561523059ed727c Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Mon, 24 Jun 2024 10:10:53 -0400
Subject: Refactor tests for Backups

---
 test/pleroma/user/backup_async_test.exs            |  49 ------
 test/pleroma/user/backup_test.exs                  | 171 +++++++++------------
 .../controllers/admin_api_controller_test.exs      |   8 +-
 .../controllers/backup_controller_test.exs         |   4 +-
 .../web/pleroma_api/views/backup_view_test.exs     |  35 +----
 test/support/mocks.ex                              |   2 -
 6 files changed, 78 insertions(+), 191 deletions(-)
 delete mode 100644 test/pleroma/user/backup_async_test.exs

(limited to 'test')

diff --git a/test/pleroma/user/backup_async_test.exs b/test/pleroma/user/backup_async_test.exs
deleted file mode 100644
index b0e9413be..000000000
--- a/test/pleroma/user/backup_async_test.exs
+++ /dev/null
@@ -1,49 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2023 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.User.BackupAsyncTest do
-  use Pleroma.DataCase, async: true
-
-  import Pleroma.Factory
-  import Mox
-
-  alias Pleroma.UnstubbedConfigMock, as: ConfigMock
-  alias Pleroma.User.Backup
-  alias Pleroma.User.Backup.ProcessorMock
-
-  setup do
-    user = insert(:user, %{nickname: "cofe", name: "Cofe", ap_id: "http://cofe.io/users/cofe"})
-
-    {:ok, backup} = user |> Backup.new() |> Repo.insert()
-    %{backup: backup}
-  end
-
-  test "it handles unrecoverable exceptions", %{backup: backup} do
-    ProcessorMock
-    |> expect(:do_process, fn _, _ ->
-      raise "mock exception"
-    end)
-
-    ConfigMock
-    |> stub_with(Pleroma.Config)
-
-    {:error, %{backup: backup, reason: :exit}} = Backup.process(backup, ProcessorMock)
-
-    assert backup.state == :failed
-  end
-
-  test "it handles timeouts", %{backup: backup} do
-    ProcessorMock
-    |> expect(:do_process, fn _, _ ->
-      Process.sleep(:timer.seconds(4))
-    end)
-
-    ConfigMock
-    |> expect(:get, fn [Pleroma.User.Backup, :process_wait_time] -> :timer.seconds(2) end)
-
-    {:error, %{backup: backup, reason: :timeout}} = Backup.process(backup, ProcessorMock)
-
-    assert backup.state == :failed
-  end
-end
diff --git a/test/pleroma/user/backup_test.exs b/test/pleroma/user/backup_test.exs
index d82d1719b..24fe09f7e 100644
--- a/test/pleroma/user/backup_test.exs
+++ b/test/pleroma/user/backup_test.exs
@@ -6,7 +6,6 @@ defmodule Pleroma.User.BackupTest do
   use Oban.Testing, repo: Pleroma.Repo
   use Pleroma.DataCase
 
-  import Mock
   import Pleroma.Factory
   import Swoosh.TestAssertions
   import Mox
@@ -16,7 +15,6 @@ defmodule Pleroma.User.BackupTest do
   alias Pleroma.UnstubbedConfigMock, as: ConfigMock
   alias Pleroma.Uploaders.S3.ExAwsMock
   alias Pleroma.User.Backup
-  alias Pleroma.User.Backup.ProcessorMock
   alias Pleroma.Web.CommonAPI
   alias Pleroma.Workers.BackupWorker
 
@@ -28,79 +26,56 @@ defmodule Pleroma.User.BackupTest do
     ConfigMock
     |> stub_with(Pleroma.Config)
 
-    ProcessorMock
-    |> stub_with(Pleroma.User.Backup.Processor)
-
     :ok
   end
 
   test "it does not requrie enabled email" do
     clear_config([Pleroma.Emails.Mailer, :enabled], false)
     user = insert(:user)
-    assert {:ok, _} = Backup.create(user)
+    assert {:ok, _} = Backup.user(user)
   end
 
   test "it does not require user's email" do
     user = insert(:user, %{email: nil})
-    assert {:ok, _} = Backup.create(user)
+    assert {:ok, _} = Backup.user(user)
   end
 
   test "it creates a backup record and an Oban job" do
-    %{id: user_id} = user = insert(:user)
-    assert {:ok, %Oban.Job{args: args}} = Backup.create(user)
+    user = insert(:user)
+    assert {:ok, %Backup{} = backup} = Backup.user(user)
+    assert {:ok, %Oban.Job{args: args}} = Backup.schedule_backup(backup)
     assert_enqueued(worker: BackupWorker, args: args)
 
-    backup = Backup.get(args["backup_id"])
-    assert %Backup{user_id: ^user_id, processed: false, file_size: 0, state: :pending} = backup
+    backup = Backup.get_by_id(args["backup_id"])
+    assert %Backup{processed: false, file_size: 0} = backup
   end
 
   test "it return an error if the export limit is over" do
-    %{id: user_id} = user = insert(:user)
+    user = insert(:user)
     limit_days = Pleroma.Config.get([Backup, :limit_days])
-    assert {:ok, %Oban.Job{args: args}} = Backup.create(user)
-    backup = Backup.get(args["backup_id"])
-    assert %Backup{user_id: ^user_id, processed: false, file_size: 0} = backup
+    {:ok, first_backup} = Backup.user(user)
+    {:ok, _run_backup} = Backup.run(first_backup)
 
-    assert Backup.create(user) == {:error, "Last export was less than #{limit_days} days ago"}
+    assert Backup.user(user) == {:error, "Last export was less than #{limit_days} days ago"}
   end
 
   test "it process a backup record" do
     clear_config([Pleroma.Upload, :uploader], Pleroma.Uploaders.Local)
     %{id: user_id} = user = insert(:user)
 
-    assert {:ok, %Oban.Job{args: %{"backup_id" => backup_id} = args}} = Backup.create(user)
-    assert {:ok, backup} = perform_job(BackupWorker, args)
-    assert backup.file_size > 0
-    assert %Backup{id: ^backup_id, processed: true, user_id: ^user_id, state: :complete} = backup
-
-    delete_job_args = %{"op" => "delete", "backup_id" => backup_id}
-
-    assert_enqueued(worker: BackupWorker, args: delete_job_args)
-    assert {:ok, backup} = perform_job(BackupWorker, delete_job_args)
-    refute Backup.get(backup_id)
-
-    email = Pleroma.Emails.UserEmail.backup_is_ready_email(backup)
+    assert {:ok, %Backup{id: backup_id}} = Backup.user(user)
 
-    assert_email_sent(
-      to: {user.name, user.email},
-      html_body: email.html_body
-    )
-  end
+    oban_args = %{"op" => "process", "backup_id" => backup_id}
 
-  test "it updates states of the backup" do
-    clear_config([Pleroma.Upload, :uploader], Pleroma.Uploaders.Local)
-    %{id: user_id} = user = insert(:user)
-
-    assert {:ok, %Oban.Job{args: %{"backup_id" => backup_id} = args}} = Backup.create(user)
-    assert {:ok, backup} = perform_job(BackupWorker, args)
+    assert {:ok, backup} = perform_job(BackupWorker, oban_args)
     assert backup.file_size > 0
-    assert %Backup{id: ^backup_id, processed: true, user_id: ^user_id, state: :complete} = backup
+    assert match?(%Backup{id: ^backup_id, processed: true, user_id: ^user_id}, backup)
 
     delete_job_args = %{"op" => "delete", "backup_id" => backup_id}
 
     assert_enqueued(worker: BackupWorker, args: delete_job_args)
     assert {:ok, backup} = perform_job(BackupWorker, delete_job_args)
-    refute Backup.get(backup_id)
+    refute Backup.get_by_id(backup_id)
 
     email = Pleroma.Emails.UserEmail.backup_is_ready_email(backup)
 
@@ -114,10 +89,15 @@ defmodule Pleroma.User.BackupTest do
     clear_config([Pleroma.Upload, :uploader], Pleroma.Uploaders.Local)
     %{id: user_id} = user = insert(:user, %{email: nil})
 
-    assert {:ok, %Oban.Job{args: %{"backup_id" => backup_id} = args}} = Backup.create(user)
-    assert {:ok, backup} = perform_job(BackupWorker, args)
-    assert backup.file_size > 0
-    assert %Backup{id: ^backup_id, processed: true, user_id: ^user_id} = backup
+    assert {:ok, %Backup{} = backup} = Backup.user(user)
+
+    expected_args = %{"op" => "process", "backup_id" => backup.id}
+
+    assert_enqueued(worker: BackupWorker, args: %{"backup_id" => backup.id})
+    assert {:ok, completed_backup} = perform_job(BackupWorker, expected_args)
+    assert completed_backup.file_size > 0
+    assert completed_backup.processed
+    assert completed_backup.user_id == user_id
 
     assert_no_email_sent()
   end
@@ -127,10 +107,13 @@ defmodule Pleroma.User.BackupTest do
     clear_config([Pleroma.Upload, :uploader], Pleroma.Uploaders.Local)
     %{id: user_id} = user = insert(:user)
 
-    assert {:ok, %Oban.Job{args: %{"backup_id" => backup_id} = args}} = Backup.create(user)
-    assert {:ok, backup} = perform_job(BackupWorker, args)
+    assert {:ok, %Backup{id: backup_id}} = Backup.user(user)
+
+    oban_args = %{"op" => "process", "backup_id" => backup_id}
+
+    assert {:ok, backup} = perform_job(BackupWorker, oban_args)
     assert backup.file_size > 0
-    assert %Backup{id: ^backup_id, processed: true, user_id: ^user_id} = backup
+    assert match?(%Backup{id: ^backup_id, processed: true, user_id: ^user_id}, backup)
 
     assert_no_email_sent()
   end
@@ -139,10 +122,15 @@ defmodule Pleroma.User.BackupTest do
     clear_config([Pleroma.Upload, :uploader], Pleroma.Uploaders.Local)
     %{id: user_id} = user = insert(:user, %{email: ""})
 
-    assert {:ok, %Oban.Job{args: %{"backup_id" => backup_id} = args}} = Backup.create(user)
-    assert {:ok, backup} = perform_job(BackupWorker, args)
+    assert {:ok, %Backup{id: backup_id} = backup} = Backup.user(user)
+
+    expected_args = %{"op" => "process", "backup_id" => backup.id}
+
+    assert_enqueued(worker: BackupWorker, args: expected_args)
+
+    assert {:ok, backup} = perform_job(BackupWorker, expected_args)
     assert backup.file_size > 0
-    assert %Backup{id: ^backup_id, processed: true, user_id: ^user_id} = backup
+    assert match?(%Backup{id: ^backup_id, processed: true, user_id: ^user_id}, backup)
 
     assert_no_email_sent()
   end
@@ -152,16 +140,13 @@ defmodule Pleroma.User.BackupTest do
     clear_config([Pleroma.Upload, :uploader], Pleroma.Uploaders.Local)
     user = insert(:user)
 
-    assert {:ok, job1} = Backup.create(user)
-
-    assert {:ok, %Backup{}} = ObanHelpers.perform(job1)
-    assert {:ok, job2} = Backup.create(user)
-    assert Pleroma.Repo.aggregate(Backup, :count) == 2
-    assert {:ok, backup2} = ObanHelpers.perform(job2)
+    assert {:ok, %{id: backup_one_id}} = Backup.user(user)
+    assert {:ok, %{id: _backup_two_id}} = Backup.user(user)
 
+    # Run the backups
     ObanHelpers.perform_all()
 
-    assert [^backup2] = Pleroma.Repo.all(Backup)
+    assert_enqueued(worker: BackupWorker, args: %{"op" => "delete", "backup_id" => backup_one_id})
   end
 
   test "it creates a zip archive with user data" do
@@ -185,9 +170,12 @@ defmodule Pleroma.User.BackupTest do
 
     CommonAPI.follow(other_user, user)
 
-    assert {:ok, backup} = user |> Backup.new() |> Repo.insert()
-    assert {:ok, path} = Backup.export(backup, self())
-    assert {:ok, zipfile} = :zip.zip_open(String.to_charlist(path), [:memory])
+    assert {:ok, backup} = Backup.user(user)
+    assert {:ok, run_backup} = Backup.run(backup)
+
+    tempfile = Path.join([run_backup.tempdir, run_backup.file_name])
+
+    assert {:ok, zipfile} = :zip.zip_open(String.to_charlist(tempfile), [:memory])
     assert {:ok, {~c"actor.json", json}} = :zip.zip_get(~c"actor.json", zipfile)
 
     assert %{
@@ -275,10 +263,10 @@ defmodule Pleroma.User.BackupTest do
            } = Jason.decode!(json)
 
     :zip.zip_close(zipfile)
-    File.rm!(path)
+    File.rm_rf!(run_backup.tempdir)
   end
 
-  test "it counts the correct number processed" do
+  test "correct number processed" do
     user = insert(:user, %{nickname: "cofe", name: "Cofe", ap_id: "http://cofe.io/users/cofe"})
 
     Enum.map(1..120, fn i ->
@@ -288,43 +276,21 @@ defmodule Pleroma.User.BackupTest do
     end)
 
     assert {:ok, backup} = user |> Backup.new() |> Repo.insert()
-    {:ok, backup} = Backup.process(backup)
+    {:ok, backup} = Backup.run(backup)
 
-    assert backup.processed_number == 1 + 120 + 120 + 120
+    zip_path = Path.join([backup.tempdir, backup.file_name])
 
-    Backup.delete(backup)
-  end
+    assert {:ok, zipfile} = :zip.zip_open(String.to_charlist(zip_path), [:memory])
 
-  test "it handles errors" do
-    user = insert(:user, %{nickname: "cofe", name: "Cofe", ap_id: "http://cofe.io/users/cofe"})
+    backup_parts = [~c"likes.json", ~c"bookmarks.json", ~c"outbox.json"]
 
-    Enum.map(1..120, fn i ->
-      {:ok, _status} = CommonAPI.post(user, %{status: "status #{i}"})
+    Enum.each(backup_parts, fn part ->
+      assert {:ok, {_part, part_json}} = :zip.zip_get(part, zipfile)
+      {:ok, decoded_part} = Jason.decode(part_json)
+      assert decoded_part["totalItems"] == 120
     end)
 
-    assert {:ok, backup} = user |> Backup.new() |> Repo.insert()
-
-    with_mock Pleroma.Web.ActivityPub.Transmogrifier,
-              [:passthrough],
-              prepare_outgoing: fn data ->
-                object =
-                  data["object"]
-                  |> Pleroma.Object.normalize(fetch: false)
-                  |> Map.get(:data)
-
-                data = data |> Map.put("object", object)
-
-                if String.contains?(data["object"]["content"], "119"),
-                  do: raise(%Postgrex.Error{}),
-                  else: {:ok, data}
-              end do
-      {:ok, backup} = Backup.process(backup)
-      assert backup.processed
-      assert backup.state == :complete
-      assert backup.processed_number == 1 + 119
-
-      Backup.delete(backup)
-    end
+    Backup.delete_archive(backup)
   end
 
   describe "it uploads and deletes a backup archive" do
@@ -343,12 +309,11 @@ defmodule Pleroma.User.BackupTest do
       Bookmark.create(user.id, status3.id)
 
       assert {:ok, backup} = user |> Backup.new() |> Repo.insert()
-      assert {:ok, path} = Backup.export(backup, self())
 
-      [path: path, backup: backup]
+      [backup: backup]
     end
 
-    test "S3", %{path: path, backup: backup} do
+    test "S3", %{backup: backup} do
       clear_config([Pleroma.Upload, :uploader], Pleroma.Uploaders.S3)
       clear_config([Pleroma.Uploaders.S3, :streaming_enabled], false)
 
@@ -358,15 +323,17 @@ defmodule Pleroma.User.BackupTest do
         %{http_method: :delete} -> {:ok, %{status_code: 204}}
       end)
 
-      assert {:ok, %Pleroma.Upload{}} = Backup.upload(backup, path)
-      assert {:ok, _backup} = Backup.delete(backup)
+      assert {:ok, backup} = Backup.run(backup)
+      assert {:ok, %Backup{processed: true}} = Backup.upload(backup)
+      assert {:ok, _backup} = Backup.delete_archive(backup)
     end
 
-    test "Local", %{path: path, backup: backup} do
+    test "Local", %{backup: backup} do
       clear_config([Pleroma.Upload, :uploader], Pleroma.Uploaders.Local)
 
-      assert {:ok, %Pleroma.Upload{}} = Backup.upload(backup, path)
-      assert {:ok, _backup} = Backup.delete(backup)
+      assert {:ok, backup} = Backup.run(backup)
+      assert {:ok, %Backup{processed: true}} = Backup.upload(backup)
+      assert {:ok, _backup} = Backup.delete_archive(backup)
     end
   end
 end
diff --git a/test/pleroma/web/admin_api/controllers/admin_api_controller_test.exs b/test/pleroma/web/admin_api/controllers/admin_api_controller_test.exs
index a7ee8359d..6614d1409 100644
--- a/test/pleroma/web/admin_api/controllers/admin_api_controller_test.exs
+++ b/test/pleroma/web/admin_api/controllers/admin_api_controller_test.exs
@@ -1096,9 +1096,13 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
 
       ObanHelpers.perform_all()
 
-      email = Pleroma.Emails.UserEmail.backup_is_ready_email(backup, admin.id)
+      email = Pleroma.Emails.UserEmail.backup_is_ready_email(backup)
+
+      assert String.contains?(
+               email.html_body,
+               "A full backup of your Pleroma account was requested"
+             )
 
-      assert String.contains?(email.html_body, "Admin @#{admin.nickname} requested a full backup")
       assert_email_sent(to: {user.name, user.email}, html_body: email.html_body)
 
       log_message = "@#{admin_nickname} requested account backup for @#{user_nickname}"
diff --git a/test/pleroma/web/pleroma_api/controllers/backup_controller_test.exs b/test/pleroma/web/pleroma_api/controllers/backup_controller_test.exs
index 21e619fa4..1e056adb5 100644
--- a/test/pleroma/web/pleroma_api/controllers/backup_controller_test.exs
+++ b/test/pleroma/web/pleroma_api/controllers/backup_controller_test.exs
@@ -20,9 +20,7 @@ defmodule Pleroma.Web.PleromaAPI.BackupControllerTest do
   end
 
   test "GET /api/v1/pleroma/backups", %{user: user, conn: conn} do
-    assert {:ok, %Oban.Job{args: %{"backup_id" => backup_id}}} = Backup.create(user)
-
-    backup = Backup.get(backup_id)
+    assert {:ok, %Backup{} = backup} = Backup.user(user)
 
     response =
       conn
diff --git a/test/pleroma/web/pleroma_api/views/backup_view_test.exs b/test/pleroma/web/pleroma_api/views/backup_view_test.exs
index b125b8872..303547f3b 100644
--- a/test/pleroma/web/pleroma_api/views/backup_view_test.exs
+++ b/test/pleroma/web/pleroma_api/views/backup_view_test.exs
@@ -27,42 +27,11 @@ defmodule Pleroma.Web.PleromaAPI.BackupViewTest do
     assert result.id == backup.id
   end
 
-  test "it renders the state and processed_number" do
+  test "it renders the processed state" do
     user = insert(:user)
     backup = Backup.new(user)
 
     result = BackupView.render("show.json", backup: backup)
-    assert result.state == to_string(backup.state)
-    assert result.processed_number == backup.processed_number
-  end
-
-  test "it renders failed state with legacy records" do
-    backup = %Backup{
-      id: 0,
-      content_type: "application/zip",
-      file_name: "dummy",
-      file_size: 1,
-      state: :invalid,
-      processed: true,
-      processed_number: 1,
-      inserted_at: NaiveDateTime.utc_now()
-    }
-
-    result = BackupView.render("show.json", backup: backup)
-    assert result.state == "complete"
-
-    backup = %Backup{
-      id: 0,
-      content_type: "application/zip",
-      file_name: "dummy",
-      file_size: 1,
-      state: :invalid,
-      processed: false,
-      processed_number: 1,
-      inserted_at: NaiveDateTime.utc_now()
-    }
-
-    result = BackupView.render("show.json", backup: backup)
-    assert result.state == "failed"
+    refute result.processed
   end
 end
diff --git a/test/support/mocks.ex b/test/support/mocks.ex
index 63cbc49ab..d84958e15 100644
--- a/test/support/mocks.ex
+++ b/test/support/mocks.ex
@@ -32,6 +32,4 @@ Mox.defmock(Pleroma.StubbedHTTPSignaturesMock, for: Pleroma.HTTPSignaturesAPI)
 
 Mox.defmock(Pleroma.LoggerMock, for: Pleroma.Logging)
 
-Mox.defmock(Pleroma.User.Backup.ProcessorMock, for: Pleroma.User.Backup.ProcessorAPI)
-
 Mox.defmock(Pleroma.Uploaders.S3.ExAwsMock, for: Pleroma.Uploaders.S3.ExAwsAPI)
-- 
cgit v1.2.3


From 59309a9eff5c2e61b2195945eca21c5126eb3f5f Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Sun, 28 Jul 2024 20:41:21 -0400
Subject: Publisher job simplification

Publisher jobs now store the the activity id instead of inserting duplicate JSON data in the Oban queue for each delivery.
---
 test/pleroma/web/activity_pub/publisher_test.exs | 40 +++++++++++++++---------
 1 file changed, 25 insertions(+), 15 deletions(-)

(limited to 'test')

diff --git a/test/pleroma/web/activity_pub/publisher_test.exs b/test/pleroma/web/activity_pub/publisher_test.exs
index 6f48a0227..15f29a386 100644
--- a/test/pleroma/web/activity_pub/publisher_test.exs
+++ b/test/pleroma/web/activity_pub/publisher_test.exs
@@ -137,6 +137,7 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
     test "publish to url with with different ports" do
       inbox80 = "http://42.site/users/nick1/inbox"
       inbox42 = "http://42.site:42/users/nick1/inbox"
+      activity = insert(:note_activity)
 
       mock(fn
         %{method: :post, url: "http://42.site:42/users/nick1/inbox"} ->
@@ -151,18 +152,16 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
       assert {:ok, %{body: "port 42"}} =
                Publisher.publish_one(%{
                  inbox: inbox42,
-                 json: "{}",
                  actor: actor,
-                 id: 1,
+                 activity_id: activity.id,
                  unreachable_since: true
                })
 
       assert {:ok, %{body: "port 80"}} =
                Publisher.publish_one(%{
                  inbox: inbox80,
-                 json: "{}",
                  actor: actor,
-                 id: 1,
+                 activity_id: activity.id,
                  unreachable_since: true
                })
     end
@@ -173,8 +172,11 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
                    [] do
       actor = insert(:user)
       inbox = "http://200.site/users/nick1/inbox"
+      activity = insert(:note_activity)
+
+      assert {:ok, _} =
+               Publisher.publish_one(%{inbox: inbox, actor: actor, activity_id: activity.id})
 
-      assert {:ok, _} = Publisher.publish_one(%{inbox: inbox, json: "{}", actor: actor, id: 1})
       assert called(Instances.set_reachable(inbox))
     end
 
@@ -184,13 +186,13 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
                    [] do
       actor = insert(:user)
       inbox = "http://200.site/users/nick1/inbox"
+      activity = insert(:note_activity)
 
       assert {:ok, _} =
                Publisher.publish_one(%{
                  inbox: inbox,
-                 json: "{}",
                  actor: actor,
-                 id: 1,
+                 activity_id: activity.id,
                  unreachable_since: NaiveDateTime.utc_now()
                })
 
@@ -203,13 +205,13 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
                    [] do
       actor = insert(:user)
       inbox = "http://200.site/users/nick1/inbox"
+      activity = insert(:note_activity)
 
       assert {:ok, _} =
                Publisher.publish_one(%{
                  inbox: inbox,
-                 json: "{}",
                  actor: actor,
-                 id: 1,
+                 activity_id: activity.id,
                  unreachable_since: nil
                })
 
@@ -222,9 +224,10 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
                    [] do
       actor = insert(:user)
       inbox = "http://404.site/users/nick1/inbox"
+      activity = insert(:note_activity)
 
       assert {:cancel, _} =
-               Publisher.publish_one(%{inbox: inbox, json: "{}", actor: actor, id: 1})
+               Publisher.publish_one(%{inbox: inbox, actor: actor, activity_id: activity.id})
 
       assert called(Instances.set_unreachable(inbox))
     end
@@ -235,10 +238,15 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
                    [] do
       actor = insert(:user)
       inbox = "http://connrefused.site/users/nick1/inbox"
+      activity = insert(:note_activity)
 
       assert capture_log(fn ->
                assert {:error, _} =
-                        Publisher.publish_one(%{inbox: inbox, json: "{}", actor: actor, id: 1})
+                        Publisher.publish_one(%{
+                          inbox: inbox,
+                          actor: actor,
+                          activity_id: activity.id
+                        })
              end) =~ "connrefused"
 
       assert called(Instances.set_unreachable(inbox))
@@ -250,8 +258,10 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
                    [] do
       actor = insert(:user)
       inbox = "http://200.site/users/nick1/inbox"
+      activity = insert(:note_activity)
 
-      assert {:ok, _} = Publisher.publish_one(%{inbox: inbox, json: "{}", actor: actor, id: 1})
+      assert {:ok, _} =
+               Publisher.publish_one(%{inbox: inbox, actor: actor, activity_id: activity.id})
 
       refute called(Instances.set_unreachable(inbox))
     end
@@ -262,14 +272,14 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
                    [] do
       actor = insert(:user)
       inbox = "http://connrefused.site/users/nick1/inbox"
+      activity = insert(:note_activity)
 
       assert capture_log(fn ->
                assert {:error, _} =
                         Publisher.publish_one(%{
                           inbox: inbox,
-                          json: "{}",
                           actor: actor,
-                          id: 1,
+                          activity_id: activity.id,
                           unreachable_since: NaiveDateTime.utc_now()
                         })
              end) =~ "connrefused"
@@ -406,7 +416,7 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
                Publisher.enqueue_one(%{
                  inbox: "https://domain.com/users/nick1/inbox",
                  actor_id: actor.id,
-                 id: note_activity.data["id"]
+                 activity_id: note_activity.id
                })
              )
     end
-- 
cgit v1.2.3


From 74072622e08dd1efdc7bf69c3278250ea1efb22e Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Mon, 29 Jul 2024 09:52:13 -0400
Subject: Remove actor and actor_id from the job as it can be inferred by the
 activity

---
 test/pleroma/web/activity_pub/publisher_test.exs | 44 +++++++++---------------
 1 file changed, 16 insertions(+), 28 deletions(-)

(limited to 'test')

diff --git a/test/pleroma/web/activity_pub/publisher_test.exs b/test/pleroma/web/activity_pub/publisher_test.exs
index 15f29a386..569b6af1a 100644
--- a/test/pleroma/web/activity_pub/publisher_test.exs
+++ b/test/pleroma/web/activity_pub/publisher_test.exs
@@ -147,12 +147,11 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
           {:ok, %Tesla.Env{status: 200, body: "port 80"}}
       end)
 
-      actor = insert(:user)
+      _actor = insert(:user)
 
       assert {:ok, %{body: "port 42"}} =
                Publisher.publish_one(%{
                  inbox: inbox42,
-                 actor: actor,
                  activity_id: activity.id,
                  unreachable_since: true
                })
@@ -160,7 +159,6 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
       assert {:ok, %{body: "port 80"}} =
                Publisher.publish_one(%{
                  inbox: inbox80,
-                 actor: actor,
                  activity_id: activity.id,
                  unreachable_since: true
                })
@@ -170,12 +168,12 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
                    Instances,
                    [:passthrough],
                    [] do
-      actor = insert(:user)
+      _actor = insert(:user)
       inbox = "http://200.site/users/nick1/inbox"
       activity = insert(:note_activity)
 
       assert {:ok, _} =
-               Publisher.publish_one(%{inbox: inbox, actor: actor, activity_id: activity.id})
+               Publisher.publish_one(%{inbox: inbox, activity_id: activity.id})
 
       assert called(Instances.set_reachable(inbox))
     end
@@ -184,14 +182,13 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
                    Instances,
                    [:passthrough],
                    [] do
-      actor = insert(:user)
+      _actor = insert(:user)
       inbox = "http://200.site/users/nick1/inbox"
       activity = insert(:note_activity)
 
       assert {:ok, _} =
                Publisher.publish_one(%{
                  inbox: inbox,
-                 actor: actor,
                  activity_id: activity.id,
                  unreachable_since: NaiveDateTime.utc_now()
                })
@@ -203,14 +200,13 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
                    Instances,
                    [:passthrough],
                    [] do
-      actor = insert(:user)
+      _actor = insert(:user)
       inbox = "http://200.site/users/nick1/inbox"
       activity = insert(:note_activity)
 
       assert {:ok, _} =
                Publisher.publish_one(%{
                  inbox: inbox,
-                 actor: actor,
                  activity_id: activity.id,
                  unreachable_since: nil
                })
@@ -222,12 +218,12 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
                    Instances,
                    [:passthrough],
                    [] do
-      actor = insert(:user)
+      _actor = insert(:user)
       inbox = "http://404.site/users/nick1/inbox"
       activity = insert(:note_activity)
 
       assert {:cancel, _} =
-               Publisher.publish_one(%{inbox: inbox, actor: actor, activity_id: activity.id})
+               Publisher.publish_one(%{inbox: inbox, activity_id: activity.id})
 
       assert called(Instances.set_unreachable(inbox))
     end
@@ -236,7 +232,7 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
                    Instances,
                    [:passthrough],
                    [] do
-      actor = insert(:user)
+      _actor = insert(:user)
       inbox = "http://connrefused.site/users/nick1/inbox"
       activity = insert(:note_activity)
 
@@ -244,7 +240,6 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
                assert {:error, _} =
                         Publisher.publish_one(%{
                           inbox: inbox,
-                          actor: actor,
                           activity_id: activity.id
                         })
              end) =~ "connrefused"
@@ -256,12 +251,12 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
                    Instances,
                    [:passthrough],
                    [] do
-      actor = insert(:user)
+      _actor = insert(:user)
       inbox = "http://200.site/users/nick1/inbox"
       activity = insert(:note_activity)
 
       assert {:ok, _} =
-               Publisher.publish_one(%{inbox: inbox, actor: actor, activity_id: activity.id})
+               Publisher.publish_one(%{inbox: inbox, activity_id: activity.id})
 
       refute called(Instances.set_unreachable(inbox))
     end
@@ -270,7 +265,7 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
                    Instances,
                    [:passthrough],
                    [] do
-      actor = insert(:user)
+      _actor = insert(:user)
       inbox = "http://connrefused.site/users/nick1/inbox"
       activity = insert(:note_activity)
 
@@ -278,7 +273,6 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
                assert {:error, _} =
                         Publisher.publish_one(%{
                           inbox: inbox,
-                          actor: actor,
                           activity_id: activity.id,
                           unreachable_since: NaiveDateTime.utc_now()
                         })
@@ -319,8 +313,7 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
       assert not called(
                Publisher.enqueue_one(%{
                  inbox: "https://domain.com/users/nick1/inbox",
-                 actor_id: actor.id,
-                 id: note_activity.data["id"]
+                 activity_id: note_activity.id
                })
              )
     end
@@ -356,8 +349,7 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
                Publisher.enqueue_one(
                  %{
                    inbox: "https://domain.com/users/nick1/inbox",
-                   actor_id: actor.id,
-                   id: note_activity.data["id"]
+                   activity_id: note_activity.id
                  },
                  priority: 1
                )
@@ -380,8 +372,7 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
                Publisher.enqueue_one(
                  %{
                    inbox: :_,
-                   actor_id: actor.id,
-                   id: note_activity.data["id"]
+                   activity_id: note_activity.id
                  },
                  priority: 0
                )
@@ -415,7 +406,6 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
       assert called(
                Publisher.enqueue_one(%{
                  inbox: "https://domain.com/users/nick1/inbox",
-                 actor_id: actor.id,
                  activity_id: note_activity.id
                })
              )
@@ -466,8 +456,7 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
                Publisher.enqueue_one(
                  %{
                    inbox: "https://domain.com/users/nick1/inbox",
-                   actor_id: actor.id,
-                   id: delete.data["id"]
+                   activity_id: delete.id
                  },
                  priority: 1
                )
@@ -477,8 +466,7 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
                Publisher.enqueue_one(
                  %{
                    inbox: "https://domain2.com/users/nick1/inbox",
-                   actor_id: actor.id,
-                   id: delete.data["id"]
+                   activity_id: delete.id
                  },
                  priority: 1
                )
-- 
cgit v1.2.3


From 8893ad98997197bd89e98f7dd18825dcb1206aa4 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Mon, 29 Jul 2024 09:59:35 -0400
Subject: Fix cancelling jobs

---
 test/pleroma/web/common_api_test.exs | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'test')

diff --git a/test/pleroma/web/common_api_test.exs b/test/pleroma/web/common_api_test.exs
index b6fba6999..4cdd3cffa 100644
--- a/test/pleroma/web/common_api_test.exs
+++ b/test/pleroma/web/common_api_test.exs
@@ -1957,7 +1957,7 @@ defmodule Pleroma.Web.CommonAPITest do
       {:ok, _, _} = Pleroma.User.follow(remote_one, local_user)
       {:ok, _, _} = Pleroma.User.follow(remote_two, local_user)
 
-      {:ok, %{data: %{"id" => ap_id}} = activity} =
+      {:ok, %{id: activity_id} = _activity} =
         CommonAPI.post(local_user, %{status: "Happy Friday everyone!"})
 
       # Generate the publish_one jobs
@@ -1971,7 +1971,7 @@ defmodule Pleroma.Web.CommonAPITest do
               state: "available",
               queue: "federator_outgoing",
               worker: "Pleroma.Workers.PublisherWorker",
-              args: %{"op" => "publish_one", "params" => %{"id" => ^ap_id}}
+              args: %{"op" => "publish_one", "params" => %{"activity_id" => ^activity_id}}
             },
             job
           )
@@ -1980,7 +1980,7 @@ defmodule Pleroma.Web.CommonAPITest do
       assert length(publish_one_jobs) == 2
 
       # The delete should have triggered cancelling the publish_one jobs
-      assert {:ok, _delete} = CommonAPI.delete(activity.id, local_user)
+      assert {:ok, _delete} = CommonAPI.delete(activity_id, local_user)
 
       # all_enqueued/1 will not return cancelled jobs
       cancelled_jobs =
@@ -1988,7 +1988,7 @@ defmodule Pleroma.Web.CommonAPITest do
         |> where([j], j.worker == "Pleroma.Workers.PublisherWorker")
         |> where([j], j.state == "cancelled")
         |> where([j], j.args["op"] == "publish_one")
-        |> where([j], j.args["params"]["id"] == ^ap_id)
+        |> where([j], j.args["params"]["activity_id"] == ^activity_id)
         |> Pleroma.Repo.all()
 
       assert length(cancelled_jobs) == 2
@@ -2001,7 +2001,7 @@ defmodule Pleroma.Web.CommonAPITest do
       {:ok, activity} =
         CommonAPI.post(remote_user, %{status: "I like turtles!"})
 
-      {:ok, %{data: %{"id" => ap_id}} = _favorite} =
+      {:ok, %{id: favorite_id} = _favorite} =
         CommonAPI.favorite(activity.id, local_user)
 
       # Generate the publish_one jobs
@@ -2015,7 +2015,7 @@ defmodule Pleroma.Web.CommonAPITest do
               state: "available",
               queue: "federator_outgoing",
               worker: "Pleroma.Workers.PublisherWorker",
-              args: %{"op" => "publish_one", "params" => %{"id" => ^ap_id}}
+              args: %{"op" => "publish_one", "params" => %{"activity_id" => ^favorite_id}}
             },
             job
           )
@@ -2032,7 +2032,7 @@ defmodule Pleroma.Web.CommonAPITest do
         |> where([j], j.worker == "Pleroma.Workers.PublisherWorker")
         |> where([j], j.state == "cancelled")
         |> where([j], j.args["op"] == "publish_one")
-        |> where([j], j.args["params"]["id"] == ^ap_id)
+        |> where([j], j.args["params"]["activity_id"] == ^favorite_id)
         |> Pleroma.Repo.all()
 
       assert length(cancelled_jobs) == 1
@@ -2049,7 +2049,7 @@ defmodule Pleroma.Web.CommonAPITest do
       {:ok, activity} =
         CommonAPI.post(remote_one, %{status: "This is an unpleasant post"})
 
-      {:ok, %{data: %{"id" => ap_id}} = _repeat} =
+      {:ok, %{id: repeat_id} = _repeat} =
         CommonAPI.repeat(activity.id, local_user)
 
       # Generate the publish_one jobs
@@ -2063,7 +2063,7 @@ defmodule Pleroma.Web.CommonAPITest do
               state: "available",
               queue: "federator_outgoing",
               worker: "Pleroma.Workers.PublisherWorker",
-              args: %{"op" => "publish_one", "params" => %{"id" => ^ap_id}}
+              args: %{"op" => "publish_one", "params" => %{"activity_id" => ^repeat_id}}
             },
             job
           )
@@ -2080,7 +2080,7 @@ defmodule Pleroma.Web.CommonAPITest do
         |> where([j], j.worker == "Pleroma.Workers.PublisherWorker")
         |> where([j], j.state == "cancelled")
         |> where([j], j.args["op"] == "publish_one")
-        |> where([j], j.args["params"]["id"] == ^ap_id)
+        |> where([j], j.args["params"]["activity_id"] == ^repeat_id)
         |> Pleroma.Repo.all()
 
       assert length(cancelled_jobs) == 2
@@ -2094,11 +2094,11 @@ defmodule Pleroma.Web.CommonAPITest do
       {:ok, _, _} = Pleroma.User.follow(remote_one, local_user)
       {:ok, _, _} = Pleroma.User.follow(remote_two, local_user)
 
-      {:ok, activity} =
+      {:ok, %{id: activity_id}} =
         CommonAPI.post(remote_one, %{status: "Gang gang!!!!"})
 
-      {:ok, %{data: %{"id" => ap_id}} = _react} =
-        CommonAPI.react_with_emoji(activity.id, local_user, "👍")
+      {:ok, %{id: react_id} = _react} =
+        CommonAPI.react_with_emoji(activity_id, local_user, "👍")
 
       # Generate the publish_one jobs
       ObanHelpers.perform_all()
@@ -2111,7 +2111,7 @@ defmodule Pleroma.Web.CommonAPITest do
               state: "available",
               queue: "federator_outgoing",
               worker: "Pleroma.Workers.PublisherWorker",
-              args: %{"op" => "publish_one", "params" => %{"id" => ^ap_id}}
+              args: %{"op" => "publish_one", "params" => %{"activity_id" => ^react_id}}
             },
             job
           )
@@ -2120,7 +2120,7 @@ defmodule Pleroma.Web.CommonAPITest do
       assert length(publish_one_jobs) == 2
 
       # The unreact should have triggered cancelling the publish_one jobs
-      assert {:ok, _unreact} = CommonAPI.unreact_with_emoji(activity.id, local_user, "👍")
+      assert {:ok, _unreact} = CommonAPI.unreact_with_emoji(activity_id, local_user, "👍")
 
       # all_enqueued/1 will not return cancelled jobs
       cancelled_jobs =
@@ -2128,7 +2128,7 @@ defmodule Pleroma.Web.CommonAPITest do
         |> where([j], j.worker == "Pleroma.Workers.PublisherWorker")
         |> where([j], j.state == "cancelled")
         |> where([j], j.args["op"] == "publish_one")
-        |> where([j], j.args["params"]["id"] == ^ap_id)
+        |> where([j], j.args["params"]["activity_id"] == ^react_id)
         |> Pleroma.Repo.all()
 
       assert length(cancelled_jobs) == 2
-- 
cgit v1.2.3


From 05d4989795b79683933aa602cd427c57ded10e2f Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Mon, 29 Jul 2024 13:54:26 -0400
Subject: Insert replacement jobs in the new format if any remain undelivered

The old jobs remain and will fail gracefully
---
 .../migrations/publisher_migration_change_test.exs | 43 ++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 test/pleroma/repo/migrations/publisher_migration_change_test.exs

(limited to 'test')

diff --git a/test/pleroma/repo/migrations/publisher_migration_change_test.exs b/test/pleroma/repo/migrations/publisher_migration_change_test.exs
new file mode 100644
index 000000000..9c035e604
--- /dev/null
+++ b/test/pleroma/repo/migrations/publisher_migration_change_test.exs
@@ -0,0 +1,43 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Repo.Migrations.PublisherMigrationChangeTest do
+  use Oban.Testing, repo: Pleroma.Repo
+  use Pleroma.DataCase
+  import Pleroma.Factory
+  import Pleroma.Tests.Helpers
+
+  alias Pleroma.Activity
+  alias Pleroma.Workers.PublisherWorker
+
+  setup_all do: require_migration("20240729163838_publisher_job_change")
+
+  describe "up/0" do
+    test "migrates publisher jobs to new format", %{migration: migration} do
+      user = insert(:user)
+
+      %Activity{id: activity_id, data: %{"id" => ap_id}} =
+        insert(:note_activity, user: user)
+
+      {:ok, %{id: job_id}} =
+        PublisherWorker.new(%{
+          "actor_id" => user.id,
+          "json" => "{}",
+          "id" => ap_id,
+          "inbox" => "https://example.com/inbox",
+          "unreachable_since" => nil
+        })
+        |> Oban.insert()
+
+      assert [%{id: ^job_id, args: %{"id" => ^ap_id}}] = all_enqueued(worker: PublisherWorker)
+
+      assert migration.up() == :ok
+
+      assert_enqueued(
+        worker: PublisherWorker,
+        args: %{"id" => ap_id, "activity_id" => activity_id}
+      )
+    end
+  end
+end
-- 
cgit v1.2.3


From 52e9bec15655dd3ba75c133b85266a1ea65a8eef Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Fri, 28 Jun 2024 11:47:31 -0400
Subject: Remove WorkerHelper

---
 test/mix/tasks/pleroma/database_test.exs           | 10 +++++---
 .../workers/purge_expired_activity_test.exs        | 30 +++++++++++++---------
 2 files changed, 24 insertions(+), 16 deletions(-)

(limited to 'test')

diff --git a/test/mix/tasks/pleroma/database_test.exs b/test/mix/tasks/pleroma/database_test.exs
index a51a3bf3d..96a925528 100644
--- a/test/mix/tasks/pleroma/database_test.exs
+++ b/test/mix/tasks/pleroma/database_test.exs
@@ -623,10 +623,12 @@ defmodule Mix.Tasks.Pleroma.DatabaseTest do
 
       expires_at = DateTime.add(DateTime.utc_now(), 60 * 61)
 
-      Pleroma.Workers.PurgeExpiredActivity.enqueue(%{
-        activity_id: activity_id3,
-        expires_at: expires_at
-      })
+      Pleroma.Workers.PurgeExpiredActivity.enqueue(
+        %{
+          activity_id: activity_id3
+        },
+        scheduled_at: expires_at
+      )
 
       Mix.Tasks.Pleroma.Database.run(["ensure_expiration"])
 
diff --git a/test/pleroma/workers/purge_expired_activity_test.exs b/test/pleroma/workers/purge_expired_activity_test.exs
index 040ff6a51..ea563d3d3 100644
--- a/test/pleroma/workers/purge_expired_activity_test.exs
+++ b/test/pleroma/workers/purge_expired_activity_test.exs
@@ -14,10 +14,12 @@ defmodule Pleroma.Workers.PurgeExpiredActivityTest do
     activity = insert(:note_activity)
 
     assert {:ok, _} =
-             PurgeExpiredActivity.enqueue(%{
-               activity_id: activity.id,
-               expires_at: DateTime.add(DateTime.utc_now(), 3601)
-             })
+             PurgeExpiredActivity.enqueue(
+               %{
+                 activity_id: activity.id
+               },
+               scheduled_at: DateTime.add(DateTime.utc_now(), 3601)
+             )
 
     assert_enqueued(
       worker: Pleroma.Workers.PurgeExpiredActivity,
@@ -34,10 +36,12 @@ defmodule Pleroma.Workers.PurgeExpiredActivityTest do
     activity = insert(:note_activity)
 
     assert {:ok, _} =
-             PurgeExpiredActivity.enqueue(%{
-               activity_id: activity.id,
-               expires_at: DateTime.add(DateTime.utc_now(), 3601)
-             })
+             PurgeExpiredActivity.enqueue(
+               %{
+                 activity_id: activity.id
+               },
+               scheduled_at: DateTime.add(DateTime.utc_now(), 3601)
+             )
 
     user = Pleroma.User.get_by_ap_id(activity.actor)
     Pleroma.Repo.delete(user)
@@ -48,10 +52,12 @@ defmodule Pleroma.Workers.PurgeExpiredActivityTest do
 
   test "error if actiivity was not found" do
     assert {:ok, _} =
-             PurgeExpiredActivity.enqueue(%{
-               activity_id: "some_id",
-               expires_at: DateTime.add(DateTime.utc_now(), 3601)
-             })
+             PurgeExpiredActivity.enqueue(
+               %{
+                 activity_id: "some_id"
+               },
+               scheduled_at: DateTime.add(DateTime.utc_now(), 3601)
+             )
 
     assert {:cancel, :activity_not_found} =
              perform_job(Pleroma.Workers.PurgeExpiredActivity, %{activity_id: "some_if"})
-- 
cgit v1.2.3


From de9194893e811eaa5e14e07ae208da84006b6f38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Sat, 3 Aug 2024 18:28:43 +0200
Subject: Support `id` param in `GET /api/v1/statuses`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 .../controllers/status_controller_test.exs         | 28 +++++++++++++++-------
 1 file changed, 19 insertions(+), 9 deletions(-)

(limited to 'test')

diff --git a/test/pleroma/web/mastodon_api/controllers/status_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/status_controller_test.exs
index 904bf1471..a4bca6cf9 100644
--- a/test/pleroma/web/mastodon_api/controllers/status_controller_test.exs
+++ b/test/pleroma/web/mastodon_api/controllers/status_controller_test.exs
@@ -922,13 +922,23 @@ defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do
     %{id: id1} = insert(:note_activity)
     %{id: id2} = insert(:note_activity)
 
-    query_string = "ids[]=#{id1}&ids[]=#{id2}"
+    query_string = "id[]=#{id1}&id[]=#{id2}"
     conn = get(conn, "/api/v1/statuses/?#{query_string}")
 
     assert [%{"id" => ^id1}, %{"id" => ^id2}] =
              Enum.sort_by(json_response_and_validate_schema(conn, :ok), & &1["id"])
   end
 
+  test "get statuses by IDs falls back to ids[]" do
+    %{conn: conn} = oauth_access(["read:statuses"])
+    %{id: id} = insert(:note_activity)
+
+    query_string = "ids[]=#{id}"
+    conn = get(conn, "/api/v1/statuses/?#{query_string}")
+
+    assert [%{"id" => ^id}] = json_response_and_validate_schema(conn, 200)
+  end
+
   describe "getting statuses by ids with restricted unauthenticated for local and remote" do
     setup do: local_and_remote_activities()
 
@@ -937,7 +947,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do
     setup do: clear_config([:restrict_unauthenticated, :activities, :remote], true)
 
     test "if user is unauthenticated", %{conn: conn, local: local, remote: remote} do
-      res_conn = get(conn, "/api/v1/statuses?ids[]=#{local.id}&ids[]=#{remote.id}")
+      res_conn = get(conn, "/api/v1/statuses?id[]=#{local.id}&id[]=#{remote.id}")
 
       assert json_response_and_validate_schema(res_conn, 200) == []
     end
@@ -945,7 +955,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do
     test "if user is authenticated", %{local: local, remote: remote} do
       %{conn: conn} = oauth_access(["read"])
 
-      res_conn = get(conn, "/api/v1/statuses?ids[]=#{local.id}&ids[]=#{remote.id}")
+      res_conn = get(conn, "/api/v1/statuses?id[]=#{local.id}&id[]=#{remote.id}")
 
       assert length(json_response_and_validate_schema(res_conn, 200)) == 2
     end
@@ -957,7 +967,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do
     setup do: clear_config([:restrict_unauthenticated, :activities, :local], true)
 
     test "if user is unauthenticated", %{conn: conn, local: local, remote: remote} do
-      res_conn = get(conn, "/api/v1/statuses?ids[]=#{local.id}&ids[]=#{remote.id}")
+      res_conn = get(conn, "/api/v1/statuses?id[]=#{local.id}&id[]=#{remote.id}")
 
       remote_id = remote.id
       assert [%{"id" => ^remote_id}] = json_response_and_validate_schema(res_conn, 200)
@@ -966,7 +976,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do
     test "if user is authenticated", %{local: local, remote: remote} do
       %{conn: conn} = oauth_access(["read"])
 
-      res_conn = get(conn, "/api/v1/statuses?ids[]=#{local.id}&ids[]=#{remote.id}")
+      res_conn = get(conn, "/api/v1/statuses?id[]=#{local.id}&id[]=#{remote.id}")
 
       assert length(json_response_and_validate_schema(res_conn, 200)) == 2
     end
@@ -978,7 +988,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do
     setup do: clear_config([:restrict_unauthenticated, :activities, :remote], true)
 
     test "if user is unauthenticated", %{conn: conn, local: local, remote: remote} do
-      res_conn = get(conn, "/api/v1/statuses?ids[]=#{local.id}&ids[]=#{remote.id}")
+      res_conn = get(conn, "/api/v1/statuses?id[]=#{local.id}&id[]=#{remote.id}")
 
       local_id = local.id
       assert [%{"id" => ^local_id}] = json_response_and_validate_schema(res_conn, 200)
@@ -987,7 +997,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do
     test "if user is authenticated", %{local: local, remote: remote} do
       %{conn: conn} = oauth_access(["read"])
 
-      res_conn = get(conn, "/api/v1/statuses?ids[]=#{local.id}&ids[]=#{remote.id}")
+      res_conn = get(conn, "/api/v1/statuses?id[]=#{local.id}&id[]=#{remote.id}")
 
       assert length(json_response_and_validate_schema(res_conn, 200)) == 2
     end
@@ -2241,7 +2251,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do
 
       result =
         conn
-        |> get("/api/v1/statuses/?ids[]=#{activity.id}")
+        |> get("/api/v1/statuses/?id[]=#{activity.id}")
         |> json_response_and_validate_schema(200)
 
       assert [
@@ -2254,7 +2264,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do
 
       result =
         conn
-        |> get("/api/v1/statuses/?ids[]=#{activity.id}&with_muted=true")
+        |> get("/api/v1/statuses/?id[]=#{activity.id}&with_muted=true")
         |> json_response_and_validate_schema(200)
 
       assert [
-- 
cgit v1.2.3


From 16ba2742b78b136d8e89edfe7847dc3d2f35ed14 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Tue, 6 Aug 2024 09:55:09 -0400
Subject: Use the normal Oban test assertions

---
 test/pleroma/web/activity_pub/publisher_test.exs | 90 +++++++++++++-----------
 1 file changed, 50 insertions(+), 40 deletions(-)

(limited to 'test')

diff --git a/test/pleroma/web/activity_pub/publisher_test.exs b/test/pleroma/web/activity_pub/publisher_test.exs
index 569b6af1a..1992fb228 100644
--- a/test/pleroma/web/activity_pub/publisher_test.exs
+++ b/test/pleroma/web/activity_pub/publisher_test.exs
@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.ActivityPub.PublisherTest do
+  use Oban.Testing, repo: Pleroma.Repo
   use Pleroma.Web.ConnCase
 
   import ExUnit.CaptureLog
@@ -310,12 +311,15 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
 
       assert res == :ok
 
-      assert not called(
-               Publisher.enqueue_one(%{
-                 inbox: "https://domain.com/users/nick1/inbox",
-                 activity_id: note_activity.id
-               })
-             )
+      refute_enqueued(
+        worker: "Pleroma.Workers.PublisherWorker",
+        args: %{
+          "params" => %{
+            inbox: "https://domain.com/users/nick1/inbox",
+            activity_id: note_activity.id
+          }
+        }
+      )
     end
 
     test_with_mock "Publishes a non-public activity to non-quarantined instances.",
@@ -345,15 +349,16 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
 
       assert res == :ok
 
-      assert called(
-               Publisher.enqueue_one(
-                 %{
-                   inbox: "https://domain.com/users/nick1/inbox",
-                   activity_id: note_activity.id
-                 },
-                 priority: 1
-               )
-             )
+      assert_enqueued(
+        worker: "Pleroma.Workers.PublisherWorker",
+        args: %{
+          "params" => %{
+            inbox: "https://domain.com/users/nick1/inbox",
+            activity_id: note_activity.id
+          }
+        },
+        priority: 1
+      )
     end
 
     test_with_mock "Publishes to directly addressed actors with higher priority.",
@@ -403,12 +408,15 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
       res = Publisher.publish(actor, note_activity)
       assert res == :ok
 
-      assert called(
-               Publisher.enqueue_one(%{
-                 inbox: "https://domain.com/users/nick1/inbox",
-                 activity_id: note_activity.id
-               })
-             )
+      assert_enqueued(
+        worker: "Pleroma.Workers.PublisherWorker",
+        args: %{
+          "params" => %{
+            inbox: "https://domain.com/users/nick1/inbox",
+            activity_id: note_activity.id
+          }
+        }
+      )
     end
 
     test_with_mock "publishes a delete activity to peers who signed fetch requests to the create acitvity/object.",
@@ -452,25 +460,27 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
       res = Publisher.publish(actor, delete)
       assert res == :ok
 
-      assert called(
-               Publisher.enqueue_one(
-                 %{
-                   inbox: "https://domain.com/users/nick1/inbox",
-                   activity_id: delete.id
-                 },
-                 priority: 1
-               )
-             )
-
-      assert called(
-               Publisher.enqueue_one(
-                 %{
-                   inbox: "https://domain2.com/users/nick1/inbox",
-                   activity_id: delete.id
-                 },
-                 priority: 1
-               )
-             )
+      assert_enqueued(
+        worker: "Pleroma.Workers.PublisherWorker",
+        args: %{
+          "params" => %{
+            inbox: "https://domain.com/users/nick1/inbox",
+            activity_id: delete.id
+          }
+        },
+        priority: 1
+      )
+
+      assert_enqueued(
+        worker: "Pleroma.Workers.PublisherWorker",
+        args: %{
+          "params" => %{
+            inbox: "https://domain2.com/users/nick1/inbox",
+            activity_id: delete.id
+          }
+        },
+        priority: 1
+      )
     end
   end
 end
-- 
cgit v1.2.3


From f8bdcaa161575e40097a82481009620edc5a0696 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Tue, 6 Aug 2024 11:15:35 -0400
Subject: Split Federator.publish_one/1 into a second function called
 prepare_one/1

---
 test/pleroma/web/activity_pub/publisher_test.exs | 27 ++++++++++++++++--------
 1 file changed, 18 insertions(+), 9 deletions(-)

(limited to 'test')

diff --git a/test/pleroma/web/activity_pub/publisher_test.exs b/test/pleroma/web/activity_pub/publisher_test.exs
index 1992fb228..370b4b4d2 100644
--- a/test/pleroma/web/activity_pub/publisher_test.exs
+++ b/test/pleroma/web/activity_pub/publisher_test.exs
@@ -151,18 +151,20 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
       _actor = insert(:user)
 
       assert {:ok, %{body: "port 42"}} =
-               Publisher.publish_one(%{
+               Publisher.prepare_one(%{
                  inbox: inbox42,
                  activity_id: activity.id,
                  unreachable_since: true
                })
+               |> Publisher.publish_one()
 
       assert {:ok, %{body: "port 80"}} =
-               Publisher.publish_one(%{
+               Publisher.prepare_one(%{
                  inbox: inbox80,
                  activity_id: activity.id,
                  unreachable_since: true
                })
+               |> Publisher.publish_one()
     end
 
     test_with_mock "calls `Instances.set_reachable` on successful federation if `unreachable_since` is not specified",
@@ -174,7 +176,8 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
       activity = insert(:note_activity)
 
       assert {:ok, _} =
-               Publisher.publish_one(%{inbox: inbox, activity_id: activity.id})
+               Publisher.prepare_one(%{inbox: inbox, activity_id: activity.id})
+               |> Publisher.publish_one()
 
       assert called(Instances.set_reachable(inbox))
     end
@@ -188,11 +191,12 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
       activity = insert(:note_activity)
 
       assert {:ok, _} =
-               Publisher.publish_one(%{
+               Publisher.prepare_one(%{
                  inbox: inbox,
                  activity_id: activity.id,
                  unreachable_since: NaiveDateTime.utc_now()
                })
+               |> Publisher.publish_one()
 
       assert called(Instances.set_reachable(inbox))
     end
@@ -206,11 +210,12 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
       activity = insert(:note_activity)
 
       assert {:ok, _} =
-               Publisher.publish_one(%{
+               Publisher.prepare_one(%{
                  inbox: inbox,
                  activity_id: activity.id,
                  unreachable_since: nil
                })
+               |> Publisher.publish_one()
 
       refute called(Instances.set_reachable(inbox))
     end
@@ -224,7 +229,8 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
       activity = insert(:note_activity)
 
       assert {:cancel, _} =
-               Publisher.publish_one(%{inbox: inbox, activity_id: activity.id})
+               Publisher.prepare_one(%{inbox: inbox, activity_id: activity.id})
+               |> Publisher.publish_one()
 
       assert called(Instances.set_unreachable(inbox))
     end
@@ -239,10 +245,11 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
 
       assert capture_log(fn ->
                assert {:error, _} =
-                        Publisher.publish_one(%{
+                        Publisher.prepare_one(%{
                           inbox: inbox,
                           activity_id: activity.id
                         })
+                        |> Publisher.publish_one()
              end) =~ "connrefused"
 
       assert called(Instances.set_unreachable(inbox))
@@ -257,7 +264,8 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
       activity = insert(:note_activity)
 
       assert {:ok, _} =
-               Publisher.publish_one(%{inbox: inbox, activity_id: activity.id})
+               Publisher.prepare_one(%{inbox: inbox, activity_id: activity.id})
+               |> Publisher.publish_one()
 
       refute called(Instances.set_unreachable(inbox))
     end
@@ -272,11 +280,12 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
 
       assert capture_log(fn ->
                assert {:error, _} =
-                        Publisher.publish_one(%{
+                        Publisher.prepare_one(%{
                           inbox: inbox,
                           activity_id: activity.id,
                           unreachable_since: NaiveDateTime.utc_now()
                         })
+                        |> Publisher.publish_one()
              end) =~ "connrefused"
 
       refute called(Instances.set_unreachable(inbox))
-- 
cgit v1.2.3


From 0319d1ad3c68e5942ef934a10d44151cc34290a8 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Tue, 6 Aug 2024 11:17:34 -0400
Subject: Remove test, logic was flawed

Before splitting the publish_one/1 function into two parts for testing purposes we had logic that checked the keys of params for :unreachable_since and if it was absent it did not set the instance as reachable. There is also a test to validate that when unreachable_since is nil, we set it as reachable.

However the default value of :unreachable_since when an instance is reachable is nil. The test appears to be testing a scenario that does not exist in the real world, and with this refactor we will always have an :unreachable_since key.

We were attempting to update the reachability upon every successful federation because we always include it when we generate the publish_one jobs.
---
 test/pleroma/web/activity_pub/publisher_test.exs | 15 ---------------
 1 file changed, 15 deletions(-)

(limited to 'test')

diff --git a/test/pleroma/web/activity_pub/publisher_test.exs b/test/pleroma/web/activity_pub/publisher_test.exs
index 370b4b4d2..c0c20b4fd 100644
--- a/test/pleroma/web/activity_pub/publisher_test.exs
+++ b/test/pleroma/web/activity_pub/publisher_test.exs
@@ -167,21 +167,6 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
                |> Publisher.publish_one()
     end
 
-    test_with_mock "calls `Instances.set_reachable` on successful federation if `unreachable_since` is not specified",
-                   Instances,
-                   [:passthrough],
-                   [] do
-      _actor = insert(:user)
-      inbox = "http://200.site/users/nick1/inbox"
-      activity = insert(:note_activity)
-
-      assert {:ok, _} =
-               Publisher.prepare_one(%{inbox: inbox, activity_id: activity.id})
-               |> Publisher.publish_one()
-
-      assert called(Instances.set_reachable(inbox))
-    end
-
     test_with_mock "calls `Instances.set_reachable` on successful federation if `unreachable_since` is set",
                    Instances,
                    [:passthrough],
-- 
cgit v1.2.3


From 21fee4215766e7f728ff390076299be4560ce279 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Tue, 6 Aug 2024 11:54:18 -0400
Subject: Test Factory: ensure remote users have a valid inbox

Without a valid inbox we can't generate the publish_one Oban jobs
---
 test/support/factory.ex | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/support/factory.ex b/test/support/factory.ex
index b248508fa..fb26f4162 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -63,7 +63,8 @@ defmodule Pleroma.Factory do
           ap_id: ap_id,
           follower_address: ap_id <> "/followers",
           following_address: ap_id <> "/following",
-          featured_address: ap_id <> "/collections/featured"
+          featured_address: ap_id <> "/collections/featured",
+          inbox: "https://#{base_domain}/inbox"
         }
       else
         %{
-- 
cgit v1.2.3


From 30eef434a9e180085ceac960e863183a11e87c7e Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Tue, 6 Aug 2024 11:58:45 -0400
Subject: Test that cc on a published Follow is an empty list

---
 test/pleroma/web/activity_pub/publisher_test.exs | 51 ++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

(limited to 'test')

diff --git a/test/pleroma/web/activity_pub/publisher_test.exs b/test/pleroma/web/activity_pub/publisher_test.exs
index c0c20b4fd..3d8598c5f 100644
--- a/test/pleroma/web/activity_pub/publisher_test.exs
+++ b/test/pleroma/web/activity_pub/publisher_test.exs
@@ -14,6 +14,7 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
   alias Pleroma.Activity
   alias Pleroma.Instances
   alias Pleroma.Object
+  alias Pleroma.Tests.ObanHelpers
   alias Pleroma.Web.ActivityPub.Publisher
   alias Pleroma.Web.CommonAPI
 
@@ -477,4 +478,54 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
       )
     end
   end
+
+  test "cc in prepared json for a follow request is an empty list" do
+    user = insert(:user)
+    remote_user = insert(:user, local: false)
+
+    {:ok, _, _, activity} = CommonAPI.follow(remote_user, user)
+
+    mock(fn
+      %{method: :post, url: "http://42.site:42/users/nick1/inbox"} ->
+        {:ok, %Tesla.Env{status: 200, body: "port 42"}}
+
+      %{method: :post, url: "http://42.site/users/nick1/inbox"} ->
+        {:ok, %Tesla.Env{status: 200, body: "port 80"}}
+    end)
+
+    assert_enqueued(
+      worker: "Pleroma.Workers.PublisherWorker",
+      args: %{
+        "activity_id" => activity.id,
+        "op" => "publish"
+      }
+    )
+
+    ObanHelpers.perform_all()
+
+    expected_params =
+      %{
+        "activity_id" => activity.id,
+        "inbox" => remote_user.inbox,
+        "unreachable_since" => nil
+      }
+
+    assert_enqueued(
+      worker: "Pleroma.Workers.PublisherWorker",
+      args: %{
+        "op" => "publish_one",
+        "params" => expected_params
+      }
+    )
+
+    # params need to be atom keys for Publisher.prepare_one.
+    # this is done in the Oban job.
+    expected_params = Map.new(expected_params, fn {k, v} -> {String.to_atom(k), v} end)
+
+    %{json: json} = Publisher.prepare_one(expected_params)
+
+    {:ok, decoded} = Jason.decode(json)
+
+    assert decoded["cc"] == []
+  end
 end
-- 
cgit v1.2.3


From 706fc7e1ec1cf8121f3d7a05cd2cc5f0a53b120c Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Tue, 6 Aug 2024 12:24:08 -0400
Subject: Remove unused mocks

---
 test/pleroma/web/activity_pub/publisher_test.exs | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'test')

diff --git a/test/pleroma/web/activity_pub/publisher_test.exs b/test/pleroma/web/activity_pub/publisher_test.exs
index 3d8598c5f..3acbac396 100644
--- a/test/pleroma/web/activity_pub/publisher_test.exs
+++ b/test/pleroma/web/activity_pub/publisher_test.exs
@@ -485,14 +485,6 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
 
     {:ok, _, _, activity} = CommonAPI.follow(remote_user, user)
 
-    mock(fn
-      %{method: :post, url: "http://42.site:42/users/nick1/inbox"} ->
-        {:ok, %Tesla.Env{status: 200, body: "port 42"}}
-
-      %{method: :post, url: "http://42.site/users/nick1/inbox"} ->
-        {:ok, %Tesla.Env{status: 200, body: "port 80"}}
-    end)
-
     assert_enqueued(
       worker: "Pleroma.Workers.PublisherWorker",
       args: %{
-- 
cgit v1.2.3


From ad7fe4e95de42a91ef46a88a3f2863682c68ec5d Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Wed, 7 Aug 2024 11:47:59 -0400
Subject: Tests to confirm wanted behavior

---
 test/pleroma/web/views/streamer_view_test.ex | 100 +++++++++++++++++++++++++++
 1 file changed, 100 insertions(+)
 create mode 100644 test/pleroma/web/views/streamer_view_test.ex

(limited to 'test')

diff --git a/test/pleroma/web/views/streamer_view_test.ex b/test/pleroma/web/views/streamer_view_test.ex
new file mode 100644
index 000000000..43a17a43e
--- /dev/null
+++ b/test/pleroma/web/views/streamer_view_test.ex
@@ -0,0 +1,100 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Web.StreamerViewTest do
+  use Pleroma.Web.ConnCase, async: true
+  # import ExUnit.CaptureLog
+  import Pleroma.Factory
+
+  alias Pleroma.Web.CommonAPI
+  alias Pleroma.Web.StreamerView
+
+  describe "follow_relationships_update.json" do
+    test "shows follower/following count normally" do
+      other_user = insert(:user)
+      %{id: following_id} = following = insert(:user)
+      follower = insert(:user)
+
+      {:ok, _, _, _} = CommonAPI.follow(other_user, following)
+      {:ok, follower, following, _activity} = CommonAPI.follow(following, follower)
+
+      result =
+        StreamerView.render(
+          "follow_relationships_update.json",
+          %{follower: follower, following: following, state: :test},
+          "user:test"
+        )
+
+      {:ok, %{"payload" => payload}} = Jason.decode(result)
+
+      {:ok, decoded_payload} = Jason.decode(payload)
+
+      # check the payload updating the user that was followed
+      assert match?(
+               %{"follower_count" => 1, "following_count" => 1, "id" => ^following_id},
+               decoded_payload["following"]
+             )
+    end
+
+    test "hides follower count for :hide_followers and :hide_followers_count" do
+      user_attrs = [%{hide_followers: true}, %{hide_followers_count: true}]
+
+      Enum.each(user_attrs, fn attrs ->
+        other_user = insert(:user)
+        %{id: following_id} = following = insert(:user, attrs)
+        follower = insert(:user)
+
+        {:ok, _, _, _} = CommonAPI.follow(other_user, following)
+        {:ok, follower, following, _activity} = CommonAPI.follow(following, follower)
+
+        result =
+          StreamerView.render(
+            "follow_relationships_update.json",
+            %{follower: follower, following: following, state: :test},
+            "user:test"
+          )
+
+        {:ok, %{"payload" => payload}} = Jason.decode(result)
+
+        {:ok, decoded_payload} = Jason.decode(payload)
+
+        # check the payload updating the user that was followed
+        assert match?(
+                 %{"follower_count" => 0, "following_count" => 1, "id" => ^following_id},
+                 decoded_payload["following"]
+               )
+      end)
+    end
+
+    test "hides follows count for :hide_follows and :hide_follows_count" do
+      user_attrs = [%{hide_follows: true}, %{hide_follows_count: true}]
+
+      Enum.each(user_attrs, fn attrs ->
+        other_user = insert(:user)
+        %{id: following_id} = following = insert(:user, attrs)
+        follower = insert(:user)
+
+        {:ok, _, _, _} = CommonAPI.follow(other_user, following)
+        {:ok, follower, following, _activity} = CommonAPI.follow(following, follower)
+
+        result =
+          StreamerView.render(
+            "follow_relationships_update.json",
+            %{follower: follower, following: following, state: :test},
+            "user:test"
+          )
+
+        {:ok, %{"payload" => payload}} = Jason.decode(result)
+
+        {:ok, decoded_payload} = Jason.decode(payload)
+
+        # check the payload updating the user that was followed
+        assert match?(
+                 %{"follower_count" => 1, "following_count" => 0, "id" => ^following_id},
+                 decoded_payload["following"]
+               )
+      end)
+    end
+  end
+end
-- 
cgit v1.2.3


From 06e8ece4cc3956d991d48dbd338604b7940d167c Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Wed, 7 Aug 2024 12:37:58 -0400
Subject: Fix CommonAPI.follow/2 which returned users in the reverse order they
 were provided to the function

---
 .../web/activity_pub/activity_pub_controller_test.exs  |  4 ++--
 test/pleroma/web/activity_pub/views/user_view_test.exs |  8 ++++----
 test/pleroma/web/common_api_test.exs                   | 10 +++++-----
 .../web/mastodon_api/views/account_view_test.exs       | 18 +++++++++---------
 .../web/mastodon_api/views/notification_view_test.exs  |  2 +-
 test/pleroma/web/views/streamer_view_test.ex           |  6 +++---
 6 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'test')

diff --git a/test/pleroma/web/activity_pub/activity_pub_controller_test.exs b/test/pleroma/web/activity_pub/activity_pub_controller_test.exs
index 6aae61835..af1a32fed 100644
--- a/test/pleroma/web/activity_pub/activity_pub_controller_test.exs
+++ b/test/pleroma/web/activity_pub/activity_pub_controller_test.exs
@@ -1747,7 +1747,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
          %{conn: conn} do
       user = insert(:user, hide_followers: true)
       other_user = insert(:user)
-      {:ok, _other_user, user, _activity} = CommonAPI.follow(user, other_user)
+      {:ok, user, _other_user, _activity} = CommonAPI.follow(user, other_user)
 
       result =
         conn
@@ -1843,7 +1843,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
          %{conn: conn} do
       user = insert(:user, hide_follows: true)
       other_user = insert(:user)
-      {:ok, user, _other_user, _activity} = CommonAPI.follow(other_user, user)
+      {:ok, _other_user, user, _activity} = CommonAPI.follow(other_user, user)
 
       result =
         conn
diff --git a/test/pleroma/web/activity_pub/views/user_view_test.exs b/test/pleroma/web/activity_pub/views/user_view_test.exs
index c94f8a2bc..651e535ac 100644
--- a/test/pleroma/web/activity_pub/views/user_view_test.exs
+++ b/test/pleroma/web/activity_pub/views/user_view_test.exs
@@ -138,7 +138,7 @@ defmodule Pleroma.Web.ActivityPub.UserViewTest do
     test "sets totalItems to zero when followers are hidden" do
       user = insert(:user)
       other_user = insert(:user)
-      {:ok, _other_user, user, _activity} = CommonAPI.follow(user, other_user)
+      {:ok, user, _other_user, _activity} = CommonAPI.follow(user, other_user)
       assert %{"totalItems" => 1} = UserView.render("followers.json", %{user: user})
       user = Map.merge(user, %{hide_followers_count: true, hide_followers: true})
       refute UserView.render("followers.json", %{user: user}) |> Map.has_key?("totalItems")
@@ -147,7 +147,7 @@ defmodule Pleroma.Web.ActivityPub.UserViewTest do
     test "sets correct totalItems when followers are hidden but the follower counter is not" do
       user = insert(:user)
       other_user = insert(:user)
-      {:ok, _other_user, user, _activity} = CommonAPI.follow(user, other_user)
+      {:ok, user, _other_user, _activity} = CommonAPI.follow(user, other_user)
       assert %{"totalItems" => 1} = UserView.render("followers.json", %{user: user})
       user = Map.merge(user, %{hide_followers_count: false, hide_followers: true})
       assert %{"totalItems" => 1} = UserView.render("followers.json", %{user: user})
@@ -158,7 +158,7 @@ defmodule Pleroma.Web.ActivityPub.UserViewTest do
     test "sets totalItems to zero when follows are hidden" do
       user = insert(:user)
       other_user = insert(:user)
-      {:ok, user, _other_user, _activity} = CommonAPI.follow(other_user, user)
+      {:ok, _other_user, user, _activity} = CommonAPI.follow(other_user, user)
       assert %{"totalItems" => 1} = UserView.render("following.json", %{user: user})
       user = Map.merge(user, %{hide_follows_count: true, hide_follows: true})
       assert %{"totalItems" => 0} = UserView.render("following.json", %{user: user})
@@ -167,7 +167,7 @@ defmodule Pleroma.Web.ActivityPub.UserViewTest do
     test "sets correct totalItems when follows are hidden but the follow counter is not" do
       user = insert(:user)
       other_user = insert(:user)
-      {:ok, user, _other_user, _activity} = CommonAPI.follow(other_user, user)
+      {:ok, _other_user, user, _activity} = CommonAPI.follow(other_user, user)
       assert %{"totalItems" => 1} = UserView.render("following.json", %{user: user})
       user = Map.merge(user, %{hide_follows_count: false, hide_follows: true})
       assert %{"totalItems" => 1} = UserView.render("following.json", %{user: user})
diff --git a/test/pleroma/web/common_api_test.exs b/test/pleroma/web/common_api_test.exs
index 4cdd3cffa..73230a58c 100644
--- a/test/pleroma/web/common_api_test.exs
+++ b/test/pleroma/web/common_api_test.exs
@@ -1420,7 +1420,7 @@ defmodule Pleroma.Web.CommonAPITest do
   describe "follow/2" do
     test "directly follows a non-locked local user" do
       [follower, followed] = insert_pair(:user)
-      {:ok, follower, followed, _} = CommonAPI.follow(followed, follower)
+      {:ok, followed, follower, _} = CommonAPI.follow(followed, follower)
 
       assert User.following?(follower, followed)
     end
@@ -1429,7 +1429,7 @@ defmodule Pleroma.Web.CommonAPITest do
   describe "unfollow/2" do
     test "also unsubscribes a user" do
       [follower, followed] = insert_pair(:user)
-      {:ok, follower, followed, _} = CommonAPI.follow(followed, follower)
+      {:ok, followed, follower, _} = CommonAPI.follow(followed, follower)
       {:ok, _subscription} = User.subscribe(follower, followed)
 
       assert User.subscribed_to?(follower, followed)
@@ -1441,7 +1441,7 @@ defmodule Pleroma.Web.CommonAPITest do
 
     test "also unpins a user" do
       [follower, followed] = insert_pair(:user)
-      {:ok, follower, followed, _} = CommonAPI.follow(followed, follower)
+      {:ok, followed, follower, _} = CommonAPI.follow(followed, follower)
       {:ok, _endorsement} = User.endorse(follower, followed)
 
       assert User.endorses?(follower, followed)
@@ -1455,7 +1455,7 @@ defmodule Pleroma.Web.CommonAPITest do
       follower = insert(:user)
       followed = insert(:user, is_locked: true)
 
-      assert {:ok, follower, followed, %{id: activity_id, data: %{"state" => "pending"}}} =
+      assert {:ok, followed, follower, %{id: activity_id, data: %{"state" => "pending"}}} =
                CommonAPI.follow(followed, follower)
 
       assert User.get_follow_state(follower, followed) == :follow_pending
@@ -1477,7 +1477,7 @@ defmodule Pleroma.Web.CommonAPITest do
       follower = insert(:user)
       followed = insert(:user, is_locked: true, local: false)
 
-      assert {:ok, follower, followed, %{id: activity_id, data: %{"state" => "pending"}}} =
+      assert {:ok, followed, follower, %{id: activity_id, data: %{"state" => "pending"}}} =
                CommonAPI.follow(followed, follower)
 
       assert User.get_follow_state(follower, followed) == :follow_pending
diff --git a/test/pleroma/web/mastodon_api/views/account_view_test.exs b/test/pleroma/web/mastodon_api/views/account_view_test.exs
index f0711fa0d..dca64853d 100644
--- a/test/pleroma/web/mastodon_api/views/account_view_test.exs
+++ b/test/pleroma/web/mastodon_api/views/account_view_test.exs
@@ -493,7 +493,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
       user = insert(:user)
       other_user = insert(:user, is_locked: true)
 
-      {:ok, user, other_user, _} = CommonAPI.follow(other_user, user)
+      {:ok, other_user, user, _} = CommonAPI.follow(other_user, user)
       user = User.get_cached_by_id(user.id)
       other_user = User.get_cached_by_id(other_user.id)
 
@@ -560,8 +560,8 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
     test "shows when follows/followers are hidden" do
       user = insert(:user, hide_followers: true, hide_follows: true)
       other_user = insert(:user)
-      {:ok, user, other_user, _activity} = CommonAPI.follow(other_user, user)
-      {:ok, _other_user, user, _activity} = CommonAPI.follow(user, other_user)
+      {:ok, other_user, user, _activity} = CommonAPI.follow(other_user, user)
+      {:ok, user, _other_user, _activity} = CommonAPI.follow(user, other_user)
 
       assert %{
                followers_count: 1,
@@ -573,11 +573,11 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
     test "shows actual follower/following count to the account owner" do
       user = insert(:user, hide_followers: true, hide_follows: true)
       other_user = insert(:user)
-      {:ok, user, other_user, _activity} = CommonAPI.follow(other_user, user)
+      {:ok, other_user, user, _activity} = CommonAPI.follow(other_user, user)
 
       assert User.following?(user, other_user)
       assert Pleroma.FollowingRelationship.follower_count(other_user) == 1
-      {:ok, _other_user, user, _activity} = CommonAPI.follow(user, other_user)
+      {:ok, user, _other_user, _activity} = CommonAPI.follow(user, other_user)
 
       assert %{
                followers_count: 1,
@@ -696,7 +696,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
       assert %{locked: true} = AccountView.render("show.json", %{user: user, for: user})
 
       other_user = insert(:user)
-      {:ok, _other_user, user, _activity} = CommonAPI.follow(user, other_user)
+      {:ok, user, _other_user, _activity} = CommonAPI.follow(user, other_user)
 
       assert %{locked: true, follow_requests_count: 1} =
                AccountView.render("show.json", %{user: user, for: user})
@@ -708,7 +708,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
       assert %{locked: true} = AccountView.render("show.json", %{user: user, for: user})
 
       other_user = insert(:user)
-      {:ok, other_user, user, _activity} = CommonAPI.follow(user, other_user)
+      {:ok, user, other_user, _activity} = CommonAPI.follow(user, other_user)
 
       assert %{locked: true, follow_requests_count: 1} =
                AccountView.render("show.json", %{user: user, for: user})
@@ -725,7 +725,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
       assert %{locked: true} = AccountView.render("show.json", %{user: user, for: user})
 
       other_user = insert(:user)
-      {:ok, other_user, user, _activity} = CommonAPI.follow(user, other_user)
+      {:ok, user, other_user, _activity} = CommonAPI.follow(user, other_user)
 
       assert %{locked: true, follow_requests_count: 1} =
                AccountView.render("show.json", %{user: user, for: user})
@@ -742,7 +742,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
       assert %{locked: true} = AccountView.render("show.json", %{user: user, for: user})
 
       other_user = insert(:user)
-      {:ok, _other_user, user, _activity} = CommonAPI.follow(user, other_user)
+      {:ok, user, _other_user, _activity} = CommonAPI.follow(user, other_user)
 
       {:ok, user} = User.update_and_set_cache(user, %{is_locked: false})
 
diff --git a/test/pleroma/web/mastodon_api/views/notification_view_test.exs b/test/pleroma/web/mastodon_api/views/notification_view_test.exs
index fae672871..75ab375aa 100644
--- a/test/pleroma/web/mastodon_api/views/notification_view_test.exs
+++ b/test/pleroma/web/mastodon_api/views/notification_view_test.exs
@@ -132,7 +132,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationViewTest do
   test "Follow notification" do
     follower = insert(:user)
     followed = insert(:user)
-    {:ok, follower, followed, _activity} = CommonAPI.follow(followed, follower)
+    {:ok, followed, follower, _activity} = CommonAPI.follow(followed, follower)
     notification = Notification |> Repo.one() |> Repo.preload(:activity)
 
     expected = %{
diff --git a/test/pleroma/web/views/streamer_view_test.ex b/test/pleroma/web/views/streamer_view_test.ex
index 43a17a43e..b1c5f52ab 100644
--- a/test/pleroma/web/views/streamer_view_test.ex
+++ b/test/pleroma/web/views/streamer_view_test.ex
@@ -17,7 +17,7 @@ defmodule Pleroma.Web.StreamerViewTest do
       follower = insert(:user)
 
       {:ok, _, _, _} = CommonAPI.follow(other_user, following)
-      {:ok, follower, following, _activity} = CommonAPI.follow(following, follower)
+      {:ok, following, follower, _activity} = CommonAPI.follow(following, follower)
 
       result =
         StreamerView.render(
@@ -46,7 +46,7 @@ defmodule Pleroma.Web.StreamerViewTest do
         follower = insert(:user)
 
         {:ok, _, _, _} = CommonAPI.follow(other_user, following)
-        {:ok, follower, following, _activity} = CommonAPI.follow(following, follower)
+        {:ok, following, follower, _activity} = CommonAPI.follow(following, follower)
 
         result =
           StreamerView.render(
@@ -76,7 +76,7 @@ defmodule Pleroma.Web.StreamerViewTest do
         follower = insert(:user)
 
         {:ok, _, _, _} = CommonAPI.follow(other_user, following)
-        {:ok, follower, following, _activity} = CommonAPI.follow(following, follower)
+        {:ok, following, follower, _activity} = CommonAPI.follow(following, follower)
 
         result =
           StreamerView.render(
-- 
cgit v1.2.3


From 721005b3126e0920ab861fcc83195f160b0ee9a0 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Wed, 7 Aug 2024 13:00:31 -0400
Subject: Fix WebPush notifications not generating jobs

Dialyzer pointed this one out.

The WorkerHelper removal in !4166 was missing this Oban.insert() and tests were not noticing any problems because we mocked the Push.send function instead of executing it and checking for the Oban job.
---
 test/pleroma/web/activity_pub/side_effects_test.exs | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'test')

diff --git a/test/pleroma/web/activity_pub/side_effects_test.exs b/test/pleroma/web/activity_pub/side_effects_test.exs
index 68922e536..4a18cab68 100644
--- a/test/pleroma/web/activity_pub/side_effects_test.exs
+++ b/test/pleroma/web/activity_pub/side_effects_test.exs
@@ -54,20 +54,17 @@ defmodule Pleroma.Web.ActivityPub.SideEffectsTest do
           [
             stream: fn _, _ -> nil end
           ]
-        },
-        {
-          Pleroma.Web.Push,
-          [],
-          [
-            send: fn _ -> nil end
-          ]
         }
       ]) do
         SideEffects.handle_after_transaction(meta)
 
         assert called(Pleroma.Web.Streamer.stream(["user", "user:notification"], notification))
         assert called(Pleroma.Web.Streamer.stream(["user", "user:pleroma_chat"], :_))
-        assert called(Pleroma.Web.Push.send(notification))
+
+        assert_enqueued(
+          worker: "Pleroma.Workers.WebPusherWorker",
+          args: %{"notification_id" => notification.id, "op" => "web_push"}
+        )
       end
     end
   end
-- 
cgit v1.2.3


From 253178538410c63be6bd14016b800b42df59bfb6 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Wed, 7 Aug 2024 13:07:54 -0400
Subject: Do not allow committing tests with a .ex extension

---
 test/pleroma/web/views/streamer_view_test.ex  | 100 --------------------------
 test/pleroma/web/views/streamer_view_test.exs | 100 ++++++++++++++++++++++++++
 2 files changed, 100 insertions(+), 100 deletions(-)
 delete mode 100644 test/pleroma/web/views/streamer_view_test.ex
 create mode 100644 test/pleroma/web/views/streamer_view_test.exs

(limited to 'test')

diff --git a/test/pleroma/web/views/streamer_view_test.ex b/test/pleroma/web/views/streamer_view_test.ex
deleted file mode 100644
index 43a17a43e..000000000
--- a/test/pleroma/web/views/streamer_view_test.ex
+++ /dev/null
@@ -1,100 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Web.StreamerViewTest do
-  use Pleroma.Web.ConnCase, async: true
-  # import ExUnit.CaptureLog
-  import Pleroma.Factory
-
-  alias Pleroma.Web.CommonAPI
-  alias Pleroma.Web.StreamerView
-
-  describe "follow_relationships_update.json" do
-    test "shows follower/following count normally" do
-      other_user = insert(:user)
-      %{id: following_id} = following = insert(:user)
-      follower = insert(:user)
-
-      {:ok, _, _, _} = CommonAPI.follow(other_user, following)
-      {:ok, follower, following, _activity} = CommonAPI.follow(following, follower)
-
-      result =
-        StreamerView.render(
-          "follow_relationships_update.json",
-          %{follower: follower, following: following, state: :test},
-          "user:test"
-        )
-
-      {:ok, %{"payload" => payload}} = Jason.decode(result)
-
-      {:ok, decoded_payload} = Jason.decode(payload)
-
-      # check the payload updating the user that was followed
-      assert match?(
-               %{"follower_count" => 1, "following_count" => 1, "id" => ^following_id},
-               decoded_payload["following"]
-             )
-    end
-
-    test "hides follower count for :hide_followers and :hide_followers_count" do
-      user_attrs = [%{hide_followers: true}, %{hide_followers_count: true}]
-
-      Enum.each(user_attrs, fn attrs ->
-        other_user = insert(:user)
-        %{id: following_id} = following = insert(:user, attrs)
-        follower = insert(:user)
-
-        {:ok, _, _, _} = CommonAPI.follow(other_user, following)
-        {:ok, follower, following, _activity} = CommonAPI.follow(following, follower)
-
-        result =
-          StreamerView.render(
-            "follow_relationships_update.json",
-            %{follower: follower, following: following, state: :test},
-            "user:test"
-          )
-
-        {:ok, %{"payload" => payload}} = Jason.decode(result)
-
-        {:ok, decoded_payload} = Jason.decode(payload)
-
-        # check the payload updating the user that was followed
-        assert match?(
-                 %{"follower_count" => 0, "following_count" => 1, "id" => ^following_id},
-                 decoded_payload["following"]
-               )
-      end)
-    end
-
-    test "hides follows count for :hide_follows and :hide_follows_count" do
-      user_attrs = [%{hide_follows: true}, %{hide_follows_count: true}]
-
-      Enum.each(user_attrs, fn attrs ->
-        other_user = insert(:user)
-        %{id: following_id} = following = insert(:user, attrs)
-        follower = insert(:user)
-
-        {:ok, _, _, _} = CommonAPI.follow(other_user, following)
-        {:ok, follower, following, _activity} = CommonAPI.follow(following, follower)
-
-        result =
-          StreamerView.render(
-            "follow_relationships_update.json",
-            %{follower: follower, following: following, state: :test},
-            "user:test"
-          )
-
-        {:ok, %{"payload" => payload}} = Jason.decode(result)
-
-        {:ok, decoded_payload} = Jason.decode(payload)
-
-        # check the payload updating the user that was followed
-        assert match?(
-                 %{"follower_count" => 1, "following_count" => 0, "id" => ^following_id},
-                 decoded_payload["following"]
-               )
-      end)
-    end
-  end
-end
diff --git a/test/pleroma/web/views/streamer_view_test.exs b/test/pleroma/web/views/streamer_view_test.exs
new file mode 100644
index 000000000..b1c5f52ab
--- /dev/null
+++ b/test/pleroma/web/views/streamer_view_test.exs
@@ -0,0 +1,100 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Web.StreamerViewTest do
+  use Pleroma.Web.ConnCase, async: true
+  # import ExUnit.CaptureLog
+  import Pleroma.Factory
+
+  alias Pleroma.Web.CommonAPI
+  alias Pleroma.Web.StreamerView
+
+  describe "follow_relationships_update.json" do
+    test "shows follower/following count normally" do
+      other_user = insert(:user)
+      %{id: following_id} = following = insert(:user)
+      follower = insert(:user)
+
+      {:ok, _, _, _} = CommonAPI.follow(other_user, following)
+      {:ok, following, follower, _activity} = CommonAPI.follow(following, follower)
+
+      result =
+        StreamerView.render(
+          "follow_relationships_update.json",
+          %{follower: follower, following: following, state: :test},
+          "user:test"
+        )
+
+      {:ok, %{"payload" => payload}} = Jason.decode(result)
+
+      {:ok, decoded_payload} = Jason.decode(payload)
+
+      # check the payload updating the user that was followed
+      assert match?(
+               %{"follower_count" => 1, "following_count" => 1, "id" => ^following_id},
+               decoded_payload["following"]
+             )
+    end
+
+    test "hides follower count for :hide_followers and :hide_followers_count" do
+      user_attrs = [%{hide_followers: true}, %{hide_followers_count: true}]
+
+      Enum.each(user_attrs, fn attrs ->
+        other_user = insert(:user)
+        %{id: following_id} = following = insert(:user, attrs)
+        follower = insert(:user)
+
+        {:ok, _, _, _} = CommonAPI.follow(other_user, following)
+        {:ok, following, follower, _activity} = CommonAPI.follow(following, follower)
+
+        result =
+          StreamerView.render(
+            "follow_relationships_update.json",
+            %{follower: follower, following: following, state: :test},
+            "user:test"
+          )
+
+        {:ok, %{"payload" => payload}} = Jason.decode(result)
+
+        {:ok, decoded_payload} = Jason.decode(payload)
+
+        # check the payload updating the user that was followed
+        assert match?(
+                 %{"follower_count" => 0, "following_count" => 1, "id" => ^following_id},
+                 decoded_payload["following"]
+               )
+      end)
+    end
+
+    test "hides follows count for :hide_follows and :hide_follows_count" do
+      user_attrs = [%{hide_follows: true}, %{hide_follows_count: true}]
+
+      Enum.each(user_attrs, fn attrs ->
+        other_user = insert(:user)
+        %{id: following_id} = following = insert(:user, attrs)
+        follower = insert(:user)
+
+        {:ok, _, _, _} = CommonAPI.follow(other_user, following)
+        {:ok, following, follower, _activity} = CommonAPI.follow(following, follower)
+
+        result =
+          StreamerView.render(
+            "follow_relationships_update.json",
+            %{follower: follower, following: following, state: :test},
+            "user:test"
+          )
+
+        {:ok, %{"payload" => payload}} = Jason.decode(result)
+
+        {:ok, decoded_payload} = Jason.decode(payload)
+
+        # check the payload updating the user that was followed
+        assert match?(
+                 %{"follower_count" => 1, "following_count" => 0, "id" => ^following_id},
+                 decoded_payload["following"]
+               )
+      end)
+    end
+  end
+end
-- 
cgit v1.2.3


From d2d07bfe4b9f1567c205a736e6e81e02d13598c1 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Wed, 7 Aug 2024 14:04:20 -0400
Subject: Add test for Follow objects with a cc

---
 .../activity_pub/object_validators/follow_validation_test.exs  | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'test')

diff --git a/test/pleroma/web/activity_pub/object_validators/follow_validation_test.exs b/test/pleroma/web/activity_pub/object_validators/follow_validation_test.exs
index 371368e0e..e684042a1 100644
--- a/test/pleroma/web/activity_pub/object_validators/follow_validation_test.exs
+++ b/test/pleroma/web/activity_pub/object_validators/follow_validation_test.exs
@@ -22,5 +22,15 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.FollowValidationTest do
     test "validates a basic follow object", %{valid_follow: valid_follow} do
       assert {:ok, _follow, []} = ObjectValidator.validate(valid_follow, [])
     end
+
+    test "supports a nil cc", %{valid_follow: valid_follow} do
+      valid_follow_with_nil_cc = Map.put(valid_follow, "cc", nil)
+      assert {:ok, _follow, []} = ObjectValidator.validate(valid_follow_with_nil_cc, [])
+    end
+
+    test "supports an empty cc", %{valid_follow: valid_follow} do
+      valid_follow_with_nil_cc = Map.put(valid_follow, "cc", [])
+      assert {:ok, _follow, []} = ObjectValidator.validate(valid_follow_with_nil_cc, [])
+    end
   end
 end
-- 
cgit v1.2.3


From fcda1b5e2aeb166dfd84ff17d1840fcfbd6f1490 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Wed, 7 Aug 2024 14:46:39 -0400
Subject: Improve variable name

---
 .../web/activity_pub/object_validators/follow_validation_test.exs     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'test')

diff --git a/test/pleroma/web/activity_pub/object_validators/follow_validation_test.exs b/test/pleroma/web/activity_pub/object_validators/follow_validation_test.exs
index e684042a1..acf6e8d8f 100644
--- a/test/pleroma/web/activity_pub/object_validators/follow_validation_test.exs
+++ b/test/pleroma/web/activity_pub/object_validators/follow_validation_test.exs
@@ -29,8 +29,8 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.FollowValidationTest do
     end
 
     test "supports an empty cc", %{valid_follow: valid_follow} do
-      valid_follow_with_nil_cc = Map.put(valid_follow, "cc", [])
-      assert {:ok, _follow, []} = ObjectValidator.validate(valid_follow_with_nil_cc, [])
+      valid_follow_with_empty_cc = Map.put(valid_follow, "cc", [])
+      assert {:ok, _follow, []} = ObjectValidator.validate(valid_follow_with_empty_cc, [])
     end
   end
 end
-- 
cgit v1.2.3


From a0af6cba09f6c85f524d31f7d1a68948b77d9e53 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Thu, 8 Aug 2024 14:12:44 -0400
Subject: Added MRF.QuietReply which prevents replies to public posts from
 being published to the timelines

---
 .../web/activity_pub/mrf/quiet_reply_test.exs      | 103 +++++++++++++++++++++
 test/support/factory.ex                            |  16 ++--
 2 files changed, 113 insertions(+), 6 deletions(-)
 create mode 100644 test/pleroma/web/activity_pub/mrf/quiet_reply_test.exs

(limited to 'test')

diff --git a/test/pleroma/web/activity_pub/mrf/quiet_reply_test.exs b/test/pleroma/web/activity_pub/mrf/quiet_reply_test.exs
new file mode 100644
index 000000000..e2b3ce439
--- /dev/null
+++ b/test/pleroma/web/activity_pub/mrf/quiet_reply_test.exs
@@ -0,0 +1,103 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Web.ActivityPub.MRF.QuietReplyTest do
+  use Pleroma.DataCase
+  import Pleroma.Factory
+
+  require Pleroma.Constants
+
+  alias Pleroma.Object
+  alias Pleroma.Web.ActivityPub.MRF.QuietReply
+  alias Pleroma.Web.CommonAPI
+
+  test "replying to public post is forced to be quiet" do
+    batman = insert(:user, nickname: "batman")
+    robin = insert(:user, nickname: "robin")
+
+    {:ok, post} = CommonAPI.post(batman, %{status: "To the Batmobile!"})
+
+    reply = %{
+      "type" => "Create",
+      "actor" => robin.ap_id,
+      "object" => %{
+        "type" => "Note",
+        "actor" => robin.ap_id,
+        "content" => "@batman Wait up, I forgot my spandex!",
+        "to" => [
+          batman.ap_id,
+          Pleroma.Constants.as_public()
+        ],
+        "cc" => [robin.follower_address],
+        "inReplyTo" => Object.normalize(post).data["id"]
+      }
+    }
+
+    expected_to = [batman.ap_id, robin.follower_address]
+    expected_cc = [Pleroma.Constants.as_public()]
+
+    assert {:ok, filtered} = QuietReply.filter(reply)
+
+    assert expected_to == filtered["object"]["to"]
+    assert expected_cc == filtered["object"]["cc"]
+  end
+
+  test "replying direct is unmodified" do
+    batman = insert(:user, nickname: "batman")
+    robin = insert(:user, nickname: "robin")
+
+    {:ok, post} = CommonAPI.post(batman, %{status: "To the Batmobile!"})
+
+    reply = %{
+      "type" => "Create",
+      "actor" => robin.ap_id,
+      "object" => %{
+        "type" => "Note",
+        "actor" => robin.ap_id,
+        "content" => "@batman Wait up, I forgot my spandex!",
+        "to" => [batman.ap_id],
+        "cc" => [],
+        "inReplyTo" => Object.normalize(post).data["id"]
+      }
+    }
+
+    assert {:ok, filtered} = QuietReply.filter(reply)
+
+    assert match?(^filtered, reply)
+  end
+
+  test "replying followers-only is unmodified" do
+    batman = insert(:user, nickname: "batman")
+    robin = insert(:user, nickname: "robin")
+
+    {:ok, post} = CommonAPI.post(batman, %{status: "To the Batmobile!"})
+
+    reply = %{
+      "type" => "Create",
+      "actor" => robin.ap_id,
+      "object" => %{
+        "type" => "Note",
+        "actor" => robin.ap_id,
+        "content" => "@batman Wait up, I forgot my spandex!",
+        "to" => [batman.ap_id, robin.follower_address],
+        "cc" => [],
+        "inReplyTo" => Object.normalize(post).data["id"]
+      }
+    }
+
+    assert {:ok, filtered} = QuietReply.filter(reply)
+
+    assert match?(^filtered, reply)
+  end
+
+  test "non-reply posts are unmodified" do
+    batman = insert(:user, nickname: "batman")
+
+    {:ok, post} = CommonAPI.post(batman, %{status: "To the Batmobile!"})
+
+    assert {:ok, filtered} = QuietReply.filter(post)
+
+    assert match?(^filtered, post)
+  end
+end
diff --git a/test/support/factory.ex b/test/support/factory.ex
index fb26f4162..64669fdf1 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -53,6 +53,15 @@ defmodule Pleroma.Factory do
       keys: pem
     }
 
+    attrs = Map.delete(attrs, :domain)
+
+    user
+    |> Map.put(:raw_bio, user.bio)
+    |> merge_attributes(attrs)
+    |> user_urls(attrs)
+  end
+
+  defp user_urls(user, attrs) do
     urls =
       if attrs[:local] == false do
         base_domain = attrs[:domain] || Enum.random(["domain1.com", "domain2.com", "domain3.com"])
@@ -75,12 +84,7 @@ defmodule Pleroma.Factory do
         }
       end
 
-    attrs = Map.delete(attrs, :domain)
-
-    user
-    |> Map.put(:raw_bio, user.bio)
-    |> Map.merge(urls)
-    |> merge_attributes(attrs)
+    Map.merge(user, urls)
   end
 
   def user_relationship_factory(attrs \\ %{}) do
-- 
cgit v1.2.3


From d6cc6aff9b617a50679fe99d1533d2b3d118b656 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Thu, 8 Aug 2024 14:22:25 -0400
Subject: Unintended commit

---
 test/support/factory.ex | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'test')

diff --git a/test/support/factory.ex b/test/support/factory.ex
index 64669fdf1..fb26f4162 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -53,15 +53,6 @@ defmodule Pleroma.Factory do
       keys: pem
     }
 
-    attrs = Map.delete(attrs, :domain)
-
-    user
-    |> Map.put(:raw_bio, user.bio)
-    |> merge_attributes(attrs)
-    |> user_urls(attrs)
-  end
-
-  defp user_urls(user, attrs) do
     urls =
       if attrs[:local] == false do
         base_domain = attrs[:domain] || Enum.random(["domain1.com", "domain2.com", "domain3.com"])
@@ -84,7 +75,12 @@ defmodule Pleroma.Factory do
         }
       end
 
-    Map.merge(user, urls)
+    attrs = Map.delete(attrs, :domain)
+
+    user
+    |> Map.put(:raw_bio, user.bio)
+    |> Map.merge(urls)
+    |> merge_attributes(attrs)
   end
 
   def user_relationship_factory(attrs \\ %{}) do
-- 
cgit v1.2.3


From 5a134a46f7a59eba131c9e484d49e09394e341a8 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Thu, 8 Aug 2024 15:23:59 -0400
Subject: We must change to/cc in the activity and inner object

---
 test/pleroma/web/activity_pub/mrf/quiet_reply_test.exs | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'test')

diff --git a/test/pleroma/web/activity_pub/mrf/quiet_reply_test.exs b/test/pleroma/web/activity_pub/mrf/quiet_reply_test.exs
index e2b3ce439..35e321fd1 100644
--- a/test/pleroma/web/activity_pub/mrf/quiet_reply_test.exs
+++ b/test/pleroma/web/activity_pub/mrf/quiet_reply_test.exs
@@ -21,6 +21,11 @@ defmodule Pleroma.Web.ActivityPub.MRF.QuietReplyTest do
     reply = %{
       "type" => "Create",
       "actor" => robin.ap_id,
+      "to" => [
+        batman.ap_id,
+        Pleroma.Constants.as_public()
+      ],
+      "cc" => [robin.follower_address],
       "object" => %{
         "type" => "Note",
         "actor" => robin.ap_id,
@@ -39,6 +44,8 @@ defmodule Pleroma.Web.ActivityPub.MRF.QuietReplyTest do
 
     assert {:ok, filtered} = QuietReply.filter(reply)
 
+    assert expected_to == filtered["to"]
+    assert expected_cc == filtered["cc"]
     assert expected_to == filtered["object"]["to"]
     assert expected_cc == filtered["object"]["cc"]
   end
@@ -52,6 +59,8 @@ defmodule Pleroma.Web.ActivityPub.MRF.QuietReplyTest do
     reply = %{
       "type" => "Create",
       "actor" => robin.ap_id,
+      "to" => [batman.ap_id],
+      "cc" => [],
       "object" => %{
         "type" => "Note",
         "actor" => robin.ap_id,
@@ -76,6 +85,8 @@ defmodule Pleroma.Web.ActivityPub.MRF.QuietReplyTest do
     reply = %{
       "type" => "Create",
       "actor" => robin.ap_id,
+      "to" => [batman.ap_id, robin.follower_address],
+      "cc" => [],
       "object" => %{
         "type" => "Note",
         "actor" => robin.ap_id,
-- 
cgit v1.2.3


From 6e53e94bdab91044ffa24e9d6585fdde1727b0f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Mon, 12 Aug 2024 12:23:38 +0200
Subject: Remove stub for /api/v1/accounts/:id/identity_proofs (deprecated by
 Mastodon 3.5.0)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 test/pleroma/web/mastodon_api/mastodon_api_controller_test.exs | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'test')

diff --git a/test/pleroma/web/mastodon_api/mastodon_api_controller_test.exs b/test/pleroma/web/mastodon_api/mastodon_api_controller_test.exs
index 622c5e3d5..8e7fe4013 100644
--- a/test/pleroma/web/mastodon_api/mastodon_api_controller_test.exs
+++ b/test/pleroma/web/mastodon_api/mastodon_api_controller_test.exs
@@ -6,15 +6,6 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
   use Pleroma.Web.ConnCase, async: true
 
   describe "empty_array/2 (stubs)" do
-    test "GET /api/v1/accounts/:id/identity_proofs" do
-      %{user: user, conn: conn} = oauth_access(["read:accounts"])
-
-      assert [] ==
-               conn
-               |> get("/api/v1/accounts/#{user.id}/identity_proofs")
-               |> json_response(200)
-    end
-
     test "GET /api/v1/endorsements" do
       %{conn: conn} = oauth_access(["read:accounts"])
 
-- 
cgit v1.2.3


From 29f7ab71169482a68c24729c6cf7607d43d8224d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Mon, 12 Aug 2024 12:25:12 +0200
Subject: Update test as /api/v1/endorsements is not a stub
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 test/pleroma/web/mastodon_api/mastodon_api_controller_test.exs | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'test')

diff --git a/test/pleroma/web/mastodon_api/mastodon_api_controller_test.exs b/test/pleroma/web/mastodon_api/mastodon_api_controller_test.exs
index 8e7fe4013..97ae3d37b 100644
--- a/test/pleroma/web/mastodon_api/mastodon_api_controller_test.exs
+++ b/test/pleroma/web/mastodon_api/mastodon_api_controller_test.exs
@@ -6,15 +6,6 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
   use Pleroma.Web.ConnCase, async: true
 
   describe "empty_array/2 (stubs)" do
-    test "GET /api/v1/endorsements" do
-      %{conn: conn} = oauth_access(["read:accounts"])
-
-      assert [] ==
-               conn
-               |> get("/api/v1/endorsements")
-               |> json_response(200)
-    end
-
     test "GET /api/v1/trends", %{conn: conn} do
       assert [] ==
                conn
-- 
cgit v1.2.3


From b76dfd8146116320cbbc00d39f29c7232f5dcfab Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Mon, 12 Aug 2024 15:36:01 -0400
Subject: Revert accidental removal of test unrelated to identity proofs

---
 test/pleroma/web/mastodon_api/mastodon_api_controller_test.exs | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'test')

diff --git a/test/pleroma/web/mastodon_api/mastodon_api_controller_test.exs b/test/pleroma/web/mastodon_api/mastodon_api_controller_test.exs
index 97ae3d37b..8e7fe4013 100644
--- a/test/pleroma/web/mastodon_api/mastodon_api_controller_test.exs
+++ b/test/pleroma/web/mastodon_api/mastodon_api_controller_test.exs
@@ -6,6 +6,15 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
   use Pleroma.Web.ConnCase, async: true
 
   describe "empty_array/2 (stubs)" do
+    test "GET /api/v1/endorsements" do
+      %{conn: conn} = oauth_access(["read:accounts"])
+
+      assert [] ==
+               conn
+               |> get("/api/v1/endorsements")
+               |> json_response(200)
+    end
+
     test "GET /api/v1/trends", %{conn: conn} do
       assert [] ==
                conn
-- 
cgit v1.2.3


From 488c4b8b983f99d036e3f3bf67dec782f9959319 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Fri, 15 Mar 2024 15:10:45 -0400
Subject: MRF.FODirectReply

Force replies to followers-only posts to always be direct
---
 .../web/activity_pub/mrf/fo_direct_reply_test.exs  | 87 ++++++++++++++++++++++
 1 file changed, 87 insertions(+)
 create mode 100644 test/pleroma/web/activity_pub/mrf/fo_direct_reply_test.exs

(limited to 'test')

diff --git a/test/pleroma/web/activity_pub/mrf/fo_direct_reply_test.exs b/test/pleroma/web/activity_pub/mrf/fo_direct_reply_test.exs
new file mode 100644
index 000000000..7afc83ffc
--- /dev/null
+++ b/test/pleroma/web/activity_pub/mrf/fo_direct_reply_test.exs
@@ -0,0 +1,87 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Web.ActivityPub.MRF.FODirectReplyTest do
+  use Pleroma.DataCase
+  import Pleroma.Factory
+
+  require Pleroma.Constants
+
+  alias Pleroma.Object
+  alias Pleroma.Web.ActivityPub.MRF.FODirectReply
+  alias Pleroma.Web.CommonAPI
+
+  test "replying to followers-only/private is changed to direct" do
+    batman = insert(:user, nickname: "batman")
+    robin = insert(:user, nickname: "robin")
+
+    {:ok, post} =
+      CommonAPI.post(batman, %{
+        status: "Has anyone seen Selina Kyle's latest selfies?",
+        visibility: "private"
+      })
+
+    reply = %{
+      "type" => "Create",
+      "actor" => robin.ap_id,
+      "to" => [batman.ap_id, robin.follower_address],
+      "cc" => [],
+      "object" => %{
+        "type" => "Note",
+        "actor" => robin.ap_id,
+        "content" => "@batman 🤤 ❤️ 🐈‍⬛",
+        "to" => [batman.ap_id, robin.follower_address],
+        "cc" => [],
+        "inReplyTo" => Object.normalize(post).data["id"]
+      }
+    }
+
+    expected_to = [batman.ap_id]
+    expected_cc = []
+
+    assert {:ok, filtered} = FODirectReply.filter(reply)
+
+    assert expected_to == filtered["to"]
+    assert expected_cc == filtered["cc"]
+    assert expected_to == filtered["object"]["to"]
+    assert expected_cc == filtered["object"]["cc"]
+  end
+
+  test "replies to public posts are unmodified" do
+    batman = insert(:user, nickname: "batman")
+    robin = insert(:user, nickname: "robin")
+
+    {:ok, post} =
+      CommonAPI.post(batman, %{status: "Has anyone seen Selina Kyle's latest selfies?"})
+
+    reply = %{
+      "type" => "Create",
+      "actor" => robin.ap_id,
+      "to" => [batman.ap_id, robin.follower_address],
+      "cc" => [],
+      "object" => %{
+        "type" => "Note",
+        "actor" => robin.ap_id,
+        "content" => "@batman 🤤 ❤️ 🐈<200d>⬛",
+        "to" => [batman.ap_id, robin.follower_address],
+        "cc" => [],
+        "inReplyTo" => Object.normalize(post).data["id"]
+      }
+    }
+
+    assert {:ok, filtered} = FODirectReply.filter(reply)
+
+    assert match?(^filtered, reply)
+  end
+
+  test "non-reply posts are unmodified" do
+    batman = insert(:user, nickname: "batman")
+
+    {:ok, post} = CommonAPI.post(batman, %{status: "To the Batmobile!"})
+
+    assert {:ok, filtered} = FODirectReply.filter(post)
+
+    assert match?(^filtered, post)
+  end
+end
-- 
cgit v1.2.3


From c0ca7a4ecab76607227221fa96df1ccb9313131e Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Thu, 8 Aug 2024 14:41:28 -0400
Subject: User Factory: include the nickname in the generated URLs

---
 test/support/factory.ex | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

(limited to 'test')

diff --git a/test/support/factory.ex b/test/support/factory.ex
index fb26f4162..8f1c6faf9 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -53,6 +53,13 @@ defmodule Pleroma.Factory do
       keys: pem
     }
 
+    user
+    |> Map.put(:raw_bio, user.bio)
+    |> merge_attributes(Map.delete(attrs, :domain))
+    |> make_user_urls(attrs)
+  end
+
+  defp make_user_urls(user, attrs) do
     urls =
       if attrs[:local] == false do
         base_domain = attrs[:domain] || Enum.random(["domain1.com", "domain2.com", "domain3.com"])
@@ -60,27 +67,22 @@ defmodule Pleroma.Factory do
         ap_id = "https://#{base_domain}/users/#{user.nickname}"
 
         %{
-          ap_id: ap_id,
-          follower_address: ap_id <> "/followers",
-          following_address: ap_id <> "/following",
-          featured_address: ap_id <> "/collections/featured",
-          inbox: "https://#{base_domain}/inbox"
+          ap_id: attrs[:ap_id] || ap_id,
+          follower_address: attrs[:follower_address] || ap_id <> "/followers",
+          following_address: attrs[:following_address] || ap_id <> "/following",
+          featured_address: attrs[:featured_address] || ap_id <> "/collections/featured",
+          inbox: attrs[:inbox] || "https://#{base_domain}/inbox"
         }
       else
         %{
-          ap_id: User.ap_id(user),
-          follower_address: User.ap_followers(user),
-          following_address: User.ap_following(user),
-          featured_address: User.ap_featured_collection(user)
+          ap_id: attrs[:ap_id] || User.ap_id(user),
+          follower_address: attrs[:follower_address] || User.ap_followers(user),
+          following_address: attrs[:following_address] || User.ap_following(user),
+          featured_address: attrs[:featured_address] || User.ap_featured_collection(user)
         }
       end
 
-    attrs = Map.delete(attrs, :domain)
-
-    user
-    |> Map.put(:raw_bio, user.bio)
-    |> Map.merge(urls)
-    |> merge_attributes(attrs)
+    Map.merge(user, urls)
   end
 
   def user_relationship_factory(attrs \\ %{}) do
-- 
cgit v1.2.3


From 8c978727c210da8558b15ee515b3b8824ff3a912 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Mon, 12 Aug 2024 20:10:09 -0400
Subject: MRF.QuietReply: add test for replies to unlisted posts

---
 .../web/activity_pub/mrf/quiet_reply_test.exs      | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'test')

diff --git a/test/pleroma/web/activity_pub/mrf/quiet_reply_test.exs b/test/pleroma/web/activity_pub/mrf/quiet_reply_test.exs
index 35e321fd1..79e64d650 100644
--- a/test/pleroma/web/activity_pub/mrf/quiet_reply_test.exs
+++ b/test/pleroma/web/activity_pub/mrf/quiet_reply_test.exs
@@ -50,6 +50,32 @@ defmodule Pleroma.Web.ActivityPub.MRF.QuietReplyTest do
     assert expected_cc == filtered["object"]["cc"]
   end
 
+  test "replying to unlisted post is unmodified" do
+    batman = insert(:user, nickname: "batman")
+    robin = insert(:user, nickname: "robin")
+
+    {:ok, post} = CommonAPI.post(batman, %{status: "To the Batmobile!", visibility: "private"})
+
+    reply = %{
+      "type" => "Create",
+      "actor" => robin.ap_id,
+      "to" => [batman.ap_id],
+      "cc" => [],
+      "object" => %{
+        "type" => "Note",
+        "actor" => robin.ap_id,
+        "content" => "@batman Wait up, I forgot my spandex!",
+        "to" => [batman.ap_id],
+        "cc" => [],
+        "inReplyTo" => Object.normalize(post).data["id"]
+      }
+    }
+
+    assert {:ok, filtered} = QuietReply.filter(reply)
+
+    assert match?(^filtered, reply)
+  end
+
   test "replying direct is unmodified" do
     batman = insert(:user, nickname: "batman")
     robin = insert(:user, nickname: "robin")
-- 
cgit v1.2.3


From b0c64945c2cfd622b9f2c68d594bda4fd4c1b9eb Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Mon, 12 Aug 2024 20:17:35 -0400
Subject: MRF.FODirectReply: use Visibility module to verify the scope

---
 .../web/activity_pub/mrf/fo_direct_reply_test.exs  | 30 ++++++++++++++++++++++
 1 file changed, 30 insertions(+)

(limited to 'test')

diff --git a/test/pleroma/web/activity_pub/mrf/fo_direct_reply_test.exs b/test/pleroma/web/activity_pub/mrf/fo_direct_reply_test.exs
index 7afc83ffc..2d6af3b68 100644
--- a/test/pleroma/web/activity_pub/mrf/fo_direct_reply_test.exs
+++ b/test/pleroma/web/activity_pub/mrf/fo_direct_reply_test.exs
@@ -48,6 +48,36 @@ defmodule Pleroma.Web.ActivityPub.MRF.FODirectReplyTest do
     assert expected_cc == filtered["object"]["cc"]
   end
 
+  test "replies to unlisted posts are unmodified" do
+    batman = insert(:user, nickname: "batman")
+    robin = insert(:user, nickname: "robin")
+
+    {:ok, post} =
+      CommonAPI.post(batman, %{
+        status: "Has anyone seen Selina Kyle's latest selfies?",
+        visibility: "unlisted"
+      })
+
+    reply = %{
+      "type" => "Create",
+      "actor" => robin.ap_id,
+      "to" => [batman.ap_id, robin.follower_address],
+      "cc" => [],
+      "object" => %{
+        "type" => "Note",
+        "actor" => robin.ap_id,
+        "content" => "@batman 🤤 ❤️ 🐈<200d>⬛",
+        "to" => [batman.ap_id, robin.follower_address],
+        "cc" => [],
+        "inReplyTo" => Object.normalize(post).data["id"]
+      }
+    }
+
+    assert {:ok, filtered} = FODirectReply.filter(reply)
+
+    assert match?(^filtered, reply)
+  end
+
   test "replies to public posts are unmodified" do
     batman = insert(:user, nickname: "batman")
     robin = insert(:user, nickname: "robin")
-- 
cgit v1.2.3


From 648e94b369c4a356feda22c0f8ee8a01f7d798f8 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Tue, 13 Aug 2024 15:28:28 -0400
Subject: Fix the uploads migration mix task test which leaked a change to the
 configured Uploader

---
 test/mix/tasks/pleroma/uploads_test.exs | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/mix/tasks/pleroma/uploads_test.exs b/test/mix/tasks/pleroma/uploads_test.exs
index d4ea89501..22b6baf24 100644
--- a/test/mix/tasks/pleroma/uploads_test.exs
+++ b/test/mix/tasks/pleroma/uploads_test.exs
@@ -3,12 +3,14 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Mix.Tasks.Pleroma.UploadsTest do
+  alias Pleroma.Config
   alias Pleroma.Upload
-  use Pleroma.DataCase
+  use Pleroma.DataCase, async: false
 
   import Mock
 
   setup_all do
+    prep_uploads()
     Mix.shell(Mix.Shell.Process)
 
     on_exit(fn ->
@@ -18,6 +20,8 @@ defmodule Mix.Tasks.Pleroma.UploadsTest do
     :ok
   end
 
+  setup do: clear_config([Pleroma.Upload, :uploader], Pleroma.Uploaders.Local)
+
   describe "running migrate_local" do
     test "uploads migrated" do
       with_mock Upload,
@@ -53,4 +57,15 @@ defmodule Mix.Tasks.Pleroma.UploadsTest do
       end
     end
   end
+
+  defp prep_uploads() do
+    upload_dir = Config.get([Pleroma.Uploaders.Local, :uploads])
+
+    if not File.exists?(upload_dir) || File.ls!(upload_dir) == [] do
+      File.mkdir_p(upload_dir)
+
+      Path.join([upload_dir, "file.txt"])
+      |> File.touch()
+    end
+  end
 end
-- 
cgit v1.2.3


From b281ad06de2de331450a5e319e3ba497071d4197 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Tue, 13 Aug 2024 15:34:56 -0400
Subject: Revert "Custom mix task to retry failed tests once in CI pipeline"

This reverts commit ed2976b237b53a524247d564691e0a12d3231d68.
---
 test/mix/tasks/pleroma/uploads_test.exs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/mix/tasks/pleroma/uploads_test.exs b/test/mix/tasks/pleroma/uploads_test.exs
index 22b6baf24..f3d5aa64f 100644
--- a/test/mix/tasks/pleroma/uploads_test.exs
+++ b/test/mix/tasks/pleroma/uploads_test.exs
@@ -58,7 +58,7 @@ defmodule Mix.Tasks.Pleroma.UploadsTest do
     end
   end
 
-  defp prep_uploads() do
+  defp prep_uploads do
     upload_dir = Config.get([Pleroma.Uploaders.Local, :uploads])
 
     if not File.exists?(upload_dir) || File.ls!(upload_dir) == [] do
-- 
cgit v1.2.3


From 3b1e6ac8f0ea263beb422f11168ecc254f1bbf53 Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Tue, 13 Aug 2024 20:06:01 +0200
Subject: User: truncate remote user fields instead of rejecting

---
 test/pleroma/user_test.exs                                | 15 +++++++++++++++
 .../transmogrifier/user_update_handling_test.exs          |  4 ++--
 2 files changed, 17 insertions(+), 2 deletions(-)

(limited to 'test')

diff --git a/test/pleroma/user_test.exs b/test/pleroma/user_test.exs
index 036ae78fb..06afc0709 100644
--- a/test/pleroma/user_test.exs
+++ b/test/pleroma/user_test.exs
@@ -1075,6 +1075,21 @@ defmodule Pleroma.UserTest do
 
       refute cs.valid?
     end
+
+    test "it truncates fields" do
+      clear_config([:instance, :max_remote_account_fields], 2)
+
+      fields = [
+        %{"name" => "One", "value" => "Uno"},
+        %{"name" => "Two", "value" => "Dos"},
+        %{"name" => "Three", "value" => "Tres"}
+      ]
+
+      cs = User.remote_user_changeset(@valid_remote |> Map.put(:fields, fields))
+
+      assert [%{"name" => "One", "value" => "Uno"}, %{"name" => "Two", "value" => "Dos"}] ==
+               Ecto.Changeset.get_field(cs, :fields)
+    end
   end
 
   describe "followers and friends" do
diff --git a/test/pleroma/web/activity_pub/transmogrifier/user_update_handling_test.exs b/test/pleroma/web/activity_pub/transmogrifier/user_update_handling_test.exs
index da46f063a..851c60850 100644
--- a/test/pleroma/web/activity_pub/transmogrifier/user_update_handling_test.exs
+++ b/test/pleroma/web/activity_pub/transmogrifier/user_update_handling_test.exs
@@ -119,8 +119,8 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier.UserUpdateHandlingTest do
     user = User.get_cached_by_ap_id(user.ap_id)
 
     assert user.fields == [
-             %{"name" => "foo", "value" => "updated"},
-             %{"name" => "foo1", "value" => "updated"}
+             %{"name" => "foo", "value" => "bar"},
+             %{"name" => "foo11", "value" => "bar11"}
            ]
 
     update_data =
-- 
cgit v1.2.3


From 8cd8cea3fb5ce87e5f92dfb45a667c47f78b6b02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Wed, 14 Aug 2024 19:25:51 +0200
Subject: Fix 'Setting a marker should mark notifications as read'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 .../controllers/marker_controller_test.exs         | 35 ++++++++++++++++++++++
 1 file changed, 35 insertions(+)

(limited to 'test')

diff --git a/test/pleroma/web/mastodon_api/controllers/marker_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/marker_controller_test.exs
index d8f7b2638..4050528ff 100644
--- a/test/pleroma/web/mastodon_api/controllers/marker_controller_test.exs
+++ b/test/pleroma/web/mastodon_api/controllers/marker_controller_test.exs
@@ -5,6 +5,10 @@
 defmodule Pleroma.Web.MastodonAPI.MarkerControllerTest do
   use Pleroma.Web.ConnCase, async: true
 
+  alias Pleroma.Notification
+  alias Pleroma.Repo
+  alias Pleroma.Web.CommonAPI
+
   import Pleroma.Factory
 
   describe "GET /api/v1/markers" do
@@ -127,5 +131,36 @@ defmodule Pleroma.Web.MastodonAPI.MarkerControllerTest do
 
       assert response == %{"error" => "Insufficient permissions: write:statuses."}
     end
+
+    test "marks notifications as read", %{conn: conn} do
+      user1 = insert(:user)
+      token = insert(:oauth_token, user: user1, scopes: ["write:statuses"])
+
+      user2 = insert(:user)
+      {:ok, _activity1} = CommonAPI.post(user2, %{status: "hi @#{user1.nickname}"})
+      {:ok, _activity2} = CommonAPI.post(user2, %{status: "hi @#{user1.nickname}"})
+      {:ok, _activity3} = CommonAPI.post(user2, %{status: "HIE @#{user1.nickname}"})
+
+      [notification3, notification2, notification1] = Notification.for_user(user1, %{limit: 3})
+
+      refute Repo.get(Notification, notification1.id).seen
+      refute Repo.get(Notification, notification2.id).seen
+      refute Repo.get(Notification, notification3.id).seen
+
+      conn
+      |> assign(:user, user1)
+      |> assign(:token, token)
+      |> put_req_header("content-type", "application/json")
+      |> post("/api/v1/markers", %{
+        notifications: %{last_read_id: to_string(notification2.id)}
+      })
+      |> json_response_and_validate_schema(200)
+
+      [notification3, notification2, notification1] = Notification.for_user(user1, %{limit: 3})
+
+      assert Repo.get(Notification, notification1.id).seen
+      assert Repo.get(Notification, notification2.id).seen
+      refute Repo.get(Notification, notification3.id).seen
+    end
   end
 end
-- 
cgit v1.2.3


From 089fa4d1463dcc9b64d9a536d9dcfc4287c150c3 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Sat, 17 Aug 2024 20:33:42 -0400
Subject: Improve Remote Object Fetcher error handling, Oban

---
 test/pleroma/object/fetcher_test.exs               | 15 +++++---
 .../pleroma/workers/remote_fetcher_worker_test.exs | 45 ++++++++++++++--------
 2 files changed, 39 insertions(+), 21 deletions(-)

(limited to 'test')

diff --git a/test/pleroma/object/fetcher_test.exs b/test/pleroma/object/fetcher_test.exs
index 6704c18db..215fca570 100644
--- a/test/pleroma/object/fetcher_test.exs
+++ b/test/pleroma/object/fetcher_test.exs
@@ -100,7 +100,7 @@ defmodule Pleroma.Object.FetcherTest do
     test "it returns thread depth exceeded error if thread depth is exceeded" do
       clear_config([:instance, :federation_incoming_replies_max_depth], 0)
 
-      assert {:error, :allowed_depth} = Fetcher.fetch_object_from_id(@ap_id, depth: 1)
+      assert {:allowed_depth, false} = Fetcher.fetch_object_from_id(@ap_id, depth: 1)
     end
 
     test "it fetches object if max thread depth is restricted to 0 and depth is not specified" do
@@ -118,15 +118,18 @@ defmodule Pleroma.Object.FetcherTest do
 
   describe "actor origin containment" do
     test "it rejects objects with a bogus origin" do
-      {:error, _} = Fetcher.fetch_object_from_id("https://info.pleroma.site/activity.json")
+      {:containment, :error} =
+        Fetcher.fetch_object_from_id("https://info.pleroma.site/activity.json")
     end
 
     test "it rejects objects when attributedTo is wrong (variant 1)" do
-      {:error, _} = Fetcher.fetch_object_from_id("https://info.pleroma.site/activity2.json")
+      {:containment, :error} =
+        Fetcher.fetch_object_from_id("https://info.pleroma.site/activity2.json")
     end
 
     test "it rejects objects when attributedTo is wrong (variant 2)" do
-      {:error, _} = Fetcher.fetch_object_from_id("https://info.pleroma.site/activity3.json")
+      {:containment, :error} =
+        Fetcher.fetch_object_from_id("https://info.pleroma.site/activity3.json")
     end
   end
 
@@ -150,14 +153,14 @@ defmodule Pleroma.Object.FetcherTest do
       clear_config([:mrf_keyword, :reject], ["yeah"])
       clear_config([:mrf, :policies], [Pleroma.Web.ActivityPub.MRF.KeywordPolicy])
 
-      assert {:reject, "[KeywordPolicy] Matches with rejected keyword"} ==
+      assert {:transmogrifier, {:reject, "[KeywordPolicy] Matches with rejected keyword"}} ==
                Fetcher.fetch_object_from_id(
                  "http://mastodon.example.org/@admin/99541947525187367"
                )
     end
 
     test "it does not fetch a spoofed object uploaded on an instance as an attachment" do
-      assert {:error, _} =
+      assert {:fetch, {:error, {:content_type, "application/json"}}} =
                Fetcher.fetch_object_from_id(
                  "https://patch.cx/media/03ca3c8b4ac3ddd08bf0f84be7885f2f88de0f709112131a22d83650819e36c2.json"
                )
diff --git a/test/pleroma/workers/remote_fetcher_worker_test.exs b/test/pleroma/workers/remote_fetcher_worker_test.exs
index 2104baab2..9caddb600 100644
--- a/test/pleroma/workers/remote_fetcher_worker_test.exs
+++ b/test/pleroma/workers/remote_fetcher_worker_test.exs
@@ -12,6 +12,7 @@ defmodule Pleroma.Workers.RemoteFetcherWorkerTest do
   @deleted_object_two "https://deleted-410.example.com/"
   @unauthorized_object "https://unauthorized.example.com/"
   @depth_object "https://depth.example.com/"
+  @content_type_object "https://bad_content_type.example.com/"
 
   describe "RemoteFetcherWorker" do
     setup do
@@ -35,34 +36,48 @@ defmodule Pleroma.Workers.RemoteFetcherWorkerTest do
           %Tesla.Env{
             status: 200
           }
+
+        %{method: :get, url: @content_type_object} ->
+          %Tesla.Env{
+            status: 200,
+            headers: [{"content-type", "application/json"}],
+            body: File.read!("test/fixtures/spoofed-object.json")
+          }
       end)
     end
 
-    test "does not requeue a deleted object" do
-      assert {:cancel, _} =
-               RemoteFetcherWorker.perform(%Oban.Job{
-                 args: %{"op" => "fetch_remote", "id" => @deleted_object_one}
-               })
+    test "does not retry jobs for a deleted object" do
+      [
+        %{"op" => "fetch_remote", "id" => @deleted_object_one},
+        %{"op" => "fetch_remote", "id" => @deleted_object_two}
+      ]
+      |> Enum.each(fn job -> assert {:cancel, _} = perform_job(RemoteFetcherWorker, job) end)
+    end
 
+    test "does not retry jobs for an unauthorized object" do
       assert {:cancel, _} =
-               RemoteFetcherWorker.perform(%Oban.Job{
-                 args: %{"op" => "fetch_remote", "id" => @deleted_object_two}
+               perform_job(RemoteFetcherWorker, %{
+                 "op" => "fetch_remote",
+                 "id" => @unauthorized_object
                })
     end
 
-    test "does not requeue an unauthorized object" do
+    test "does not retry jobs for an an object that exceeded depth" do
+      clear_config([:instance, :federation_incoming_replies_max_depth], 0)
+
       assert {:cancel, _} =
-               RemoteFetcherWorker.perform(%Oban.Job{
-                 args: %{"op" => "fetch_remote", "id" => @unauthorized_object}
+               perform_job(RemoteFetcherWorker, %{
+                 "op" => "fetch_remote",
+                 "id" => @depth_object,
+                 "depth" => 1
                })
     end
 
-    test "does not requeue an object that exceeded depth" do
-      clear_config([:instance, :federation_incoming_replies_max_depth], 0)
-
+    test "does not retry jobs for when object returns wrong content type" do
       assert {:cancel, _} =
-               RemoteFetcherWorker.perform(%Oban.Job{
-                 args: %{"op" => "fetch_remote", "id" => @depth_object, "depth" => 1}
+               perform_job(RemoteFetcherWorker, %{
+                 "op" => "fetch_remote",
+                 "id" => @content_type_object
                })
     end
   end
-- 
cgit v1.2.3


From 55cc1ba50eaea0df769604f0659aedf0d5969ecb Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Mon, 19 Aug 2024 08:39:03 -0400
Subject: Fix test cases for validating instance reachability based on results
 of publishing attempts

Now that we store the unreachable_since in the Oban job the value is no longer a %NaiveDateTime{} so the code was wrong
---
 test/pleroma/web/activity_pub/publisher_test.exs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'test')

diff --git a/test/pleroma/web/activity_pub/publisher_test.exs b/test/pleroma/web/activity_pub/publisher_test.exs
index 3acbac396..99ed42877 100644
--- a/test/pleroma/web/activity_pub/publisher_test.exs
+++ b/test/pleroma/web/activity_pub/publisher_test.exs
@@ -180,7 +180,7 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
                Publisher.prepare_one(%{
                  inbox: inbox,
                  activity_id: activity.id,
-                 unreachable_since: NaiveDateTime.utc_now()
+                 unreachable_since: NaiveDateTime.utc_now() |> NaiveDateTime.to_string()
                })
                |> Publisher.publish_one()
 
@@ -269,7 +269,7 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
                         Publisher.prepare_one(%{
                           inbox: inbox,
                           activity_id: activity.id,
-                          unreachable_since: NaiveDateTime.utc_now()
+                          unreachable_since: NaiveDateTime.utc_now() |> NaiveDateTime.to_string()
                         })
                         |> Publisher.publish_one()
              end) =~ "connrefused"
-- 
cgit v1.2.3