From 5c911042be46f2ccc51dcc7090c4428f4fd3645e Mon Sep 17 00:00:00 2001
From: natto1784 <singh.amneesh1784@gmail.com>
Date: Mon, 14 Feb 2022 00:58:19 +0530
Subject: [PATCH] show actual serial numbers

---
 src/commands/count.rs | 15 +++++++--------
 src/commands/tags.rs  | 11 ++++++++---
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/commands/count.rs b/src/commands/count.rs
index c9b65cc..d2749dd 100644
--- a/src/commands/count.rs
+++ b/src/commands/count.rs
@@ -160,11 +160,8 @@ pub async fn cedit(ctx: &Context, msg: &Message, args: Args) -> CommandResult {
     let query: String = args.raw().collect::<Vec<&str>>().join(" ");
     let queries = query.splitn(2, "&").collect::<Vec<&str>>();
     if queries.len() != 2 {
-        msg.reply(
-            ctx,
-            "Please use the proper syntax\n,cedit <name>&<regex>",
-        )
-        .await?;
+        msg.reply(ctx, "Please use the proper syntax\n,cedit <name>&<regex>")
+            .await?;
         return Ok(());
     }
     if queries[1].contains(" ") {
@@ -208,9 +205,9 @@ macro_rules! make_embed {
             .title(format!("List of words: Page {}", $cur))
             .color(Colour::TEAL);
         for row in $group {
-            let idx: i32 = row.get(0);
+            let idx: i64 = row.get(0);
             let name: String = row.get(1);
-            let owner_id: String = row.get(3);
+            let owner_id: String = row.get(2);
             $e = $e.field(
                 format!("{}. {}", idx, name),
                 format!(" by <@{}>", owner_id),
@@ -255,7 +252,9 @@ pub async fn cls(ctx: &Context, msg: &Message, _: Args) -> CommandResult {
         .get::<crate::Database>()
         .expect("Expected Database in TypeMap.")
         .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() {
         msg.reply(ctx, "No words stored").await?;
         return Ok(());
diff --git a/src/commands/tags.rs b/src/commands/tags.rs
index f59cca2..7193745 100644
--- a/src/commands/tags.rs
+++ b/src/commands/tags.rs
@@ -216,9 +216,9 @@ macro_rules! make_embed {
             .title(format!("List of tags: Page {}", $cur))
             .color(Colour::FABLED_PINK);
         for row in $group {
-            let idx: i32 = row.get(0);
+            let idx: i64 = row.get(0);
             let name: String = row.get(1);
-            let owner_id: String = row.get(3);
+            let owner_id: String = row.get(2);
             $e = $e.field(
                 format!("{}. {}", idx, name),
                 format!(" by <@{}>", owner_id),
@@ -263,7 +263,12 @@ pub async fn tls(ctx: &Context, msg: &Message, _: Args) -> CommandResult {
         .get::<crate::Database>()
         .expect("Expected Database in TypeMap.")
         .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() {
         msg.reply(ctx, "No tags stored").await?;
         return Ok(());