Mix format

config/description.exs

@@ -3161,10 +3161,10 @@
         children: frontend_options
       },
       %{
-          key: :pickable,
+        key: :pickable,
-          type: {:list, :string},
+        type: {:list, :string},
-          description:
+        description:
-            "A list containing all frontends users can pick as their preference, format is :name/:ref, e.g pleroma-fe/stable."
+          "A list containing all frontends users can pick as their preference, format is :name/:ref, e.g pleroma-fe/stable."
       }
     ]
   },

lib/pleroma/web/activity_pub/activity_pub_controller.ex

@@ -8,7 +8,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
   alias Pleroma.Activity
   alias Pleroma.Delivery
   alias Pleroma.Object
-  alias Pleroma.Object.Fetcher
   alias Pleroma.User
   alias Pleroma.Web.ActivityPub.ActivityPub
   alias Pleroma.Web.ActivityPub.InternalFetchActor

lib/pleroma/web/nodeinfo/nodeinfo_controller.ex

@@ -5,11 +5,6 @@
 defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
   use Pleroma.Web, :controller
 
-  alias Pleroma.Config
-  alias Pleroma.Stats
-  alias Pleroma.User
-  alias Pleroma.Web.Federator.Publisher
-  alias Pleroma.Web.MastodonAPI.InstanceView
   alias Pleroma.Web.Endpoint
   alias Pleroma.Web.Nodeinfo.Nodeinfo
 

lib/pleroma/web/plugs/http_security_plug.ex

@@ -117,11 +117,13 @@ defp csp_string(conn) do
     font_src = "font-src 'self'"
 
     script_src = "script-src 'self' '#{nonce_tag}' "
-    script_src = if @mix_env == :dev do
+
-      "script-src 'self' 'unsafe-eval' 'unsafe-inline'"
+    script_src =
-    else
+      if @mix_env == :dev do
-      script_src
+        "script-src 'self' 'unsafe-eval' 'unsafe-inline'"
-    end
+      else
+        script_src
+      end
 
     report = if report_uri, do: ["report-uri ", report_uri, ";report-to csp-endpoint"]
     insecure = if scheme == "https", do: "upgrade-insecure-requests"

test/pleroma/web/mastodon_api/controllers/timeline_controller_test.exs

@@ -423,10 +423,9 @@ test "should return 404 if disabled" do
     test "should not return 404 if local is specified" do
       clear_config([:instance, :federated_timeline_available], false)
 
-      result =
+      build_conn()
-        build_conn()
+      |> get("/api/v1/timelines/public?local=true")
-        |> get("/api/v1/timelines/public?local=true")
+      |> json_response_and_validate_schema(200)
-        |> json_response_and_validate_schema(200)
     end
   end