Mix format

diff --git a/config/description.exs b/config/description.exs
index d329f8afa156e3548a34c85b2e205ac58f215603..bd20cb2392b9dc1f4727f4f910cbcd7a2a648927 100644 (file)
--- a/config/description.exs
+++ b/config/description.exs
@@ -3161,10 +3161,10 @@ config :pleroma, :config_description, [
         children: frontend_options
       },
       %{
-          key: :pickable,
-          type: {:list, :string},
-          description:
-            "A list containing all frontends users can pick as their preference, format is :name/:ref, e.g pleroma-fe/stable."
+        key: :pickable,
+        type: {:list, :string},
+        description:
+          "A list containing all frontends users can pick as their preference, format is :name/:ref, e.g pleroma-fe/stable."
       }
     ]
   },

diff --git a/lib/mix/tasks/pleroma/diagnostics.ex b/lib/mix/tasks/pleroma/diagnostics.ex
index 3b6063723713435a3c4373f4b8bc79f22d9269e1..87be38b7834d2f27c6501a0d723d708de5ad7388 100644 (file)
--- a/lib/mix/tasks/pleroma/diagnostics.ex
+++ b/lib/mix/tasks/pleroma/diagnostics.ex
@@ -120,8 +120,8 @@ defmodule Mix.Tasks.Pleroma.Diagnostics do
         params
       )
       |> limit(20)
-    
+
     Ecto.Adapters.SQL.explain(Repo, :all, query, analyze: true, timeout: :infinity)
-    |> IO.puts()    
+    |> IO.puts()
   end
 end

diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
index 5d7297c236e03e1dcb6d384a8ce1b81d2e4fd13e..4e6842d85058b8d05cfab9a5d8d46aebc6899d16 100644 (file)
--- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/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

diff --git a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
index 4c5a36895ceac1a09f025b3e9daae04450f9ba48..ea2d86f92ec4e51b9b6bcaf14d19ce24cd450e3c 100644 (file)
--- a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
+++ b/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
 

diff --git a/lib/pleroma/web/plugs/http_security_plug.ex b/lib/pleroma/web/plugs/http_security_plug.ex
index 570aeefff8d88ce8492dbdb533fd4c84545b1b28..d7cff73436a83701ed02fbfe16b85174edea0265 100644 (file)
--- a/lib/pleroma/web/plugs/http_security_plug.ex
+++ b/lib/pleroma/web/plugs/http_security_plug.ex
@@ -117,11 +117,13 @@ defmodule Pleroma.Web.Plugs.HTTPSecurityPlug 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'"
-    else
-      script_src
-    end
+
+    script_src =
+      if @mix_env == :dev do
+        "script-src 'self' 'unsafe-eval' 'unsafe-inline'"
+      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"

diff --git a/test/pleroma/web/mastodon_api/controllers/timeline_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/timeline_controller_test.exs
index fcc7a204eb58b429d7afd4246ded0a7d30cc59dc..eed12234f0afa1da216a1a1e4d67732873d6bccb 100644 (file)
--- a/test/pleroma/web/mastodon_api/controllers/timeline_controller_test.exs
+++ b/test/pleroma/web/mastodon_api/controllers/timeline_controller_test.exs
@@ -423,10 +423,9 @@ defmodule Pleroma.Web.MastodonAPI.TimelineControllerTest do
     test "should not return 404 if local is specified" do
       clear_config([:instance, :federated_timeline_available], false)
 
-      result =
-        build_conn()
-        |> get("/api/v1/timelines/public?local=true")
-        |> json_response_and_validate_schema(200)
+      build_conn()
+      |> get("/api/v1/timelines/public?local=true")
+      |> json_response_and_validate_schema(200)
     end
   end