Handle cases where we don't get lease_seconds returned.

[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 e860ec9e5381c180dde61df581a892cba7a345d3..c47c820bc93475493f8f0a71397b3172bc8ce311 100644 (file)
--- a/lib/pleroma/web/websub/websub_controller.ex
+++ b/lib/pleroma/web/websub/websub_controller.ex
@@ -1,12 +1,10 @@
 defmodule Pleroma.Web.Websub.WebsubController do
   use Pleroma.Web, :controller
   alias Pleroma.{Repo, User}
-  alias Pleroma.Web.Websub
+  alias Pleroma.Web.{Websub, Federator}
   alias Pleroma.Web.Websub.WebsubClientSubscription
   require Logger
 
-  @ostatus Application.get_env(:pleroma, :ostatus)
-
   def websub_subscription_request(conn, %{"nickname" => nickname} = params) do
     user = User.get_cached_by_nickname(nickname)
 
@@ -20,9 +18,18 @@ 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
+    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
-      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)
@@ -38,7 +45,7 @@ defmodule Pleroma.Web.Websub.WebsubController do
          %WebsubClientSubscription{} = websub <- Repo.get(WebsubClientSubscription, id),
          {:ok, body, _conn} = read_body(conn),
          ^signature <- Websub.sign(websub.secret, body) do
-      @ostatus.handle_incoming(body)
+      Federator.enqueue(:incoming_doc, body)
       conn
       |> send_resp(200, "OK")
     else _e ->