limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity

Lint

Browse source 
Ref: fix-local-public
This commit is contained in:
Tusooa Zhu 2022-05-05 11:18:18 -04:00
parent 826deb7375
commit 466568ae36
No known key found for this signature in database
GPG key ID: 7B467EDE43A08224
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/pleroma/activity/search.ex
View file

@ -58,7 +58,10 @@ defmodule Pleroma.Activity.Search do
def maybe_restrict_blocked(query, _), do: query def maybe_restrict_blocked(query, _), do: query
defp restrict_public(q, user) when not is_nil(user) 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()] intended_recipients = [
Pleroma.Constants.as_public(),
Pleroma.Web.ActivityPub.Utils.as_local_public()
]
from([a, o] in q, from([a, o] in q,
where: fragment("?->>'type' = 'Create'", a.data), where: fragment("?->>'type' = 'Create'", a.data),

9
test/pleroma/web/mastodon_api/controllers/search_controller_test.exs
View file

@ -83,7 +83,8 @@ defmodule Pleroma.Web.MastodonAPI.SearchControllerTest do
user = insert(:user) user = insert(:user)
%{conn: conn} = oauth_access(["read:search"]) %{conn: conn} = oauth_access(["read:search"])
{:ok, activity} = CommonAPI.post(user, %{status: "This is about 2hu private 天子", visibility: "local"}) {:ok, activity} =
CommonAPI.post(user, %{status: "This is about 2hu private 天子", visibility: "local"})
results = results =
conn conn
@ -98,7 +99,8 @@ defmodule Pleroma.Web.MastodonAPI.SearchControllerTest do
user = insert(:user) user = insert(:user)
%{conn: conn} = oauth_access([]) %{conn: conn} = oauth_access([])
{:ok, _activity} = CommonAPI.post(user, %{status: "This is about 2hu private 天子", visibility: "local"}) {:ok, _activity} =
CommonAPI.post(user, %{status: "This is about 2hu private 天子", visibility: "local"})
results = results =
conn conn
@ -111,7 +113,8 @@ defmodule Pleroma.Web.MastodonAPI.SearchControllerTest do
test "search local-only status as an anonymous user" do test "search local-only status as an anonymous user" do
user = insert(:user) user = insert(:user)
{:ok, _activity} = CommonAPI.post(user, %{status: "This is about 2hu private 天子", visibility: "local"}) {:ok, _activity} =
CommonAPI.post(user, %{status: "This is about 2hu private 天子", visibility: "local"})
results = results =
build_conn() build_conn()