Fixed spell descriptions

service/migrations/000010_create_guilds/up.sql

@@ -1,5 +1,5 @@
 CREATE TABLE IF NOT EXISTS guilds (
   id BIGINT PRIMARY KEY NOT NULL,
   bot_id BIGINT NOT NULL,
-  volume DOUBLE PRECISION NOT NULL
+  volume INTEGER NOT NULL
 );

service/src/bot/api/routes.rs

@@ -291,16 +291,17 @@ async fn set_volume(path: web::Path<String>, volume: web::Json::<SetVolume>, dat
     }
   };
 
-  let bound_volume = volume.volume.parse::<f32>().unwrap_or(0.0);
-
-  let _ = InsertGuild::update_audio(guild_id as i64, bound_volume as f64);
-
-  if let Some(handler_lock) = data.songbird.get(guild_id) {
-    let handler = handler_lock.lock().await;
-    for (_, track_handle) in handler.queue().current_queue().iter().enumerate() {
-      let _ = track_handle.set_volume(bound_volume);
+  let volume = volume.volume.parse::<i32>().unwrap_or(0);
+  let manager = Arc::clone(&data.songbird);
+  let http = Arc::clone(&data.http);
+  let guild = match http.get_guild(guild_id).await {
+    Ok(guild) => guild,
+    Err(err) => {
+      warn!("Could not get guild: {:?}", err);
+      return ResponseError::error_response(&ServiceError { status: 422, message: err.to_string() })
     }
-  }
+  };
+  crate::bot::commands::audio::volume::set_volume(manager, guild.id, volume).await;
 
   HttpResponse::Ok().finish()
 }

service/src/bot/commands/audio/volume.rs

@@ -1,8 +1,11 @@
+use std::sync::Arc;
+
 use log::{error, warn};
 
-use serenity::prelude::*;
+use serenity::{prelude::*, model::prelude::GuildId};
 use serenity::builder::CreateApplicationCommand;
 use serenity::model::application::interaction::application_command::ApplicationCommandInteraction;
+use songbird::Songbird;
 
 use crate::db::guilds::InsertGuild;
 
