commit: 9710063fdc92ca3df9005ef57f678fd78680a4f0
parent 286204913d6a1e65a8f75fc7277d2003827f9857
Author: Phantasm <phantasm@centrum.cz>
Date: Sun, 1 Jun 2025 21:25:38 +0000
Apply suggestions to 2 files.
Diffstat:
2 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
@@ -93,16 +93,8 @@ defmodule Pleroma.Application do
# Disable warnings_as_errors at runtime, it breaks Phoenix live reload
# due to protocol consolidation warnings
# :warnings_as_errors is deprecated via Code.compiler_options/2 since 1.18
- if elixir_version = System.version() do
- [major, minor] =
- elixir_version
- |> String.split(".")
- |> Enum.map(&String.to_integer/1)
- |> Enum.take(2)
-
- if major == 1 and minor < 18 do
- Code.compiler_options(warnings_as_errors: false)
- end
+ if Version.compare(System.version(), "1.18.0") == :lt do
+ Code.compiler_options(warnings_as_errors: false)
end
# Define workers and child supervisors to be supervised
diff --git a/lib/pleroma/web/activity_pub/object_validators/tag_validator.ex b/lib/pleroma/web/activity_pub/object_validators/tag_validator.ex
@@ -50,7 +50,12 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.TagValidator do
end
def changeset(struct, %{"type" => "Hashtag", "name" => name} = data) do
- name = String.downcase(name)
+ name =
+ case name do
+ "#" <> name -> name
+ name -> name
+ end
+
data = Map.put(data, "name", name)