From ae0e6d80030eec96d9b323d8e11fdf6eb3a214ae Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Wed, 10 May 2017 19:04:27 +0200
Subject: [PATCH] Handle cases where we don't get lease_seconds returned.
---
lib/pleroma/web/websub/websub_controller.ex | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/lib/pleroma/web/websub/websub_controller.ex b/lib/pleroma/web/websub/websub_controller.ex
index 9d3c1cd01..c47c820bc 100644
--- a/lib/pleroma/web/websub/websub_controller.ex
+++ b/lib/pleroma/web/websub/websub_controller.ex
@@ -19,9 +19,16 @@ def websub_subscription_request(conn, %{"nickname" => nickname} = params) do
end
# TODO: Extract this into the Websub module
- def websub_subscription_confirmation(conn, %{"id" => id, "hub.mode" => "subscribe", "hub.challenge" => challenge, "hub.topic" => topic, "hub.lease_seconds" => lease_seconds}) do
+ def websub_subscription_confirmation(conn, %{"id" => id, "hub.mode" => "subscribe", "hub.challenge" => challenge, "hub.topic" => topic} = params) do
+ lease_seconds = if params["hub.lease_seconds"] do
+ String.to_integer(params["hub.lease_seconds"])
+ else
+ # Guess 3 days
+ 60 * 24 * 3
+ end
+
with %WebsubClientSubscription{} = websub <- Repo.get_by(WebsubClientSubscription, id: id, topic: topic) do
- valid_until = NaiveDateTime.add(NaiveDateTime.utc_now, String.to_integer(lease_seconds))
+ valid_until = NaiveDateTime.add(NaiveDateTime.utc_now, lease_seconds)
change = Ecto.Changeset.change(websub, %{state: "accepted", valid_until: valid_until})
{:ok, _websub} = Repo.update(change)
conn