expanding filtration for home timeline

added local & remote statuses filtration for home timeline
This commit is contained in:
Alexander Strizhakov 2021-01-26 11:58:54 +03:00
parent 08a2cb750d
commit c3110c46f3
No known key found for this signature in database
GPG Key ID: 022896A53AEF1381
4 changed files with 95 additions and 0 deletions

View File

@ -735,6 +735,12 @@ defp restrict_local(query, %{local_only: true}) do
defp restrict_local(query, _), do: query
defp restrict_remote(query, %{only_remote: true}) do
from(activity in query, where: activity.local == false)
end
defp restrict_remote(query, _), do: query
defp restrict_actor(query, %{actor_id: actor_id}) do
from(activity in query, where: activity.actor == ^actor_id)
end
@ -1111,6 +1117,7 @@ def fetch_activities_query(recipients, opts \\ %{}) do
|> restrict_tag_all(opts)
|> restrict_since(opts)
|> restrict_local(opts)
|> restrict_remote(opts)
|> restrict_actor(opts)
|> restrict_type(opts)
|> restrict_state(opts)

View File

@ -25,6 +25,7 @@ def home_operation do
security: [%{"oAuth" => ["read:statuses"]}],
parameters: [
local_param(),
remote_param(),
with_muted_param(),
exclude_visibilities_param(),
reply_visibility_param() | pagination_params()
@ -198,4 +199,13 @@ defp only_media_param do
"Show only statuses with media attached?"
)
end
defp remote_param do
Operation.parameter(
:only_remote,
:query,
%Schema{allOf: [BooleanLike], default: false},
"Show only remote statuses?"
)
end
end

View File

@ -51,6 +51,8 @@ def home(%{assigns: %{user: user}} = conn, params) do
|> Map.put(:reply_filtering_user, user)
|> Map.put(:announce_filtering_user, user)
|> Map.put(:user, user)
|> Map.put(:local_only, params[:local])
|> Map.delete(:local)
activities =
[user.ap_id | User.following(user)]

View File

@ -90,6 +90,82 @@ test "muted emotions", %{user: user, conn: conn} do
}
] = result
end
test "local/remote filtering", %{conn: conn, user: user} do
local = insert(:user)
remote = insert(:user, local: false)
{:ok, user, local} = User.follow(user, local)
{:ok, _user, remote} = User.follow(user, remote)
object1 =
insert(:note, %{
data: %{
"to" => ["https://www.w3.org/ns/activitystreams#Public", User.ap_followers(local)]
},
user: local
})
activity1 =
insert(:note_activity, %{
note: object1,
recipients: ["https://www.w3.org/ns/activitystreams#Public", User.ap_followers(local)],
user: local
})
object2 =
insert(:note, %{
data: %{
"to" => ["https://www.w3.org/ns/activitystreams#Public", User.ap_followers(remote)]
},
user: remote
})
activity2 =
insert(:note_activity, %{
note: object2,
recipients: ["https://www.w3.org/ns/activitystreams#Public", User.ap_followers(remote)],
user: remote,
local: false
})
resp1 =
conn
|> get("/api/v1/timelines/home")
|> json_response_and_validate_schema(200)
without_filter_ids = Enum.map(resp1, & &1["id"])
assert activity1.id in without_filter_ids
assert activity2.id in without_filter_ids
resp2 =
conn
|> get("/api/v1/timelines/home?local=true")
|> json_response_and_validate_schema(200)
only_local_ids = Enum.map(resp2, & &1["id"])
assert activity1.id in only_local_ids
refute activity2.id in only_local_ids
resp3 =
conn
|> get("/api/v1/timelines/home?only_remote=true")
|> json_response_and_validate_schema(200)
only_remote_ids = Enum.map(resp3, & &1["id"])
refute activity1.id in only_remote_ids
assert activity2.id in only_remote_ids
resp4 =
conn
|> get("/api/v1/timelines/home?only_remote=true&local=true")
|> json_response_and_validate_schema(200)
assert resp4 == []
end
end
describe "public" do