projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into mutes-blocks-pagination
[akkoma]
/
lib
/
mix
/
tasks
/
pleroma
/
user.ex
diff --git
a/lib/mix/tasks/pleroma/user.ex
b/lib/mix/tasks/pleroma/user.ex
index 8196e34b1dc28a6fbf6500b9fb7e4e532510d4fd..a8d2514118992eea0850b713d2471733b4ed5960 100644
(file)
--- a/
lib/mix/tasks/pleroma/user.ex
+++ b/
lib/mix/tasks/pleroma/user.ex
@@
-370,7
+370,7
@@
defmodule Mix.Tasks.Pleroma.User do
is_admin: false,
invisible: false
})
is_admin: false,
invisible: false
})
- |> Pleroma.Repo
Streamer.chunk_stream(500
)
+ |> Pleroma.Repo
.chunk_stream(500, :batches
)
|> Stream.each(fn users ->
users
|> Enum.each(fn user -> User.need_confirmation(user, false) end)
|> Stream.each(fn users ->
users
|> Enum.each(fn user -> User.need_confirmation(user, false) end)
@@
-388,7
+388,7
@@
defmodule Mix.Tasks.Pleroma.User do
is_admin: false,
invisible: false
})
is_admin: false,
invisible: false
})
- |> Pleroma.Repo
Streamer.chunk_stream(500
)
+ |> Pleroma.Repo
.chunk_stream(500, :batches
)
|> Stream.each(fn users ->
users
|> Enum.each(fn user -> User.need_confirmation(user, true) end)
|> Stream.each(fn users ->
users
|> Enum.each(fn user -> User.need_confirmation(user, true) 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,19
+447,15
@@
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
defp set_confirmed(user, value) do
user
end
defp set_confirmed(user, value) do
- {:ok, user} =
- case value do
- true -> User.need_confirmation(user, false)
- false -> User.need_confirmation(user, true)
- end
+ {:ok, user} = User.need_confirmation(user, !value)
shell_info("Confirmation pending status of #{user.nickname}: #{user.confirmation_pending}")
user
shell_info("Confirmation pending status of #{user.nickname}: #{user.confirmation_pending}")
user