Xproles (#133)

* xproles commands * implement xprole updating
circuitsacul · Jan 6, 2023 · 62f3d06 · 62f3d06
1 parent b12f0b3
commit 62f3d06
Show file tree

Hide file tree

Showing 16 changed files with 513 additions and 45 deletions.
diff --git a/sqlx-data.json b/sqlx-data.json
@@ -90,40 +90,6 @@
     },
     "query": "SELECT * FROM overrides\n            WHERE starboard_id=$1 AND\n            channel_ids && $2::bigint[]"
   },
-  "0503b7de215f55d8463a73b800bba7a9e1c48f91ba6d67e36c3b105f8b1a1484": {
-    "describe": {
-      "columns": [
-        {
-          "name": "role_id",
-          "ordinal": 0,
-          "type_info": "Int8"
-        },
-        {
-          "name": "guild_id",
-          "ordinal": 1,
-          "type_info": "Int8"
-        },
-        {
-          "name": "required",
-          "ordinal": 2,
-          "type_info": "Int2"
-        }
-      ],
-      "nullable": [
-        false,
-        false,
-        false
-      ],
-      "parameters": {
-        "Left": [
-          "Int8",
-          "Int8",
-          "Int2"
-        ]
-      }
-    },
-    "query": "INSERT INTO xproles\n            (role_id, guild_id, required)\n            VALUES ($1, $2, $3)\n            RETURNING *"
-  },
   "066998b6c842af003c90e4c71ae933524c0bef88b94b3dce92cc14e855852ad3": {
     "describe": {
       "columns": [
@@ -168,6 +134,26 @@
     },
     "query": "DELETE FROM permroles WHERE role_id=$1 RETURNING *"
   },
+  "08d0ded05e0b03c89892109f492fee7fa6e7a47afd18bf4155524593ce92aaca": {
+    "describe": {
+      "columns": [
+        {
+          "name": "count",
+          "ordinal": 0,
+          "type_info": "Int8"
+        }
+      ],
+      "nullable": [
+        null
+      ],
+      "parameters": {
+        "Left": [
+          "Int8"
+        ]
+      }
+    },
+    "query": "SELECT count(*) FROM xproles WHERE guild_id=$1"
+  },
   "0b73a06177a4053dd91a029b196db5f718a2626c09ef951ac8df598ec60759b9": {
     "describe": {
       "columns": [
@@ -508,6 +494,45 @@
     },
     "query": "DELETE FROM votes WHERE message_id=$1 AND starboard_id=$2 AND user_id=$3\n            RETURNING *"
   },
+  "2111de885c5b267c61a1f639a990e1f40114a56e5303add22b8e5a348080999d": {
+    "describe": {
+      "columns": [
+        {
+          "name": "user_id",
+          "ordinal": 0,
+          "type_info": "Int8"
+        },
+        {
+          "name": "guild_id",
+          "ordinal": 1,
+          "type_info": "Int8"
+        },
+        {
+          "name": "xp",
+          "ordinal": 2,
+          "type_info": "Float4"
+        },
+        {
+          "name": "autoredeem_enabled",
+          "ordinal": 3,
+          "type_info": "Bool"
+        }
+      ],
+      "nullable": [
+        false,
+        false,
+        false,
+        false
+      ],
+      "parameters": {
+        "Left": [
+          "Int8",
+          "Int8"
+        ]
+      }
+    },
+    "query": "SELECT * FROM members WHERE guild_id=$1 AND user_id=$2"
+  },
   "234c6ea2740620a51ee59fd0dcbe4a54fa4be45c02312f69c7bdfa81e9e43ee3": {
     "describe": {
       "columns": [
@@ -1328,6 +1353,39 @@
     },
     "query": "DELETE FROM starboards WHERE name=$1 AND guild_id=$2\n            RETURNING *"
   },
+  "4210d1f0ce64aca7813b63421f3af67b1a0c3c586e0507f52754bd50c75189f3": {
+    "describe": {
+      "columns": [
+        {
+          "name": "role_id",
+          "ordinal": 0,
+          "type_info": "Int8"
+        },
+        {
+          "name": "guild_id",
+          "ordinal": 1,
+          "type_info": "Int8"
+        },
+        {
+          "name": "required",
+          "ordinal": 2,
+          "type_info": "Int2"
+        }
+      ],
+      "nullable": [
+        false,
+        false,
+        false
+      ],
+      "parameters": {
+        "Left": [
+          "Int2",
+          "Int8"
+        ]
+      }
+    },
+    "query": "UPDATE xproles SET required=$1 WHERE role_id=$2 RETURNING *"
+  },
   "4799c2a2b60b149a964d4e435f3991a8b12a9ecdd8f5d413fbbe01649b185470": {
     "describe": {
       "columns": [
@@ -1827,6 +1885,38 @@
     },
     "query": "INSERT INTO patrons (patreon_id) VALUES ($1)\n            RETURNING *"
   },
+  "70e4dde509221ec5efbae5241702d3d7876fed9a216872704d2449ccaeeb458c": {
+    "describe": {
+      "columns": [
+        {
+          "name": "role_id",
+          "ordinal": 0,
+          "type_info": "Int8"
+        },
+        {
+          "name": "guild_id",
+          "ordinal": 1,
+          "type_info": "Int8"
+        },
+        {
+          "name": "required",
+          "ordinal": 2,
+          "type_info": "Int2"
+        }
+      ],
+      "nullable": [
+        false,
+        false,
+        false
+      ],
+      "parameters": {
+        "Left": [
+          "Int8"
+        ]
+      }
+    },
+    "query": "SELECT * FROM xproles WHERE guild_id=$1 ORDER BY required DESC"
+  },
   "7584c85655f379fc8a95a4b0fe7e3d060711300ba1ec6e28d01bd7536ba4c53b": {
     "describe": {
       "columns": [
@@ -3499,6 +3589,38 @@
     },
     "query": "SELECT * FROM starboards WHERE guild_id=$1"
   },
+  "c9a0aa39cb29f094a4c208de6e7f5cfb5a26b34a7faed0bd32a1660e98f21bfb": {
+    "describe": {
+      "columns": [
+        {
+          "name": "role_id",
+          "ordinal": 0,
+          "type_info": "Int8"
+        },
+        {
+          "name": "guild_id",
+          "ordinal": 1,
+          "type_info": "Int8"
+        },
+        {
+          "name": "required",
+          "ordinal": 2,
+          "type_info": "Int2"
+        }
+      ],
+      "nullable": [
+        false,
+        false,
+        false
+      ],
+      "parameters": {
+        "Left": [
+          "Int8"
+        ]
+      }
+    },
+    "query": "DELETE FROM xproles WHERE role_id=$1 RETURNING *"
+  },
   "cb9b3ce9131ac41057770317c912a7c71f79dfc2818f9d0f547acb9939516027": {
     "describe": {
       "columns": [
@@ -3669,6 +3791,40 @@
     },
     "query": "INSERT INTO overrides\n            (guild_id, name, starboard_id)\n            VALUES ($1, $2, $3)\n            RETURNING *"
   },
+  "dfc37673f365e1eb8f2b224a2fac0273285af7607978fe5b40a86fd09fbb1bcc": {
+    "describe": {
+      "columns": [
+        {
+          "name": "role_id",
+          "ordinal": 0,
+          "type_info": "Int8"
+        },
+        {
+          "name": "guild_id",
+          "ordinal": 1,
+          "type_info": "Int8"
+        },
+        {
+          "name": "required",
+          "ordinal": 2,
+          "type_info": "Int2"
+        }
+      ],
+      "nullable": [
+        false,
+        false,
+        false
+      ],
+      "parameters": {
+        "Left": [
+          "Int8",
+          "Int8",
+          "Int2"
+        ]
+      }
+    },
+    "query": "INSERT INTO xproles (role_id, guild_id, required) VALUES ($1, $2, $3) RETURNING *"
+  },
   "e0d3435ac460506de5e62af8dea8bf9151a123a5e958a706241e15206499076c": {
     "describe": {
       "columns": [

diff --git a/src/constants.rs b/src/constants.rs
@@ -63,3 +63,6 @@ pub const MAX_OVERRIDES_PER_STARBOARD: i64 = 10;
 
 // PermRole Validation
 pub const MAX_PERMROLES: i64 = 50;
+
+// XP-based Award Role Validation
+pub const MAX_XPROLES: i64 = 50;
diff --git a/src/core/mod.rs b/src/core/mod.rs
@@ -5,3 +5,4 @@ pub mod has_image;
 pub mod permroles;
 pub mod starboard;
 pub mod stats;
+pub mod xproles;
diff --git a/src/core/starboard/reaction_events.rs b/src/core/starboard/reaction_events.rs
@@ -169,7 +169,7 @@ pub async fn handle_reaction_add(
         }
     }
 
-    refresh_xp(bot, guild_id.get_i64(), author_id).await?;
+    refresh_xp(bot, guild_id, author_id.into_id()).await?;
 
     Ok(())
 }
@@ -219,7 +219,7 @@ pub async fn handle_reaction_remove(
         VoteStatus::Ignore | VoteStatus::Remove => (),
     }
 
-    refresh_xp(bot, guild_id.get_i64(), author.user_id).await?;
+    refresh_xp(bot, guild_id, author.user_id.into_id()).await?;
 
     Ok(())
 }
diff --git a/src/core/stats.rs b/src/core/stats.rs
@@ -1,10 +1,17 @@
+use twilight_model::id::{
+    marker::{GuildMarker, UserMarker},
+    Id,
+};
+
 use crate::{
     client::bot::StarboardBot,
     database::{Member, Starboard},
     errors::StarboardResult,
-    utils::into_id::IntoId,
+    utils::id_as_i64::GetI64,
 };
 
+use super::xproles::refresh_xpr;
+
 #[derive(Default)]
 pub struct MemberStats {
     pub xp: f32,
@@ -117,21 +124,27 @@ impl MemberStats {
     }
 }
 
-pub async fn refresh_xp(bot: &StarboardBot, guild_id: i64, user_id: i64) -> StarboardResult<()> {
+pub async fn refresh_xp(
+    bot: &StarboardBot,
+    guild_id: Id<GuildMarker>,
+    user_id: Id<UserMarker>,
+) -> StarboardResult<()> {
     if bot
         .cooldowns
         .xp_refresh
-        .trigger(&(user_id.into_id(), guild_id.into_id()))
+        .trigger(&(user_id, guild_id))
         .is_some()
     {
         return Ok(());
     }
 
-    let Some(stats) = MemberStats::get(&bot.pool, guild_id, user_id).await? else {
+    let Some(stats) = MemberStats::get(&bot.pool, guild_id.get_i64(), user_id.get_i64()).await? else {
         return Ok(());
     };
 
-    Member::set_xp(&bot.pool, user_id, guild_id, stats.xp).await?;
+    Member::set_xp(&bot.pool, user_id.get_i64(), guild_id.get_i64(), stats.xp).await?;
+
+    refresh_xpr(bot, guild_id, user_id).await?;
 
     Ok(())
 }