Cycles: Pleroma.Activity.search/3 --> Pleroma.Activity.Search.search/3

Helps break up cycles between views

5 files changed, 8 insertions, 10 deletions

diff --git a/lib/mix/tasks/pleroma/benchmark.ex b/lib/mix/tasks/pleroma/benchmark.ex
index fdf99747a..df82a4ad5 100644
--- a/lib/mix/tasks/pleroma/benchmark.ex
+++ b/lib/mix/tasks/pleroma/benchmark.ex
@@ -11,7 +11,7 @@ defmodule Mix.Tasks.Pleroma.Benchmark do
 
     Benchee.run(%{
       "search" => fn ->
-        Pleroma.Activity.search(nil, "cofe")
+        Pleroma.Activity.Search.search(nil, "cofe")
       end
     })
   end
diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex
index 6542e684e..2bd360430 100644
--- a/lib/pleroma/activity.ex
+++ b/lib/pleroma/activity.ex
@@ -351,8 +351,6 @@ defmodule Pleroma.Activity do
     Activity.Queries.exclude_authors(query, deactivated_users)
   end
 
-  defdelegate search(user, query, options \\ []), to: Pleroma.Activity.Search
-
   def direct_conversation_id(activity, for_user) do
     alias Pleroma.Conversation.Participation
 
diff --git a/lib/pleroma/web/mastodon_api/controllers/search_controller.ex b/lib/pleroma/web/mastodon_api/controllers/search_controller.ex
index 3d35e8fe0..d1035805f 100644
--- a/lib/pleroma/web/mastodon_api/controllers/search_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/search_controller.ex
@@ -98,7 +98,7 @@ defmodule Pleroma.Web.MastodonAPI.SearchController do
   end
 
   defp resource_search(_, "statuses", query, options) do
-    statuses = with_fallback(fn -> Activity.search(options[:for_user], query, options) end)
+    statuses = with_fallback(fn -> Activity.Search.search(options[:for_user], query, options) end)
 
     StatusView.render("index.json",
       activities: statuses,
diff --git a/test/pleroma/activity_test.exs b/test/pleroma/activity_test.exs
index 390a06344..c3f44d9bf 100644
--- a/test/pleroma/activity_test.exs
+++ b/test/pleroma/activity_test.exs
@@ -147,7 +147,7 @@ defmodule Pleroma.ActivityTest do
       japanese_activity: japanese_activity,
       user: user
     } do
-      activities = Activity.search(user, "更新情報")
+      activities = Activity.Search.search(user, "更新情報")
 
       assert [^japanese_activity] = activities
     end
@@ -157,19 +157,19 @@ defmodule Pleroma.ActivityTest do
       remote_activity: remote_activity,
       user: user
     } do
-      activities = Enum.sort_by(Activity.search(user, "find me"), & &1.id)
+      activities = Enum.sort_by(Activity.Search.search(user, "find me"), & &1.id)
 
       assert [^local_activity, ^remote_activity] = activities
     end
 
     test "find only local statuses for unauthenticated users", %{local_activity: local_activity} do
-      assert [^local_activity] = Activity.search(nil, "find me")
+      assert [^local_activity] = Activity.Search.search(nil, "find me")
     end
 
     test "find only local statuses for unauthenticated users  when `limit_to_local_content` is `:all`",
          %{local_activity: local_activity} do
       clear_config([:instance, :limit_to_local_content], :all)
-      assert [^local_activity] = Activity.search(nil, "find me")
+      assert [^local_activity] = Activity.Search.search(nil, "find me")
     end
 
     test "find all statuses for unauthenticated users when `limit_to_local_content` is `false`",
@@ -179,7 +179,7 @@ defmodule Pleroma.ActivityTest do
          } do
       clear_config([:instance, :limit_to_local_content], false)
 
-      activities = Enum.sort_by(Activity.search(nil, "find me"), & &1.id)
+      activities = Enum.sort_by(Activity.Search.search(nil, "find me"), & &1.id)
 
       assert [^local_activity, ^remote_activity] = activities
     end
diff --git a/test/pleroma/web/mastodon_api/views/status_view_test.exs b/test/pleroma/web/mastodon_api/views/status_view_test.exs
index 2de3afc4f..056859c2c 100644
--- a/test/pleroma/web/mastodon_api/views/status_view_test.exs
+++ b/test/pleroma/web/mastodon_api/views/status_view_test.exs
@@ -492,7 +492,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
 
   test "put the url advertised in the Activity in to the url attribute" do
     id = "https://wedistribute.org/wp-json/pterotype/v1/object/85810"
-    [activity] = Activity.search(nil, id)
+    [activity] = Activity.Search.search(nil, id)
 
     status = StatusView.render("show.json", %{activity: activity})