Commit 5db4c823 authored by lain's avatar lain
Browse files

Merge branch 'restrict-domain' into 'develop'

View a remote server's timeline

See merge request !2713
parents 9c09ea01 cb3cd3a7
Pipeline #32556 passed with stages
in 96 minutes and 20 seconds
......@@ -16,6 +16,7 @@ The format is based on [Keep a Changelog](
- App metrics: ability to restrict access to specified IP whitelist.
- Account backup
- Configuration: Add `:instance, autofollowing_nicknames` setting to provide a way to make accounts automatically follow new users that register on the local Pleroma instance.
- Ability to view remote timelines, with ex. `/api/v1/timelines/public?` and streams `public:remote` and `public:remote:media`
### Changed
......@@ -9,9 +9,13 @@ Pleroma uses 128-bit ids as opposed to Mastodon's 64 bits. However just like Mas
## Timelines
Adding the parameter `with_muted=true` to the timeline queries will also return activities by muted (not by blocked!) users.
Adding the parameter `exclude_visibilities` to the timeline queries will exclude the statuses with the given visibilities. The parameter accepts an array of visibility types (`public`, `unlisted`, `private`, `direct`), e.g., `exclude_visibilities[]=direct&exclude_visibilities[]=private`.
Adding the parameter `reply_visibility` to the public and home timelines queries will filter replies. Possible values: without parameter (default) shows all replies, `following` - replies directed to you or users you follow, `self` - replies directed to you.
Adding the parameter `` to the public timeline will show only statuses originating from `` (or any remote instance).
## Statuses
- `visibility`: has an additional possible value `list`
......@@ -249,6 +253,8 @@ Has these additional fields under the `pleroma` object:
There is an additional `user:pleroma_chat` stream. Incoming chat messages will make the current chat be sent to this `user` stream. The `event` of an incoming chat message is `pleroma:chat_update`. The payload is the updated chat with the incoming chat message in the `last_message` field.
For viewing remote server timelines, there are `public:remote` and `public:remote:media` streams. Each of these accept a parameter like `?`.
## Not implemented
Pleroma is generally compatible with the Mastodon 2.7.2 API, but some newer features and non-essential features are omitted. These features usually return an HTTP 200 status code, but with an empty response. While they may be added in the future, they are considered low priority.
......@@ -40,7 +40,8 @@ defp visibility_tags(object, activity) do
defp item_creation_tags(tags, object, %{data: %{"type" => "Create"}} = activity) do
tags ++ hashtags_to_topics(object) ++ attachment_topics(object, activity)
tags ++
remote_topics(activity) ++ hashtags_to_topics(object) ++ attachment_topics(object, activity)
defp item_creation_tags(tags, _, _) do
......@@ -55,9 +56,19 @@ defp hashtags_to_topics(%{data: %{"tag" => tags}}) do
defp hashtags_to_topics(_), do: []
defp remote_topics(%{local: true}), do: []
defp remote_topics(%{actor: actor}) when is_binary(actor),
do: ["public:remote:" <> URI.parse(actor).host]
defp remote_topics(_), do: []
defp attachment_topics(%{data: %{"attachment" => []}}, _act), do: []
defp attachment_topics(_object, %{local: true}), do: ["public:media", "public:local:media"]
defp attachment_topics(_object, %{actor: actor}) when is_binary(actor),
do: ["public:media", "public:remote:media:" <> URI.parse(actor).host]
defp attachment_topics(_object, _act), do: ["public:media"]
......@@ -937,16 +937,11 @@ defp restrict_muted_reblogs(query, %{muting_user: %User{} = user} = opts) do
defp restrict_muted_reblogs(query, _), do: query
defp restrict_instance(query, %{instance: instance}) do
users =
u in User,
select: u.ap_id,
where: fragment("? LIKE ?", u.nickname, ^"%@#{instance}")
|> Repo.all()
from(activity in query, where: in ^users)
defp restrict_instance(query, %{instance: instance}) when is_binary(instance) do
activity in query,
where: fragment("split_part(actor::text, '/'::text, 3) = ?", ^instance)
defp restrict_instance(query, _), do: query
......@@ -59,6 +59,7 @@ def public_operation do
security: [%{"oAuth" => ["read:statuses"]}],
parameters: [
......@@ -158,6 +159,15 @@ defp local_param do
defp instance_param do
%Schema{type: :string},
"Show only statuses from the given domain"
defp with_muted_param do
Operation.parameter(:with_muted, :query, BooleanLike, "Include activities by muted users")
......@@ -111,6 +111,7 @@ def public(%{assigns: %{user: user}} = conn, params) do
|> Map.put(:blocking_user, user)
|> Map.put(:muting_user, user)
|> Map.put(:reply_filtering_user, user)
|> Map.put(:instance, params[:instance])
|> ActivityPub.fetch_public_activities()
......@@ -57,6 +57,15 @@ def get_topic("hashtag", _user, _oauth_token, %{"tag" => tag} = _params) do
{:ok, "hashtag:" <> tag}
# Allow remote instance streams.
def get_topic("public:remote", _user, _oauth_token, %{"instance" => instance} = _params) do
{:ok, "public:remote:" <> instance}
def get_topic("public:remote:media", _user, _oauth_token, %{"instance" => instance} = _params) do
{:ok, "public:remote:media:" <> instance}
# Expand user streams.
def get_topic(
......@@ -97,6 +97,20 @@ test "only converts strings to hash tags", %{
refute Enum.member?(topics, "hashtag:2")
test "non-local action produces public:remote topic", %{activity: activity} do
activity = %{activity | local: false, actor: ""}
topics = Topics.get_activity_topics(activity)
assert Enum.member?(topics, "")
test "local action doesn't produce public:remote topic", %{activity: activity} do
activity = %{activity | local: true, actor: ""}
topics = Topics.get_activity_topics(activity)
refute Enum.member?(topics, "")
describe "public visibility create events with attachments" do
......@@ -128,6 +142,13 @@ test "non-local doesn't produce public:local:media topics", %{activity: activity
refute Enum.member?(topics, "public:local:media")
test "non-local action produces public:remote:media topic", %{activity: activity} do
activity = %{activity | local: false, actor: ""}
topics = Topics.get_activity_topics(activity)
assert Enum.member?(topics, "")
describe "non-public visibility" do
......@@ -49,6 +49,7 @@ test "requires authentication and a valid token for protected streams" do
test "allows public streams without authentication" do
assert {:ok, _} = start_socket("?stream=public")
assert {:ok, _} = start_socket("?stream=public:local")
assert {:ok, _} = start_socket("?stream=public:remote&")
assert {:ok, _} = start_socket("?stream=hashtag&tag=lain")
......@@ -844,8 +844,8 @@ test "sets password_reset_pending to true", %{conn: conn} do
describe "instances" do
test "GET /instances/:instance/statuses", %{conn: conn} do
user = insert(:user, local: false, nickname: "")
user2 = insert(:user, local: false, nickname: "")
user = insert(:user, local: false, ap_id: "")
user2 = insert(:user, local: false, ap_id: "")
insert_pair(:note_activity, user: user)
activity = insert(:note_activity, user: user2)
......@@ -147,6 +147,18 @@ test "doesn't return replies if follow is posting with users from blocked domain
activities = json_response_and_validate_schema(res_conn, 200)
[%{"id" => ^activity_id}] = activities
test "can be filtered by instance", %{conn: conn} do
user = insert(:user, ap_id: "")
insert(:note_activity, local: false)
insert(:note_activity, local: false)
{:ok, _} =, %{status: "test"})
conn = get(conn, "/api/v1/timelines/public?")
assert length(json_response_and_validate_schema(conn, :ok)) == 1
defp local_and_remote_activities do
......@@ -29,6 +29,14 @@ test "allows public" do
assert {:ok, "public:local:media"} = Streamer.get_topic("public:local:media", nil, nil)
test "allows instance streams" do
assert {:ok, ""} =
Streamer.get_topic("public:remote", nil, nil, %{"instance" => ""})
assert {:ok, ""} =
Streamer.get_topic("public:remote:media", nil, nil, %{"instance" => ""})
test "allows hashtag streams" do
assert {:ok, "hashtag:cofe"} = Streamer.get_topic("hashtag", nil, nil, %{"tag" => "cofe"})
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment