diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-10-28 11:36:25 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-10-28 19:23:58 +0200 |
| commit | cb19be67d1b47dd04cb5bb88e09f0101a614bd1c (patch) | |
| tree | 6c85ccc6ac0279ae7b1ed4dff56c8e83f71a0c95 /app/controllers/api/v1/timelines | |
| parent | 371563b0e249b6369e04709fb974a8e57413529f (diff) | |
| parent | 8dfe5179ee7186e549dbe1186a151ffa848fe8ab (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app/controllers/api/v1/timelines')
| -rw-r--r-- | app/controllers/api/v1/timelines/public_controller.rb | 1 | ||||
| -rw-r--r-- | app/controllers/api/v1/timelines/tag_controller.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/api/v1/timelines/public_controller.rb b/app/controllers/api/v1/timelines/public_controller.rb index 493fe4776..2ee5aaf18 100644 --- a/app/controllers/api/v1/timelines/public_controller.rb +++ b/app/controllers/api/v1/timelines/public_controller.rb @@ -35,6 +35,7 @@ class Api::V1::Timelines::PublicController < Api::BaseController def public_feed PublicFeed.new( current_account, + locale: content_locale, local: truthy_param?(:local), remote: truthy_param?(:remote), only_media: truthy_param?(:only_media), diff --git a/app/controllers/api/v1/timelines/tag_controller.rb b/app/controllers/api/v1/timelines/tag_controller.rb index 64a1db58d..9f3a5b3f1 100644 --- a/app/controllers/api/v1/timelines/tag_controller.rb +++ b/app/controllers/api/v1/timelines/tag_controller.rb @@ -36,6 +36,7 @@ class Api::V1::Timelines::TagController < Api::BaseController TagFeed.new( @tag, current_account, + locale: content_locale, any: params[:any], all: params[:all], none: params[:none], |