OpenCloud
/
mastodon
mirror of https://github.com/tootsuite/mastodon
1
1
Fork 0
Code Issues Releases Wiki Activity

Use shorter attribute query methods in `Announcement` (#28474)

pull/28521/head
Matt Jankowski 2023-12-29 05:55:50 -05:00 committed by GitHub
parent fd57e40681
commit ba5f659bb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/announcement.rb
View File

@ -28,8 +28,8 @@ class Announcement < ApplicationRecord
has_many :announcement_reactions, dependent: :destroy
validates :text, presence: true
validates :starts_at, presence: true, if: -> { ends_at.present? }
validates :ends_at, presence: true, if: -> { starts_at.present? }
validates :starts_at, presence: true, if: :ends_at?
validates :ends_at, presence: true, if: :starts_at?
before_validation :set_published, on: :create
@ -46,7 +46,7 @@ class Announcement < ApplicationRecord
end
def time_range?
starts_at.present? && ends_at.present?
starts_at? && ends_at?
end
def mentions