mirror of
https://github.com/discourse/discourse.git
synced 2025-05-31 09:07:54 +08:00
Remove more uses of rescue nil
.
This commit is contained in:
@ -66,7 +66,12 @@ after_initialize do
|
||||
|
||||
# ensure no race condition when poll is automatically closed
|
||||
if poll["close"].present?
|
||||
close_date = Time.zone.parse(poll["close"]) rescue nil
|
||||
close_date =
|
||||
begin
|
||||
close_date = Time.zone.parse(poll["close"])
|
||||
rescue ArgumentError
|
||||
end
|
||||
|
||||
raise StandardError.new I18n.t("poll.poll_must_be_open_to_vote") if close_date && close_date <= Time.zone.now
|
||||
end
|
||||
|
||||
@ -159,7 +164,12 @@ after_initialize do
|
||||
Jobs.cancel_scheduled_job(:close_poll, post_id: post.id, poll_name: name)
|
||||
|
||||
if poll["status"] == "open" && poll["close"].present?
|
||||
close_date = Time.zone.parse(poll["close"]) rescue nil
|
||||
close_date =
|
||||
begin
|
||||
Time.zone.parse(poll["close"])
|
||||
rescue ArgumentError
|
||||
end
|
||||
|
||||
Jobs.enqueue_at(close_date, :close_poll, post_id: post.id, poll_name: name) if close_date && close_date > Time.zone.now
|
||||
end
|
||||
end
|
||||
|
Reference in New Issue
Block a user