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
/
mix
/
tasks
/
pleroma
/
user.ex
diff --git
a/lib/mix/tasks/pleroma/user.ex
b/lib/mix/tasks/pleroma/user.ex
index b396ff0deebc5cfc8c353c785b666b509980cefd..d130ff8c960e3ba919514490ffb2f22a2b7f35a2 100644
(file)
--- a/
lib/mix/tasks/pleroma/user.ex
+++ b/
lib/mix/tasks/pleroma/user.ex
@@
-126,7
+126,7
@@
defmodule Mix.Tasks.Pleroma.User do
proceed? = assume_yes? or Mix.shell().yes?("Continue?")
proceed? = assume_yes? or Mix.shell().yes?("Continue?")
-
unless not
proceed? do
+
if
proceed? do
Common.start_pleroma()
params = %{
Common.start_pleroma()
params = %{
@@
-138,7
+138,7
@@
defmodule Mix.Tasks.Pleroma.User do
bio: bio
}
bio: bio
}
- changeset = User.register_changeset(%User{}, params,
confirmed: tru
e)
+ changeset = User.register_changeset(%User{}, params,
need_confirmation: fals
e)
{:ok, _user} = User.register(changeset)
Mix.shell().info("User #{nickname} created")
{:ok, _user} = User.register(changeset)
Mix.shell().info("User #{nickname} created")
@@
-163,7
+163,7
@@
defmodule Mix.Tasks.Pleroma.User do
Common.start_pleroma()
with %User{local: true} = user <- User.get_cached_by_nickname(nickname) do
Common.start_pleroma()
with %User{local: true} = user <- User.get_cached_by_nickname(nickname) do
- User.
delete(
user)
+ User.
perform(:delete,
user)
Mix.shell().info("User #{nickname} deleted.")
else
_ ->
Mix.shell().info("User #{nickname} deleted.")
else
_ ->
@@
-380,7
+380,7
@@
defmodule Mix.Tasks.Pleroma.User do
Common.start_pleroma()
with %User{local: true} = user <- User.get_cached_by_nickname(nickname) do
Common.start_pleroma()
with %User{local: true} = user <- User.get_cached_by_nickname(nickname) do
- User.delete_user_activities(user)
+
{:ok, _} =
User.delete_user_activities(user)
Mix.shell().info("User #{nickname} statuses deleted.")
else
_ ->
Mix.shell().info("User #{nickname} statuses deleted.")
else
_ ->