projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 7d5df34ba17a553d06e3c7bb08f03c0ac16ef99f..4e2c5472d3789375de4a2fddda61952efd857101 100644
(file)
--- a/
lib/pleroma/user/info.ex
+++ b/
lib/pleroma/user/info.ex
@@
-17,6
+17,12
@@
defmodule Pleroma.User.Info do
field(:ap_enabled, :boolean, default: false)
field(:is_moderator, :boolean, default: false)
field(:keys, :string, default: nil)
field(:ap_enabled, :boolean, default: false)
field(:is_moderator, :boolean, default: false)
field(:keys, :string, default: nil)
+ 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
def set_activation_status(info, deactivated) do
end
def set_activation_status(info, deactivated) do
@@
-93,13
+99,39
@@
defmodule Pleroma.User.Info do
:ap_enabled,
:source_data,
:banner,
:ap_enabled,
:source_data,
:banner,
- :locked
+ :locked,
+ :magic_key,
+ :uri,
+ :hub,
+ :topic
])
end
])
end
- # Receives data from user_data_from_user_object
def user_upgrade(info, params) do
info
def user_upgrade(info, params) do
info
- |> cast(params, [:ap_enabled, :source_data, :banner, :locked])
+ |> cast(params, [
+ :ap_enabled,
+ :source_data,
+ :banner,
+ :locked,
+ :magic_key
+ ])
+ end
+
+ def profile_update(info, params) do
+ info
+ |> cast(params, [
+ :locked,
+ :no_rich_text,
+ :default_scope
+ ])
+ end
+
+ def set_source_data(info, source_data) do
+ params = %{source_data: source_data}
+
+ info
+ |> cast(params, [:source_data])
+ |> validate_required([:source_data])
end
end
end
end