jude/reminder-bot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Support daily intervals

Browse Source 
Add new database column for interval_days. Update humantime to return days as a separate field.
This commit is contained in:
jude
2022-12-10 15:32:49 +00:00
parent aa74a7f9a3
commit a49a849917
6 changed files with 145 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/models/reminder/builder.rs
View File

@ -53,7 +53,8 @@ pub struct ReminderBuilder {
channel: u32,
utc_time: NaiveDateTime,
timezone: String,
interval_secs: Option<i64>,
interval_seconds: Option<i64>,
interval_days: Option<i64>,
interval_months: Option<i64>,
expires: Option<NaiveDateTime>,
content: String,
@ -87,6 +88,7 @@ INSERT INTO reminders (
`utc_time`,
`timezone`,
`interval_seconds`,
`interval_days`,
`interval_months`,
`expires`,
`content`,
@ -106,6 +108,7 @@ INSERT INTO reminders (
?,
?,
?,
?,
?
)
",
@ -113,7 +116,8 @@ INSERT INTO reminders (
self.channel,
utc_time,
self.timezone,
self.interval_secs,
self.interval_seconds,
self.interval_days,
self.interval_months,
self.expires,
self.content,
@ -210,9 +214,14 @@ impl<'a> MultiReminderBuilder<'a> {
let mut ok_locs = HashSet::new();
if self.interval.map_or(false, |i| ((i.sec + i.month * 30 * DAY) as i64) < *MIN_INTERVAL) {
if self
.interval
.map_or(false, |i| ((i.sec + i.day * DAY + i.month * 30 * DAY) as i64) < *MIN_INTERVAL)
{
errors.insert(ReminderError::ShortInterval);
} else if self.interval.map_or(false, |i| ((i.sec + i.month * 30 * DAY) as i64) > *MAX_TIME)
} else if self
.interval
.map_or(false, |i| ((i.sec + i.day * DAY + i.month * 30 * DAY) as i64) > *MAX_TIME)
{
errors.insert(ReminderError::LongInterval);
} else {
@ -300,7 +309,8 @@ impl<'a> MultiReminderBuilder<'a> {
channel: c,
utc_time: self.utc_time,
timezone: self.timezone.to_string(),
interval_secs: self.interval.map(|i| i.sec as i64),
interval_seconds: self.interval.map(|i| i.sec as i64),
interval_days: self.interval.map(|i| i.day as i64),
interval_months: self.interval.map(|i| i.month as i64),
expires: self.expires,
content: self.content.content.clone(),

12
src/models/reminder/mod.rs
View File

@ -26,6 +26,7 @@ pub struct Reminder {
pub channel: u64,
pub utc_time: DateTime<Utc>,
pub interval_seconds: Option<u32>,
pub interval_days: Option<u32>,
pub interval_months: Option<u32>,
pub expires: Option<NaiveDateTime>,
pub enabled: bool,
@ -59,6 +60,7 @@ SELECT
channels.channel,
reminders.utc_time,
reminders.interval_seconds,
reminders.interval_days,
reminders.interval_months,
reminders.expires,
reminders.enabled,
@ -95,6 +97,7 @@ SELECT
channels.channel,
reminders.utc_time,
reminders.interval_seconds,
reminders.interval_days,
reminders.interval_months,
reminders.expires,
reminders.enabled,
@ -138,6 +141,7 @@ SELECT
channels.channel,
reminders.utc_time,
reminders.interval_seconds,
reminders.interval_days,
reminders.interval_months,
reminders.expires,
reminders.enabled,
@ -195,6 +199,7 @@ SELECT
channels.channel,
reminders.utc_time,
reminders.interval_seconds,
reminders.interval_days,
reminders.interval_months,
reminders.expires,
reminders.enabled,
@ -228,6 +233,7 @@ SELECT
channels.channel,
reminders.utc_time,
reminders.interval_seconds,
reminders.interval_days,
reminders.interval_months,
reminders.expires,
reminders.enabled,
@ -262,6 +268,7 @@ SELECT
channels.channel,
reminders.utc_time,
reminders.interval_seconds,
reminders.interval_days,
reminders.interval_months,
reminders.expires,
reminders.enabled,
@ -323,7 +330,10 @@ WHERE
TimeDisplayType::Relative => format!("<t:{}:R>", self.utc_time.timestamp()),
};
if self.interval_seconds.is_some() || self.interval_months.is_some() {
if self.interval_seconds.is_some()
|| self.interval_days.is_some()
|| self.interval_months.is_some()
{
format!(
"'{}' *occurs next at* **{}**, repeating (set by {})\n",
self.display_content(),