remove libavacado part 1

Author: Your Name

.DS_Store

@@ -1,2 +1,2 @@
 [workspace]
-members = ["bot", "libavacado"] 
+members = ["bot"] 

Cargo.lock

@@ -16,16 +16,22 @@ sqlx = { version = "0.6", features = [ "runtime-tokio-rustls", "postgres", "chro
 reqwest = { version = "0.11", default-features = false, features = ["json", "rustls-tls", "rustls-tls-native-roots"] }
 chrono = { version = "0.4", features = ["serde"]}
 futures-util = "0.3"
-libavacado = { path = "../libavacado" }
 ring = "0.16"
 data-encoding = "2.3"
 indexmap = { version = "1.9.1", features = ["serde"] }
 moka = { version = "0.9", features = ["future"] }
 ts-rs = "6.2"
 axum = "0.6"
 tower-http = { version = "0.3", features = ["cors"] }
+rand = "0.8"
+serde_yaml = "0.9"
+once_cell = "1.17"
 
 [dependencies.tokio]
 version = "1"
 default-features = true
 features = ["fs", "macros", "rt", "sync", "time", "rt-multi-thread"]
+
+[build-dependencies]
+vergen = "7"
+anyhow = "1.0"

Cargo.toml

@@ -1,6 +1,7 @@
 use crate::Context;
 use crate::Error;
-use crate::_checks as checks;
+use crate::checks;
+use crate::impls;
 
 use poise::serenity_prelude::CreateActionRow;
 use poise::serenity_prelude::CreateButton;
@@ -49,9 +50,9 @@ pub async fn approveonboard(
     .await?;
 
     if onboard_state.staff_onboard_state
-        != libavacado::onboarding::OnboardState::PendingManagerReview.as_str()
+        != crate::onboarding::OnboardState::PendingManagerReview.as_str()
         && onboard_state.staff_onboard_state
-            != libavacado::onboarding::OnboardState::Denied.as_str()
+            != crate::onboarding::OnboardState::Denied.as_str()
     {
         return Err(format!(
             "User is not pending manager review and currently has state of: {}",
@@ -63,7 +64,7 @@ pub async fn approveonboard(
     // Update onboard state of user
     sqlx::query!(
         "UPDATE users SET staff_onboard_state = $1 WHERE user_id = $2",
-        libavacado::onboarding::OnboardState::Completed.as_str(),
+        crate::onboarding::OnboardState::Completed.as_str(),
         member.id.to_string()
     )
     .execute(&data.pool)
@@ -106,7 +107,7 @@ pub async fn denyonboard(
     .await?;
 
     if onboard_state.staff_onboard_state
-        != libavacado::onboarding::OnboardState::PendingManagerReview.as_str()
+        != crate::onboarding::OnboardState::PendingManagerReview.as_str()
     {
         return Err(format!(
             "User is not pending manager review and currently has state of: {}",
@@ -118,7 +119,7 @@ pub async fn denyonboard(
     // Update onboard state of user
     sqlx::query!(
         "UPDATE users SET staff_onboard_state = $1 WHERE user_id = $2",
-        libavacado::onboarding::OnboardState::Denied.as_str(),
+        crate::onboarding::OnboardState::Denied.as_str(),
         user.id.to_string()
     )
     .execute(&data.pool)
@@ -187,7 +188,7 @@ pub async fn resetonboard(
     // Update onboard state of user
     sqlx::query!(
         "UPDATE users SET staff_onboard_guild = NULL, staff_onboard_state = $1, staff_onboard_last_start_time = NOW() WHERE user_id = $2",
-        libavacado::onboarding::OnboardState::Pending.as_str(),
+        crate::onboarding::OnboardState::Pending.as_str(),
         user.id.to_string()
     )
     .execute(&data.pool)
@@ -216,7 +217,7 @@ pub async fn voteresetbot(
 ) -> Result<(), crate::Error> {
     let data = ctx.data();
 
-    libavacado::manage::vote_reset_bot(
+    impls::actions::vote_reset_bot(
         &data.cache_http,
         &data.pool,
         &bot.id.to_string(),
@@ -244,7 +245,7 @@ pub async fn voteresetallbots(
 ) -> Result<(), crate::Error> {
     let data = ctx.data();
 
-    libavacado::manage::vote_reset_all_bot(
+    impls::actions::vote_reset_all_bot(
         &data.cache_http,
         &data.pool,
         &ctx.author().id.to_string(),
@@ -272,7 +273,7 @@ pub async fn unverifybot(
 ) -> Result<(), crate::Error> {
     let data = ctx.data();
 
-    libavacado::manage::unverify_bot(
+    impls::actions::unverify_bot(
         &data.cache_http,
         &data.pool,
         &bot.id.to_string(),

bot/Cargo.toml

@@ -1,4 +1,4 @@
-use crate::_checks as checks;
+use crate::{checks, config};
 use poise::serenity_prelude::RoleId;
 
 type Error = crate::Error;
@@ -108,8 +108,8 @@ pub async fn getbotroles(ctx: Context<'_>) -> Result<(), Error> {
     let mut roles_to_add = Vec::new();
     let mut roles_to_remove = Vec::new();
 
-    let bot_role = RoleId(libavacado::CONFIG.roles.bot_developer);
-    let certified_role = RoleId(libavacado::CONFIG.roles.certified_developer);
+    let bot_role = RoleId(config::CONFIG.roles.bot_developer);
+    let certified_role = RoleId(config::CONFIG.roles.certified_developer);
 
     if certified {
         ctx.say("You are the owner/additional owner of a certified bot! Giving you certified role")

libavacado/build.rs renamed to bot/build.rs

@@ -1,10 +1,12 @@
+use crate::config;
+
 type Error = crate::Error;
 type Context<'a> = crate::Context<'a>;
 
 /// Check for main_server
 pub async fn main_server(ctx: Context<'_>) -> Result<bool, Error> {
     let in_main_server = match ctx.guild_id() {
-        Some(guild_id) => guild_id.0 == libavacado::CONFIG.servers.main,
+        Some(guild_id) => guild_id.0 == config::CONFIG.servers.main,
         None => false,
     };
 
@@ -14,7 +16,7 @@ pub async fn main_server(ctx: Context<'_>) -> Result<bool, Error> {
 /// Check for staff_server
 pub async fn staff_server(ctx: Context<'_>) -> Result<bool, Error> {
     let in_staff_server = match ctx.guild_id() {
-        Some(guild_id) => guild_id.0 == libavacado::CONFIG.servers.staff,
+        Some(guild_id) => guild_id.0 == config::CONFIG.servers.staff,
         None => false,
     };
 
@@ -24,7 +26,7 @@ pub async fn staff_server(ctx: Context<'_>) -> Result<bool, Error> {
 /// Check for staff_server
 pub async fn testing_server(ctx: Context<'_>) -> Result<bool, Error> {
     let in_testing_server = match ctx.guild_id() {
-        Some(guild_id) => guild_id.0 == libavacado::CONFIG.servers.testing,
+        Some(guild_id) => guild_id.0 == config::CONFIG.servers.testing,
         None => false,
     };
 

bot/src/_utils.rs

@@ -1,6 +1,10 @@
 use serde::{Deserialize, Serialize};
 use serde_yaml;
 use std::{fs::File, io::Write, num::NonZeroU64};
+use once_cell::sync::Lazy;
+
+/// Global config object
+pub static CONFIG: Lazy<Config> = Lazy::new(|| Config::load());
 
 #[derive(Serialize, Deserialize)]
 pub struct Servers {
@@ -138,10 +142,10 @@ impl Config {
         match file {
             Ok(file) => {
                 // Parse config.yaml
-                let config: Config = serde_yaml::from_reader(file).unwrap();
+                let cfg: Config = serde_yaml::from_reader(file).unwrap();
 
                 // Return config
-                config
+                cfg
             }
             Err(e) => {
                 // Print error