treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Use `EXPIRATION_DURATIONS` constant in `CustomFilter` class (#30088)

main-rebase-security-fix
Matt Jankowski 2024-04-29 05:01:46 -04:00 committed by GitHub
parent 4527e012da
commit f0c9cbaf3b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/custom_filter.rb
View File

@ -28,6 +28,8 @@ class CustomFilter < ApplicationRecord
account account
).freeze ).freeze
EXPIRATION_DURATIONS = [30.minutes, 1.hour, 6.hours, 12.hours, 1.day, 1.week].freeze
include Expireable include Expireable
include Redisable include Redisable
@ -52,7 +54,7 @@ class CustomFilter < ApplicationRecord
return @expires_in if defined?(@expires_in) return @expires_in if defined?(@expires_in)
return nil if expires_at.nil? return nil if expires_at.nil?
[30.minutes, 1.hour, 6.hours, 12.hours, 1.day, 1.week].find { |expires_in| expires_in.from_now >= expires_at } EXPIRATION_DURATIONS.find { |expires_in| expires_in.from_now >= expires_at }
end end
def irreversible=(value) def irreversible=(value)

2
app/views/filters/_filter_fields.html.haml
View File

@ -6,7 +6,7 @@
wrapper: :with_label wrapper: :with_label
.fields-row__column.fields-row__column-6.fields-group .fields-row__column.fields-row__column-6.fields-group
= f.input :expires_in, = f.input :expires_in,
collection: [30.minutes, 1.hour, 6.hours, 12.hours, 1.day, 1.week].map(&:to_i), collection: CustomFilter::EXPIRATION_DURATIONS.map(&:to_i),
include_blank: I18n.t('invites.expires_in_prompt'), include_blank: I18n.t('invites.expires_in_prompt'),
label_method: ->(i) { I18n.t("invites.expires_in.#{i}") }, label_method: ->(i) { I18n.t("invites.expires_in.#{i}") },
wrapper: :with_label wrapper: :with_label