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

readded patreon checks to natural

Browse Source
This commit is contained in:
jellywx 2021-01-14 18:00:24 +00:00
parent 04232162f2
commit 4d7b957a91
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -1314,7 +1314,7 @@ dependencies = [
[[package]]
name = "reminder_rs"
version = "1.4.0-alpha"
version = "1.4.0"
dependencies = [
"Inflector",
"chrono",

2
Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "reminder_rs"
version = "1.4.0-alpha"
version = "1.4.0"
authors = ["jellywx <judesouthworth@pm.me>"]
edition = "2018"

18
src/commands/reminder_cmds.rs
View File

@ -1222,6 +1222,8 @@ async fn natural(ctx: &Context, msg: &Message, args: String) {
match REGEX_NATURAL_COMMAND.captures(&args) {
Some(captures) => {
let subscribed = check_subscription_on_message(&ctx, msg).await;
let location_ids = if let Some(mentions) = captures.name("mentions").map(|m| m.as_str())
{
parse_mention_list(mentions)
@ -1230,15 +1232,23 @@ async fn natural(ctx: &Context, msg: &Message, args: String) {
};
let expires = if let Some(expires_crop) = captures.name("expires") {
natural_parser(expires_crop.as_str(), &user_data.timezone).await
if subscribed {
natural_parser(expires_crop.as_str(), &user_data.timezone).await
} else {
None
}
} else {
None
};
let interval = if let Some(interval_crop) = captures.name("interval") {
natural_parser(interval_crop.as_str(), &user_data.timezone)
.await
.map(|i| i - since_epoch.as_secs() as i64)
if subscribed {
natural_parser(interval_crop.as_str(), &user_data.timezone)
.await
.map(|i| i - since_epoch.as_secs() as i64)
} else {
None
}
} else {
None
};