Merge branch 'publisher' into 'develop'

Discard some failed publisher jobs See merge request pleroma/pleroma!4022
2023-12-29 23:18:34 +00:00 · 2023-12-29 23:18:34 +00:00 · f74f5e0a56
commit f74f5e0a56
parent 8ac4458630 833117f573
4 changed files with 20 additions and 4 deletions
--- a/test/pleroma/web/activity_pub/publisher_test.exs
+++ b/test/pleroma/web/activity_pub/publisher_test.exs
@ -212,7 +212,8 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
      actor = insert(:user)
      inbox = "http://404.site/users/nick1/inbox"

-      assert {:error, _} = Publisher.publish_one(%{inbox: inbox, json: "{}", actor: actor, id: 1})
+      assert {:discard, _} =
+               Publisher.publish_one(%{inbox: inbox, json: "{}", actor: actor, id: 1})

      assert called(Instances.set_unreachable(inbox))
    end