diff options
| -rw-r--r-- | lib/pleroma/web/websub/websub_controller.ex | 6 | ||||
| -rw-r--r-- | test/web/websub/websub_controller_test.exs | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/lib/pleroma/web/websub/websub_controller.ex b/lib/pleroma/web/websub/websub_controller.ex index 4fc693214..9d3c1cd01 100644 --- a/lib/pleroma/web/websub/websub_controller.ex +++ b/lib/pleroma/web/websub/websub_controller.ex @@ -18,9 +18,11 @@ 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, "hub.lease_seconds" => lease_seconds}) do 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, String.to_integer(lease_seconds)) + change = Ecto.Changeset.change(websub, %{state: "accepted", valid_until: valid_until}) {:ok, _websub} = Repo.update(change) conn |> send_resp(200, challenge) diff --git a/test/web/websub/websub_controller_test.exs b/test/web/websub/websub_controller_test.exs index 8f68248a4..0aa0fdff7 100644 --- a/test/web/websub/websub_controller_test.exs +++ b/test/web/websub/websub_controller_test.exs @@ -31,7 +31,7 @@ defmodule Pleroma.Web.Websub.WebsubControllerTest do "hub.mode" => "subscribe", "hub.topic" => websub.topic, "hub.challenge" => "some challenge", - "hub.lease_seconds" => 100 + "hub.lease_seconds" => "100" } conn = conn @@ -41,8 +41,7 @@ defmodule Pleroma.Web.Websub.WebsubControllerTest do assert response(conn, 200) == "some challenge" assert websub.state == "accepted" - - # TODO valid_until + assert_in_delta NaiveDateTime.diff(websub.valid_until, NaiveDateTime.utc_now), 100, 5 end test "handles incoming feed updates", %{conn: conn} do |