Merge pull request #110 from xp-bot/dev

dev build
xp-bot · Sep 24, 2023 · c1ac18d · c1ac18d
2 parents fd442d7 + 110fa2c
commit c1ac18d
Show file tree

Hide file tree

Showing 24 changed files with 809 additions and 187 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@ FROM rust:latest
 WORKDIR /usr/src
 COPY . . 
 
-RUN cargo install --path xp-bot
+RUN cargo build --release
 EXPOSE 80
 
-CMD ["cargo", "run", "--release"]
+CMD ["./target/release/xp-bot"]
diff --git a/vmng/Cargo.toml b/vmng/Cargo.toml
diff --git a/vmng/src/main.rs b/vmng/src/main.rs
diff --git a/xp-bot/src/commands/admin/add.rs b/xp-bot/src/commands/admin/add.rs
@@ -10,9 +10,9 @@ use serenity::{
     },
     prelude::Context,
 };
-use xp_db_connector::guild_member::GuildMember;
+use xp_db_connector::{guild_member::GuildMember, guild::Guild};
 
-use crate::{commands::XpCommand, utils::{colors, utils::format_number}};
+use crate::{commands::XpCommand, utils::{colors, utils::{format_number, handle_level_roles}, math::calculate_level}};
 
 pub struct AddCommand;
 
@@ -80,6 +80,9 @@ impl XpCommand for AddCommand {
 
         let new_amount = guild_member.xp + amount;
 
+        let guild = Guild::from_id(guild_id).await?;
+        let new_level = calculate_level(&new_amount);
+
         let _ = GuildMember::set_xp(guild_id, user, &new_amount, &guild_member).await?;
 
         command
@@ -100,6 +103,9 @@ impl XpCommand for AddCommand {
             })
             .await?;
 
+        handle_level_roles(&guild, &user, &new_level, &ctx, command.guild_id.clone().unwrap().0).await;
+
+
         Ok(())
     }
 }
diff --git a/xp-bot/src/commands/admin/remove.rs b/xp-bot/src/commands/admin/remove.rs
@@ -10,9 +10,9 @@ use serenity::{
     },
     prelude::Context,
 };
-use xp_db_connector::guild_member::GuildMember;
+use xp_db_connector::{guild_member::GuildMember, guild::Guild};
 
-use crate::{commands::XpCommand, utils::{colors, utils::format_number}};
+use crate::{commands::XpCommand, utils::{colors, utils::{format_number, handle_level_roles}, math::calculate_level}};
 
 pub struct RemoveCommand;
 
@@ -79,6 +79,9 @@ impl XpCommand for RemoveCommand {
 
         let new_amount = guild_member.xp - amount;
 
+        let guild = Guild::from_id(guild_id).await?;
+        let new_level = calculate_level(&new_amount);
+
         let _ = GuildMember::set_xp(guild_id, user, &new_amount, &guild_member).await?;
 
         command
@@ -99,6 +102,8 @@ impl XpCommand for RemoveCommand {
             })
             .await?;
 
+        handle_level_roles(&guild, &user, &new_level, &ctx, command.guild_id.clone().unwrap().0).await;
+
         Ok(())
     }
 }
diff --git a/xp-bot/src/commands/admin/set.rs b/xp-bot/src/commands/admin/set.rs
@@ -10,9 +10,9 @@ use serenity::{
     },
     prelude::Context,
 };
-use xp_db_connector::guild_member::GuildMember;
+use xp_db_connector::{guild_member::GuildMember, guild::Guild};
 
-use crate::{commands::XpCommand, utils::{colors, utils::format_number}};
+use crate::{commands::XpCommand, utils::{colors, utils::{format_number, handle_level_roles}, math::calculate_level}};
 
 pub struct SetCommand;
 
@@ -78,6 +78,9 @@ impl XpCommand for SetCommand {
 
         let guild_member = GuildMember::from_id(guild_id, user).await?;
 
+        let guild = Guild::from_id(guild_id).await?;
+        let new_level = calculate_level(&amount);
+
         let _ = GuildMember::set_xp(guild_id, user, &amount, &guild_member).await?;
 
         command
@@ -98,6 +101,8 @@ impl XpCommand for SetCommand {
             })
             .await?;
 
