timorl/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Packages Projects Releases Wiki Activity

Formatting

Browse source
This commit is contained in:
timorl 2024-04-16 08:02:13 +02:00
parent b144218dce
commit 59d32c10d9
No known key found for this signature in database
GPG key ID: 8E97CB9C0E7F3285
5 changed files with 53 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/web/plugs/o_auth_scopes_plug.ex
View file

@ -34,9 +34,7 @@ defmodule Pleroma.Web.Plugs.OAuthScopesPlug do
permissions = Enum.join(missing_scopes, " #{op} ") permissions = Enum.join(missing_scopes, " #{op} ")
error_message = error_message =
dgettext("errors", "Insufficient permissions: %{permissions}.", dgettext("errors", "Insufficient permissions: %{permissions}.", permissions: permissions)
permissions: permissions
)
conn conn
|> put_resp_content_type("application/json") |> put_resp_content_type("application/json")

69
lib/pleroma/web/telemetry.ex
View file

@ -151,41 +151,40 @@ defmodule Pleroma.Web.Telemetry do
# phoenix.router_dispatch.stop.duration # phoenix.router_dispatch.stop.duration
# pleroma.repo.query.total_time # pleroma.repo.query.total_time
# pleroma.repo.query.queue_time # pleroma.repo.query.queue_time
dist_metrics = dist_metrics = [
[ distribution("phoenix.endpoint.stop.duration.fdist",
distribution("phoenix.endpoint.stop.duration.fdist", event_name: [:phoenix, :endpoint, :stop],
event_name: [:phoenix, :endpoint, :stop], measurement: :duration,
measurement: :duration, unit: {:native, :millisecond},
unit: {:native, :millisecond}, reporter_options: [
reporter_options: [ buckets: simple_buckets
buckets: simple_buckets ]
] ),
), distribution("pleroma.repo.query.decode_time.fdist",
distribution("pleroma.repo.query.decode_time.fdist", event_name: [:pleroma, :repo, :query],
event_name: [:pleroma, :repo, :query], measurement: :decode_time,
measurement: :decode_time, unit: {:native, :millisecond},
unit: {:native, :millisecond}, reporter_options: [
reporter_options: [ buckets: simple_buckets_quick
buckets: simple_buckets_quick ]
] ),
), distribution("pleroma.repo.query.query_time.fdist",
distribution("pleroma.repo.query.query_time.fdist", event_name: [:pleroma, :repo, :query],
event_name: [:pleroma, :repo, :query], measurement: :query_time,
measurement: :query_time, unit: {:native, :millisecond},
unit: {:native, :millisecond}, reporter_options: [
reporter_options: [ buckets: simple_buckets
buckets: simple_buckets ]
] ),
), distribution("pleroma.repo.query.idle_time.fdist",
distribution("pleroma.repo.query.idle_time.fdist", event_name: [:pleroma, :repo, :query],
event_name: [:pleroma, :repo, :query], measurement: :idle_time,
measurement: :idle_time, unit: {:native, :millisecond},
unit: {:native, :millisecond}, reporter_options: [
reporter_options: [ buckets: simple_buckets
buckets: simple_buckets ]
] )
) ]
]
vm_metrics = vm_metrics =
sum_counter_pair("vm.memory.total", sum_counter_pair("vm.memory.total",

2
test/mix/tasks/pleroma/instance_test.exs
View file

@ -93,8 +93,10 @@ defmodule Mix.Tasks.Pleroma.InstanceTest do
assert generated_config =~ "password: \"dbpass\"" assert generated_config =~ "password: \"dbpass\""
assert generated_config =~ "configurable_from_database: true" assert generated_config =~ "configurable_from_database: true"
assert generated_config =~ "http: [ip: {127, 0, 0, 1}, port: 4000]" assert generated_config =~ "http: [ip: {127, 0, 0, 1}, port: 4000]"
assert generated_config =~ assert generated_config =~
"filters: [Pleroma.Upload.Filter.Exiftool.StripLocation, Pleroma.Upload.Filter.Exiftool.ReadDescription]" "filters: [Pleroma.Upload.Filter.Exiftool.StripLocation, Pleroma.Upload.Filter.Exiftool.ReadDescription]"
assert generated_config =~ "base_url: \"https://media.pleroma.social/media\"" assert generated_config =~ "base_url: \"https://media.pleroma.social/media\""
assert File.read!(tmp_path() <> "setup.psql") == generated_setup_psql() assert File.read!(tmp_path() <> "setup.psql") == generated_setup_psql()
assert File.exists?(Path.expand("./test/instance/static/robots.txt")) assert File.exists?(Path.expand("./test/instance/static/robots.txt"))

15
test/pleroma/web/activity_pub/object_validators/attachment_validator_test.exs
View file

@ -12,14 +12,13 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.AttachmentValidatorTest do
describe "attachments" do describe "attachments" do
test "works with apng" do test "works with apng" do
attachment = attachment = %{
%{ "mediaType" => "image/apng",
"mediaType" => "image/apng", "name" => "",
"name" => "", "type" => "Document",
"type" => "Document", "url" =>
"url" => "https://media.misskeyusercontent.com/io/2859c26e-cd43-4550-848b-b6243bc3fe28.apng"
"https://media.misskeyusercontent.com/io/2859c26e-cd43-4550-848b-b6243bc3fe28.apng" }
}
assert {:ok, attachment} = assert {:ok, attachment} =
AttachmentValidator.cast_and_validate(attachment) AttachmentValidator.cast_and_validate(attachment)

19
test/support/factory.ex
View file

@ -559,16 +559,15 @@ defmodule Pleroma.Factory do
like_activity = attrs[:like_activity] || insert(:like_activity) like_activity = attrs[:like_activity] || insert(:like_activity)
attrs = Map.drop(attrs, [:like_activity]) attrs = Map.drop(attrs, [:like_activity])
data = data = %{
%{ "id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(),
"id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(), "type" => "Undo",
"type" => "Undo", "actor" => like_activity.data["actor"],
"actor" => like_activity.data["actor"], "to" => like_activity.data["to"],
"to" => like_activity.data["to"], "object" => like_activity.data["id"],
"object" => like_activity.data["id"], "published" => DateTime.utc_now() |> DateTime.to_iso8601(),
"published" => DateTime.utc_now() |> DateTime.to_iso8601(), "context" => like_activity.data["context"]
"context" => like_activity.data["context"] }
}
%Pleroma.Activity{ %Pleroma.Activity{
data: data, data: data,