projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable' into mergeback/2.2.2
[akkoma]
/
lib
/
mix
/
tasks
/
pleroma
/
user.ex
diff --git
a/lib/mix/tasks/pleroma/user.ex
b/lib/mix/tasks/pleroma/user.ex
index e062628047b402d192a0a4be3cd41e1f5020c7ae..e87f1c271d157e0051be05dd98d75e970694dfba 100644
(file)
--- a/
lib/mix/tasks/pleroma/user.ex
+++ b/
lib/mix/tasks/pleroma/user.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Mix.Tasks.Pleroma.User do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Mix.Tasks.Pleroma.User do
@@
-60,7
+60,7
@@
defmodule Mix.Tasks.Pleroma.User do
- admin: #{if(admin?, do: "true", else: "false")}
""")
- admin: #{if(admin?, do: "true", else: "false")}
""")
- proceed? = assume_yes? or shell_
yes?("Continue?"
)
+ proceed? = assume_yes? or shell_
prompt("Continue?", "n") in ~w(Yn Y y
)
if proceed? do
start_pleroma()
if proceed? do
start_pleroma()
@@
-74,7
+74,7
@@
defmodule Mix.Tasks.Pleroma.User do
bio: bio
}
bio: bio
}
- changeset = User.register_changeset(%User{}, params,
need_confirmation: fals
e)
+ changeset = User.register_changeset(%User{}, params,
is_confirmed: tru
e)
{:ok, _user} = User.register(changeset)
shell_info("User #{nickname} created")
{:ok, _user} = User.register(changeset)
shell_info("User #{nickname} created")
@@
-213,7
+213,7
@@
defmodule Mix.Tasks.Pleroma.User do
user =
case Keyword.get(options, :confirmed) do
nil -> user
user =
case Keyword.get(options, :confirmed) do
nil -> user
- value -> set_confirm
ed
(user, value)
+ value -> set_confirm
ation
(user, value)
end
user =
end
user =
@@
-345,13
+345,13
@@
defmodule Mix.Tasks.Pleroma.User do
end
end
end
end
- def run(["
toggle_confirmed
", nickname]) do
+ def run(["
confirm
", nickname]) do
start_pleroma()
with %User{} = user <- User.get_cached_by_nickname(nickname) do
start_pleroma()
with %User{} = user <- User.get_cached_by_nickname(nickname) do
- {:ok, user} = User.
toggle_confirmation
(user)
+ {:ok, user} = User.
confirm
(user)
- message = if
user.confirmation_pending
, do: "needs", else: "doesn't need"
+ message = if
!user.is_confirmed
, do: "needs", else: "doesn't need"
shell_info("#{nickname} #{message} confirmation.")
else
shell_info("#{nickname} #{message} confirmation.")
else
@@
-373,7
+373,7
@@
defmodule Mix.Tasks.Pleroma.User do
|> Pleroma.Repo.chunk_stream(500, :batches)
|> Stream.each(fn users ->
users
|> Pleroma.Repo.chunk_stream(500, :batches)
|> Stream.each(fn users ->
users
- |> Enum.each(fn user -> User.
need_confirmation(user, fals
e) end)
+ |> Enum.each(fn user -> User.
set_confirmation(user, tru
e) end)
end)
|> Stream.run()
end
end)
|> Stream.run()
end
@@
-391,7
+391,7
@@
defmodule Mix.Tasks.Pleroma.User do
|> Pleroma.Repo.chunk_stream(500, :batches)
|> Stream.each(fn users ->
users
|> Pleroma.Repo.chunk_stream(500, :batches)
|> Stream.each(fn users ->
users
- |> Enum.each(fn user -> User.
need_confirmation(user, tru
e) end)
+ |> Enum.each(fn user -> User.
set_confirmation(user, fals
e) end)
end)
|> Stream.run()
end
end)
|> Stream.run()
end
@@
-419,7
+419,7
@@
defmodule Mix.Tasks.Pleroma.User do
|> Enum.each(fn user ->
shell_info(
"#{user.nickname} moderator: #{user.is_moderator}, admin: #{user.is_admin}, locked: #{
|> Enum.each(fn user ->
shell_info(
"#{user.nickname} moderator: #{user.is_moderator}, admin: #{user.is_admin}, locked: #{
- user.locked
+ user.
is_
locked
}, deactivated: #{user.deactivated}"
)
end)
}, deactivated: #{user.deactivated}"
)
end)
@@
-447,17
+447,17
@@
defmodule Mix.Tasks.Pleroma.User do
defp set_locked(user, value) do
{:ok, user} =
user
defp set_locked(user, value) do
{:ok, user} =
user
- |> Changeset.change(%{locked: value})
+ |> Changeset.change(%{
is_
locked: value})
|> User.update_and_set_cache()
|> User.update_and_set_cache()
- shell_info("Locked status of #{user.nickname}: #{user.locked}")
+ shell_info("Locked status of #{user.nickname}: #{user.
is_
locked}")
user
end
user
end
- defp set_confirm
ed
(user, value) do
- {:ok, user} = User.
need_confirmation(user, !
value)
+ defp set_confirm
ation
(user, value) do
+ {:ok, user} = User.
set_confirmation(user,
value)
- shell_info("Confirmation
pending status of #{user.nickname}: #{user.confirmation_pending
}")
+ shell_info("Confirmation
status of #{user.nickname}: #{user.is_confirmed
}")
user
end
end
user
end
end