diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2021-01-18 11:56:40 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2021-01-18 11:56:40 +0300 |
| commit | 2289a1d58777b8ed129e322c3ce4119bc129366c (patch) | |
| tree | 693af643bfd94af28c29ec519ef8df0f208d7424 /lib/pleroma/web/admin_api/controllers/admin_api_controller.ex | |
| parent | dbaa15232bfe4c2bc3e2b1a17cfc7503e7036d77 (diff) | |
| parent | 732cc0ce46e8044909dd5205858c43f75fe3e937 (diff) | |
| download | pleroma-2289a1d58777b8ed129e322c3ce4119bc129366c.tar.gz | |
Merge branch 'develop' into refactor/uploads
Diffstat (limited to 'lib/pleroma/web/admin_api/controllers/admin_api_controller.ex')
| -rw-r--r-- | lib/pleroma/web/admin_api/controllers/admin_api_controller.ex | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex b/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex index 5c2c282b3..709c863ec 100644 --- a/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex +++ b/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex @@ -1,5 +1,5 @@ # Pleroma: A lightweight social networking server -# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/> +# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/> # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Web.AdminAPI.AdminAPIController do @@ -103,13 +103,15 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do godmode = params["godmode"] == "true" || params["godmode"] == true with %User{} = user <- User.get_cached_by_nickname_or_id(nickname, for: admin) do - {_, page_size} = page_params(params) + {page, page_size} = page_params(params) activities = ActivityPub.fetch_user_activities(user, nil, %{ limit: page_size, + offset: (page - 1) * page_size, godmode: godmode, - exclude_reblogs: not with_reblogs + exclude_reblogs: not with_reblogs, + pagination_type: :offset }) conn @@ -415,7 +417,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do def confirm_email(%{assigns: %{user: admin}} = conn, %{"nicknames" => nicknames}) do users = Enum.map(nicknames, &User.get_cached_by_nickname/1) - User.toggle_confirmation(users) + User.confirm(users) ModerationLog.insert_log(%{actor: admin, subject: users, action: "confirm_email"}) |