diff options
| author | lain <lain@soykaf.club> | 2021-01-26 14:24:32 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2021-01-26 14:24:32 +0000 |
| commit | 229acae6c3da541ebb0438cb7f310cdce1df92b3 (patch) | |
| tree | 8b93f46ac090021e7e53db392ba54a3c48b31fda /lib/pleroma/web/admin_api/controllers | |
| parent | 71166b30a42ad3a8988049992bcab93c7e2ed656 (diff) | |
| parent | 250e2020987b1fc65251ba9564e41b38ba060391 (diff) | |
| download | pleroma-229acae6c3da541ebb0438cb7f310cdce1df92b3.tar.gz | |
Merge branch 'develop' into '2435-list-multiple-users'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'lib/pleroma/web/admin_api/controllers')
| -rw-r--r-- | lib/pleroma/web/admin_api/controllers/user_controller.ex | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/pleroma/web/admin_api/controllers/user_controller.ex b/lib/pleroma/web/admin_api/controllers/user_controller.ex index fa710c7ec..a18b9f8d5 100644 --- a/lib/pleroma/web/admin_api/controllers/user_controller.ex +++ b/lib/pleroma/web/admin_api/controllers/user_controller.ex @@ -172,9 +172,9 @@ defmodule Pleroma.Web.AdminAPI.UserController do def toggle_activation(%{assigns: %{user: admin}} = conn, %{"nickname" => nickname}) do user = User.get_cached_by_nickname(nickname) - {:ok, updated_user} = User.deactivate(user, !user.deactivated) + {:ok, updated_user} = User.set_activation(user, !user.is_active) - action = if user.deactivated, do: "activate", else: "deactivate" + action = if !user.is_active, do: "activate", else: "deactivate" ModerationLog.insert_log(%{ actor: admin, @@ -189,7 +189,7 @@ defmodule Pleroma.Web.AdminAPI.UserController do def activate(%{assigns: %{user: admin}} = conn, %{"nicknames" => nicknames}) do users = Enum.map(nicknames, &User.get_cached_by_nickname/1) - {:ok, updated_users} = User.deactivate(users, false) + {:ok, updated_users} = User.set_activation(users, true) ModerationLog.insert_log(%{ actor: admin, @@ -204,7 +204,7 @@ defmodule Pleroma.Web.AdminAPI.UserController do def deactivate(%{assigns: %{user: admin}} = conn, %{"nicknames" => nicknames}) do users = Enum.map(nicknames, &User.get_cached_by_nickname/1) - {:ok, updated_users} = User.deactivate(users, true) + {:ok, updated_users} = User.set_activation(users, false) ModerationLog.insert_log(%{ actor: admin, |