erik/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-08-20 21:08:15 -07:00
Code Issues Projects Releases Wiki Activity

Merge 11805597a6 into a50c8e951f

Browse source
This commit is contained in:
Matt Jankowski 2024-07-31 14:05:07 +00:00 committed by GitHub
commit da5e92610a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/models/status_trend.rb
View file

@ -19,5 +19,19 @@ class StatusTrend < ApplicationRecord
belongs_to :status belongs_to :status
belongs_to :account belongs_to :account
scope :allowed, -> { joins('INNER JOIN (SELECT account_id, MAX(score) AS max_score FROM status_trends GROUP BY account_id) AS grouped_status_trends ON status_trends.account_id = grouped_status_trends.account_id AND status_trends.score = grouped_status_trends.max_score').where(allowed: true) } scope :allowed, -> { where(allowed: true) }
scope :not_allowed, -> { where(allowed: false) }
scope :with_account_constraint, -> { joins(account_constraint_joins_sql) }
def self.account_constraint_joins_sql
<<~SQL.squish
INNER JOIN (
SELECT account_id, MAX(score) AS max_score
FROM status_trends
GROUP BY account_id
) AS grouped_status_trends
ON status_trends.account_id = grouped_status_trends.account_id
AND status_trends.score = grouped_status_trends.max_score
SQL
end
end end

2
app/models/trends/status_filter.rb
View file

@ -49,7 +49,7 @@ class Trends::StatusFilter
def trending_scope(value) def trending_scope(value)
case value case value
when 'allowed' when 'allowed'
StatusTrend.allowed StatusTrend.with_account_constraint.allowed
else else
StatusTrend.all StatusTrend.all
end end

6
app/models/trends/statuses.rb
View file

@ -25,7 +25,7 @@ class Trends::Statuses < Trends::Base
def to_arel def to_arel
scope = Status.joins(:trend).reorder(score: :desc) scope = Status.joins(:trend).reorder(score: :desc)
scope = scope.reorder(language_order_clause.desc, score: :desc) if preferred_languages.present? scope = scope.reorder(language_order_clause.desc, score: :desc) if preferred_languages.present?
scope = scope.merge(StatusTrend.allowed) if @allowed scope = scope.merge(StatusTrend.with_account_constraint.allowed) if @allowed
scope = scope.not_excluded_by_account(@account).not_domain_blocked_by_account(@account) if @account.present? scope = scope.not_excluded_by_account(@account).not_domain_blocked_by_account(@account) if @account.present?
scope = scope.offset(@offset) if @offset.present? scope = scope.offset(@offset) if @offset.present?
scope = scope.limit(@limit) if @limit.present? scope = scope.limit(@limit) if @limit.present?
@ -79,8 +79,8 @@ class Trends::Statuses < Trends::Base
def request_review def request_review
StatusTrend.pluck('distinct language').flat_map do |language| StatusTrend.pluck('distinct language').flat_map do |language|
score_at_threshold = StatusTrend.where(language: language, allowed: true).by_rank.ranked_below(options[:review_threshold]).first&.score || 0 score_at_threshold = StatusTrend.where(language: language).allowed.by_rank.ranked_below(options[:review_threshold]).first&.score || 0
status_trends = StatusTrend.where(language: language, allowed: false).joins(:status).includes(status: :account) status_trends = StatusTrend.where(language: language).not_allowed.joins(:status).includes(status: :account)
status_trends.filter_map do |trend| status_trends.filter_map do |trend|
status = trend.status status = trend.status