Merge search behaviour change, and refactor elasticsearch #28

Merged
floatingghost merged 91 commits from elasticsearch-refactor into develop 2022-06-30 16:55:31 +00:00
2 changed files with 3 additions and 2 deletions
Showing only changes of commit 0802c0666b - Show all commits

View file

@ -368,8 +368,6 @@ def restrict_deactivated_users(query) do
end
defdelegate search(user, query, options \\ []), to: Pleroma.Activity.Search
def add_to_index(_activity), do: nil
def remove_from_index(_object), do: nil
def direct_conversation_id(activity, for_user) do
alias Pleroma.Conversation.Participation

View file

@ -45,6 +45,9 @@ def search(user, search_query, options \\ []) do
end
end
def add_to_index(_activity), do: nil
def remove_from_index(_object), do: nil
def maybe_restrict_author(query, %User{} = author) do
Activity.Queries.by_author(query, author)
end