Mix format

This commit is contained in:
FloatingGhost 2023-04-14 17:56:34 +01:00
parent 1fa3c0b485
commit 522221f7fb
6 changed files with 16 additions and 21 deletions

View file

@ -3161,10 +3161,10 @@ config :pleroma, :config_description, [
children: frontend_options 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."
} }
] ]
}, },

View file

@ -120,8 +120,8 @@ defmodule Mix.Tasks.Pleroma.Diagnostics do
params params
) )
|> limit(20) |> limit(20)
Ecto.Adapters.SQL.explain(Repo, :all, query, analyze: true, timeout: :infinity) Ecto.Adapters.SQL.explain(Repo, :all, query, analyze: true, timeout: :infinity)
|> IO.puts() |> IO.puts()
end end
end end

View file

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

View file

@ -5,11 +5,6 @@
defmodule Pleroma.Web.Nodeinfo.NodeinfoController do defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
use Pleroma.Web, :controller 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.Endpoint
alias Pleroma.Web.Nodeinfo.Nodeinfo alias Pleroma.Web.Nodeinfo.Nodeinfo

View file

@ -117,11 +117,13 @@ defmodule Pleroma.Web.Plugs.HTTPSecurityPlug do
font_src = "font-src 'self'" font_src = "font-src 'self'"
script_src = "script-src 'self' '#{nonce_tag}' " 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"] report = if report_uri, do: ["report-uri ", report_uri, ";report-to csp-endpoint"]
insecure = if scheme == "https", do: "upgrade-insecure-requests" insecure = if scheme == "https", do: "upgrade-insecure-requests"

View file

@ -423,10 +423,9 @@ defmodule Pleroma.Web.MastodonAPI.TimelineControllerTest do
test "should not return 404 if local is specified" do test "should not return 404 if local is specified" do
clear_config([:instance, :federated_timeline_available], false) 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
end end