From: Maxim Filippov <colixer@gmail.com>
Date: Fri, 1 Mar 2019 18:17:20 +0000 (+0300)
Subject: Refactor a little bit
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=f635b675b2cc0bc10b395cd71ae1720b0696d364;p=akkoma

Refactor a little bit
---

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 37f8da892..3c6fb4f9b 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -763,17 +763,13 @@ defmodule Pleroma.User do
     if options[:resolve], do: get_or_fetch(term)
 
     fts_results =
-      do_search(fts_search_subquery(term, query), options[:for_user], %{
-        limit: options[:limit]
-      })
+      do_search(fts_search_subquery(term, query), options[:for_user], limit: options[:limit])
 
     {:ok, trigram_results} =
       Repo.transaction(fn ->
         Ecto.Adapters.SQL.query(Repo, "select set_limit(0.25)", [])
 
-        do_search(trigram_search_subquery(term, query), options[:for_user], %{
-          limit: options[:limit]
-        })
+        do_search(trigram_search_subquery(term, query), options[:for_user], limit: options[:limit])
       end)
 
     Enum.uniq_by(fts_results ++ trigram_results, & &1.id)
@@ -1024,12 +1020,8 @@ defmodule Pleroma.User do
     update_and_set_cache(cng)
   end
 
-  def maybe_local_user_query(local) when local == true do
-    local_user_query()
-  end
-
-  def maybe_local_user_query(local) when local == false do
-    User
+  def maybe_local_user_query(local) do
+    if local, do: local_user_query(), else: User
   end
 
   def local_user_query do
diff --git a/lib/pleroma/web/admin_api/admin_api_controller.ex b/lib/pleroma/web/admin_api/admin_api_controller.ex
index 270097d35..33f9689cd 100644
--- a/lib/pleroma/web/admin_api/admin_api_controller.ex
+++ b/lib/pleroma/web/admin_api/admin_api_controller.ex
@@ -70,11 +70,11 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
          do:
            conn
            |> json(
-             AccountView.render("index.json", %{
+             AccountView.render("index.json",
                users: users,
                count: count,
                page_size: @users_page_size
-             })
+             )
            )
   end
 
@@ -89,11 +89,11 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
 
     conn
     |> json(
-      AccountView.render("index.json", %{
+      AccountView.render("index.json",
         users: users,
         count: length(users),
         page_size: @users_page_size
-      })
+      )
     )
   end