+        handle_level_roles(&guild, &user, &new_level, &ctx, command.guild_id.clone().unwrap().0).await;
+
         Ok(())
     }
 }
diff --git a/xp-bot/src/commands/admin/setlevel.rs b/xp-bot/src/commands/admin/setlevel.rs
@@ -10,11 +10,11 @@ use serenity::{
     },
     prelude::Context,
 };
-use xp_db_connector::guild_member::GuildMember;
+use xp_db_connector::{guild_member::GuildMember, guild::Guild};
 
 use crate::{
     commands::XpCommand,
-    utils::{colors, math::get_required_xp},
+    utils::{colors, math::{get_required_xp, calculate_level}, utils::handle_level_roles},
 };
 
 pub struct SetLevelCommand;
@@ -82,6 +82,10 @@ impl XpCommand for SetLevelCommand {
         let required_xp = get_required_xp(level as i32);
 
         let guild_member = GuildMember::from_id(command.guild_id.unwrap().into(), user_id).await?;
+
+        let guild = Guild::from_id(command.guild_id.unwrap().into()).await?;
+        let new_level = calculate_level(&(required_xp as u64));
+
         let _ = GuildMember::set_xp(
             command.guild_id.unwrap().into(),
             user_id,
@@ -109,6 +113,8 @@ impl XpCommand for SetLevelCommand {
             })
             .await;
 
+        handle_level_roles(&guild, &user_id, &new_level, &ctx, command.guild_id.clone().unwrap().0).await;
+
         Ok(())
     }
 }
diff --git a/xp-bot/src/commands/games/daily.rs b/xp-bot/src/commands/games/daily.rs
@@ -60,7 +60,7 @@ impl XpCommand for DailyCommand {
             return Ok(());
         }
 
