X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fadmin_api%2Fadmin_api_controller.ex;h=c1df2d5703be116e19f2c5c0de17d1795700f400;hb=f9d05902fea122a995cb66cadaeb420df0d504b6;hp=0cc84430d64bec10f067fac5bf8d94f895ec9d96;hpb=578a9117370c3756c56448ad663664f73155a50b;p=akkoma

diff --git a/lib/pleroma/web/admin_api/admin_api_controller.ex b/lib/pleroma/web/admin_api/admin_api_controller.ex
index 0cc84430d..c1df2d570 100644
--- a/lib/pleroma/web/admin_api/admin_api_controller.ex
+++ b/lib/pleroma/web/admin_api/admin_api_controller.ex
@@ -7,7 +7,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
 
   action_fallback(:errors)
 
-  def user_delete(conn, %{nickname: nickname}) do
+  def user_delete(conn, %{"nickname" => nickname}) do
     user = User.get_by_nickname(nickname)
 
     if user[:local] == true do
@@ -17,13 +17,12 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
     end
 
     conn
-    |> send(200)
+    |> json(nickname)
   end
 
-  def user_create(
-        conn,
-        %{user: %{nickname: nickname, email: email, password: password} = user}
-      ) do
+  def user_create(conn, %{
+        user: %{"nickname" => nickname, "email" => email, "password" => password} = user
+      }) do
     new_user = %User{
       nickname: nickname,
       name: user.name || nickname,
@@ -35,33 +34,96 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
 
     User.register_changeset(%User{}, new_user)
 
-    Repo.insert!(user)
+    Repo.insert!(new_user)
 
     conn
-    |> send(200)
+    |> json(new_user.nickname)
   end
 
-  def relay_follow(conn, %{relay_url: target}) do
+  def right_add(conn, %{"right" => right, "nickname" => nickname})
+      when right in ["moderator", "admin"] do
+    user = User.get_by_nickname(nickname)
+
+    info =
+      user.info
+      |> Map.put("is_" <> right, true)
+
+    cng = User.info_changeset(user, %{info: info})
+    {:ok, user} = User.update_and_set_cache(cng)
+
+    conn
+    |> json(user.info)
+  end
+
+  def right_get(conn, %{"nickname" => nickname}) do
+    user = User.get_by_nickname(nickname)
+
+    conn
+    |> json(user.info)
+  end
+
+  def right_add(conn, _) do
+    conn
+    |> put_status(404)
+    |> json(%{error: "No such right"})
+  end
+
+  def right_delete(
+        %{assigns: %{user: %User{:nickname => admin_nickname}}} = conn,
+        %{
+          "right" => right,
+          "nickname" => nickname
+        }
+      )
+      when right in ["moderator", "admin"] do
+    if admin_nickname == nickname do
+      conn
+      |> post_status(403)
+      |> 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)
+
+      cng = User.info_changeset(user, %{info: info})
+      {:ok, user} = User.update_and_set_cache(cng)
+
+      conn
+      |> json(user.info)
+    end
+  end
+
+  def right_delete(conn, _) do
+    conn
+    |> put_status(404)
+    |> json(%{error: "No such right"})
+  end
+
+  def relay_follow(conn, %{"relay_url" => target}) do
     :ok = Relay.follow(target)
 
     conn
-    |> send(200)
+    |> json(target)
   end
 
-  def relay_unfollow(conn, %{relay_url: target}) do
+  def relay_unfollow(conn, %{"relay_url" => target}) do
     :ok = Relay.unfollow(target)
 
     conn
-    |> send(200)
+    |> json(target)
   end
 
+  @shortdoc "Get a account registeration invite token (base64 string)"
   def get_invite_token(conn, _params) do
-    {:ok, token} <- Pleroma.UserInviteToken.create_token()
+    {:ok, token} = Pleroma.UserInviteToken.create_token()
 
     conn
-    |> puts(token)
+    |> json(token.token)
   end
 
+  @shortdoc "Get a password reset token (base64 string) for given nickname"
   def get_password_reset(conn, %{"nickname" => nickname}) do
     (%User{local: true} = user) = User.get_by_nickname(nickname)
     {:ok, token} = Pleroma.PasswordResetToken.create_token(user)