From f50b726dd0cd6389098dfdd987d35e8858283be6 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 4 May 2016 05:19:40 +0200 Subject: [PATCH] `!m gl` fix if song is queued with a link, commandlist update --- NadekoBot/Classes/SearchHelper.cs | 2 +- NadekoBot/Modules/Music/MusicModule.cs | 2 +- commandlist.md | 11 ++++++----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/NadekoBot/Classes/SearchHelper.cs b/NadekoBot/Classes/SearchHelper.cs index 62aa2c3e..b3e59574 100644 --- a/NadekoBot/Classes/SearchHelper.cs +++ b/NadekoBot/Classes/SearchHelper.cs @@ -156,7 +156,7 @@ namespace NadekoBot.Classes var match = new Regex("(?:youtu\\.be\\/|v=)(?[\\da-zA-Z\\-_]*)").Match(keywords); if (match.Length > 1) { - return $"http://www.youtube.com?v={match.Groups["id"].Value}"; + return $"https://www.youtube.com/watch?v={match.Groups["id"].Value}"; } var response = await GetResponseStringAsync( $"https://www.googleapis.com/youtube/v3/search?" + diff --git a/NadekoBot/Modules/Music/MusicModule.cs b/NadekoBot/Modules/Music/MusicModule.cs index 2950bc1b..d69f63b5 100644 --- a/NadekoBot/Modules/Music/MusicModule.cs +++ b/NadekoBot/Modules/Music/MusicModule.cs @@ -340,7 +340,7 @@ namespace NadekoBot.Modules.Music }); cgb.CreateCommand("lo") - .Description("Queues a local file by specifying a full path. **Owner Only!**\n**Usage**: `!m ra C:/music/mysong.mp3`") + .Description("Queues a local file by specifying a full path. **Owner Only!**\n**Usage**: `!m lo C:/music/mysong.mp3`") .Parameter("path", ParameterType.Unparsed) .AddCheck(SimpleCheckers.OwnerOnly()) .Do(async e => diff --git a/commandlist.md b/commandlist.md index 53a08730..8ad5c8d6 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.5967.5682` +Version: `NadekoBot v0.9.5967.41521` ### Administration Command and aliases | Description | Usage ----------------|--------------|------- @@ -54,6 +54,7 @@ Command and aliases | Description | Usage `.rch`, `.rtch` | Removes a text channel with a given name. `.ch`, `.tch` | Creates a new text channel with a given name. `.st`, `.settopic`, `.topic` | Sets a topic on the current channel. +`.schn`, `.setchannelname`, `.topic` | Changed the name of the current channel. `.uid`, `.userid` | Shows user ID. `.cid`, `.channelid` | Shows current channel ID. `.sid`, `.serverid` | Shows current server ID. @@ -217,7 +218,7 @@ Command and aliases | Description | Usage `!m pl` | Queues up to 50 songs from a youtube playlist specified by a link, or keywords. | `!m pl playlist link or name` `!m lopl` | Queues all songs from a directory. **Owner Only!** | `!m lopl C:/music/classical` `!m radio`, `!m ra` | Queues a radio stream from a link. It can be a direct mp3 radio stream, .m3u, .pls .asx or .xspf | `!m ra radio link here` -`!m lo` | Queues a local file by specifying a full path. **Owner Only!** | `!m ra C:/music/mysong.mp3` +`!m lo` | Queues a local file by specifying a full path. **Owner Only!** | `!m lo C:/music/mysong.mp3` `!m mv` | Moves the bot to your voice channel. (works only if music is already playing) | `!m mv` `!m rm` | Remove a song by its # in the queue, or 'all' to remove whole queue. | `!m rm 5` `!m cleanup` | Cleans up hanging voice connections. **Owner Only!** | `!m cleanup` @@ -246,7 +247,7 @@ Command and aliases | Description | Usage `~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. +`~randomcat`, `~meow` | Shows a random cat image. `~i` | Pulls the first image found using a search parameter. Use ~ir for different results. | ~i cute kitten `~ir` | Pulls a random image using a search parameter. | ~ir cute kitten `~lmgtfy` | Google something for an idiot. @@ -270,8 +271,8 @@ Command and aliases | Description | Usage `~hentai` | Shows a random NSFW hentai image from gelbooru and danbooru with a given tag. Tag is optional but preffered. (multiple tags are appended with +) | ~hentai yuri+kissing `~danbooru` | Shows a random hentai image from danbooru with a given tag. Tag is optional but preffered. (multiple tags are appended with +) | ~danbooru yuri+kissing `~gelbooru` | Shows a random hentai image from gelbooru with a given tag. Tag is optional but preffered. (multiple tags are appended with +) | ~gelbooru yuri+kissing -`~rule34` | Shows a random image from rule34.xx with a given tag. Tag is optional but preffered. (multiple tags are appended with +) | ~gelbooru yuri+kissing -`~e621` | Shows a random hentai image from e621.net with a given tag. Tag is optional but preffered. Use spaces for multiple tags. | ~e621 yuri+kissing +`~rule34` | Shows a random image from rule34.xx with a given tag. Tag is optional but preffered. (multiple tags are appended with +) | ~rule34 yuri+kissing +`~e621` | Shows a random hentai image from e621.net with a given tag. Tag is optional but preffered. Use spaces for multiple tags. | ~e621 yuri kissing `~cp` | We all know where this will lead you to. `~boobs` | Real adult content. `~butts`, `~ass`, `~butt` | Real adult content.