moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't reject already accepted subscriptions.

This commit is contained in:
Roger Braun 2017-10-05 12:53:16 +02:00
parent 2b980dea2f
commit b4f055b604
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/pleroma/web/websub/websub.ex
View File

@ -31,9 +31,9 @@ def verify(subscription, getter \\ &@httpoison.get/3) do
do do
changeset = Changeset.change(subscription, %{state: "active"}) changeset = Changeset.change(subscription, %{state: "active"})
Repo.update(changeset) Repo.update(changeset)
else _e -> else e ->
changeset = Changeset.change(subscription, %{state: "rejected"}) Logger.debug("Couldn't verify subscription")
{:ok, subscription} = Repo.update(changeset) Logger.debug(inspect(e))
{:error, subscription} {:error, subscription}
end end
end end

3
test/web/websub/websub_test.exs
View File

@ -46,7 +46,8 @@ test "a verification of a request that doesn't return 200" do
end end
{:error, sub} = Websub.verify(sub, getter) {:error, sub} = Websub.verify(sub, getter)
assert sub.state == "rejected" # Keep the current state.
assert sub.state == "requested"
end end
test "an incoming subscription request" do test "an incoming subscription request" do