feat: split compact message

.cargo/config.toml

@@ -1,14 +1,5 @@
 [build]
-rustflags = ["-C", "target-cpu=haswell"]
-rustdocflags = ["-C", "target-cpu=native"]
-
-[target.x86_64-unknown-linux-gnu]
-
-[target.wasm32-unknown-unknown]
-rustflags = ["-C", "target-feature=+simd128"]
-
-[target.wasm32-wasi]
-rustflags = ["-C", "target-feature=+simd128"]
+rustflags = ["-C", "target-cpu=native"]
 
 [net]
 git-fetch-with-cli = true

crates/api/src/lib.rs

@@ -4,7 +4,6 @@
 #![allow(clippy::wildcard_imports)]
 #![allow(clippy::get_first)]
 #![feature(let_chains)]
-#![feature(exclusive_range_pattern)]
 #![feature(assert_matches)]
 #![feature(associated_type_defaults)]
 

crates/extra/src/lib.rs

@@ -1,5 +1,3 @@
-#![feature(exclusive_range_pattern)]
-
 pub mod inverse_bool;
 pub mod meters;
 pub mod percent;

crates/minecraft/src/lib.rs

@@ -1,5 +1,4 @@
 #![warn(clippy::pedantic)]
-#![feature(exclusive_range_pattern)]
 #![feature(assert_matches)]
 #![feature(const_precise_live_drops)]
 #![feature(const_mut_refs)]

crates/statpixel/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "statpixel"
-version = "0.40.0"
+version = "0.41.0"
 edition = "2021"
 license = "GPL-3.0"
 authors = ["Matthew Polak <[email protected]>"]

crates/statpixel/src/commands/at/run.rs

@@ -13,7 +13,7 @@ use minecraft::{
 	text::{parse, Text},
 	Colour,
 };
-use poise::serenity_prelude::CreateAttachment;
+use poise::serenity_prelude::{CacheHttp, CreateAttachment, CreateMessage};
 use skia_safe::textlayout::TextAlign;
 use translate::{context, tr, tr_fmt, Error};
 use uuid::Uuid;
@@ -119,15 +119,16 @@ pub async fn command<G: api::canvas::prelude::Game>(
 				at: format!("<t:{}:f>", created_at.timestamp()),
 			);
 
