diff --git a/NadekoBot/Classes/DBHandler.cs b/NadekoBot/Classes/DBHandler.cs index e7d3d838..9fb664f9 100644 --- a/NadekoBot/Classes/DBHandler.cs +++ b/NadekoBot/Classes/DBHandler.cs @@ -198,7 +198,7 @@ Limit 20 OFFSET ?", num * 20); { using (var conn = new SQLiteConnection(FilePath)) { - return conn.Table().OrderBy(cs => -cs.Value).Take(n).ToList(); + return conn.Table().OrderByDescending(cs => cs.Value).Take(n).ToList(); } } } diff --git a/NadekoBot/Modules/Administration/AdministrationModule.cs b/NadekoBot/Modules/Administration/AdministrationModule.cs index 8095ad0a..36538813 100644 --- a/NadekoBot/Modules/Administration/AdministrationModule.cs +++ b/NadekoBot/Modules/Administration/AdministrationModule.cs @@ -79,7 +79,7 @@ namespace NadekoBot.Modules.Administration }); cgb.CreateCommand(Prefix + "restart") - .Description("Restarts the bot. Might not work.") + .Description("Restarts the bot. Might not work. **Bot Owner Only**") .AddCheck(SimpleCheckers.OwnerOnly()) .Do(async e => { diff --git a/NadekoBot/Modules/Administration/Commands/LogCommand.cs b/NadekoBot/Modules/Administration/Commands/LogCommand.cs index 8eac1b93..8f51c9e5 100644 --- a/NadekoBot/Modules/Administration/Commands/LogCommand.cs +++ b/NadekoBot/Modules/Administration/Commands/LogCommand.cs @@ -238,7 +238,7 @@ $@"🕔`{prettyCurrentTime}` **Message** 📝 `#{e.Channel.Name}` var config = SpecificConfigurations.Default.Of(e.Server.Id); try { - var chId = config.LogServerChannel; + var chId = config.LogPresenceChannel; if (chId != null) { Channel ch; @@ -365,6 +365,8 @@ $@"🕔`{prettyCurrentTime}` **Message** 📝 `#{e.Channel.Name}` Channel ch; if ((ch = e.Server.TextChannels.Where(tc => tc.Id == chId).FirstOrDefault()) == null) return; + + SpecificConfigurations.Default.Of (e.Server.Id).LogServerChannel = null; await e.Channel.SendMessage($"❗**NO LONGER LOGGING IN {ch.Mention} CHANNEL**❗").ConfigureAwait(false); }); @@ -373,14 +375,14 @@ $@"🕔`{prettyCurrentTime}` **Message** 📝 `#{e.Channel.Name}` .AddCheck(SimpleCheckers.ManageServer()) .Do(async e => { - var chId = SpecificConfigurations.Default.Of(e.Server.Id).LogServerChannel; + var chId = SpecificConfigurations.Default.Of(e.Server.Id).LogPresenceChannel; if (chId == null) { - SpecificConfigurations.Default.Of(e.Server.Id).LogServerChannel = e.Channel.Id; + SpecificConfigurations.Default.Of(e.Server.Id).LogPresenceChannel = e.Channel.Id; await e.Channel.SendMessage($"**User presence notifications enabled.**").ConfigureAwait(false); return; } - SpecificConfigurations.Default.Of(e.Server.Id).LogServerChannel = null; + SpecificConfigurations.Default.Of(e.Server.Id).LogPresenceChannel = null; await e.Channel.SendMessage($"**User presence notifications disabled.**").ConfigureAwait(false); }); diff --git a/NadekoBot/Modules/Music/Classes/MusicControls.cs b/NadekoBot/Modules/Music/Classes/MusicControls.cs index deb9bc2a..e1cd32bb 100644 --- a/NadekoBot/Modules/Music/Classes/MusicControls.cs +++ b/NadekoBot/Modules/Music/Classes/MusicControls.cs @@ -50,7 +50,7 @@ namespace NadekoBot.Modules.Music.Classes private bool Destroyed { get; set; } = false; public bool RepeatSong { get; private set; } = false; public bool RepeatPlaylist { get; private set; } = false; - public bool Autoplay { get; private set; } = false; + public bool Autoplay { get; set; } = false; public MusicPlayer(Channel startingVoiceChannel, float? defaultVolume) { diff --git a/NadekoBot/Modules/Music/MusicModule.cs b/NadekoBot/Modules/Music/MusicModule.cs index f2e2071a..a22bc843 100644 --- a/NadekoBot/Modules/Music/MusicModule.cs +++ b/NadekoBot/Modules/Music/MusicModule.cs @@ -58,7 +58,10 @@ namespace NadekoBot.Modules.Music MusicPlayer musicPlayer; if (!MusicPlayers.TryGetValue(e.Server, out musicPlayer)) return; if (e.User.VoiceChannel == musicPlayer.PlaybackVoiceChannel) + { + musicPlayer.Autoplay = false; musicPlayer.Stop(); + } }); cgb.CreateCommand("destroy") diff --git a/commandlist.md b/commandlist.md index 4e449351..68146587 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.6029.16666` +Version: `NadekoBot v0.9.6029.36463` ### Help Command and aliases | Description | Usage ----------------|--------------|------- @@ -54,7 +54,7 @@ Command and aliases | Description | Usage `.listincidents`, `.lin` | List all UNREAD incidents and flags them as read. `.listallincidents`, `.lain` | Sends you a file containing all incidents and flags them as read. `.delmsgoncmd` | Toggles the automatic deletion of user's successful command message to prevent chat flood. Server Manager Only. -`.restart` | Restarts the bot. Might not work. +`.restart` | Restarts the bot. Might not work. **Bot Owner Only** `.setrole`, `.sr` | Sets a role for a given user. | .sr @User Guest `.removerole`, `.rr` | Removes a role from a given user. | .rr @User Admin `.renamerole`, `.renr` | Renames a role. Role you are renaming must be lower than bot's highest role. | `.renr "First role" SecondRole` @@ -200,37 +200,37 @@ Command and aliases | Description | Usage ### Music Command and aliases | Description | Usage ----------------|--------------|------- -`! next`, `! n`, `! skip` | Goes to the next song in the queue. You have to be in the same voice channel as the bot. | `!m n` -`! stop`, `! s` | Stops the music and clears the playlist. Stays in the channel. | `!m s` -`! destroy`, `! d` | Completely stops the music and unbinds the bot from the channel. (may cause weird behaviour) | `!m d` -`! pause`, `! p` | Pauses or Unpauses the song. | `!m p` -`! queue`, `! q`, `! yq` | Queue a song using keywords or a link. Bot will join your voice channel.**You must be in a voice channel**. | `!m q Dream Of Venice` -`! listqueue`, `! lq` | Lists 15 currently queued songs per page. Default page is 1. | `!m lq` or `!m lq 2` -`! nowplaying`, `! np` | Shows the song currently playing. | `!m np` -`! volume`, `! vol` | Sets the music volume 0-100% | `!m vol 50` -`! defvol`, `! dv` | Sets the default music volume when music playback is started (0-100). Does not persist through restarts. | `!m dv 80` -`! mute`, `! min` | Sets the music volume to 0% | `!m min` -`! max` | Sets the music volume to 100% (real max is actually 150%). | `!m max` -`! half` | Sets the music volume to 50%. | `!m half` -`! shuffle`, `! sh` | Shuffles the current playlist. | `!m sh` -`! playlist`, `! pl` | Queues up to 50 songs from a youtube playlist specified by a link, or keywords. | `!m pl playlist link or name` -`! soundcloudpl`, `! scpl` | Queue a soundcloud playlist using a link. | `!m scpl https://soundcloud.com/saratology/sets/symphony` -`! localplaylst`, `! lopl` | Queues all songs from a directory. **Bot Owner Only!** | `!m lopl C:/music/classical` -`! radio`, `! 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` -`! local`, `! lo` | Queues a local file by specifying a full path. **Bot Owner Only!** | `!m lo C:/music/mysong.mp3` -`! move`, `! mv` | Moves the bot to your voice channel. (works only if music is already playing) | `!m mv` -`! remove`, `! rm` | Remove a song by its # in the queue, or 'all' to remove whole queue. | `!m rm 5` -`! movesong`, `! ms` | Moves a song from one position to another. | `! ms` 5>3 -`! cleanup` | Cleans up hanging voice connections. **Bot Owner Only!** | `!m cleanup` -`! reptcursong`, `! rcs` | Toggles repeat of current song. | `!m rcs` -`! rpeatplaylst`, `! rpl` | Toggles repeat of all songs in the queue (every song that finishes is added to the end of the queue). | `!m rpl` -`! save` | Saves a playlist under a certain name. Name must be no longer than 20 characters and mustn't contain dashes. | `!m save classical1` -`! load` | Loads a playlist under a certain name. | `!m load classical-1` -`! playlists`, `! pls` | Lists all playlists. Paginated. 20 per page. Default page is 0. | `!m pls 1` -`! deleteplaylist`, `! delpls` | Deletes a saved playlist. Only if you made it or if you are the bot owner. | `!m delpls animu-5` -`! goto` | Goes to a specific time in seconds in a song. -`! getlink`, `! gl` | Shows a link to the currently playing song. -`! autoplay`, `! ap` | Toggles autoplay - When the song is finished, automatically queue a related youtube song. (Works only for youtube songs and when queue is empty) +`!m next`, `!m n`, `!m skip` | Goes to the next song in the queue. You have to be in the same voice channel as the bot. | `!m n` +`!m stop`, `!m s` | Stops the music and clears the playlist. Stays in the channel. | `!m s` +`!m destroy`, `!m d` | Completely stops the music and unbinds the bot from the channel. (may cause weird behaviour) | `!m d` +`!m pause`, `!m p` | Pauses or Unpauses the song. | `!m p` +`!m queue`, `!m q`, `!m yq` | Queue a song using keywords or a link. Bot will join your voice channel.**You must be in a voice channel**. | `!m q Dream Of Venice` +`!m listqueue`, `!m lq` | Lists 15 currently queued songs per page. Default page is 1. | `!m lq` or `!m lq 2` +`!m nowplaying`, `!m np` | Shows the song currently playing. | `!m np` +`!m volume`, `!m vol` | Sets the music volume 0-100% | `!m vol 50` +`!m defvol`, `!m dv` | Sets the default music volume when music playback is started (0-100). Does not persist through restarts. | `!m dv 80` +`!m mute`, `!m min` | Sets the music volume to 0% | `!m min` +`!m max` | Sets the music volume to 100% (real max is actually 150%). | `!m max` +`!m half` | Sets the music volume to 50%. | `!m half` +`!m shuffle`, `!m sh` | Shuffles the current playlist. | `!m sh` +`!m playlist`, `!m pl` | Queues up to 50 songs from a youtube playlist specified by a link, or keywords. | `!m pl playlist link or name` +`!m soundcloudpl`, `!m scpl` | Queue a soundcloud playlist using a link. | `!m scpl https://soundcloud.com/saratology/sets/symphony` +`!m localplaylst`, `!m lopl` | Queues all songs from a directory. **Bot 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 local`, `!m lo` | Queues a local file by specifying a full path. **Bot Owner Only!** | `!m lo C:/music/mysong.mp3` +`!m move`, `!m mv` | Moves the bot to your voice channel. (works only if music is already playing) | `!m mv` +`!m remove`, `!m rm` | Remove a song by its # in the queue, or 'all' to remove whole queue. | `!m rm 5` +`!m movesong`, `!m ms` | Moves a song from one position to another. | `!m ms` 5>3 +`!m cleanup` | Cleans up hanging voice connections. **Bot Owner Only!** | `!m cleanup` +`!m reptcursong`, `!m rcs` | Toggles repeat of current song. | `!m rcs` +`!m rpeatplaylst`, `!m rpl` | Toggles repeat of all songs in the queue (every song that finishes is added to the end of the queue). | `!m rpl` +`!m save` | Saves a playlist under a certain name. Name must be no longer than 20 characters and mustn't contain dashes. | `!m save classical1` +`!m load` | Loads a playlist under a certain name. | `!m load classical-1` +`!m playlists`, `!m pls` | Lists all playlists. Paginated. 20 per page. Default page is 0. | `!m pls 1` +`!m deleteplaylist`, `!m delpls` | Deletes a saved playlist. Only if you made it or if you are the bot owner. | `!m delpls animu-5` +`!m goto` | Goes to a specific time in seconds in a song. +`!m getlink`, `!m gl` | Shows a link to the currently playing song. +`!m autoplay`, `!m ap` | Toggles autoplay - When the song is finished, automatically queue a related youtube song. (Works only for youtube songs and when queue is empty) ### Searches Command and aliases | Description | Usage