-        if !eligibility_helper(command.user.id.0).await {
+        if !eligibility_helper(command.user.id.0, &command.guild_id.unwrap().0).await {
             command
                 .create_interaction_response(ctx, |response| {
                     response
@@ -121,19 +121,37 @@ impl XpCommand for DailyCommand {
 
         let daily_xp = 250;
 
+        let mut old_streak_msg = String::new();
         // reset streak if last daily was claimed more than 48 hours ago
-        let streak =
-            if time_now - guild_member.timestamps.game_daily.unwrap_or(0) as i64 > 86400 * 1000 * 2 {
-                1
-            } else {
-                guild_member.streaks.game_daily.unwrap_or(0) + 1
-            };
-
-        guild_member.xp += daily_xp * streak;
+        let streak = if time_now - guild_member.timestamps.game_daily.unwrap_or(0) as i64
+            > 86400 * 1000 * 2
+        {
+            old_streak_msg = format!(
+                "Your old streak was **{}**.",
+                guild_member.streaks.game_daily.unwrap_or(0)
+            );
+            1
+        } else {
+            guild_member.streaks.game_daily.unwrap_or(0) + 1
+        };
+
+        let member_xp = daily_xp * streak;
+        let xp_to_add = if member_xp > guild.values.maximumdailyxp as u64 {
+            guild.values.maximumdailyxp as u64
+        } else {
+            member_xp
+        };
+        guild_member.xp += xp_to_add;
+
         guild_member.timestamps.game_daily = Some(time_now as u64);
         guild_member.streaks.game_daily = Some(streak);
 
-        let _ = GuildMember::set_guild_member(command.guild_id.unwrap().0, command.user.id.0, guild_member).await?;
+        let _ = GuildMember::set_guild_member(
+            command.guild_id.unwrap().0,
+            command.user.id.0,
+            guild_member,
+        )
+        .await?;
 
         command
             .create_interaction_response(ctx, |response| {
@@ -142,9 +160,10 @@ impl XpCommand for DailyCommand {
                     .interaction_response_data(|message| {
                         message.embed(|embed| {
                             embed.description(format!(
-                                "You claimed **{}** xp. Your streak is now **{}**.",
-                                format_number(daily_xp * streak),
-                                streak
+                                "You claimed **{}** xp. Your streak is now **{}**.\n\n{}",
+                                format_number(xp_to_add),
+                                streak,
+                                old_streak_msg
                             ));
                             embed.color(colors::green())
                         })

diff --git a/xp-bot/src/commands/games/fish.rs b/xp-bot/src/commands/games/fish.rs
@@ -10,7 +10,7 @@ use crate::{
     commands::XpCommand,
     utils::{
         colors,
-        utils::{eligibility_helper, is_cooldowned, format_number},
+        utils::{eligibility_helper, is_cooldowned, format_number, game_fish},
     },
 };
 
@@ -58,7 +58,7 @@ impl XpCommand for FishCommand {
             return Ok(());
         }
 
-        if !eligibility_helper(command.user.id.0).await {
+        if !eligibility_helper(command.user.id.0, &command.guild_id.unwrap().0).await {
             command
                 .create_interaction_response(ctx, |response| {
                     response
@@ -115,8 +115,10 @@ impl XpCommand for FishCommand {
             return Ok(());
         }
 
+        let game_result = game_fish(guild.values.fishXP as i64);
+
         // assign xp
-        guild_member.xp += guild.values.fishXP as u64;
+        guild_member.xp += game_result.xp as u64;
 
         // set new cooldown
         guild_member.timestamps.game_fish = Some(time_now as u64);
@@ -134,8 +136,9 @@ impl XpCommand for FishCommand {
                     .interaction_response_data(|message| {
                         message.embed(|embed| {
                             embed.description(format!(
-                                ":fishing_pole_and_fish: | You caught a fish and gained **{}** xp!",
-                                format_number(guild.values.fishXP as u64)
+                                ":fishing_pole_and_fish: | You got **{}** xp for finding **{}**.",
+                                format_number(game_result.xp as u64),
+                                game_result.item
                             ));
                             embed.color(colors::green())
                         })

diff --git a/xp-bot/src/commands/games/loot.rs b/xp-bot/src/commands/games/loot.rs
@@ -10,7 +10,7 @@ use crate::{
     commands::XpCommand,
     utils::{
         colors,
-        utils::{eligibility_helper, format_number, is_cooldowned},
+        utils::{eligibility_helper, format_number, game_loot, is_cooldowned},
     },
 };
 
@@ -58,7 +58,7 @@ impl XpCommand for LootCommand {
             return Ok(());
         }
 
-        if !eligibility_helper(command.user.id.0).await {
+        if !eligibility_helper(command.user.id.0, &command.guild_id.unwrap().0).await {
             command
                 .create_interaction_response(ctx, |response| {
                     response
@@ -117,8 +117,10 @@ impl XpCommand for LootCommand {
             return Ok(());
         }
 
+        let game_result = game_loot(guild.values.lootXP as i64);
+
         // assign xp
-        guild_member.xp += guild.values.lootXP as u64;
+        guild_member.xp += game_result.xp as u64;
 
         // set new cooldown
         guild_member.timestamps.game_loot = Some(time_now as u64);
@@ -136,8 +138,9 @@ impl XpCommand for LootCommand {
                     .interaction_response_data(|message| {
                         message.embed(|embed| {
                             embed.description(format!(
-                                ":package: | You looted a crate and got **{}** xp!",
-                                format_number(guild.values.lootXP as u64),
+                                ":package: | You found **{}** crate and got **{}** xp!",
+                                game_result.item,
+                                format_number(game_result.xp as u64),
                             ));
                             embed.color(colors::green())
                         })

diff --git a/xp-bot/src/commands/games/mod.rs b/xp-bot/src/commands/games/mod.rs
@@ -2,4 +2,5 @@ pub mod fish;
 pub mod roll;
 pub mod loot;
 pub mod daily;
-pub mod trivia;
+pub mod trivia;
+pub mod party;