diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mix/tasks/pleroma/benchmark.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/activity.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/search_controller.ex | 2 |
3 files changed, 2 insertions, 4 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, |