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

!m gl fix if song is queued with a link, commandlist update

Browse Source
This commit is contained in:
Master Kwoth 2016-05-04 05:19:40 +02:00
parent f7e47f03d6
commit f50b726dd0
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NadekoBot/Classes/SearchHelper.cs
View File

@ -156,7 +156,7 @@ namespace NadekoBot.Classes
var match = new Regex("(?:youtu\\.be\\/|v=)(?<id>[\\da-zA-Z\\-_]*)").Match(keywords); var match = new Regex("(?:youtu\\.be\\/|v=)(?<id>[\\da-zA-Z\\-_]*)").Match(keywords);
if (match.Length > 1) 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( var response = await GetResponseStringAsync(
$"https://www.googleapis.com/youtube/v3/search?" + $"https://www.googleapis.com/youtube/v3/search?" +

2
NadekoBot/Modules/Music/MusicModule.cs
View File

@ -340,7 +340,7 @@ namespace NadekoBot.Modules.Music
}); });
cgb.CreateCommand("lo") 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) .Parameter("path", ParameterType.Unparsed)
.AddCheck(SimpleCheckers.OwnerOnly()) .AddCheck(SimpleCheckers.OwnerOnly())
.Do(async e => .Do(async e =>

11
commandlist.md
View File

@ -2,7 +2,7 @@
######You can donate on paypal: `nadekodiscordbot@gmail.com` or Bitcoin `17MZz1JAqME39akMLrVT4XBPffQJ2n1EPa` ######You can donate on paypal: `nadekodiscordbot@gmail.com` or Bitcoin `17MZz1JAqME39akMLrVT4XBPffQJ2n1EPa`
#NadekoBot List Of Commands #NadekoBot List Of Commands
Version: `NadekoBot v0.9.5967.5682` Version: `NadekoBot v0.9.5967.41521`
### Administration ### Administration
Command and aliases | Description | Usage Command and aliases | Description | Usage
----------------|--------------|------- ----------------|--------------|-------
@ -54,6 +54,7 @@ Command and aliases | Description | Usage
`.rch`, `.rtch` | Removes a text channel with a given name. `.rch`, `.rtch` | Removes a text channel with a given name.
`.ch`, `.tch` | Creates a new 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. `.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. `.uid`, `.userid` | Shows user ID.
`.cid`, `.channelid` | Shows current channel ID. `.cid`, `.channelid` | Shows current channel ID.
`.sid`, `.serverid` | Shows current server 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 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 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 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 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 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` `!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. `~ani`, `~anime`, `~aq` | Queries anilist for an anime and shows the first result.
`~imdb` | Queries imdb for movies or series, show 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. `~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 `~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 `~ir` | Pulls a random image using a search parameter. | ~ir cute kitten
`~lmgtfy` | Google something for an idiot. `~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 `~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 `~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 `~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 `~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 `~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. `~cp` | We all know where this will lead you to.
`~boobs` | Real adult content. `~boobs` | Real adult content.
`~butts`, `~ass`, `~butt` | Real adult content. `~butts`, `~ass`, `~butt` | Real adult content.