X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fadmin_api%2Fadmin_api_controller.ex;h=06c3c7c817a61c908e859254845aba44bbfc620c;hb=bda25b999b5176c73380bff9a1ce6be51cba4820;hp=bcdb4ba37abdaa0934130f853d746a362ecdc110;hpb=b9bc83097d01f445ca30bf0f70242fa50f1f2d40;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 bcdb4ba37..06c3c7c81 100644
--- a/lib/pleroma/web/admin_api/admin_api_controller.ex
+++ b/lib/pleroma/web/admin_api/admin_api_controller.ex
@@ -3,6 +3,8 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
   alias Pleroma.{User, Repo}
   alias Pleroma.Web.ActivityPub.Relay
 
+  import Pleroma.Web.ControllerHelper, only: [json_response: 3]
+
   require Logger
 
   action_fallback(:errors)
@@ -40,26 +42,34 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
     |> json(new_user.nickname)
   end
 
+  def tag_users(conn, %{"nicknames" => nicknames, "tags" => tags}) do
+    with {:ok, _} <- User.tag(nicknames, tags),
+         do: json_response(conn, :no_content, "")
+  end
+
+  def untag_users(conn, %{"nicknames" => nicknames, "tags" => tags}) do
+    with {:ok, _} <- User.untag(nicknames, tags),
+         do: json_response(conn, :no_content, "")
+  end
+
   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.info
+      %{}
       |> Map.put("is_" <> permission_group, true)
 
-    cng = User.info_changeset(user, %{info: info})
-    {:ok, user} = User.update_and_set_cache(cng)
+    info_cng = User.Info.admin_api_update(user.info, info)
 
-    conn
-    |> json(user.info)
-  end
+    cng =
+      user
+      |> Ecto.Changeset.change()
+      |> Ecto.Changeset.put_embed(:info, info_cng)
 
-  def right_get(conn, %{"nickname" => nickname}) do
-    user = User.get_by_nickname(nickname)
+    {:ok, _user} = User.update_and_set_cache(cng)
 
-    conn
-    |> json(user.info)
+    json(conn, info)
   end
 
   def right_add(conn, _) do
@@ -68,6 +78,16 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
     |> json(%{error: "No such permission_group"})
   end
 
+  def right_get(conn, %{"nickname" => nickname}) do
+    user = User.get_by_nickname(nickname)
+
+    conn
+    |> json(%{
+      is_moderator: user.info.is_moderator,
+      is_admin: user.info.is_admin
+    })
+  end
+
   def right_delete(
         %{assigns: %{user: %User{:nickname => admin_nickname}}} = conn,
         %{
@@ -84,14 +104,18 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
       user = User.get_by_nickname(nickname)
 
       info =
-        user.info
+        %{}
         |> Map.put("is_" <> permission_group, false)
 
-      cng = User.info_changeset(user, %{info: info})
-      {:ok, user} = User.update_and_set_cache(cng)
+      info_cng = User.Info.admin_api_update(user.info, info)
 
-      conn
-      |> json(user.info)
+      cng =
+        Ecto.Changeset.change(user)
+        |> Ecto.Changeset.put_embed(:info, info_cng)
+
+      {:ok, _user} = User.update_and_set_cache(cng)
+
+      json(conn, info)
     end
   end
 
@@ -102,32 +126,28 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
   end
 
   def relay_follow(conn, %{"relay_url" => target}) do
-    {status, message} = Relay.follow(target)
-
-    if status == :ok do
-      conn
-      |> json(target)
+    with {:ok, _message} <- Relay.follow(target) do
+      json(conn, target)
     else
-      conn
-      |> put_status(500)
-      |> json(target)
+      _ ->
+        conn
+        |> put_status(500)
+        |> json(target)
     end
   end
 
   def relay_unfollow(conn, %{"relay_url" => target}) do
-    {status, message} = Relay.unfollow(target)
-
-    if status == :ok do
-      conn
-      |> json(target)
+    with {:ok, _message} <- Relay.unfollow(target) do
+      json(conn, target)
     else
-      conn
-      |> put_status(500)
-      |> json(target)
+      _ ->
+        conn
+        |> put_status(500)
+        |> json(target)
     end
   end
 
-  @shortdoc "Get a account registeration invite token (base64 string)"
+  @doc "Get a account registeration invite token (base64 string)"
   def get_invite_token(conn, _params) do
     {:ok, token} = Pleroma.UserInviteToken.create_token()
 
@@ -135,7 +155,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
     |> json(token.token)
   end
 
-  @shortdoc "Get a password reset token (base64 string) for given nickname"
+  @doc "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)