mattburchett/NadekoBot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rip

Browse Source
This commit is contained in:
appelemac 2016-06-15 15:55:37 +02:00
parent c7ce776075
commit 6d0fe62094
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/NadekoBot/NadekoBot.scgdat
View File

Binary file not shown.

17
NadekoBot/Modules/Conversations/Conversations.cs
View File

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