Merge branch 'jude/remove-activity-setter' into current

Cargo.lock

@@ -2431,7 +2431,7 @@ checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
 
 [[package]]
 name = "reminder-rs"
-version = "1.7.23"
+version = "1.7.24"
 dependencies = [
  "base64 0.22.1",
  "chrono",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "reminder-rs"
-version = "1.7.23"
+version = "1.7.24"
 authors = ["Jude Southworth <judesouthworth@pm.me>"]
 edition = "2021"
 license = "AGPL-3.0 only"

src/event_handlers.rs

@@ -13,9 +13,6 @@ pub async fn listener(
     data: &Data,
 ) -> Result<(), Error> {
     match event {
-        FullEvent::Ready { .. } => {
-            ctx.set_activity(Some(ActivityData::watching("for /remind")));
-        }
         FullEvent::ChannelDelete { channel, .. } => {
             sqlx::query!("DELETE FROM channels WHERE channel = ?", channel.id.get())
                 .execute(&data.database)

src/main.rs

@@ -39,6 +39,7 @@ use poise::serenity_prelude::{
     },
     ClientBuilder,
 };
+use serenity::all::ActivityData;
 use sqlx::{MySql, Pool};
 use tokio::sync::{broadcast, broadcast::Sender, RwLock};
 
@@ -283,8 +284,10 @@ async fn _main(tx: Sender<()>) -> Result<(), Box<dyn StdError + Send + Sync>> {
         .options(options)
         .build();
 
-    let mut client =
+    let mut client = ClientBuilder::new(&discord_token, GatewayIntents::GUILDS)
-        ClientBuilder::new(&discord_token, GatewayIntents::GUILDS).framework(framework).await?;
+        .framework(framework)
+        .activity(ActivityData::watching("for /remind"))
+        .await?;
 
     client.start_autosharded().await?;