From 5c58f892cb3ed2e3d10eb5c12fe8d3c581d83fe2 Mon Sep 17 00:00:00 2001
From: Lan <50151341+Lannnnnnnnn@users.noreply.github.com>
Date: Thu, 16 Apr 2020 13:00:20 +0300
Subject: [PATCH] added fish leaderboard

also minor fix in reminders
---
 Kehyeedra3/Commands/Economy.cs | 69 ++++++++++++++++++++++++----------
 Kehyeedra3/Commands/Stuff.cs   |  4 +-
 2 files changed, 52 insertions(+), 21 deletions(-)

diff --git a/Kehyeedra3/Commands/Economy.cs b/Kehyeedra3/Commands/Economy.cs
index cd02555..d62beaa 100644
--- a/Kehyeedra3/Commands/Economy.cs
+++ b/Kehyeedra3/Commands/Economy.cs
@@ -976,31 +976,61 @@ namespace Kehyeedra3.Commands
                 }
             }
         }
-        [Command("leaderboard"), Alias("top", "lb"), Summary("Shows the top 10 people in regards to % money as well as how much of the money in circulation they own")]
-        public async Task Leaderboard()
+        [Command("leaderboard"), Alias("top", "lb"), Summary("Shows the top 10 people in a leaderboard, currently available leaderboards: 'f, fish', 'm, money'.")]
+        public async Task Leaderboard(string type = null)
         {
-            List<User> users;
-            User bank;
-            User skuld;
-
-            using (var Database = new ApplicationDbContextFactory().CreateDbContext())
+            if (type == null)
             {
-                users = Database.Users.OrderByDescending(user => user.Money).ToList();
-                bank = Database.Users.FirstOrDefault(x => x.Id == 0);
-                skuld = Database.Users.FirstOrDefault(x => x.Id == 1);
+                await Context.Channel.SendMessageAsync($"{Context.User.Mention}\nPlease specify the leaderboard you want to view (fish or f for fish, m or money for money)");
             }
-            users.Remove(bank);
-            users.Remove(skuld);
+            else if (type == "m" || type == "money")
+            {
+                List<User> users;
+                User bank;
+                User skuld;
+                using (var Database = new ApplicationDbContextFactory().CreateDbContext())
+                {
+                    users = Database.Users.OrderByDescending(user => user.Money).ToList();
+                    bank = Database.Users.FirstOrDefault(x => x.Id == 0);
+                    skuld = Database.Users.FirstOrDefault(x => x.Id == 1);
+                }
+                users.Remove(bank);
+                users.Remove(skuld);
 
-            string leaderboardMessage = "**Top Ten Most Jewish Miners**:";
-            for (int i = 0; i < 10; i++)
+                int placing = 0;
+                string leaderboardMessage = "**Top Ten Most Jewish Users**:";
+                for (int i = 0; i < 10; i++)
+                {
+                    placing += 1;
+                    string percent = $"{ users[i].Money / 10000d }";
+                    string percentCirculating = $"{Math.Round(((users[i].Money * 100d) / (1000000d - bank.Money - skuld.Money)), 2, MidpointRounding.ToEven)}";
+                    leaderboardMessage += $"\n**#{placing} : {users[i].Username}**\n{percent}% ~ *{percentCirculating}% circulating*";
+                }
+                await Context.Channel.SendMessageAsync(leaderboardMessage);
+            }
+            else if (type == "f" || type == "fish")
             {
-                string percent = $"{ users[i].Money / 10000d }";
-                string percentCirculating = $"{Math.Round(((users[i].Money * 100d) / (1000000d - bank.Money - skuld.Money)), 2, MidpointRounding.ToEven)}";
-                leaderboardMessage += $"\n**{users[i].Username}** : {percent}% ~ *{percentCirculating}% circulating*";
+                List<Fishing> users;
+                using (var Database = new ApplicationDbContextFactory().CreateDbContext())
+                {
+                    users = Database.Fishing.OrderByDescending(user => user.TXp).ToList();
+                    string leaderboardMessage = "**Top Ten Smelliest Fishermen**:";
+                    int placing = 0;
+                    for (int i = 0; i < 10; i++)
+                    {
+                        placing += 1;
+                        var user = Database.Users.FirstOrDefault(x => x.Id == users[i].Id);
+                        string xp = $"{users[i].TXp}";
+                        string level = $"{users[i].Lvl}";
+                        leaderboardMessage += $"\n**#{placing} : {user.Username}** Lvl : **{level}**\n*{xp}xp*";
+                    }
+                    await Context.Channel.SendMessageAsync(leaderboardMessage);
+                }
+            }
+            else
+            {
+                await Context.Channel.SendMessageAsync($"{Context.User.Mention}\nCan't find the leaderboard you were looking for. \nPlease type fish or f for fish leaderboard, m or money for money leaderboard.");
             }
-
-            await Context.Channel.SendMessageAsync(leaderboardMessage);
 
         }
         [Command("give"), Summary("Give a user money. Eg. 'give @user [amount]'")]
@@ -1062,5 +1092,6 @@ namespace Kehyeedra3.Commands
                 }
             }
         }
+
     }
 }
diff --git a/Kehyeedra3/Commands/Stuff.cs b/Kehyeedra3/Commands/Stuff.cs
index 0eb4d1a..ff37653 100644
--- a/Kehyeedra3/Commands/Stuff.cs
+++ b/Kehyeedra3/Commands/Stuff.cs
@@ -112,12 +112,12 @@ namespace Kehyeedra3.Commands
             ulong sen = (d * 86400) + (h * 3600) + (m * 60);
             ulong yeedraStamp = DateTime.UtcNow.ToYeedraStamp();
 
-            while (m > 60)
+            while (m > 59)
             {
                 h += 1;
                 m -= 60;
             }
-            while (h > 24)
+            while (h > 23)
             {
                 d += 1;
                 h -= 24;