Assorted fixes.

This commit is contained in:
lain 2018-11-30 17:08:02 +01:00
commit 48b95a9b95
5 changed files with 19 additions and 15 deletions

View file

@ -20,6 +20,8 @@ defmodule Pleroma.User.Info do
field(:settings, :map, default: nil)
field(:magic_key, :string, default: nil)
field(:uri, :string, default: nil)
field(:topic, :string, default: nil)
field(:hub, :string, default: nil)
# topic, subject, salmon, subscribe_address, uri
end
@ -99,7 +101,9 @@ defmodule Pleroma.User.Info do
:banner,
:locked,
:magic_key,
:uri
:uri,
:hub,
:topic
])
end

View file

@ -146,7 +146,7 @@ defmodule Pleroma.Web.Websub do
end
def subscribe(subscriber, subscribed, requester \\ &request_subscription/1) do
topic = subscribed.info["topic"]
topic = subscribed.info.topic
# FIXME: Race condition, use transactions
{:ok, subscription} =
with subscription when not is_nil(subscription) <-
@ -158,7 +158,7 @@ defmodule Pleroma.Web.Websub do
_e ->
subscription = %WebsubClientSubscription{
topic: topic,
hub: subscribed.info["hub"],
hub: subscribed.info.hub,
subscribers: [subscriber.ap_id],
state: "requested",
secret: :crypto.strong_rand_bytes(8) |> Base.url_encode64(),