pleroma

commit: ae0e6d80030eec96d9b323d8e11fdf6eb3a214ae
parent: 153995f83222eea9641f098864c2c483674da7f6
Author: Roger Braun <roger@rogerbraun.net>
Date:   Wed, 10 May 2017 19:04:27 +0200

Handle cases where we don't get lease_seconds returned.

Diffstat:
M
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
@@ -19,9 +19,16 @@ defmodule Pleroma.Web.Websub.WebsubController 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