logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: b4f055b60416986220d905bbf688f8417cd8a270
parent: 2b980dea2fe41e81ece6915bd05f3958007b424e
Author: Roger Braun <roger@rogerbraun.net>
Date:   Thu,  5 Oct 2017 12:53:16 +0200

Don't reject already accepted subscriptions.

Diffstat:

Mlib/pleroma/web/websub/websub.ex6+++---
Mtest/web/websub/websub_test.exs3++-
2 files changed, 5 insertions(+), 4 deletions(-)

diff --git 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 @@ -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