feat(framework): migrate to serenity and poise next event dispatch and client setup

Author: DevYukine

src/events/mod.rs

@@ -1,9 +1,8 @@
 use crate::abstraction::activity_data::FromStringTuple;
 use lazy_static::lazy_static;
 use log::{debug, info};
-use serenity::all::{ActivityData, Ready, ResumedEvent};
+use serenity::all::{ActivityData, Context, EventHandler, FullEvent};
 use serenity::async_trait;
-use serenity::prelude::{Context, EventHandler};
 use std::env;
 
 pub struct Handler;
@@ -15,18 +14,22 @@ lazy_static! {
 
 #[async_trait]
 impl EventHandler for Handler {
-	async fn ready(&self, ctx: Context, ready: Ready) {
-		info!("{} is connected!", ready.user.name);
+	async fn dispatch(&self, ctx: &Context, event: &FullEvent) {
+		match event {
+			FullEvent::Ready { data_about_bot, .. } => {
+				info!("{} is connected!", data_about_bot.user.name);
 
-		if !DISCORD_STATUS.is_empty() && !DISCORD_STATUS_NAME.is_empty() {
-			ctx.set_activity(Some(ActivityData::from_tuple(
-				&DISCORD_STATUS,
-				&DISCORD_STATUS_NAME,
-			)));
-		};
-	}
-
-	async fn resume(&self, _ctx: Context, _resume: ResumedEvent) {
-		debug!("Resumed");
+				if !DISCORD_STATUS.is_empty() && !DISCORD_STATUS_NAME.is_empty() {
+					ctx.set_activity(Some(ActivityData::from_tuple(
+						&DISCORD_STATUS,
+						&DISCORD_STATUS_NAME,
+					)));
+				}
+			}
+			FullEvent::Resume { .. } => {
+				debug!("Resumed");
+			}
+			_ => {}
+		}
 	}
 }

src/main.rs

@@ -9,8 +9,9 @@ use crate::command::{
 use abstraction::command::CommandData;
 use dotenvy::dotenv;
 use log::info;
-use serenity::all::GuildId;
+use serenity::all::{GuildId, Http, Token};
 use serenity::prelude::GatewayIntents;
+use std::sync::Arc;
 
 pub mod built_info {
 	// The file has been placed there by the build script.
@@ -19,7 +20,6 @@ pub mod built_info {
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
-	// Load environment variables from .env file, if present but do nothing if it fails
 	let _ = dotenv();
 	tracing_subscriber::fmt::init();
 
@@ -31,57 +31,51 @@ async fn main() -> anyhow::Result<()> {
 		built_info::BUILT_TIME_UTC
 	);
 
-	let token = std::env::var("DISCORD_TOKEN").expect("missing DISCORD_TOKEN");
-
+	let token = Token::from_env("DISCORD_TOKEN")?;
 	let intents = GatewayIntents::non_privileged();
 
-	let framework = poise::Framework::builder()
-		.options(poise::FrameworkOptions {
-			commands: get_all_commands(),
-			post_command: |ctx| {
-				Box::pin(async move {
-					let author = ctx.author();
-					let guild = ctx.guild();
-					let cmd = ctx.command();
-
-					let user_info = format!("{}[{}]", author.name, author.id);
-
-					let guild_info = if let Some(guild) = guild {
-						format!("{}[{}]", guild.name, guild.id)
-					} else {
-						"Direct Messages".to_string()
-					};
+	let http = Http::new(token.clone());
+	poise::builtins::register_globally(&http, get_global_commands().iter()).await?;
+	poise::builtins::register_in_guild(
+		&http,
+		retrorealm_server_commands().iter(),
+		GuildId::new(*RETROREALM_SERVER_ID),
+	)
+	.await?;
+
+	let options = poise::FrameworkOptions {
+		commands: get_all_commands(),
+		post_command: |ctx| {
+			Box::pin(async move {
+				let author = ctx.author();
+				let guild = ctx.guild();
+				let cmd = ctx.command();
 
-					let command_name = cmd.name.to_lowercase();
+				let user_info = format!("{}[{}]", author.name, author.id);
 
-					info!("{user_info} @ {guild_info} {command_name}");
-				})
-			},
-			..Default::default()
-		})
-		.setup(|ctx, _ready, _framework| {
-			Box::pin(async move {
-				poise::builtins::register_globally(ctx, get_global_commands().as_slice()).await?;
+				let guild_info = if let Some(guild) = guild {
+					format!("{}[{}]", guild.name, guild.id)
+				} else {
+					"Direct Messages".to_string()
+				};
 
-				poise::builtins::register_in_guild(
-					ctx,
-					retrorealm_server_commands().as_slice(),
-					GuildId::from(*RETROREALM_SERVER_ID),
-				)
-				.await?;
+				let command_name = cmd.name.to_lowercase();
 
-				Ok(CommandData::default())
+				info!("{user_info} @ {guild_info} {command_name}");
 			})
-		})
-		.initialize_owners(true)
-		.build();
+		},
+		..Default::default()
+	};
+
+	let framework = poise::Framework::new(options);
 
-	let mut client = serenity::Client::builder(token, intents)
-		.event_handler(events::Handler)
-		.framework(framework)
-		.await?;
+	let client = serenity::Client::builder(token, intents)
+		.framework(Box::new(framework))
+		.event_handler(Arc::new(events::Handler))
+		.data(Arc::new(CommandData::default()) as _)
+		.await;
 
-	client.start().await?;
+	client?.start().await?;
 
 	Ok(())
 }