Salmon: Take both versions of public keys.

[akkoma] / lib / pleroma / web / websub / websub_controller.ex

diff --git a/lib/pleroma/web/websub/websub_controller.ex b/lib/pleroma/web/websub/websub_controller.ex
index 4fc6932140fe777c8a8d73c56948d24af69d0085..6c9164ec8ec3ab7a1dde4b6c8516ee2000c7f6a4 100644 (file)
--- a/lib/pleroma/web/websub/websub_controller.ex
+++ b/lib/pleroma/web/websub/websub_controller.ex
@@ -18,9 +18,20 @@ defmodule Pleroma.Web.Websub.WebsubController do
     end
   end
 
-  def websub_subscription_confirmation(conn, %{"id" => id, "hub.mode" => "subscribe", "hub.challenge" => challenge, "hub.topic" => topic}) do
+  # TODO: Extract this into the Websub module
+  def websub_subscription_confirmation(conn, %{"id" => id, "hub.mode" => "subscribe", "hub.challenge" => challenge, "hub.topic" => topic} = params) do
+    Logger.debug("Got websub confirmation")
+    Logger.debug(inspect(params))
+    lease_seconds = if params["hub.lease_seconds"] do
+      String.to_integer(params["hub.lease_seconds"])
+    else
+      # Guess 3 days
+      60 * 60 * 24 * 3
+    end
+
     with %WebsubClientSubscription{} = websub <- Repo.get_by(WebsubClientSubscription, id: id, topic: topic) do
-      change = Ecto.Changeset.change(websub, %{state: "accepted"})
+      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
       |> send_resp(200, challenge)