cleaned up a bit

This commit is contained in:
jude-lafitteIII 2020-06-04 02:29:48 +01:00
parent c31be2f7da
commit 461326be30

View File

@ -17,7 +17,7 @@ use serenity::{
Client, Context, Client, Context,
}, },
framework::standard::{ framework::standard::{
Args, CommandResult, CheckResult, DispatchError, StandardFramework, Reason, Args, CommandError, CommandResult, CheckResult, DispatchError, StandardFramework, Reason,
macros::{ macros::{
command, group, check, hook, command, group, check, hook,
} }
@ -65,7 +65,6 @@ use std::{
sync::Arc, sync::Arc,
time::Duration, time::Duration,
}; };
use serenity::framework::standard::CommandError;
struct SQLPool; struct SQLPool;
@ -236,9 +235,9 @@ impl EventHandler for Handler {
if guild_data.allow_greets { if guild_data.allow_greets {
let join_id_res = sqlx::query!( let join_id_res = sqlx::query!(
" "
SELECT join_sound_id SELECT join_sound_id
FROM users FROM users
WHERE user = ? AND join_sound_id IS NOT NULL WHERE user = ? AND join_sound_id IS NOT NULL
", ",
new.user_id.as_u64() new.user_id.as_u64()
) )
@ -251,9 +250,9 @@ impl EventHandler for Handler {
let mut sound = sqlx::query_as_unchecked!( let mut sound = sqlx::query_as_unchecked!(
Sound, Sound,
" "
SELECT name, id, plays, public, server_id, uploader_id SELECT name, id, plays, public, server_id, uploader_id
FROM sounds FROM sounds
WHERE id = ? WHERE id = ?
", ",
join_id join_id
) )