Merge branch 're-mrf' into 'develop'

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

diff --git a/lib/pleroma/user/info.ex b/lib/pleroma/user/info.ex
index b664af81c033022ad15e326aca873946e0cf129f..7a99787f81a78405e3253cbb07a290990fc68fff 100644 (file)
--- a/lib/pleroma/user/info.ex
+++ b/lib/pleroma/user/info.ex
@@ -4,6 +4,7 @@ defmodule Pleroma.User.Info do
 
   embedded_schema do
     field(:banner, :map, default: %{})
+    field(:background, :map, default: %{})
     field(:source_data, :map, default: %{})
     field(:note_count, :integer, default: 0)
     field(:follower_count, :integer, default: 0)
@@ -15,7 +16,23 @@ defmodule Pleroma.User.Info do
     field(:no_rich_text, :boolean, default: false)
     field(:ap_enabled, :boolean, default: false)
     field(:is_moderator, :boolean, default: false)
+    field(:is_admin, :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)
+    field(:salmon, :string, default: nil)
+    field(:hide_network, :boolean, default: false)
+
+    # Found in the wild
+    # ap_id -> Where is this used?
+    # bio -> Where is this used?
+    # avatar -> Where is this used?
+    # fqn -> Where is this used?
+    # host -> Where is this used?
+    # subject _> Where is this used?
   end
 
   def set_activation_status(info, deactivated) do
@@ -88,12 +105,63 @@ defmodule Pleroma.User.Info do
 
   def remote_user_creation(info, params) do
     info
-    |> cast(params, [:source_data])
+    |> cast(params, [
+      :ap_enabled,
+      :source_data,
+      :banner,
+      :locked,
+      :magic_key,
+      :uri,
+      :hub,
+      :topic,
+      :salmon
+    ])
   end
 
-  # Receives data from user_data_from_user_object
   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,
+      :banner,
+      :hide_network,
+      :background
+    ])
+  end
+
+  def mastodon_profile_update(info, params) do
+    info
+    |> cast(params, [
+      :locked,
+      :banner
+    ])
+  end
+
+  def set_source_data(info, source_data) do
+    params = %{source_data: source_data}
+
+    info
+    |> cast(params, [:source_data])
+    |> validate_required([:source_data])
+  end
+
+  def admin_api_update(info, params) do
+    info
+    |> cast(params, [
+      :is_moderator,
+      :is_admin
+    ])
   end
 end