diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-02-26 17:04:44 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-02-26 17:04:44 +0100 |
| commit | 0158937fc2345a83f8ee5a64e85b14cabfe4b1e7 (patch) | |
| tree | 79872e72c27d6371620c0dd8f04700aa0094020c /app/controllers/api/v1/accounts/statuses_controller.rb | |
| parent | d82de360c13894746d3974d11c9505c8937ebdee (diff) | |
| parent | a5e7ada62fa2824be158f0b3bed7f3c39ce9c0fa (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - Dockerfile Took upstream version and reverted f13ebd02c91776ddb88b5178bf9015c6e0f1ca80. Hopefuly it's not needed anymore. - app/controllers/api/v1/search_controller.rb The conflict was due to us raising the number of results returned. Upstream raised it further, so took it. - config/locales/de.yml Took upstream changes to theme translation strings. - config/locales/gl.yml Took upstream changes to theme translation strings. - config/locales/nl.yml Took upstream changes to theme translation strings. - config/locales/sk.yml Took upstream changes to theme translation strings.
Diffstat (limited to 'app/controllers/api/v1/accounts/statuses_controller.rb')
| -rw-r--r-- | app/controllers/api/v1/accounts/statuses_controller.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/api/v1/accounts/statuses_controller.rb b/app/controllers/api/v1/accounts/statuses_controller.rb index 6fdc827cb..ed10f3f6a 100644 --- a/app/controllers/api/v1/accounts/statuses_controller.rb +++ b/app/controllers/api/v1/accounts/statuses_controller.rb @@ -51,9 +51,9 @@ class Api::V1::Accounts::StatusesController < Api::BaseController # Also, Avoid getting slow by not narrowing down by `statuses.account_id`. # When narrowing down by `statuses.account_id`, `index_statuses_20180106` will be used # and the table will be joined by `Merge Semi Join`, so the query will be slow. - Status.joins(:media_attachments).merge(@account.media_attachments).permitted_for(@account, current_account) - .paginate_by_max_id(limit_param(DEFAULT_STATUSES_LIMIT), params[:max_id], params[:since_id]) - .reorder(id: :desc).distinct(:id).pluck(:id) + @account.statuses.joins(:media_attachments).merge(@account.media_attachments).permitted_for(@account, current_account) + .paginate_by_max_id(limit_param(DEFAULT_STATUSES_LIMIT), params[:max_id], params[:since_id]) + .reorder(id: :desc).distinct(:id).pluck(:id) end def pinned_scope |