1 files changed, 90 insertions, 68 deletions

diff --git a/lib/pleroma/web/websub/websub.ex b/lib/pleroma/web/websub/websub.ex
index 5caa8198c..e494811f9 100644
--- a/lib/pleroma/web/websub/websub.ex
+++ b/lib/pleroma/web/websub/websub.ex
@@ -26,15 +26,16 @@ defmodule Pleroma.Web.Websub do
     url = hd(String.split(subscription.callback, "?"))
     query = URI.parse(subscription.callback).query || ""
     params = Map.merge(params, URI.decode_query(query))
-    with {:ok, response} <- getter.(url, [], [params: params]),
-         ^challenge <- response.body
-    do
+
+    with {:ok, response} <- getter.(url, [], params: params),
+         ^challenge <- response.body do
       changeset = Changeset.change(subscription, %{state: "active"})
       Repo.update(changeset)
-    else e ->
-      Logger.debug("Couldn't verify subscription")
-      Logger.debug(inspect(e))
-      {:error, subscription}
+    else
+      e ->
+        Logger.debug("Couldn't verify subscription")
+        Logger.debug(inspect(e))
+        {:error, subscription}
     end
   end
 
@@ -46,17 +47,24 @@ defmodule Pleroma.Web.Websub do
     "Undo",
     "Delete"
   ]
-  def publish(topic, user, %{data: %{"type" => type}} = activity) when type in @supported_activities do
+  def publish(topic, user, %{data: %{"type" => type}} = activity)
+      when type in @supported_activities do
     # TODO: Only send to still valid subscriptions.
-    query = from sub in WebsubServerSubscription,
-      where: sub.topic == ^topic and sub.state == "active",
-      where: fragment("? > NOW()", sub.valid_until)
+    query =
+      from(
+        sub in WebsubServerSubscription,
+        where: sub.topic == ^topic and sub.state == "active",
+        where: fragment("? > NOW()", sub.valid_until)
+      )
+
     subscriptions = Repo.all(query)
