jude/soundfx-bot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

split guilddata, errortypes and sound into separate files

Browse Source
This commit is contained in:
jude-lafitteIII 2020-05-20 01:46:41 +01:00
parent 3de4b9d98e
commit 815600709d
4 changed files with 385 additions and 364 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/error.rs Normal file
View File

@ -0,0 +1,14 @@
use std::fmt::Formatter;
#[derive(Debug)]
pub enum ErrorTypes {
InvalidFile,
NotEnoughRoles,
}
impl std::error::Error for ErrorTypes {}
impl std::fmt::Display for ErrorTypes {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
write!(f, "ErrorTypes")
}
}

67
src/guilddata.rs Normal file
View File

@ -0,0 +1,67 @@
use serenity::model::guild::Guild;
use sqlx::mysql::MySqlPool;
pub struct GuildData {
pub id: u64,
pub name: Option<String>,
pub prefix: String,
pub volume: u8,
}
impl GuildData {
pub async fn get_from_id(guild_id: u64, db_pool: MySqlPool) -> Option<GuildData> {
let guild = sqlx::query_as!(
GuildData,
"
SELECT *
FROM servers
WHERE id = ?
", guild_id
)
.fetch_one(&db_pool)
.await;
match guild {
Ok(guild) => Some(guild),
Err(_) => None,
}
}
pub async fn create_from_guild(guild: Guild, db_pool: MySqlPool) -> Result<GuildData, Box<dyn std::error::Error>> {
sqlx::query!(
"
INSERT INTO servers (id, name)
VALUES (?, ?)
", guild.id.as_u64(), guild.name
)
.execute(&db_pool)
.await?;
Ok(GuildData {
id: *guild.id.as_u64(),
name: Some(guild.name.clone()),
prefix: String::from("?"),
volume: 100,
})
}
pub async fn commit(&self, db_pool: MySqlPool) -> Result<(), Box<dyn std::error::Error>> {
sqlx::query!(
"
UPDATE servers
SET
name = ?,
prefix = ?,
volume = ?
WHERE
id = ?
",
self.name, self.prefix, self.volume, self.id
)
.execute(&db_pool)
.await?;
Ok(())
}
}

375
src/main.rs
View File

