B DatabaseSearch: Fix local-only search.

This commit is contained in:
Lain Soykaf 2023-11-12 16:19:54 +04:00
parent 5996bef7cd
commit a1a25029da
2 changed files with 23 additions and 10 deletions

View File

@ -8,6 +8,7 @@ defmodule Pleroma.Search.DatabaseSearch do
alias Pleroma.Pagination
alias Pleroma.User
alias Pleroma.Web.ActivityPub.Visibility
alias Pleroma.Config
require Pleroma.Constants
@ -17,7 +18,7 @@ defmodule Pleroma.Search.DatabaseSearch do
@impl true
def search(user, search_query, options \\ []) do
index_type = if Pleroma.Config.get([:database, :rum_enabled]), do: :rum, else: :gin
index_type = if Config.get([:database, :rum_enabled]), do: :rum, else: :gin
limit = Enum.min([Keyword.get(options, :limit), 40])
offset = Keyword.get(options, :offset, 0)
author = Keyword.get(options, :author)
@ -33,7 +34,7 @@ def search(user, search_query, options \\ []) do
Activity
|> Activity.with_preloaded_object()
|> Activity.restrict_deactivated_users()
|> restrict_public()
|> restrict_public(user)
|> query_with(index_type, search_query, search_function)
|> maybe_restrict_local(user)
|> maybe_restrict_author(author)
@ -49,10 +50,10 @@ def search(user, search_query, options \\ []) do
end
@impl true
def add_to_index(_activity), do: nil
def add_to_index(_activity), do: :ok
@impl true
def remove_from_index(_object), do: nil
def remove_from_index(_object), do: :ok
def maybe_restrict_author(query, %User{} = author) do
Activity.Queries.by_author(query, author)
@ -66,7 +67,19 @@ def maybe_restrict_blocked(query, %User{} = user) do
def maybe_restrict_blocked(query, _), do: query
def restrict_public(q) do
defp restrict_public(q, user) when not is_nil(user) do
intended_recipients = [
Pleroma.Constants.as_public(),
Pleroma.Web.ActivityPub.Utils.as_local_public()
]
from([a, o] in q,
where: fragment("?->>'type' = 'Create'", a.data),
where: fragment("? && ?", ^intended_recipients, a.recipients)
)
end
defp restrict_public(q, _user) do
from([a, o] in q,
where: fragment("?->>'type' = 'Create'", a.data),
where: ^Pleroma.Constants.as_public() in a.recipients
@ -134,7 +147,7 @@ defp query_with(q, :rum, search_query, :websearch) do
end
def maybe_restrict_local(q, user) do
limit = Pleroma.Config.get([:instance, :limit_to_local_content], :unauthenticated)
limit = Config.get([:instance, :limit_to_local_content], :unauthenticated)
case {limit, user} do
{:all, _} -> restrict_local(q)

View File

@ -3,7 +3,7 @@
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Search.DatabaseSearchTest do
alias Pleroma.Search.DatabaseSearch
alias Pleroma.Search.DatabaseSearch, as: Search
alias Pleroma.Web.CommonAPI
import Pleroma.Factory
@ -13,7 +13,7 @@ test "it finds something" do
user = insert(:user)
{:ok, post} = CommonAPI.post(user, %{status: "it's wednesday my dudes"})
[result] = DatabaseSearch.search(nil, "wednesday")
[result] = Search.search(nil, "wednesday")
assert result.id == post.id
end
@ -45,7 +45,7 @@ test "using plainto_tsquery on postgres < 11" do
{:ok, _post2} = CommonAPI.post(user, %{status: "it's wednesday my bros"})
# plainto doesn't understand complex queries
assert [result] = DatabaseSearch.search(nil, "wednesday -dudes")
assert [result] = Search.search(nil, "wednesday -dudes")
assert result.id == post.id
end
@ -55,7 +55,7 @@ test "using websearch_to_tsquery" do
{:ok, _post} = CommonAPI.post(user, %{status: "it's wednesday my dudes"})
{:ok, other_post} = CommonAPI.post(user, %{status: "it's wednesday my bros"})
assert [result] = DatabaseSearch.search(nil, "wednesday -dudes")
assert [result] = Search.search(nil, "wednesday -dudes")
assert result.id == other_post.id
end