Update template with changes

This commit is contained in:
Nwero 2025-04-13 01:54:36 +10:00
parent 2baf0eb5dd
commit 3a93247096
4 changed files with 43 additions and 19 deletions
Cargo.lock
cmds/src/dispatch
events/src/events
src

43
Cargo.lock generated

@ -179,9 +179,9 @@ dependencies = [
[[package]]
name = "cc"
version = "1.2.18"
version = "1.2.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "525046617d8376e3db1deffb079e91cef90a89fc3ca5c185bbf8c9ecdd15cd5c"
checksum = "8e3a13707ac958681c13b39b458c073d0d9bc8a22cb1b2f4c8e55eb72c13f362"
dependencies = [
"shlex",
]
@ -313,9 +313,9 @@ dependencies = [
[[package]]
name = "data-encoding"
version = "2.8.0"
version = "2.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "575f75dfd25738df5b91b8e43e14d44bda14637a58fae779fd2b064f8bf3e010"
checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476"
[[package]]
name = "deranged"
@ -933,9 +933,9 @@ checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
[[package]]
name = "linux-raw-sys"
version = "0.9.3"
version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413"
checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
[[package]]
name = "litemap"
@ -1179,7 +1179,7 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
[[package]]
name = "poise"
version = "0.6.1"
source = "git+https://github.com/serenity-rs/poise?branch=serenity-next#2a10bf958ef83b40ad7d7c6db29af6687c1b8628"
source = "git+https://github.com/serenity-rs/poise?branch=serenity-next#a1edcc09085be800a8593602910d2a09eaf986dc"
dependencies = [
"async-trait",
"derivative",
@ -1197,7 +1197,7 @@ dependencies = [
[[package]]
name = "poise_macros"
version = "0.6.1"
source = "git+https://github.com/serenity-rs/poise?branch=serenity-next#2a10bf958ef83b40ad7d7c6db29af6687c1b8628"
source = "git+https://github.com/serenity-rs/poise?branch=serenity-next#a1edcc09085be800a8593602910d2a09eaf986dc"
dependencies = [
"darling",
"proc-macro2",
@ -1337,6 +1337,26 @@ dependencies = [
"bitflags",
]
[[package]]
name = "ref-cast"
version = "1.0.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4a0ae411dbe946a674d89546582cea4ba2bb8defac896622d6496f14c23ba5cf"
dependencies = [
"ref-cast-impl",
]
[[package]]
name = "ref-cast-impl"
version = "1.0.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1165225c21bff1f3bbce98f5a1f889949bc902d3575308cc7b0de30b4f6d27c7"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.100",
]
[[package]]
name = "regex"
version = "1.11.1"
@ -1520,9 +1540,9 @@ dependencies = [
[[package]]
name = "rustls"
version = "0.23.25"
version = "0.23.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "822ee9188ac4ec04a2f0531e55d035fb2de73f18b41a63c70c2712503b6fb13c"
checksum = "df51b5869f3a441595eac5e8ff14d486ff285f7b8c0df8770e49c3b56351f0f0"
dependencies = [
"once_cell",
"ring",
@ -1685,7 +1705,7 @@ dependencies = [
[[package]]
name = "serenity"
version = "0.12.4"
source = "git+https://github.com/serenity-rs/serenity?branch=next#bd4d91dd02dac0a78bc90ee7e7dc709a1ed60edf"
source = "git+https://github.com/serenity-rs/serenity?branch=next#06a16ac2d65c192f47541dfe6c45aacc29f38f9a"
dependencies = [
"aformat",
"arrayvec",
@ -1704,6 +1724,7 @@ dependencies = [
"nonmax",
"parking_lot",
"percent-encoding",
"ref-cast",
"reqwest",
"serde",
"serde_cow",

@ -1,7 +1,10 @@
use {
poise::{
CreateReply,
serenity_prelude::ChannelId
serenity_prelude::{
ChannelId,
GenericChannelId
}
},
rustbot_lib::{
RustbotContext,
@ -96,10 +99,10 @@ async fn echo(
let channel = match channel {
Some(c) => c,
None => ctx.channel_id()
None => ChannelId::new(ctx.channel_id().get())
};
match ChannelId::new(channel.get()).say(ctx.http(), message).await {
match GenericChannelId::new(channel.get()).say(ctx.http(), message).await {
Ok(_) => {
ctx.send(CreateReply::new().content("Sent!").ephemeral(true)).await?;
},

@ -2,11 +2,11 @@ use super::RUSTBOT_EVENT;
use {
poise::serenity_prelude::{
ChannelId,
Context,
CreateEmbed,
CreateEmbedAuthor,
CreateMessage,
GenericChannelId,
Ready
},
rustbot_lib::{
@ -49,8 +49,8 @@ async fn ready_once(
.thumbnail(ready.user.avatar_url().unwrap_or_default())
.author(CreateEmbedAuthor::new(format!("{} is ready!", ready.user.name)));
ChannelId::new(BINARY_PROPERTIES.rustbot_logs)
.send_message(&ctx.http, message.add_embed(ready_embed))
GenericChannelId::new(BINARY_PROPERTIES.rustbot_logs)
.send_message(&ctx.http, message.embed(ready_embed))
.await?;
Ok(())

@ -36,8 +36,8 @@ async fn main() {
commands: collect!(),
pre_command: |ctx| {
Box::pin(async move {
let get_guild_channel_name = match ctx.guild_channel().await {
Some(channel) => format!("in #{}", channel.name.clone()),
let get_guild_channel_name = match ctx.channel().await {
Some(channel) => format!("in #{}", channel.guild().unwrap_or_default().base.name),
None => String::from("")
};
let prefix = ctx