unconditionally consume args in exec and eval

assyst-core/src/command/arguments.rs

@@ -294,6 +294,48 @@ impl ParseArgument for Rest {
     }
 }
 
+/// The rest of a message as an argument, and asserts that there is no following flag argument. This
+/// should be the last argument if used.
+#[derive(Debug)]
+pub struct RestNoFlags(pub String);
+
+impl ParseArgument for RestNoFlags {
+    async fn parse_raw_message(ctxt: &mut RawMessageParseCtxt<'_>, label: Label) -> Result<Self, TagParseError> {
+        if let Some(m) = ctxt.cx.data.message {
+            if let Some(ref r) = m.referenced_message {
+                Ok(Self(r.content.clone()))
+            } else {
+                Ok(Self(ctxt.rest_all(label)))
+            }
+        } else {
+            Ok(Self(ctxt.rest_all(label)))
+        }
+    }
+
+    async fn parse_command_option(ctxt: &mut InteractionCommandParseCtxt<'_>) -> Result<Self, TagParseError> {
+        // treat Rest as same as Word because there is no option type which is just one whitespace-delimited
+        // word
+        let word = ctxt.next_option()?;
+
+        if let CommandOptionValue::String(ref option) = word.value {
+            Ok(RestNoFlags(option.clone()))
+        } else {
+            Err(TagParseError::MismatchedCommandOptionType((
+                "String (Rest)".to_owned(),
+                word.value.clone(),
+            )))
+        }
+    }
+
+    fn as_command_option(name: &str) -> CommandOption {
+        StringBuilder::new(name, "text input").required(true).build()
+    }
+
+    fn usage(name: &str) -> String {
+        format!("<...{name}>")
+    }
+}
+
 pub struct ImageUrl(pub String);
 
 impl ImageUrl {

assyst-core/src/command/misc/mod.rs

@@ -3,7 +3,7 @@ use std::time::{Duration, Instant};
 use crate::command::Availability;
 use crate::rest::eval::fake_eval;
 
-use super::arguments::{Image, ImageUrl, Rest, Word};
+use super::arguments::{Image, ImageUrl, Rest, RestNoFlags, Word};
 use super::{Category, CommandCtxt};
 
 use anyhow::Context;
@@ -89,7 +89,7 @@ pub async fn ping(ctxt: CommandCtxt<'_>) -> anyhow::Result<()> {
     usage = "[script]",
     examples = ["rm -rf /*"]
 )]
-pub async fn exec(ctxt: CommandCtxt<'_>, script: Rest) -> anyhow::Result<()> {
+pub async fn exec(ctxt: CommandCtxt<'_>, script: RestNoFlags) -> anyhow::Result<()> {
     let result = exec_sync(&script.0)?;
 
     let mut output = "".to_owned();
@@ -113,7 +113,7 @@ pub async fn exec(ctxt: CommandCtxt<'_>, script: Rest) -> anyhow::Result<()> {
     usage = "[script]",
     examples = ["1"]
 )]
-pub async fn eval(ctxt: CommandCtxt<'_>, script: Rest) -> anyhow::Result<()> {
+pub async fn eval(ctxt: CommandCtxt<'_>, script: RestNoFlags) -> anyhow::Result<()> {
     let result = fake_eval(ctxt.assyst(), script.0, true, ctxt.data.message, Vec::new())
         .await
         .context("Evaluation failed")?;

assyst-core/src/main.rs

@@ -129,7 +129,7 @@ async fn main() {
     assyst.register_task(Task::new_delayed(
         assyst.clone(),
         Duration::from_secs(60 * 10),
-        Duration::from_secs(30),
+        Duration::from_secs(60 * 10),
         function_task_callback!(refresh_web_download_urls),
     ));
     info!("Registered web download url refreshing task");