.gvc added

src/NadekoBot/Modules/Administration/Commands/GameChannelCommands.cs

@@ -0,0 +1,131 @@
+using Discord;
+using Discord.Commands;
+using Microsoft.EntityFrameworkCore;
+using NadekoBot.Attributes;
+using NadekoBot.Services;
+using NadekoBot.Services.Database;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Discord.WebSocket;
+using NLog;
+using NadekoBot.Extensions;
+
+namespace NadekoBot.Modules.Administration
+{
+    public partial class Administration
+    {
+        [Group]
+        public class GameChannelCommands : NadekoSubmodule
+        {
+            private static readonly Timer _t;
+
+            private static readonly ConcurrentHashSet<ulong> gameVoiceChannels = new ConcurrentHashSet<ulong>();
+
+            private static new readonly Logger _log;
+
+            static GameChannelCommands()
+            {
+                //_t = new Timer(_ => {
+
+                //}, null, );
+
+                _log = LogManager.GetCurrentClassLogger();
+
+                gameVoiceChannels = new ConcurrentHashSet<ulong>(
+                    NadekoBot.AllGuildConfigs.Where(gc => gc.GameVoiceChannel != null)
+                                             .Select(gc => gc.GameVoiceChannel.Value));
+
+                NadekoBot.Client.UserVoiceStateUpdated += Client_UserVoiceStateUpdated;
+
+            }
+
+            private static Task Client_UserVoiceStateUpdated(SocketUser usr, SocketVoiceState oldState, SocketVoiceState newState)
+            {
+                var _ = Task.Run(async () =>
+                {
+                    try
+                    {
+                        var gUser = usr as SocketGuildUser;
+                        if (gUser == null)
+                            return;
+
+                        var game = gUser.Game?.Name.TrimTo(50).ToLowerInvariant();
+
+                        if (oldState.VoiceChannel == newState.VoiceChannel ||
+                            newState.VoiceChannel == null)
+                            return;
+
+                        if (!gameVoiceChannels.Contains(newState.VoiceChannel.Id) ||
+                            string.IsNullOrWhiteSpace(game))
+                            return;
+
+                        var vch = gUser.Guild.VoiceChannels
+                            .FirstOrDefault(x => x.Name.ToLowerInvariant() == game);
+
+                        if (vch == null)
+                            return;
+
+                        await Task.Delay(1000).ConfigureAwait(false);
+                        await gUser.ModifyAsync(gu => gu.Channel = vch).ConfigureAwait(false);
+                    }
+                    catch (Exception ex)
+                    {
+                        _log.Warn(ex);
+                    }
+                });
+
+                return Task.CompletedTask;
+            }
+
+            [NadekoCommand, Usage, Description, Aliases]
+            [RequireContext(ContextType.Guild)]
+            [RequireUserPermission(GuildPermission.Administrator)]
+            [RequireBotPermission(GuildPermission.MoveMembers)]
+            public async Task GameVoiceChannel()
+            {
+                var vch = ((IGuildUser)Context.User).VoiceChannel;
+
+                if (vch == null)
+                {
+                    await ReplyErrorLocalized("not_in_voice").ConfigureAwait(false);
+                    return;
+                }
+                ulong? id;
+                using (var uow = DbHandler.UnitOfWork())
+                {
+                    var gc = uow.GuildConfigs.For(Context.Guild.Id, set => set);
+
+                    if (gc.GameVoiceChannel == vch.Id)
+                    {
+                        gameVoiceChannels.TryRemove(vch.Id);
+                        id = gc.GameVoiceChannel = null;
+                    }
+                    else
+                    {
+                        if(gc.GameVoiceChannel != null)
+                            gameVoiceChannels.TryRemove(gc.GameVoiceChannel.Value);
+                        gameVoiceChannels.Add(vch.Id);
+                        id = gc.GameVoiceChannel = vch.Id;
+                    }
+
+                    uow.Complete();
+                }
+
+                if (id == null)
+                {
+                    await ReplyConfirmLocalized("gvc_disabled").ConfigureAwait(false);
+                }
+                else
+                {
+                    gameVoiceChannels.Add(vch.Id);
+                    await ReplyConfirmLocalized("gvc_enabled", Format.Bold(vch.Name)).ConfigureAwait(false);
+                }
+            }
+        }
+    }
+}

src/NadekoBot/Modules/Gambling/Commands/FlowerShop.cs

@@ -140,7 +140,6 @@ namespace NadekoBot.Modules.Gambling
 
                             removed = uow.Complete();
                         }
-                        _log.Warn($"Removed {removed} items");
                         try
                         {
                             await (await Context.User.CreateDMChannelAsync())

src/NadekoBot/Modules/Music/Music.cs

@@ -20,7 +20,7 @@ namespace NadekoBot.Modules.Music
 {
     [NadekoModule("Music", "!!")]
     [DontAutoLoad]
-    public class Music : NadekoTopLevelModule
+    public class Music : NadekoTopLevelModule 
     {
         public static ConcurrentDictionary<ulong, MusicPlayer> MusicPlayers { get; } = new ConcurrentDictionary<ulong, MusicPlayer>();