removed all guild data related code

src/models/guild_data.rs

@@ -1,77 +0,0 @@
-use log::error;
-use serenity::model::guild::Guild;
-use sqlx::MySqlPool;
-
-use crate::consts::DEFAULT_PREFIX;
-
-pub struct GuildData {
-    pub id: u32,
-    pub name: Option<String>,
-    pub prefix: String,
-}
-
-impl GuildData {
-    pub async fn from_guild(guild: Guild, pool: &MySqlPool) -> Result<Self, sqlx::Error> {
-        let guild_id = guild.id.as_u64().to_owned();
-
-        match sqlx::query_as!(
-            Self,
-            "
-SELECT id, name, prefix FROM guilds WHERE guild = ?
-            ",
-            guild_id
-        )
-        .fetch_one(pool)
-        .await
-        {
-            Ok(mut g) => {
-                g.name = Some(guild.name);
-
-                Ok(g)
-            }
-
-            Err(sqlx::Error::RowNotFound) => {
-                sqlx::query!(
-                    "
-INSERT INTO guilds (guild, name, prefix) VALUES (?, ?, ?)
-                    ",
-                    guild_id,
-                    guild.name,
-                    *DEFAULT_PREFIX
-                )
-                .execute(&pool.clone())
-                .await?;
-
-                Ok(sqlx::query_as!(
-                    Self,
-                    "
-SELECT id, name, prefix FROM guilds WHERE guild = ?
-                    ",
-                    guild_id
-                )
-                .fetch_one(pool)
-                .await?)
-            }
-
-            Err(e) => {
-                error!("Unexpected error in guild query: {:?}", e);
-
-                Err(e)
-            }
-        }
-    }
-
-    pub async fn commit_changes(&self, pool: &MySqlPool) {
-        sqlx::query!(
-            "
-UPDATE guilds SET name = ?, prefix = ? WHERE id = ?
-            ",
-            self.name,
-            self.prefix,
-            self.id
-        )
-        .execute(pool)
-        .await
-        .unwrap();
-    }
-}

src/models/mod.rs

@@ -1,35 +1,23 @@
 pub mod channel_data;
 pub mod command_macro;
-pub mod guild_data;
 pub mod reminder;
 pub mod timer;
 pub mod user_data;
 
-use std::sync::Arc;
-
 use chrono_tz::Tz;
 use serenity::{
     async_trait,
-    model::id::{ChannelId, GuildId, UserId},
+    model::id::{ChannelId, UserId},
     prelude::Context,
 };
-use tokio::sync::RwLock;
 
 use crate::{
-    consts::DEFAULT_PREFIX,
-    models::{channel_data::ChannelData, guild_data::GuildData, user_data::UserData},
-    GuildDataCache, SQLPool,
+    models::{channel_data::ChannelData, user_data::UserData},
+    SQLPool,
 };
 
 #[async_trait]
 pub trait CtxData {
-    async fn guild_data<G: Into<GuildId> + Send + Sync>(
-        &self,
-        guild_id: G,
-    ) -> Result<Arc<RwLock<GuildData>>, sqlx::Error>;
-
-    async fn prefix<G: Into<GuildId> + Send + Sync>(&self, guild_id: Option<G>) -> String;
-
     async fn user_data<U: Into<UserId> + Send + Sync>(
         &self,
         user_id: U,
@@ -45,45 +33,6 @@ pub trait CtxData {
 
 #[async_trait]
 impl CtxData for Context {
-    async fn guild_data<G: Into<GuildId> + Send + Sync>(
-        &self,
-        guild_id: G,
-    ) -> Result<Arc<RwLock<GuildData>>, sqlx::Error> {
-        let guild_id = guild_id.into();
-
-        let guild = guild_id.to_guild_cached(&self.cache).unwrap();
-
-        let guild_cache = self.data.read().await.get::<GuildDataCache>().cloned().unwrap();
-
-        let x = if let Some(guild_data) = guild_cache.get(&guild_id) {
-            Ok(guild_data.clone())
-        } else {
-            let pool = self.data.read().await.get::<SQLPool>().cloned().unwrap();
-
-            match GuildData::from_guild(guild, &pool).await {
-                Ok(d) => {
-                    let lock = Arc::new(RwLock::new(d));
-
-                    guild_cache.insert(guild_id, lock.clone());
-
-                    Ok(lock)
-                }
-
-                Err(e) => Err(e),
-            }
-        };
-
-        x
-    }
-
-    async fn prefix<G: Into<GuildId> + Send + Sync>(&self, guild_id: Option<G>) -> String {
-        if let Some(guild_id) = guild_id {
-            self.guild_data(guild_id).await.unwrap().read().await.prefix.clone()
-        } else {
-            DEFAULT_PREFIX.clone()
-        }
-    }
-
     async fn user_data<U: Into<UserId> + Send + Sync>(
         &self,
         user_id: U,