Assorted fixes.

[akkoma] / lib / pleroma / web / mastodon_api / mastodon_api_controller.ex

diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
index 280bd78fc6b2507c108bfac6b1a0253570f15670..bfd0f7ff4295bf9c23331247530552725dd2c639 100644 (file)
--- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@ -71,34 +71,34 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
         user
       end
 
-    user =
-      if banner = params["header"] do
-        with %Plug.Upload{} <- banner,
-             {:ok, object} <- ActivityPub.upload(banner, banner_upload_limit),
-             new_info <- Map.put(user.info, "banner", object.data),
-             change <- User.info_changeset(user, %{info: new_info}),
-             {:ok, user} <- User.update_and_set_cache(change) do
-          user
-        else
-          _e -> user
-        end
-      else
-        user
-      end
-
-    user =
-      if locked = params["locked"] do
-        with locked <- locked == "true",
-             new_info <- Map.put(user.info, "locked", locked),
-             change <- User.info_changeset(user, %{info: new_info}),
-             {:ok, user} <- User.update_and_set_cache(change) do
-          user
-        else
-          _e -> user
-        end
-      else
-        user
-      end
+    # user =
+    #   if banner = params["header"] do
+    #     with %Plug.Upload{} <- banner,
+    #          {:ok, object} <- ActivityPub.upload(banner, banner_upload_limit),
+    #          new_info <- Map.put(user.info, "banner", object.data),
+    #          change <- User.info_changeset(user, %{info: new_info}),
+    #          {:ok, user} <- User.update_and_set_cache(change) do
+    #       user
+    #     else
+    #       _e -> user
+    #     end
+    #   else
+    #     user
+    #   end
+
+    # user =
+    #   if locked = params["locked"] do
+    #     with locked <- locked == "true",
+    #          new_info <- Map.put(user.info, "locked", locked),
+    #          change <- User.info_changeset(user, %{info: new_info}),
+    #          {:ok, user} <- User.update_and_set_cache(change) do
+    #       user
+    #     else
+    #       _e -> user
+    #     end
+    #   else
+    #     user
+    #   end
 
     with changeset <- User.update_changeset(user, params),
          {:ok, user} <- User.update_and_set_cache(changeset) do
@@ -919,7 +919,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
           },
           compose: %{
             me: "#{user.id}",
-            default_privacy: user.info.default_scope || "public",
+            default_privacy: user.info.default_scope,
             default_sensitive: false
           },
           media_attachments: %{
@@ -939,7 +939,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
             ]
           },
           settings:
-            Map.get(user.info, "settings") ||
+            Map.get(user.info, :settings) ||
               %{
                 onboarded: true,
                 home: %{