From 7238e7177d413430aed8b14508278a686b4922a4 Mon Sep 17 00:00:00 2001
From: runebaas <runebaas@gmail.com>
Date: Sun, 6 May 2018 02:43:23 +0200
Subject: [PATCH] Bug fixes in !quote

---
 Geekbot.net/Commands/Utils/Quote/Quote.cs    | 32 +++++++++++++++-----
 Geekbot.net/Lib/Polyfills/UserPolyfillDto.cs | 31 +++++++++++++++++++
 2 files changed, 55 insertions(+), 8 deletions(-)
 create mode 100644 Geekbot.net/Lib/Polyfills/UserPolyfillDto.cs

diff --git a/Geekbot.net/Commands/Utils/Quote/Quote.cs b/Geekbot.net/Commands/Utils/Quote/Quote.cs
index f1941ba..7a25b50 100644
--- a/Geekbot.net/Commands/Utils/Quote/Quote.cs
+++ b/Geekbot.net/Commands/Utils/Quote/Quote.cs
@@ -5,6 +5,7 @@ using Discord;
 using Discord.Commands;
 using Geekbot.net.Lib;
 using Geekbot.net.Lib.ErrorHandling;
+using Geekbot.net.Lib.Polyfills;
 using Newtonsoft.Json;
 using StackExchange.Redis;
 
@@ -30,6 +31,11 @@ namespace Geekbot.net.Commands.Utils.Quote
             try
             {
                 var randomQuotes = _redis.SetMembers($"{Context.Guild.Id}:Quotes");
+                if (!randomQuotes.Any())
+                {
+                    await ReplyAsync("This server doesn't seem to have any quotes yet. You can add a quote with `!quote save @user` or `!quote save <messageId>`");
+                    return;
+                }
                 var randomNumber = new Random().Next(randomQuotes.Length - 1);
                 var randomQuote = randomQuotes[randomNumber];
                 var quote = JsonConvert.DeserializeObject<QuoteObjectDto>(randomQuote);
@@ -62,6 +68,7 @@ namespace Geekbot.net.Commands.Utils.Quote
                 }
 
                 var lastMessage = await GetLastMessageByUser(user);
+                if (lastMessage == null) return;
                 var quote = CreateQuoteObject(lastMessage);
                 var quoteStore = JsonConvert.SerializeObject(quote);
                 _redis.SetAdd($"{Context.Guild.Id}:Quotes", quoteStore);
@@ -116,6 +123,7 @@ namespace Geekbot.net.Commands.Utils.Quote
             try
             {
                 var lastMessage = await GetLastMessageByUser(user);
+                if (lastMessage == null) return;
                 var quote = CreateQuoteObject(lastMessage);
                 var embed = QuoteBuilder(quote);
                 await ReplyAsync("", false, embed.Build());
@@ -178,18 +186,26 @@ namespace Geekbot.net.Commands.Utils.Quote
 
         private async Task<IMessage> GetLastMessageByUser(IUser user)
         {
-            var list = Context.Channel.GetMessagesAsync().Flatten();
-            await list;
-            return list.Result
-                .First(msg => msg.Author.Id == user.Id
-                              && msg.Embeds.Count == 0
-                              && msg.Id != Context.Message.Id
-                              && !msg.Content.ToLower().StartsWith("!"));
+            try
+            {
+                var list = Context.Channel.GetMessagesAsync().Flatten();
+                await list;
+                return list.Result
+                    .First(msg => msg.Author.Id == user.Id
+                                  && msg.Embeds.Count == 0
+                                  && msg.Id != Context.Message.Id
+                                  && !msg.Content.ToLower().StartsWith("!"));
+            }
+            catch
+            {
+                await ReplyAsync($"No quoteable message have been sent by {user.Username} in this channel");
+                return null;
+            }
         }
 
         private EmbedBuilder QuoteBuilder(QuoteObjectDto quote, int id = 0)
         {
-            var user = Context.Client.GetUserAsync(quote.UserId).Result;
+            var user = Context.Client.GetUserAsync(quote.UserId).Result ?? new UserPolyfillDto { Username = "Unknown User" };
             var eb = new EmbedBuilder();
             eb.WithColor(new Color(143, 167, 232));
             eb.Title = id == 0 ? "" : $"#{id} | ";
diff --git a/Geekbot.net/Lib/Polyfills/UserPolyfillDto.cs b/Geekbot.net/Lib/Polyfills/UserPolyfillDto.cs
new file mode 100644
index 0000000..407ae36
--- /dev/null
+++ b/Geekbot.net/Lib/Polyfills/UserPolyfillDto.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Threading.Tasks;
+using Discord;
+
+namespace Geekbot.net.Lib.Polyfills
+{
+    internal class UserPolyfillDto : IUser
+    {
+        public ulong Id { get; set; }
+        public DateTimeOffset CreatedAt { get; set; }
+        public string Mention { get; set; }
+        public Game? Game { get; set; }
+        public UserStatus Status { get; set; }
+        public string AvatarId { get; set; }
+        public string Discriminator { get; set; }
+        public ushort DiscriminatorValue { get; set; }
+        public bool IsBot { get; set; }
+        public bool IsWebhook { get; set; }
+        public string Username { get; set; }
+        
+        public string GetAvatarUrl(ImageFormat format = ImageFormat.Auto, ushort size = 128)
+        {
+            return "https://discordapp.com/assets/6debd47ed13483642cf09e832ed0bc1b.png";
+        }
+
+        public Task<IDMChannel> GetOrCreateDMChannelAsync(RequestOptions options = null)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
\ No newline at end of file