@@ -13,7 +16,7 @@ pub async fn run(ctx: &Context, command: &ApplicationCommandInteraction) {
   let volume = match command.data.options.get(0) {
     Some(t) => match &t.value {
       Some(v) => match v.as_i64() {
-        Some(p) => std::cmp::min(100, std::cmp::max(0, p)),
+        Some(p) => p as i32,
         None => {
           warn!("Unable to get volume option as a string");
           if let Err(why) = create_response(&ctx, &command, format!("Volume option is missing")).await {
@@ -39,9 +42,6 @@ pub async fn run(ctx: &Context, command: &ApplicationCommandInteraction) {
     }
   };
 
-  // Format volume to f32 bound between 0.0 and 1.0
-  let bound_volume = volume as f32 / 100.0;
-
   // Create the initial response
   if let Err(why) = create_response(&ctx, &command, "Processing command...".to_string()).await {
     error!("Failed to create response message: {}", why);
@@ -57,17 +57,25 @@ pub async fn run(ctx: &Context, command: &ApplicationCommandInteraction) {
       return;
     }
   };
-  let _ = InsertGuild::update_audio(guild_id.0 as i64, bound_volume as f64);
   let manager = get_songbird(ctx).await;
+  set_volume(manager, guild_id, volume).await;
+  if let Err(why) = edit_response(&ctx, &command, format!("Setting the volume to {}", volume)).await {
+    error!("Failed to set the volume: {}", why);
+  }
+}
+
+pub async fn set_volume(manager: Arc<Songbird>, guild_id: GuildId, volume: i32) {
+  // Format volume to f32 bound between 0.0 and 1.0
+  let volume = std::cmp::min(100, std::cmp::max(0, volume));
+  let bound_volume = volume as f32 / 100.0;
+  let _ = InsertGuild::update_audio(guild_id.0 as i64, volume);
+
   if let Some(handler_lock) = manager.get(guild_id) {
     let handler = handler_lock.lock().await;
     for (_, track_handle) in handler.queue().current_queue().iter().enumerate() {
       let _ = track_handle.set_volume(bound_volume);
     }
   }
-  if let Err(why) = edit_response(&ctx, &command, format!("Setting the volume to {}", volume)).await {
-    error!("Failed to set the volume: {}", why);
-  }
 }
 
 pub fn register(command: &mut CreateApplicationCommand) -> &mut CreateApplicationCommand {

service/src/bot/handler.rs

@@ -77,7 +77,7 @@ impl EventHandler for Handler {
       let _ = InsertGuild::insert(InsertGuild {
         id: (guild.id.0 as i64),
         bot_id: ctx.cache.current_user().id.0 as i64,
-        volume: 100.0
+        volume: 100
       });
       let commands = guild.id.set_application_commands(&ctx.http, |commands| {
         commands.create_application_command(|command: &mut serenity::builder::CreateApplicationCommand| { commands::ping::register(command) })

service/src/db/guilds/model.rs

@@ -9,7 +9,7 @@ use crate::db::{schema::guilds, connection};
 pub struct QueryGuild {
   pub id: i64,
   pub bot_id: i64,
-  pub volume: f64
+  pub volume: i32
 }
 
 impl QueryGuild {
@@ -25,7 +25,7 @@ impl QueryGuild {
 pub struct InsertGuild {
   pub id: i64,
   pub bot_id: i64,
-  pub volume: f64
+  pub volume: i32
 }
 
 impl InsertGuild {
@@ -35,7 +35,7 @@ impl InsertGuild {
     Ok(guild)
   }
 
-  pub fn update_audio(id: i64, volume: f64) -> Result<QueryGuild, ServiceError> {
+  pub fn update_audio(id: i64, volume: i32) -> Result<QueryGuild, ServiceError> {
     let mut conn = connection()?;
     let guild = diesel::update(guilds::table.filter(guilds::id.eq(id))).set(guilds::volume.eq(volume)).get_result(&mut conn)?;
     Ok(guild)

service/src/db/schema.rs

@@ -35,6 +35,6 @@ diesel::table! {
   guilds (id) {
     id -> BigInt,
     bot_id -> BigInt,
-    volume -> Float8,
+    volume -> Integer,
   }
 }

service/src/db/spells/model.rs

@@ -6,7 +6,7 @@ use crate::db::{schema::spells::{self}, classes::AbilityType, conditions::Condit
 
 use super::{SchoolType, CastingTime, SpellAttackType, SpellDamageType, Range, Area, Components, Duration, Source, Description, DurationType, Effect};
 
-#[derive(Queryable, QueryableByName, Serialize, Deserialize)]
+#[derive(Debug, Queryable, QueryableByName, Serialize, Deserialize)]
 #[diesel(table_name = spells)]
 pub struct QuerySpell {
   pub id: i32,
@@ -163,7 +163,7 @@ impl QuerySpell {
   }
 }
 
-#[derive(Insertable, AsChangeset)]
+#[derive(Debug, Insertable, AsChangeset)]
 #[diesel(table_name = spells)]
 pub struct InsertSpell {
   pub name: String,

service/src/db/spells/types.rs

@@ -263,7 +263,7 @@ pub struct Description {
 
 #[derive(Debug)]
 pub struct Entry {
-  pub text: Option<Vec<String>>,
+  pub text: Option<String>,
   pub list: Option<Vec<String>>,
   pub table: Option<EntryTable>
 }
@@ -279,11 +279,18 @@ impl<'de> Deserialize<'de> for Entry {
     let value = serde_json::Value::deserialize(deserializer)?;
     match value {
       serde_json::Value::String(s) => Ok(Entry {
-        text: Some(vec![s]),
+        text: Some(s),
         list: None,
         table: None,
       }),
       serde_json::Value::Object(o) => {
+        let text = match o.get("text") {
+          Some(t) => match t.as_str() {
+            Some(s) => Some(s.to_string()),
+            None => return Err(serde::de::Error::custom("Invalid entry text"))
+          },
+          None => None
+        };
         let list = match o.get("list") {
           Some(i) => match i.as_array() {
             Some(a) => {
@@ -352,7 +359,7 @@ impl<'de> Deserialize<'de> for Entry {
           None => None
         };
         Ok(Entry {
-          text: None,
+          text,
           list,
           table
         })