-			let attachments = G::condensed(ctx, family, data_lhs, suffix.as_deref(), background)
-				.into_iter()
-				.map(|mut surface| {
-					CreateAttachment::bytes(
-						Cow::Owned(canvas::to_png(&mut surface)),
-						crate::IMAGE_NAME,
-					)
-				})
-				.collect::<Vec<_>>();
+			let mut attachments =
+				G::condensed(ctx, family, data_lhs, suffix.as_deref(), background)
+					.into_iter()
+					.map(|mut surface| {
+						CreateAttachment::bytes(
+							Cow::Owned(canvas::to_png(&mut surface)),
+							crate::IMAGE_NAME,
+						)
+					})
+					.collect::<Vec<_>>();
 
 			let (_, id) = G::Mode::as_at(
 				ctx,
@@ -136,14 +137,28 @@ pub async fn command<G: api::canvas::prelude::Game>(
 				None,
 			);
 
-			let mut reply = poise::CreateReply::new().content(format!(
-				"{}\n{content}",
-				tr_fmt!(ctx, "identifier", identifier: api::id::encode(&id)),
-			));
-
-			reply.attachments = attachments;
+			let reply = poise::CreateReply::new()
+				.content(format!(
+					"{}\n{content}",
+					tr_fmt!(ctx, "identifier", identifier: api::id::encode(&id)),
+				))
+				.attachment(attachments.remove(0));
 
 			ctx.send(reply).await?;
+
+			let Some(channel_id) = ctx.channel_id() else {
+				return Ok(());
+			};
+
+			for attachment in attachments {
+				channel_id
+					.send_files(
+						ctx.discord().http(),
+						Some(attachment),
+						CreateMessage::default(),
+					)
+					.await?;
+			}
 		}
 		format::Display::Text => {
 			let (player, data_rhs) = commands::get_player_data(ctx, uuid, username).await?;

crates/statpixel/src/commands/compare/run.rs

@@ -1,7 +1,7 @@
 use std::borrow::Cow;
 
 use api::canvas::{self, prelude::Mode};
-use poise::serenity_prelude::CreateAttachment;
+use poise::serenity_prelude::{CacheHttp, CreateAttachment, CreateMessage};
 use translate::{context, tr_fmt, Error};
 use uuid::Uuid;
 
@@ -100,7 +100,7 @@ pub async fn command<G: api::canvas::prelude::Game>(
 				to: data_lhs.username.as_str(),
 			);
 
-			let attachments = G::condensed_diff(
+			let mut attachments = G::condensed_diff(
 				ctx,
 				family,
 				&data_lhs,
@@ -116,14 +116,28 @@ pub async fn command<G: api::canvas::prelude::Game>(
 
 			let (_, id) = G::Mode::as_compare(ctx, player_lhs.uuid, player_rhs.uuid, None);
 
-			let mut reply = poise::CreateReply::new().content(format!(
-				"{}\n{content}",
-				tr_fmt!(ctx, "identifier", identifier: api::id::encode(&id)),
-			));
-
-			reply.attachments = attachments;
+			let reply = poise::CreateReply::new()
+				.content(format!(
+					"{}\n{content}",
+					tr_fmt!(ctx, "identifier", identifier: api::id::encode(&id)),
+				))
+				.attachment(attachments.remove(0));
 
 			ctx.send(reply).await?;
+
+			let Some(channel_id) = ctx.channel_id() else {
+				return Ok(());
+			};
+
+			for attachment in attachments {
+				channel_id
+					.send_files(
+						ctx.discord().http(),
+						Some(attachment),
+						CreateMessage::default(),
+					)
+					.await?;
+			}
 		}
 		format::Display::Text => {
 			let (player_rhs, data_rhs) = commands::get_player_data(

crates/statpixel/src/commands/games/run.rs

@@ -1,7 +1,7 @@
 use std::borrow::Cow;
 
 use api::canvas::{self, prelude::Mode};
-use poise::serenity_prelude::CreateAttachment;
+use poise::serenity_prelude::{CacheHttp, CreateAttachment, CreateMessage};
 use translate::{context, tr_fmt};
 use uuid::Uuid;
 
@@ -22,7 +22,8 @@ pub async fn command<G: api::canvas::prelude::Game>(
 
 			player.increase_searches(ctx).await?;
 
-			let attachments = G::condensed(ctx, family, &data, suffix.as_deref(), background)
+			// guaranteed to have >= 1 element
+			let mut attachments = G::condensed(ctx, family, &data, suffix.as_deref(), background)
 				.into_iter()
 				.map(|mut surface| {
 					CreateAttachment::bytes(
@@ -33,15 +34,29 @@ pub async fn command<G: api::canvas::prelude::Game>(
 				.collect::<Vec<_>>();
 
 			let (_, id) = G::Mode::as_root(ctx, player.uuid, None);
-			let mut reply = poise::CreateReply::new().content(format!(
-				"{}\n{}",
-				tr_fmt!(ctx, "identifier", identifier: api::id::encode(&id)),
-				crate::tip::random(ctx),
-			));
-
-			reply.attachments = attachments;
+			let reply = poise::CreateReply::new()
+				.content(format!(
+					"{}\n{}",
+					tr_fmt!(ctx, "identifier", identifier: api::id::encode(&id)),
+					crate::tip::random(ctx),
+				))
+				.attachment(attachments.remove(0));
 
 			ctx.send(reply).await?;
+
+			let Some(channel_id) = ctx.channel_id() else {
+				return Ok(());
+			};
+
+			for attachment in attachments {
+				channel_id
+					.send_files(
+						ctx.discord().http(),
+						Some(attachment),
+						CreateMessage::default(),
+					)
+					.await?;
+			}
 		}
 		format::Display::Image | format::Display::Compact => {
 			let (player, data, session, skin, suffix) =

crates/statpixel/src/commands/snapshot/run.rs

@@ -13,7 +13,7 @@ use minecraft::{
 	text::{parse, Text},
 	Colour,
 };
-use poise::serenity_prelude::CreateAttachment;
+use poise::serenity_prelude::{CacheHttp, CreateAttachment, CreateMessage};
 use skia_safe::textlayout::TextAlign;
 use translate::{context, tr, tr_fmt, Error};
 use uuid::Uuid;
@@ -116,7 +116,7 @@ pub async fn command<G: api::canvas::prelude::Game>(
 				to: format!("<t:{}:f>", Utc::now().timestamp()),
 			);
 
-			let attachments = G::condensed_diff(
+			let mut attachments = G::condensed_diff(
 				ctx,
 				family,
 				data_lhs,
@@ -137,14 +137,28 @@ pub async fn command<G: api::canvas::prelude::Game>(
 				None,
 			);
 
-			let mut reply = poise::CreateReply::new().content(format!(
-				"{}\n{content}",
-				tr_fmt!(ctx, "identifier", identifier: api::id::encode(&id)),
-			));
-
-			reply.attachments = attachments;
+			let reply = poise::CreateReply::new()
+				.content(format!(
+					"{}\n{content}",
+					tr_fmt!(ctx, "identifier", identifier: api::id::encode(&id)),
+				))
+				.attachment(attachments.remove(0));
 
 			ctx.send(reply).await?;
+
+			let Some(channel_id) = ctx.channel_id() else {
+				return Ok(());
+			};
+
+			for attachment in attachments {
+				channel_id
+					.send_files(
+						ctx.discord().http(),
+						Some(attachment),
+						CreateMessage::default(),
+					)
+					.await?;
+			}
 		}
 		format::Display::Text => {
 			let (player, data_rhs) = commands::get_player_data(ctx, uuid, username).await?;

crates/statpixel/src/commands/snapshot/session.rs

@@ -2,7 +2,7 @@ use std::borrow::Cow;
 
 use api::canvas;
 use chrono::Utc;
-use poise::serenity_prelude::CreateAttachment;
+use poise::serenity_prelude::{CacheHttp, CreateAttachment, CreateMessage};
 use translate::{context, tr_fmt, Error};
 use uuid::Uuid;
 
@@ -77,7 +77,7 @@ pub async fn command<G: api::canvas::prelude::Game>(
 				to: format!("<t:{}:f>", Utc::now().timestamp()),
 			);
 
-			let attachments = G::condensed_diff(
+			let mut attachments = G::condensed_diff(
 				ctx,
 				family,
 				data_lhs,
@@ -91,11 +91,25 @@ pub async fn command<G: api::canvas::prelude::Game>(
 			})
 			.collect::<Vec<_>>();
 
-			let mut reply = poise::CreateReply::new().content(content);
-
-			reply.attachments = attachments;
+			let reply = poise::CreateReply::new()
+				.content(content)
+				.attachment(attachments.remove(0));
 
 			ctx.send(reply).await?;
+
+			let Some(channel_id) = ctx.channel_id() else {
+				return Ok(());
+			};
+
+			for attachment in attachments {
+				channel_id
+					.send_files(
+						ctx.discord().http(),
+						Some(attachment),
+						CreateMessage::default(),
+					)
+					.await?;
+			}
 		}
 		format::Display::Text => {
 			let (player, data_rhs) = commands::get_player_data(ctx, Some(uuid_rhs), None).await?;

crates/statpixel/src/main.rs

@@ -5,7 +5,6 @@
 // and overflows the requirement evaluator
 #![allow(clippy::get_first)]
 #![feature(let_chains)]
-#![feature(exclusive_range_pattern)]
 #![feature(iter_intersperse)]
 #![feature(iter_array_chunks)]
 

crates/translate/src/context.rs

@@ -355,6 +355,16 @@ impl<'c> Context<'c> {
 		}
 	}
 
+	pub fn channel_id(&self) -> Option<serenity::ChannelId> {
+		match &self.interaction {
+			#[cfg(feature = "error")]
+			ContextInteraction::Command(ctx) => Some(ctx.channel_id()),
+			ContextInteraction::Component { interaction, .. } => Some(interaction.channel_id),
+			ContextInteraction::Modal { interaction, .. } => Some(interaction.channel_id),
+			ContextInteraction::External(..) | ContextInteraction::Empty => None,
+		}
+	}
+
 	async fn send_modal(
 		&self,
 		ctx: &serenity::Context,