diff options
| -rw-r--r-- | app/controllers/api/v1/statuses_controller.rb | 2 | ||||
| -rw-r--r-- | app/models/status.rb | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb index 952ed641d..64dc3f84e 100644 --- a/app/controllers/api/v1/statuses_controller.rb +++ b/app/controllers/api/v1/statuses_controller.rb @@ -55,7 +55,7 @@ class Api::V1::StatusesController < ApiController end def public - @statuses = Status.with_includes.with_counters.order('id desc').paginate_by_max_id(20, params[:max_id], params[:since_id]).to_a + @statuses = Status.as_public_timeline(current_user.account).paginate_by_max_id(20, params[:max_id], params[:since_id]).to_a render action: :index end end diff --git a/app/models/status.rb b/app/models/status.rb index 7ff0487a3..111172e9a 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -18,6 +18,8 @@ class Status < ApplicationRecord validates :text, presence: true, length: { maximum: 500 }, if: proc { |s| s.local? && !s.reblog? } validates :reblog, uniqueness: { scope: :account, message: 'of status already exists' }, if: 'reblog?' + default_scope { order('id desc') } + scope :with_counters, -> { select('statuses.*, (select count(r.id) from statuses as r where r.reblog_of_id = statuses.id) as reblogs_count, (select count(f.id) from favourites as f where f.status_id = statuses.id) as favourites_count') } scope :with_includes, -> { includes(:account, :media_attachments, :stream_entry, mentions: :account, reblog: [:account, mentions: :account], thread: :account) } @@ -83,6 +85,10 @@ class Status < ApplicationRecord where(id: Mention.where(account: account).pluck(:status_id)).with_includes.with_counters end + def self.as_public_timeline(account) + where.not(account_id: account.blocking).with_includes.with_counters + end + def self.favourites_map(status_ids, account_id) Favourite.where(status_id: status_ids).where(account_id: account_id).map { |f| [f.status_id, true] }.to_h end |