Merge branch 'main' of github.com:minneelyyyy/bot

src/commands/gambling/daily.rs

@@ -1,6 +1,6 @@
 use crate::{Context, Error};
 
-use poise::serenity_prelude::UserId;
+use poise::serenity_prelude::{UserId, User};
 use sqlx::{types::chrono::{DateTime, Utc, TimeZone}, PgExecutor, Row};
 
 use std::time::Duration;
@@ -59,10 +59,14 @@ where
 
 /// Tells you what your current daily streak is
 #[poise::command(slash_command, prefix_command)]
-pub async fn streak(ctx: Context<'_>) -> Result<(), Error> {
+pub async fn streak(ctx: Context<'_>, user: Option<User>) -> Result<(), Error> {
     let db = &ctx.data().database;
+    let (user, who) = match user {
+        Some(user) => (user.id, format!("{} has", user.display_name())),
+        None => (ctx.author().id, "You have".to_string()),
+    };
 
-    ctx.reply(format!("You have a daily streak of **{}**", get_streak(db, ctx.author().id).await?.unwrap_or(0))).await?;
+    ctx.reply(format!("{who} a daily streak of **{}**", get_streak(db, user).await?.unwrap_or(0))).await?;
     Ok(())
 }
 

src/commands/gambling/leaderboard.rs

@@ -3,18 +3,23 @@ use crate::common::{Context, Error};
 use poise::serenity_prelude::UserId;
 use sqlx::Row;
 
-/// Display a leaderboard of the top 10 wealthiest players
+enum LeaderboardType {
-#[poise::command(slash_command, prefix_command, aliases("lb"))]
+    Tokens(usize),
-pub async fn leaderboard(ctx: Context<'_>) -> Result<(), Error> {
+    Dailies(usize),
+}
+
+async fn display_leaderboard(ctx: Context<'_>, t: LeaderboardType) -> Result<(), Error> {
     let db = &ctx.data().database;
 
+    match t {
+        LeaderboardType::Tokens(count) => {
             let rows = sqlx::query(
                 r#"
                 SELECT id, balance FROM bank
                 ORDER BY balance DESC
-        LIMIT 10
+                LIMIT $1
                 "#
-    ).fetch_all(db).await?;
+            ).bind(count as i32).fetch_all(db).await?;
 
             let users: Vec<(_, i32)> = rows.iter().map(|row| (UserId::new(row.get::<i64, _>(0) as u64), row.get(1))).collect();
             let mut output = String::new();
@@ -25,6 +30,59 @@ pub async fn leaderboard(ctx: Context<'_>) -> Result<(), Error> {
             }
 
             ctx.reply(format!("```\n{output}```")).await?;        
+        }
+        LeaderboardType::Dailies(count) => {
+            let rows = sqlx::query(
+                r#"
+                SELECT userid, streak FROM dailies
+                ORDER BY streak DESC
+                LIMIT $1
+                "#
+            ).bind(count as i32).fetch_all(db).await?;
+
+            let users: Vec<(_, i32)> = rows.iter().map(|row| (UserId::new(row.get::<i64, _>(0) as u64), row.get(1))).collect();
+            let mut output = String::new();
+
+            for (id, streak) in users {
+                let user = id.to_user(ctx).await?;
+                output += &format!("{} - {}\n", user.display_name(), streak);
+            }
+
+            ctx.reply(format!("```\n{output}```")).await?;  
+        }
+    }
 
     Ok(())
 }
+
+/// DIsplay users with the top highest balances
+#[poise::command(slash_command, prefix_command)]
+pub async fn tokens(ctx: Context<'_>, count: Option<usize>) -> Result<(), Error> {
+    let count = count.unwrap_or(10);
+
+    if count < 1 || count > 20 {
+        ctx.reply(format!("Sorry, I cannot display {count} entries.")).await?;
+        return Ok(());
+    }
+
+    display_leaderboard(ctx, LeaderboardType::Tokens(count)).await
+}
+
+/// Display users with the top highest daily streaks
+#[poise::command(slash_command, prefix_command)]
+pub async fn dailies(ctx: Context<'_>, count: Option<usize>) -> Result<(), Error> {
+    let count = count.unwrap_or(10);
+
+    if count < 1 || count > 20 {
+        ctx.reply(format!("Sorry, I cannot display {count} entries.")).await?;
+        return Ok(());
+    }
+
+    display_leaderboard(ctx, LeaderboardType::Dailies(count)).await
+}
+
+/// Display a leaderboard
+#[poise::command(slash_command, prefix_command, aliases("lb"), subcommands("tokens", "dailies"))]
+pub async fn leaderboard(ctx: Context<'_>) -> Result<(), Error> {
+    display_leaderboard(ctx, LeaderboardType::Tokens(10)).await
+}