@ -1,6 +1,14 @@
#[macro_use]
extern crate lazy_static;
mod guilddata;
mod sound;
mod error;
use sound::Sound;
use guilddata::GuildData;
use error::ErrorTypes;
use serenity::{
client::{
bridge::{
@ -17,7 +25,6 @@ use serenity::{
},
model::{
channel::Message,
guild::Guild,
id::{
GuildId,
RoleId,
@ -28,11 +35,7 @@ use serenity::{
Mutex as SerenityMutex,
*
},
voice::{
AudioSource,
ffmpeg,
Handler as VoiceHandler,
},
voice::Handler as VoiceHandler,
};
use sqlx::{
@ -46,8 +49,6 @@ use sqlx::{
use dotenv::dotenv;
use tokio::{
fs::File,
process::Command,
sync::{
Mutex,
MutexGuard
@ -61,11 +62,9 @@ use std::{
HashSet,
},
env,
path::Path,
sync::Arc,
time::Duration,
};
use std::fmt::Formatter;
struct SQLPool;
@ -106,7 +105,7 @@ lazy_static! {
static ref DISCONNECT_CYCLES: u8 = {
dotenv().unwrap();
env::var("DISCONNECT_CYCLES").unwrap_or("2").parse::<u64>().unwrap()
env::var("DISCONNECT_CYCLES").unwrap_or("2".to_string()).parse::<u8>().unwrap()
};
}
@ -115,7 +114,7 @@ lazy_static! {
struct AllUsers;
#[group]
#[commands (play, upload_new_sound, change_volume, delete_sound)]
#[commands(play, upload_new_sound, change_volume, delete_sound)]
#[checks(role_check)]
struct RoleManagedUsers;
@ -195,358 +194,6 @@ async fn perform_permission_check(ctx: &Context, msg: &&Message) -> CheckResult
CheckResult::Failure(Reason::User(String::from("User needs `Manage Guild` permission")))
}
struct Sound {
name: String,
id: u32,
plays: u32,
public: bool,
server_id: u64,
uploader_id: u64,
src: Vec<u8>,
}
#[derive(Debug)]
enum ErrorTypes {
InvalidFile,
NotEnoughRoles,
}
impl std::error::Error for ErrorTypes {}
impl std::fmt::Display for ErrorTypes {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
write!(f, "ErrorTypes")
}
}
impl Sound {
async fn search_for_sound(query: &str, guild_id: u64, user_id: u64, db_pool: MySqlPool, strict: bool) -> Result<Vec<Sound>, sqlx::Error> {
fn extract_id(s: &str) -> Option<u32> {
if s.len() > 3 && s.to_lowercase().starts_with("id:") {
match s[3..].parse::<u32>() {
Ok(id) => Some(id),
Err(_) => None
}
}
else {
None
}
}
if let Some(id) = extract_id(&query) {
let sound = sqlx::query_as_unchecked!(
Self,
"
SELECT *
FROM sounds
WHERE id = ? AND (
public = 1 OR
uploader_id = ? OR
server_id = ?
)
",
id, user_id, guild_id
)
.fetch_all(&db_pool)
.await?;
Ok(sound)
}
else {
let name = query;
let sound;
if strict {
sound = sqlx::query_as_unchecked!(
Self,
"
SELECT *
FROM sounds
WHERE name = ? AND (
public = 1 OR
uploader_id = ? OR
server_id = ?
)
ORDER BY rand(), public = 1, server_id = ?, uploader_id = ?
",
name, user_id, guild_id, guild_id, user_id
)
.fetch_all(&db_pool)
.await?;
}
else {
sound = sqlx::query_as_unchecked!(
Self,
"
SELECT *
FROM sounds
WHERE name LIKE CONCAT('%', ?, '%') AND (
public = 1 OR
uploader_id = ? OR
server_id = ?
)
ORDER BY rand(), public = 1, server_id = ?, uploader_id = ?
",
name, user_id, guild_id, guild_id, user_id
)
.fetch_all(&db_pool)
.await?;
}
Ok(sound)
}
}
async fn store_sound_source(&self) -> Result<Box<dyn AudioSource>, Box<dyn std::error::Error>> {
let caching_location = env::var("CACHING_LOCATION").unwrap_or(String::from("/tmp"));
let path_name = format!("{}/sound-{}", caching_location, self.id);
let path = Path::new(&path_name);
if !path.exists() {
use tokio::prelude::*;
let mut file = File::create(&path).await?;
file.write_all(self.src.as_ref()).await?;
}
Ok(ffmpeg(path_name).await?)
}
async fn count_user_sounds(user_id: u64, db_pool: MySqlPool) -> Result<u32, sqlx::error::Error> {
let c = sqlx::query!(
"
SELECT COUNT(1) as count
FROM sounds
WHERE uploader_id = ?
",
user_id
)
.fetch_one(&db_pool)
.await?.count;
Ok(c as u32)
}
async fn count_named_user_sounds(user_id: u64, name: &String, db_pool: MySqlPool) -> Result<u32, sqlx::error::Error> {
let c = sqlx::query!(
"
SELECT COUNT(1) as count
FROM sounds
WHERE
uploader_id = ? AND
name = ?
",
user_id, name
)
.fetch_one(&db_pool)
.await?.count;
Ok(c as u32)
}
async fn set_as_greet(&self, user_id: u64, db_pool: MySqlPool) -> Result<(), Box<dyn std::error::Error>> {
sqlx::query!(
"
UPDATE users
SET
join_sound_id = ?
WHERE
user = ?
",
self.id, user_id
)
.execute(&db_pool)
.await?;
Ok(())
}
async fn commit(&self, db_pool: MySqlPool) -> Result<(), Box<dyn std::error::Error>> {
sqlx::query!(
"
UPDATE sounds
SET
plays = ?,
public = ?
WHERE
id = ?
",
self.plays, self.public, self.id
)
.execute(&db_pool)
.await?;
Ok(())
}
async fn delete(&self, db_pool: MySqlPool) -> Result<(), Box<dyn std::error::Error>> {
sqlx::query!(
"
DELETE
FROM sounds
WHERE id = ?
",
self.id
)
.execute(&db_pool)
.await?;
Ok(())
}
async fn create_anon(name: &str, src_url: &str, server_id: u64, user_id: u64, db_pool: MySqlPool) -> Result<u64, Box<dyn std::error::Error + Send>> {
async fn process_src(src_url: &str) -> Option<Vec<u8>> {
let future = Command::new("ffmpeg")
.arg("-i")
.arg(src_url)
.arg("-loglevel")
.arg("error")
.arg("-b:a")
.arg("28000")
.arg("-f")
.arg("opus")
.arg("-fs")
.arg("1048576")
.arg("pipe:1")
.output();
let output = future.await;
match output {
Ok(out) => {
if out.status.success() {
Some(out.stdout)
}
else {
None
}
}
Err(_) => None,
}
}
let source = process_src(src_url).await;
match source {
Some(data) => {
match sqlx::query!(
"
INSERT INTO sounds (name, server_id, uploader_id, public, src)
VALUES (?, ?, ?, 1, ?)
",
name, server_id, user_id, data
)
.execute(&db_pool)
.await {
Ok(u) => Ok(u),
Err(e) => Err(Box::new(e))
}
}
None => Err(Box::new(ErrorTypes::InvalidFile))
}
}
async fn get_user_sounds(user_id: u64, db_pool: MySqlPool) -> Result<Vec<Sound>, Box<dyn std::error::Error>> {
let sounds = sqlx::query_as_unchecked!(
Sound,
"
SELECT *
FROM sounds
WHERE uploader_id = ?
",
user_id
).fetch_all(&db_pool).await?;
Ok(sounds)
}
async fn get_guild_sounds(guild_id: u64, db_pool: MySqlPool) -> Result<Vec<Sound>, Box<dyn std::error::Error>> {
let sounds = sqlx::query_as_unchecked!(
Sound,
"
SELECT *
FROM sounds
WHERE server_id = ?
",
guild_id
).fetch_all(&db_pool).await?;
Ok(sounds)
}
}
struct GuildData {
pub id: u64,
pub name: Option<String>,
pub prefix: String,
pub volume: u8,
}
impl GuildData {
async fn get_from_id(guild_id: u64, db_pool: MySqlPool) -> Option<GuildData> {
let guild = sqlx::query_as!(
GuildData,
"
SELECT *
FROM servers
WHERE id = ?
", guild_id
)
.fetch_one(&db_pool)
.await;
match guild {
Ok(guild) => Some(guild),
Err(_) => None,
}
}
async fn create_from_guild(guild: Guild, db_pool: MySqlPool) -> Result<GuildData, Box<dyn std::error::Error>> {
sqlx::query!(
"
INSERT INTO servers (id, name)
VALUES (?, ?)
", guild.id.as_u64(), guild.name
)
.execute(&db_pool)
.await?;
Ok(GuildData {
id: *guild.id.as_u64(),
name: Some(guild.name.clone()),
prefix: String::from("?"),
volume: 100,
})
}
async fn commit(&self, db_pool: MySqlPool) -> Result<(), Box<dyn std::error::Error>> {
sqlx::query!(
"
UPDATE servers
SET
name = ?,
prefix = ?,
volume = ?
WHERE
id = ?
",
self.name, self.prefix, self.volume, self.id
)
.execute(&db_pool)
.await?;
Ok(())
}
}
// create event handler for bot
struct Handler;

293
src/sound.rs Normal file
View File

@ -0,0 +1,293 @@
use super::error::ErrorTypes;
use sqlx::mysql::MySqlPool;
use serenity::voice::{
AudioSource,
ffmpeg,
};
use tokio::{
fs::File,
process::Command,
};
use std::{
env,
path::Path,
};
pub struct Sound {
pub name: String,
pub id: u32,
pub plays: u32,
pub public: bool,
pub server_id: u64,
pub uploader_id: u64,
pub src: Vec<u8>,
}
impl Sound {
pub async fn search_for_sound(query: &str, guild_id: u64, user_id: u64, db_pool: MySqlPool, strict: bool) -> Result<Vec<Sound>, sqlx::Error> {
fn extract_id(s: &str) -> Option<u32> {
if s.len() > 3 && s.to_lowercase().starts_with("id:") {
match s[3..].parse::<u32>() {
Ok(id) => Some(id),
Err(_) => None
}
}
else {
None
}
}
if let Some(id) = extract_id(&query) {
let sound = sqlx::query_as_unchecked!(
Self,
"
SELECT *
FROM sounds
WHERE id = ? AND (
public = 1 OR
uploader_id = ? OR
server_id = ?
)
",
id, user_id, guild_id
)
.fetch_all(&db_pool)
.await?;
Ok(sound)
}
else {
let name = query;
let sound;
if strict {
sound = sqlx::query_as_unchecked!(
Self,
"
SELECT *
FROM sounds
WHERE name = ? AND (
public = 1 OR
uploader_id = ? OR
server_id = ?
)
ORDER BY rand(), public = 1, server_id = ?, uploader_id = ?
",
name, user_id, guild_id, guild_id, user_id
)
.fetch_all(&db_pool)
.await?;
}
else {
sound = sqlx::query_as_unchecked!(
Self,
"
SELECT *
FROM sounds
WHERE name LIKE CONCAT('%', ?, '%') AND (
public = 1 OR
uploader_id = ? OR
server_id = ?
)
ORDER BY rand(), public = 1, server_id = ?, uploader_id = ?
",
name, user_id, guild_id, guild_id, user_id
)
.fetch_all(&db_pool)
.await?;
}
Ok(sound)
}
}
pub async fn store_sound_source(&self) -> Result<Box<dyn AudioSource>, Box<dyn std::error::Error>> {
let caching_location = env::var("CACHING_LOCATION").unwrap_or(String::from("/tmp"));
let path_name = format!("{}/sound-{}", caching_location, self.id);
let path = Path::new(&path_name);
if !path.exists() {
use tokio::prelude::*;
let mut file = File::create(&path).await?;
file.write_all(self.src.as_ref()).await?;
}
Ok(ffmpeg(path_name).await?)
}
pub async fn count_user_sounds(user_id: u64, db_pool: MySqlPool) -> Result<u32, sqlx::error::Error> {
let c = sqlx::query!(
"
SELECT COUNT(1) as count
FROM sounds
WHERE uploader_id = ?
",
user_id
)
.fetch_one(&db_pool)
.await?.count;
Ok(c as u32)
}
pub async fn count_named_user_sounds(user_id: u64, name: &String, db_pool: MySqlPool) -> Result<u32, sqlx::error::Error> {
let c = sqlx::query!(
"
SELECT COUNT(1) as count
FROM sounds
WHERE
uploader_id = ? AND
name = ?
",
user_id, name
)
.fetch_one(&db_pool)
.await?.count;
Ok(c as u32)
}
pub async fn set_as_greet(&self, user_id: u64, db_pool: MySqlPool) -> Result<(), Box<dyn std::error::Error>> {
sqlx::query!(
"
UPDATE users
SET
join_sound_id = ?
WHERE
user = ?
",
self.id, user_id
)
.execute(&db_pool)
.await?;
Ok(())
}
pub async fn commit(&self, db_pool: MySqlPool) -> Result<(), Box<dyn std::error::Error>> {
sqlx::query!(
"
UPDATE sounds
SET
plays = ?,
public = ?
WHERE
id = ?
",
self.plays, self.public, self.id
)
.execute(&db_pool)
.await?;
Ok(())
}
pub async fn delete(&self, db_pool: MySqlPool) -> Result<(), Box<dyn std::error::Error>> {
sqlx::query!(
"
DELETE
FROM sounds
WHERE id = ?
",
self.id
)
.execute(&db_pool)
.await?;
Ok(())
}
pub async fn create_anon(name: &str, src_url: &str, server_id: u64, user_id: u64, db_pool: MySqlPool) -> Result<u64, Box<dyn std::error::Error + Send>> {
async fn process_src(src_url: &str) -> Option<Vec<u8>> {
let future = Command::new("ffmpeg")
.arg("-i")
.arg(src_url)
.arg("-loglevel")
.arg("error")
.arg("-b:a")
.arg("28000")
.arg("-f")
.arg("opus")
.arg("-fs")
.arg("1048576")
.arg("pipe:1")
.output();
let output = future.await;
match output {
Ok(out) => {
if out.status.success() {
Some(out.stdout)
}
else {
None
}
}
Err(_) => None,
}
}
let source = process_src(src_url).await;
match source {
Some(data) => {
match sqlx::query!(
"
INSERT INTO sounds (name, server_id, uploader_id, public, src)
VALUES (?, ?, ?, 1, ?)
",
name, server_id, user_id, data
)
.execute(&db_pool)
.await {
Ok(u) => Ok(u),
Err(e) => Err(Box::new(e))
}
}
None => Err(Box::new(ErrorTypes::InvalidFile))
}
}
pub async fn get_user_sounds(user_id: u64, db_pool: MySqlPool) -> Result<Vec<Sound>, Box<dyn std::error::Error>> {
let sounds = sqlx::query_as_unchecked!(
Sound,
"
SELECT *
FROM sounds
WHERE uploader_id = ?
",
user_id
).fetch_all(&db_pool).await?;
Ok(sounds)
}
pub async fn get_guild_sounds(guild_id: u64, db_pool: MySqlPool) -> Result<Vec<Sound>, Box<dyn std::error::Error>> {
let sounds = sqlx::query_as_unchecked!(
Sound,
"
SELECT *
FROM sounds
WHERE server_id = ?
",
guild_id
).fetch_all(&db_pool).await?;
Ok(sounds)
}
}