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 issue/1934-welcome-email
[akkoma]
/
lib
/
pleroma
/
web
/
admin_api
/
controllers
/
admin_api_controller.ex
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 5cbf0dd4fceaa74e2f2843ca3cee6eb0e5ca2855..5101e28d62ed83ba83e5daf8b14f243e3f2763a0 100644
(file)
--- a/
lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
+++ b/
lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
@@
-111,8
+111,7
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIController do
action: "delete"
})
action: "delete"
})
- conn
- |> json(nicknames)
+ json(conn, nicknames)
end
def user_follow(%{assigns: %{user: admin}} = conn, %{
end
def user_follow(%{assigns: %{user: admin}} = conn, %{
@@
-131,8
+130,7
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIController do
})
end
})
end
- conn
- |> json("ok")
+ json(conn, "ok")
end
def user_unfollow(%{assigns: %{user: admin}} = conn, %{
end
def user_unfollow(%{assigns: %{user: admin}} = conn, %{
@@
-151,8
+149,7
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIController do
})
end
})
end
- conn
- |> json("ok")
+ json(conn, "ok")
end
def users_create(%{assigns: %{user: admin}} = conn, %{"users" => users}) do
end
def users_create(%{assigns: %{user: admin}} = conn, %{"users" => users}) do
@@
-191,8
+188,7
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIController do
action: "create"
})
action: "create"
})
- conn
- |> json(res)
+ json(conn, res)
{:error, id, changeset, _} ->
res =
{:error, id, changeset, _} ->
res =
@@
-210,8
+206,8
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIController do
end
end
end
end
- def user_show(conn, %{"nickname" => nickname}) do
- with %User{} = user <- User.get_cached_by_nickname_or_id(nickname) do
+ def user_show(
%{assigns: %{user: admin}} =
conn, %{"nickname" => nickname}) do
+ with %User{} = user <- User.get_cached_by_nickname_or_id(nickname
, for: admin
) do
conn
|> put_view(AccountView)
|> render("show.json", %{user: user})
conn
|> put_view(AccountView)
|> render("show.json", %{user: user})
@@
-237,11
+233,11
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIController do
|> render("index.json", %{activities: activities, as: :activity})
end
|> render("index.json", %{activities: activities, as: :activity})
end
- def list_user_statuses(conn, %{"nickname" => nickname} = params) do
+ def list_user_statuses(
%{assigns: %{user: admin}} =
conn, %{"nickname" => nickname} = params) do
with_reblogs = params["with_reblogs"] == "true" || params["with_reblogs"] == true
godmode = params["godmode"] == "true" || params["godmode"] == true
with_reblogs = params["with_reblogs"] == "true" || params["with_reblogs"] == true
godmode = params["godmode"] == "true" || params["godmode"] == true
- with %User{} = user <- User.get_cached_by_nickname_or_id(nickname) do
+ with %User{} = user <- User.get_cached_by_nickname_or_id(nickname
, for: admin
) do
{_, page_size} = page_params(params)
activities =
{_, page_size} = page_params(params)
activities =
@@
-349,7
+345,11
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIController do
with {:ok, users, count} <- Search.user(Map.merge(search_params, filters)) do
json(
conn,
with {:ok, users, count} <- Search.user(Map.merge(search_params, filters)) do
json(
conn,
- AccountView.render("index.json", users: users, count: count, page_size: page_size)
+ AccountView.render("index.json",
+ users: users,
+ count: count,
+ page_size: page_size
+ )
)
end
end
)
end
end
@@
-363,8
+363,8
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIController do
filters
|> String.split(",")
|> Enum.filter(&Enum.member?(@filters, &1))
filters
|> String.split(",")
|> Enum.filter(&Enum.member?(@filters, &1))
- |> Enum.map(&String.to_atom
(&1)
)
- |>
Enum.into(%{},
&{&1, true})
+ |> Enum.map(&String.to_atom
/1
)
+ |>
Map.new(
&{&1, true})
end
def right_add_multiple(%{assigns: %{user: admin}} = conn, %{
end
def right_add_multiple(%{assigns: %{user: admin}} = conn, %{
@@
-530,7
+530,7
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIController do
@doc "Show a given user's credentials"
def show_user_credentials(%{assigns: %{user: admin}} = conn, %{"nickname" => nickname}) do
@doc "Show a given user's credentials"
def show_user_credentials(%{assigns: %{user: admin}} = conn, %{"nickname" => nickname}) do
- with %User{} = user <- User.get_cached_by_nickname_or_id(nickname) do
+ with %User{} = user <- User.get_cached_by_nickname_or_id(nickname
, for: admin
) do
conn
|> put_view(AccountView)
|> render("credentials.json", %{user: user, for: admin})
conn
|> put_view(AccountView)
|> render("credentials.json", %{user: user, for: admin})
@@
-568,10
+568,10
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIController do
{:error, changeset} ->
errors = Map.new(changeset.errors, fn {key, {error, _}} -> {key, error} end)
{:error, changeset} ->
errors = Map.new(changeset.errors, fn {key, {error, _}} -> {key, error} end)
- json(conn, %{errors: errors})
+ {:errors, errors}
_ ->
_ ->
- json(conn, %{error: "Unable to update user."})
+ {:error, :not_found}
end
end
end
end
@@
-616,42
+616,36
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIController do
def reload_emoji(conn, _params) do
Pleroma.Emoji.reload()
def reload_emoji(conn, _params) do
Pleroma.Emoji.reload()
-
conn |> json(
"ok")
+
json(conn,
"ok")
end
def confirm_email(%{assigns: %{user: admin}} = conn, %{"nicknames" => nicknames}) do
end
def confirm_email(%{assigns: %{user: admin}} = conn, %{"nicknames" => nicknames}) do
- users =
nicknames |> Enum.map(
&User.get_cached_by_nickname/1)
+ users =
Enum.map(nicknames,
&User.get_cached_by_nickname/1)
User.toggle_confirmation(users)
User.toggle_confirmation(users)
- ModerationLog.insert_log(%{
- actor: admin,
- subject: users,
- action: "confirm_email"
- })
+ ModerationLog.insert_log(%{actor: admin, subject: users, action: "confirm_email"})
-
conn |> json(
"")
+
json(conn,
"")
end
def resend_confirmation_email(%{assigns: %{user: admin}} = conn, %{"nicknames" => nicknames}) do
end
def resend_confirmation_email(%{assigns: %{user: admin}} = conn, %{"nicknames" => nicknames}) do
- users = nicknames |> Enum.map(&User.get_cached_by_nickname/1)
-
- User.try_send_confirmation_email(users)
+ users =
+ Enum.map(nicknames, fn nickname ->
+ nickname
+ |> User.get_cached_by_nickname()
+ |> User.send_confirmation_email()
+ end)
- ModerationLog.insert_log(%{
- actor: admin,
- subject: users,
- action: "resend_confirmation_email"
- })
+ ModerationLog.insert_log(%{actor: admin, subject: users, action: "resend_confirmation_email"})
-
conn |> json(
"")
+
json(conn,
"")
end
end
- def stats(conn,
_
) do
- count
= Stats.get_status_visibility_count(
)
+ def stats(conn,
params
) do
+ count
ers = Stats.get_status_visibility_count(params["instance"]
)
- conn
- |> json(%{"status_visibility" => count})
+ json(conn, %{"status_visibility" => counters})
end
defp page_params(params) do
end
defp page_params(params) do