github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-04 20:04:42 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Remove all code referencing at_desktop bookmark reminders (#9650)

Browse Source 
We have found no need for these reminder types, so we are removing the code for them.
This commit is contained in:
Martin Brennan
2020-05-06 15:22:43 +10:00
committed by GitHub
parent 4239ca1f8d
commit fa572d3a7a
30 changed files with 36 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/models/bookmark.rb
View File

@ -6,8 +6,8 @@ class Bookmark < ActiveRecord::Base
belongs_to :topic
validates :reminder_at, presence: {
message: I18n.t("bookmarks.errors.time_must_be_provided", reminder_type: I18n.t("bookmarks.reminders.at_desktop")),
if: -> { reminder_type.present? && reminder_type != Bookmark.reminder_types[:at_desktop] }
message: I18n.t("bookmarks.errors.time_must_be_provided"),
if: -> { reminder_type.present? }
}
validate :unique_per_post_for_user
@ -47,21 +47,12 @@ class Bookmark < ActiveRecord::Base
where("reminder_at IS NOT NULL AND reminder_at <= :before_time", before_time: before_time)
end
scope :pending_at_desktop_reminders, ->(before_time = Time.now.utc) do
where("reminder_at IS NULL AND reminder_type = :at_desktop", at_desktop: reminder_types[:at_desktop])
end
scope :pending_reminders_for_user, ->(user) do
pending_reminders.where(user: user)
end
scope :at_desktop_reminders_for_user, ->(user) do
where("reminder_type = :at_desktop AND user_id = :user_id", at_desktop: reminder_types[:at_desktop], user_id: user.id)
end
def self.reminder_types
@reminder_type = Enum.new(
at_desktop: 0,
later_today: 1,
next_business_day: 2,
tomorrow: 3,