Don't reject already accepted subscriptions.

diff --git a/lib/pleroma/web/websub/websub.ex b/lib/pleroma/web/websub/websub.ex
index 6bbf13130dfb79e91fcdcfa0697620334798bf0a..db1577a9373a71044263266a0b9443254dad2d94 100644 (file)
--- a/lib/pleroma/web/websub/websub.ex
+++ b/lib/pleroma/web/websub/websub.ex
@@ -31,9 +31,9 @@ defmodule Pleroma.Web.Websub do
     do
       changeset = Changeset.change(subscription, %{state: "active"})
       Repo.update(changeset)
-    else _e ->
-      changeset = Changeset.change(subscription, %{state: "rejected"})
-      {:ok, subscription} = Repo.update(changeset)
+    else e ->
+      Logger.debug("Couldn't verify subscription")
+      Logger.debug(inspect(e))
       {:error, subscription}
     end
   end

diff --git a/test/web/websub/websub_test.exs b/test/web/websub/websub_test.exs
index 1ca573d6600bf49b00eda84deadad111fc3be6b3..6b2c612addcc93c74f7b809ab92aa17b6113114a 100644 (file)
--- a/test/web/websub/websub_test.exs
+++ b/test/web/websub/websub_test.exs
@@ -46,7 +46,8 @@ defmodule Pleroma.Web.WebsubTest do
     end
 
     {:error, sub} = Websub.verify(sub, getter)
-    assert sub.state == "rejected"
+    # Keep the current state.
+    assert sub.state == "requested"
   end
 
   test "an incoming subscription request" do