hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move is_good_locale_code? to object validator

Browse source 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
This commit is contained in:
marcin mikołajczak 2023-08-31 11:35:09 +02:00
commit b52d189fcc
5 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/pleroma/web/common_api/activity_draft.ex
View file

@ -10,6 +10,9 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.CommonAPI.Utils
import Pleroma.EctoType.ActivityPub.ObjectValidators.LanguageCode,
only: [is_good_locale_code?: 1]
import Pleroma.Web.Gettext
defstruct valid?: true,
@ -195,7 +198,7 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
defp language(draft) do
language = draft.params[:language]
if Utils.is_good_locale_code?(language) do
if is_good_locale_code?(language) do
%__MODULE__{draft | language: language}
else
draft

4
lib/pleroma/web/common_api/utils.ex
View file

@ -494,8 +494,4 @@ defmodule Pleroma.Web.CommonAPI.Utils do
{:error, dgettext("errors", "Too many attachments")}
end
end
def is_good_locale_code?(code) when is_binary(code), do: code =~ ~r<^[a-zA-Z0-9\-]+$>
def is_good_locale_code?(_code), do: false
end