natto1784/singh3
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

added initial sql script and some minor change

Browse Source
This commit is contained in:
Amneesh Singh
2022-02-12 23:24:32 +05:30
parent 88b6b4fb8d
commit 17e98f9160
7 changed files with 146 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@@ -662,9 +662,9 @@ dependencies = [
[[package]] [[package]]
name = "once_cell" name = "once_cell"
version = "1.8.0" version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5"
[[package]] [[package]]
name = "opaque-debug" name = "opaque-debug"

10
Cargo.toml
View File

@@ -5,13 +5,13 @@ authors = [ "Amneesh Singh <natto@weirdnatto.in>" ]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
tracing = "0.1.22" tracing = "*"
regex = "1.5.4" regex = "*"
tokio-postgres = "0.7.2" tokio-postgres = "*"
rand = "0.8.4" rand = "*"
[dependencies.serenity] [dependencies.serenity]
version = "0.10.8" version = "0.10.*"
features = ["cache", "framework", "standard_framework", "rustls_backend", "unstable_discord_api", "collector"] features = ["cache", "framework", "standard_framework", "rustls_backend", "unstable_discord_api", "collector"]
[dependencies.tokio] [dependencies.tokio]

5
init.sql Normal file
View File

@@ -0,0 +1,5 @@
CREATE TABLE IF NOT EXISTS words (
id serial primary key,
name varchar not null,
reg varchar not null,
owner varchar );

113
src/commands/count.rs
View File

@@ -4,8 +4,6 @@ use serenity::{
prelude::*, prelude::*,
utils::Colour, utils::Colour,
}; };
use std::env;
use tokio_postgres::NoTls;
#[command] #[command]
pub async fn kitna(ctx: &Context, msg: &Message, args: Args) -> CommandResult { pub async fn kitna(ctx: &Context, msg: &Message, args: Args) -> CommandResult {
@@ -14,17 +12,14 @@ pub async fn kitna(ctx: &Context, msg: &Message, args: Args) -> CommandResult {
msg.reply(ctx, "bruh kitna kya?").await?; msg.reply(ctx, "bruh kitna kya?").await?;
return Ok(()); return Ok(());
} }
let db: String = env::var("DB_URL").expect("bhay DB_URL daal na"); let data_read = ctx.data.read().await;
let (client, conn) = tokio_postgres::connect(&db, NoTls) let db = data_read
.await .get::<crate::Database>()
.expect("cant connect bha"); .expect("Expected Database in TypeMap.")
tokio::spawn(async move { .clone();
if let Err(e) = conn.await {
eprintln!("connection error: {}", e);
}
});
let id = msg.author.id.to_string(); let id = msg.author.id.to_string();
let mut query_helper = client let mut query_helper = db
.query( .query(
format!("select name from words where '{}' ~ reg", query).as_str(), format!("select name from words where '{}' ~ reg", query).as_str(),
&[], &[],
@@ -32,7 +27,7 @@ pub async fn kitna(ctx: &Context, msg: &Message, args: Args) -> CommandResult {
.await .await
.expect("helper query to select count failed"); .expect("helper query to select count failed");
if query_helper.is_empty() { if query_helper.is_empty() {
query_helper = client query_helper = db
.query( .query(
format!("select name from words where name='{}'", query).as_str(), format!("select name from words where name='{}'", query).as_str(),
&[], &[],
@@ -43,7 +38,7 @@ pub async fn kitna(ctx: &Context, msg: &Message, args: Args) -> CommandResult {
msg.reply( msg.reply(
ctx, ctx,
format!( format!(
"No entry for '{}' found. If you want to add it, run 'xxadd {}&<regex>'", "No entry for '{}' found. If you want to add it, run ',count add {}&<regex>'",
query, query query, query
), ),
) )
@@ -58,7 +53,7 @@ pub async fn kitna(ctx: &Context, msg: &Message, args: Args) -> CommandResult {
}; };
for row in query_helper { for row in query_helper {
let name: &str = row.get(0); let name: &str = row.get(0);
let query_result: i32 = client let query_result: i32 = db
.query_one( .query_one(
format!("select count from user{} where name='{}'", id, name).as_str(), format!("select count from user{} where name='{}'", id, name).as_str(),
&[], &[],
@@ -75,9 +70,9 @@ pub async fn kitna(ctx: &Context, msg: &Message, args: Args) -> CommandResult {
#[command] #[command]
pub async fn add(ctx: &Context, msg: &Message, args: Args) -> CommandResult { pub async fn add(ctx: &Context, msg: &Message, args: Args) -> CommandResult {
let query: String = args.raw().collect::<Vec<&str>>().join(" "); let query: String = args.raw().collect::<Vec<&str>>().join(" ");
let queries = query.split("&").collect::<Vec<&str>>(); let queries = query.splitn(2, "&").collect::<Vec<&str>>();
if queries.len() != 2 { if queries.len() != 2 {
msg.reply(ctx, "Please use the proper syntax: xxadd <name>&<regex>\nIf you don't know what regex is, just do: xxadd <name>&<name>") msg.reply(ctx, "Please use the proper syntax: `,count add <name>&<regex>`\nIf you don't know what regex is, just do: `,count add <name>&<name>`")
.await?; .await?;
return Ok(()); return Ok(());
} }
@@ -85,16 +80,12 @@ pub async fn add(ctx: &Context, msg: &Message, args: Args) -> CommandResult {
msg.reply(ctx, "Not a valid regex").await?; msg.reply(ctx, "Not a valid regex").await?;
return Ok(()); return Ok(());
} }
let db: String = env::var("DB_URL").expect("bhay DB_URL daal na"); let data_read = ctx.data.read().await;
let (client, conn) = tokio_postgres::connect(&db, NoTls) let db = data_read
.await .get::<crate::Database>()
.expect("cant connect bha"); .expect("Expected Database in TypeMap.")
tokio::spawn(async move { .clone();
if let Err(e) = conn.await { let check_existense = db
eprintln!("connection error: {}", e);
}
});
let check_existense = client
.query( .query(
format!("select name, reg from words where name='{}'", queries[0]).as_str(), format!("select name, reg from words where name='{}'", queries[0]).as_str(),
&[], &[],
@@ -109,8 +100,7 @@ pub async fn add(ctx: &Context, msg: &Message, args: Args) -> CommandResult {
.await?; .await?;
return Ok(()); return Ok(());
} }
client db.execute(
.execute(
format!( format!(
"insert into words(name, reg, owner) values('{}','(?i){}', '{}')", "insert into words(name, reg, owner) values('{}','(?i){}', '{}')",
queries[0], queries[0],
@@ -128,16 +118,12 @@ pub async fn add(ctx: &Context, msg: &Message, args: Args) -> CommandResult {
#[command] #[command]
pub async fn rm(ctx: &Context, msg: &Message, args: Args) -> CommandResult { pub async fn rm(ctx: &Context, msg: &Message, args: Args) -> CommandResult {
let query: String = args.raw().collect::<Vec<&str>>().join(" "); let query: String = args.raw().collect::<Vec<&str>>().join(" ");
let db: String = env::var("DB_URL").expect("bhay DB_URL daal na"); let data_read = ctx.data.read().await;
let (client, conn) = tokio_postgres::connect(&db, NoTls) let db = data_read
.await .get::<crate::Database>()
.expect("cant connect bha"); .expect("Expected Database in TypeMap.")
tokio::spawn(async move { .clone();
if let Err(e) = conn.await { let owner = db
eprintln!("connection error: {}", e);
}
});
let owner = client
.query( .query(
format!("select owner from words where name = '{}'", query).as_str(), format!("select owner from words where name = '{}'", query).as_str(),
&[], &[],
@@ -150,8 +136,7 @@ pub async fn rm(ctx: &Context, msg: &Message, args: Args) -> CommandResult {
return Ok(()); return Ok(());
} }
} }
client db.execute(
.execute(
format!("delete from words where name='{}'", query,).as_str(), format!("delete from words where name='{}'", query,).as_str(),
&[], &[],
) )
@@ -163,9 +148,12 @@ pub async fn rm(ctx: &Context, msg: &Message, args: Args) -> CommandResult {
#[command] #[command]
pub async fn change(ctx: &Context, msg: &Message, args: Args) -> CommandResult { pub async fn change(ctx: &Context, msg: &Message, args: Args) -> CommandResult {
let query: String = args.raw().collect::<Vec<&str>>().join(" "); let query: String = args.raw().collect::<Vec<&str>>().join(" ");
let queries = query.split("&").collect::<Vec<&str>>(); let queries = query.splitn(2, "&").collect::<Vec<&str>>();
if queries.len() != 2 { if queries.len() != 2 {
msg.reply(ctx, "Please use the proper syntax\nxxchange <name>&<regex>") msg.reply(
ctx,
"Please use the proper syntax\n,count change <name>&<regex>",
)
.await?; .await?;
return Ok(()); return Ok(());
} }
@@ -173,16 +161,12 @@ pub async fn change(ctx: &Context, msg: &Message, args: Args) -> CommandResult {
msg.reply(ctx, "Not a valid regex").await?; msg.reply(ctx, "Not a valid regex").await?;
return Ok(()); return Ok(());
} }
let db: String = env::var("DB_URL").expect("bhay DB_URL daal na"); let data_read = ctx.data.read().await;
let (client, conn) = tokio_postgres::connect(&db, NoTls) let db = data_read
.await .get::<crate::Database>()
.expect("cant connect bha"); .expect("Expected Database in TypeMap.")
tokio::spawn(async move { .clone();
if let Err(e) = conn.await { let owner = db
eprintln!("connection error: {}", e);
}
});
let owner = client
.query( .query(
format!("select owner from words where name = '{}'", queries[0]).as_str(), format!("select owner from words where name = '{}'", queries[0]).as_str(),
&[], &[],
@@ -195,8 +179,7 @@ pub async fn change(ctx: &Context, msg: &Message, args: Args) -> CommandResult {
return Ok(()); return Ok(());
} }
} }
client db.execute(
.execute(
format!( format!(
"update words set reg='(?i){}' where name='{}'", "update words set reg='(?i){}' where name='{}'",
queries[1], queries[0] queries[1], queries[0]
@@ -210,17 +193,13 @@ pub async fn change(ctx: &Context, msg: &Message, args: Args) -> CommandResult {
} }
#[command] #[command]
pub async fn list(ctx: &Context, msg: &Message, _: Args) -> CommandResult { pub async fn ls(ctx: &Context, msg: &Message, _: Args) -> CommandResult {
let db: String = env::var("DB_URL").expect("bhay DB_URL daal na"); let data_read = ctx.data.read().await;
let (client, conn) = tokio_postgres::connect(&db, NoTls) let db = data_read
.await .get::<crate::Database>()
.expect("cant connect bha"); .expect("Expected Database in TypeMap.")
tokio::spawn(async move { .clone();
if let Err(e) = conn.await { let rows = db.query("select * from words", &[]).await?;
eprintln!("connection error: {}", e);
}
});
let rows = client.query("select * from words", &[]).await?;
msg.channel_id msg.channel_id
.send_message(ctx, |mut m| { .send_message(ctx, |mut m| {
let mut a: u32 = 1; let mut a: u32 = 1;
@@ -231,7 +210,7 @@ pub async fn list(ctx: &Context, msg: &Message, _: Args) -> CommandResult {
.color(Colour::TEAL); .color(Colour::TEAL);
a += 1; a += 1;
for row in group { for row in group {
let idx: u32 = row.get(0); let idx: i32 = row.get(0);
let name: String = row.get(1); let name: String = row.get(1);
let _reg: String = row.get(2); let _reg: String = row.get(2);
let owner_id: String = row.get(3); let owner_id: String = row.get(3);

34
src/handler/count.rs
View File

@@ -1,38 +1,26 @@
use regex::Regex; use regex::Regex;
use serenity::model::channel::Message; use serenity::model::channel::Message;
use std::env; use tokio_postgres::Client;
use tokio_postgres::NoTls;
pub async fn count(msg: Message) { pub async fn count(msg: Message, db: std::sync::Arc<Client>) {
let db: String = env::var("DB_URL").expect("bhay DB_URL daal na");
let (client, conn) = tokio_postgres::connect(&db, NoTls)
.await
.expect("cant connect bha");
tokio::spawn(async move {
if let Err(e) = conn.await {
eprintln!("connection error: {}", e);
}
});
let id = msg.author.id.as_u64().to_owned().to_string(); let id = msg.author.id.as_u64().to_owned().to_string();
client db.execute(
.execute(
format!( format!(
" r#"
CREATE TABLE IF NOT EXISTS user{} ( CREATE TABLE IF NOT EXISTS user{} (
id SERIAL PRIMARY KEY, id SERIAL PRIMARY KEY,
name VARCHAR NOT NULL, name VARCHAR NOT NULL,
count INTEGER NOT NULL count INTEGER NOT NULL
) )"#,
",
id id
) )
.as_str(), .as_str(),
&[], &[],
) )
.await .await
.expect("cant create table"); .expect("cant create a user table");
for row in client for row in db
.query("SELECT name, reg FROM words", &[]) .query("SELECT name, reg FROM words", &[])
.await .await
.expect("can't get the words to count") .expect("can't get the words to count")
@@ -41,7 +29,7 @@ pub async fn count(msg: Message) {
let regex: Regex = Regex::new(row.get(1)).unwrap(); let regex: Regex = Regex::new(row.get(1)).unwrap();
let count = regex.captures_iter(&msg.content).count(); let count = regex.captures_iter(&msg.content).count();
if count > 0 { if count > 0 {
let query_result = client let query_result = db
.query( .query(
format!("SELECT count FROM user{} where name='{}'", id, name).as_str(), format!("SELECT count FROM user{} where name='{}'", id, name).as_str(),
&[], &[],
@@ -49,8 +37,7 @@ pub async fn count(msg: Message) {
.await .await
.expect("cant select the count"); .expect("cant select the count");
if query_result.is_empty() { if query_result.is_empty() {
client db.execute(
.execute(
format!( format!(
"insert into user{} (name, count) values ('{}', 0)", "insert into user{} (name, count) values ('{}', 0)",
id, name id, name
@@ -61,8 +48,7 @@ pub async fn count(msg: Message) {
.await .await
.expect("cant insert shit"); .expect("cant insert shit");
} }
client db.execute(
.execute(
format!( format!(
"UPDATE user{} SET count = count + {} where name='{}'", "UPDATE user{} SET count = count + {} where name='{}'",
id, count, name id, count, name

17
src/handler/mod.rs
View File

@@ -1,11 +1,11 @@
mod interactions;
mod count; mod count;
mod interactions;
use serenity::{ use serenity::{
async_trait, async_trait,
model::{ model::{
channel::Message,
event::ResumedEvent, event::ResumedEvent,
gateway::Ready, gateway::Ready,
channel::Message,
interactions::{ interactions::{
ApplicationCommand, Interaction, InteractionData, InteractionResponseType, ApplicationCommand, Interaction, InteractionData, InteractionResponseType,
InteractionType, InteractionType,
@@ -29,8 +29,13 @@ impl EventHandler for Handler {
async fn resume(&self, _: Context, _: ResumedEvent) { async fn resume(&self, _: Context, _: ResumedEvent) {
info!("how th when the"); info!("how th when the");
} }
async fn message(&self, _: Context, msg: Message) { async fn message(&self, ctx: Context, msg: Message) {
count::count(msg).await; let data_read = ctx.data.read().await;
let db_client = data_read
.get::<crate::Database>()
.expect("Expected Database in TypeMap.")
.clone();
count::count(msg, db_client).await;
} }
async fn interaction_create(&self, ctx: Context, interaction: Interaction) { async fn interaction_create(&self, ctx: Context, interaction: Interaction) {
@@ -40,7 +45,9 @@ impl EventHandler for Handler {
.create_interaction_response(&ctx.http, |response| { .create_interaction_response(&ctx.http, |response| {
response response
.kind(InteractionResponseType::ChannelMessageWithSource) .kind(InteractionResponseType::ChannelMessageWithSource)
.interaction_response_data(|message| interactions::responses(data.name.to_string(), message)) .interaction_response_data(|message| {
interactions::responses(data.name.to_string(), message)
})
}) })
.await .await
{ {

32
src/main.rs
View File

@@ -1,5 +1,9 @@
mod commands; mod commands;
mod handler; mod handler;
use commands::count::*;
use commands::general::*;
use commands::minigames::*;
use handler::Handler;
use serenity::{ use serenity::{
client::bridge::gateway::ShardManager, client::bridge::gateway::ShardManager,
framework::{standard::macros::group, StandardFramework}, framework::{standard::macros::group, StandardFramework},
@@ -8,22 +12,24 @@ use serenity::{
}; };
use std::{collections::HashSet, env, sync::Arc}; use std::{collections::HashSet, env, sync::Arc};
use tracing::error; use tracing::error;
pub struct ShardManagerContainer;
use commands::general::*;
use commands::count::*;
use commands::minigames::*;
use handler::Handler;
struct ShardManagerContainer;
impl TypeMapKey for ShardManagerContainer { impl TypeMapKey for ShardManagerContainer {
type Value = Arc<Mutex<ShardManager>>; type Value = Arc<Mutex<ShardManager>>;
} }
struct Database;
impl TypeMapKey for Database {
type Value = Arc<tokio_postgres::Client>;
}
#[group] #[group]
#[commands(ping)] #[commands(ping)]
struct General; struct General;
#[group] #[group]
#[commands(kitna,add,rm,change)] #[prefix = "count"]
#[commands(kitna, add, rm, change, ls)]
struct Count; struct Count;
#[group] #[group]
#[commands(challenge)] #[commands(challenge)]
@@ -46,7 +52,7 @@ async fn main() {
}; };
let framework = StandardFramework::new() let framework = StandardFramework::new()
.configure(|c| c.owners(owners).prefix("xx")) .configure(|c| c.owners(owners).prefix(","))
.group(&GENERAL_GROUP) .group(&GENERAL_GROUP)
.group(&COUNT_GROUP) .group(&COUNT_GROUP)
.group(&MINIGAMES_GROUP); .group(&MINIGAMES_GROUP);
@@ -59,7 +65,19 @@ async fn main() {
.expect("Client no wokey"); .expect("Client no wokey");
{ {
let db_url: String = env::var("DB_URL").expect("DB_URL not found");
let (db_client, conn) = tokio_postgres::connect(&db_url, tokio_postgres::NoTls)
.await
.expect("cant connect bha");
tokio::spawn(async move {
if let Err(e) = conn.await {
eprintln!("connection error: {}", e);
}
});
let init_script = std::include_str!("../init.sql");
db_client.batch_execute(init_script).await.expect("Couldn't run the init script");
let mut data = client.data.write().await; let mut data = client.data.write().await;
data.insert::<Database>(Arc::new(db_client));
data.insert::<ShardManagerContainer>(client.shard_manager.clone()); data.insert::<ShardManagerContainer>(client.shard_manager.clone());
} }