From 7aba128ad68b62b57d2a36b2f9b9272c5dd47cc7 Mon Sep 17 00:00:00 2001
From: jude <judesouthworth@pm.me>
Date: Fri, 23 Oct 2020 12:14:29 +0100
Subject: [PATCH] posting guild counts separately for shards. format
 default_prefix into info message

---
 Cargo.lock                |  2 +-
 Cargo.toml                |  2 +-
 src/commands/info_cmds.rs |  4 +++-
 src/main.rs               | 11 +++++++++--
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 13d08ac..0f9d1ae 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1165,7 +1165,7 @@ dependencies = [
 
 [[package]]
 name = "reminder_rs"
-version = "0.1.5"
+version = "0.1.6"
 dependencies = [
  "Inflector",
  "async-trait",
diff --git a/Cargo.toml b/Cargo.toml
index 047bc5e..25cecca 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "reminder_rs"
-version = "0.1.5"
+version = "0.1.6"
 authors = ["jellywx <judesouthworth@pm.me>"]
 edition = "2018"
 
diff --git a/src/commands/info_cmds.rs b/src/commands/info_cmds.rs
index c61db67..980f6a6 100644
--- a/src/commands/info_cmds.rs
+++ b/src/commands/info_cmds.rs
@@ -5,6 +5,7 @@ use serenity::{client::Context, framework::standard::CommandResult, model::chann
 use chrono::offset::Utc;
 
 use crate::{
+    consts::DEFAULT_PREFIX,
     models::{GuildData, UserData},
     SQLPool, THEME_COLOR,
 };
@@ -82,7 +83,8 @@ async fn info(ctx: &Context, msg: &Message, _args: String) -> CommandResult {
         .response(&pool, "info")
         .await
         .replacen("{user}", &ctx.cache.current_user().await.name, 1)
-        .replacen("{prefix}", &guild_data.prefix, 1);
+        .replace("{default_prefix}", &*DEFAULT_PREFIX)
+        .replace("{prefix}", &guild_data.prefix);
 
     msg.channel_id
         .send_message(ctx, |m| {
diff --git a/src/main.rs b/src/main.rs
index 74a8658..357786e 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -20,6 +20,7 @@ use serenity::{
         id::{GuildId, UserId},
     },
     prelude::{Context, EventHandler, TypeMapKey},
+    utils::shard_id,
 };
 
 use sqlx::{
@@ -83,13 +84,19 @@ DELETE FROM channels WHERE channel = ?
         .unwrap();
     }
 
-    async fn guild_create(&self, ctx: Context, _guild: Guild, is_new: bool) {
+    async fn guild_create(&self, ctx: Context, guild: Guild, is_new: bool) {
         if is_new {
             if let Ok(token) = env::var("DISCORDBOTS_TOKEN") {
-                let guild_count = ctx.cache.guild_count().await;
+                let guild_count = ctx.cache.guild_count().await as u64;
+                let shard_count = ctx.cache.shard_count().await;
 
                 let mut hm = HashMap::new();
                 hm.insert("server_count", guild_count);
+                hm.insert(
+                    "shard_id",
+                    shard_id(guild.id.as_u64().to_owned(), shard_count),
+                );
+                hm.insert("shard_count", shard_count);
 
                 let client = ctx
                     .data