projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor as per Rin's suggestions, add endpoint tests
[akkoma]
/
lib
/
pleroma
/
web
/
admin_api
/
admin_api_controller.ex
diff --git
a/lib/pleroma/web/admin_api/admin_api_controller.ex
b/lib/pleroma/web/admin_api/admin_api_controller.ex
index 4d73cf219c379f47022b6fcddfb0d5674ee0babb..dc01f46f38a1d062498a773d9ed964cb643e84cc 100644
(file)
--- a/
lib/pleroma/web/admin_api/admin_api_controller.ex
+++ b/
lib/pleroma/web/admin_api/admin_api_controller.ex
@@
-1,6
+1,10
@@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
defmodule Pleroma.Web.AdminAPI.AdminAPIController do
use Pleroma.Web, :controller
defmodule Pleroma.Web.AdminAPI.AdminAPIController do
use Pleroma.Web, :controller
- alias Pleroma.
{User, Repo}
+ alias Pleroma.
User
alias Pleroma.Web.ActivityPub.Relay
import Pleroma.Web.ControllerHelper, only: [json_response: 3]
alias Pleroma.Web.ActivityPub.Relay
import Pleroma.Web.ControllerHelper, only: [json_response: 3]
@@
-10,13
+14,8
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIController do
action_fallback(:errors)
def user_delete(conn, %{"nickname" => nickname}) do
action_fallback(:errors)
def user_delete(conn, %{"nickname" => nickname}) do
- user = User.get_by_nickname(nickname)
-
- if user.local == true do
- User.delete(user)
- else
- User.delete(user)
- end
+ User.get_by_nickname(nickname)
+ |> User.delete()
conn
|> json(nickname)
conn
|> json(nickname)
@@
-26,7
+25,7
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIController do
conn,
%{"nickname" => nickname, "email" => email, "password" => password}
) do
conn,
%{"nickname" => nickname, "email" => email, "password" => password}
) do
-
new_user
= %{
+
user_data
= %{
nickname: nickname,
name: nickname,
email: email,
nickname: nickname,
name: nickname,
email: email,
@@
-35,11
+34,11
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIController do
bio: "."
}
bio: "."
}
-
User.register_changeset(%User{}, new_user
)
-
|> Repo.insert!(
)
+
changeset = User.register_changeset(%User{}, user_data, confirmed: true
)
+
{:ok, user} = User.register(changeset
)
conn
conn
- |> json(
new_
user.nickname)
+ |> json(user.nickname)
end
def tag_users(conn, %{"nicknames" => nicknames, "tags" => tags}) do
end
def tag_users(conn, %{"nicknames" => nicknames, "tags" => tags}) do