upgrade dependencies

Cargo.toml

@@ -7,13 +7,13 @@ edition = "2021"
 
 [dependencies]
 log = "0.4"
-env_logger = "0.9"
+env_logger = "0.11.3"
-chrono = "0.4"
+time = "0.3.36"
-itertools = "0.10"
+itertools = "0.13"
-tokio = {version = "1.20", features = ["rt-multi-thread", "signal"]}
+tokio = {version = "1.37", features = ["rt-multi-thread", "signal"]}
-dashmap = "5.3.4"
+dashmap = "5.5.3"
 
 [dependencies.serenity]
-version = "0.11"
+version = "0.12"
 default-features = false
-features = ["builder", "cache", "client", "gateway", "http", "model", "utils", "rustls_backend"]
+features = ["builder", "cache", "client", "gateway", "http", "model", "utils", "rustls_backend"]

src/bin/spamcontest.rs

@@ -40,7 +40,7 @@ async fn main() -> ExitCode {
             .expect("error on waiting for shutdown signal");
 
         debug!("Shutting down...");
-        shard_manager.lock().await.shutdown_all().await;
+        shard_manager.shutdown_all().await;
     });
 
     match client.start().await {

src/lib.rs

@@ -1,17 +1,19 @@
 use dashmap::DashMap;
 use itertools::Itertools;
 use log::{debug, error, info};
+use serenity::all::{ActivityData, CreateEmbed, CreateMessage};
 use serenity::client::{Context, EventHandler};
 use serenity::model::channel::Message;
+use serenity::model::colour::Colour;
 use serenity::model::event::ResumedEvent;
-use serenity::model::gateway::{Activity, Ready};
+use serenity::model::gateway::Ready;
 use serenity::model::id::{ChannelId, UserId};
-use serenity::utils::Colour;
 use std::cmp::Reverse;
 use std::collections::HashMap;
 use std::fmt::Display;
 use std::ops::RangeInclusive;
 use std::time::Duration;
+use time::OffsetDateTime;
 use tokio::sync::mpsc;
 
 const DEFAULT_CONTEST_DURATION: Duration = Duration::from_secs(60);
@@ -42,7 +44,7 @@ impl EventHandler for Handler {
                 "Counting message {} (from {} in channel {})",
                 msg.id,
                 msg.author.tag(),
-                msg.channel_id.0
+                msg.channel_id.get()
             );
             contest.value().send(msg).await.unwrap();
             return;
@@ -61,7 +63,7 @@ impl EventHandler for Handler {
                 "User {} started a {} second contest in channel {}",
                 msg.author.tag(),
                 duration.as_secs(),
-                msg.channel_id.0
+                msg.channel_id.get()
             );
 
             match run_contest(
@@ -75,12 +77,13 @@ impl EventHandler for Handler {
             {
                 Ok(contest) => debug!(
                     "Contest in channel {} has ended with {} participant(s)",
-                    msg.channel_id.0,
+                    msg.channel_id.get(),
                     contest.counts.len()
                 ),
                 Err(err) => error!(
                     "Error while running contest in channel {}: {}",
-                    msg.channel_id.0, err
+                    msg.channel_id.get(),
+                    err
                 ),
             };
         }
@@ -88,7 +91,7 @@ impl EventHandler for Handler {
 
     async fn ready(&self, ctx: Context, ready: Ready) {
         info!("Connected as {}", ready.user.tag());
-        ctx.set_activity(Activity::listening("Spam")).await;
+        ctx.set_activity(Some(ActivityData::listening("Spam")));
     }
 
     async fn resume(&self, _ctx: Context, _: ResumedEvent) {
@@ -143,7 +146,7 @@ impl Contest {
 
         let mut result = String::new();
         let mut cur_rank_num = 1;
-        for (_, rank_group) in &ranking.into_iter().group_by(|elt| fk((*elt).1)) {
+        for (_, rank_group) in &ranking.into_iter().chunk_by(|elt| fk((elt).1)) {
             let mut group_size = 0;
             for (userid, count) in rank_group {
                 result.push_str(
@@ -164,20 +167,21 @@ async fn run_contest(
     contests: &Contests,
     pin: bool,
 ) -> serenity::Result<Contest> {
-    let end_timestamp =
+    let end_timestamp = (OffsetDateTime::now_utc() + duration).unix_timestamp();
-        (chrono::Utc::now() + chrono::Duration::from_std(duration).unwrap()).timestamp() + 1;
 
     // send announcement message
     let announcement = channel_id
-        .send_message(&ctx.http, |m| {
+        .send_message(
-            m.embed(|e| {
+            &ctx.http,
-                e.title("Es wurde ein Spam-Wettbewerb gestartet!")
+            CreateMessage::new().add_embed(
+                CreateEmbed::new()
+                    .title("Es wurde ein Spam-Wettbewerb gestartet!")
                     .description(format!(
                         "Wer am meisten spamt, gewinnt.\nEnde <t:{end_timestamp}:R>.",
                     ))
-                    .colour(Colour::BLUE)
+                    .colour(Colour::BLUE),
-            })
+            ),
-        })
+        )
         .await?;
 
     if pin {
@@ -211,9 +215,11 @@ async fn run_contest(
 
         // send ranking message
         channel_id
-            .send_message(&ctx.http, |m| {
+            .send_message(
-                m.embed(|e| {
+                &ctx.http,
-                    e.title("Der Wettbewerb ist beendet!")
+                CreateMessage::new().add_embed(
+                    CreateEmbed::new()
+                        .title("Der Wettbewerb ist beendet!")
                         .colour(Colour::DARK_GREEN)
                         .field(
                             "Ergebnisse (nach Nachrichten):",
@@ -224,9 +230,9 @@ async fn run_contest(
                             "Ergebnisse (nach Zeichen):",
                             counts.ranking_by(|c| Reverse(c.characters), |c| c.characters),
                             false,
-                        )
+                        ),
-                })
+                ),
-            })
+            )
             .await?;
     }