diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-07-01 21:12:59 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-07-18 19:35:07 -0500 |
| commit | afa8b469ed0a71247f27efec08d6eeac24b6674f (patch) | |
| tree | 20c62bbf4a7013d026744f44da45efe77c678aac /lib/pleroma/web/mastodon_api | |
| parent | 10d46235cfae03901c297473043a5700a8c5e4f0 (diff) | |
| download | pleroma-afa8b469ed0a71247f27efec08d6eeac24b6674f.tar.gz | |
Allow restricting public timeline by instance
Diffstat (limited to 'lib/pleroma/web/mastodon_api')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex b/lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex index ab7b1d6aa..7dccc0005 100644 --- a/lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex @@ -110,6 +110,7 @@ defmodule Pleroma.Web.MastodonAPI.TimelineController 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() conn |