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

show actual serial numbers

Browse Source
This commit is contained in:
Amneesh Singh
2022-02-14 00:58:19 +05:30
parent 8177787376
commit 5c911042be
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/commands/count.rs
View File

@@ -160,10 +160,7 @@ pub async fn cedit(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.splitn(2, "&").collect::<Vec<&str>>(); let queries = query.splitn(2, "&").collect::<Vec<&str>>();
if queries.len() != 2 { if queries.len() != 2 {
msg.reply( msg.reply(ctx, "Please use the proper syntax\n,cedit <name>&<regex>")
ctx,
"Please use the proper syntax\n,cedit <name>&<regex>",
)
.await?; .await?;
return Ok(()); return Ok(());
} }
@@ -208,9 +205,9 @@ macro_rules! make_embed {
.title(format!("List of words: Page {}", $cur)) .title(format!("List of words: Page {}", $cur))
.color(Colour::TEAL); .color(Colour::TEAL);
for row in $group { for row in $group {
let idx: i32 = row.get(0); let idx: i64 = row.get(0);
let name: String = row.get(1); let name: String = row.get(1);
let owner_id: String = row.get(3); let owner_id: String = row.get(2);
$e = $e.field( $e = $e.field(
format!("{}. {}", idx, name), format!("{}. {}", idx, name),
format!(" by <@{}>", owner_id), format!(" by <@{}>", owner_id),
@@ -255,7 +252,9 @@ pub async fn cls(ctx: &Context, msg: &Message, _: Args) -> CommandResult {
.get::<crate::Database>() .get::<crate::Database>()
.expect("Expected Database in TypeMap.") .expect("Expected Database in TypeMap.")
.clone(); .clone();
let rows = db.query("SELECT * FROM words", &[]).await?; let rows = db
.query("SELECT ROW_NUMBER() OVER (ORDER BY id), name, owner FROM words", &[])
.await?;
if rows.is_empty() { if rows.is_empty() {
msg.reply(ctx, "No words stored").await?; msg.reply(ctx, "No words stored").await?;
return Ok(()); return Ok(());

11
src/commands/tags.rs
View File

@@ -216,9 +216,9 @@ macro_rules! make_embed {
.title(format!("List of tags: Page {}", $cur)) .title(format!("List of tags: Page {}", $cur))
.color(Colour::FABLED_PINK); .color(Colour::FABLED_PINK);
for row in $group { for row in $group {
let idx: i32 = row.get(0); let idx: i64 = row.get(0);
let name: String = row.get(1); let name: String = row.get(1);
let owner_id: String = row.get(3); let owner_id: String = row.get(2);
$e = $e.field( $e = $e.field(
format!("{}. {}", idx, name), format!("{}. {}", idx, name),
format!(" by <@{}>", owner_id), format!(" by <@{}>", owner_id),
@@ -263,7 +263,12 @@ pub async fn tls(ctx: &Context, msg: &Message, _: Args) -> CommandResult {
.get::<crate::Database>() .get::<crate::Database>()
.expect("Expected Database in TypeMap.") .expect("Expected Database in TypeMap.")
.clone(); .clone();
let rows = db.query("SELECT * FROM tags", &[]).await?; let rows = db
.query(
"SELECT ROW_NUMBER() OVER (ORDER BY id), name, owner FROM tags",
&[],
)
.await?;
if rows.is_empty() { if rows.is_empty() {
msg.reply(ctx, "No tags stored").await?; msg.reply(ctx, "No tags stored").await?;
return Ok(()); return Ok(());