Merge remote-tracking branch 'origin' into validate-user-info

[akkoma] / lib / pleroma / user / info.ex

diff --git a/lib/pleroma/user/info.ex b/lib/pleroma/user/info.ex
index 49387163a054a57cca8eace5dcdafc7a216b89d4..4e2c5472d3789375de4a2fddda61952efd857101 100644 (file)
--- 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