feat: now using proper types for the guild and user ID's

src/bin/update_users.rs

@@ -1,17 +1,15 @@
-use serenity::model::id::GuildId;
 use serenity::{
   async_trait,
   client::{Context, EventHandler},
   model::{
     gateway::{GatewayIntents, Ready},
-    prelude::RoleId,
+    id::GuildId,
   },
   Client,
 };
-use skynet_discord_bot::{db_init, get_config, Accounts, Config, DataBase, Servers};
+use skynet_discord_bot::{db_init, get_config, get_server_config_bulk, Accounts, Config, DataBase, Servers};
 use sqlx::{Pool, Sqlite};
-use std::process;
-use std::sync::Arc;
+use std::{process, sync::Arc};
 use tokio::sync::RwLock;
 
 #[tokio::main]
@@ -75,7 +73,6 @@ async fn bulk_check(ctx: Arc<Context>) {
     let mut roles_set = [0, 0, 0];
     let mut members = vec![];
 
-    let server = GuildId::from(server as u64);
     for member in get_server_member_bulk(&db, &server).await {
       if let Some(x) = member.discord {
         members.push(x);
@@ -89,16 +86,14 @@ async fn bulk_check(ctx: Arc<Context>) {
           let mut roles = vec![];
 
           if let Some(role) = &role_past {
-            let role = RoleId::from(*role as u64);
-            if !member.roles.contains(&role) {
+            if !member.roles.contains(role) {
               roles_set[0] += 1;
               roles.push(role.to_owned());
             }
           }
 
           if let Some(role) = &role_current {
-            let role = RoleId::from(*role as u64);
-            if !member.roles.contains(&role) {
+            if !member.roles.contains(role) {
               roles_set[1] += 1;
               roles.push(role.to_owned());
             }
@@ -111,15 +106,13 @@ async fn bulk_check(ctx: Arc<Context>) {
           // old and never
 
           if let Some(role) = &role_past {
-            let role = RoleId::from(*role as u64);
-            if member.roles.contains(&role) {
+            if member.roles.contains(role) {
               members_all += 1;
             }
           }
 
           if let Some(role) = &role_current {
-            let role = RoleId::from(*role as u64);
-            if member.roles.contains(&role) {
+            if member.roles.contains(role) {
               roles_set[2] += 1;
               // if theya re not a current member and have the role then remove it
               if let Err(e) = member.remove_role(&ctx, role).await {
@@ -137,17 +130,6 @@ async fn bulk_check(ctx: Arc<Context>) {
     println!("{:?} Changes: New: +{}, Current: +{}/-{}", server.as_u64(), roles_set[0], roles_set[1], roles_set[2]);
   }
 }
-async fn get_server_config_bulk(db: &Pool<Sqlite>) -> Vec<Servers> {
-  sqlx::query_as::<_, Servers>(
-    r#"
-        SELECT *
-        FROM servers
-        "#,
-  )
-  .fetch_all(db)
-  .await
-  .unwrap_or_default()
-}
 
 async fn get_server_member_bulk(db: &Pool<Sqlite>, server: &GuildId) -> Vec<Accounts> {
   sqlx::query_as::<_, Accounts>(