projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Parse user's bio on register
[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 c1df2d5703be116e19f2c5c0de17d1795700f400..2c67d9cdaf3011d25255fb6b9dd83594a80ea452 100644
(file)
--- a/
lib/pleroma/web/admin_api/admin_api_controller.ex
+++ b/
lib/pleroma/web/admin_api/admin_api_controller.ex
@@
-10,7
+10,7
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIController do
def user_delete(conn, %{"nickname" => nickname}) do
user = User.get_by_nickname(nickname)
def user_delete(conn, %{"nickname" => nickname}) do
user = User.get_by_nickname(nickname)
- if user
[:local]
== true do
+ if user
.local
== true do
User.delete(user)
else
User.delete(user)
User.delete(user)
else
User.delete(user)
@@
-20,99
+20,124
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIController do
|> json(nickname)
end
|> json(nickname)
end
- def user_create(conn, %{
- user: %{"nickname" => nickname, "email" => email, "password" => password} = user
- }) do
- new_user = %User{
+ def user_create(
+ conn,
+ %{"nickname" => nickname, "email" => email, "password" => password}
+ ) do
+ new_user = %{
nickname: nickname,
nickname: nickname,
- name:
user.name ||
nickname,
+ name: nickname,
email: email,
password: password,
password_confirmation: password,
email: email,
password: password,
password_confirmation: password,
- bio:
user.bio ||
"."
+ bio: "."
}
User.register_changeset(%User{}, new_user)
}
User.register_changeset(%User{}, new_user)
-
- Repo.insert!(new_user)
+ |> Repo.insert!()
conn
|> json(new_user.nickname)
end
conn
|> json(new_user.nickname)
end
- def right_add(conn, %{"
right" => right
, "nickname" => nickname})
- when
right
in ["moderator", "admin"] do
+ def right_add(conn, %{"
permission_group" => permission_group
, "nickname" => nickname})
+ when
permission_group
in ["moderator", "admin"] do
user = User.get_by_nickname(nickname)
info =
user = User.get_by_nickname(nickname)
info =
- user.info
- |> Map.put("is_" <> right, true)
+ %{}
+ |> Map.put("is_" <> permission_group, true)
+
+ info_cng = User.Info.admin_api_update(user.info, info)
+
+ cng =
+ Ecto.Changeset.change(user)
+ |> Ecto.Changeset.put_embed(:info, info_cng)
- cng = User.info_changeset(user, %{info: info})
{:ok, user} = User.update_and_set_cache(cng)
conn
{:ok, user} = User.update_and_set_cache(cng)
conn
- |> json(
user.
info)
+ |> json(info)
end
def right_get(conn, %{"nickname" => nickname}) do
user = User.get_by_nickname(nickname)
conn
end
def right_get(conn, %{"nickname" => nickname}) do
user = User.get_by_nickname(nickname)
conn
- |> json(user.info)
+ |> json(%{
+ is_moderator: user.info.is_moderator,
+ is_admin: user.info.is_admin
+ })
end
def right_add(conn, _) do
conn
|> put_status(404)
end
def right_add(conn, _) do
conn
|> put_status(404)
- |> json(%{error: "No such
right
"})
+ |> json(%{error: "No such
permission_group
"})
end
def right_delete(
%{assigns: %{user: %User{:nickname => admin_nickname}}} = conn,
%{
end
def right_delete(
%{assigns: %{user: %User{:nickname => admin_nickname}}} = conn,
%{
- "
right" => right
,
+ "
permission_group" => permission_group
,
"nickname" => nickname
}
)
"nickname" => nickname
}
)
- when
right
in ["moderator", "admin"] do
+ when
permission_group
in ["moderator", "admin"] do
if admin_nickname == nickname do
conn
if admin_nickname == nickname do
conn
- |> p
os
t_status(403)
+ |> p
u
t_status(403)
|> json(%{error: "You can't revoke your own admin status."})
else
user = User.get_by_nickname(nickname)
info =
|> json(%{error: "You can't revoke your own admin status."})
else
user = User.get_by_nickname(nickname)
info =
- user.info
- |> Map.put("is_" <> right, false)
+ %{}
+ |> Map.put("is_" <> permission_group, false)
+
+ info_cng = User.Info.admin_api_update(user.info, info)
+
+ cng =
+ Ecto.Changeset.change(user)
+ |> Ecto.Changeset.put_embed(:info, info_cng)
- cng = User.info_changeset(user, %{info: info})
{:ok, user} = User.update_and_set_cache(cng)
conn
{:ok, user} = User.update_and_set_cache(cng)
conn
- |> json(
user.
info)
+ |> json(info)
end
end
def right_delete(conn, _) do
conn
|> put_status(404)
end
end
def right_delete(conn, _) do
conn
|> put_status(404)
- |> json(%{error: "No such
right
"})
+ |> json(%{error: "No such
permission_group
"})
end
def relay_follow(conn, %{"relay_url" => target}) do
end
def relay_follow(conn, %{"relay_url" => target}) do
-
:ok
= Relay.follow(target)
+
{status, message}
= Relay.follow(target)
- conn
- |> json(target)
+ if status == :ok do
+ conn
+ |> json(target)
+ else
+ conn
+ |> put_status(500)
+ |> json(target)
+ end
end
def relay_unfollow(conn, %{"relay_url" => target}) do
end
def relay_unfollow(conn, %{"relay_url" => target}) do
-
:ok
= Relay.unfollow(target)
+
{status, message}
= Relay.unfollow(target)
- conn
- |> json(target)
+ if status == :ok do
+ conn
+ |> json(target)
+ else
+ conn
+ |> put_status(500)
+ |> json(target)
+ end
end
@shortdoc "Get a account registeration invite token (base64 string)"
end
@shortdoc "Get a account registeration invite token (base64 string)"