-    Enum.each(subscriptions, fn(sub) ->
-      response = user
-      |> FeedRepresenter.to_simple_form([activity], [user])
-      |> :xmerl.export_simple(:xmerl_xml)
-      |> to_string
+
+    Enum.each(subscriptions, fn sub ->
+      response =
+        user
+        |> FeedRepresenter.to_simple_form([activity], [user])
+        |> :xmerl.export_simple(:xmerl_xml)
+        |> to_string
 
       data = %{
         xml: response,
@@ -64,22 +72,24 @@ defmodule Pleroma.Web.Websub do
         callback: sub.callback,
         secret: sub.secret
       }
+
       Pleroma.Web.Federator.enqueue(:publish_single_websub, data)
     end)
   end
-  def publish(_,_,_), do: ""
+
+  def publish(_, _, _), do: ""
 
   def sign(secret, doc) do
-    :crypto.hmac(:sha, secret, to_string(doc)) |> Base.encode16 |> String.downcase
+    :crypto.hmac(:sha, secret, to_string(doc)) |> Base.encode16() |> String.downcase()
   end
 
   def incoming_subscription_request(user, %{"hub.mode" => "subscribe"} = params) do
     with {:ok, topic} <- valid_topic(params, user),
          {:ok, lease_time} <- lease_time(params),
          secret <- params["hub.secret"],
-         callback <- params["hub.callback"]
-    do
+         callback <- params["hub.callback"] do
       subscription = get_subscription(topic, callback)
+
       data = %{
         state: subscription.state || "requested",
         topic: topic,
@@ -90,18 +100,20 @@ defmodule Pleroma.Web.Websub do
       change = Changeset.change(subscription, data)
       websub = Repo.insert_or_update!(change)
 
-      change = Changeset.change(websub, %{valid_until:
-                                          NaiveDateTime.add(websub.updated_at, lease_time)})
+      change =
+        Changeset.change(websub, %{valid_until: NaiveDateTime.add(websub.updated_at, lease_time)})
+
       websub = Repo.update!(change)
 
       Pleroma.Web.Federator.enqueue(:verify_websub, websub)
 
       {:ok, websub}
-    else {:error, reason} ->
-      Logger.debug("Couldn't create subscription")
-      Logger.debug(inspect(reason))
+    else
+      {:error, reason} ->
+        Logger.debug("Couldn't create subscription")
+        Logger.debug(inspect(reason))
 
-      {:error, reason}
+        {:error, reason}
     end
   end
 
@@ -112,7 +124,8 @@ defmodule Pleroma.Web.Websub do
 
   # Temp hack for mastodon.
   defp lease_time(%{"hub.lease_seconds" => ""}) do
-    {:ok, 60 * 60 * 24 * 3} # three days
+    # three days
+    {:ok, 60 * 60 * 24 * 3}
   end
 
   defp lease_time(%{"hub.lease_seconds" => lease_seconds}) do
@@ -120,7 +133,8 @@ defmodule Pleroma.Web.Websub do
   end
 
   defp lease_time(_) do
-    {:ok, 60 * 60 * 24 * 3} # three days
+    # three days
+    {:ok, 60 * 60 * 24 * 3}
   end
 
   defp valid_topic(%{"hub.topic" => topic}, user) do
@@ -134,21 +148,26 @@ defmodule Pleroma.Web.Websub do
   def subscribe(subscriber, subscribed, requester \\ &request_subscription/1) do
     topic = subscribed.info["topic"]
     # FIXME: Race condition, use transactions
-    {:ok, subscription} = with subscription when not is_nil(subscription) <- Repo.get_by(WebsubClientSubscription, topic: topic) do
-      subscribers = [subscriber.ap_id | subscription.subscribers] |> Enum.uniq
-      change = Ecto.Changeset.change(subscription, %{subscribers: subscribers})
-      Repo.update(change)
-    else _e ->
-      subscription = %WebsubClientSubscription{
-        topic: topic,
-        hub: subscribed.info["hub"],
-        subscribers: [subscriber.ap_id],
-        state: "requested",
-        secret: :crypto.strong_rand_bytes(8) |> Base.url_encode64,
-        user: subscribed
-      }
-      Repo.insert(subscription)
-    end
+    {:ok, subscription} =
+      with subscription when not is_nil(subscription) <-
+             Repo.get_by(WebsubClientSubscription, topic: topic) do
+        subscribers = [subscriber.ap_id | subscription.subscribers] |> Enum.uniq()
+        change = Ecto.Changeset.change(subscription, %{subscribers: subscribers})
+        Repo.update(change)
+      else
+        _e ->
+          subscription = %WebsubClientSubscription{
+            topic: topic,
+            hub: subscribed.info["hub"],
+            subscribers: [subscriber.ap_id],
+            state: "requested",
+            secret: :crypto.strong_rand_bytes(8) |> Base.url_encode64(),
+            user: subscribed
+          }
+
+          Repo.insert(subscription)
+      end
+
     requester.(subscription)
   end
 
@@ -159,24 +178,25 @@ defmodule Pleroma.Web.Websub do
          doc <- XML.parse_document(body),
          uri when not is_nil(uri) <- XML.string_from_xpath("/feed/author[1]/uri", doc),
          hub when not is_nil(hub) <- XML.string_from_xpath(~S{/feed/link[@rel="hub"]/@href}, doc) do
-
       name = XML.string_from_xpath("/feed/author[1]/name", doc)
       preferredUsername = XML.string_from_xpath("/feed/author[1]/poco:preferredUsername", doc)
       displayName = XML.string_from_xpath("/feed/author[1]/poco:displayName", doc)
       avatar = OStatus.make_avatar_object(doc)
       bio = XML.string_from_xpath("/feed/author[1]/summary", doc)
 
-      {:ok, %{
-        "uri" => uri,
-        "hub" => hub,
-        "nickname" => preferredUsername || name,
-        "name" => displayName || name,
-        "host" => URI.parse(uri).host,
-        "avatar" => avatar,
-        "bio" => bio
-      }}
-    else e ->
-      {:error, e}
+      {:ok,
+       %{
+         "uri" => uri,
+         "hub" => hub,
+         "nickname" => preferredUsername || name,
+         "name" => displayName || name,
+         "host" => URI.parse(uri).host,
+         "avatar" => avatar,
+         "bio" => bio
+       }}
+    else
+      e ->
+        {:error, e}
     end
   end
 
@@ -190,43 +210,45 @@ defmodule Pleroma.Web.Websub do
 
     # This checks once a second if we are confirmed yet
     websub_checker = fn ->
-      helper = fn (helper) ->
+      helper = fn helper ->
         :timer.sleep(1000)
         websub = Repo.get_by(WebsubClientSubscription, id: websub.id, state: "accepted")
         if websub, do: websub, else: helper.(helper)
       end
+
       helper.(helper)
     end
 
     task = Task.async(websub_checker)
 
-    with {:ok, %{status_code: 202}} <- poster.(websub.hub, {:form, data}, ["Content-type": "application/x-www-form-urlencoded"]),
+    with {:ok, %{status_code: 202}} <-
+           poster.(websub.hub, {:form, data}, "Content-type": "application/x-www-form-urlencoded"),
          {:ok, websub} <- Task.yield(task, timeout) do
       {:ok, websub}
-    else e ->
-      Task.shutdown(task)
+    else
+      e ->
+        Task.shutdown(task)
 
-      change = Ecto.Changeset.change(websub, %{state: "rejected"})
-      {:ok, websub} = Repo.update(change)
+        change = Ecto.Changeset.change(websub, %{state: "rejected"})
+        {:ok, websub} = Repo.update(change)
 
-      Logger.debug(fn -> "Couldn't confirm subscription: #{inspect(websub)}" end)
-      Logger.debug(fn -> "error: #{inspect(e)}" end)
+        Logger.debug(fn -> "Couldn't confirm subscription: #{inspect(websub)}" end)
+        Logger.debug(fn -> "error: #{inspect(e)}" end)
 
-      {:error, websub}
+        {:error, websub}
     end
   end
 
   def refresh_subscriptions(delta \\ 60 * 60 * 24) do
     Logger.debug("Refreshing subscriptions")
 
-    cut_off = NaiveDateTime.add(NaiveDateTime.utc_now, delta)
+    cut_off = NaiveDateTime.add(NaiveDateTime.utc_now(), delta)
 
-    query = from sub in WebsubClientSubscription,
-      where: sub.valid_until < ^cut_off
+    query = from(sub in WebsubClientSubscription, where: sub.valid_until < ^cut_off)
 
     subs = Repo.all(query)
 
-    Enum.each(subs, fn (sub) ->
+    Enum.each(subs, fn sub ->
       Pleroma.Web.Federator.enqueue(:request_subscription, sub)
     end)
   end