diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/user/info.ex | 6 | ||||
| -rw-r--r-- | lib/pleroma/web/websub/websub.ex | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lib/pleroma/user/info.ex b/lib/pleroma/user/info.ex index 49387163a..4e2c5472d 100644 --- a/lib/pleroma/user/info.ex +++ b/lib/pleroma/user/info.ex @@ -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 diff --git a/lib/pleroma/web/websub/websub.ex b/lib/pleroma/web/websub/websub.ex index e494811f9..440b48665 100644 --- a/lib/pleroma/web/websub/websub.ex +++ b/lib/pleroma/web/websub/websub.ex @@ -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(), |