From 9003beb1bb9781e3ef27848d119e22e8f53ac3fb Mon Sep 17 00:00:00 2001
From: jellywx <judesouthworth@pm.me>
Date: Tue, 19 Jan 2021 12:01:14 +0000
Subject: [PATCH] fix multiline reminders. disable unused gateways if dm
 disabled

---
 Cargo.lock    |  2 +-
 Cargo.toml    |  2 +-
 src/consts.rs | 14 ++++++++++----
 src/main.rs   | 14 ++++++++++----
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6f9fd2f..467d253 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1314,7 +1314,7 @@ dependencies = [
 
 [[package]]
 name = "reminder_rs"
-version = "1.4.0"
+version = "1.4.1"
 dependencies = [
  "Inflector",
  "chrono",
diff --git a/Cargo.toml b/Cargo.toml
index aea3116..db3cc76 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "reminder_rs"
-version = "1.4.0"
+version = "1.4.1"
 authors = ["jellywx <judesouthworth@pm.me>"]
 edition = "2018"
 
diff --git a/src/consts.rs b/src/consts.rs
index 34037e1..778b402 100644
--- a/src/consts.rs
+++ b/src/consts.rs
@@ -33,7 +33,7 @@ const THEME_COLOR_FALLBACK: u32 = 0x8fb677;
 
 use std::{collections::HashSet, env, iter::FromIterator};
 
-use regex::Regex;
+use regex::{Regex, RegexBuilder};
 
 lazy_static! {
     pub static ref REGEX_CHANNEL: Regex = Regex::new(r#"^\s*<#(\d+)>\s*$"#).unwrap();
@@ -49,19 +49,25 @@ lazy_static! {
 
     pub static ref REGEX_CHANNEL_USER: Regex = Regex::new(r#"\s*<(#|@)(?:!)?(\d+)>\s*"#).unwrap();
 
-    pub static ref REGEX_REMIND_COMMAND: Regex = Regex::new(
+    pub static ref REGEX_REMIND_COMMAND: Regex = RegexBuilder::new(
     r#"(?P<mentions>(?:<@\d+>\s|<@!\d+>\s|<#\d+>\s)*)(?P<time>(?:(?:\d+)(?:s|m|h|d|:|/|-|))+)(?:\s+(?P<interval>(?:(?:\d+)(?:s|m|h|d|))+))?(?:\s+(?P<expires>(?:(?:\d+)(?:s|m|h|d|:|/|-|))+))?\s+(?P<content>.*)"#
     )
+        .dot_matches_new_line(true)
+        .build()
         .unwrap();
 
-    pub static ref REGEX_NATURAL_COMMAND_1: Regex = Regex::new(
+    pub static ref REGEX_NATURAL_COMMAND_1: Regex = RegexBuilder::new(
     r#"(?P<time>.*?) (?:send|say) (?P<msg>.*?)(?: to (?P<mentions>((?:<@\d+>)|(?:<@!\d+>)|(?:<#\d+>)|(?:\s+))+))?$"#
     )
+        .dot_matches_new_line(true)
+        .build()
         .unwrap();
 
-    pub static ref REGEX_NATURAL_COMMAND_2: Regex = Regex::new(
+    pub static ref REGEX_NATURAL_COMMAND_2: Regex = RegexBuilder::new(
     r#"(?P<msg>.*) every (?P<interval>.*?)(?: (?:until|for) (?P<expires>.*?))?$"#
     )
+        .dot_matches_new_line(true)
+        .build()
         .unwrap();
 
     pub static ref SUBSCRIPTION_ROLES: HashSet<u64> = HashSet::from_iter(
diff --git a/src/main.rs b/src/main.rs
index c583278..e8d923a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -167,11 +167,13 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
         .map_ok(|user| user.id.as_u64().to_owned())
         .await?;
 
+    let dm_enabled = env::var("DM_ENABLED").map_or(true, |var| var == "1");
+
     let framework = RegexFramework::new(logged_in_id)
         .default_prefix(DEFAULT_PREFIX.clone())
         .case_insensitive(env::var("CASE_INSENSITIVE").map_or(true, |var| var == "1"))
         .ignore_bots(env::var("IGNORE_BOTS").map_or(true, |var| var == "1"))
-        .dm_enabled(env::var("DM_ENABLED").map_or(true, |var| var == "1"))
+        .dm_enabled(dm_enabled)
         // info commands
         .add_command("ping", &info_cmds::PING_COMMAND)
         .add_command("help", &info_cmds::HELP_COMMAND)
@@ -217,13 +219,17 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
     let framework_arc = Arc::new(Box::new(framework) as Box<dyn Framework + Send + Sync>);
 
     let mut client = Client::builder(&token)
-        .intents(
+        .intents(if dm_enabled {
             GatewayIntents::GUILD_MESSAGES
                 | GatewayIntents::GUILDS
                 | GatewayIntents::GUILD_MESSAGE_REACTIONS
                 | GatewayIntents::DIRECT_MESSAGES
-                | GatewayIntents::DIRECT_MESSAGE_REACTIONS,
-        )
+                | GatewayIntents::DIRECT_MESSAGE_REACTIONS
+        } else {
+            GatewayIntents::GUILD_MESSAGES
+                | GatewayIntents::GUILDS
+                | GatewayIntents::GUILD_MESSAGE_REACTIONS
+        })
         .event_handler(Handler)
         .framework_arc(framework_arc.clone())
         .await