From afc06bda9fbd54cd4ac4123c2bc959259c2d6ed6 Mon Sep 17 00:00:00 2001
From: jude <judesouthworth@pm.me>
Date: Wed, 28 Oct 2020 09:19:10 +0000
Subject: [PATCH] fixed formatting for reminders that are about to send in
 $look. fixed multiline reminders on natural that have a location or interval
 provided

---
 src/commands/reminder_cmds.rs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/commands/reminder_cmds.rs b/src/commands/reminder_cmds.rs
index 5e9e66a..baeb0f9 100644
--- a/src/commands/reminder_cmds.rs
+++ b/src/commands/reminder_cmds.rs
@@ -50,7 +50,7 @@ use std::{
     time::{SystemTime, UNIX_EPOCH},
 };
 
-use regex::Regex;
+use regex::RegexBuilder;
 
 fn shorthand_displacement(seconds: u64) -> String {
     let (days, seconds) = seconds.div_rem(&DAY);
@@ -466,7 +466,7 @@ LIMIT
                         .unwrap()
                         .as_secs();
 
-                    longhand_displacement((reminder.time as u64).checked_sub(now).unwrap_or(0))
+                    longhand_displacement((reminder.time as u64).checked_sub(now).unwrap_or(1))
                 }
             };
 
@@ -1063,7 +1063,9 @@ async fn natural(ctx: &Context, msg: &Message, args: String) {
             let mut interval = None;
 
             if msg.guild_id.is_some() {
-                let re_match = Regex::new(&format!(r#"(?:\s*)(?P<msg>.*) {} (?P<mentions>((?:<@\d+>)|(?:<@!\d+>)|(?:<#\d+>)|(?:\s+))+)$"#, to_str))
+                let re_match = RegexBuilder::new(&format!(r#"(?:\s*)(?P<msg>.*) {} (?P<mentions>((?:<@\d+>)|(?:<@!\d+>)|(?:<#\d+>)|(?:\s+))+)$"#, to_str))
+                    .dot_matches_new_line(true)
+                    .build()
                     .unwrap()
                     .captures(msg_crop);
 
@@ -1090,7 +1092,9 @@ async fn natural(ctx: &Context, msg: &Message, args: String) {
 
             if check_subscription_on_message(&ctx, &msg).await {
                 let re_match =
-                    Regex::new(&format!(r#"(?P<msg>.*) {} (?P<interval>.*)$"#, every_str))
+                    RegexBuilder::new(&format!(r#"(?P<msg>.*) {} (?P<interval>.*)$"#, every_str))
+                        .dot_matches_new_line(true)
+                        .build()
                         .unwrap()
                         .captures(content);