Merge Main

Author: Tokarak

Cargo.lock

@@ -1,6 +1,6 @@
 [workspace]
-members = ["bot", "protocol", "worker"]
-default-members = ["bot"]
+members = ["crates/bot", "crates/protocol", "crates/worker"]
+default-members = ["crates/bot"]
 resolver = "2"
 
 [profile.dev]

Cargo.toml

@@ -6,9 +6,7 @@ FROM chef AS planner
 
 # Compilation requires only the source code.
 COPY Cargo.toml Cargo.lock ./
-COPY protocol protocol
-COPY worker worker
-COPY bot bot
+COPY crates crates
 RUN cargo chef prepare --recipe-path recipe.json
 
 FROM chef AS builder
@@ -18,9 +16,7 @@ COPY --from=planner /typst-bot/recipe.json recipe.json
 RUN cargo chef cook --release --workspace --recipe-path recipe.json
 # Compilation requires only the source code.
 COPY Cargo.toml Cargo.lock ./
-COPY protocol protocol
-COPY worker worker
-COPY bot bot
+COPY crates crates
 RUN cargo build --release --workspace --config git-fetch-with-cli=true
 
 # ============ Run Stage ============

Dockerfile

@@ -7,13 +7,13 @@ version = "0.1.0"
 anyhow = "1"
 bincode = "1"
 flate2 = "1"
-poise = { version = "0.6", git = "https://github.com/serenity-rs/poise", default_features = false, features = [
+poise = { version = "0.6", git = "https://github.com/serenity-rs/poise", default-features = false, features = [
 	"cache",
 ] }
 protocol = { path = "../protocol" }
 rusqlite = { version = "0.31", features = ["bundled"] }
 serde = { version = "1", features = ["derive"] }
-serenity = { version = "0.12", default_features = false, features = [
+serenity = { version = "0.12", default-features = false, features = [
 	"rustls_backend",
 ] }
 strip-ansi-escapes = "0.2.0"

bot/Cargo.toml renamed to crates/bot/Cargo.toml

@@ -547,9 +547,28 @@ async fn tag_autocomplete(ctx: Context<'_>, partial_tag: &str) -> Vec<TagName> {
 		.unwrap_or_else(|_| Vec::new())
 }
 
+fn interpolate<'a>(template: &str, mut params: impl Iterator<Item = &'a str>) -> String {
+	let mut buf = String::with_capacity(template.len() / 2);
+	for chunk in template.split("%%") {
+		let mut chunks = chunk.split("%s");
+		buf += chunks.next().unwrap();
+		for chunk in chunks {
+			buf += params.next().unwrap_or("%s");
+			buf += chunk;
+		}
+		buf += "%";
+	}
+	// Remove last `%`.
+	buf.pop();
+	buf
+}
+
 /// Print the content of a tag by name.
 ///
-/// Syntax: `?tag <tag name>`
+/// Syntax: `?tag <tag name> <parameters...>`
+///
+/// If the tag has placeholders (set with `%s`),
+/// then you can fill them with the subsequent arguments.
 ///
 /// Note that tags are local to the guild.
 #[poise::command(prefix_command, slash_command, track_edits)]
@@ -559,6 +578,7 @@ async fn tag(
 	#[description = "The tag to print"]
 	#[autocomplete = "tag_autocomplete"]
 	TagName(tag_name): TagName,
+	#[description = "Any parameters for the tag"] parameters: Vec<String>,
 ) -> Result<(), PoiseError> {
 	let database = &ctx.data().database;
 	let guild_id = ctx.guild_id().ok_or("no guild id, so no tags")?.get();
@@ -571,6 +591,7 @@ async fn tag(
 		.map(|row| row.get::<_, String>("text"))
 		.transpose()?;
 	let text = text.unwrap_or_else(|| "That tag is not defined.".into());
+	let text = interpolate(&text, parameters.iter().map(String::as_str));
 	ctx.say(text).await?;
 	Ok(())
 }

bot/build.rs renamed to crates/bot/build.rs

@@ -4,11 +4,11 @@ name = "worker"
 version = "0.1.0"
 
 [dependencies]
-ariadne = { version = "0.4", default_features = false }
+ariadne = { version = "0.4", default-features = false }
 bincode = "1"
 bytemuck = "1"
 comemo = "0.4"
-image = { version = "0.25", default_features = false, features = ["png"] }
+image = { version = "0.25", default-features = false, features = ["png"] }
 protocol = { path = "../protocol" }
 thiserror = "1"
 time = "0.3"
@@ -17,7 +17,7 @@ typst = "0.11"
 typst-render = "0.11"
 
 # downloading packages
-zune-inflate = { version = "0.2", default_features = false, features = [
+zune-inflate = { version = "0.2", default-features = false, features = [
 	"gzip",
 	"std",
 ] }