Handle User.post_register_action/1 in steps

This commit is contained in:
Alex Gleason 2020-10-11 18:52:35 -05:00
parent bc3cf0fee0
commit b2fed59209
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
2 changed files with 30 additions and 3 deletions

View file

@ -773,12 +773,37 @@ defmodule Pleroma.User do
end end
def post_register_action(%User{} = user) do 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
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
# TODO: Send approval explanation email
{:ok, user}
end
defp do_post_register_action(
%User{approval_pending: false, confirmation_pending: false} = user,
_instance_config
) do
with {:ok, user} <- autofollow_users(user), with {:ok, user} <- autofollow_users(user),
{:ok, user} <- set_cache(user), {:ok, user} <- set_cache(user),
{:ok, _} <- send_welcome_email(user), {:ok, _} <- send_welcome_email(user),
{:ok, _} <- send_welcome_message(user), {:ok, _} <- send_welcome_message(user),
{:ok, _} <- send_welcome_chat_message(user), {:ok, _} <- send_welcome_chat_message(user) do
{:ok, _} <- try_send_confirmation_email(user) do
{:ok, user} {:ok, user}
end end
end end
@ -1570,6 +1595,7 @@ defmodule Pleroma.User do
def approve(%User{} = user) do def approve(%User{} = user) do
change(user, approval_pending: false) change(user, approval_pending: false)
|> update_and_set_cache() |> update_and_set_cache()
|> post_register_action()
end end
def update_notification_settings(%User{} = user, settings) do def update_notification_settings(%User{} = user, settings) do

View file

@ -34,7 +34,8 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
{:ok, _} <- {:ok, _} <-
user user
|> User.confirmation_changeset(need_confirmation: false) |> User.confirmation_changeset(need_confirmation: false)
|> User.update_and_set_cache() do |> User.update_and_set_cache()
|> User.post_register_action() do
redirect(conn, to: "/") redirect(conn, to: "/")
end end
end end