mirrors/akkoma
1
0
Fork 1
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-14 21:24:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Registration: user state is separate from instance state

Browse source
This commit is contained in:
Alex Gleason 2020-10-11 19:25:34 -05:00
parent b2fed59209
commit c69b205409
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
1 changed files with 3 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lib/pleroma/user.ex
View file

@ -772,33 +772,18 @@ defmodule Pleroma.User do
end
end
def post_register_action(%User{} = user) do
instance_config =
Config.get(:instance)
|> Enum.into(%{})
do_post_register_action(user, instance_config)
end
defp do_post_register_action(%User{confirmation_pending: true} = user, %{
account_activation_required: true
}) do
def post_register_action(%User{confirmation_pending: true} = user) do
with {:ok, _} <- try_send_confirmation_email(user) do
{:ok, user}
end
end
defp do_post_register_action(%User{approval_pending: true} = user, %{
account_approval_required: true
}) do
def post_register_action(%User{approval_pending: true} = user) do
# TODO: Send approval explanation email
{:ok, user}
end
defp do_post_register_action(
%User{approval_pending: false, confirmation_pending: false} = user,
_instance_config
) do
def post_register_action(%User{approval_pending: false, confirmation_pending: false} = user) do
with {:ok, user} <- autofollow_users(user),
{:ok, user} <- set_cache(user),
{:ok, _} <- send_welcome_email(user),