mirror of
https://git.pleroma.social/pleroma/pleroma.git
synced 2024-12-23 00:26:30 +00:00
Rename search.ex to database_search.ex and add search/2
This commit is contained in:
parent
39e596a5b5
commit
0fae71f88d
4 changed files with 11 additions and 7 deletions
|
@ -1,4 +1,4 @@
|
|||
defmodule Pleroma.Search do
|
||||
defmodule Pleroma.Search.DatabaseSearch do
|
||||
def add_to_index(activity) do
|
||||
search_module = Pleroma.Config.get([Pleroma.Search, :module])
|
||||
|
||||
|
@ -15,4 +15,10 @@ defmodule Pleroma.Search do
|
|||
Task.start(fn -> search_module.remove_from_index(object) end)
|
||||
end)
|
||||
end
|
||||
|
||||
def search(query, options) do
|
||||
search_module = Pleroma.Config.get([Pleroma.Search, :module], Pleroma.Activity)
|
||||
|
||||
search_module.search(options[:for_user], query, options)
|
||||
end
|
||||
end
|
|
@ -141,7 +141,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
|
|||
end)
|
||||
|
||||
# Add local posts to search index
|
||||
if local, do: Pleroma.Search.add_to_index(activity)
|
||||
if local, do: Pleroma.Search.DatabaseSearch.add_to_index(activity)
|
||||
|
||||
{:ok, activity}
|
||||
else
|
||||
|
|
|
@ -227,7 +227,7 @@ defmodule Pleroma.Web.ActivityPub.SideEffects do
|
|||
Task.start(fn -> Pleroma.Web.RichMedia.Helpers.fetch_data_for_activity(activity) end)
|
||||
end)
|
||||
|
||||
Pleroma.Search.add_to_index(Map.put(activity, :object, object))
|
||||
Pleroma.Search.DatabaseSearch.add_to_index(Map.put(activity, :object, object))
|
||||
|
||||
meta =
|
||||
meta
|
||||
|
@ -330,7 +330,7 @@ defmodule Pleroma.Web.ActivityPub.SideEffects do
|
|||
if result == :ok do
|
||||
Notification.create_notifications(object)
|
||||
|
||||
Pleroma.Search.remove_from_index(deleted_object)
|
||||
Pleroma.Search.DatabaseSearch.remove_from_index(deleted_object)
|
||||
|
||||
{:ok, object, meta}
|
||||
else
|
||||
|
|
|
@ -99,9 +99,7 @@ defmodule Pleroma.Web.MastodonAPI.SearchController do
|
|||
end
|
||||
|
||||
defp resource_search(_, "statuses", query, options) do
|
||||
search_module = Pleroma.Config.get([Pleroma.Search, :module], Pleroma.Activity)
|
||||
|
||||
statuses = with_fallback(fn -> search_module.search(options[:for_user], query, options) end)
|
||||
statuses = with_fallback(fn -> Pleroma.Search.DatabaseSearch.search(query, options) end)
|
||||
|
||||
StatusView.render("index.json",
|
||||
activities: statuses,
|
||||
|
|
Loading…
Reference in a new issue