projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'features/hashtag-column' into 'develop'
[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..20fe6c6e408bc85275a5cb88a73774a13b937554 100644
(file)
--- a/
lib/mix/tasks/pleroma/user.ex
+++ b/
lib/mix/tasks/pleroma/user.ex
@@
-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()
@@
-345,11
+345,11
@@
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.confirmation_pending, do: "needs", else: "doesn't need"
@@
-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,10
+447,10
@@
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