projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
[akkoma]
/
lib
/
pleroma
/
user.ex
diff --git
a/lib/pleroma/user.ex
b/lib/pleroma/user.ex
index a8e902bf35c32cfa33568b705b7787ba3cd46527..6aaa3244f41188da2181dec5ce5db4ca50d63284 100644
(file)
--- a/
lib/pleroma/user.ex
+++ b/
lib/pleroma/user.ex
@@
-294,8
+294,10
@@
defmodule Pleroma.User do
if user.info.confirmation_pending &&
Pleroma.Config.get([:instance, :account_activation_required]) do
user
if user.info.confirmation_pending &&
Pleroma.Config.get([:instance, :account_activation_required]) do
user
- |> Pleroma.UserEmail.account_confirmation_email()
- |> Pleroma.Mailer.deliver_async()
+ |> Pleroma.Emails.UserEmail.account_confirmation_email()
+ |> Pleroma.Emails.Mailer.deliver_async()
+
+ {:ok, :enqueued}
else
{:ok, :noop}
end
else
{:ok, :noop}
end
@@
-1159,13
+1161,16
@@
defmodule Pleroma.User do
def deactivate(%User{} = user, status \\ true) do
info_cng = User.Info.set_activation_status(user.info, status)
def deactivate(%User{} = user, status \\ true) do
info_cng = User.Info.set_activation_status(user.info, status)
- with {:ok, user} <-
+ with {:ok, friends} <- User.get_friends(user),
+ {:ok, followers} <- User.get_followers(user),
+ {:ok, user} <-
user
|> change()
|> put_embed(:info, info_cng)
user
|> change()
|> put_embed(:info, info_cng)
- |> update_and_set_cache()
,
- {:ok, friends} <- User.get_friends(user) do
+ |> update_and_set_cache()
do
+ Enum.each(followers, &invalidate_cache(&1))
Enum.each(friends, &update_follower_count(&1))
Enum.each(friends, &update_follower_count(&1))
+
{:ok, user}
end
end
{:ok, user}
end
end