From 6d0fe62094232297bc0886997e5e4d1f06992ad9 Mon Sep 17 00:00:00 2001
From: appelemac <appelemac@gmail.com>
Date: Wed, 15 Jun 2016 15:55:37 +0200
Subject: [PATCH] rip

---
 .vs/NadekoBot/NadekoBot.scgdat                 | Bin 131072 -> 0 bytes
 .../Modules/Conversations/Conversations.cs     |  17 ++++-------------
 2 files changed, 4 insertions(+), 13 deletions(-)
 delete mode 100644 .vs/NadekoBot/NadekoBot.scgdat

diff --git a/.vs/NadekoBot/NadekoBot.scgdat b/.vs/NadekoBot/NadekoBot.scgdat
deleted file mode 100644
index e34ebe8d2ab64f089e47c182c8648a3a419a7573..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 131072
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
L009ILa0UJkXGugR

diff --git a/NadekoBot/Modules/Conversations/Conversations.cs b/NadekoBot/Modules/Conversations/Conversations.cs
index 64f28376..227814c7 100644
--- a/NadekoBot/Modules/Conversations/Conversations.cs
+++ b/NadekoBot/Modules/Conversations/Conversations.cs
@@ -1,16 +1,16 @@
 using Discord;
 using Discord.Commands;
 using Discord.Modules;
-using NadekoBot.Classes;
 using NadekoBot.Classes.Conversations.Commands;
 using NadekoBot.DataModels;
 using NadekoBot.Extensions;
+using NadekoBot.Classes;
+using System.Drawing.Drawing2D;
 using NadekoBot.Modules.Permissions.Classes;
 using NadekoBot.Properties;
 using System;
 using System.Diagnostics;
 using System.Drawing;
-using System.Drawing.Drawing2D;
 using System.Drawing.Imaging;
 using System.IO;
 using System.Linq;
@@ -196,7 +196,7 @@ namespace NadekoBot.Modules.Conversations
                             return;
                         var usr = e.Channel.FindUsers(e.GetArg("user")).FirstOrDefault();
                         var text = "";
-                        var avatar = await GetAvatar(usr.AvatarUrl);
+			var avatar = await GetAvatar(usr.AvatarUrl);
                         text = usr?.Name ?? e.GetArg("user");
                         var file = RipUser(text, avatar, string.IsNullOrWhiteSpace(e.GetArg("year"))
                                 ? null
@@ -204,7 +204,6 @@ namespace NadekoBot.Modules.Conversations
                         await e.Channel.SendFile("ripzor_m8.png",
                                             file);
                     });
-
                 if (!NadekoBot.Config.DontJoinServers)
                 {
                     cgb.CreateCommand("j")
@@ -321,6 +320,7 @@ namespace NadekoBot.Modules.Conversations
             });
         }
 
+
         /// <summary>
         /// Create a RIP image of the given name and avatar, with an optional year
         /// </summary>
@@ -332,16 +332,11 @@ namespace NadekoBot.Modules.Conversations
         {
             var bm = Resources.rip;
             var offset = name.Length * 2;
-
             var fontSize = 20;
-
             if (name.Length > 10)
             {
                 fontSize -= (name.Length - 10) / 2;
             }
-            //var avatar = Image.FromStream(await SearchHelper.GetResponseStreamAsync(aviLink));
-
-
 
             //TODO use measure string
             var g = Graphics.FromImage(bm);
@@ -354,7 +349,6 @@ namespace NadekoBot.Modules.Conversations
             g.Dispose();
 
             return bm.ToStream(ImageFormat.Png);
-
         }
 
 
@@ -375,9 +369,6 @@ namespace NadekoBot.Modules.Conversations
             return bmp;
 
         }
-
-
-
         private static Func<CommandEventArgs, Task> SayYes()
             => async e => await e.Channel.SendMessage("Yes. :)").ConfigureAwait(false);
     }