From c9c572296ae342ca34b023f326b96f9111d5dcdc Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 28 Mar 2016 02:58:34 +0200 Subject: [PATCH] commandlist update --- NadekoBot/Commands/LoLCommands.cs | 144 +++++++++++++++++++---------- NadekoBot/Modules/Conversations.cs | 17 ++-- commandlist.md | 33 ++++--- 3 files changed, 125 insertions(+), 69 deletions(-) diff --git a/NadekoBot/Commands/LoLCommands.cs b/NadekoBot/Commands/LoLCommands.cs index 09a49e92..4b706745 100644 --- a/NadekoBot/Commands/LoLCommands.cs +++ b/NadekoBot/Commands/LoLCommands.cs @@ -1,19 +1,22 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Discord.Commands; -using System.Drawing; +using Discord.Commands; using NadekoBot.Classes; using NadekoBot.Extensions; using NadekoBot.Modules; using Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; -namespace NadekoBot.Commands { - internal class LoLCommands : DiscordCommand { +namespace NadekoBot.Commands +{ + internal class LoLCommands : DiscordCommand + { - private class CachedChampion { + private class CachedChampion + { public System.IO.Stream ImageStream { get; set; } public DateTime AddedAt { get; set; } public string Name { get; set; } @@ -24,16 +27,20 @@ namespace NadekoBot.Commands { private System.Timers.Timer clearTimer { get; } = new System.Timers.Timer(); - public LoLCommands(DiscordModule module) : base(module) { + public LoLCommands(DiscordModule module) : base(module) + { clearTimer.Interval = new TimeSpan(0, 10, 0).TotalMilliseconds; clearTimer.Start(); - clearTimer.Elapsed += (s, e) => { - try { + clearTimer.Elapsed += (s, e) => + { + try + { lock (cacheLock) CachedChampionImages = CachedChampionImages .Where(kvp => DateTime.Now - kvp.Value.AddedAt > new TimeSpan(1, 0, 0)) .ToDictionary(kvp => kvp.Key, kvp => kvp.Value); - } catch { } + } + catch { } }; } @@ -44,11 +51,13 @@ namespace NadekoBot.Commands { "If you consider playing teemo, do it. If you consider teemo, you deserve him.", "Doesn't matter what you ban really. Enemy will ban your main and you will lose." }; - public Func DoFunc() { + public Func DoFunc() + { throw new NotImplementedException(); } - private class MatchupModel { + private class MatchupModel + { public int Games { get; set; } public float WinRate { get; set; } [Newtonsoft.Json.JsonProperty("key")] @@ -56,48 +65,60 @@ namespace NadekoBot.Commands { public float StatScore { get; set; } } - internal override void Init(CommandGroupBuilder cgb) { + internal override void Init(CommandGroupBuilder cgb) + { cgb.CreateCommand(Module.Prefix + "lolchamp") .Description("Shows League Of Legends champion statistics. If there are spaces/apostrophes or in the name - omit them. Optional second parameter is a role.\n**Usage**:~lolchamp Riven or ~lolchamp Annie sup") .Parameter("champ", ParameterType.Required) .Parameter("position", ParameterType.Unparsed) - .Do(async e => { - try { + .Do(async e => + { + try + { //get role var role = ResolvePos(e.GetArg("position")); var resolvedRole = role; var name = e.GetArg("champ").Replace(" ", "").ToLower(); CachedChampion champ = null; - lock (cacheLock) { + lock (cacheLock) + { CachedChampionImages.TryGetValue(name + "_" + resolvedRole, out champ); } - if (champ != null) { + if (champ != null) + { champ.ImageStream.Position = 0; await e.Channel.SendFile("champ.png", champ.ImageStream); return; } var allData = JArray.Parse(await Classes.SearchHelper.GetResponseStringAsync($"http://api.champion.gg/champion/{name}?api_key={NadekoBot.Creds.LOLAPIKey}")); JToken data = null; - if (role != null) { - for (var i = 0; i < allData.Count; i++) { - if (allData[i]["role"].ToString().Equals(role)) { + if (role != null) + { + for (var i = 0; i < allData.Count; i++) + { + if (allData[i]["role"].ToString().Equals(role)) + { data = allData[i]; break; } } - if (data == null) { + if (data == null) + { await e.Channel.SendMessage("💢 Data for that role does not exist."); return; } - } else { + } + else { data = allData[0]; role = allData[0]["role"].ToString(); resolvedRole = ResolvePos(role); } - lock (cacheLock) { + lock (cacheLock) + { CachedChampionImages.TryGetValue(name + "_" + resolvedRole, out champ); } - if (champ != null) { + if (champ != null) + { Console.WriteLine("Sending lol image from cache."); champ.ImageStream.Position = 0; await e.Channel.SendFile("champ.png", champ.ImageStream); @@ -106,7 +127,8 @@ namespace NadekoBot.Commands { //name = data["title"].ToString(); // get all possible roles, and "select" the shown one var roles = new string[allData.Count]; - for (var i = 0; i < allData.Count; i++) { + for (var i = 0; i < allData.Count; i++) + { roles[i] = allData[i]["role"].ToString(); if (roles[i] == role) roles[i] = ">" + roles[i] + "<"; @@ -114,14 +136,16 @@ namespace NadekoBot.Commands { var general = JArray.Parse(await SearchHelper.GetResponseStringAsync($"http://api.champion.gg/stats/" + $"champs/{name}?api_key={NadekoBot.Creds.LOLAPIKey}")) .FirstOrDefault(jt => jt["role"].ToString() == role)?["general"]; - if (general == null) { + if (general == null) + { Console.WriteLine("General is null."); return; } //get build data for this role var buildData = data["items"]["mostGames"]["items"]; var items = new string[6]; - for (var i = 0; i < 6; i++) { + for (var i = 0; i < 6; i++) + { items[i] = buildData[i]["id"].ToString(); } @@ -146,7 +170,8 @@ namespace NadekoBot.Commands { var orderArr = (data["skills"]["mostGames"]["order"] as JArray); var img = Image.FromFile("data/lol/bg.png"); - using (var g = Graphics.FromImage(img)) { + using (var g = Graphics.FromImage(img)) + { g.CompositingQuality = System.Drawing.Drawing2D.CompositingQuality.HighQuality; //g.CompositingMode = System.Drawing.Drawing2D.CompositingMode.SourceCopy; const int margin = 5; @@ -166,12 +191,14 @@ namespace NadekoBot.Commands { //draw skill order float orderFormula = 120 / orderArr.Count; const float orderVerticalSpacing = 10; - for (var i = 0; i < orderArr.Count; i++) { + for (var i = 0; i < orderArr.Count; i++) + { var orderX = margin + margin + imageSize + orderFormula * i + i; float orderY = margin + 35; var spellName = orderArr[i].ToString().ToLowerInvariant(); - switch (spellName) { + switch (spellName) + { case "w": orderY += orderVerticalSpacing; break; @@ -206,7 +233,8 @@ Assists: {general["assists"]} Ban: {general["banRate"]}% g.DrawString($"Best against", smallFont, Brushes.WhiteSmoke, margin, img.Height - imageSize + margin); var smallImgSize = 50; - for (var i = 0; i < counters.Length; i++) { + for (var i = 0; i < counters.Length; i++) + { g.DrawImage(GetImage(counters[i]), new Rectangle(i * (smallImgSize + margin) + margin, img.Height - smallImgSize - margin, smallImgSize, @@ -215,7 +243,8 @@ Assists: {general["assists"]} Ban: {general["banRate"]}% //draw countered by g.DrawString($"Worst against", smallFont, Brushes.WhiteSmoke, img.Width - 3 * (smallImgSize + margin), img.Height - imageSize + margin); - for (var i = 0; i < countered.Length; i++) { + for (var i = 0; i < countered.Length; i++) + { var j = countered.Length - i; g.DrawImage(GetImage(countered[i]), new Rectangle(img.Width - (j * (smallImgSize + margin) + margin), img.Height - smallImgSize - margin, @@ -225,7 +254,8 @@ Assists: {general["assists"]} Ban: {general["banRate"]}% //draw item build g.DrawString("Popular build", normalFont, Brushes.WhiteSmoke, img.Width - (3 * (smallImgSize + margin) + margin), 77); - for (var i = 0; i < 6; i++) { + for (var i = 0; i < 6; i++) + { var inverseI = 5 - i; var j = inverseI % 3 + 1; var k = inverseI / 3; @@ -238,18 +268,23 @@ Assists: {general["assists"]} Ban: {general["banRate"]}% var cachedChamp = new CachedChampion { AddedAt = DateTime.Now, ImageStream = img.ToStream(System.Drawing.Imaging.ImageFormat.Png), Name = name.ToLower() + "_" + resolvedRole }; CachedChampionImages.Add(cachedChamp.Name, cachedChamp); await e.Channel.SendFile(data["title"] + "_stats.png", cachedChamp.ImageStream); - } catch { + } + catch (Exception ex) + { + Console.WriteLine(ex); await e.Channel.SendMessage("💢 Failed retreiving data for that champion."); } }); cgb.CreateCommand(Module.Prefix + "lolban") .Description("Shows top 6 banned champions ordered by ban rate. Ban these champions and you will be Plat 5 in no time.") - .Do(async e => { + .Do(async e => + { var showCount = 6; //http://api.champion.gg/stats/champs/mostBanned?api_key=YOUR_API_TOKEN&page=1&limit=2 - try { + try + { var data = JObject.Parse( await Classes .SearchHelper @@ -260,7 +295,8 @@ Assists: {general["assists"]} Ban: {general["banRate"]}% var sb = new StringBuilder(); sb.AppendLine($"**Showing {showCount} top banned champions.**"); sb.AppendLine($"`{trashTalk[new Random().Next(0, trashTalk.Length)]}`"); - for (var i = 0; i < data.Count; i++) { + for (var i = 0; i < data.Count; i++) + { if (i % 2 == 0 && i != 0) sb.AppendLine(); sb.Append($"`{i + 1}.` **{data[i]["name"]}** "); @@ -268,34 +304,44 @@ Assists: {general["assists"]} Ban: {general["banRate"]}% } await e.Channel.SendMessage(sb.ToString()); - } catch (Exception ex) { + } + catch (Exception ex) + { await e.Channel.SendMessage($":anger: Fail: Champion.gg didsabled ban data until next patch. Sorry for the inconvenience."); } }); } - private enum GetImageType { + private enum GetImageType + { Champion, Item } - private static Image GetImage(string id, GetImageType imageType = GetImageType.Champion) { - try { - switch (imageType) { + private static Image GetImage(string id, GetImageType imageType = GetImageType.Champion) + { + try + { + switch (imageType) + { case GetImageType.Champion: return Image.FromFile($"data/lol/champions/{id}.png"); case GetImageType.Item: default: return Image.FromFile($"data/lol/items/{id}.png"); } - } catch (Exception) { + } + catch (Exception) + { return Image.FromFile("data/lol/_ERROR.png"); } } - private static string ResolvePos(string pos) { + private static string ResolvePos(string pos) + { if (string.IsNullOrWhiteSpace(pos)) return null; - switch (pos.ToLowerInvariant()) { + switch (pos.ToLowerInvariant()) + { case "m": case "mid": case "midorfeed": diff --git a/NadekoBot/Modules/Conversations.cs b/NadekoBot/Modules/Conversations.cs index a8ba0317..c3f8ecf1 100644 --- a/NadekoBot/Modules/Conversations.cs +++ b/NadekoBot/Modules/Conversations.cs @@ -1,18 +1,17 @@ using Discord; using Discord.Commands; using Discord.Modules; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using System.Diagnostics; -using System.Drawing; -using System.IO; -using System.Drawing.Imaging; using NadekoBot.Classes; +using NadekoBot.Commands; using NadekoBot.Extensions; using NadekoBot.Properties; -using NadekoBot.Commands; +using System; +using System.Diagnostics; +using System.Drawing; +using System.Drawing.Imaging; +using System.IO; +using System.Linq; +using System.Threading.Tasks; namespace NadekoBot.Modules { diff --git a/commandlist.md b/commandlist.md index 3fe3a9a1..681c48ba 100644 --- a/commandlist.md +++ b/commandlist.md @@ -2,7 +2,7 @@ ######You can donate on paypal: `nadekodiscordbot@gmail.com` or Bitcoin `17MZz1JAqME39akMLrVT4XBPffQJ2n1EPa` #NadekoBot List Of Commands -Version: `NadekoBot v0.9.5925.41065` +Version: `NadekoBot v0.9.5930.23184` ### Administration Command and aliases | Description | Usage ----------------|--------------|------- @@ -13,9 +13,9 @@ Command and aliases | Description | Usage `.byepm` | Toggles whether the good bye messages will be sent in a PM or in the text channel. `.greetpm` | Toggles whether the greet messages will be sent in a PM or in the text channel. `.spmom` | Toggles whether mentions of other offline users on your server will send a pm to them. -`.logserver` | Toggles logging in this channel. Logs every message sent/deleted/edited on the server. BOT OWNER ONLY. SERVER OWNER ONLY. -`.userpresence` | Starts logging to this channel when someone from the server goes online/offline/idle. BOT OWNER ONLY. SERVER OWNER ONLY. -`.voicepresence` | Toggles logging to this channel whenever someone joins or leaves a voice channel you are in right now. BOT OWNER ONLY. SERVER OWNER ONLY. +`.logserver` | Toggles logging in this channel. Logs every message sent/deleted/edited on the server. **Owner Only!** +`.userpresence` | Starts logging to this channel when someone from the server goes online/offline/idle. **Owner Only!** +`.voicepresence` | Toggles logging to this channel whenever someone joins or leaves a voice channel you are in right now. **Owner Only!** `.repeat` | Repeat a message every X minutes. If no parameters are specified, repeat is disabled. Requires manage messages. `.rotateplaying`, `.ropl` | Toggles rotation of playing status of the dynamic strings you specified earlier. `.addplaying`, `.adpl` | Adds a specified string to the list of playing strings to rotate. Supported placeholders: %servers%, %users%, %playing%, %queued%, %trivia% @@ -77,7 +77,7 @@ Command and aliases | Description | Usage Command and aliases | Description | Usage ----------------|--------------|------- `-h`, `-help`, `@BotName help`, `@BotName h`, `~h` | Either shows a help for a single command, or PMs you help link if no arguments are specified. | '-h !m q' or just '-h' -`-hgit` | OWNER ONLY commandlist.md file generation. +`-hgit` | Generates the commandlist.md file. **Owner Only!** `-readme`, `-guide` | Sends a readme and a guide links to the channel. `-donate`, `~donate` | Instructions for helping the project! `-modules`, `.modules` | List all bot modules. @@ -114,16 +114,19 @@ Command and aliases | Description | Usage `;arm`, `;allrolemodules` | Sets permissions for all modules at the role level. | ;arm [enable/disable] [role_name] `;arc`, `;allrolecommands` | Sets permissions for all commands from a certain module at the role level. | ;arc [module_name] [enable/disable] [role_name] `;ubl` | Blacklists a mentioned user. | ;ubl [user_mention] -`;uubl`, `;unblacklist` | Unblacklists a mentioned user. | ;uubl [user_mention] +`;uubl` | Unblacklists a mentioned user. | ;uubl [user_mention] `;cbl` | Blacklists a mentioned channel (#general for example). | ;ubl [channel_mention] +`;cubl` | Unblacklists a mentioned channel (#general for example). | ;cubl [channel_mention] `;sbl` | Blacklists a server by a name or id (#general for example). **BOT OWNER ONLY** | ;usl [servername/serverid] ### Conversations Command and aliases | Description | Usage ----------------|--------------|------- `e` | You did it. +`comeatmebro` | Come at me bro (ง’̀-‘́)ง | comeatmebro {target} `\o\` | Nadeko replies with /o/ `/o/` | Nadeko replies with \o\ +`moveto` | Suggests moving the conversation. | moveto #spam `..` | Adds a new quote with the specified name (single word) and message (no limit). | .. abc My message `...` | Shows a random quote with a specified name. | .. abc `@BotName copyme`, `@BotName cm` | Nadeko starts copying everything you say. Disable with cs @@ -155,7 +158,7 @@ Command and aliases | Description | Usage `@BotName dump` | Dumps all of the invites it can to dump.txt.** Owner Only.** `@BotName ab` | Try to get 'abalabahaha' `@BotName av`, `@BotName avatar` | Shows a mentioned person's avatar. | ~av @X -`@BotName leet` | Convert your text to leetspeak. Level is a number 1-6. | @BotName leet [level] [Your text here] +`@BotName leet` | ### Gambling Command and aliases | Description | Usage @@ -167,6 +170,7 @@ Command and aliases | Description | Usage `$nroll` | Rolls in a given range. | `$nroll 5` (rolls 0-5) or `$nroll 5-15` `$raffle` | Prints a name and ID of a random user from the online list from the (optional) role. `$$$` | Check how many NadekoFlowers you have. +`$give` | Give someone a certain amount of flowers ### Games Command and aliases | Description | Usage @@ -202,14 +206,14 @@ Command and aliases | Description | Usage `!m max` | Sets the music volume to 100% (real max is actually 150%). `!m half` | Sets the music volume to 50%. `!m sh` | Shuffles the current playlist. -`!m setgame` | Sets the game of the bot to the number of songs playing.**Owner only** +`!m setgame` | Sets the game of the bot to the number of songs playing. **Owner only** `!m pl` | Queues up to 25 songs from a youtube playlist specified by a link, or keywords. -`!m lopl` | Queues up to 50 songs from a directory. +`!m lopl` | Queues up to 50 songs from a directory. **Owner Only!** `!m radio`, `!m ra` | Queues a direct radio stream from a link. -`!m lo` | Queues a local file by specifying a full path. BOT OWNER ONLY. +`!m lo` | Queues a local file by specifying a full path. **Owner Only!** `!m mv` | Moves the bot to your voice channel. (works only if music is already playing) `!m rm` | Remove a song by its # in the queue, or 'all' to remove whole queue. -`!m cleanup` | Cleans up hanging voice connections. BOT OWNER ONLY +`!m cleanup` | Cleans up hanging voice connections. **Owner Only!** ### Searches Command and aliases | Description | Usage @@ -223,6 +227,7 @@ Command and aliases | Description | Usage `~we` | Shows weather data for a specified city and a country BOTH ARE REQUIRED. Weather api is very random if you make a mistake. `~yt` | Searches youtubes and shows the first result `~ani`, `~anime`, `~aq` | Queries anilist for an anime and shows the first result. +`~imdb` | Queries imdb for movies or series, show first result. `~mang`, `~manga`, `~mq` | Queries anilist for a manga and shows the first result. `~randomcat` | Shows a random cat image. `~i` | Pulls the first image found using a search parameter. Use ~ir for different results. | ~i cute kitten @@ -234,6 +239,12 @@ Command and aliases | Description | Usage `~#` | Searches Tagdef.com for a hashtag. | ~# ff `~quote` | Shows a random quote. +### Translator +Command and aliases | Description | Usage +----------------|--------------|------- +`~trans` | Translates from>to text. From the given language to the destiation language. +`~translangs` | List the valid languages for translation. + ### NSFW Command and aliases | Description | Usage ----------------|--------------|-------