aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/user.ex32
-rw-r--r--lib/pleroma/user/query.ex20
-rw-r--r--lib/pleroma/web/activity_pub/activity_pub.ex6
-rw-r--r--lib/pleroma/web/activity_pub/views/user_view.ex8
-rw-r--r--lib/pleroma/web/api_spec/operations/account_operation.ex16
-rw-r--r--lib/pleroma/web/api_spec/schemas/account.ex6
-rw-r--r--lib/pleroma/web/mastodon_api/controllers/account_controller.ex4
-rw-r--r--lib/pleroma/web/mastodon_api/views/account_view.ex18
-rw-r--r--lib/pleroma/web/mastodon_api/views/instance_view.ex4
-rw-r--r--lib/pleroma/web/twitter_api/twitter_api.ex2
10 files changed, 58 insertions, 58 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 5655762ac..d608525e8 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -154,8 +154,8 @@ defmodule Pleroma.User do
field(:pinned_objects, :map, default: %{})
field(:is_suggested, :boolean, default: false)
field(:last_status_at, :naive_datetime)
- field(:birth_date, :date)
- field(:hide_birth_date, :boolean, default: false)
+ field(:birthday, :date)
+ field(:hide_birthday, :boolean, default: false)
embeds_one(
:notification_settings,
@@ -473,7 +473,7 @@ defmodule Pleroma.User do
:also_known_as,
:accepts_chat_messages,
:pinned_objects,
- :birth_date
+ :birthday
]
)
|> cast(params, [:name], empty_values: [])
@@ -535,8 +535,8 @@ defmodule Pleroma.User do
:actor_type,
:accepts_chat_messages,
:disclose_client,
- :birth_date,
- :hide_birth_date
+ :birthday,
+ :hide_birthday
]
)
|> validate_min_age()
@@ -745,7 +745,7 @@ defmodule Pleroma.User do
:emoji,
:accepts_chat_messages,
:registration_reason,
- :birth_date
+ :birthday
])
|> validate_required([:name, :nickname, :password, :password_confirmation])
|> validate_confirmation(:password)
@@ -767,7 +767,7 @@ defmodule Pleroma.User do
|> validate_length(:name, min: 1, max: name_limit)
|> validate_length(:registration_reason, max: reason_limit)
|> maybe_validate_required_email(opts[:external])
- |> maybe_validate_required_birth_date
+ |> maybe_validate_required_birthday
|> validate_min_age()
|> put_password_hash
|> put_ap_id()
@@ -785,9 +785,9 @@ defmodule Pleroma.User do
end
end
- defp maybe_validate_required_birth_date(changeset) do
- if Config.get([:instance, :birth_date_required]) do
- validate_required(changeset, [:birth_date])
+ defp maybe_validate_required_birthday(changeset) do
+ if Config.get([:instance, :birthday_required]) do
+ validate_required(changeset, [:birthday])
else
changeset
end
@@ -795,13 +795,13 @@ defmodule Pleroma.User do
defp validate_min_age(changeset) do
changeset
- |> validate_change(:birth_date, fn :birth_date, birth_date ->
+ |> validate_change(:birthday, fn :birthday, birthday ->
valid? =
Date.utc_today()
- |> Date.diff(birth_date) >=
- Config.get([:instance, :birth_date_min_age])
+ |> Date.diff(birthday) >=
+ Config.get([:instance, :birthday_min_age])
- if valid?, do: [], else: [birth_date: "Invalid birth date"]
+ if valid?, do: [], else: [birthday: "Invalid age"]
end)
end
@@ -2589,8 +2589,8 @@ defmodule Pleroma.User do
User.Query.build(%{
friends: user,
deactivated: false,
- birth_day: day,
- birth_month: month
+ birthday_day: day,
+ birthday_month: month
})
end
end
diff --git a/lib/pleroma/user/query.ex b/lib/pleroma/user/query.ex
index ea1706c9e..dddfe07bf 100644
--- a/lib/pleroma/user/query.ex
+++ b/lib/pleroma/user/query.ex
@@ -60,8 +60,8 @@ defmodule Pleroma.User.Query do
select: term(),
limit: pos_integer(),
actor_types: [String.t()],
- birth_day: pos_integer(),
- birth_month: pos_integer()
+ birthday_day: pos_integer(),
+ birthday_month: pos_integer()
}
| map()
@@ -232,18 +232,18 @@ defmodule Pleroma.User.Query do
|> where([u], not like(u.nickname, "internal.%"))
end
- defp compose_query({:birth_day, day}, query) do
+ defp compose_query({:birthday_day, day}, query) do
query
- |> where([u], u.hide_birth_date == false)
- |> where([u], not is_nil(u.birth_date))
- |> where([u], fragment("date_part('day', ?)", u.birth_date) == ^day)
+ |> where([u], u.hide_birthday == false)
+ |> where([u], not is_nil(u.birthday))
+ |> where([u], fragment("date_part('day', ?)", u.birthday) == ^day)
end
- defp compose_query({:birth_month, month}, query) do
+ defp compose_query({:birthday_month, month}, query) do
query
- |> where([u], u.hide_birth_date == false)
- |> where([u], not is_nil(u.birth_date))
- |> where([u], fragment("date_part('month', ?)", u.birth_date) == ^month)
+ |> where([u], u.hide_birthday == false)
+ |> where([u], not is_nil(u.birthday))
+ |> where([u], fragment("date_part('month', ?)", u.birthday) == ^month)
end
defp compose_query(_unsupported_param, query), do: query
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index e1f94ba9c..bdbcc93f4 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -1501,8 +1501,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
nil
end
- birth_date =
- if data["vcard:bday"] do
+ birthday =
+ if is_binary(data["vcard:bday"]) do
case Date.from_iso8601(data["vcard:bday"]) do
{:ok, date} -> date
{:error, _} -> nil
@@ -1534,7 +1534,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
shared_inbox: shared_inbox,
accepts_chat_messages: accepts_chat_messages,
pinned_objects: pinned_objects,
- birth_date: birth_date
+ birthday: birthday
}
# nickname can be nil because of virtual actors
diff --git a/lib/pleroma/web/activity_pub/views/user_view.ex b/lib/pleroma/web/activity_pub/views/user_view.ex
index 942f5685a..8ab516214 100644
--- a/lib/pleroma/web/activity_pub/views/user_view.ex
+++ b/lib/pleroma/web/activity_pub/views/user_view.ex
@@ -92,9 +92,9 @@ defmodule Pleroma.Web.ActivityPub.UserView do
%{}
end
- birth_date =
- if !user.hide_birth_date,
- do: user.birth_date,
+ birthday =
+ if !user.hide_birthday,
+ do: user.birthday,
else: nil
%{
@@ -122,7 +122,7 @@ defmodule Pleroma.Web.ActivityPub.UserView do
"discoverable" => user.is_discoverable,
"capabilities" => capabilities,
"alsoKnownAs" => user.also_known_as,
- "vcard:bday" => birth_date
+ "vcard:bday" => birthday
}
|> Map.merge(maybe_make_image(&User.avatar_url/2, "icon", user))
|> Map.merge(maybe_make_image(&User.banner_url/2, "image", user))
diff --git a/lib/pleroma/web/api_spec/operations/account_operation.ex b/lib/pleroma/web/api_spec/operations/account_operation.ex
index e0ef45027..1b2bffa3e 100644
--- a/lib/pleroma/web/api_spec/operations/account_operation.ex
+++ b/lib/pleroma/web/api_spec/operations/account_operation.ex
@@ -544,10 +544,10 @@ defmodule Pleroma.Web.ApiSpec.AccountOperation do
nullable: true,
description: "Invite token required when the registrations aren't public"
},
- birth_date: %Schema{
+ birthday: %Schema{
type: :string,
nullable: true,
- description: "User's birth date",
+ description: "User's birthday",
format: :date
}
},
@@ -727,16 +727,16 @@ defmodule Pleroma.Web.ApiSpec.AccountOperation do
"Discovery (listing, indexing) of this account by external services (search bots etc.) is allowed."
},
actor_type: ActorType,
- birth_date: %Schema{
+ birthday: %Schema{
type: :string,
nullable: true,
- description: "User's birth date",
+ description: "User's birthday",
format: :date
},
- hide_birth_date: %Schema{
+ hide_birthday: %Schema{
allOf: [BooleanLike],
nullable: true,
- description: "User's birth date will be hidden"
+ description: "User's birthday will be hidden"
}
},
example: %{
@@ -758,8 +758,8 @@ defmodule Pleroma.Web.ApiSpec.AccountOperation do
also_known_as: ["https://foo.bar/users/foo"],
discoverable: false,
actor_type: "Person",
- hide_birth_date: true,
- birth_date: "2001-02-12"
+ hide_birthday: true,
+ birthday: "2001-02-12"
}
}
end
diff --git a/lib/pleroma/web/api_spec/schemas/account.ex b/lib/pleroma/web/api_spec/schemas/account.ex
index 3796bccfd..2113f0d31 100644
--- a/lib/pleroma/web/api_spec/schemas/account.ex
+++ b/lib/pleroma/web/api_spec/schemas/account.ex
@@ -47,14 +47,14 @@ defmodule Pleroma.Web.ApiSpec.Schemas.Account do
description: "whether the user allows automatically follow moved following accounts"
},
background_image: %Schema{type: :string, nullable: true, format: :uri},
- birth_date: %Schema{type: :string, nullable: true, format: :date},
+ birthday: %Schema{type: :string, nullable: true, format: :date},
chat_token: %Schema{type: :string},
is_confirmed: %Schema{
type: :boolean,
description:
"whether the user account is waiting on email confirmation to be activated"
},
- hide_birth_date: %Schema{type: :boolean, nullable: true},
+ hide_birthday: %Schema{type: :boolean, nullable: true},
hide_favorites: %Schema{type: :boolean},
hide_followers_count: %Schema{
type: :boolean,
@@ -205,7 +205,7 @@ defmodule Pleroma.Web.ApiSpec.Schemas.Account do
"settings_store" => %{
"pleroma-fe" => %{}
},
- "birth_date" => "2001-02-12"
+ "birthday" => "2001-02-12"
},
"source" => %{
"fields" => [],
diff --git a/lib/pleroma/web/mastodon_api/controllers/account_controller.ex b/lib/pleroma/web/mastodon_api/controllers/account_controller.ex
index 64034fbef..60c9f7d69 100644
--- a/lib/pleroma/web/mastodon_api/controllers/account_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/account_controller.ex
@@ -192,7 +192,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountController do
:allow_following_move,
:also_known_as,
:accepts_chat_messages,
- :hide_birth_date
+ :hide_birthday
]
|> Enum.reduce(%{}, fn key, acc ->
Maps.put_if_present(acc, key, params[key], &{:ok, Params.truthy_param?(&1)})
@@ -220,7 +220,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountController do
|> Maps.put_if_present(:is_locked, params[:locked])
# Note: param name is indeed :discoverable (not an error)
|> Maps.put_if_present(:is_discoverable, params[:discoverable])
- |> Maps.put_if_present(:birth_date, params[:birth_date])
+ |> Maps.put_if_present(:birthday, params[:birthday])
# What happens here:
#
diff --git a/lib/pleroma/web/mastodon_api/views/account_view.ex b/lib/pleroma/web/mastodon_api/views/account_view.ex
index 6c7b4f7c5..e0137a112 100644
--- a/lib/pleroma/web/mastodon_api/views/account_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/account_view.ex
@@ -298,8 +298,8 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
background_image: image_url(user.background) |> MediaProxy.url(),
accepts_chat_messages: user.accepts_chat_messages,
favicon: favicon,
- birth_date: user.birth_date,
- hide_birth_date: user.hide_birth_date
+ birthday: user.birthday,
+ hide_birthday: user.hide_birthday
}
}
|> maybe_put_role(user, opts[:for])
@@ -313,7 +313,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
|> maybe_put_unread_conversation_count(user, opts[:for])
|> maybe_put_unread_notification_count(user, opts[:for])
|> maybe_put_email_address(user, opts[:for])
- |> maybe_hide_birth_date(user, opts[:for])
+ |> maybe_hide_birthday(user, opts[:for])
end
defp username_from_nickname(string) when is_binary(string) do
@@ -435,21 +435,21 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
defp maybe_put_email_address(data, _, _), do: data
- defp maybe_hide_birth_date(data, %User{id: user_id}, %User{id: user_id}) do
+ defp maybe_hide_birthday(data, %User{id: user_id}, %User{id: user_id}) do
data
end
- defp maybe_hide_birth_date(data, %User{hide_birth_date: true}, _) do
+ defp maybe_hide_birthday(data, %User{hide_birthday: true}, _) do
data
- |> Kernel.pop_in([:pleroma, :birth_date])
+ |> Kernel.pop_in([:pleroma, :birthday])
|> elem(1)
- |> Kernel.pop_in([:pleroma, :hide_birth_date])
+ |> Kernel.pop_in([:pleroma, :hide_birthday])
|> elem(1)
end
- defp maybe_hide_birth_date(data, _, _) do
+ defp maybe_hide_birthday(data, _, _) do
data
- |> Kernel.pop_in([:pleroma, :hide_birth_date])
+ |> Kernel.pop_in([:pleroma, :hide_birthday])
|> elem(1)
end
diff --git a/lib/pleroma/web/mastodon_api/views/instance_view.ex b/lib/pleroma/web/mastodon_api/views/instance_view.ex
index f7c76f06b..f24979048 100644
--- a/lib/pleroma/web/mastodon_api/views/instance_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/instance_view.ex
@@ -47,8 +47,8 @@ defmodule Pleroma.Web.MastodonAPI.InstanceView do
fields_limits: fields_limits(),
post_formats: Config.get([:instance, :allowed_post_formats]),
privileged_staff: Config.get([:instance, :privileged_staff]),
- birth_date_required: Config.get([:instance, :birth_date_required]),
- birth_date_min_age: Config.get([:instance, :birth_date_min_age])
+ birthday_required: Config.get([:instance, :birthday_required]),
+ birthday_min_age: Config.get([:instance, :birthday_min_age])
},
stats: %{mau: Pleroma.User.active_user_count()},
vapid_public_key: Keyword.get(Pleroma.Web.Push.vapid_config(), :public_key)
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index 91d10d260..aa4dfb145 100644
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -20,7 +20,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
|> Map.put(:name, Map.get(params, :fullname, params[:username]))
|> Map.put(:password_confirmation, params[:password])
|> Map.put(:registration_reason, params[:reason])
- |> Map.put(:birth_date, params[:birth_date])
+ |> Map.put(:birthday, params[:birthday])
if Pleroma.Config.get([:instance, :registrations_open]) do
create_user(params, opts)
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-24 12:50:20 +0000