diff options
| author | lain <lain@soykaf.club> | 2020-11-04 14:54:53 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-11-04 14:54:53 +0000 |
| commit | 5db4c823b2e345155fbed48e7e7d12cab87eca72 (patch) | |
| tree | 52cea8f21a2746c496ec9fa733c6c987d581ff0a /lib/pleroma/web/mastodon_api | |
| parent | 9c09ea01aa8c93e02b5697e27f0a8458b624b161 (diff) | |
| parent | cb3cd3a761d96a08b1b55f5b277795822aa7e1d7 (diff) | |
| download | pleroma-5db4c823b2e345155fbed48e7e7d12cab87eca72.tar.gz | |
Merge branch 'restrict-domain' into 'develop'
View a remote server's timeline
See merge request pleroma/pleroma!2713
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 7a5c80e01..ac96520a3 100644 --- a/lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex @@ -111,6 +111,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 |