AkkomaGang/fedibird-fe
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity

Change to remove coalesce for null from conditional expression in statuses.expires_at

Browse source
This commit is contained in:
noellabo 2021-07-05 12:09:22 +09:00
parent 788289011f
commit 8029bd9afb
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/concerns/expireable.rb
View file

@ -30,7 +30,7 @@ module Expireable
end end
def expires? def expires?
!expires_at.nil? && expires_at != ::Float::INFINITY !expires_at.nil?
end end
end end
end end

7
app/models/status.rb
View file

@ -36,7 +36,6 @@ class Status < ApplicationRecord
include Cacheable include Cacheable
include StatusThreadingConcern include StatusThreadingConcern
include RateLimitable include RateLimitable
include Expireable
include Redisable include Redisable
rate_limit by: :account, family: :statuses rate_limit by: :account, family: :statuses
@ -102,7 +101,7 @@ class Status < ApplicationRecord
scope :remote, -> { where(local: false).where.not(uri: nil) } scope :remote, -> { where(local: false).where.not(uri: nil) }
scope :local, -> { where(local: true).or(where(uri: nil)) } scope :local, -> { where(local: true).or(where(uri: nil)) }
scope :not_expired, -> { where("COALESCE(statuses.expires_at,'infinity') >= CURRENT_TIMESTAMP") } scope :not_expired, -> { where("statuses.expires_at >= CURRENT_TIMESTAMP") }
scope :include_expired, -> { unscoped.recent.kept } scope :include_expired, -> { unscoped.recent.kept }
scope :with_accounts, ->(ids) { where(id: ids).includes(:account) } scope :with_accounts, ->(ids) { where(id: ids).includes(:account) }
scope :without_replies, -> { where('statuses.reply = FALSE OR statuses.in_reply_to_account_id = statuses.account_id') } scope :without_replies, -> { where('statuses.reply = FALSE OR statuses.in_reply_to_account_id = statuses.account_id') }
@ -257,6 +256,10 @@ class Status < ApplicationRecord
media_attachments.any? media_attachments.any?
end end
def expires?
expires_at != ::Float::INFINITY
end
def non_sensitive_with_media? def non_sensitive_with_media?
!sensitive? && with_media? !sensitive? && with_media?
end end