import Ecto.Query
- @websub_verifier Application.get_env(:pleroma, :websub_verifier)
+ @httpoison Application.get_env(:pleroma, :httpoison)
- def verify(subscription, getter \\ &HTTPoison.get/3) do
+ def verify(subscription, getter \\ &@httpoison.get/3) do
challenge = Base.encode16(:crypto.strong_rand_bytes(8))
lease_seconds = NaiveDateTime.diff(subscription.valid_until, subscription.updated_at)
lease_seconds = lease_seconds |> to_string
end
def publish(topic, user, activity) do
+ # TODO: Only send to still valid subscriptions.
query = from sub in WebsubServerSubscription,
where: sub.topic == ^topic and sub.state == "active"
subscriptions = Repo.all(query)
|> to_string
signature = sign(sub.secret || "", response)
- Logger.debug("Pushing to #{sub.callback}")
-
- HTTPoison.post(sub.callback, response, [
- {"Content-Type", "application/atom+xml"},
- {"X-Hub-Signature", "sha1=#{signature}"}
- ])
+ Logger.debug(fn -> "Pushing to #{sub.callback}" end)
+
+ Task.start(fn ->
+ @httpoison.post(sub.callback, response, [
+ {"Content-Type", "application/atom+xml"},
+ {"X-Hub-Signature", "sha1=#{signature}"}
+ ])
+ end)
end)
end
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
+ subscribers = [subscriber.ap_id | subscription.subscribers] |> Enum.uniq
change = Ecto.Changeset.change(subscription, %{subscribers: subscribers})
Repo.update(change)
else _e ->
requester.(subscription)
end
- def gather_feed_data(topic, getter \\ &HTTPoison.get/1) do
+ def gather_feed_data(topic, getter \\ &@httpoison.get/1) do
with {:ok, response} <- getter.(topic),
status_code when status_code in 200..299 <- response.status_code,
body <- response.body,
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,
"nickname" => preferredUsername || name,
"name" => displayName || name,
"host" => URI.parse(uri).host,
- "avatar" => avatar
+ "avatar" => avatar,
+ "bio" => bio
}}
else e ->
{:error, e}
end
end
- def request_subscription(websub, poster \\ &HTTPoison.post/3, timeout \\ 10_000) do
+ def request_subscription(websub, poster \\ &@httpoison.post/3, timeout \\ 10_000) do
data = [
"hub.mode": "subscribe",
"hub.topic": websub.topic,
change = Ecto.Changeset.change(websub, %{state: "rejected"})
{:ok, websub} = Repo.update(change)
- Logger.debug("Couldn't confirm subscription: #{inspect(websub)}")
- Logger.debug("error: #{inspect(e)}")
+ Logger.debug(fn -> "Couldn't confirm subscription: #{inspect(websub)}" end)
+ Logger.debug(fn -> "error: #{inspect(e)}" end)
{:error, websub}
end
end
+
+ def refresh_subscriptions(delta \\ 60 * 60 * 24) do
+ Logger.debug("Refreshing subscriptions")
+
+ cut_off = NaiveDateTime.add(NaiveDateTime.utc_now, delta)
+
+ query = from sub in WebsubClientSubscription,
+ where: sub.valid_until < ^cut_off and sub.state == "accepted"
+
+ subs = Repo.all(query)
+
+ Enum.map(subs, fn (sub) ->
+ request_subscription(sub)
+ end)
+ end
end