Merge pull request #3 from Kwoth/1.0

1.0 update

discord.net

@@ -1 +1 @@
-Subproject commit e8550fa462f86e0338925547dfe99242bfc1fdcc
+Subproject commit b51408def863ee5f4273478efa65eb50e4008487

src/NadekoBot/Attributes/LocalizedAlias.cs

@@ -0,0 +1,18 @@
+using Discord.Commands;
+using NadekoBot.Services;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace NadekoBot.Attributes
+{
+    public class LocalizedAliasAttribute : AliasAttribute
+    {
+        public LocalizedAliasAttribute([CallerMemberName] string memberName = "") : base(Localization.LoadCommandString(memberName.ToLowerInvariant() + "_text").Split(' ').Skip(1).ToArray())
+        {
+        }
+    }
+}

src/NadekoBot/Attributes/LocalizedCommand.cs

@@ -1,12 +1,13 @@
 using Discord.Commands;
 using NadekoBot.Services;
+using System.Linq;
 using System.Runtime.CompilerServices;
 
 namespace NadekoBot.Attributes
 {
     public class LocalizedCommandAttribute : CommandAttribute
     {
-        public LocalizedCommandAttribute([CallerMemberName] string memberName="") : base(Localization.LoadCommandString(memberName.ToLowerInvariant() + "_text"))
+        public LocalizedCommandAttribute([CallerMemberName] string memberName="") : base(Localization.LoadCommandString(memberName.ToLowerInvariant() + "_text").Split(' ')[0])
         {
 
         }

src/NadekoBot/Attributes/NadekoModule.cs

@@ -0,0 +1,52 @@
+using Discord.Commands;
+using NadekoBot.Services;
+using NadekoBot.Services.Database;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace NadekoBot.Attributes
+{
+    [System.AttributeUsage(AttributeTargets.Class)]
+    sealed class NadekoModuleAttribute : ModuleAttribute
+    {
+        //modulename / prefix
+        private static Dictionary<string, string> modulePrefixes = null;
+        public static Dictionary<string, string> ModulePrefixes {
+            get {
+                if (modulePrefixes != null)
+                    return modulePrefixes;
+
+                using (var uow = DbHandler.UnitOfWork())
+                {
+                    return (modulePrefixes = uow.BotConfig
+                                                .GetOrCreate()
+                                                .ModulePrefixes
+                                                .ToDictionary(p => p.ModuleName, p => p.Prefix));
+                }
+            }
+        }
+
+        public NadekoModuleAttribute(string moduleName, string defaultPrefix) : base(GetModulePrefix(moduleName) ?? defaultPrefix)
+        {
+            AppendSpace = false;
+        }
+
+        private static string GetModulePrefix(string moduleName)
+        {
+            string prefix;
+            if (ModulePrefixes.TryGetValue(moduleName, out prefix))
+            {
+                Console.WriteLine("Cache hit");
+                return prefix;
+            }
+
+            Console.WriteLine("Cache not hit for " + moduleName);
+            return null;
+        }
+    }
+}
+

src/NadekoBot/Migrations/20160910180231_first.Designer.cs

@@ -8,7 +8,7 @@ using NadekoBot.Services.Database.Impl;
 namespace NadekoBot.Migrations
 {
     [DbContext(typeof(NadekoSqliteContext))]
-    [Migration("20160828000228_first")]
+    [Migration("20160910180231_first")]
     partial class first
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -39,6 +39,10 @@ namespace NadekoBot.Migrations
 
                     b.Property<ulong>("BufferSize");
 
+                    b.Property<float>("CurrencyGenerationChance");
+
+                    b.Property<int>("CurrencyGenerationCooldown");
+
                     b.Property<string>("CurrencyName");
 
                     b.Property<string>("CurrencyPluralName");
@@ -104,6 +108,39 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
+            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("InternalTrigger");
+
+                    b.Property<decimal>("Modifier");
+
+                    b.Property<string>("UnitType");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ConversionUnits");
+                });
+
+            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<long>("Amount");
+
+                    b.Property<ulong>("UserId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("Currency");
+                });
+
             modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
@@ -136,7 +173,31 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("BotConfigId");
 
-                    b.ToTable("EightBallResponse");
+                    b.ToTable("EightBallResponses");
+                });
+
+            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<ulong>("ChannelId");
+
+                    b.Property<int?>("GuildConfigId");
+
+                    b.Property<ulong>("GuildId");
+
+                    b.Property<bool>("LastStatus");
+
+                    b.Property<int>("Type");
+
+                    b.Property<string>("Username");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GuildConfigId");
+
+                    b.ToTable("FollowedStream");
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
@@ -160,36 +221,122 @@ namespace NadekoBot.Migrations
 
                     b.Property<string>("ChannelGreetMessageText");
 
+                    b.Property<float>("DefaultMusicVolume");
+
                     b.Property<bool>("DeleteMessageOnCommand");
 
                     b.Property<string>("DmGreetMessageText");
 
                     b.Property<bool>("ExclusiveSelfAssignedRoles");
 
+                    b.Property<ulong?>("GenerateCurrencyChannelId");
+
                     b.Property<ulong>("GreetMessageChannelId");
 
                     b.Property<ulong>("GuildId");
 
+                    b.Property<int?>("LogSettingId");
+
                     b.Property<bool>("SendChannelByeMessage");
 
                     b.Property<bool>("SendChannelGreetMessage");
 
                     b.Property<bool>("SendDmGreetMessage");
 
+                    b.Property<bool>("VoicePlusTextEnabled");
+
                     b.HasKey("Id");
 
                     b.HasIndex("GuildId")
                         .IsUnique();
 
+                    b.HasIndex("LogSettingId");
+
                     b.ToTable("GuildConfigs");
                 });
 
+            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<ulong>("ChannelId");
+
+                    b.Property<int?>("LogSettingId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("LogSettingId");
+
+                    b.ToTable("IgnoredLogChannels");
+                });
+
+            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<ulong>("ChannelId");
+
+                    b.Property<int?>("LogSettingId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("LogSettingId");
+
+                    b.ToTable("IgnoredVoicePresenceCHannels");
+                });
+
+            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool>("ChannelCreated");
+
+                    b.Property<bool>("ChannelDestroyed");
+
+                    b.Property<ulong>("ChannelId");
+
+                    b.Property<bool>("ChannelUpdated");
+
+                    b.Property<bool>("IsLogging");
+
+                    b.Property<bool>("LogUserPresence");
+
+                    b.Property<bool>("LogVoicePresence");
+
+                    b.Property<bool>("MessageDeleted");
+
+                    b.Property<bool>("MessageReceived");
+
+                    b.Property<bool>("MessageUpdated");
+
+                    b.Property<bool>("UserBanned");
+
+                    b.Property<bool>("UserJoined");
+
+                    b.Property<bool>("UserLeft");
+
+                    b.Property<ulong>("UserPresenceChannelId");
+
+                    b.Property<bool>("UserUnbanned");
+
+                    b.Property<bool>("UserUpdated");
+
+                    b.Property<ulong>("VoicePresenceChannelId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("LogSettings");
+                });
+
             modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
 
-                    b.Property<int?>("BotConfigId");
+                    b.Property<int>("BotConfigId");
 
                     b.Property<string>("ModuleName");
 
@@ -199,7 +346,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("BotConfigId");
 
-                    b.ToTable("ModulePrefix");
+                    b.ToTable("ModulePrefixes");
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
@@ -256,7 +403,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("BotConfigId");
 
-                    b.ToTable("RaceAnimal");
+                    b.ToTable("RaceAnimals");
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
@@ -281,6 +428,27 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
+            modelBuilder.Entity("NadekoBot.Services.Database.Models.Repeater", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<ulong>("ChannelId");
+
+                    b.Property<ulong>("GuildId");
+
+                    b.Property<TimeSpan>("Interval");
+
+                    b.Property<string>("Message");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ChannelId")
+                        .IsUnique();
+
+                    b.ToTable("Repeaters");
+                });
+
             modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
@@ -298,6 +466,20 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
+            modelBuilder.Entity("NadekoBot.Services.Database.Models.TypingArticle", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Author");
+
+                    b.Property<string>("Text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TypingArticles");
+                });
+
             modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
@@ -320,11 +502,40 @@ namespace NadekoBot.Migrations
                         .HasForeignKey("BotConfigId");
                 });
 
+            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+                {
+                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                        .WithMany("FollowedStreams")
+                        .HasForeignKey("GuildConfigId");
+                });
+
+            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+                {
+                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                        .WithMany()
+                        .HasForeignKey("LogSettingId");
+                });
+
+            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+                {
+                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                        .WithMany("IgnoredChannels")
+                        .HasForeignKey("LogSettingId");
+                });
+
+            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+                {
+                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                        .WithMany("IgnoredVoicePresenceChannelIds")
+                        .HasForeignKey("LogSettingId");
+                });
+
             modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig", "BotConfig")
                         .WithMany("ModulePrefixes")
-                        .HasForeignKey("BotConfigId");
+                        .HasForeignKey("BotConfigId")
+                        .OnDelete(DeleteBehavior.Cascade);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>

src/NadekoBot/Migrations/20160910180231_first.cs

@@ -15,6 +15,8 @@ namespace NadekoBot.Migrations
                     Id = table.Column<int>(nullable: false)
                         .Annotation("Autoincrement", true),
                     BufferSize = table.Column<ulong>(nullable: false),
+                    CurrencyGenerationChance = table.Column<float>(nullable: false),
+                    CurrencyGenerationCooldown = table.Column<int>(nullable: false),
                     CurrencyName = table.Column<string>(nullable: true),
                     CurrencyPluralName = table.Column<string>(nullable: true),
                     CurrencySign = table.Column<string>(nullable: true),
@@ -47,6 +49,35 @@ namespace NadekoBot.Migrations
                     table.PrimaryKey("PK_ClashOfClans", x => x.Id);
                 });
 
+            migrationBuilder.CreateTable(
+                name: "ConversionUnits",
+                columns: table => new
+                {
+                    Id = table.Column<int>(nullable: false)
+                        .Annotation("Autoincrement", true),
+                    InternalTrigger = table.Column<string>(nullable: true),
+                    Modifier = table.Column<decimal>(nullable: false),
+                    UnitType = table.Column<string>(nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_ConversionUnits", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Currency",
+                columns: table => new
+                {
+                    Id = table.Column<int>(nullable: false)
+                        .Annotation("Autoincrement", true),
+                    Amount = table.Column<long>(nullable: false),
+                    UserId = table.Column<ulong>(nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Currency", x => x.Id);
+                });
+
             migrationBuilder.CreateTable(
                 name: "Donators",
                 columns: table => new
@@ -63,31 +94,32 @@ namespace NadekoBot.Migrations
                 });
 
             migrationBuilder.CreateTable(
-                name: "GuildConfigs",
+                name: "LogSettings",
                 columns: table => new
                 {
                     Id = table.Column<int>(nullable: false)
                         .Annotation("Autoincrement", true),
-                    AutoAssignRoleId = table.Column<ulong>(nullable: false),
-                    AutoDeleteByeMessages = table.Column<bool>(nullable: false),
-                    AutoDeleteGreetMessages = table.Column<bool>(nullable: false),
-                    AutoDeleteGreetMessagesTimer = table.Column<int>(nullable: false),
-                    AutoDeleteSelfAssignedRoleMessages = table.Column<bool>(nullable: false),
-                    ByeMessageChannelId = table.Column<ulong>(nullable: false),
-                    ChannelByeMessageText = table.Column<string>(nullable: true),
-                    ChannelGreetMessageText = table.Column<string>(nullable: true),
-                    DeleteMessageOnCommand = table.Column<bool>(nullable: false),
-                    DmGreetMessageText = table.Column<string>(nullable: true),
-                    ExclusiveSelfAssignedRoles = table.Column<bool>(nullable: false),
-                    GreetMessageChannelId = table.Column<ulong>(nullable: false),
-                    GuildId = table.Column<ulong>(nullable: false),
-                    SendChannelByeMessage = table.Column<bool>(nullable: false),
-                    SendChannelGreetMessage = table.Column<bool>(nullable: false),
-                    SendDmGreetMessage = table.Column<bool>(nullable: false)
+                    ChannelCreated = table.Column<bool>(nullable: false),
+                    ChannelDestroyed = table.Column<bool>(nullable: false),
+                    ChannelId = table.Column<ulong>(nullable: false),
+                    ChannelUpdated = table.Column<bool>(nullable: false),
+                    IsLogging = table.Column<bool>(nullable: false),
+                    LogUserPresence = table.Column<bool>(nullable: false),
+                    LogVoicePresence = table.Column<bool>(nullable: false),
+                    MessageDeleted = table.Column<bool>(nullable: false),
+                    MessageReceived = table.Column<bool>(nullable: false),
+                    MessageUpdated = table.Column<bool>(nullable: false),
+                    UserBanned = table.Column<bool>(nullable: false),
+                    UserJoined = table.Column<bool>(nullable: false),
+                    UserLeft = table.Column<bool>(nullable: false),
+                    UserPresenceChannelId = table.Column<ulong>(nullable: false),
+                    UserUnbanned = table.Column<bool>(nullable: false),
+                    UserUpdated = table.Column<bool>(nullable: false),
+                    VoicePresenceChannelId = table.Column<ulong>(nullable: false)
                 },
                 constraints: table =>
                 {
-                    table.PrimaryKey("PK_GuildConfigs", x => x.Id);
+                    table.PrimaryKey("PK_LogSettings", x => x.Id);
                 });
 
             migrationBuilder.CreateTable(
@@ -125,6 +157,22 @@ namespace NadekoBot.Migrations
                     table.PrimaryKey("PK_Reminders", x => x.Id);
                 });
 
+            migrationBuilder.CreateTable(
+                name: "Repeaters",
+                columns: table => new
+                {
+                    Id = table.Column<int>(nullable: false)
+                        .Annotation("Autoincrement", true),
+                    ChannelId = table.Column<ulong>(nullable: false),
+                    GuildId = table.Column<ulong>(nullable: false),
+                    Interval = table.Column<TimeSpan>(nullable: false),
+                    Message = table.Column<string>(nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Repeaters", x => x.Id);
+                });
+
             migrationBuilder.CreateTable(
                 name: "SelfAssignableRoles",
                 columns: table => new
@@ -139,6 +187,20 @@ namespace NadekoBot.Migrations
                     table.PrimaryKey("PK_SelfAssignableRoles", x => x.Id);
                 });
 
+            migrationBuilder.CreateTable(
+                name: "TypingArticles",
+                columns: table => new
+                {
+                    Id = table.Column<int>(nullable: false)
+                        .Annotation("Autoincrement", true),
+                    Author = table.Column<string>(nullable: true),
+                    Text = table.Column<string>(nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_TypingArticles", x => x.Id);
+                });
+
             migrationBuilder.CreateTable(
                 name: "BlacklistItem",
                 columns: table => new
@@ -160,7 +222,7 @@ namespace NadekoBot.Migrations
                 });
 
             migrationBuilder.CreateTable(
-                name: "EightBallResponse",
+                name: "EightBallResponses",
                 columns: table => new
                 {
                     Id = table.Column<int>(nullable: false)
@@ -170,9 +232,9 @@ namespace NadekoBot.Migrations
                 },
                 constraints: table =>
                 {
-                    table.PrimaryKey("PK_EightBallResponse", x => x.Id);
+                    table.PrimaryKey("PK_EightBallResponses", x => x.Id);
                     table.ForeignKey(
-                        name: "FK_EightBallResponse_BotConfig_BotConfigId",
+                        name: "FK_EightBallResponses_BotConfig_BotConfigId",
                         column: x => x.BotConfigId,
                         principalTable: "BotConfig",
                         principalColumn: "Id",
@@ -180,24 +242,24 @@ namespace NadekoBot.Migrations
                 });
 
             migrationBuilder.CreateTable(
-                name: "ModulePrefix",
+                name: "ModulePrefixes",
                 columns: table => new
                 {
                     Id = table.Column<int>(nullable: false)
                         .Annotation("Autoincrement", true),
-                    BotConfigId = table.Column<int>(nullable: true),
+                    BotConfigId = table.Column<int>(nullable: false),
                     ModuleName = table.Column<string>(nullable: true),
                     Prefix = table.Column<string>(nullable: true)
                 },
                 constraints: table =>
                 {
-                    table.PrimaryKey("PK_ModulePrefix", x => x.Id);
+                    table.PrimaryKey("PK_ModulePrefixes", x => x.Id);
                     table.ForeignKey(
-                        name: "FK_ModulePrefix_BotConfig_BotConfigId",
+                        name: "FK_ModulePrefixes_BotConfig_BotConfigId",
                         column: x => x.BotConfigId,
                         principalTable: "BotConfig",
                         principalColumn: "Id",
-                        onDelete: ReferentialAction.Restrict);
+                        onDelete: ReferentialAction.Cascade);
                 });
 
             migrationBuilder.CreateTable(
@@ -221,7 +283,7 @@ namespace NadekoBot.Migrations
                 });
 
             migrationBuilder.CreateTable(
-                name: "RaceAnimal",
+                name: "RaceAnimals",
                 columns: table => new
                 {
                     Id = table.Column<int>(nullable: false)
@@ -232,9 +294,9 @@ namespace NadekoBot.Migrations
                 },
                 constraints: table =>
                 {
-                    table.PrimaryKey("PK_RaceAnimal", x => x.Id);
+                    table.PrimaryKey("PK_RaceAnimals", x => x.Id);
                     table.ForeignKey(
-                        name: "FK_RaceAnimal_BotConfig_BotConfigId",
+                        name: "FK_RaceAnimals_BotConfig_BotConfigId",
                         column: x => x.BotConfigId,
                         principalTable: "BotConfig",
                         principalColumn: "Id",
@@ -264,6 +326,108 @@ namespace NadekoBot.Migrations
                         onDelete: ReferentialAction.Cascade);
                 });
 
+            migrationBuilder.CreateTable(
+                name: "GuildConfigs",
+                columns: table => new
+                {
+                    Id = table.Column<int>(nullable: false)
+                        .Annotation("Autoincrement", true),
+                    AutoAssignRoleId = table.Column<ulong>(nullable: false),
+                    AutoDeleteByeMessages = table.Column<bool>(nullable: false),
+                    AutoDeleteGreetMessages = table.Column<bool>(nullable: false),
+                    AutoDeleteGreetMessagesTimer = table.Column<int>(nullable: false),
+                    AutoDeleteSelfAssignedRoleMessages = table.Column<bool>(nullable: false),
+                    ByeMessageChannelId = table.Column<ulong>(nullable: false),
+                    ChannelByeMessageText = table.Column<string>(nullable: true),
+                    ChannelGreetMessageText = table.Column<string>(nullable: true),
+                    DefaultMusicVolume = table.Column<float>(nullable: false),
+                    DeleteMessageOnCommand = table.Column<bool>(nullable: false),
+                    DmGreetMessageText = table.Column<string>(nullable: true),
+                    ExclusiveSelfAssignedRoles = table.Column<bool>(nullable: false),
+                    GenerateCurrencyChannelId = table.Column<ulong>(nullable: true),
+                    GreetMessageChannelId = table.Column<ulong>(nullable: false),
+                    GuildId = table.Column<ulong>(nullable: false),
+                    LogSettingId = table.Column<int>(nullable: true),
+                    SendChannelByeMessage = table.Column<bool>(nullable: false),
+                    SendChannelGreetMessage = table.Column<bool>(nullable: false),
+                    SendDmGreetMessage = table.Column<bool>(nullable: false),
+                    VoicePlusTextEnabled = table.Column<bool>(nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_GuildConfigs", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_GuildConfigs_LogSettings_LogSettingId",
+                        column: x => x.LogSettingId,
+                        principalTable: "LogSettings",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Restrict);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "IgnoredLogChannels",
+                columns: table => new
+                {
+                    Id = table.Column<int>(nullable: false)
+                        .Annotation("Autoincrement", true),
+                    ChannelId = table.Column<ulong>(nullable: false),
+                    LogSettingId = table.Column<int>(nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_IgnoredLogChannels", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_IgnoredLogChannels_LogSettings_LogSettingId",
+                        column: x => x.LogSettingId,
+                        principalTable: "LogSettings",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Restrict);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "IgnoredVoicePresenceCHannels",
+                columns: table => new
+                {
+                    Id = table.Column<int>(nullable: false)
+                        .Annotation("Autoincrement", true),
+                    ChannelId = table.Column<ulong>(nullable: false),
+                    LogSettingId = table.Column<int>(nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_IgnoredVoicePresenceCHannels", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_IgnoredVoicePresenceCHannels_LogSettings_LogSettingId",
+                        column: x => x.LogSettingId,
+                        principalTable: "LogSettings",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Restrict);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "FollowedStream",
+                columns: table => new
+                {
+                    Id = table.Column<int>(nullable: false)
+                        .Annotation("Autoincrement", true),
+                    ChannelId = table.Column<ulong>(nullable: false),
+                    GuildConfigId = table.Column<int>(nullable: true),
+                    GuildId = table.Column<ulong>(nullable: false),
+                    LastStatus = table.Column<bool>(nullable: false),
+                    Type = table.Column<int>(nullable: false),
+                    Username = table.Column<string>(nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_FollowedStream", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_FollowedStream_GuildConfigs_GuildConfigId",
+                        column: x => x.GuildConfigId,
+                        principalTable: "GuildConfigs",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Restrict);
+                });
+
             migrationBuilder.CreateIndex(
                 name: "IX_BlacklistItem_BotConfigId",
                 table: "BlacklistItem",
@@ -274,6 +438,12 @@ namespace NadekoBot.Migrations
                 table: "ClashCallers",
                 column: "ClashWarId");
 
+            migrationBuilder.CreateIndex(
+                name: "IX_Currency_UserId",
+                table: "Currency",
+                column: "UserId",
+                unique: true);
+
             migrationBuilder.CreateIndex(
                 name: "IX_Donators_UserId",
                 table: "Donators",
@@ -281,10 +451,15 @@ namespace NadekoBot.Migrations
                 unique: true);
 
             migrationBuilder.CreateIndex(
-                name: "IX_EightBallResponse_BotConfigId",
-                table: "EightBallResponse",
+                name: "IX_EightBallResponses_BotConfigId",
+                table: "EightBallResponses",
                 column: "BotConfigId");
 
+            migrationBuilder.CreateIndex(
+                name: "IX_FollowedStream_GuildConfigId",
+                table: "FollowedStream",
+                column: "GuildConfigId");
+
             migrationBuilder.CreateIndex(
                 name: "IX_GuildConfigs_GuildId",
                 table: "GuildConfigs",
@@ -292,8 +467,23 @@ namespace NadekoBot.Migrations
                 unique: true);
 
             migrationBuilder.CreateIndex(
-                name: "IX_ModulePrefix_BotConfigId",
-                table: "ModulePrefix",
+                name: "IX_GuildConfigs_LogSettingId",
+                table: "GuildConfigs",
+                column: "LogSettingId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_IgnoredLogChannels_LogSettingId",
+                table: "IgnoredLogChannels",
+                column: "LogSettingId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_IgnoredVoicePresenceCHannels_LogSettingId",
+                table: "IgnoredVoicePresenceCHannels",
+                column: "LogSettingId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ModulePrefixes_BotConfigId",
+                table: "ModulePrefixes",
                 column: "BotConfigId");
 
             migrationBuilder.CreateIndex(
@@ -302,10 +492,16 @@ namespace NadekoBot.Migrations
                 column: "BotConfigId");
 
             migrationBuilder.CreateIndex(
-                name: "IX_RaceAnimal_BotConfigId",
-                table: "RaceAnimal",
+                name: "IX_RaceAnimals_BotConfigId",
+                table: "RaceAnimals",
                 column: "BotConfigId");
 
+            migrationBuilder.CreateIndex(
+                name: "IX_Repeaters_ChannelId",
+                table: "Repeaters",
+                column: "ChannelId",
+                unique: true);
+
             migrationBuilder.CreateIndex(
                 name: "IX_SelfAssignableRoles_GuildId_RoleId",
                 table: "SelfAssignableRoles",
@@ -321,17 +517,29 @@ namespace NadekoBot.Migrations
             migrationBuilder.DropTable(
                 name: "ClashCallers");
 
+            migrationBuilder.DropTable(
+                name: "ConversionUnits");
+
+            migrationBuilder.DropTable(
+                name: "Currency");
+
             migrationBuilder.DropTable(
                 name: "Donators");
 
             migrationBuilder.DropTable(
-                name: "EightBallResponse");
+                name: "EightBallResponses");
 
             migrationBuilder.DropTable(
-                name: "GuildConfigs");
+                name: "FollowedStream");
 
             migrationBuilder.DropTable(
-                name: "ModulePrefix");
+                name: "IgnoredLogChannels");
+
+            migrationBuilder.DropTable(
+                name: "IgnoredVoicePresenceCHannels");
+
+            migrationBuilder.DropTable(
+                name: "ModulePrefixes");
 
             migrationBuilder.DropTable(
                 name: "PlayingStatus");
@@ -340,19 +548,31 @@ namespace NadekoBot.Migrations
                 name: "Quotes");
 
             migrationBuilder.DropTable(
-                name: "RaceAnimal");
+                name: "RaceAnimals");
 
             migrationBuilder.DropTable(
                 name: "Reminders");
 
+            migrationBuilder.DropTable(
+                name: "Repeaters");
+
             migrationBuilder.DropTable(
                 name: "SelfAssignableRoles");
 
+            migrationBuilder.DropTable(
+                name: "TypingArticles");
+
             migrationBuilder.DropTable(
                 name: "ClashOfClans");
 
+            migrationBuilder.DropTable(
+                name: "GuildConfigs");
+
             migrationBuilder.DropTable(
                 name: "BotConfig");
+
+            migrationBuilder.DropTable(
+                name: "LogSettings");
         }
     }
 }

src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs

@@ -38,6 +38,10 @@ namespace NadekoBot.Migrations
 
                     b.Property<ulong>("BufferSize");
 
+                    b.Property<float>("CurrencyGenerationChance");
+
+                    b.Property<int>("CurrencyGenerationCooldown");
+
                     b.Property<string>("CurrencyName");
 
                     b.Property<string>("CurrencyPluralName");
@@ -103,6 +107,39 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
+            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("InternalTrigger");
+
+                    b.Property<decimal>("Modifier");
+
+                    b.Property<string>("UnitType");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ConversionUnits");
+                });
+
+            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<long>("Amount");
+
+                    b.Property<ulong>("UserId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("Currency");
+                });
+
             modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
@@ -135,7 +172,31 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("BotConfigId");
 
-                    b.ToTable("EightBallResponse");
+                    b.ToTable("EightBallResponses");
+                });
+
+            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<ulong>("ChannelId");
+
+                    b.Property<int?>("GuildConfigId");
+
+                    b.Property<ulong>("GuildId");
+
+                    b.Property<bool>("LastStatus");
+
+                    b.Property<int>("Type");
+
+                    b.Property<string>("Username");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GuildConfigId");
+
+                    b.ToTable("FollowedStream");
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
@@ -159,36 +220,122 @@ namespace NadekoBot.Migrations
 
                     b.Property<string>("ChannelGreetMessageText");
 
+                    b.Property<float>("DefaultMusicVolume");
+
                     b.Property<bool>("DeleteMessageOnCommand");
 
                     b.Property<string>("DmGreetMessageText");
 
                     b.Property<bool>("ExclusiveSelfAssignedRoles");
 
+                    b.Property<ulong?>("GenerateCurrencyChannelId");
+
                     b.Property<ulong>("GreetMessageChannelId");
 
                     b.Property<ulong>("GuildId");
 
+                    b.Property<int?>("LogSettingId");
+
                     b.Property<bool>("SendChannelByeMessage");
 
                     b.Property<bool>("SendChannelGreetMessage");
 
                     b.Property<bool>("SendDmGreetMessage");
 
+                    b.Property<bool>("VoicePlusTextEnabled");
+
                     b.HasKey("Id");
 
                     b.HasIndex("GuildId")
                         .IsUnique();
 
+                    b.HasIndex("LogSettingId");
+
                     b.ToTable("GuildConfigs");
                 });
 
+            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<ulong>("ChannelId");
+
+                    b.Property<int?>("LogSettingId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("LogSettingId");
+
+                    b.ToTable("IgnoredLogChannels");
+                });
+
+            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<ulong>("ChannelId");
+
+                    b.Property<int?>("LogSettingId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("LogSettingId");
+
+                    b.ToTable("IgnoredVoicePresenceCHannels");
+                });
+
+            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool>("ChannelCreated");
+
+                    b.Property<bool>("ChannelDestroyed");
+
+                    b.Property<ulong>("ChannelId");
+
+                    b.Property<bool>("ChannelUpdated");
+
+                    b.Property<bool>("IsLogging");
+
+                    b.Property<bool>("LogUserPresence");
+
+                    b.Property<bool>("LogVoicePresence");
+
+                    b.Property<bool>("MessageDeleted");
+
+                    b.Property<bool>("MessageReceived");
+
+                    b.Property<bool>("MessageUpdated");
+
+                    b.Property<bool>("UserBanned");
+
+                    b.Property<bool>("UserJoined");
+
+                    b.Property<bool>("UserLeft");
+
+                    b.Property<ulong>("UserPresenceChannelId");
+
+                    b.Property<bool>("UserUnbanned");
+
+                    b.Property<bool>("UserUpdated");
+
+                    b.Property<ulong>("VoicePresenceChannelId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("LogSettings");
+                });
+
             modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
 
-                    b.Property<int?>("BotConfigId");
+                    b.Property<int>("BotConfigId");
 
                     b.Property<string>("ModuleName");
 
@@ -198,7 +345,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("BotConfigId");
 
-                    b.ToTable("ModulePrefix");
+                    b.ToTable("ModulePrefixes");
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
@@ -255,7 +402,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("BotConfigId");
 
-                    b.ToTable("RaceAnimal");
+                    b.ToTable("RaceAnimals");
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
@@ -280,6 +427,27 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
+            modelBuilder.Entity("NadekoBot.Services.Database.Models.Repeater", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<ulong>("ChannelId");
+
+                    b.Property<ulong>("GuildId");
+
+                    b.Property<TimeSpan>("Interval");
+
+                    b.Property<string>("Message");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ChannelId")
+                        .IsUnique();
+
+                    b.ToTable("Repeaters");
+                });
+
             modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
@@ -297,6 +465,20 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
+            modelBuilder.Entity("NadekoBot.Services.Database.Models.TypingArticle", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Author");
+
+                    b.Property<string>("Text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TypingArticles");
+                });
+
             modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
@@ -319,11 +501,40 @@ namespace NadekoBot.Migrations
                         .HasForeignKey("BotConfigId");
                 });
 
+            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+                {
+                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                        .WithMany("FollowedStreams")
+                        .HasForeignKey("GuildConfigId");
+                });
+
+            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+                {
+                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                        .WithMany()
+                        .HasForeignKey("LogSettingId");
+                });
+
+            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+                {
+                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                        .WithMany("IgnoredChannels")
+                        .HasForeignKey("LogSettingId");
+                });
+
+            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+                {
+                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                        .WithMany("IgnoredVoicePresenceChannelIds")
+                        .HasForeignKey("LogSettingId");
+                });
+
             modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig", "BotConfig")
                         .WithMany("ModulePrefixes")
-                        .HasForeignKey("BotConfigId");
+                        .HasForeignKey("BotConfigId")
+                        .OnDelete(DeleteBehavior.Cascade);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>

src/NadekoBot/Modules/Administration/Administration.cs

@@ -14,18 +14,41 @@ using Discord.WebSocket;
 using NadekoBot.Services.Database;
 using NadekoBot.Services.Database.Models;
 
-//todo fix delmsgoncmd
 namespace NadekoBot.Modules.Administration
 {
-    [Module(".", AppendSpace = false)]
+    [NadekoModule("Administration", ".")]
     public partial class Administration : DiscordModule
     {
         public Administration(ILocalization loc, CommandService cmds, DiscordSocketClient client) : base(loc, cmds, client)
         {
-
+            NadekoBot.CommandHandler.CommandExecuted += DelMsgOnCmd_Handler;
         }
+
+        private async void DelMsgOnCmd_Handler(object sender, CommandExecutedEventArgs e)
+        {
+            try
+            {
+                var channel = e.Message.Channel as ITextChannel;
+                if (channel == null)
+                    return;
+
+                bool shouldDelete;
+                using (var uow = DbHandler.UnitOfWork())
+                {
+                    shouldDelete = uow.GuildConfigs.For(channel.Guild.Id).DeleteMessageOnCommand;
+                }
+
+                if (shouldDelete)
+                    await e.Message.DeleteAsync();
+            }
+            catch (Exception ex)
+            {
+                _log.Warn(ex, "Delmsgoncmd errored...");
+            }
+        }
+
         ////todo owner only
-        //[LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        //[LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         //[RequireContext(ContextType.Guild)]
         //public async Task Restart(IUserMessage umsg)
         //{
@@ -37,7 +60,7 @@ namespace NadekoBot.Modules.Administration
         //    Environment.Exit(0);
         //}
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         [RequirePermission(GuildPermission.Administrator)]
         public async Task Delmsgoncmd(IUserMessage umsg)
@@ -57,7 +80,7 @@ namespace NadekoBot.Modules.Administration
                 await channel.SendMessageAsync("❗`Stopped automatic deletion of successfull command invokations.`");
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         [RequirePermission(GuildPermission.ManageRoles)]
         public async Task Setrole(IUserMessage umsg, IGuildUser usr, [Remainder] IRole role)
@@ -75,7 +98,7 @@ namespace NadekoBot.Modules.Administration
             }
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         [RequirePermission(GuildPermission.ManageRoles)]
         public async Task Removerole(IUserMessage umsg, IGuildUser usr, [Remainder] IRole role)
@@ -92,7 +115,7 @@ namespace NadekoBot.Modules.Administration
             }
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         [RequirePermission(GuildPermission.ManageRoles)]
         public async Task RenameRole(IUserMessage umsg, IRole roleToEdit, string newname)
@@ -114,7 +137,7 @@ namespace NadekoBot.Modules.Administration
             }
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         [RequirePermission(GuildPermission.ManageRoles)]
         public async Task RemoveAllRoles(IUserMessage umsg, [Remainder] IGuildUser user)
@@ -132,7 +155,7 @@ namespace NadekoBot.Modules.Administration
             }
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         [RequirePermission(GuildPermission.ManageRoles)]
         public async Task CreateRole(IUserMessage umsg, [Remainder] string roleName = null)
@@ -153,7 +176,7 @@ namespace NadekoBot.Modules.Administration
             }
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         [RequirePermission(GuildPermission.ManageRoles)]
         public async Task RoleColor(IUserMessage umsg, params string[] args)
@@ -191,7 +214,7 @@ namespace NadekoBot.Modules.Administration
             }
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         [RequirePermission(GuildPermission.BanMembers)]
         public async Task Ban(IUserMessage umsg, IGuildUser user)
@@ -218,7 +241,7 @@ namespace NadekoBot.Modules.Administration
             }
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         [RequirePermission(GuildPermission.BanMembers)]
         public async Task Softban(IUserMessage umsg, IGuildUser user, [Remainder] string msg = null)
@@ -244,7 +267,7 @@ namespace NadekoBot.Modules.Administration
             }
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Kick(IUserMessage umsg, IGuildUser user, [Remainder] string msg = null)
         {
@@ -272,7 +295,7 @@ namespace NadekoBot.Modules.Administration
             }
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         [RequirePermission(GuildPermission.MuteMembers)]
         public async Task Mute(IUserMessage umsg, params IGuildUser[] users)
@@ -295,7 +318,7 @@ namespace NadekoBot.Modules.Administration
             }
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         [RequirePermission(GuildPermission.MuteMembers)]
         public async Task Unmute(IUserMessage umsg, params IGuildUser[] users)
@@ -318,7 +341,7 @@ namespace NadekoBot.Modules.Administration
             }
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         [RequirePermission(GuildPermission.DeafenMembers)]
         public async Task Deafen(IUserMessage umsg, params IGuildUser[] users)
@@ -341,7 +364,7 @@ namespace NadekoBot.Modules.Administration
             }
 
         }
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         [RequirePermission(GuildPermission.DeafenMembers)]
         public async Task UnDeafen(IUserMessage umsg, params IGuildUser[] users)
@@ -364,7 +387,7 @@ namespace NadekoBot.Modules.Administration
             }
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         [RequirePermission(GuildPermission.ManageChannels)]
         public async Task DelVoiChanl(IUserMessage umsg, [Remainder] IVoiceChannel voiceChannel)
@@ -373,18 +396,17 @@ namespace NadekoBot.Modules.Administration
             await umsg.Channel.SendMessageAsync($"Removed channel **{voiceChannel.Name}**.").ConfigureAwait(false);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         [RequirePermission(GuildPermission.ManageChannels)]
         public async Task CreatVoiChanl(IUserMessage umsg, [Remainder] string channelName)
         {
             var channel = (ITextChannel)umsg.Channel;
-            //todo actually print info about created channel
             var ch = await channel.Guild.CreateVoiceChannelAsync(channelName).ConfigureAwait(false);
             await channel.SendMessageAsync($"Created voice channel **{ch.Name}**, id `{ch.Id}`.").ConfigureAwait(false);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         [RequirePermission(GuildPermission.ManageChannels)]
         public async Task DelTxtChanl(IUserMessage umsg, [Remainder] ITextChannel channel)
@@ -393,18 +415,17 @@ namespace NadekoBot.Modules.Administration
             await channel.SendMessageAsync($"Removed text channel **{channel.Name}**, id `{channel.Id}`.").ConfigureAwait(false);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         [RequirePermission(GuildPermission.ManageChannels)]
         public async Task CreaTxtChanl(IUserMessage umsg, [Remainder] string channelName)
         {
             var channel = (ITextChannel)umsg.Channel;
-            //todo actually print info about created channel
             var txtCh = await channel.Guild.CreateTextChannelAsync(channelName).ConfigureAwait(false);
             await channel.SendMessageAsync($"Added text channel **{txtCh.Name}**, id `{txtCh.Id}`.").ConfigureAwait(false);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         [RequirePermission(GuildPermission.ManageChannels)]
         public async Task SetTopic(IUserMessage umsg, [Remainder] string topic = null)
@@ -415,7 +436,7 @@ namespace NadekoBot.Modules.Administration
             await channel.SendMessageAsync(":ok: **New channel topic set.**").ConfigureAwait(false);
 
         }
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         [RequirePermission(GuildPermission.ManageChannels)]
         public async Task SetChanlName(IUserMessage umsg, [Remainder] string name)
@@ -428,7 +449,7 @@ namespace NadekoBot.Modules.Administration
 
 
         //delets her own messages, no perm required
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Prune(IUserMessage umsg)
         {
@@ -441,7 +462,7 @@ namespace NadekoBot.Modules.Administration
         }
 
         // prune x
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         [RequirePermission(ChannelPermission.ManageMessages)]
         public async Task Prune(IUserMessage msg, int count)
@@ -460,7 +481,7 @@ namespace NadekoBot.Modules.Administration
         }
 
         //prune @user [x]
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Prune(IUserMessage msg, IGuildUser user, int count = 100)
         {
@@ -470,7 +491,7 @@ namespace NadekoBot.Modules.Administration
             await msg.Channel.DeleteMessagesAsync(enumerable);
         }
         ////todo owner only
-        //[LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        //[LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         //[RequireContext(ContextType.Guild)]
         //public async Task Die(IUserMessage umsg)
         //{
@@ -482,7 +503,7 @@ namespace NadekoBot.Modules.Administration
         //}
 
         ////todo owner only
-        //[LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        //[LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         //[RequireContext(ContextType.Guild)]
         //public async Task Setname(IUserMessage umsg, [Remainder] string newName = null)
         //{
@@ -491,7 +512,7 @@ namespace NadekoBot.Modules.Administration
         //}
 
         ////todo owner only
-        //[LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        //[LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         //[RequireContext(ContextType.Guild)]
         //public async Task NewAvatar(IUserMessage umsg, [Remainder] string img = null)
         //{
@@ -510,7 +531,7 @@ namespace NadekoBot.Modules.Administration
         //}
 
         ////todo owner only
-        //[LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        //[LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         //[RequireContext(ContextType.Guild)]
         //public async Task SetGame(IUserMessage umsg, [Remainder] string game = null)
         //{
@@ -522,7 +543,7 @@ namespace NadekoBot.Modules.Administration
         //}
 
         ////todo owner only
-        //[LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        //[LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         //[RequireContext(ContextType.Guild)]
         //public async Task Send(IUserMessage umsg, string where, [Remainder] string msg = null)
         //{
@@ -567,7 +588,7 @@ namespace NadekoBot.Modules.Administration
         //}
 
         ////todo owner only
-        //[LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        //[LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         //[RequireContext(ContextType.Guild)]
         //public async Task Announce(IUserMessage umsg, [Remainder] string message)
         //{
@@ -582,7 +603,7 @@ namespace NadekoBot.Modules.Administration
         //}
 
         ////todo owner only
-        //[LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        //[LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         //[RequireContext(ContextType.Guild)]
         //public async Task SaveChat(IUserMessage umsg, int cnt)
         //{
@@ -614,7 +635,7 @@ namespace NadekoBot.Modules.Administration
         //}
 
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         [RequirePermission(GuildPermission.MentionEveryone)]
         public async Task MentionRole(IUserMessage umsg, params IRole[] roles)
@@ -639,7 +660,7 @@ namespace NadekoBot.Modules.Administration
             await channel.SendMessageAsync(send).ConfigureAwait(false);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Donators(IUserMessage umsg)
         {
@@ -655,7 +676,7 @@ namespace NadekoBot.Modules.Administration
         }
 
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Donadd(IUserMessage umsg, IUser donator, int amount)
         {

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

@@ -19,26 +19,30 @@ namespace NadekoBot.Modules.Administration
             public AutoAssignRoleCommands()
             {
                 var _client = NadekoBot.Client;
-                _client.UserJoined += async (user) =>
+                _client.UserJoined += (user) =>
                 {
-                    GuildConfig conf;
-                    using (var uow = DbHandler.UnitOfWork())
+                    var t = Task.Run(async () =>
                     {
-                        conf = uow.GuildConfigs.For(user.Guild.Id);
-                    }
-                    var aarType = conf.AutoAssignRoleId.GetType();
+                        GuildConfig conf;
+                        using (var uow = DbHandler.UnitOfWork())
+                        {
+                            conf = uow.GuildConfigs.For(user.Guild.Id);
+                        }
+                        var aarType = conf.AutoAssignRoleId.GetType();
 
-                    if (conf.AutoAssignRoleId == 0)
-                        return;
+                        if (conf.AutoAssignRoleId == 0)
+                            return;
 
-                    var role = user.Guild.Roles.FirstOrDefault(r => r.Id == conf.AutoAssignRoleId);
+                        var role = user.Guild.Roles.FirstOrDefault(r => r.Id == conf.AutoAssignRoleId);
 
-                    if (role != null)
-                        await user.AddRolesAsync(role);
+                        if (role != null)
+                            await user.AddRolesAsync(role);
+                    });
+                    return Task.CompletedTask;
                 };
             }
 
-            [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
             [RequireContext(ContextType.Guild)]
             [RequirePermission(GuildPermission.ManageRoles)]
             public async Task AutoAssignRole(IUserMessage umsg, [Remainder] IRole role = null)

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

@@ -1,111 +1,102 @@
-//using Discord;
-//using Discord.Commands;
-//using NadekoBot.Classes;
-//using NadekoBot.Modules.Permissions.Classes;
-//using System;
-//using System.Collections.Concurrent;
-//using System.Collections.Generic;
-//using System.Linq;
+using Discord;
+using Discord.Commands;
+using Discord.WebSocket;
+using NadekoBot.Attributes;
+using NadekoBot.Extensions;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 
-////todo DB
-//namespace NadekoBot.Modules.Administration
-//{
-//    class CrossServerTextChannel : DiscordCommand
-//    {
-//        public CrossServerTextChannel(DiscordModule module) : base(module)
-//        {
-//            NadekoBot.Client.MessageReceived += async (s, e) =>
-//            {
-//                try
-//                {
-//                    if (umsg.Author.Id == NadekoBot.Client.CurrentUser.Id) return;
-//                    foreach (var subscriber in Subscribers)
-//                    {
-//                        var set = subscriber.Value;
-//                        if (!set.Contains(e.Channel))
-//                            continue;
-//                        foreach (var chan in set.Except(new[] { e.Channel }))
-//                        {
-//                            await chan.SendMessageAsync(GetText(e.Server, e.Channel, umsg.Author, e.Message)).ConfigureAwait(false);
-//                        }
-//                    }
-//                }
-//                catch { }
-//            };
-//            NadekoBot.Client.MessageUpdated += async (s, e) =>
-//            {
-//                try
-//                {
-//                    if (e.After?.User?.Id == null || e.After.User.Id == NadekoBot.Client.CurrentUser.Id) return;
-//                    foreach (var subscriber in Subscribers)
-//                    {
-//                        var set = subscriber.Value;
-//                        if (!set.Contains(e.Channel))
-//                            continue;
-//                        foreach (var chan in set.Except(new[] { e.Channel }))
-//                        {
-//                            var msg = chan.Messages
-//                                .FirstOrDefault(m =>
-//                                    m.RawText == GetText(e.Server, e.Channel, umsg.Author, e.Before));
-//                            if (msg != default(Message))
-//                                await msg.Edit(GetText(e.Server, e.Channel, umsg.Author, e.After)).ConfigureAwait(false);
-//                        }
-//                    }
+namespace NadekoBot.Modules.Administration
+{
+    public partial class Administration
+    {
+        [Group]
+        public class CrossServerTextChannel
+        {
+            public CrossServerTextChannel()
+            {
+                NadekoBot.Client.MessageReceived += (imsg) =>
+                {
+                    var msg = imsg as IUserMessage;
+                    if (msg == null)
+                        return Task.CompletedTask;
 
-//                }
-//                catch { }
-//            };
-//        }
+                    var channel = imsg.Channel as ITextChannel;
+                    if (channel == null)
+                        return Task.CompletedTask;
 
-//        private string GetText(Server server, Channel channel, User user, Message message) =>
-//            $"**{server.Name} | {channel.Name}** `{user.Name}`: " + message.RawText;
+                    Task.Run(async () =>
+                    {
+                        try
+                        {
+                            if (msg.Author.Id == NadekoBot.Client.GetCurrentUser().Id) return;
+                            foreach (var subscriber in Subscribers)
+                            {
+                                var set = subscriber.Value;
+                                if (!set.Contains(msg.Channel))
+                                    continue;
+                                foreach (var chan in set.Except(new[] { channel }))
+                                {
+                                    await chan.SendMessageAsync(GetText(channel.Guild, channel, (IGuildUser)msg.Author, msg)).ConfigureAwait(false);
+                                }
+                            }
+                        }
+                        catch { }
+                    });
+                    return Task.CompletedTask;
+                };
+            }
 
-//        public static readonly ConcurrentDictionary<int, HashSet<Channel>> Subscribers = new ConcurrentDictionary<int, HashSet<Channel>>();
+            private string GetText(IGuild server, ITextChannel channel, IGuildUser user, IUserMessage message) =>
+                $"**{server.Name} | {channel.Name}** `{user.Username}`: " + message.Content;
 
-//        internal override void Init(CommandGroupBuilder cgb)
-//        {
-//            cgb.CreateCommand(Module.Prefix + "scsc")
-//                .Description("Starts an instance of cross server channel. You will get a token as a DM " +
-//                             $"that other people will use to tune in to the same instance. **Bot Owner Only.** | `{Prefix}scsc`")
-//                .AddCheck(SimpleCheckers.OwnerOnly())
-//                .Do(async e =>
-//                {
-//                    var token = new Random().Next();
-//                    var set = new HashSet<Channel>();
-//                    if (Subscribers.TryAdd(token, set))
-//                    {
-//                        set.Add(e.Channel);
-//                        await umsg.Author.SendMessageAsync("This is your CSC token:" + token.ToString()).ConfigureAwait(false);
-//                    }
-//                });
+            public static readonly ConcurrentDictionary<int, HashSet<ITextChannel>> Subscribers = new ConcurrentDictionary<int, HashSet<ITextChannel>>();
 
-//            cgb.CreateCommand(Module.Prefix + "jcsc")
-//                .Description($"Joins current channel to an instance of cross server channel using the token. **Needs Manage Server Permissions.**| `{Prefix}jcsc`")
-//                .Parameter("token")
-//                .AddCheck(SimpleCheckers.ManageServer())
-//                .Do(async e =>
-//                {
-//                    int token;
-//                    if (!int.TryParse(token, out token))
-//                        return;
-//                    HashSet<Channel> set;
-//                    if (!Subscribers.TryGetValue(token, out set))
-//                        return;
-//                    set.Add(e.Channel);
-//                    await channel.SendMessageAsync(":ok:").ConfigureAwait(false);
-//                });
+            ////todo owner only
+            //[LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
+            //[RequireContext(ContextType.Guild)]
+            //public async Task Scsc(IUserMessage msg)
+            //{
+            //    var channel = (ITextChannel)msg.Channel;
+            //    var token = new NadekoRandom().Next();
+            //    var set = new HashSet<ITextChannel>();
+            //    if (Subscribers.TryAdd(token, set))
+            //    {
+            //        set.Add(channel);
+            //        await ((IGuildUser)msg.Author).SendMessageAsync("This is your CSC token:" + token.ToString()).ConfigureAwait(false);
+            //    }
+            //}
 
-//            cgb.CreateCommand(Module.Prefix + "lcsc")
-//                .Description($"Leaves Cross server channel instance from this channel. **Needs Manage Server Permissions.**| `{Prefix}lcsc`")
-//                .AddCheck(SimpleCheckers.ManageServer())
-//                .Do(async e =>
-//                {
-//                    foreach (var subscriber in Subscribers)
-//                    {
-//                        subscriber.Value.Remove(e.Channel);
-//                    }
-//                    await channel.SendMessageAsync(":ok:").ConfigureAwait(false);
-//                });
-//        }
-//    }
-//}
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
+            [RequireContext(ContextType.Guild)]
+            [RequirePermission(GuildPermission.ManageGuild)]
+            public async Task Jcsc(IUserMessage imsg, int token)
+            {
+                var channel = (ITextChannel)imsg.Channel;
+
+                HashSet<ITextChannel> set;
+                if (!Subscribers.TryGetValue(token, out set))
+                    return;
+                set.Add(channel);
+                await channel.SendMessageAsync(":ok:").ConfigureAwait(false);
+            }
+
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
+            [RequireContext(ContextType.Guild)]
+            [RequirePermission(GuildPermission.ManageGuild)]
+            public async Task Lcsc(IUserMessage imsg)
+            {
+                var channel = (ITextChannel)imsg.Channel;
+
+                foreach (var subscriber in Subscribers)
+                {
+                    subscriber.Value.Remove(channel);
+                }
+                await channel.SendMessageAsync(":ok:").ConfigureAwait(false);
+            }
+        }
+    }
+}

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

@@ -1,130 +1,159 @@
 using Discord;
 using Discord.Commands;
-using NadekoBot.Classes;
-using NadekoBot.Modules.Permissions.Classes;
+using Discord.WebSocket;
+using NadekoBot.Attributes;
+using NadekoBot.Services;
+using NadekoBot.Services.Database;
+using NadekoBot.Services.Database.Models;
 using System;
 using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
-using System.Timers;
 
-//todo DB
 namespace NadekoBot.Modules.Administration
 {
-    class MessageRepeater : DiscordCommand
+    public partial class Administration
     {
-        private readonly ConcurrentDictionary<Server, Repeater> repeaters = new ConcurrentDictionary<Server, Repeater>();
-        private class Repeater
+        [Group]
+        public class RepeatCommands
         {
-            [Newtonsoft.Json.JsonIgnore]
-            public Timer MessageTimer { get; set; }
-            [Newtonsoft.Json.JsonIgnore]
-            public Channel RepeatingChannel { get; set; }
+            public ConcurrentDictionary<ulong, RepeatRunner> repeaters;
 
-            public ulong RepeatingServerId { get; set; }
-            public ulong RepeatingChannelId { get; set; }
-            public Message lastMessage { get; set; } = null;
-            public string RepeatingMessage { get; set; }
-            public int Interval { get; set; }
-
-            public Repeater Start()
+            public class RepeatRunner
             {
-                MessageTimer = new Timer { Interval = Interval };
-                MessageTimer.Elapsed += async (s, e) => await Invoke();
-                return this;
-            }
+                private CancellationTokenSource source { get; set; }
+                private CancellationToken token { get; set; }
+                public Repeater Repeater { get; }
+                public ITextChannel Channel { get; }
 
-            public async Task Invoke()
-            {
-                var ch = RepeatingChannel;
-                var msg = RepeatingMessage;
-                if (ch != null && !string.IsNullOrWhiteSpace(msg))
+                public RepeatRunner(Repeater repeater, ITextChannel channel = null)
                 {
+                    this.Repeater = repeater;
+                    this.Channel = channel ?? NadekoBot.Client.GetGuild(repeater.GuildId)?.GetTextChannel(repeater.ChannelId);
+                    if (Channel == null)
+                        return;
+                    Task.Run(Run);
+                }
+
+
+                private async Task Run()
+                {
+                    source = new CancellationTokenSource();
+                    token = source.Token;
                     try
                     {
-                        if (lastMessage != null)
-                            await lastMessage.Delete().ConfigureAwait(false);
+                        while (!token.IsCancellationRequested)
+                        {
+                            await Task.Delay(Repeater.Interval, token).ConfigureAwait(false);
+                            await Channel.SendMessageAsync("🔄 " + Repeater.Message).ConfigureAwait(false);
+                        }
                     }
-                    catch { }
-                    try
-                    {
-                        lastMessage = await ch.SendMessageAsync(msg).ConfigureAwait(false);
-                    }
-                    catch { }
+                    catch (OperationCanceledException) { }
+                }
+
+                public void Reset()
+                {
+                    source.Cancel();
+                    var t = Task.Run(Run);
+                }
+
+                public void Stop()
+                {
+                    source.Cancel();
                 }
             }
-        }
-        internal override void Init(CommandGroupBuilder cgb)
-        {
 
-            cgb.CreateCommand(Module.Prefix + "repeatinvoke")
-                .Alias(Module.Prefix + "repinv")
-                .Description($"Immediately shows the repeat message and restarts the timer. **Needs Manage Messages Permissions.**| `{Prefix}repinv`")
-                .AddCheck(SimpleCheckers.ManageMessages())
-                .Do(async e =>
+            public RepeatCommands()
+            {
+                using (var uow = DbHandler.UnitOfWork())
                 {
-                    Repeater rep;
-                    if (!repeaters.TryGetValue(e.Server, out rep))
-                    {
-                        await channel.SendMessageAsync("`No repeating message found on this server.`");
-                        return;
-                    }
+                    repeaters = new ConcurrentDictionary<ulong, RepeatRunner>(uow.Repeaters.GetAll().Select(r => new RepeatRunner(r)).Where(r => r != null).ToDictionary(r => r.Repeater.ChannelId));
+                }
+            }
 
-                    await rep.Invoke();
-                });
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
+            [RequireContext(ContextType.Guild)]
+            [RequirePermission(GuildPermission.ManageMessages)]
+            public async Task RepeatInvoke(IUserMessage imsg)
+            {
+                var channel = (ITextChannel)imsg.Channel;
 
-            cgb.CreateCommand(Module.Prefix + "repeat")
-                .Description("Repeat a message every X minutes. If no parameters are specified, " +
-                             $"repeat is disabled. **Needs Manage Messages Permissions.** |`{Prefix}repeat 5 Hello there`")
-                .Parameter("minutes", ParameterType.Optional)
-                .Parameter("msg", ParameterType.Unparsed)
-                .AddCheck(SimpleCheckers.ManageMessages())
-                .Do(async e =>
+                RepeatRunner rep;
+                if (!repeaters.TryGetValue(channel.Id, out rep))
                 {
-                    var minutesStr = minutes;
-                    var msg = msg;
+                    await channel.SendMessageAsync("`No repeating message found on this server.`").ConfigureAwait(false);
+                    return;
+                }
+                rep.Reset();
+                await channel.SendMessageAsync("🔄 " + rep.Repeater.Message).ConfigureAwait(false);
+            }
 
-                    // if both null, disable
-                    if (string.IsNullOrWhiteSpace(msg) && string.IsNullOrWhiteSpace(minutesStr))
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
+            [RequireContext(ContextType.Guild)]
+            public async Task Repeat(IUserMessage imsg)
+            {
+                var channel = (ITextChannel)imsg.Channel;
+                RepeatRunner rep;
+                if (repeaters.TryRemove(channel.Id, out rep))
+                {
+                    using (var uow = DbHandler.UnitOfWork())
                     {
-
-                        Repeater rep;
-                        if (!repeaters.TryRemove(e.Server, out rep))
-                            return;
-                        rep.MessageTimer.Stop();
-                        await channel.SendMessageAsync("Repeating disabled").ConfigureAwait(false);
-                        return;
+                        uow.Repeaters.Remove(rep.Repeater);
+                        await uow.CompleteAsync();
                     }
-                    int minutes;
-                    if (!int.TryParse(minutesStr, out minutes) || minutes < 1 || minutes > 1440)
+                    rep.Stop();
+                    await channel.SendMessageAsync("`Stopped repeating a message.`").ConfigureAwait(false);
+                }
+                else
+                    await channel.SendMessageAsync("`No message is repeating.`").ConfigureAwait(false);
+            }
+
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
+            [RequireContext(ContextType.Guild)]
+            public async Task Repeat(IUserMessage imsg, int minutes, [Remainder] string message)
+            {
+                var channel = (ITextChannel)imsg.Channel;
+
+                if (minutes < 1 || minutes > 1500)
+                    return;
+
+                if (string.IsNullOrWhiteSpace(message))
+                    return;
+
+                RepeatRunner rep;
+
+                rep = repeaters.AddOrUpdate(channel.Id, (cid) =>
+                {
+                    using (var uow = DbHandler.UnitOfWork())
                     {
-                        await channel.SendMessageAsync("Invalid value").ConfigureAwait(false);
-                        return;
-                    }
-
-                    var repeater = repeaters.GetOrAdd(
-                        e.Server,
-                        s => new Repeater
+                        var localRep = new Repeater
                         {
-                            Interval = minutes * 60 * 1000,
-                            RepeatingChannel = e.Channel,
-                            RepeatingChannelId = e.Channel.Id,
-                            RepeatingServerId = e.Server.Id,
-                        }.Start()
-                    );
-
-                    if (!string.IsNullOrWhiteSpace(msg))
-                        repeater.RepeatingMessage = msg;
-
-                    repeater.MessageTimer.Stop();
-                    repeater.MessageTimer.Start();
-
-                    await channel.SendMessageAsync(String.Format("👌 Repeating `{0}` every " +
-                                                              "**{1}** minutes on {2} channel.",
-                                                              repeater.RepeatingMessage, minutes, repeater.RepeatingChannel))
-                                                              .ConfigureAwait(false);
+                            ChannelId = channel.Id,
+                            GuildId = channel.Guild.Id,
+                            Interval = TimeSpan.FromMinutes(minutes),
+                            Message = message,
+                        };
+                        uow.Repeaters.Add(localRep);
+                        uow.Complete();
+                        return new RepeatRunner(localRep, channel);
+                    }
+                }, (cid, old) =>
+                {
+                    using (var uow = DbHandler.UnitOfWork())
+                    {
+                        old.Repeater.Message = message;
+                        old.Repeater.Interval = TimeSpan.FromMinutes(minutes);
+                        uow.Repeaters.Update(old.Repeater);
+                        uow.Complete();
+                    }
+                    old.Reset();
+                    return old;
                 });
-        }
 
-        public MessageRepeater(DiscordModule module) : base(module) { }
+                await channel.SendMessageAsync($"Repeating \"{rep.Repeater.Message}\" every {rep.Repeater.Interval} minutes").ConfigureAwait(false);
+            }
+        }
     }
 }

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

@@ -86,7 +86,7 @@ namespace NadekoBot.Modules.Administration
                     {"%queued%", () => Music.Music.MusicPlayers.Sum(kvp => kvp.Value.Playlist.Count).ToString()}
                 };
 
-            [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
             [RequireContext(ContextType.Guild)]
             public async Task RotatePlaying(IUserMessage umsg)
             {
@@ -106,7 +106,7 @@ namespace NadekoBot.Modules.Administration
                     await channel.SendMessageAsync("`Rotating playing status disabled.`");
             }
 
-            [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
             [RequireContext(ContextType.Guild)]
             public async Task AddPlaying(IUserMessage umsg, [Remainder] string status)
             {
@@ -122,7 +122,7 @@ namespace NadekoBot.Modules.Administration
                 await channel.SendMessageAsync("`Added.`").ConfigureAwait(false);
             }
 
-            [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
             [RequireContext(ContextType.Guild)]
             public async Task ListPlaying(IUserMessage umsg)
             {
@@ -144,7 +144,7 @@ namespace NadekoBot.Modules.Administration
 
             }
 
-            [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
             [RequireContext(ContextType.Guild)]
             public async Task RemovePlaying(IUserMessage umsg, int index)
             {

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

@@ -5,9 +5,9 @@ using NadekoBot.Attributes;
 using NadekoBot.Extensions;
 using System;
 using System.Collections.Concurrent;
+using System.Threading;
 using System.Threading.Tasks;
 
-//todo rewrite to accept msg/sec (for example 1/5 - 1 message every 5 seconds)
 namespace NadekoBot.Modules.Administration
 {
     public partial class Administration
@@ -15,58 +15,103 @@ namespace NadekoBot.Modules.Administration
         [Group]
         public class RatelimitCommand
         {
-            public static ConcurrentDictionary<ulong, ConcurrentDictionary<ulong, DateTime>> RatelimitingChannels = new ConcurrentDictionary<ulong, ConcurrentDictionary<ulong, DateTime>>();
+            public static ConcurrentDictionary<ulong, Ratelimiter> RatelimitingChannels = new ConcurrentDictionary<ulong, Ratelimiter>();
 
-            private static readonly TimeSpan ratelimitTime = new TimeSpan(0, 0, 0, 5);
             private DiscordSocketClient _client { get; }
 
+            public class Ratelimiter
+            {
+                public class RatelimitedUser
+                {
+                    public ulong UserId { get; set; }
+                    public int MessageCount { get; set; } = 0;
+                }
+
+                public ulong ChannelId { get; set; }
+
+                public int MaxMessages { get; set; }
+                public int PerSeconds { get; set; }
+
+                public CancellationTokenSource cancelSource { get; set; } = new CancellationTokenSource();
+
+                public ConcurrentDictionary<ulong, RatelimitedUser> Users { get; set; } = new ConcurrentDictionary<ulong, RatelimitedUser>();
+
+                public bool CheckUserRatelimit(ulong id)
+                {
+                    RatelimitedUser usr = Users.GetOrAdd(id, (key) => new RatelimitedUser() { UserId = id });
+                    if (usr.MessageCount == MaxMessages)
+                    {
+                        return true;
+                    }
+                    else
+                    {
+                        usr.MessageCount++;
+                        var t = Task.Run(async () => {
+                            try
+                            {
+                                await Task.Delay(PerSeconds * 1000, cancelSource.Token);
+                            }
+                            catch (OperationCanceledException) { }
+                            usr.MessageCount--;
+                        });
+                        return false;
+                    }
+
+                }
+            }
+
             public RatelimitCommand()
             {
-
                 this._client = NadekoBot.Client;
 
-               _client.MessageReceived += async (umsg) =>
+               _client.MessageReceived += (umsg) =>
                 {
-                    var usrMsg = umsg as IUserMessage;
-                    var channel = usrMsg.Channel as ITextChannel;
-
-                    if (channel == null || await usrMsg.IsAuthor())
-                        return;
-                    ConcurrentDictionary<ulong, DateTime> userTimePair;
-                    if (!RatelimitingChannels.TryGetValue(channel.Id, out userTimePair)) return;
-                    DateTime lastMessageTime;
-                    if (userTimePair.TryGetValue(usrMsg.Author.Id, out lastMessageTime))
+                    var t = Task.Run(async () =>
                     {
-                        if (DateTime.Now - lastMessageTime < ratelimitTime)
-                        {
-                            try
-                            {
-                                await usrMsg.DeleteAsync().ConfigureAwait(false);
-                            }
-                            catch { }
+                        var usrMsg = umsg as IUserMessage;
+                        var channel = usrMsg.Channel as ITextChannel;
+
+                        if (channel == null || usrMsg.IsAuthor())
                             return;
-                        }
-                    }
-                    userTimePair.AddOrUpdate(usrMsg.Author.Id, id => DateTime.Now, (id, dt) => DateTime.Now);
+                        Ratelimiter limiter;
+                        if (!RatelimitingChannels.TryGetValue(channel.Id, out limiter))
+                            return;
+
+                        if (limiter.CheckUserRatelimit(usrMsg.Author.Id))
+                            await usrMsg.DeleteAsync();
+                    });
+                    return Task.CompletedTask;
                 };
             }
 
-            [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
             [RequireContext(ContextType.Guild)]
-            public async Task Slowmode(IUserMessage umsg)
+            public async Task Slowmode(IUserMessage umsg, int msg = 1, int perSec = 5)
             {
                 var channel = (ITextChannel)umsg.Channel;
 
-                ConcurrentDictionary<ulong, DateTime> throwaway;
+                Ratelimiter throwaway;
                 if (RatelimitingChannels.TryRemove(channel.Id, out throwaway))
                 {
-                    await channel.SendMessageAsync("Slow mode disabled.").ConfigureAwait(false);
+                    throwaway.cancelSource.Cancel();
+                    await channel.SendMessageAsync("`Slow mode disabled.`").ConfigureAwait(false);
                     return;
                 }
-                if (RatelimitingChannels.TryAdd(channel.Id, new ConcurrentDictionary<ulong, DateTime>()))
+
+                if (msg < 1 || perSec < 1)
                 {
-                    await channel.SendMessageAsync("Slow mode initiated. " +
-                                                "Users can't send more than 1 message every 5 seconds.")
+                    await channel.SendMessageAsync("`Invalid parameters.`");
+                    return;
+                }
+
+                if (RatelimitingChannels.TryAdd(channel.Id,throwaway = new Ratelimiter() {
+                    ChannelId = channel.Id,
+                    MaxMessages = msg,
+                    PerSeconds = perSec,
+                }))
+                {
+                    await channel.SendMessageAsync("`Slow mode initiated.` " +
+                                                $"Users can't send more than {throwaway.MaxMessages} message(s) every {throwaway.PerSeconds} second(s).")
                                                 .ConfigureAwait(false);
                 }
             }

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

@@ -10,7 +10,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-//todo DB
+
 namespace NadekoBot.Modules.Administration
 {
     public partial class Administration
@@ -19,7 +19,7 @@ namespace NadekoBot.Modules.Administration
         public class SelfAssignedRolesCommands
         {
 
-            [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
             [RequireContext(ContextType.Guild)]
             [RequirePermission(GuildPermission.ManageRoles)]
             public async Task Asar(IUserMessage umsg, [Remainder] IRole role)
@@ -49,7 +49,7 @@ namespace NadekoBot.Modules.Administration
                 await channel.SendMessageAsync(msg.ToString()).ConfigureAwait(false);
             }
 
-            [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
             [RequireContext(ContextType.Guild)]
             [RequirePermission(GuildPermission.ManageRoles)]
             public async Task Rsar(IUserMessage umsg, [Remainder] IRole role)
@@ -70,7 +70,7 @@ namespace NadekoBot.Modules.Administration
                 await channel.SendMessageAsync($":ok:**{role.Name}** has been removed from the list of self-assignable roles").ConfigureAwait(false);
             }
 
-            [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
             [RequireContext(ContextType.Guild)]
             public async Task Lsar(IUserMessage umsg)
             {
@@ -105,7 +105,7 @@ namespace NadekoBot.Modules.Administration
                 await channel.SendMessageAsync(msg.ToString() + "\n\n" + removeMsg.ToString()).ConfigureAwait(false);
             }
 
-            [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
             [RequireContext(ContextType.Guild)]
             [RequirePermission(GuildPermission.ManageRoles)]
             public async Task Tesar(IUserMessage umsg)
@@ -124,7 +124,7 @@ namespace NadekoBot.Modules.Administration
                 await channel.SendMessageAsync("Self assigned roles are now " + exl);
             }
 
-            [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
             [RequireContext(ContextType.Guild)]
             public async Task Iam(IUserMessage umsg, [Remainder] IRole role)
             {
@@ -182,7 +182,7 @@ namespace NadekoBot.Modules.Administration
                 }
             }
 
-            [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
             [RequireContext(ContextType.Guild)]
             public async Task Iamnot(IUserMessage umsg, [Remainder] IRole role)
             {

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

@@ -20,7 +20,7 @@
 //                this._client = client;
 //            }
 
-//            [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+//            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
 //            [RequireContext(ContextType.Guild)]
 //            public async Task Leave(IUserMessage umsg, [Remainder] string guildStr)
 //            {

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

@@ -106,7 +106,7 @@ namespace NadekoBot.Modules.Administration
                 return Task.CompletedTask;
             }
 
-            [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
             [RequireContext(ContextType.Guild)]
             [RequirePermission(GuildPermission.ManageGuild)]
             public async Task GreetDel(IUserMessage umsg)
@@ -128,7 +128,7 @@ namespace NadekoBot.Modules.Administration
                     await channel.SendMessageAsync("`Automatic deletion of greet messages has been disabled.`").ConfigureAwait(false);
             }
 
-            [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
             [RequireContext(ContextType.Guild)]
             [RequirePermission(GuildPermission.ManageGuild)]
             public async Task Greet(IUserMessage umsg)
@@ -151,7 +151,7 @@ namespace NadekoBot.Modules.Administration
                     await channel.SendMessageAsync("Greet announcements disabled.").ConfigureAwait(false);
             }
             
-            [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
             [RequireContext(ContextType.Guild)]
             [RequirePermission(GuildPermission.ManageGuild)]
             public async Task GreetMsg(IUserMessage umsg, [Remainder] string text)
@@ -180,7 +180,7 @@ namespace NadekoBot.Modules.Administration
                     await channel.SendMessageAsync("Enable greet messsages by typing `.greet`").ConfigureAwait(false);
             }
 
-            [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
             [RequireContext(ContextType.Guild)]
             [RequirePermission(GuildPermission.ManageGuild)]
             public async Task GreetDm(IUserMessage umsg)
@@ -202,7 +202,7 @@ namespace NadekoBot.Modules.Administration
                     await channel.SendMessageAsync("Greet announcements disabled.").ConfigureAwait(false);
             }
             
-            [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
             [RequireContext(ContextType.Guild)]
             [RequirePermission(GuildPermission.ManageGuild)]
             public async Task GreetDmMsg(IUserMessage umsg, [Remainder] string text)
@@ -231,7 +231,7 @@ namespace NadekoBot.Modules.Administration
                     await channel.SendMessageAsync("Enable DM greet messsages by typing `.greetdm`").ConfigureAwait(false);
             }
 
-            [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
             [RequireContext(ContextType.Guild)]
             [RequirePermission(GuildPermission.ManageGuild)]
             public async Task Bye(IUserMessage umsg)
@@ -254,7 +254,7 @@ namespace NadekoBot.Modules.Administration
                     await channel.SendMessageAsync("Bye announcements disabled.").ConfigureAwait(false);
             }
 
-            [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
             [RequireContext(ContextType.Guild)]
             [RequirePermission(GuildPermission.ManageGuild)]
             public async Task ByeMsg(IUserMessage umsg, [Remainder] string text)
@@ -283,7 +283,7 @@ namespace NadekoBot.Modules.Administration
                     await channel.SendMessageAsync("Enable bye messsages by typing `.bye`").ConfigureAwait(false);
             }
 
-            [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
             [RequireContext(ContextType.Guild)]
             [RequirePermission(GuildPermission.ManageGuild)]
             public async Task ByeDel(IUserMessage umsg)

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

@@ -1,166 +0,0 @@
-//using Discord;
-//using Discord.Commands;
-//using NadekoBot.Classes;
-//using NadekoBot.Extensions;
-//using NadekoBot.Modules.Permissions.Classes;
-//using System;
-//using System.Linq;
-//using System.Text.RegularExpressions;
-//using System.Threading.Tasks;
-//using ChPermOverride = Discord.ChannelPermissionOverrides;
-
-////todo DB
-////todo rewrite
-//namespace NadekoBot.Modules.Administration
-//{
-//    internal class VoicePlusTextCommand : DiscordCommand
-//    {
-//        Regex channelNameRegex = new Regex(@"[^a-zA-Z0-9 -]", RegexOptions.Compiled);
-//        public VoicePlusTextCommand(DiscordModule module) : base(module)
-//        {
-//            // changing servers may cause bugs
-//            NadekoBot.Client.UserUpdated += async (sender, e) =>
-//            {
-//                try
-//                {
-//                    if (e.Server == null)
-//                        return;
-//                    var config = SpecificConfigurations.Default.Of(e.Server.Id);
-//                    if (e.Before.VoiceChannel == e.After.VoiceChannel) return;
-//                    if (!config.VoicePlusTextEnabled)
-//                        return;
-//                    var serverPerms = e.Server.GetUser(NadekoBot.Client.CurrentUser.Id)?.ServerPermissions;
-//                    if (serverPerms == null)
-//                        return;
-//                    if (!serverPerms.Value.ManageChannels || !serverPerms.Value.ManageRoles)
-//                    {
-
-//                        try
-//                        {
-//                            await e.Server.Owner.SendMessageAsync(
-//                                "I don't have manage server and/or Manage Channels permission," +
-//                                $" so I cannot run voice+text on **{e.Server.Name}** server.").ConfigureAwait(false);
-//                        }
-//                        catch { } // meh
-//                        config.VoicePlusTextEnabled = false;
-//                        return;
-//                    }
-
-
-//                    var beforeVch = e.Before.VoiceChannel;
-//                    if (beforeVch != null)
-//                    {
-//                        var textChannel =
-//                            e.Server.FindChannels(GetChannelName(beforeVch.Name), ChannelType.Text).FirstOrDefault();
-//                        if (textChannel != null)
-//                            await textChannel.AddPermissionsRule(e.Before,
-//                                new ChPermOverride(readMessages: PermValue.Deny,
-//                                                   sendMessages: PermValue.Deny)).ConfigureAwait(false);
-//                    }
-//                    var afterVch = e.After.VoiceChannel;
-//                    if (afterVch != null && e.Server.AFKChannel != afterVch)
-//                    {
-//                        var textChannel = e.Server.FindChannels(
-//                                                    GetChannelName(afterVch.Name),
-//                                                    ChannelType.Text)
-//                                                    .FirstOrDefault();
-//                        if (textChannel == null)
-//                        {
-//                            textChannel = (await e.Server.CreateChannel(GetChannelName(afterVch.Name), ChannelType.Text).ConfigureAwait(false));
-//                            await textChannel.AddPermissionsRule(e.Server.EveryoneRole,
-//                                new ChPermOverride(readMessages: PermValue.Deny,
-//                                                   sendMessages: PermValue.Deny)).ConfigureAwait(false);
-//                        }
-//                        await textChannel.AddPermissionsRule(e.After,
-//                            new ChPermOverride(readMessages: PermValue.Allow,
-//                                               sendMessages: PermValue.Allow)).ConfigureAwait(false);
-//                    }
-//                }
-//                catch (Exception ex)
-//                {
-//                    Console.WriteLine(ex);
-//                }
-//            };
-//        }
-
-//        private string GetChannelName(string voiceName) =>
-//            channelNameRegex.Replace(voiceName, "").Trim().Replace(" ", "-").TrimTo(90, true) + "-voice";
-
-//        internal override void Init(CommandGroupBuilder cgb)
-//        {
-//            cgb.CreateCommand(Module.Prefix + "cleanv+t")
-//                .Alias(Module.Prefix + "cv+t")
-//                .Description($"Deletes all text channels ending in `-voice` for which voicechannels are not found. **Use at your own risk.\nNeeds Manage Roles and Manage Channels Permissions.** | `{Prefix}cleanv+t`")
-//                .AddCheck(SimpleCheckers.CanManageRoles)
-//                .AddCheck(SimpleCheckers.ManageChannels())
-//                .Do(async e =>
-//                {
-//                    if (!e.Server.CurrentUser.ServerPermissions.ManageChannels)
-//                    {
-//                        await channel.SendMessageAsync("`I have insufficient permission to do that.`");
-//                        return;
-//                    }
-
-//                    var allTxtChannels = e.Server.TextChannels.Where(c => c.Name.EndsWith("-voice"));
-//                    var validTxtChannelNames = e.Server.VoiceChannels.Select(c => GetChannelName(c.Name));
-
-//                    var invalidTxtChannels = allTxtChannels.Where(c => !validTxtChannelNames.Contains(c.Name));
-
-//                    foreach (var c in invalidTxtChannels)
-//                    {
-//                        try
-//                        {
-//                            await c.Delete();
-//                        }
-//                        catch { }
-//                        await Task.Delay(500);
-//                    }
-
-//                    await channel.SendMessageAsync("`Done.`");
-//                });
-
-//            cgb.CreateCommand(Module.Prefix + "voice+text")
-//                .Alias(Module.Prefix + "v+t")
-//                .Description("Creates a text channel for each voice channel only users in that voice channel can see." +
-//                             $"If you are server owner, keep in mind you will see them all the time regardless. **Needs Manage Roles and Manage Channels Permissions.**| `{Prefix}voice+text`")
-//                .AddCheck(SimpleCheckers.ManageChannels())
-//                .AddCheck(SimpleCheckers.CanManageRoles)
-//                .Do(async e =>
-//                {
-//                    try
-//                    {
-//                        var config = SpecificConfigurations.Default.Of(e.Server.Id);
-//                        if (config.VoicePlusTextEnabled == true)
-//                        {
-//                            config.VoicePlusTextEnabled = false;
-//                            foreach (var textChannel in e.Server.TextChannels.Where(c => c.Name.EndsWith("-voice")))
-//                            {
-//                                try
-//                                {
-//                                    await textChannel.Delete().ConfigureAwait(false);
-//                                }
-//                                catch
-//                                {
-//                                    await channel.SendMessageAsync(
-//                                            ":anger: Error: Most likely i don't have permissions to do this.")
-//                                                .ConfigureAwait(false);
-//                                    return;
-//                                }
-//                            }
-//                            await channel.SendMessageAsync("Successfuly removed voice + text feature.").ConfigureAwait(false);
-//                            return;
-//                        }
-//                        config.VoicePlusTextEnabled = true;
-//                        await channel.SendMessageAsync("Successfuly enabled voice + text feature. " +
-//                                                    "**Make sure the bot has manage roles and manage channels permissions**")
-//                                                    .ConfigureAwait(false);
-
-//                    }
-//                    catch (Exception ex)
-//                    {
-//                        await channel.SendMessageAsync(ex.ToString()).ConfigureAwait(false);
-//                    }
-//                });
-//        }
-//    }
-//}

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

@@ -0,0 +1,170 @@
+using Discord;
+using Discord.Commands;
+using Discord.WebSocket;
+using NadekoBot.Attributes;
+using NadekoBot.Extensions;
+using NadekoBot.Services;
+using System;
+using System.Collections.Concurrent;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+
+namespace NadekoBot.Modules.Administration
+{
+    public partial class Administration
+    {
+        [Group]
+        public class VoicePlusTextCommands
+        {
+            Regex channelNameRegex = new Regex(@"[^a-zA-Z0-9 -]", RegexOptions.Compiled);
+            //guildid/voiceplustextenabled
+            private ConcurrentDictionary<ulong, bool> voicePlusTextCache;
+            public VoicePlusTextCommands()
+            {
+                NadekoBot.Client.UserUpdated += UserUpdatedEventHandler;
+                voicePlusTextCache = new ConcurrentDictionary<ulong, bool>();
+            }
+
+            private Task UserUpdatedEventHandler(IGuildUser before, IGuildUser after)
+            {
+                var task = Task.Run(async () =>
+                {
+                    var guild = before.Guild ?? after.Guild;
+                    var botUserPerms = guild.GetCurrentUser().GuildPermissions;
+                    try
+                    {
+                        if (before.VoiceChannel == after.VoiceChannel) return;
+
+                        bool isEnabled;
+                        voicePlusTextCache.TryGetValue(guild.Id, out isEnabled);
+                        if (!isEnabled)
+                            return;
+
+                        if (!botUserPerms.ManageChannels || !botUserPerms.ManageRoles)
+                        {
+                            try
+                            {
+                                await (await guild.GetOwnerAsync()).SendMessageAsync(
+                                    "I don't have manage server and/or Manage Channels permission," +
+                                    $" so I cannot run voice+text on **{guild.Name}** server.").ConfigureAwait(false);
+                            }
+                            catch { }
+                            using (var uow = DbHandler.UnitOfWork())
+                            {
+                                uow.GuildConfigs.For(before.Guild.Id).VoicePlusTextEnabled = false;
+                                voicePlusTextCache.TryUpdate(guild.Id, false, true);
+                            }
+                            return;
+                        }
+
+
+                        var beforeVch = before.VoiceChannel;
+                        if (beforeVch != null)
+                        {
+                            var textChannel = guild.GetTextChannels().Where(t => t.Name == GetChannelName(beforeVch.Name)).FirstOrDefault();
+                            if (textChannel != null)
+                                await textChannel.AddPermissionOverwriteAsync(before,
+                                    new OverwritePermissions(readMessages: PermValue.Deny,
+                                                       sendMessages: PermValue.Deny)).ConfigureAwait(false);
+                        }
+                        var afterVch = after.VoiceChannel;
+                        if (afterVch != null && guild.AFKChannelId != afterVch.Id)
+                        {
+                            var textChannel = guild.GetTextChannels()
+                                                        .Where(t => t.Name ==  GetChannelName(afterVch.Name))
+                                                        .FirstOrDefault();
+                            if (textChannel == null)
+                            {
+                                textChannel = (await guild.CreateTextChannelAsync(GetChannelName(afterVch.Name)).ConfigureAwait(false));
+                                await textChannel.AddPermissionOverwriteAsync(guild.EveryoneRole,
+                                    new OverwritePermissions(readMessages: PermValue.Deny,
+                                                       sendMessages: PermValue.Deny)).ConfigureAwait(false);
+                            }
+                            await textChannel.AddPermissionOverwriteAsync(after,
+                                new OverwritePermissions(readMessages: PermValue.Allow,
+                                                        sendMessages: PermValue.Allow)).ConfigureAwait(false);
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        Console.WriteLine(ex);
+                    }
+                });
+                return Task.CompletedTask;
+            }
+
+            private string GetChannelName(string voiceName) =>
+                channelNameRegex.Replace(voiceName, "").Trim().Replace(" ", "-").TrimTo(90, true) + "-voice";
+
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
+            [RequireContext(ContextType.Guild)]
+            [RequirePermission(GuildPermission.ManageRoles)]
+            [RequirePermission(GuildPermission.ManageChannels)]
+            public async Task VoicePlusText(IUserMessage msg, [Remainder] string arg)
+            {
+                var channel = (ITextChannel)msg.Channel;
+                var guild = channel.Guild;
+
+                var botUser = guild.GetCurrentUser();
+                if (!botUser.GuildPermissions.ManageRoles || !botUser.GuildPermissions.ManageChannels)
+                {
+                    await channel.SendMessageAsync(":anger: `I require manage roles and manage channels permissions to enable this feature.`");
+                    return;
+                }
+                try
+                {
+                    bool isEnabled;
+                    using (var uow = DbHandler.UnitOfWork())
+                    {
+                        var conf = uow.GuildConfigs.For(guild.Id);
+                        isEnabled = conf.VoicePlusTextEnabled = !conf.VoicePlusTextEnabled;
+                    }
+                    voicePlusTextCache.AddOrUpdate(guild.Id, isEnabled, (id, val) => isEnabled);
+                    if (isEnabled)
+                    {
+                        foreach (var textChannel in guild.GetTextChannels().Where(c => c.Name.EndsWith("-voice")))
+                        {
+                            try { await textChannel.DeleteAsync().ConfigureAwait(false); } catch { }
+                        }
+                        await channel.SendMessageAsync("Successfuly removed voice + text feature.").ConfigureAwait(false);
+                        return;
+                    }
+                    await channel.SendMessageAsync("Successfuly enabled voice + text feature.").ConfigureAwait(false);
+
+                }
+                catch (Exception ex)
+                {
+                    await channel.SendMessageAsync(ex.ToString()).ConfigureAwait(false);
+                }
+            }
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
+            [RequireContext(ContextType.Guild)]
+            [RequirePermission(GuildPermission.ManageChannels)]
+            [RequirePermission(GuildPermission.ManageRoles)]
+            public async Task CleanVPlusT(IUserMessage msg, [Remainder] string arg)
+            {
+                var channel = (ITextChannel)msg.Channel;
+                var guild = channel.Guild;
+                if (!guild.GetCurrentUser().GuildPermissions.ManageChannels)
+                {
+                    await channel.SendMessageAsync("`I have insufficient permission to do that.`");
+                    return;
+                }
+
+                var allTxtChannels = guild.GetTextChannels().Where(c => c.Name.EndsWith("-voice"));
+                var validTxtChannelNames = guild.GetVoiceChannels().Select(c => GetChannelName(c.Name));
+
+                var invalidTxtChannels = allTxtChannels.Where(c => !validTxtChannelNames.Contains(c.Name));
+
+                foreach (var c in invalidTxtChannels)
+                {
+                    try { await c.DeleteAsync().ConfigureAwait(false); } catch { }
+                    await Task.Delay(500);
+                }
+
+                await channel.SendMessageAsync("`Done.`");
+            }
+        }
+    }
+}

src/NadekoBot/Modules/ClashOfClans/ClashOfClans.cs

@@ -12,10 +12,9 @@ using NadekoBot.Services.Database.Models;
 using System.Linq;
 using NadekoBot.Services.Database;
 
-//todo DB
 namespace NadekoBot.Modules.ClashOfClans
 {
-    [Module(",", AppendSpace = false)]
+    [NadekoModule("ClashOfClans", ",")]
     public class ClashOfClans : DiscordModule
     {
         public static ConcurrentDictionary<ulong, List<ClashWar>> ClashWars { get; set; } = new ConcurrentDictionary<ulong, List<ClashWar>>();
@@ -55,7 +54,7 @@ namespace NadekoBot.Modules.ClashOfClans
             }
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task CreateWar(IUserMessage umsg, int size, [Remainder] string enemyClan = null)
         {
@@ -88,7 +87,7 @@ namespace NadekoBot.Modules.ClashOfClans
             await channel.SendMessageAsync($"❗🔰**CREATED CLAN WAR AGAINST {cw.ShortPrint()}**").ConfigureAwait(false);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task StartWar(IUserMessage umsg, [Remainder] string number = null)
         {
@@ -116,7 +115,7 @@ namespace NadekoBot.Modules.ClashOfClans
             SaveWar(war);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task ListWar(IUserMessage umsg, [Remainder] string number = null)
         {
@@ -159,7 +158,7 @@ namespace NadekoBot.Modules.ClashOfClans
             await channel.SendMessageAsync(warsInfo.Item1[warsInfo.Item2].ToPrettyString()).ConfigureAwait(false);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Claim(IUserMessage umsg, int number, int baseNumber, [Remainder] string other_name = null)
         {
@@ -187,7 +186,7 @@ namespace NadekoBot.Modules.ClashOfClans
             }
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task ClaimFinish1(IUserMessage umsg, int number, int baseNumber, [Remainder] string other_name = null)
         {
@@ -195,7 +194,7 @@ namespace NadekoBot.Modules.ClashOfClans
             await FinishClaim(umsg, number, baseNumber, other_name, 1);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task ClaimFinish2(IUserMessage umsg, int number, int baseNumber, [Remainder] string other_name = null)
         {
@@ -203,7 +202,7 @@ namespace NadekoBot.Modules.ClashOfClans
             await FinishClaim(umsg, number, baseNumber, other_name, 2);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task ClaimFinish(IUserMessage umsg, int number, int baseNumber, [Remainder] string other_name = null)
         {
@@ -211,7 +210,7 @@ namespace NadekoBot.Modules.ClashOfClans
             await FinishClaim(umsg, number, baseNumber, other_name);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task EndWar(IUserMessage umsg, int number)
         {
@@ -232,7 +231,7 @@ namespace NadekoBot.Modules.ClashOfClans
             warsInfo.Item1.RemoveAt(warsInfo.Item2);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Unclaim(IUserMessage umsg, int number, [Remainder] string otherName = null)
         {

src/NadekoBot/Modules/DiscordModule.cs

@@ -8,10 +8,10 @@ namespace NadekoBot.Modules
 {
     public class DiscordModule
     {
-        protected ILocalization _l;
-        protected CommandService _commands;
-        protected DiscordSocketClient _client;
-        protected Logger _log;
+        protected ILocalization _l { get; }
+        protected CommandService _commands { get; }
+        protected DiscordSocketClient _client { get; }
+        protected Logger _log { get; }
 
         public DiscordModule(ILocalization loc, CommandService cmds, DiscordSocketClient client)
         {

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

@@ -20,7 +20,7 @@ namespace NadekoBot.Modules.Gambling
         {
             public static ConcurrentDictionary<ulong, AnimalRace> AnimalRaces = new ConcurrentDictionary<ulong, AnimalRace>();
 
-            [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
             [RequireContext(ContextType.Guild)]
             public async Task Race(IUserMessage umsg)
             {
@@ -32,7 +32,7 @@ namespace NadekoBot.Modules.Gambling
                     await channel.SendMessageAsync("🏁 `Failed starting a race. Another race is probably running.`");
             }
 
-            [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
             [RequireContext(ContextType.Guild)]
             public async Task JoinRace(IUserMessage umsg, int amount = 0)
             {
@@ -41,17 +41,10 @@ namespace NadekoBot.Modules.Gambling
                 if (amount < 0)
                     amount = 0;
 
-                //todo DB
-                //var userFlowers = Gambling.GetUserFlowers(umsg.Author.Id);
+                if (amount > 0)
+                    if(!await CurrencyHandler.RemoveCurrencyAsync((IGuildUser)umsg.Author, "BetRace", amount, true).ConfigureAwait(false))
+                        await channel.SendMessageAsync($"{umsg.Author.Mention} You don't have enough {Gambling.CurrencyName}s.").ConfigureAwait(false);
 
-                //if (userFlowers < amount)
-                //{
-                //    await channel.SendMessageAsync($"{umsg.Author.Mention} You don't have enough {NadekoBot.Config.CurrencyName}s. You only have {userFlowers}{NadekoBot.Config.CurrencySign}.").ConfigureAwait(false);
-                //    return;
-                //}
-
-                //if (amount > 0)
-                //    await FlowersHandler.RemoveFlowers(umsg.Author, "BetRace", (int)amount, true).ConfigureAwait(false);
 
                 AnimalRace ar;
                 if (!AnimalRaces.TryGetValue(channel.Guild.Id, out ar))
@@ -67,7 +60,7 @@ namespace NadekoBot.Modules.Gambling
 
                 private ConcurrentQueue<string> animals { get; }
 
-                public bool Fail { get; internal set; }
+                public bool Fail { get; set; }
 
                 public List<Participant> participants = new List<Participant>();
                 private ulong serverId;
@@ -116,9 +109,9 @@ namespace NadekoBot.Modules.Gambling
                             {
                                 await raceChannel.SendMessageAsync("🏁`Race failed to start since there was not enough participants.`");
                                 var p = participants.FirstOrDefault();
-                                //todo DB
-                                //if (p != null)
-                                //    await FlowersHandler.AddFlowersAsync(p.User, "BetRace", p.AmountBet, true).ConfigureAwait(false);
+                                
+                                if (p != null)
+                                    await CurrencyHandler.AddCurrencyAsync(p.User, "BetRace", p.AmountBet, true).ConfigureAwait(false);
                                 End();
                                 return;
                             }
@@ -137,7 +130,7 @@ namespace NadekoBot.Modules.Gambling
 
                 private async Task StartRace()
                 {
-                    var rng = new Random();
+                    var rng = new NadekoRandom();
                     Participant winner = null;
                     IUserMessage msg = null;
                     int place = 1;
@@ -150,7 +143,6 @@ namespace NadekoBot.Modules.Gambling
                             //update the state
                             participants.ForEach(p =>
                             {
-
                                 p.Total += 1 + rng.Next(0, 10);
                                 if (p.Total > 60)
                                 {
@@ -191,8 +183,8 @@ namespace NadekoBot.Modules.Gambling
                     if (winner.AmountBet > 0)
                     {
                         var wonAmount = winner.AmountBet * (participants.Count - 1);
-                        //todo DB
-                        //await FlowersHandler.AddFlowersAsync(winner.User, "Won a Race", wonAmount).ConfigureAwait(false);
+                        
+                        await CurrencyHandler.AddCurrencyAsync(winner.User, "Won a Race", wonAmount, false).ConfigureAwait(false);
                         await raceChannel.SendMessageAsync($"🏁 {winner.User.Mention} as {winner.Animal} **Won the race and {wonAmount}{CurrencySign}!**").ConfigureAwait(false);
                     }
                     else
@@ -202,14 +194,15 @@ namespace NadekoBot.Modules.Gambling
 
                 }
 
-                private async Task Client_MessageReceived(IMessage imsg)
+                private Task Client_MessageReceived(IMessage imsg)
                 {
                     var msg = imsg as IUserMessage;
                     if (msg == null)
-                        return;
-                    if (await msg.IsAuthor() || !(imsg.Channel is ITextChannel) || imsg.Channel != raceChannel)
-                        return;
+                        return Task.CompletedTask;
+                    if (msg.IsAuthor() || !(imsg.Channel is ITextChannel) || imsg.Channel != raceChannel)
+                        return Task.CompletedTask;
                     messagesSinceGameStarted++;
+                    return Task.CompletedTask;
                 }
 
                 private async Task CheckForFullGameAsync(CancellationToken cancelToken)

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

@@ -2,6 +2,7 @@ using Discord;
 using Discord.Commands;
 using NadekoBot.Attributes;
 using NadekoBot.Extensions;
+using NadekoBot.Services;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -13,99 +14,100 @@ namespace NadekoBot.Modules.Gambling
     public partial class Gambling
     {
         private Regex dndRegex { get; } = new Regex(@"(?<n1>\d+)d(?<n2>\d+)", RegexOptions.Compiled);
-        ////todo drawing
-        //[LocalizedCommand, LocalizedDescription, LocalizedSummary]
-        //[RequireContext(ContextType.Guild)]
-        //public Task Roll(IUserMessage umsg, [Remainder] string arg = null) =>
-        //    InternalRoll(umsg, arg, true);
 
-        //[LocalizedCommand, LocalizedDescription, LocalizedSummary]
-        //[RequireContext(ContextType.Guild)]
-        //public Task Rolluo(IUserMessage umsg, [Remainder] string arg = null) =>
-        //    InternalRoll(umsg, arg, false);
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
+        [RequireContext(ContextType.Guild)]
+        public Task Roll(IUserMessage umsg, [Remainder] string arg = null) =>
+            publicRoll(umsg, arg, true);
 
-        //private async Task InternalRoll(IUserMessage umsg, string arg, bool ordered) {
-        //    var channel = (ITextChannel)umsg.Channel;
-        //    var r = new Random();
-        //    if (string.IsNullOrWhiteSpace(arg))
-        //    {
-        //        var gen = r.Next(0, 101);
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
+        [RequireContext(ContextType.Guild)]
+        public Task Rolluo(IUserMessage umsg, [Remainder] string arg = null) =>
+            publicRoll(umsg, arg, false);
+        //todo drawing
+        private async Task publicRoll(IUserMessage umsg, string arg, bool ordered)
+        {
+            var channel = (ITextChannel)umsg.Channel;
+            var r = new NadekoRandom();
+            //if (string.IsNullOrWhiteSpace(arg))
+            //{
+            //    var gen = r.Next(0, 101);
 
-        //        var num1 = gen / 10;
-        //        var num2 = gen % 10;
+            //    var num1 = gen / 10;
+            //    var num2 = gen % 10;
 
-        //        var imageStream = await new Image[2] { GetDice(num1), GetDice(num2) }.Merge().ToStream(ImageFormat.Png);
+            //    var imageStream = await new Image[2] { GetDice(num1), GetDice(num2) }.Merge().ToStream(ImageFormat.Png);
 
-        //        await channel.SendFileAsync(imageStream, "dice.png").ConfigureAwait(false);
-        //        return;
-        //    }
-        //    Match m;
-        //    if ((m = dndRegex.Match(arg)).Length != 0)
-        //    {
-        //        int n1;
-        //        int n2;
-        //        if (int.TryParse(m.Groups["n1"].ToString(), out n1) &&
-        //            int.TryParse(m.Groups["n2"].ToString(), out n2) &&
-        //            n1 <= 50 && n2 <= 100000 && n1 > 0 && n2 > 0)
-        //        {
-        //            var arr = new int[n1];
-        //            for (int i = 0; i < n1; i++)
-        //            {
-        //                arr[i] = r.Next(1, n2 + 1);
-        //            }
-        //            var elemCnt = 0;
-        //            await channel.SendMessageAsync($"`Rolled {n1} {(n1 == 1 ? "die" : "dice")} 1-{n2}.`\n`Result:` " + string.Join(", ", (ordered ? arr.OrderBy(x => x).AsEnumerable() : arr).Select(x => elemCnt++ % 2 == 0 ? $"**{x}**" : x.ToString()))).ConfigureAwait(false);
-        //        }
-        //        return;
-        //    }
-        //    try
-        //    {
-        //        var num = int.Parse(e.Args[0]);
-        //        if (num < 1) num = 1;
-        //        if (num > 30)
-        //        {
-        //            await channel.SendMessageAsync("You can roll up to 30 dice at a time.").ConfigureAwait(false);
-        //            num = 30;
-        //        }
-        //        var dices = new List<Image>(num);
-        //        var values = new List<int>(num);
-        //        for (var i = 0; i < num; i++)
-        //        {
-        //            var randomNumber = r.Next(1, 7);
-        //            var toInsert = dices.Count;
-        //            if (ordered)
-        //            {
-        //                if (randomNumber == 6 || dices.Count == 0)
-        //                    toInsert = 0;
-        //                else if (randomNumber != 1)
-        //                    for (var j = 0; j < dices.Count; j++)
-        //                    {
-        //                        if (values[j] < randomNumber)
-        //                        {
-        //                            toInsert = j;
-        //                            break;
-        //                        }
-        //                    }
-        //            }
-        //            else
-        //            {
-        //                toInsert = dices.Count;
-        //            }
-        //            dices.Insert(toInsert, GetDice(randomNumber));
-        //            values.Insert(toInsert, randomNumber);
-        //        }
+            //    await channel.SendFileAsync(imageStream, "dice.png").ConfigureAwait(false);
+            //    return;
+            //}
+            Match m;
+            if ((m = dndRegex.Match(arg)).Length != 0)
+            {
+                int n1;
+                int n2;
+                if (int.TryParse(m.Groups["n1"].ToString(), out n1) &&
+                    int.TryParse(m.Groups["n2"].ToString(), out n2) &&
+                    n1 <= 50 && n2 <= 100000 && n1 > 0 && n2 > 0)
+                {
+                    var arr = new int[n1];
+                    for (int i = 0; i < n1; i++)
+                    {
+                        arr[i] = r.Next(1, n2 + 1);
+                    }
+                    var elemCnt = 0;
+                    await channel.SendMessageAsync($"`Rolled {n1} {(n1 == 1 ? "die" : "dice")} 1-{n2}.`\n`Result:` " + string.Join(", ", (ordered ? arr.OrderBy(x => x).AsEnumerable() : arr).Select(x => elemCnt++ % 2 == 0 ? $"**{x}**" : x.ToString()))).ConfigureAwait(false);
+                }
+                return;
+            }
+            //try
+            //{
+            //    var num = int.Parse(e.Args[0]);
+            //    if (num < 1) num = 1;
+            //    if (num > 30)
+            //    {
+            //        await channel.SendMessageAsync("You can roll up to 30 dice at a time.").ConfigureAwait(false);
+            //        num = 30;
+            //    }
+            //    var dices = new List<Image>(num);
+            //    var values = new List<int>(num);
+            //    for (var i = 0; i < num; i++)
+            //    {
+            //        var randomNumber = r.Next(1, 7);
+            //        var toInsert = dices.Count;
+            //        if (ordered)
+            //        {
+            //            if (randomNumber == 6 || dices.Count == 0)
+            //                toInsert = 0;
+            //            else if (randomNumber != 1)
+            //                for (var j = 0; j < dices.Count; j++)
+            //                {
+            //                    if (values[j] < randomNumber)
+            //                    {
+            //                        toInsert = j;
+            //                        break;
+            //                    }
+            //                }
+            //        }
+            //        else
+            //        {
+            //            toInsert = dices.Count;
+            //        }
+            //        dices.Insert(toInsert, GetDice(randomNumber));
+            //        values.Insert(toInsert, randomNumber);
+            //    }
 
-        //        var bitmap = dices.Merge();
-        //        await channel.SendMessageAsync(values.Count + " Dice rolled. Total: **" + values.Sum() + "** Average: **" + (values.Sum() / (1.0f * values.Count)).ToString("N2") + "**").ConfigureAwait(false);
-        //        await channel.SendFileAsync("dice.png", bitmap.ToStream(ImageFormat.Png)).ConfigureAwait(false);
-        //    }
-        //    catch
-        //    {
-        //        await channel.SendMessageAsync("Please enter a number of dice to roll.").ConfigureAwait(false);
-        //    }
-        //}
+            //    var bitmap = dices.Merge();
+            //    await channel.SendMessageAsync(values.Count + " Dice rolled. Total: **" + values.Sum() + "** Average: **" + (values.Sum() / (1.0f * values.Count)).ToString("N2") + "**").ConfigureAwait(false);
+            //    await channel.SendFileAsync("dice.png", bitmap.ToStream(ImageFormat.Png)).ConfigureAwait(false);
+            //}
+            //catch
+            //{
+            //    await channel.SendMessageAsync("Please enter a number of dice to roll.").ConfigureAwait(false);
+            //}
+        }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task NRoll(IUserMessage umsg, [Remainder] string range)
         {
@@ -123,11 +125,11 @@ namespace NadekoBot.Modules.Gambling
                                     .ToArray();
                     if (arr[0] > arr[1])
                         throw new ArgumentException("First argument should be bigger than the second one.");
-                    rolled = new Random().Next(arr[0], arr[1] + 1);
+                    rolled = new NadekoRandom().Next(arr[0], arr[1] + 1);
                 }
                 else
                 {
-                    rolled = new Random().Next(0, int.Parse(range) + 1);
+                    rolled = new NadekoRandom().Next(0, int.Parse(range) + 1);
                 }
 
                 await channel.SendMessageAsync($"{umsg.Author.Mention} rolled **{rolled}**.").ConfigureAwait(false);

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

@@ -11,11 +11,11 @@
 ////todo drawing
 //namespace NadekoBot.Modules.Gambling
 //{
-//    internal class DrawCommand : DiscordCommand
+//    public class DrawCommand : DiscordCommand
 //    {
 //        public DrawCommand(DiscordModule module) : base(module) { }
 
-//        internal override void Init(CommandGroupBuilder cgb)
+//        public override void Init(CommandGroupBuilder cgb)
 //        {
 //            cgb.CreateCommand(Module.Prefix + "draw")
 //                .Description($"Draws a card from the deck.If you supply number [x], she draws up to 5 cards from the deck. | `{Prefix}draw [x]`")

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

@@ -1,113 +1,93 @@
-//using Discord.Commands;
-//using NadekoBot.Classes;
-//using NadekoBot.Extensions;
-//using System;
-//using System.Drawing;
-//using System.Threading.Tasks;
+using Discord;
+using Discord.Commands;
 
-////todo drawing
-//namespace NadekoBot.Modules.Gambling
-//{
-//    internal class FlipCoinCommand : DiscordCommand
-//    {
+//todo drawing
+namespace NadekoBot.Modules.Gambling
+{ 
+    [Group]
+    public class FlipCoinCommands
+    {
 
-//        public FlipCoinCommand(DiscordModule module) : base(module) { }
-
-//        internal override void Init(CommandGroupBuilder cgb)
-//        {
-//            cgb.CreateCommand(Module.Prefix + "flip")
-//                .Description($"Flips coin(s) - heads or tails, and shows an image. | `{Prefix}flip` or `{Prefix}flip 3`")
-//                .Parameter("count", ParameterType.Optional)
-//                .Do(FlipCoinFunc());
-
-//            cgb.CreateCommand(Module.Prefix + "betflip")
-//                .Alias(Prefix+"bf")
-//                .Description($"Bet to guess will the result be heads or tails. Guessing award you double flowers you've bet. | `{Prefix}bf 5 heads` or `{Prefix}bf 3 t`")
-//                .Parameter("amount", ParameterType.Required)
-//                .Parameter("guess", ParameterType.Required)
-//                .Do(BetFlipCoinFunc());
-//        }
+        public FlipCoinCommands() { }
 
 
+        ////todo drawing
+        //[LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
+        //[RequireContext(ContextType.Guild)]
+        //public async Task Flip(IUserMessage imsg, int count = 0)
+        //{
+        //    var channel = (ITextChannel)imsg.Channel;
+        //    if (count == 0)
+        //    {
+        //        if (rng.Next(0, 2) == 1)
+        //            await channel.SendFileAsync("heads.png", ).ConfigureAwait(false);
+        //        else
+        //            await channel.SendFileAsync("tails.png", ).ConfigureAwait(false);
+        //        return;
+        //    }
+        //    if (result > 10)
+        //        result = 10;
+        //    var imgs = new Image[result];
+        //    for (var i = 0; i < result; i++)
+        //    {
+        //        imgs[i] = rng.Next(0, 2) == 0 ?
+        //                    Properties.Resources.tails :
+        //                    Properties.Resources.heads;
+        //    }
+        //    await channel.SendFile($"{result} coins.png", imgs.Merge().ToStream(System.Drawing.Imaging.ImageFormat.Png)).ConfigureAwait(false);
+        //    return;
+        //    await channel.SendMessageAsync("Invalid number").ConfigureAwait(false);
+        //}
 
-//        private readonly Random rng = new Random();
-//        public Func<CommandEventArgs, Task> BetFlipCoinFunc() => async e =>
-//        {
+        //[LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
+        //[RequireContext(ContextType.Guild)]
+        //public async Task Betflip(IUserMessage umsg, int amount, string guess)
+        //{
+        //    var channel = (ITextChannel)umsg.Channel;
+        //    var guildUser = (IGuildUser)umsg.Author;
+        //    var guessStr = guess.Trim().ToUpperInvariant();
+        //    if (guessStr != "H" && guessStr != "T" && guessStr != "HEADS" && guessStr != "TAILS")
+        //        return;
             
-//            var amountstr = amount.Trim();
+        //    if (amount < 1)
+        //        return;
 
-//            var guessStr = guess.Trim().ToUpperInvariant();
-//            if (guessStr != "H" && guessStr != "T" && guessStr != "HEADS" && guessStr != "TAILS")
-//                return;
+        //    var userFlowers = Gambling.GetUserFlowers(umsg.Author.Id);
 
-//            int amount;
-//            if (!int.TryParse(amountstr, out amount) || amount < 1)
-//                return;
+        //    if (userFlowers < amount)
+        //    {
+        //        await channel.SendMessageAsync($"{umsg.Author.Mention} You don't have enough {Gambling.CurrencyName}s. You only have {userFlowers}{Gambling.CurrencySign}.").ConfigureAwait(false);
+        //        return;
+        //    }
 
-//            var userFlowers = Gambling.GetUserFlowers(umsg.Author.Id);
+        //    await CurrencyHandler.RemoveCurrencyAsync(guildUser, "Betflip Gamble", amount, false).ConfigureAwait(false);
+        //    //heads = true
+        //    //tails = false
 
-//            if (userFlowers < amount)
-//            {
-//                await channel.SendMessageAsync($"{umsg.Author.Mention} You don't have enough {NadekoBot.Config.CurrencyName}s. You only have {userFlowers}{NadekoBot.Config.CurrencySign}.").ConfigureAwait(false);
-//                return;
-//            }
+        //    var isHeads = guessStr == "HEADS" || guessStr == "H";
+        //    bool result = false;
+        //    var rng = new NadekoRandom();
+        //    if (rng.Next(0, 2) == 1)
+        //    {
+        //        await channel.SendFileAsync("heads.png", Properties.Resources.heads.ToStream(System.Drawing.Imaging.ImageFormat.Png)).ConfigureAwait(false);
+        //        result = true;
+        //    }
+        //    else
+        //    {
+        //        await channel.SendFileAsync("tails.png", Properties.Resources.tails.ToStream(System.Drawing.Imaging.ImageFormat.Png)).ConfigureAwait(false);
+        //    }
 
-//            await FlowersHandler.RemoveFlowers(umsg.Author, "Betflip Gamble", (int)amount, true).ConfigureAwait(false);
-//            //heads = true
-//            //tails = false
+        //    string str;
+        //    if (isHeads == result)
+        //    {
+        //        str = $"{umsg.Author.Mention}`You guessed it!` You won {amount * 2}{Gambling.CurrencySign}";
+        //        await CurrencyHandler.AddCurrencyAsync((IGuildUser)umsg.Author, "Betflip Gamble", amount * 2, false).ConfigureAwait(false);
 
-//            var guess = guessStr == "HEADS" || guessStr == "H";
-//            bool result = false;
-//            if (rng.Next(0, 2) == 1) {
-//                await e.Channel.SendFile("heads.png", Properties.Resources.heads.ToStream(System.Drawing.Imaging.ImageFormat.Png)).ConfigureAwait(false);
-//                result = true;
-//            }
-//            else {
-//                await e.Channel.SendFile("tails.png", Properties.Resources.tails.ToStream(System.Drawing.Imaging.ImageFormat.Png)).ConfigureAwait(false);
-//            }
+        //    }
+        //    else
+        //        str = $"{umsg.Author.Mention}`More luck next time.`";
 
-//            string str;
-//            if (guess == result)
-//            {
-//                str = $"{umsg.Author.Mention}`You guessed it!` You won {amount * 2}{NadekoBot.Config.CurrencySign}";
-//                await FlowersHandler.AddFlowersAsync(umsg.Author, "Betflip Gamble", amount * 2, true).ConfigureAwait(false);
-
-//            }
-//            else
-//                str = $"{umsg.Author.Mention}`More luck next time.`";
-
-//            await channel.SendMessageAsync(str).ConfigureAwait(false);
-//        };
-
-//        public Func<CommandEventArgs, Task> FlipCoinFunc() => async e =>
-//        {
-
-//            if (count == "")
-//            {
-//                if (rng.Next(0, 2) == 1)
-//                    await e.Channel.SendFile("heads.png", Properties.Resources.heads.ToStream(System.Drawing.Imaging.ImageFormat.Png)).ConfigureAwait(false);
-//                else
-//                    await e.Channel.SendFile("tails.png", Properties.Resources.tails.ToStream(System.Drawing.Imaging.ImageFormat.Png)).ConfigureAwait(false);
-//            }
-//            else
-//            {
-//                int result;
-//                if (int.TryParse(count, out result))
-//                {
-//                    if (result > 10)
-//                        result = 10;
-//                    var imgs = new Image[result];
-//                    for (var i = 0; i < result; i++)
-//                    {
-//                        imgs[i] = rng.Next(0, 2) == 0 ?
-//                                    Properties.Resources.tails :
-//                                    Properties.Resources.heads;
-//                    }
-//                    await e.Channel.SendFile($"{result} coins.png", imgs.Merge().ToStream(System.Drawing.Imaging.ImageFormat.Png)).ConfigureAwait(false);
-//                    return;
-//                }
-//                await channel.SendMessageAsync("Invalid number").ConfigureAwait(false);
-//            }
-//        };
-//    }
-//}
+        //    await channel.SendMessageAsync(str).ConfigureAwait(false);
+        //}
+    }
+}

src/NadekoBot/Modules/Gambling/Commands/Models/Cards.cs

@@ -1,4 +1,6 @@
-using System;
+using NadekoBot.Extensions;
+using NadekoBot.Services;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -114,7 +116,7 @@ namespace NadekoBot.Modules.Gambling.Models
                 }
             }
         }
-        private Random r = new Random();
+        private Random r = new NadekoRandom();
         /// <summary>
         /// Take a card from the pool, you either take it from the top if the deck is shuffled, or from a random place if the deck is in the default order.
         /// </summary>
@@ -143,7 +145,7 @@ namespace NadekoBot.Modules.Gambling.Models
         private void Shuffle()
         {
             if (cardPool.Count <= 1) return;
-            var orderedPool = cardPool.OrderBy(x => r.Next());
+            var orderedPool = cardPool.Shuffle();
             cardPool = cardPool as List<Card> ?? orderedPool.ToList();
         }
         public override string ToString() => string.Concat(cardPool.Select(c => c.ToString())) + Environment.NewLine;

src/NadekoBot/Modules/Gambling/Gambling.cs

@@ -9,11 +9,12 @@ using System.Threading.Tasks;
 using NadekoBot.Services;
 using Discord.WebSocket;
 using NadekoBot.Services.Database;
+using NadekoBot.Services.Database.Models;
+using System.Collections.Generic;
 
-//todo DB
 namespace NadekoBot.Modules.Gambling
 {
-    [Module("$", AppendSpace = false)]
+    [NadekoModule("Gambling", "$")]
     public partial class Gambling : DiscordModule
     {
         public static string CurrencyName { get; set; }
@@ -30,10 +31,9 @@ namespace NadekoBot.Modules.Gambling
                 CurrencySign = conf.CurrencySign;
                 CurrencyPluralName = conf.CurrencyPluralName;
             }
-            
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Raffle(IUserMessage umsg, [Remainder] IRole role = null)
         {
@@ -43,55 +43,52 @@ namespace NadekoBot.Modules.Gambling
 
             var members = role.Members().Where(u => u.Status == UserStatus.Online);
             var membersArray = members as IUser[] ?? members.ToArray();
-            var usr = membersArray[new Random().Next(0, membersArray.Length)];
+            var usr = membersArray[new NadekoRandom().Next(0, membersArray.Length)];
             await channel.SendMessageAsync($"**Raffled user:** {usr.Username} (id: {usr.Id})").ConfigureAwait(false);
-
         }
         
-        ////todo DB
-        //[LocalizedCommand("$$$"), LocalizedDescription("$$$"), LocalizedSummary("$$$")]
-        //[RequireContext(ContextType.Guild)]
-        //public async Task Cash(IUserMessage umsg, [Remainder] string arg)
-        //{
-        //    var channel = (ITextChannel)umsg.Channel;
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
+        [RequireContext(ContextType.Guild)]
+        public async Task Cash(IUserMessage umsg, [Remainder] IUser user = null)
+        {
+            var channel = (ITextChannel)umsg.Channel;
 
-        //    var usr = e.Message.MentionedUsers.FirstOrDefault() ?? umsg.Author;
-        //    var pts = GetUserFlowers(usr.Id);
-        //    var str = $"{usr.Name} has {pts} {NadekoBot.Config.CurrencySign}";
-        //    await channel.SendMessageAsync(str).ConfigureAwait(false);
-        //}
+            user = user ?? umsg.Author;
+            long amount;
+            BotConfig config;
+            using (var uow = DbHandler.UnitOfWork())
+            {
+                amount = uow.Currency.GetUserCurrency(user.Id);
+                config = uow.BotConfig.GetOrCreate();
+            }
 
-        ////todo DB
-        //[LocalizedCommand, LocalizedDescription, LocalizedSummary]
-        //[RequireContext(ContextType.Guild)]
-        //public async Task Give(IUserMessage umsg, long amount, [Remainder] IUser receiver)
-        //{
-        //    var channel = (ITextChannel)umsg.Channel;
-        //    if (amount <= 0)
-        //        return;
-        //    var userFlowers = GetUserFlowers(umsg.Author.Id);
+            await channel.SendMessageAsync($"{user.Username} has {amount} {config.CurrencySign}").ConfigureAwait(false);
+        }
         
-        //    if (userFlowers < amount)
-        //    {
-        //        await channel.SendMessageAsync($"{umsg.Author.Mention} You don't have enough {NadekoBot.Config.CurrencyName}s. You only have {userFlowers}{NadekoBot.Config.CurrencySign}.").ConfigureAwait(false);
-        //        return;
-        //    }
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
+        [RequireContext(ContextType.Guild)]
+        public async Task Give(IUserMessage umsg, long amount, [Remainder] IGuildUser receiver)
+        {
+            var channel = (ITextChannel)umsg.Channel;
+            if (amount <= 0)
+                return;
+            var success = await CurrencyHandler.RemoveCurrencyAsync((IGuildUser)umsg.Author, $"Gift to {receiver.Username} ({receiver.Id}).", amount, true).ConfigureAwait(false);
+            if (!success)
+            {
+                await channel.SendMessageAsync($"{umsg.Author.Mention} You don't have enough {Gambling.CurrencyPluralName}.").ConfigureAwait(false);
+                return;
+            }
+            await CurrencyHandler.AddCurrencyAsync(receiver, $"Gift from {umsg.Author.Username} ({umsg.Author.Id}).", amount, true).ConfigureAwait(false);
+            await channel.SendMessageAsync($"{umsg.Author.Mention} successfully sent {amount} {Gambling.CurrencyPluralName}s to {receiver.Mention}!").ConfigureAwait(false);
+        }
 
-        //    await FlowersHandler.RemoveFlowers(umsg.Author, "Gift", (int)amount, true).ConfigureAwait(false);
-        //    await FlowersHandler.AddFlowersAsync(receiver, "Gift", (int)amount).ConfigureAwait(false);
-
-        //    await channel.SendMessageAsync($"{umsg.Author.Mention} successfully sent {amount} {NadekoBot.Config.CurrencyName}s to {receiver.Mention}!").ConfigureAwait(false);
-
-        //}
-
-        ////todo DB
         ////todo owner only
-        //[LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        //[LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         //[RequireContext(ContextType.Guild)]
         //public Task Award(IUserMessage umsg, long amount, [Remainder] IGuildUser usr) =>
         //    Award(umsg, amount, usr.Id);
 
-        //[LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        //[LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         //[RequireContext(ContextType.Guild)]
         //public async Task Award(IUserMessage umsg, long amount, [Remainder] ulong usrId)
         //{
@@ -100,19 +97,19 @@ namespace NadekoBot.Modules.Gambling
         //    if (amount <= 0)
         //        return;
 
-        //    await FlowersHandler.AddFlowersAsync(usrId, $"Awarded by bot owner. ({umsg.Author.Username}/{umsg.Author.Id})", (int)amount).ConfigureAwait(false);
+        //    await CurrencyHandler.AddFlowersAsync(usrId, $"Awarded by bot owner. ({umsg.Author.Username}/{umsg.Author.Id})", (int)amount).ConfigureAwait(false);
 
-        //    await channel.SendMessageAsync($"{umsg.Author.Mention} successfully awarded {amount} {NadekoBot.Config.CurrencyName}s to <@{usrId}>!").ConfigureAwait(false);
+        //    await channel.SendMessageAsync($"{umsg.Author.Mention} successfully awarded {amount} {Gambling.CurrencyName}s to <@{usrId}>!").ConfigureAwait(false);
         //}
 
         ////todo owner only
-        ////todo DB
-        //[LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        //[LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         //[RequireContext(ContextType.Guild)]
         //public Task Take(IUserMessage umsg, long amount, [Remainder] IGuildUser user) =>
         //    Take(umsg, amount, user.Id);
 
-        //[LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        //todo owner only
+        //[LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         //[RequireContext(ContextType.Guild)]
         //public async Task Take(IUserMessage umsg, long amount, [Remainder] ulong usrId)
         //{
@@ -120,76 +117,84 @@ namespace NadekoBot.Modules.Gambling
         //    if (amount <= 0)
         //        return;
 
-        //    await FlowersHandler.RemoveFlowers(usrId, $"Taken by bot owner.({umsg.Author.Username}/{umsg.Author.Id})", (int)amount).ConfigureAwait(false);
+        //    await CurrencyHandler.RemoveFlowers(usrId, $"Taken by bot owner.({umsg.Author.Username}/{umsg.Author.Id})", (int)amount).ConfigureAwait(false);
 
-        //    await channel.SendMessageAsync($"{umsg.Author.Mention} successfully took {amount} {NadekoBot.Config.CurrencyName}s from <@{usrId}>!").ConfigureAwait(false);
+        //    await channel.SendMessageAsync($"{umsg.Author.Mention} successfully took {amount} {Gambling.CurrencyName}s from <@{usrId}>!").ConfigureAwait(false);
         //}
 
-        //[LocalizedCommand, LocalizedDescription, LocalizedSummary]
-        //[RequireContext(ContextType.Guild)]
-        //public async Task BetRoll(IUserMessage umsg, int amount)
-        //{
-        //    var channel = (ITextChannel)umsg.Channel;
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
+        [RequireContext(ContextType.Guild)]
+        public async Task BetRoll(IUserMessage umsg, long amount)
+        {
+            var channel = (ITextChannel)umsg.Channel;
 
-        //    if (amount < 1)
-        //        return;
+            if (amount < 1)
+                return;
 
-        //    var userFlowers = GetUserFlowers(umsg.Author.Id);
+            var guildUser = (IGuildUser)umsg.Author;
 
-        //    if (userFlowers < amount)
-        //    {
-        //        await channel.SendMessageAsync($"{umsg.Author.Mention} You don't have enough {NadekoBot.Config.CurrencyName}s. You only have {userFlowers}{NadekoBot.Config.CurrencySign}.").ConfigureAwait(false);
-        //        return;
-        //    }
+            long userFlowers;
+            using (var uow = DbHandler.UnitOfWork())
+            {
+                userFlowers = uow.Currency.GetOrCreate(umsg.Author.Id).Amount;
+            }
 
-        //    await FlowersHandler.RemoveFlowers(umsg.Author, "Betroll Gamble", (int)amount, true).ConfigureAwait(false);
+            if (userFlowers < amount)
+            {
+                await channel.SendMessageAsync($"{guildUser.Mention} You don't have enough {Gambling.CurrencyPluralName}. You only have {userFlowers}{Gambling.CurrencySign}.").ConfigureAwait(false);
+                return;
+            }
 
-        //    var rng = new Random().Next(0, 101);
-        //    var str = $"{umsg.Author.Mention} `You rolled {rng}.` ";
-        //    if (rng < 67)
-        //    {
-        //        str += "Better luck next time.";
-        //    }
-        //    else if (rng < 90)
-        //    {
-        //        str += $"Congratulations! You won {amount * 2}{NadekoBot.Config.CurrencySign} for rolling above 66";
-        //        await FlowersHandler.AddFlowersAsync(umsg.Author, "Betroll Gamble", amount * 2, true).ConfigureAwait(false);
-        //    }
-        //    else if (rng < 100)
-        //    {
-        //        str += $"Congratulations! You won {amount * 3}{NadekoBot.Config.CurrencySign} for rolling above 90.";
-        //        await FlowersHandler.AddFlowersAsync(umsg.Author, "Betroll Gamble", amount * 3, true).ConfigureAwait(false);
-        //    }
-        //    else
-        //    {
-        //        str += $"👑 Congratulations! You won {amount * 10}{NadekoBot.Config.CurrencySign} for rolling **100**. 👑";
-        //        await FlowersHandler.AddFlowersAsync(umsg.Author, "Betroll Gamble", amount * 10, true).ConfigureAwait(false);
-        //    }
+            await CurrencyHandler.RemoveCurrencyAsync(guildUser, "Betroll Gamble", amount, false).ConfigureAwait(false);
 
-        //    await channel.SendMessageAsync(str).ConfigureAwait(false);
-        //}
+            var rng = new NadekoRandom().Next(0, 101);
+            var str = $"{guildUser.Mention} `You rolled {rng}.` ";
+            if (rng < 67)
+            {
+                str += "More luck next time.";
+            }
+            else if (rng < 90)
+            {
+                str += $"Congratulations! You won {amount * 2}{Gambling.CurrencySign} for rolling above 66";
+                await CurrencyHandler.AddCurrencyAsync(guildUser, "Betroll Gamble", amount * 2, false).ConfigureAwait(false);
+            }
+            else if (rng < 100)
+            {
+                str += $"Congratulations! You won {amount * 3}{Gambling.CurrencySign} for rolling above 90.";
+                await CurrencyHandler.AddCurrencyAsync(guildUser, "Betroll Gamble", amount * 3, false).ConfigureAwait(false);
+            }
+            else
+            {
+                str += $"👑 Congratulations! You won {amount * 10}{Gambling.CurrencySign} for rolling **100**. 👑";
+                await CurrencyHandler.AddCurrencyAsync(guildUser, "Betroll Gamble", amount * 10, false).ConfigureAwait(false);
+            }
 
-        ////todo DB
-//        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
-//        [RequireContext(ContextType.Guild)]
-//        public async Task Leaderboard(IUserMessage umsg)
-//        {
-//            var channel = (ITextChannel)umsg.Channel;
+            await channel.SendMessageAsync(str).ConfigureAwait(false);
+        }
 
-//            var richestTemp = DbHandler.Instance.GetTopRichest();
-//            var richest = richestTemp as CurrencyState[] ?? richestTemp.ToArray();
-//            if (richest.Length == 0)
-//                return;
-//            await channel.SendMessageAsync(
-//                richest.Aggregate(new StringBuilder(
-//$@"```xl
-//┏━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━┓
-//┃        Id           ┃  $$$  ┃
-//"),
-//                (cur, cs) => cur.AppendLine(
-//$@"┣━━━━━━━━━━━━━━━━━━━━━╋━━━━━━━┫
-//┃{(e.Server.Users.Where(u => u.Id == (ulong)cs.UserId).FirstOrDefault()?.Name.TrimTo(18, true) ?? cs.UserId.ToString()),-20} ┃ {cs.Value,5} ┃")
-//                        ).ToString() + "┗━━━━━━━━━━━━━━━━━━━━━┻━━━━━━━┛```").ConfigureAwait(false);
-        //}
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
+        [RequireContext(ContextType.Guild)]
+        public async Task Leaderboard(IUserMessage umsg)
+        {
+            var channel = (ITextChannel)umsg.Channel;
+
+            IEnumerable<Currency> richest;
+            using (var uow = DbHandler.UnitOfWork())
+            {
+                richest = uow.Currency.GetTopRichest(10);
+            }
+            if (!richest.Any())
+                return;
+            await channel.SendMessageAsync(
+                richest.Aggregate(new StringBuilder(
+$@"```xl
+        ┏━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━┓
+        ┃        Id           ┃  $$$  ┃
+        "),
+                (cur, cs) => cur.AppendLine(
+$@"┣━━━━━━━━━━━━━━━━━━━━━╋━━━━━━━┫
+        ┃{(channel.Guild.GetUser(cs.UserId)?.Username.TrimTo(18, true) ?? cs.UserId.ToString()),-20} ┃ {cs,5} ┃")
+                        ).ToString() + "┗━━━━━━━━━━━━━━━━━━━━━┻━━━━━━━┛```").ConfigureAwait(false);
+        }
     }
 }

src/NadekoBot/Modules/Games/Commands/LeetCommands.cs

@@ -10,9 +10,9 @@ using System.Threading.Tasks;
 // because i don't want to waste my time on this cancerous command
 namespace NadekoBot.Modules.Games
 {
-    public partial class GamesModule
+    public partial class Games
     {
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Leet(IUserMessage umsg, int level, [Remainder] string text = null)
         {

src/NadekoBot/Modules/Games/Commands/PlantAndPickCommands.cs

@@ -1,168 +1,220 @@
-//using Discord;
-//using Discord.Commands;
-//using NadekoBot.Classes;
-//using NadekoBot.Extensions;
-//using NadekoBot.Modules.Permissions.Classes;
-//using System;
-//using System.Collections.Concurrent;
-//using System.Collections.Generic;
-//using System.IO;
-//using System.Linq;
-//using System.Security.Cryptography;
-//using System.Threading;
-//using System.Threading.Tasks;
+using Discord;
+using Discord.Commands;
+using Discord.WebSocket;
+using NadekoBot.Attributes;
+using NadekoBot.Extensions;
+using NadekoBot.Services;
+using NadekoBot.Services.Database;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Threading;
+using System.Threading.Tasks;
 
-////todo DI into partials
-////todo DB
-//namespace NadekoBot.Modules.Games
-//{
-//    /// <summary>
-//    /// Flower picking/planting idea is given to me by its
-//    /// inceptor Violent Crumble from Game Developers League discord server
-//    /// (he has !cookie and !nom) Thanks a lot Violent!
-//    /// Check out GDL (its a growing gamedev community):
-//    /// https://discord.gg/0TYNJfCU4De7YIk8
-//    /// </summary>
-//    class PlantPick : DiscordCommand
-//    {
+//todo rewrite
+namespace NadekoBot.Modules.Games
+{
+    public partial class Games
+    {
+        /// <summary>
+        /// Flower picking/planting idea is given to me by its
+        /// inceptor Violent Crumble from Game Developers League discord server
+        /// (he has !cookie and !nom) Thanks a lot Violent!
+        /// Check out GDL (its a growing gamedev community):
+        /// https://discord.gg/0TYNJfCU4De7YIk8
+        /// </summary>
+        [Group]
+        public class PlantPickCommands
+        {
 
-//        private Random rng;
-//        public PlantPick(DiscordModule module) : base(module)
-//        {
-//            NadekoBot.Client.MessageReceived += PotentialFlowerGeneration;
-//            rng = new Random();
-//        }
+            private Random rng;
 
-//        private static readonly ConcurrentDictionary<ulong, DateTime> plantpickCooldowns = new ConcurrentDictionary<ulong, DateTime>();
+            private ConcurrentDictionary<ulong, bool> generationChannels = new ConcurrentDictionary<ulong, bool>();
+            //channelid/message
+            private ConcurrentDictionary<ulong, List<IUserMessage>> plantedFlowers = new ConcurrentDictionary<ulong, List<IUserMessage>>();
+            //channelId/last generation
+            private ConcurrentDictionary<ulong, DateTime> lastGenerations = new ConcurrentDictionary<ulong, DateTime>();
 
-//        private async void PotentialFlowerGeneration(object sender, Discord.MessageEventArgs e)
-//        {
-//            try
-//            {
-//                if (e.Server == null || e.Channel.IsPrivate || e.Message.IsAuthor)
-//                    return;
-//                var config = Classes.SpecificConfigurations.Default.Of(e.Server.Id);
-//                var now = DateTime.Now;
-//                int cd;
-//                DateTime lastSpawned;
-//                if (config.GenerateCurrencyChannels.TryGetValue(e.Channel.Id, out cd))
-//                    if (!plantpickCooldowns.TryGetValue(e.Channel.Id, out lastSpawned) || (lastSpawned + new TimeSpan(0, cd, 0)) < now)
-//                    {
-//                        var rnd = Math.Abs(rng.Next(0,101));
-//                        if (rnd == 0)
-//                        {
-//                            var msgs = new[] { await e.Channel.SendFile(GetRandomCurrencyImagePath()), await channel.SendMessageAsync($"❗ A random {NadekoBot.Config.CurrencyName} appeared! Pick it up by typing `>pick`") };
-//                            plantedFlowerChannels.AddOrUpdate(e.Channel.Id, msgs, (u, m) => { m.ForEach(async msgToDelete => { try { await msgToDelete.Delete(); } catch { } }); return msgs; });
-//                            plantpickCooldowns.AddOrUpdate(e.Channel.Id, now, (i, d) => now);
-//                        }
-//                    }
-//            }
-//            catch { }
-//        }
-//        //channelid/messageid pair
-//        ConcurrentDictionary<ulong, IEnumerable<Message>> plantedFlowerChannels = new ConcurrentDictionary<ulong, IEnumerable<Message>>();
+            private float chance;
+            private int cooldown;
 
-//        private SemaphoreSlim locker = new SemaphoreSlim(1,1);
+            public PlantPickCommands()
+            {
+                NadekoBot.Client.MessageReceived += PotentialFlowerGeneration;
+                rng = new NadekoRandom();
 
-//        internal override void Init(CommandGroupBuilder cgb)
-//        {
-//            cgb.CreateCommand(Module.Prefix + "pick")
-//                .Description($"Picks a flower planted in this channel. | `{Prefix}pick`")
-//                .Do(async e =>
-//                {
-//                    IEnumerable<Message> msgs;
+                using (var uow = DbHandler.UnitOfWork())
+                {
+                    var conf = uow.BotConfig.GetOrCreate();
+                    var x =
+                    generationChannels = new ConcurrentDictionary<ulong, bool>(uow.GuildConfigs.GetAll()
+                        .Where(c => c.GenerateCurrencyChannelId != null)
+                        .ToDictionary(c => c.GenerateCurrencyChannelId.Value, c => true));
+                    chance = conf.CurrencyGenerationChance;
+                    cooldown = conf.CurrencyGenerationCooldown;
+                }
+            }
 
-//                    await e.Message.Delete().ConfigureAwait(false);
-//                    if (!plantedFlowerChannels.TryRemove(e.Channel.Id, out msgs))
-//                        return;
+            private Task PotentialFlowerGeneration(IMessage imsg)
+            {
+                var msg = imsg as IUserMessage;
+                if (msg == null || msg.IsAuthor())
+                    return Task.CompletedTask;
 
-//                    foreach(var msgToDelete in msgs)
-//                        await msgToDelete.Delete().ConfigureAwait(false);
+                var channel = imsg.Channel as ITextChannel;
+                if (channel == null)
+                    return Task.CompletedTask;
 
-//                    await FlowersHandler.AddFlowersAsync(umsg.Author, "Picked a flower.", 1, true).ConfigureAwait(false);
-//                    var msg = await channel.SendMessageAsync($"**{umsg.Author.Username}** picked a {NadekoBot.Config.CurrencyName}!").ConfigureAwait(false);
-//                    ThreadPool.QueueUserWorkItem(async (state) =>
-//                    {
-//                        try
-//                        {
-//                            await Task.Delay(10000).ConfigureAwait(false);
-//                            await msg.Delete().ConfigureAwait(false);
-//                        }
-//                        catch { }
-//                    });
-//                });
+                bool shouldGenerate;
+                if (!generationChannels.TryGetValue(channel.Id, out shouldGenerate) || !shouldGenerate)
+                    return Task.CompletedTask;
 
-//            cgb.CreateCommand(Module.Prefix + "plant")
-//                .Description($"Spend a flower to plant it in this channel. (If bot is restarted or crashes, flower will be lost) | `{Prefix}plant`")
-//                .Do(async e =>
-//                {
-//                    await locker.WaitAsync().ConfigureAwait(false);
-//                    try
-//                    {
-//                        if (plantedFlowerChannels.ContainsKey(e.Channel.Id))
-//                        {
-//                            await channel.SendMessageAsync($"There is already a {NadekoBot.Config.CurrencyName} in this channel.").ConfigureAwait(false);
-//                            return;
-//                        }
-//                        var removed = await FlowersHandler.RemoveFlowers(umsg.Author, "Planted a flower.", 1, true).ConfigureAwait(false);
-//                        if (!removed)
-//                        {
-//                            await channel.SendMessageAsync($"You don't have any {NadekoBot.Config.CurrencyName}s.").ConfigureAwait(false);
-//                            return;
-//                        }
+                var t = Task.Run(async () =>
+                {
+                    var lastGeneration = lastGenerations.GetOrAdd(channel.Id, DateTime.MinValue);
 
-//                        var file = GetRandomCurrencyImagePath();
-//                        Message msg;
-//                        if (file == null)
-//                            msg = await channel.SendMessageAsync(NadekoBot.Config.CurrencySign).ConfigureAwait(false);
-//                        else
-//                            msg = await e.Channel.SendFile(file).ConfigureAwait(false);
-//                        var vowelFirst = new[] { 'a', 'e', 'i', 'o', 'u' }.Contains(NadekoBot.Config.CurrencyName[0]);
-//                        var msg2 = await channel.SendMessageAsync($"Oh how Nice! **{umsg.Author.Username}** planted {(vowelFirst ? "an" : "a")} {NadekoBot.Config.CurrencyName}. Pick it using {Module.Prefix}pick").ConfigureAwait(false);
-//                        plantedFlowerChannels.TryAdd(e.Channel.Id, new[] { msg, msg2 });
-//                    }
-//                    finally { locker.Release();  }
-//                });
+                    if (DateTime.Now - TimeSpan.FromSeconds(cooldown) < lastGeneration) //recently generated in this channel, don't generate again
+                        return;
 
-//            cgb.CreateCommand(Prefix + "gencurrency")
-//                .Alias(Prefix + "gc")
-//                .Description($"Toggles currency generation on this channel. Every posted message will have 2% chance to spawn a {NadekoBot.Config.CurrencyName}. Optional parameter cooldown time in minutes, 5 minutes by default. Requires Manage Messages permission. | `{Prefix}gc` or `{Prefix}gc 60`")
-//                .AddCheck(SimpleCheckers.ManageMessages())
-//                .Parameter("cd", ParameterType.Unparsed)
-//                .Do(async e =>
-//                {
-//                    var cdStr = cd;
-//                    int cd = 2;
-//                    if (!int.TryParse(cdStr, out cd) || cd < 0)
-//                    {
-//                        cd = 2;
-//                    }
-//                    var config = SpecificConfigurations.Default.Of(e.Server.Id);
-//                    int throwaway;
-//                    if (config.GenerateCurrencyChannels.TryRemove(e.Channel.Id, out throwaway))
-//                    {
-//                        await channel.SendMessageAsync("`Currency generation disabled on this channel.`").ConfigureAwait(false);
-//                    }
-//                    else
-//                    {
-//                        if (config.GenerateCurrencyChannels.TryAdd(e.Channel.Id, cd))
-//                            await channel.SendMessageAsync($"`Currency generation enabled on this channel. Cooldown is {cd} minutes.`").ConfigureAwait(false);
-//                    }
-//                });
-//        }
+                    var num = rng.Next(1, 101) + chance * 100;
 
-//        private string GetRandomCurrencyImagePath() =>
-//            Directory.GetFiles("data/currency_images").OrderBy(s => rng.Next()).FirstOrDefault();
+                    if (num > 100)
+                    {
+                        lastGenerations.AddOrUpdate(channel.Id, DateTime.Now, (id, old) => DateTime.Now);
+                        //todo get prefix
+                        try
+                        {
+                            var sent = await channel.SendFileAsync(
+                                GetRandomCurrencyImagePath(), 
+                                $"❗ A random { Gambling.Gambling.CurrencyName } appeared! Pick it up by typing `>pick`")
+                                    .ConfigureAwait(false);
+                            plantedFlowers.AddOrUpdate(channel.Id, new List<IUserMessage>() { sent }, (id, old) => { old.Add(sent); return old; });
+                        }
+                        catch { }
                         
-//        int GetRandomNumber()
-//        {
-//            using (var rg = RandomNumberGenerator.Create())
-//            {
-//                byte[] rno = new byte[4];
-//                rg.GetBytes(rno);
-//                int randomvalue = BitConverter.ToInt32(rno, 0);
-//                return randomvalue;
-//            }
-//        }
-//    }
-//}
+                    }
+                });
+                return Task.CompletedTask;
+            }
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
+            [RequireContext(ContextType.Guild)]
+            public async Task Pick(IUserMessage imsg)
+            {
+                var channel = (ITextChannel)imsg.Channel;
+
+                if (!channel.Guild.GetCurrentUser().GetPermissions(channel).ManageMessages)
+                {
+                    await channel.SendMessageAsync("`I need manage channel permissions in order to process this command.`").ConfigureAwait(false);
+                    return;
+                }
+
+                List<IUserMessage> msgs;
+
+                try { await imsg.DeleteAsync().ConfigureAwait(false); } catch { }
+                if (!plantedFlowers.TryRemove(channel.Id, out msgs))
+                    return;
+
+                await Task.WhenAll(msgs.Select(toDelete => toDelete.DeleteAsync())).ConfigureAwait(false);
+
+                await CurrencyHandler.AddCurrencyAsync((IGuildUser)imsg.Author, "Picked flower(s).", msgs.Count, false).ConfigureAwait(false);
+                var msg = await channel.SendMessageAsync($"**{imsg.Author.Username}** picked {msgs.Count}{Gambling.Gambling.CurrencySign}!").ConfigureAwait(false);
+                var t = Task.Run(async () =>
+                 {
+                     try
+                     {
+                         await Task.Delay(10000).ConfigureAwait(false);
+                         await msg.DeleteAsync().ConfigureAwait(false);
+                     }
+                     catch { }
+                 });
+            }
+
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
+            [RequireContext(ContextType.Guild)]
+            public async Task Plant(IUserMessage imsg)
+            {
+                var channel = (ITextChannel)imsg.Channel;
+                if (channel == null)
+                    return;
+
+                var removed = await CurrencyHandler.RemoveCurrencyAsync((IGuildUser)imsg.Author, "Planted a flower.", 1, false).ConfigureAwait(false);
+                if (!removed)
+                {
+                    await channel.SendMessageAsync($"You don't have any {Gambling.Gambling.CurrencyPluralName}.").ConfigureAwait(false);
+                    return;
+                }
+
+                var file = GetRandomCurrencyImagePath();
+                IUserMessage msg;
+                var vowelFirst = new[] { 'a', 'e', 'i', 'o', 'u' }.Contains(Gambling.Gambling.CurrencyName[0]);
+                var msgToSend = $"Oh how Nice! **{imsg.Author.Username}** planted {(vowelFirst ? "an" : "a")} {Gambling.Gambling.CurrencyName}. Pick it using >pick";
+                if (file == null)
+                {
+                    msg = await channel.SendMessageAsync(Gambling.Gambling.CurrencySign).ConfigureAwait(false);
+                }
+                else
+                {
+                    //todo add prefix
+                    msg = await channel.SendFileAsync(file, msgToSend).ConfigureAwait(false);
+                }
+                plantedFlowers.AddOrUpdate(channel.Id, new List<IUserMessage>() { msg }, (id, old) => { old.Add(msg); return old; });
+            }
+            
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
+            [RequireContext(ContextType.Guild)]
+            [RequirePermission(GuildPermission.ManageMessages)]
+            public async Task Gencurrency(IUserMessage imsg)
+            {
+                var channel = imsg.Channel as ITextChannel;
+                if (channel == null)
+                    return;
+
+                bool enabled;
+                using (var uow = DbHandler.UnitOfWork())
+                {
+                    var guildConfig = uow.GuildConfigs.For(channel.Id);
+
+                    if (guildConfig.GenerateCurrencyChannelId == null)
+                    {
+                        guildConfig.GenerateCurrencyChannelId = channel.Id;
+                        generationChannels.TryAdd(channel.Id, true);
+                        enabled = true;
+                    }
+                    else
+                    {
+                        guildConfig.GenerateCurrencyChannelId = null;
+                        bool throwaway;
+                        generationChannels.TryRemove(channel.Id, out throwaway);
+                        enabled = false;
+                    }
+                    await uow.CompleteAsync();
+                }
+                if (enabled)
+                {
+                    await channel.SendMessageAsync("`Currency generation enabled on this channel.`").ConfigureAwait(false);
+                }
+                else
+                {
+                    await channel.SendMessageAsync($"`Currency generation disabled on this channel.`").ConfigureAwait(false);
+                }
+            }
+
+            private string GetRandomCurrencyImagePath() =>
+                Directory.GetFiles("data/currency_images").OrderBy(s => rng.Next()).FirstOrDefault();
+
+            int GetRandomNumber()
+            {
+                using (var rg = RandomNumberGenerator.Create())
+                {
+                    byte[] rno = new byte[4];
+                    rg.GetBytes(rno);
+                    int randomvalue = BitConverter.ToInt32(rno, 0);
+                    return randomvalue;
+                }
+            }
+        }
+    }
+}

src/NadekoBot/Modules/Games/Commands/PollCommands.cs

@@ -10,12 +10,11 @@ using System.Threading.Tasks;
 
 namespace NadekoBot.Modules.Games
 {
-    public partial class GamesModule
+    public partial class Games
     {
-        //todo DB in the future
         public static ConcurrentDictionary<IGuild, Poll> ActivePolls = new ConcurrentDictionary<IGuild, Poll>();
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Poll(IUserMessage umsg, [Remainder] string arg = null)
         {
@@ -36,7 +35,7 @@ namespace NadekoBot.Modules.Games
             }
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Pollend(IUserMessage umsg)
         {
@@ -108,26 +107,36 @@ namespace NadekoBot.Modules.Games
             }
         }
 
-        private async Task Vote(IMessage imsg)
+        private Task Vote(IMessage imsg)
         {
-            var msg = imsg as ISystemMessage;
+            // has to be a user message
+            var msg = imsg as IUserMessage;
             if (msg == null)
-                return;
-            try
+                return Task.CompletedTask;
+            // channel must be private
+            IPrivateChannel ch;
+            if ((ch = msg.Channel as IPrivateChannel) == null)
+                return Task.CompletedTask;
+
+            // has to be an integer
+            int vote;
+            if (!int.TryParse(msg.Content, out vote)) return Task.CompletedTask;
+
+            var t = Task.Run(async () =>
             {
-                IPrivateChannel ch;
-                if ((ch = msg.Channel as IPrivateChannel) == null)
-                    return;
-                int vote;
-                if (!int.TryParse(msg.Content, out vote)) return;
-                if (vote < 1 || vote > answers.Length)
-                    return;
-                if (participants.TryAdd(msg.Author, vote))
+                try
                 {
-                    await (ch as ITextChannel).SendMessageAsync($"Thanks for voting **{msg.Author.Username}**.").ConfigureAwait(false);
+                    
+                    if (vote < 1 || vote > answers.Length)
+                        return;
+                    if (participants.TryAdd(msg.Author, vote))
+                    {
+                        await (ch as ITextChannel).SendMessageAsync($"Thanks for voting **{msg.Author.Username}**.").ConfigureAwait(false);
+                    }
                 }
-            }
-            catch { }
+                catch { }
+            });
+            return Task.CompletedTask;
         }
     }
 }

src/NadekoBot/Modules/Games/Commands/SpeedTypingCommands.cs

@@ -1,196 +1,197 @@
-//using Discord;
-//using Discord.Commands;
-//using NadekoBot.Classes;
-//using NadekoBot.DataModels;
-//using NadekoBot.Extensions;
-//using System;
-//using System.Collections.Concurrent;
-//using System.Collections.Generic;
-//using System.Diagnostics;
-//using System.Linq;
-//using System.Threading.Tasks;
+using Discord;
+using Discord.Commands;
+using Discord.WebSocket;
+using NadekoBot.Attributes;
+using NadekoBot.Extensions;
+using NadekoBot.Services;
+using NadekoBot.Services.Database;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading.Tasks;
 
-////todo DB
-////todo Rewrite?
-//namespace NadekoBot.Modules.Games
-//{
-//    public static class SentencesProvider
-//    {
-//        internal static string GetRandomSentence()
-//        {
-//            var data = DbHandler.Instance.GetAllRows<TypingArticle>();
-//            try
-//            {
-//                return data.ToList()[new Random().Next(0, data.Count())].Text;
-//            }
-//            catch
-//            {
-//                return "Failed retrieving data from parse. Owner didn't add any articles to type using `typeadd`.";
-//            }
-//        }
-//    }
+namespace NadekoBot.Modules.Games
+{
+    public partial class Games
+    {
+        public class TypingGame
+        {
+            public const float WORD_VALUE = 4.5f;
+            private readonly ITextChannel channel;
+            public string CurrentSentence;
+            public bool IsActive;
+            private readonly Stopwatch sw;
+            private readonly List<ulong> finishedUserIds;
 
-//    public class TypingGame
-//    {
-//        public const float WORD_VALUE = 4.5f;
-//        private readonly Channel channel;
-//        public string CurrentSentence;
-//        public bool IsActive;
-//        private readonly Stopwatch sw;
-//        private readonly List<ulong> finishedUserIds;
+            public TypingGame(ITextChannel channel)
+            {
+                this.channel = channel;
+                IsActive = false;
+                sw = new Stopwatch();
+                finishedUserIds = new List<ulong>();
+            }
 
-//        public TypingGame(Channel channel)
-//        {
-//            this.channel = channel;
-//            IsActive = false;
-//            sw = new Stopwatch();
-//            finishedUserIds = new List<ulong>();
-//        }
+            public ITextChannel Channel { get; set; }
 
-//        public Channel Channell { get; internal set; }
+            public async Task<bool> Stop()
+            {
+                if (!IsActive) return false;
+                NadekoBot.Client.MessageReceived -= AnswerReceived;
+                finishedUserIds.Clear();
+                IsActive = false;
+                sw.Stop();
+                sw.Reset();
+                await channel.SendMessageAsync("Typing contest stopped").ConfigureAwait(false);
+                return true;
+            }
 
-//        internal async Task<bool> Stop()
-//        {
-//            if (!IsActive) return false;
-//            NadekoBot.Client.MessageReceived -= AnswerReceived;
-//            finishedUserIds.Clear();
-//            IsActive = false;
-//            sw.Stop();
-//            sw.Reset();
-//            await channel.Send("Typing contest stopped").ConfigureAwait(false);
-//            return true;
-//        }
-
-//        internal async Task Start()
-//        {
-//            while (true)
-//            {
-//                if (IsActive) return; // can't start running game
-//                IsActive = true;
-//                CurrentSentence = SentencesProvider.GetRandomSentence();
-//                var i = (int)(CurrentSentence.Length / WORD_VALUE * 1.7f);
-//                await channel.SendMessageAsync($":clock2: Next contest will last for {i} seconds. Type the bolded text as fast as you can.").ConfigureAwait(false);
+            public async Task Start()
+            {
+                while (true)
+                {
+                    if (IsActive) return; // can't start running game
+                    IsActive = true;
+                    CurrentSentence = GetRandomSentence();
+                    var i = (int)(CurrentSentence.Length / WORD_VALUE * 1.7f);
+                    await channel.SendMessageAsync($":clock2: Next contest will last for {i} seconds. Type the bolded text as fast as you can.").ConfigureAwait(false);
 
 
-//                var msg = await channel.SendMessageAsync("Starting new typing contest in **3**...").ConfigureAwait(false);
-//                await Task.Delay(1000).ConfigureAwait(false);
-//                await msg.Edit("Starting new typing contest in **2**...").ConfigureAwait(false);
-//                await Task.Delay(1000).ConfigureAwait(false);
-//                await msg.Edit("Starting new typing contest in **1**...").ConfigureAwait(false);
-//                await Task.Delay(1000).ConfigureAwait(false);
-//                await msg.Edit($":book:**{CurrentSentence.Replace(" ", " \x200B")}**:book:").ConfigureAwait(false);
-//                sw.Start();
-//                HandleAnswers();
+                    var msg = await channel.SendMessageAsync("Starting new typing contest in **3**...").ConfigureAwait(false);
+                    await Task.Delay(1000).ConfigureAwait(false);
+                    await msg.ModifyAsync(m => m.Content = "Starting new typing contest in **2**...").ConfigureAwait(false);
+                    await Task.Delay(1000).ConfigureAwait(false);
+                    await msg.ModifyAsync(m => m.Content = "Starting new typing contest in **1**...").ConfigureAwait(false);
+                    await Task.Delay(1000).ConfigureAwait(false);
+                    await msg.ModifyAsync(m => m.Content = $":book:**{CurrentSentence.Replace(" ", " \x200B")}**:book:").ConfigureAwait(false);
+                    sw.Start();
+                    HandleAnswers();
 
-//                while (i > 0)
-//                {
-//                    await Task.Delay(1000).ConfigureAwait(false);
-//                    i--;
-//                    if (!IsActive)
-//                        return;
-//                }
+                    while (i > 0)
+                    {
+                        await Task.Delay(1000).ConfigureAwait(false);
+                        i--;
+                        if (!IsActive)
+                            return;
+                    }
 
-//                await Stop().ConfigureAwait(false);
-//            }
-//        }
+                    await Stop().ConfigureAwait(false);
+                }
+            }
 
-//        private void HandleAnswers()
-//        {
-//            NadekoBot.Client.MessageReceived += AnswerReceived;
-//        }
+            public string GetRandomSentence()
+            {
+                using (var uow = DbHandler.UnitOfWork())
+                {
+                    return uow.TypingArticles.GetRandom()?.Text ?? "No typing articles found. Use `>typeadd` command to add a new article for typing.";
+                }
 
-//        private async void AnswerReceived(object sender, MessageEventArgs e)
-//        {
-//            try
-//            {
-//                if (e.Channel == null || e.Channel.Id != channel.Id || umsg.Author.Id == NadekoBot.Client.CurrentUser.Id) return;
+            }
 
-//                var guess = e.Message.RawText;
+            private void HandleAnswers()
+            {
+                NadekoBot.Client.MessageReceived += AnswerReceived;
+            }
 
-//                var distance = CurrentSentence.LevenshteinDistance(guess);
-//                var decision = Judge(distance, guess.Length);
-//                if (decision && !finishedUserIds.Contains(umsg.Author.Id))
-//                {
-//                    finishedUserIds.Add(umsg.Author.Id);
-//                    await channel.Send($"{umsg.Author.Mention} finished in **{sw.Elapsed.Seconds}** seconds with { distance } errors, **{ CurrentSentence.Length / WORD_VALUE / sw.Elapsed.Seconds * 60 }** WPM!").ConfigureAwait(false);
-//                    if (finishedUserIds.Count % 2 == 0)
-//                    {
-//                        await channel.SendMessageAsync($":exclamation: `A lot of people finished, here is the text for those still typing:`\n\n:book:**{CurrentSentence}**:book:").ConfigureAwait(false);
-//                    }
-//                }
-//            }
-//            catch { }
-//        }
+            private Task AnswerReceived(IMessage imsg)
+            {
+                var msg = imsg as IUserMessage;
+                if (msg == null)
+                    return Task.CompletedTask;
+                var t = Task.Run(async () =>
+                {
+                    try
+                    {
+                        if (channel == null || channel.Id != channel.Id || msg.Author.Id == NadekoBot.Client.GetCurrentUser().Id) return;
 
-//        private bool Judge(int errors, int textLength) => errors <= textLength / 25;
+                        var guess = msg.Content;
 
-//    }
+                        var distance = CurrentSentence.LevenshteinDistance(guess);
+                        var decision = Judge(distance, guess.Length);
+                        if (decision && !finishedUserIds.Contains(msg.Author.Id))
+                        {
+                            finishedUserIds.Add(msg.Author.Id);
+                            await channel.SendMessageAsync($"{msg.Author.Mention} finished in **{sw.Elapsed.Seconds}** seconds with { distance } errors, **{ CurrentSentence.Length / WORD_VALUE / sw.Elapsed.Seconds * 60 }** WPM!").ConfigureAwait(false);
+                            if (finishedUserIds.Count % 2 == 0)
+                            {
+                                await channel.SendMessageAsync($":exclamation: `A lot of people finished, here is the text for those still typing:`\n\n:book:**{CurrentSentence}**:book:").ConfigureAwait(false);
+                            }
+                        }
+                    }
+                    catch { }
+                });
+                return Task.CompletedTask;
+            }
 
-//    internal class SpeedTyping : DiscordCommand
-//    {
+            private bool Judge(int errors, int textLength) => errors <= textLength / 25;
 
-//        public static ConcurrentDictionary<ulong, TypingGame> RunningContests;
+        }
 
-//        public SpeedTyping(DiscordModule module) : base(module)
-//        {
-//            RunningContests = new ConcurrentDictionary<ulong, TypingGame>();
-//        }
+        [Group]
+        public class SpeedTypingCommands
+        {
 
-//        public Func<CommandEventArgs, Task> DoFunc() =>
-//            async e =>
-//            {
-//                var game = RunningContests.GetOrAdd(umsg.Author.Server.Id, id => new TypingGame(e.Channel));
+            public static ConcurrentDictionary<ulong, TypingGame> RunningContests;
 
-//                if (game.IsActive)
-//                {
-//                    await channel.SendMessageAsync(
-//                            $"Contest already running in " +
-//                            $"{game.Channell.Mention} channel.")
-//                                .ConfigureAwait(false);
-//                }
-//                else
-//                {
-//                    await game.Start().ConfigureAwait(false);
-//                }
-//            };
+            public SpeedTypingCommands()
+            {
+                RunningContests = new ConcurrentDictionary<ulong, TypingGame>();
+            }
 
-//        private Func<CommandEventArgs, Task> QuitFunc() =>
-//            async e =>
-//            {
-//                TypingGame game;
-//                if (RunningContests.TryRemove(umsg.Author.Server.Id, out game))
-//                {
-//                    await game.Stop().ConfigureAwait(false);
-//                    return;
-//                }
-//                await channel.SendMessageAsync("No contest to stop on this channel.").ConfigureAwait(false);
-//            };
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
+            [RequireContext(ContextType.Guild)]
+            public async Task TypeStart(IUserMessage msg)
+            {
+                var channel = (ITextChannel)msg.Channel;
 
-//        internal override void Init(CommandGroupBuilder cgb)
-//        {
-//            cgb.CreateCommand(Module.Prefix + "typestart")
-//                .Description($"Starts a typing contest. | `{Prefix}typestart`")
-//                .Do(DoFunc());
+                var game = RunningContests.GetOrAdd(channel.Guild.Id, id => new TypingGame(channel));
 
-//            cgb.CreateCommand(Module.Prefix + "typestop")
-//                .Description($"Stops a typing contest on the current channel. | `{Prefix}typestop`")
-//                .Do(QuitFunc());
+                if (game.IsActive)
+                {
+                    await channel.SendMessageAsync(
+                            $"Contest already running in " +
+                            $"{game.Channel.Mention} channel.")
+                                .ConfigureAwait(false);
+                }
+                else
+                {
+                    await game.Start().ConfigureAwait(false);
+                }
+            }
 
-//            cgb.CreateCommand(Module.Prefix + "typeadd")
-//                .Description($"Adds a new article to the typing contest. Owner only. | `{Prefix}typeadd wordswords`")
-//                .Parameter("text", ParameterType.Unparsed)
-//                .Do(async e =>
-//                {
-//                    if (!NadekoBot.IsOwner(umsg.Author.Id) || string.IsNullOrWhiteSpace(text)) return;
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
+            [RequireContext(ContextType.Guild)]
+            public async Task TypeStop(IUserMessage imsg)
+            {
+                var channel = (ITextChannel)imsg.Channel;
+                TypingGame game;
+                if (RunningContests.TryRemove(channel.Guild.Id, out game))
+                {
+                    await game.Stop().ConfigureAwait(false);
+                    return;
+                }
+                await channel.SendMessageAsync("No contest to stop on this channel.").ConfigureAwait(false);
+            }
 
-//                    DbHandler.Instance.Connection.Insert(new TypingArticle
-//                    {
-//                        Text = text,
-//                        DateAdded = DateTime.Now
-//                    });
+            ////todo owner only
+            //[LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
+            //[RequireContext(ContextType.Guild)]
+            //public async Task Typeadd(IUserMessage imsg, [Remainder] string text)
+            //{
+            //    var channel = (ITextChannel)imsg.Channel;
 
-//                    await channel.SendMessageAsync("Added new article for typing game.").ConfigureAwait(false);
-//                });
-//        }
-//    }
-//}
+            //    using (var uow = DbHandler.UnitOfWork())
+            //    {
+            //        uow.TypingArticles.Add(new Services.Database.Models.TypingArticle
+            //        {
+            //            Author = imsg.Author.Username,
+            //            Text = text
+            //        });
+            //    }
+
+            //    await channel.SendMessageAsync("Added new article for typing game.").ConfigureAwait(false);
+            //}
+        }
+    }
+}

src/NadekoBot/Modules/Games/Commands/Trivia/TriviaGame.cs

@@ -7,8 +7,6 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
-// todo rewrite?
-// todo DB
 namespace NadekoBot.Modules.Games.Trivia
 {
     public class TriviaGame
@@ -102,39 +100,42 @@ namespace NadekoBot.Modules.Games.Trivia
             ShouldStopGame = true;
         }
 
-        private async Task PotentialGuess(IMessage imsg)
+        private Task PotentialGuess(IMessage imsg)
         {
             var umsg = imsg as IUserMessage;
             if (umsg == null)
-                return;
-
-            try
+                return Task.CompletedTask;
+            var t = Task.Run(async () =>
             {
-                if (!(umsg.Channel is IGuildChannel && umsg.Channel is ITextChannel)) return;
-                if ((umsg.Channel as ITextChannel).Guild != guild) return;
-                if (umsg.Author.Id == (await NadekoBot.Client.GetCurrentUserAsync()).Id) return;
-
-                var guildUser = umsg.Author as IGuildUser;
-
-                var guess = false;
-                await _guessLock.WaitAsync().ConfigureAwait(false);
                 try
                 {
-                    if (GameActive && CurrentQuestion.IsAnswerCorrect(umsg.Content) && !triviaCancelSource.IsCancellationRequested)
+                    if (!(umsg.Channel is IGuildChannel && umsg.Channel is ITextChannel)) return;
+                    if ((umsg.Channel as ITextChannel).Guild != guild) return;
+                    if (umsg.Author.Id == (await NadekoBot.Client.GetCurrentUserAsync()).Id) return;
+
+                    var guildUser = umsg.Author as IGuildUser;
+
+                    var guess = false;
+                    await _guessLock.WaitAsync().ConfigureAwait(false);
+                    try
                     {
-                        Users.AddOrUpdate(guildUser, 0, (gu, old) => old++);
-                        guess = true;
+                        if (GameActive && CurrentQuestion.IsAnswerCorrect(umsg.Content) && !triviaCancelSource.IsCancellationRequested)
+                        {
+                            Users.AddOrUpdate(guildUser, 0, (gu, old) => old++);
+                            guess = true;
+                        }
                     }
+                    finally { _guessLock.Release(); }
+                    if (!guess) return;
+                    triviaCancelSource.Cancel();
+                    await channel.SendMessageAsync($"☑️ {guildUser.Mention} guessed it! The answer was: **{CurrentQuestion.Answer}**").ConfigureAwait(false);
+                    if (Users[guildUser] != WinRequirement) return;
+                    ShouldStopGame = true;
+                    await channel.SendMessageAsync($":exclamation: We have a winner! It's {guildUser.Mention}.").ConfigureAwait(false);
                 }
-                finally { _guessLock.Release(); }
-                if (!guess) return;
-                triviaCancelSource.Cancel();
-                await channel.SendMessageAsync($"☑️ {guildUser.Mention} guessed it! The answer was: **{CurrentQuestion.Answer}**").ConfigureAwait(false);
-                if (Users[guildUser] != WinRequirement) return;
-                ShouldStopGame = true;
-                await channel.SendMessageAsync($":exclamation: We have a winner! It's {guildUser.Mention}.").ConfigureAwait(false);
-            }
-            catch { }
+                catch { }
+            });
+            return Task.CompletedTask;
         }
 
         public string GetLeaderboard()

src/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestionPool.cs

@@ -1,4 +1,5 @@
-using Newtonsoft.Json.Linq;
+using NadekoBot.Services;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -9,10 +10,9 @@ namespace NadekoBot.Modules.Games.Trivia
     public class TriviaQuestionPool
     {
         public static TriviaQuestionPool Instance { get; } = new TriviaQuestionPool();
-        //todo DB
         public HashSet<TriviaQuestion> pool = new HashSet<TriviaQuestion>();
 
-        private Random rng { get; } = new Random();
+        private Random rng { get; } = new NadekoRandom();
 
         static TriviaQuestionPool() { }
 
@@ -28,16 +28,16 @@ namespace NadekoBot.Modules.Games.Trivia
             return list[rand];
         }
 
-        internal void Reload()
+        public void Reload()
         {
-            var arr = JArray.Parse(File.ReadAllText("data/questions.json"));
+            var arr = JArray.Parse(File.ReadAllText("data/triviaquestions.json"));
 
             foreach (var item in arr)
             {
                 var tq = new TriviaQuestion(item["Question"].ToString(), item["Answer"].ToString(), item["Category"]?.ToString());
                 pool.Add(tq);
             }
-            var r = new Random();
+            var r = new NadekoRandom();
             pool = new HashSet<TriviaQuestion>(pool.OrderBy(x => r.Next()));
         }
     }

src/NadekoBot/Modules/Games/Commands/TriviaCommands.cs

@@ -10,16 +10,16 @@ using System.Threading.Tasks;
 //todo Rewrite? Fix trivia not stopping bug
 namespace NadekoBot.Modules.Games
 {
-    public partial class GamesModule
+    public partial class Games
     {
         [Group]
         public class TriviaCommands
         {
             public static ConcurrentDictionary<ulong, TriviaGame> RunningTrivias = new ConcurrentDictionary<ulong, TriviaGame>();
 
-            [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
             [RequireContext(ContextType.Guild)]
-            public async Task Trivia(IUserMessage umsg, string[] args)
+            public async Task Trivia(IUserMessage umsg, params string[] args)
             {
                 var channel = (ITextChannel)umsg.Channel;
 
@@ -44,7 +44,7 @@ namespace NadekoBot.Modules.Games
                     await channel.SendMessageAsync("Trivia game is already running on this server.\n" + trivia.CurrentQuestion).ConfigureAwait(false);
             }
 
-            [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
             [RequireContext(ContextType.Guild)]
             public async Task Tl(IUserMessage umsg)
             {
@@ -57,7 +57,7 @@ namespace NadekoBot.Modules.Games
                     await channel.SendMessageAsync("No trivia is running on this server.").ConfigureAwait(false);
             }
 
-            [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
             [RequireContext(ContextType.Guild)]
             public async Task Tq(IUserMessage umsg)
             {

src/NadekoBot/Modules/Games/Games.cs

@@ -12,10 +12,9 @@ using NadekoBot.Services.Database;
 
 namespace NadekoBot.Modules.Games
 {
-    [Module(">", AppendSpace = false)]
+    [NadekoModule("Games", ">")]
     public partial class Games : DiscordModule
     {
-        //todo DB
         private IEnumerable<string> _8BallResponses {
             get {
                 using (var uow = DbHandler.UnitOfWork())
@@ -28,7 +27,7 @@ namespace NadekoBot.Modules.Games
         {
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Choose(IUserMessage umsg, [Remainder] string list = null)
         {
@@ -38,11 +37,11 @@ namespace NadekoBot.Modules.Games
             var listArr = list.Split(';');
             if (listArr.Count() < 2)
                 return;
-            var rng = new Random();
+            var rng = new NadekoRandom();
             await channel.SendMessageAsync(listArr[rng.Next(0, listArr.Length)]).ConfigureAwait(false);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task _8Ball(IUserMessage umsg, [Remainder] string question = null)
         {
@@ -50,12 +49,12 @@ namespace NadekoBot.Modules.Games
 
             if (string.IsNullOrWhiteSpace(question))
                 return;
-                var rng = new Random();
+                var rng = new NadekoRandom();
             await channel.SendMessageAsync($@":question: `Question` __**{question}**__ 
 🎱 `8Ball Answers` __**{_8BallResponses.Shuffle().FirstOrDefault()}**__").ConfigureAwait(false);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Rps(IUserMessage umsg, string input)
         {
@@ -91,7 +90,7 @@ namespace NadekoBot.Modules.Games
                 default:
                     return;
             }
-            var nadekoPick = new Random().Next(0, 3);
+            var nadekoPick = new NadekoRandom().Next(0, 3);
             var msg = "";
             if (pick == nadekoPick)
                 msg = $"It's a draw! Both picked :{GetRPSPick(pick)}:";
@@ -105,7 +104,7 @@ namespace NadekoBot.Modules.Games
             await channel.SendMessageAsync(msg).ConfigureAwait(false);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Linux(IUserMessage umsg, string guhnoo, string loonix)
         {

src/NadekoBot/Modules/Help/Help.cs

@@ -12,7 +12,7 @@ using Discord.WebSocket;
 
 namespace NadekoBot.Modules.Help
 {
-    [Module("-", AppendSpace = false)]
+    [NadekoModule("Help", "-")]
     public partial class Help : DiscordModule
     {
         public string HelpString {
@@ -25,7 +25,7 @@ namespace NadekoBot.Modules.Help
         {
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Modules(IUserMessage umsg)
         {
@@ -35,7 +35,7 @@ namespace NadekoBot.Modules.Help
                                        .ConfigureAwait(false);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Commands(IUserMessage umsg, [Remainder] string module = null)
         {
@@ -44,7 +44,7 @@ namespace NadekoBot.Modules.Help
             module = module?.Trim().ToUpperInvariant();
             if (string.IsNullOrWhiteSpace(module))
                 return;
-            var cmds = _commands.Commands.Where(c => c.Module.Name.ToUpperInvariant() == module)
+            var cmds = _commands.Commands.Where(c => c.Module.Name.ToUpperInvariant().StartsWith(module))
                                                   .OrderBy(c => c.Text)
                                                   .AsEnumerable();
             var cmdsArray = cmds as Command[] ?? cmds.ToArray();
@@ -55,8 +55,7 @@ namespace NadekoBot.Modules.Help
             }
             if (module != "customreactions" && module != "conversations")
             {
-                //todo aliases
-                await channel.SendTableAsync("`List Of Commands:`\n", cmdsArray, el => $"{el.Text,-15}").ConfigureAwait(false);
+                await channel.SendTableAsync("`List Of Commands:`\n", cmdsArray, el => $"{el.Text,-15} {"["+el.Aliases.Skip(1).FirstOrDefault()+"]",-8}").ConfigureAwait(false);
             }
             else
             {
@@ -65,7 +64,7 @@ namespace NadekoBot.Modules.Help
             await channel.SendMessageAsync($"`You can type \"-h command_name\" to see the help about that specific command.`").ConfigureAwait(false);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task H(IUserMessage umsg, [Remainder] string comToFind = null)
         {
@@ -77,16 +76,23 @@ namespace NadekoBot.Modules.Help
                 await (await (umsg.Author as IGuildUser).CreateDMChannelAsync()).SendMessageAsync(HelpString).ConfigureAwait(false);
                 return;
             }
-            var com = _commands.Commands.FirstOrDefault(c => c.Text.ToLowerInvariant() == comToFind);
+            var com = _commands.Commands.FirstOrDefault(c => c.Text.ToLowerInvariant() == comToFind || c.Aliases.Select(a=>a.ToLowerInvariant()).Contains(comToFind));
 
-            //todo aliases
+            if (com == null)
+            {
+                await channel.SendMessageAsync("`No command found.`");
+                return;
+            }
+            var str = $"**__Help for:__ `{com.Text}`**";
+            var alias = com.Aliases.Skip(1).FirstOrDefault();
+            if (alias != null)
+                str += $" / `{ alias }`";
             if (com != null)
-                await channel.SendMessageAsync($@"**__Help for:__ `{com.Text}`**
-**Desc:** {com.Description}
+                await channel.SendMessageAsync(str + $@"{Environment.NewLine}**Desc:** {com.Description}
 **Usage:** {com.Summary}").ConfigureAwait(false);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Hgit(IUserMessage umsg)
         {
@@ -102,8 +108,7 @@ namespace NadekoBot.Modules.Help
                     helpstr.AppendLine("----------------|--------------|-------");
                     lastModule = com.Module.Name;
                 }
-                //todo aliases
-                helpstr.AppendLine($"`{com.Text}` | {com.Description} | {com.Summary}");
+                helpstr.AppendLine($"`{com.Text}` {string.Join(" ", com.Aliases.Skip(1).Select(a=>"`"+a+"`"))} | {com.Description} | {com.Summary}");
             }
             helpstr = helpstr.Replace((await NadekoBot.Client.GetCurrentUserAsync()).Username , "@BotName");
 #if DEBUG
@@ -113,7 +118,7 @@ namespace NadekoBot.Modules.Help
 #endif
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Guide(IUserMessage umsg)
         {
@@ -124,7 +129,7 @@ namespace NadekoBot.Modules.Help
 **Hosting Guides and docs can be found here**: <http://nadekobot.rtfd.io>").ConfigureAwait(false);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Donate(IUserMessage umsg)
         {

src/NadekoBot/Modules/Music/Classes/MusicControls.cs

@@ -234,7 +234,7 @@ namespace NadekoBot.Modules.Music.Classes
             });
         }
 
-        internal void ClearQueue()
+        public void ClearQueue()
         {
             actionQueue.Enqueue(() =>
             {
@@ -256,7 +256,7 @@ namespace NadekoBot.Modules.Music.Classes
             });
         }
 
-        internal Task MoveToVoiceChannel(IVoiceChannel voiceChannel)
+        public Task MoveToVoiceChannel(IVoiceChannel voiceChannel)
         {
             if (audioClient?.ConnectionState != ConnectionState.Connected)
                 throw new InvalidOperationException("Can't move while bot is not connected to voice channel.");
@@ -264,13 +264,13 @@ namespace NadekoBot.Modules.Music.Classes
             return PlaybackVoiceChannel.ConnectAsync();
         }
 
-        internal bool ToggleRepeatSong() => this.RepeatSong = !this.RepeatSong;
+        public bool ToggleRepeatSong() => this.RepeatSong = !this.RepeatSong;
 
-        internal bool ToggleRepeatPlaylist() => this.RepeatPlaylist = !this.RepeatPlaylist;
+        public bool ToggleRepeatPlaylist() => this.RepeatPlaylist = !this.RepeatPlaylist;
 
-        internal bool ToggleAutoplay() => this.Autoplay = !this.Autoplay;
+        public bool ToggleAutoplay() => this.Autoplay = !this.Autoplay;
 
-        internal void ThrowIfQueueFull()
+        public void ThrowIfQueueFull()
         {
             if (MaxQueueSize == 0)
                 return;

src/NadekoBot/Modules/Music/Classes/Song.cs

@@ -16,18 +16,18 @@ namespace NadekoBot.Modules.Music.Classes
 {
     public class SongInfo
     {
-        public string Provider { get; internal set; }
-        public MusicType ProviderType { get; internal set; }
+        public string Provider { get; set; }
+        public MusicType ProviderType { get; set; }
         /// <summary>
         /// Will be set only if the providertype is normal
         /// </summary>
-        public string Query { get; internal set; }
-        public string Title { get; internal set; }
-        public string Uri { get; internal set; }
+        public string Query { get; set; }
+        public string Title { get; set; }
+        public string Uri { get; set; }
     }
     public class Song
     {
-        public StreamState State { get; internal set; }
+        public StreamState State { get; set; }
         public string PrettyName =>
             $"**【 {SongInfo.Title.TrimTo(55)} 】**`{(SongInfo.Provider ?? "-")}` `by {QueuerName}`";
         public SongInfo SongInfo { get; }
@@ -80,11 +80,11 @@ namespace NadekoBot.Modules.Music.Classes
             return this;
         }
 
-        internal async Task Play(IAudioClient voiceClient, CancellationToken cancelToken)
+        public async Task Play(IAudioClient voiceClient, CancellationToken cancelToken)
         {
             var filename = Path.Combine(Music.MusicDataPath, DateTime.Now.UnixTimestamp().ToString());
 
-            SongBuffer inStream = new SongBuffer(MusicPlayer, filename, SongInfo, skipTo);
+            SongBuffer inStream = new SongBuffer(MusicPlayer, filename, SongInfo, skipTo, frameBytes * 100);
             var bufferTask = inStream.BufferSong(cancelToken).ConfigureAwait(false);
 
             bytesSent = 0;
@@ -118,9 +118,10 @@ namespace NadekoBot.Modules.Music.Classes
                 while (!cancelToken.IsCancellationRequested)
                 {
                     //Console.WriteLine($"Read: {songBuffer.ReadPosition}\nWrite: {songBuffer.WritePosition}\nContentLength:{songBuffer.ContentLength}\n---------");
-                    var read = inStream.Read(buffer, 0, buffer.Length);
+                    var read = await inStream.ReadAsync(buffer, 0, buffer.Length).ConfigureAwait(false);
                     //await inStream.CopyToAsync(voiceClient.OutputStream);
-                    _log.Debug("read {0}", read);
+                    if(read < frameBytes)
+                        _log.Debug("read {0}", read);
                     unchecked
                     {
                         bytesSent += (ulong)read;
@@ -155,7 +156,7 @@ namespace NadekoBot.Modules.Music.Classes
                     int delayMillis = unchecked(nextTime - Environment.TickCount);
                     if (delayMillis > 0)
                         await Task.Delay(delayMillis, cancelToken).ConfigureAwait(false);
-                    await outStream.WriteAsync(buffer, 0, read);
+                    await outStream.WriteAsync(buffer, 0, read).ConfigureAwait(false);
                 }
             }
             finally

src/NadekoBot/Modules/Music/Classes/SongBuffer.cs

@@ -1,4 +1,5 @@
 using NadekoBot.Extensions;
+using NLog;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -17,14 +18,15 @@ namespace NadekoBot.Modules.Music.Classes
     /// </summary>
     class SongBuffer : Stream
     {
-
-        public SongBuffer(MusicPlayer musicPlayer, string basename, SongInfo songInfo, int skipTo)
+        public SongBuffer(MusicPlayer musicPlayer, string basename, SongInfo songInfo, int skipTo, int maxFileSize)
         {
             MusicPlayer = musicPlayer;
             Basename = basename;
             SongInfo = songInfo;
             SkipTo = skipTo;
+            MaxFileSize = maxFileSize;
             CurrentFileStream = new FileStream(this.GetNextFile(), FileMode.OpenOrCreate, FileAccess.Read, FileShare.Write);
+            _log = LogManager.GetCurrentClassLogger();
         }
 
         MusicPlayer MusicPlayer;
@@ -35,7 +37,7 @@ namespace NadekoBot.Modules.Music.Classes
 
         private int SkipTo;
 
-        private static int MAX_FILE_SIZE = 2.MiB();
+        private int MaxFileSize = 2.MiB();
 
         private long FileNumber = -1;
 
@@ -46,9 +48,10 @@ namespace NadekoBot.Modules.Music.Classes
         private ulong CurrentBufferSize = 0;
 
         private FileStream CurrentFileStream;
+        private Logger _log;
 
         public Task BufferSong(CancellationToken cancelToken) =>
-           Task.Factory.StartNew(async () =>
+           Task.Run(async () =>
            {
                Process p = null;
                FileStream outStream = null;
@@ -72,7 +75,7 @@ namespace NadekoBot.Modules.Music.Classes
                    while (!p.HasExited) //Also fix low bandwidth
                    {
                        int bytesRead = await p.StandardOutput.BaseStream.ReadAsync(buffer, 0, buffer.Length, cancelToken).ConfigureAwait(false);
-                       if (currentFileSize >= MAX_FILE_SIZE)
+                       if (currentFileSize >= MaxFileSize)
                        {
                            try
                            {
@@ -122,7 +125,7 @@ Check the guides for your platform on how to setup ffmpeg correctly:
                        p.Dispose();
                    }
                }
-           }, TaskCreationOptions.LongRunning);
+           });
 
         /// <summary>
         /// Return the next file to read, and delete the old one
@@ -172,18 +175,7 @@ Check the guides for your platform on how to setup ffmpeg correctly:
 
         public override long Length => (long) CurrentBufferSize;
 
-        public override long Position
-        {
-            get
-            {
-                return 0;
-            }
-
-            set
-            {
-                
-            }
-        }
+        public override long Position { get; set; } = 0;
 
         public override void Flush() { }
 
@@ -198,6 +190,8 @@ Check the guides for your platform on how to setup ffmpeg correctly:
                     CurrentFileStream = new FileStream(GetNextFile(), FileMode.OpenOrCreate, FileAccess.Read, FileShare.Write);
                     read += CurrentFileStream.Read(buffer, read + offset, count - read);
                 }
+                if (read < count)
+                    Array.Clear(buffer, read, count - read);
             }
             return read;
         }

src/NadekoBot/Modules/Music/Classes/SoundCloud.cs

@@ -40,7 +40,7 @@ namespace NadekoBot.Modules.Music.Classes
         public bool IsSoundCloudLink(string url) =>
             System.Text.RegularExpressions.Regex.IsMatch(url, "(.*)(soundcloud.com|snd.sc)(.*)");
 
-        internal async Task<SoundCloudVideo> GetVideoByQueryAsync(string query)
+        public async Task<SoundCloudVideo> GetVideoByQueryAsync(string query)
         {
             if (string.IsNullOrWhiteSpace(query))
                 throw new ArgumentNullException(nameof(query));

src/NadekoBot/Modules/Music/Music.cs

@@ -13,10 +13,11 @@ using NadekoBot.Extensions;
 using System.Net.Http;
 using Newtonsoft.Json.Linq;
 using System.Collections.Generic;
+using NadekoBot.Services.Database;
 
 namespace NadekoBot.Modules.Music
 {
-    [Module("!!", AppendSpace = false)]
+    [NadekoModule("ClashOfClans", "!!")]
     public partial class Music : DiscordModule
     {
         public static ConcurrentDictionary<ulong, MusicPlayer> MusicPlayers = new ConcurrentDictionary<ulong, MusicPlayer>();
@@ -34,46 +35,49 @@ namespace NadekoBot.Modules.Music
             _google = google;
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
-        public async Task Next(IUserMessage umsg)
+        public Task Next(IUserMessage umsg)
         {
             var channel = (ITextChannel)umsg.Channel;
 
             MusicPlayer musicPlayer;
-            if (!MusicPlayers.TryGetValue(channel.Guild.Id, out musicPlayer)) return;
+            if (!MusicPlayers.TryGetValue(channel.Guild.Id, out musicPlayer)) return Task.CompletedTask;
             if (musicPlayer.PlaybackVoiceChannel == ((IGuildUser)umsg.Author).VoiceChannel)
                 musicPlayer.Next();
+            return Task.CompletedTask;
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
-        public async Task Stop(IUserMessage umsg)
+        public Task Stop(IUserMessage umsg)
         {
             var channel = (ITextChannel)umsg.Channel;
 
             MusicPlayer musicPlayer;
-            if (!MusicPlayers.TryGetValue(channel.Guild.Id, out musicPlayer)) return;
+            if (!MusicPlayers.TryGetValue(channel.Guild.Id, out musicPlayer)) return Task.CompletedTask;
             if (((IGuildUser)umsg.Author).VoiceChannel == musicPlayer.PlaybackVoiceChannel)
             {
                 musicPlayer.Autoplay = false;
                 musicPlayer.Stop();
             }
+            return Task.CompletedTask;
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
-        public async Task Destroy(IUserMessage umsg)
+        public Task Destroy(IUserMessage umsg)
         {
             var channel = (ITextChannel)umsg.Channel;
 
             MusicPlayer musicPlayer;
-            if (!MusicPlayers.TryRemove(channel.Guild.Id, out musicPlayer)) return;
+            if (!MusicPlayers.TryRemove(channel.Guild.Id, out musicPlayer)) return Task.CompletedTask;
             if (((IGuildUser)umsg.Author).VoiceChannel == musicPlayer.PlaybackVoiceChannel)
                 musicPlayer.Destroy();
+            return Task.CompletedTask;
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Pause(IUserMessage umsg)
         {
@@ -90,7 +94,7 @@ namespace NadekoBot.Modules.Music
                 await channel.SendMessageAsync("🎵`Music Player unpaused.`").ConfigureAwait(false);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Queue(IUserMessage umsg, [Remainder] string query)
         {
@@ -104,7 +108,7 @@ namespace NadekoBot.Modules.Music
             }
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task SoundCloudQueue(IUserMessage umsg, [Remainder] string query)
         {
@@ -118,7 +122,7 @@ namespace NadekoBot.Modules.Music
             }
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task ListQueue(IUserMessage umsg, int page = 1)
         {
@@ -151,7 +155,7 @@ namespace NadekoBot.Modules.Music
             await channel.SendMessageAsync(toSend + string.Join("\n", musicPlayer.Playlist.Skip(startAt).Take(15).Select(v => $"`{number++}.` {v.PrettyName}"))).ConfigureAwait(false);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task NowPlaying(IUserMessage umsg)
         {
@@ -166,7 +170,7 @@ namespace NadekoBot.Modules.Music
                                         $"{currentSong.PrettyCurrentTime()}").ConfigureAwait(false);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Volume(IUserMessage umsg, int val)
         {
@@ -181,51 +185,55 @@ namespace NadekoBot.Modules.Music
             var volume = musicPlayer.SetVolume(val);
             await channel.SendMessageAsync($"🎵 `Volume set to {volume}%`").ConfigureAwait(false);
         }
-        ////todo DB
-        //[LocalizedCommand, LocalizedDescription, LocalizedSummary]
-        //[RequireContext(ContextType.Guild)]
-        //public async Task Defvol(IUserMessage umsg, [Remainder] int val)
-        //{
-        //    var channel = (ITextChannel)umsg.Channel;
-        //    var arg = val;
-        //    float volume;
-        //    if (!float.TryParse(arg, out volume) || volume < 0 || volume > 100)
-        //    {
-        //        await channel.SendMessageAsync("Volume number invalid.").ConfigureAwait(false);
-        //        return;
-        //    }
-        //    var conf = SpecificConfigurations.Default.Of(channel.Guild.Id);
-        //    conf.DefaultMusicVolume = volume / 100;
-        //    await channel.SendMessageAsync($"🎵 `Default volume set to {volume}%`").ConfigureAwait(false);
-        //}
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
-        public async Task Mute(IUserMessage umsg)
+        public async Task Defvol(IUserMessage umsg, [Remainder] int val)
+        {
+            var channel = (ITextChannel)umsg.Channel;
+
+            if (val < 0 || val > 100)
+            {
+                await channel.SendMessageAsync("Volume number invalid. Must be between 0 and 100").ConfigureAwait(false);
+                return;
+            }
+            using (var uow = DbHandler.UnitOfWork())
+            {
+                uow.GuildConfigs.For(channel.Guild.Id).DefaultMusicVolume = val / 100.0f;
+                uow.Complete();
+            }
+            await channel.SendMessageAsync($"🎵 `Default volume set to {val}%`").ConfigureAwait(false);
+        }
+
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
+        [RequireContext(ContextType.Guild)]
+        public Task Mute(IUserMessage umsg)
         {
             var channel = (ITextChannel)umsg.Channel;
             MusicPlayer musicPlayer;
             if (!MusicPlayers.TryGetValue(channel.Guild.Id, out musicPlayer))
-                return;
+                return Task.CompletedTask;
             if (((IGuildUser)umsg.Author).VoiceChannel != musicPlayer.PlaybackVoiceChannel)
-                return;
+                return Task.CompletedTask;
             musicPlayer.SetVolume(0);
+            return Task.CompletedTask;
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
-        public async Task Max(IUserMessage umsg)
+        public Task Max(IUserMessage umsg)
         {
             var channel = (ITextChannel)umsg.Channel;
             MusicPlayer musicPlayer;
             if (!MusicPlayers.TryGetValue(channel.Guild.Id, out musicPlayer))
-                return;
+                return Task.CompletedTask;
             if (((IGuildUser)umsg.Author).VoiceChannel != musicPlayer.PlaybackVoiceChannel)
-                return;
+                return Task.CompletedTask;
             musicPlayer.SetVolume(100);
+            return Task.CompletedTask;
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Shuffle(IUserMessage umsg)
         {
@@ -245,7 +253,7 @@ namespace NadekoBot.Modules.Music
             await channel.SendMessageAsync("🎵 `Songs shuffled.`").ConfigureAwait(false);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Playlist(IUserMessage umsg, [Remainder] string playlist)
         {
@@ -287,7 +295,7 @@ namespace NadekoBot.Modules.Music
             await msg.ModifyAsync(m => m.Content = "🎵 `Playlist queue complete.`").ConfigureAwait(false);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task SoundCloudPl(IUserMessage umsg, [Remainder] string pl)
         {
@@ -324,7 +332,7 @@ namespace NadekoBot.Modules.Music
             }
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task LocalPl(IUserMessage umsg, [Remainder] string directory)
         {
@@ -353,7 +361,7 @@ namespace NadekoBot.Modules.Music
             catch { }
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Radio(IUserMessage umsg, string radio_link)
         {
@@ -371,7 +379,7 @@ namespace NadekoBot.Modules.Music
             }
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Local(IUserMessage umsg, [Remainder] string path)
         {
@@ -383,7 +391,7 @@ namespace NadekoBot.Modules.Music
 
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Move(IUserMessage umsg)
         {
@@ -392,10 +400,10 @@ namespace NadekoBot.Modules.Music
             var voiceChannel = ((IGuildUser)umsg.Author).VoiceChannel;
             if (voiceChannel == null || voiceChannel.Guild != channel.Guild || !MusicPlayers.TryGetValue(channel.Guild.Id, out musicPlayer))
                 return;
-            musicPlayer.MoveToVoiceChannel(voiceChannel);
+            await musicPlayer.MoveToVoiceChannel(voiceChannel);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Remove(IUserMessage umsg, int num)
         {
@@ -414,8 +422,8 @@ namespace NadekoBot.Modules.Music
             musicPlayer.RemoveSongAt(num - 1);
             await channel.SendMessageAsync($"🎵**Track {song.PrettyName} at position `#{num}` has been removed.**").ConfigureAwait(false);
         }
-        //todo fix
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Remove(IUserMessage umsg, string all)
         {
@@ -430,7 +438,7 @@ namespace NadekoBot.Modules.Music
             return;
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task MoveSong(IUserMessage umsg, [Remainder] string fromto)
         {
@@ -466,7 +474,7 @@ namespace NadekoBot.Modules.Music
 
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task SetMaxQueue(IUserMessage umsg, uint size)
         {
@@ -480,7 +488,7 @@ namespace NadekoBot.Modules.Music
             await channel.SendMessageAsync($"🎵 `Max queue set to {(size == 0 ? ("unlimited") : size + " tracks")}`");
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task ReptCurSong(IUserMessage umsg)
         {
@@ -498,7 +506,7 @@ namespace NadekoBot.Modules.Music
                                             .ConfigureAwait(false);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task RepeatPl(IUserMessage umsg)
         {
@@ -511,7 +519,7 @@ namespace NadekoBot.Modules.Music
         }
 
         ///
-        //[LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        //[LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         //[RequireContext(ContextType.Guild)]
         //public async Task Save(IUserMessage umsg, [Remainder] string name)
         //{
@@ -519,7 +527,7 @@ namespace NadekoBot.Modules.Music
 
         //}
 
-        //[LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        //[LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         //[RequireContext(ContextType.Guild)]
         //public async Task Load(IUserMessage umsg, [Remainder] string name)
         //{
@@ -527,7 +535,7 @@ namespace NadekoBot.Modules.Music
 
         //}
 
-        //[LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        //[LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         //[RequireContext(ContextType.Guild)]
         //public async Task Playlists(IUserMessage umsg, [Remainder] string num)
         //{
@@ -535,7 +543,7 @@ namespace NadekoBot.Modules.Music
 
         //}
 
-        //[LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        //[LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         //[RequireContext(ContextType.Guild)]
         //public async Task DeletePlaylist(IUserMessage umsg, [Remainder] string pl)
         //{
@@ -543,7 +551,7 @@ namespace NadekoBot.Modules.Music
 
         //}
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Goto(IUserMessage umsg, int time)
         {
@@ -580,7 +588,7 @@ namespace NadekoBot.Modules.Music
             await channel.SendMessageAsync($"`Skipped to {minutes}:{seconds}`").ConfigureAwait(false);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task GetLink(IUserMessage umsg, int index = 0)
         {
@@ -615,7 +623,7 @@ namespace NadekoBot.Modules.Music
             }
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Autoplay(IUserMessage umsg)
         {
@@ -643,8 +651,11 @@ namespace NadekoBot.Modules.Music
 
             var musicPlayer = MusicPlayers.GetOrAdd(textCh.Guild.Id, server =>
             {
-                //todo DB
                 float vol = 1;// SpecificConfigurations.Default.Of(server.Id).DefaultMusicVolume;
+                using (var uow = DbHandler.UnitOfWork())
+                {
+                    vol = uow.GuildConfigs.For(textCh.Guild.Id).DefaultMusicVolume;
+                }
                 var mp = new MusicPlayer(voiceCh, vol);
 
 

src/NadekoBot/Modules/NSFW/NSFW.cs

@@ -15,14 +15,14 @@ using NadekoBot.Extensions;
 
 namespace NadekoBot.Modules.NSFW
 {
-    [Module("~", AppendSpace = false)]
+    [NadekoModule("NSFW", "~")]
     public class NSFW : DiscordModule
     {
         public NSFW(ILocalization loc, CommandService cmds, DiscordSocketClient client) : base(loc, cmds, client)
         {
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Hentai(IUserMessage umsg, [Remainder] string tag = null)
         {
@@ -41,7 +41,7 @@ namespace NadekoBot.Modules.NSFW
             await channel.SendMessageAsync(String.Join("\n\n", links)).ConfigureAwait(false);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Danbooru(IUserMessage umsg, [Remainder] string tag = null)
         {
@@ -55,7 +55,7 @@ namespace NadekoBot.Modules.NSFW
                 await channel.SendMessageAsync(link).ConfigureAwait(false);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Gelbooru(IUserMessage umsg, [Remainder] string tag = null)
         {
@@ -69,7 +69,7 @@ namespace NadekoBot.Modules.NSFW
                 await channel.SendMessageAsync(link).ConfigureAwait(false);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Rule34(IUserMessage umsg, [Remainder] string tag = null)
         {
@@ -83,7 +83,7 @@ namespace NadekoBot.Modules.NSFW
                 await channel.SendMessageAsync(link).ConfigureAwait(false);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task E621(IUserMessage umsg, [Remainder] string tag = null)
         {
@@ -97,7 +97,7 @@ namespace NadekoBot.Modules.NSFW
                 await channel.SendMessageAsync(link).ConfigureAwait(false);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Cp(IUserMessage umsg)
         {
@@ -106,7 +106,7 @@ namespace NadekoBot.Modules.NSFW
             await channel.SendMessageAsync("http://i.imgur.com/MZkY1md.jpg").ConfigureAwait(false);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Boobs(IUserMessage umsg)
         {
@@ -116,7 +116,7 @@ namespace NadekoBot.Modules.NSFW
                 JToken obj;
                 using (var http = new HttpClient())
                 {
-                    obj = JArray.Parse(await http.GetStringAsync($"http://api.oboobs.ru/boobs/{ new Random().Next(0, 9880) }").ConfigureAwait(false))[0];
+                    obj = JArray.Parse(await http.GetStringAsync($"http://api.oboobs.ru/boobs/{ new NadekoRandom().Next(0, 9880) }").ConfigureAwait(false))[0];
                 }
                 await channel.SendMessageAsync($"http://media.oboobs.ru/{ obj["preview"].ToString() }").ConfigureAwait(false);
             }
@@ -126,7 +126,7 @@ namespace NadekoBot.Modules.NSFW
             }
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Butts(IUserMessage umsg)
         {
@@ -137,7 +137,7 @@ namespace NadekoBot.Modules.NSFW
                 JToken obj;
                 using (var http = new HttpClient())
                 {
-                    obj = JArray.Parse(await http.GetStringAsync($"http://api.obutts.ru/butts/{ new Random().Next(0, 3873) }").ConfigureAwait(false))[0];
+                    obj = JArray.Parse(await http.GetStringAsync($"http://api.obutts.ru/butts/{ new NadekoRandom().Next(0, 3873) }").ConfigureAwait(false))[0];
                 }
                 await channel.SendMessageAsync($"http://media.obutts.ru/{ obj["preview"].ToString() }").ConfigureAwait(false);
             }
@@ -149,7 +149,7 @@ namespace NadekoBot.Modules.NSFW
 
         public static async Task<string> GetDanbooruImageLink(string tag)
         {
-            var rng = new Random();
+            var rng = new NadekoRandom();
 
             if (tag == "loli") //loli doesn't work for some reason atm
                 tag = "flat_chest";
@@ -181,7 +181,7 @@ namespace NadekoBot.Modules.NSFW
                 if (matches.Count == 0)
                     return null;
 
-                var rng = new Random();
+                var rng = new NadekoRandom();
                 var match = matches[rng.Next(0, matches.Count)];
                 return matches[rng.Next(0, matches.Count)].Groups["url"].Value;
             }
@@ -189,7 +189,7 @@ namespace NadekoBot.Modules.NSFW
 
         public static async Task<string> GetRule34ImageLink(string tag)
         {
-            var rng = new Random();
+            var rng = new NadekoRandom();
             var url =
             $"http://rule34.xxx/index.php?page=dapi&s=post&q=index&limit=100&tags={tag.Replace(" ", "_")}";
             using (var http = new HttpClient())
@@ -204,7 +204,7 @@ namespace NadekoBot.Modules.NSFW
         }
 
 
-        internal static async Task<string> GetE621ImageLink(string tags)
+        public static async Task<string> GetE621ImageLink(string tags)
         {
             try
             {

src/NadekoBot/Modules/Pokemon/Pokemon.cs

@@ -15,7 +15,7 @@ namespace NadekoBot.Modules.Games
         }
 
         //todo Dragon should PR this in
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Poke(IUserMessage umsg)
         {

src/NadekoBot/Modules/Searches/Commands/AnimeSearchCommands.cs

@@ -1,99 +1,132 @@
-//using Discord;
-//using Discord.Commands;
-//using NadekoBot.Attributes;
-//using System;
-//using System.Collections.Generic;
-//using System.Linq;
-//using System.Threading.Tasks;
+using Discord;
+using Discord.Commands;
+using NadekoBot.Attributes;
+using NadekoBot.Extensions;
+using NadekoBot.Modules.Searches.Models;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using NLog;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
 
-//// todo RestSharp
-//namespace NadekoBot.Modules.Searches
-//{
-//    public partial class SearchesModule
-//    {
-//        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
-//        [RequireContext(ContextType.Guild)]
-//        public async Task Anime(IUserMessage umsg, [Remainder] string query = null)
-//        {
-//            var channel = (ITextChannel)umsg.Channel;
+namespace NadekoBot.Modules.Searches
+{
+    public partial class Searches
+    {
+        [Group]
+        public class AnimeSearchCommands
+        {
+            private Logger _log;
 
-//            if (!(await ValidateQuery(umsg.Channel as ITextChannel, query).ConfigureAwait(false))) return;
-//            string result;
-//            try
-//            {
-//                result = (await GetAnimeData(query).ConfigureAwait(false)).ToString();
-//            }
-//            catch
-//            {
-//                await channel.SendMessageAsync("Failed to find that anime.").ConfigureAwait(false);
-//                return;
-//            }
+            private string anilistToken { get; set; }
+            private DateTime lastRefresh { get; set; }
 
-//            await channel.SendMessageAsync(result.ToString()).ConfigureAwait(false);
-//        }
+            public AnimeSearchCommands()
+            {
+                _log = LogManager.GetCurrentClassLogger();
+            }
 
-//        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
-//        [RequireContext(ContextType.Guild)]
-//        public async Task Manga(IUserMessage umsg, [Remainder] string query = null)
-//        {
-//            var channel = (ITextChannel)umsg.Channel;
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
+            [RequireContext(ContextType.Guild)]
+            public async Task Anime(IUserMessage umsg, [Remainder] string query)
+            {
+                var channel = (ITextChannel)umsg.Channel;
 
-//            if (!(await ValidateQuery(umsg.Channel as ITextChannel, query).ConfigureAwait(false))) return;
-//            string result;
-//            try
-//            {
-//                result = (await GetMangaData(query).ConfigureAwait(false)).ToString();
-//            }
-//            catch
-//            {
-//                await channel.SendMessageAsync("Failed to find that manga.").ConfigureAwait(false);
-//                return;
-//            }
-//            await channel.SendMessageAsync(result).ConfigureAwait(false);
-//        }
+                if (string.IsNullOrWhiteSpace(query))
+                    return;
 
-//        public static async Task<AnimeResult> GetAnimeData(string query)
-//        {
-//            if (string.IsNullOrWhiteSpace(query))
-//                throw new ArgumentNullException(nameof(query));
+                var result = await GetAnimeData(query).ConfigureAwait(false);
 
-//            await RefreshAnilistToken().ConfigureAwait(false);
+                await channel.SendMessageAsync(result.ToString() ?? "`No anime found.`").ConfigureAwait(false);
+            }
 
-//            var link = "http://anilist.co/api/anime/search/" + Uri.EscapeUriString(query);
-//            var smallContent = "";
-//            var cl = new RestSharp.RestClient("http://anilist.co/api");
-//            var rq = new RestSharp.RestRequest("/anime/search/" + Uri.EscapeUriString(query));
-//            rq.AddParameter("access_token", token);
-//            smallContent = cl.Execute(rq).Content;
-//            var smallObj = JArray.Parse(smallContent)[0];
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
+            [RequireContext(ContextType.Guild)]
+            public async Task Manga(IUserMessage umsg, [Remainder] string query)
+            {
+                var channel = (ITextChannel)umsg.Channel;
 
-//            rq = new RestSharp.RestRequest("/anime/" + smallObj["id"]);
-//            rq.AddParameter("access_token", token);
-//            var content = cl.Execute(rq).Content;
+                if (string.IsNullOrWhiteSpace(query))
+                    return;
 
-//            return await Task.Run(() => JsonConvert.DeserializeObject<AnimeResult>(content)).ConfigureAwait(false);
-//        }
+                var result = await GetMangaData(query).ConfigureAwait(false);
 
-//        public static async Task<MangaResult> GetMangaData(string query)
-//        {
-//            if (string.IsNullOrWhiteSpace(query))
-//                throw new ArgumentNullException(nameof(query));
+                await channel.SendMessageAsync(result.ToString() ?? "`No manga found.`").ConfigureAwait(false);
+            }
 
-//            await RefreshAnilistToken().ConfigureAwait(false);
+            private async Task<AnimeResult> GetAnimeData(string query)
+            {
+                if (string.IsNullOrWhiteSpace(query))
+                    throw new ArgumentNullException(nameof(query));
+                try
+                {
+                    await RefreshAnilistToken().ConfigureAwait(false);
 
-//            var link = "http://anilist.co/api/anime/search/" + Uri.EscapeUriString(query);
-//            var smallContent = "";
-//            var cl = new RestSharp.RestClient("http://anilist.co/api");
-//            var rq = new RestSharp.RestRequest("/manga/search/" + Uri.EscapeUriString(query));
-//            rq.AddParameter("access_token", token);
-//            smallContent = cl.Execute(rq).Content;
-//            var smallObj = JArray.Parse(smallContent)[0];
+                    var link = "http://anilist.co/api/anime/search/" + Uri.EscapeUriString(query);
+                    using (var http = new HttpClient())
+                    {
+                        var res = await http.GetStringAsync("http://anilist.co/api/anime/search/" + Uri.EscapeUriString(query) + $"?access_token={anilistToken}").ConfigureAwait(false);
+                        var smallObj = JArray.Parse(res)[0];
+                        var aniData = await http.GetStringAsync("http://anilist.co/api/anime/" + smallObj["id"] + $"?access_token={anilistToken}").ConfigureAwait(false);
 
-//            rq = new RestSharp.RestRequest("/manga/" + smallObj["id"]);
-//            rq.AddParameter("access_token", token);
-//            var content = cl.Execute(rq).Content;
+                        return await Task.Run(() => JsonConvert.DeserializeObject<AnimeResult>(aniData)).ConfigureAwait(false);
+                    }
+                }
+                catch (Exception ex) {
+                    _log.Warn(ex, "Failed anime search for {0}", query);
+                    return null;
+                }
+            }
 
-//            return await Task.Run(() => JsonConvert.DeserializeObject<MangaResult>(content)).ConfigureAwait(false);
-//        }
-//    }
-//}
+            private async Task RefreshAnilistToken()
+            {
+                if (DateTime.Now - lastRefresh > TimeSpan.FromMinutes(29))
+                    lastRefresh = DateTime.Now;
+                else
+                {
+                    return;
+                }
+                var headers = new Dictionary<string, string> {
+                    {"grant_type", "client_credentials"},
+                    {"client_id", "kwoth-w0ki9"},
+                    {"client_secret", "Qd6j4FIAi1ZK6Pc7N7V4Z"},
+                };
+                using (var http = new HttpClient())
+                {
+                    http.AddFakeHeaders();
+                    var formContent = new FormUrlEncodedContent(headers);
+                    var response = await http.PostAsync("http://anilist.co/api/auth/access_token", formContent).ConfigureAwait(false);
+                    var stringContent = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    anilistToken = JObject.Parse(stringContent)["access_token"].ToString();
+                }
+                
+            }
+
+            private async Task<MangaResult> GetMangaData(string query)
+            {
+                if (string.IsNullOrWhiteSpace(query))
+                    throw new ArgumentNullException(nameof(query));
+                try
+                {
+                    await RefreshAnilistToken().ConfigureAwait(false);
+                    using (var http = new HttpClient())
+                    {
+                        var res = await http.GetStringAsync("http://anilist.co/api/manga/search/" + Uri.EscapeUriString(query) + $"?access_token={anilistToken}").ConfigureAwait(false);
+                        var smallObj = JArray.Parse(res)[0];
+                        var aniData = await http.GetStringAsync("http://anilist.co/api/manga/" + smallObj["id"] + $"?access_token={anilistToken}").ConfigureAwait(false);
+
+                        return await Task.Run(() => JsonConvert.DeserializeObject<MangaResult>(aniData)).ConfigureAwait(false);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _log.Warn(ex, "Failed anime search for {0}", query);
+                    return null;
+                }
+            }
+        }
+    }
+}

src/NadekoBot/Modules/Searches/Commands/CalcCommand.cs

@@ -14,7 +14,7 @@ namespace NadekoBot.Modules.Searches
     [Group]
     public partial class Searches
     {
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public static async Task Calculate(IUserMessage msg, [Remainder] string expression)
         {
@@ -41,7 +41,7 @@ namespace NadekoBot.Modules.Searches
             }
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task CalcOps(IUserMessage msg)
         {

src/NadekoBot/Modules/Searches/Commands/ConverterCommands.cs

@@ -30,7 +30,7 @@
 //        }
 
 
-//        internal override void Init(CommandGroupBuilder cgb)
+//        public override void Init(CommandGroupBuilder cgb)
 //        {
 //            cgb.CreateCommand(Module.Prefix + "convert")
 //                .Description($"Convert quantities from>to. | `{Prefix}convert m>km 1000`")

src/NadekoBot/Modules/Searches/Commands/JokeCommands.cs

@@ -2,6 +2,7 @@
 using Discord.Commands;
 using NadekoBot.Attributes;
 using NadekoBot.Modules.Searches.Models;
+using NadekoBot.Services;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using NLog;
@@ -19,7 +20,6 @@ namespace NadekoBot.Modules.Searches
         [Group]
         public class JokeCommands
         {
-            //todo DB
             private List<WoWJoke> wowJokes = new List<WoWJoke>();
             private List<MagicItem> magicItems;
             private Logger _log;
@@ -42,7 +42,7 @@ namespace NadekoBot.Modules.Searches
                     _log.Warn("data/magicitems.json is missing. Magic items are not loaded.");
             }
 
-            [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
             [RequireContext(ContextType.Guild)]
             public async Task Yomama(IUserMessage umsg)
             {
@@ -54,7 +54,7 @@ namespace NadekoBot.Modules.Searches
                 }
             }
 
-            [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
             [RequireContext(ContextType.Guild)]
             public async Task Randjoke(IUserMessage umsg)
             {
@@ -66,7 +66,7 @@ namespace NadekoBot.Modules.Searches
                 }
             }
 
-            [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
             [RequireContext(ContextType.Guild)]
             public async Task ChuckNorris(IUserMessage umsg)
             {
@@ -78,7 +78,7 @@ namespace NadekoBot.Modules.Searches
                 }
             }
 
-            [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
             [RequireContext(ContextType.Guild)]
             public async Task WowJoke(IUserMessage umsg)
             {
@@ -87,15 +87,15 @@ namespace NadekoBot.Modules.Searches
                 if (!wowJokes.Any())
                 {
                 }
-                await channel.SendMessageAsync(wowJokes[new Random().Next(0, wowJokes.Count)].ToString());
+                await channel.SendMessageAsync(wowJokes[new NadekoRandom().Next(0, wowJokes.Count)].ToString());
             }
 
-            [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
             [RequireContext(ContextType.Guild)]
             public async Task MagicItem(IUserMessage umsg)
             {
                 var channel = (ITextChannel)umsg.Channel;
-                var rng = new Random();
+                var rng = new NadekoRandom();
                 var item = magicItems[rng.Next(0, magicItems.Count)].ToString();
 
                 await channel.SendMessageAsync(item).ConfigureAwait(false);

src/NadekoBot/Modules/Searches/Commands/LoLCommands.cs

@@ -2,6 +2,7 @@
 using Discord.Commands;
 using NadekoBot.Attributes;
 using NadekoBot.Extensions;
+using NadekoBot.Services;
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
@@ -31,7 +32,7 @@ namespace NadekoBot.Modules.Searches
                                                 "Doesn't matter what you ban really. Enemy will ban your main and you will lose." };
 
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Lolban(IUserMessage umsg)
         {
@@ -52,7 +53,7 @@ namespace NadekoBot.Modules.Searches
                     var dataList = data.Distinct(new ChampionNameComparer()).Take(showCount).ToList();
                     var sb = new StringBuilder();
                     sb.AppendLine($"**Showing {dataList.Count} top banned champions.**");
-                    sb.AppendLine($"`{trashTalk[new Random().Next(0, trashTalk.Length)]}`");
+                    sb.AppendLine($"`{trashTalk[new NadekoRandom().Next(0, trashTalk.Length)]}`");
                     for (var i = 0; i < dataList.Count; i++)
                     {
                         if (i % 2 == 0 && i != 0)
@@ -113,7 +114,7 @@ namespace NadekoBot.Modules.Searches
 //            public float StatScore { get; set; }
 //        }
 
-//        internal override void Init(CommandGroupBuilder cgb)
+//        public 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. |`{Prefix}lolchamp Riven` or `{Prefix}lolchamp Annie sup`")

src/NadekoBot/Modules/Searches/Commands/MemegenCommands.cs

@@ -15,7 +15,7 @@ namespace NadekoBot.Modules.Searches
 {
     public partial class Searches
     {
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Memelist(IUserMessage umsg)
         {
@@ -29,7 +29,7 @@ namespace NadekoBot.Modules.Searches
             }
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Memegen(IUserMessage umsg, string meme, string topText, string botText)
         {

src/NadekoBot/Modules/Searches/Commands/Models/AnimeResult.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Classes.JSONModels
+namespace NadekoBot.Modules.Searches.Models
 {
     public class AnimeResult
     {

src/NadekoBot/Modules/Searches/Commands/Models/MangaResult.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot.Classes.JSONModels
+namespace NadekoBot.Modules.Searches.Models
 {
     public class MangaResult
     {

src/NadekoBot/Modules/Searches/Commands/Models/MeasurementUnit.cs

@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+
+namespace NadekoBot.Modules.Searches.Commands.Models
+{
+    public class MeasurementUnit
+    {
+        public List<string> Triggers { get; set; }
+        public string UnitType { get; set; }
+        public decimal Modifier { get; set; }
+    }
+}

src/NadekoBot/Modules/Searches/Commands/Models/Rates.cs

@@ -0,0 +1,14 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+
+namespace NadekoBot.Modules.Searches.Commands.Models
+{
+    public class Rates
+    {
+        public string Base { get; set; }
+        public DateTime Date { get; set; }
+        [JsonProperty("rates")]
+        public Dictionary<string, decimal> ConversionRates { get; set; }
+    }
+}

src/NadekoBot/Modules/Searches/Commands/OsuCommands.cs

@@ -25,7 +25,7 @@ namespace NadekoBot.Modules.Searches
             {
                 _log = LogManager.GetCurrentClassLogger();
             }
-            [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
             [RequireContext(ContextType.Guild)]
             public async Task Osu(IUserMessage umsg, string usr, string mode)
             {
@@ -58,7 +58,7 @@ namespace NadekoBot.Modules.Searches
                 }
             }
 
-            [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
             [RequireContext(ContextType.Guild)]
             public async Task Osub(IUserMessage umsg, [Remainder] string map)
             {
@@ -95,7 +95,7 @@ namespace NadekoBot.Modules.Searches
                 }
             }
 
-            [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
             [RequireContext(ContextType.Guild)]
             public async Task Osu5(IUserMessage umsg, string user, [Remainder] string mode)
             {

src/NadekoBot/Modules/Searches/Commands/PokemonSearchCommands.cs

@@ -15,7 +15,6 @@ namespace NadekoBot.Modules.Searches
         [Group]
         public class PokemonSearchCommands
         {
-            //todo DB
             private static Dictionary<string, SearchPokemon> pokemons = new Dictionary<string, SearchPokemon>();
             private static Dictionary<string, SearchPokemonAbility> pokemonAbilities = new Dictionary<string, SearchPokemonAbility>();
 
@@ -39,7 +38,7 @@ namespace NadekoBot.Modules.Searches
                     _log.Warn(PokemonAbilitiesFile + " is missing. Pokemon abilities not loaded.");
             }
 
-            [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
             [RequireContext(ContextType.Guild)]
             public async Task Pokemon(IUserMessage umsg, [Remainder] string pokemon = null)
             {
@@ -60,7 +59,7 @@ namespace NadekoBot.Modules.Searches
                 await channel.SendMessageAsync("`No pokemon found.`");
             }
 
-            [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
             [RequireContext(ContextType.Guild)]
             public async Task PokemonAbility(IUserMessage umsg, [Remainder] string ability = null)
             {

src/NadekoBot/Modules/Searches/Commands/StreamNotificationCommands.cs

@@ -1,348 +1,288 @@
-//using Discord.Commands;
-//using NadekoBot.Classes;
-//using Newtonsoft.Json.Linq;
-//using System;
-//using System.Collections.Concurrent;
-//using System.Linq;
-//using System.Threading.Tasks;
-//using Discord;
-//using NadekoBot.Services;
-//using System.Threading;
+using Discord.Commands;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Concurrent;
+using System.Linq;
+using System.Threading.Tasks;
+using Discord;
+using NadekoBot.Services;
+using System.Threading;
+using NadekoBot.Services.Database;
+using System.Collections.Generic;
+using NadekoBot.Services.Database.Models;
+using System.Net.Http;
+using Discord.WebSocket;
+using NadekoBot.Attributes;
 
-//todo DB
-//namespace NadekoBot.Modules.Searches
-//{
-//    public partial class Searches
-//    {
-//        [Group]
-//        public class StreamNotificationCommands
-//        {
-//            private readonly Timer checkTimer;
-//            private ConcurrentDictionary<string, Tuple<bool, string>> cachedStatuses = new ConcurrentDictionary<string, Tuple<bool, string>>();
-//            private bool FirstPass { get; set; } = true; 
+namespace NadekoBot.Modules.Searches
+{
+    public partial class Searches
+    {
+        [Group]
+        public class StreamNotificationCommands
+        {
+            private Timer checkTimer { get; }
+            private ConcurrentDictionary<string, Tuple<bool, string>> cachedStatuses = new ConcurrentDictionary<string, Tuple<bool, string>>();
+            private bool FirstPass { get; set; } = true;
 
-//            public StreamNotifications(DiscordModule module)
-//            {
-//                checkTimer = new Timer(async (state) =>
-//                {
-//                    cachedStatuses.Clear();
-//                    try
-//                    {
-//                        var streams = SpecificConfigurations.Default.AllConfigs.SelectMany(c => c.ObservingStreams);
-//                        if (!streams.Any()) return;
-//                        foreach (var stream in streams)
-//                        {
-//                            Tuple<bool, string> data;
-//                            try
-//                            {
-//                                data = await GetStreamStatus(stream).ConfigureAwait(false);
-//                            }
-//                            catch
-//                            {
-//                                continue;
-//                            }
+            public StreamNotificationCommands()
+            {
+                checkTimer = new Timer(async (state) =>
+                {
+                    cachedStatuses.Clear();
+                    try
+                    {
+                        IEnumerable<FollowedStream> streams;
+                        using (var uow = DbHandler.UnitOfWork())
+                        {
+                            streams = uow.GuildConfigs.GetAllFollowedStreams();
+                        }
+                        foreach (var stream in streams)
+                        {
+                            Tuple<bool, string> data;
+                            try
+                            {
+                                data = await GetStreamStatus(stream).ConfigureAwait(false);
+                            }
+                            catch
+                            {
+                                continue;
+                            }
 
-//                            if (data.Item1 != stream.LastStatus)
-//                            {
-//                                stream.LastStatus = data.Item1;
-//                                if (FirstPass)
-//                                    continue;
-//                                var server = NadekoBot.Client.GetServer(stream.ServerId);
-//                                var channel = server?.GetChannel(stream.ChannelId);
-//                                if (channel == null)
-//                                    continue;
-//                                var msg = $"`{stream.Username}`'s stream is now " +
-//                                          $"**{(data.Item1 ? "ONLINE" : "OFFLINE")}** with " +
-//                                          $"**{data.Item2}** viewers.";
-//                                if (stream.LastStatus)
-//                                    if (stream.Type == StreamNotificationConfig.StreamType.Hitbox)
-//                                        msg += $"\n`Here is the Link:`【 http://www.hitbox.tv/{stream.Username}/ 】";
-//                                    else if (stream.Type == StreamNotificationConfig.StreamType.Twitch)
-//                                        msg += $"\n`Here is the Link:`【 http://www.twitch.tv/{stream.Username}/ 】";
-//                                    else if (stream.Type == StreamNotificationConfig.StreamType.Beam)
-//                                        msg += $"\n`Here is the Link:`【 http://www.beam.pro/{stream.Username}/ 】";
-//                                    else if (stream.Type == StreamNotificationConfig.StreamType.YoutubeGaming)
-//                                        msg += $"\n`Here is the Link:`【 not implemented yet - {stream.Username} 】";
-//                                await channel.SendMessageAsync(msg).ConfigureAwait(false);
-//                            }
-//                        }
-//                        FirstPass = false;
-//                    }
-//                    catch { }
-//                }, null, TimeSpan.Zero, TimeSpan.FromSeconds(15));
-//            }
+                            if (data.Item1 != stream.LastStatus)
+                            {
+                                stream.LastStatus = data.Item1;
+                                if (FirstPass)
+                                    continue;
+                                var server = NadekoBot.Client.GetGuild(stream.GuildId);
+                                var channel = server?.GetTextChannel(stream.ChannelId);
+                                if (channel == null)
+                                    continue;
+                                var msg = $"`{stream.Username}`'s stream is now " +
+                                          $"**{(data.Item1 ? "ONLINE" : "OFFLINE")}** with " +
+                                          $"**{data.Item2}** viewers.";
+                                if (stream.LastStatus)
+                                    if (stream.Type == FollowedStream.FollowedStreamType.Hitbox)
+                                        msg += $"\n`Here is the Link:`【 http://www.hitbox.tv/{stream.Username}/ 】";
+                                    else if (stream.Type == FollowedStream.FollowedStreamType.Twitch)
+                                        msg += $"\n`Here is the Link:`【 http://www.twitch.tv/{stream.Username}/ 】";
+                                    else if (stream.Type == FollowedStream.FollowedStreamType.Beam)
+                                        msg += $"\n`Here is the Link:`【 http://www.beam.pro/{stream.Username}/ 】";
+                                    //else if (stream.Type == FollowedStream.FollowedStreamType.YoutubeGaming)
+                                    //    msg += $"\n`Here is the Link:`【 not implemented yet - {stream.Username} 】";
+                                await channel.SendMessageAsync(msg).ConfigureAwait(false);
+                            }
+                        }
+                        FirstPass = false;
+                    }
+                    catch { }
+                }, null, TimeSpan.Zero, TimeSpan.FromSeconds(15));
+            }
 
-//            public StreamNotifications(ILocalization loc, CommandService cmds, IBotConfiguration config, DiscordSocketClient client) : base(loc, cmds, config, client)
-//            {
-//            }
+            private async Task<Tuple<bool, string>> GetStreamStatus(FollowedStream stream, bool checkCache = true)
+            {
+                bool isLive;
+                string response;
+                JObject data;
+                Tuple<bool, string> result;
+                switch (stream.Type)
+                {
+                    case FollowedStream.FollowedStreamType.Hitbox:
+                        var hitboxUrl = $"https://api.hitbox.tv/media/status/{stream.Username}";
+                        if (checkCache && cachedStatuses.TryGetValue(hitboxUrl, out result))
+                            return result;
+                        using (var http = new HttpClient())
+                        {
+                            response = await http.GetStringAsync(hitboxUrl).ConfigureAwait(false);
+                        }
+                        data = JObject.Parse(response);
+                        isLive = data["media_is_live"].ToString() == "1";
+                        result = new Tuple<bool, string>(isLive, data["media_views"].ToString());
+                        cachedStatuses.TryAdd(hitboxUrl, result);
+                        return result;
+                    case FollowedStream.FollowedStreamType.Twitch:
+                        var twitchUrl = $"https://api.twitch.tv/kraken/streams/{Uri.EscapeUriString(stream.Username)}";
+                        if (checkCache && cachedStatuses.TryGetValue(twitchUrl, out result))
+                            return result;
+                        using (var http = new HttpClient())
+                        {
+                            response = await http.GetStringAsync(twitchUrl).ConfigureAwait(false);
+                        }
+                        data = JObject.Parse(response);
+                        isLive = !string.IsNullOrWhiteSpace(data["stream"].ToString());
+                        result = new Tuple<bool, string>(isLive, isLive ? data["stream"]["viewers"].ToString() : "0");
+                        cachedStatuses.TryAdd(twitchUrl, result);
+                        return result;
+                    case FollowedStream.FollowedStreamType.Beam:
+                        var beamUrl = $"https://beam.pro/api/v1/channels/{stream.Username}";
+                        if (checkCache && cachedStatuses.TryGetValue(beamUrl, out result))
+                            return result;
+                        using (var http = new HttpClient())
+                        {
+                            response = await http.GetStringAsync(beamUrl).ConfigureAwait(false);
+                        }
+                        data = JObject.Parse(response);
+                        isLive = data["online"].ToObject<bool>() == true;
+                        result = new Tuple<bool, string>(isLive, data["viewersCurrent"].ToString());
+                        cachedStatuses.TryAdd(beamUrl, result);
+                        return result;
+                    default:
+                        break;
+                }
+                return new Tuple<bool, string>(false, "0");
+            }
 
-//            private async Task<Tuple<bool, string>> GetStreamStatus(StreamNotificationConfig stream, bool checkCache = true)
-//            {
-//                bool isLive;
-//                string response;
-//                JObject data;
-//                Tuple<bool, string> result;
-//                switch (stream.Type)
-//                {
-//                    case StreamNotificationConfig.StreamType.Hitbox:
-//                        var hitboxUrl = $"https://api.hitbox.tv/media/status/{stream.Username}";
-//                        if (checkCache && cachedStatuses.TryGetValue(hitboxUrl, out result))
-//                            return result;
-//                        response = await http.GetStringAsync(hitboxUrl).ConfigureAwait(false);
-//                        data = JObject.Parse(response);
-//                        isLive = data["media_is_live"].ToString() == "1";
-//                        result = new Tuple<bool, string>(isLive, data["media_views"].ToString());
-//                        cachedStatuses.TryAdd(hitboxUrl, result);
-//                        return result;
-//                    case StreamNotificationConfig.StreamType.Twitch:
-//                        var twitchUrl = $"https://api.twitch.tv/kraken/streams/{Uri.EscapeUriString(stream.Username)}";
-//                        if (checkCache && cachedStatuses.TryGetValue(twitchUrl, out result))
-//                            return result;
-//                        response = await http.GetStringAsync(twitchUrl).ConfigureAwait(false);
-//                        data = JObject.Parse(response);
-//                        isLive = !string.IsNullOrWhiteSpace(data["stream"].ToString());
-//                        result = new Tuple<bool, string>(isLive, isLive ? data["stream"]["viewers"].ToString() : "0");
-//                        cachedStatuses.TryAdd(twitchUrl, result);
-//                        return result;
-//                    case StreamNotificationConfig.StreamType.Beam:
-//                        var beamUrl = $"https://beam.pro/api/v1/channels/{stream.Username}";
-//                        if (checkCache && cachedStatuses.TryGetValue(beamUrl, out result))
-//                            return result;
-//                        response = await http.GetStringAsync(beamUrl).ConfigureAwait(false);
-//                        data = JObject.Parse(response);
-//                        isLive = data["online"].ToObject<bool>() == true;
-//                        result = new Tuple<bool, string>(isLive, data["viewersCurrent"].ToString());
-//                        cachedStatuses.TryAdd(beamUrl, result);
-//                        return result;
-//                    default:
-//                        break;
-//                }
-//                return new Tuple<bool, string>(false, "0");
-//            }
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
+            [RequireContext(ContextType.Guild)]
+            [RequirePermission(GuildPermission.ManageMessages)]
+            public async Task Hitbox(IUserMessage msg, [Remainder] string username) =>
+                await TrackStream((ITextChannel)msg.Channel, username, FollowedStream.FollowedStreamType.Hitbox)
+                    .ConfigureAwait(false);
 
-//            internal override void Init(CommandGroupBuilder cgb)
-//            {
-//                cgb.CreateCommand(Module.Prefix + "hitbox")
-//                    .Alias(Module.Prefix + "hb")
-//                    .Description("Notifies this channel when a certain user starts streaming." +
-//                                 $" | `{Prefix}hitbox SomeStreamer`")
-//                    .Parameter("username", ParameterType.Unparsed)
-//                    .AddCheck(SimpleCheckers.ManageServer())
-//                    .Do(TrackStream(StreamNotificationConfig.StreamType.Hitbox));
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
+            [RequireContext(ContextType.Guild)]
+            [RequirePermission(GuildPermission.ManageMessages)]
+            public async Task Twitch(IUserMessage msg, [Remainder] string username) =>
+                await TrackStream((ITextChannel)msg.Channel, username, FollowedStream.FollowedStreamType.Twitch)
+                    .ConfigureAwait(false);
 
-//                cgb.CreateCommand(Module.Prefix + "twitch")
-//                    .Alias(Module.Prefix + "tw")
-//                    .Description("Notifies this channel when a certain user starts streaming." +
-//                                 $" | `{Prefix}twitch SomeStreamer`")
-//                    .AddCheck(SimpleCheckers.ManageServer())
-//                    .Parameter("username", ParameterType.Unparsed)
-//                    .Do(TrackStream(StreamNotificationConfig.StreamType.Twitch));
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
+            [RequireContext(ContextType.Guild)]
+            [RequirePermission(GuildPermission.ManageMessages)]
+            public async Task Beam(IUserMessage msg, [Remainder] string username) =>
+                await TrackStream((ITextChannel)msg.Channel, username, FollowedStream.FollowedStreamType.Beam)
+                    .ConfigureAwait(false);
 
-//                cgb.CreateCommand(Module.Prefix + "beam")
-//                    .Alias(Module.Prefix + "bm")
-//                    .Description("Notifies this channel when a certain user starts streaming." +
-//                                 $" | `{Prefix}beam SomeStreamer`")
-//                    .AddCheck(SimpleCheckers.ManageServer())
-//                    .Parameter("username", ParameterType.Unparsed)
-//                    .Do(TrackStream(StreamNotificationConfig.StreamType.Beam));
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
+            [RequireContext(ContextType.Guild)]
+            public async Task ListStreams(IUserMessage imsg)
+            {
+                var channel = (ITextChannel)imsg.Channel;
 
-//                cgb.CreateCommand(Module.Prefix + "checkhitbox")
-//                    .Alias(Module.Prefix + "chhb")
-//                    .Description("Checks if a certain user is streaming on the hitbox platform." +
-//                                 $" | `{Prefix}chhb SomeStreamer`")
-//                    .Parameter("username", ParameterType.Unparsed)
-//                    .AddCheck(SimpleCheckers.ManageServer())
-//                    .Do(async e =>
-//                    {
-//                        var stream = username?.Trim();
-//                        if (string.IsNullOrWhiteSpace(stream))
-//                            return;
-//                        try
-//                        {
-//                            var streamStatus = (await GetStreamStatus(new StreamNotificationConfig
-//                            {
-//                                Username = stream,
-//                                Type = StreamNotificationConfig.StreamType.Hitbox
-//                            }));
-//                            if (streamStatus.Item1)
-//                            {
-//                                await channel.SendMessageAsync($"`Streamer {streamStatus.Item2} is online.`");
-//                            }
-//                        }
-//                        catch
-//                        {
-//                            await channel.SendMessageAsync("No channel found.");
-//                        }
-//                    });
+                IEnumerable<FollowedStream> streams;
+                using (var uow = DbHandler.UnitOfWork())
+                {
+                    streams = uow.GuildConfigs.For(channel.Guild.Id).FollowedStreams;
+                }
 
-//                cgb.CreateCommand(Module.Prefix + "checktwitch")
-//                    .Alias(Module.Prefix + "chtw")
-//                    .Description("Checks if a certain user is streaming on the twitch platform." +
-//                                 $" | `{Prefix}chtw SomeStreamer`")
-//                    .AddCheck(SimpleCheckers.ManageServer())
-//                    .Parameter("username", ParameterType.Unparsed)
-//                    .Do(async e =>
-//                    {
-//                        var stream = username?.Trim();
-//                        if (string.IsNullOrWhiteSpace(stream))
-//                            return;
-//                        try
-//                        {
-//                            var streamStatus = (await GetStreamStatus(new StreamNotificationConfig
-//                            {
-//                                Username = stream,
-//                                Type = StreamNotificationConfig.StreamType.Twitch
-//                            }));
-//                            if (streamStatus.Item1)
-//                            {
-//                                await channel.SendMessageAsync($"`Streamer {streamStatus.Item2} is online.`");
-//                            }
-//                        }
-//                        catch
-//                        {
-//                            await channel.SendMessageAsync("No channel found.");
-//                        }
-//                    });
+                if (!streams.Any())
+                {
+                    await channel.SendMessageAsync("You are not following any streams on this server.").ConfigureAwait(false);
+                    return;
+                }
 
-//                cgb.CreateCommand(Module.Prefix + "checkbeam")
-//                    .Alias(Module.Prefix + "chbm")
-//                    .Description("Checks if a certain user is streaming on the beam platform." +
-//                                 $" | `{Prefix}chbm SomeStreamer`")
-//                    .AddCheck(SimpleCheckers.ManageServer())
-//                    .Parameter("username", ParameterType.Unparsed)
-//                    .Do(async e =>
-//                    {
-//                        var stream = username?.Trim();
-//                        if (string.IsNullOrWhiteSpace(stream))
-//                            return;
-//                        try
-//                        {
-//                            var streamStatus = (await GetStreamStatus(new StreamNotificationConfig
-//                            {
-//                                Username = stream,
-//                                Type = StreamNotificationConfig.StreamType.Beam
-//                            }));
-//                            if (streamStatus.Item1)
-//                            {
-//                                await channel.SendMessageAsync($"`Streamer {streamStatus.Item2} is online.`");
-//                            }
-//                        }
-//                        catch
-//                        {
-//                            await channel.SendMessageAsync("No channel found.");
-//                        }
-//                    });
+                var text = string.Join("\n", streams.Select(snc =>
+                {
+                    return $"`{snc.Username}`'s stream on **{channel.Guild.GetTextChannel(snc.ChannelId)?.Name}** channel. 【`{snc.Type.ToString()}`】";
+                }));
 
-//                cgb.CreateCommand(Module.Prefix + "removestream")
-//                    .Alias(Module.Prefix + "rms")
-//                    .Description("Removes notifications of a certain streamer on this channel." +
-//                                 $" | `{Prefix}rms SomeGuy`")
-//                    .AddCheck(SimpleCheckers.ManageServer())
-//                    .Parameter("username", ParameterType.Unparsed)
-//                    .Do(async e =>
-//                    {
-//                        var username = username?.ToLower().Trim();
-//                        if (string.IsNullOrWhiteSpace(username))
-//                            return;
+                await channel.SendMessageAsync($"You are following **{streams.Count()}** streams on this server.\n\n" + text).ConfigureAwait(false);
+            }
 
-//                        var config = SpecificConfigurations.Default.Of(e.Server.Id);
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
+            [RequireContext(ContextType.Guild)]
+            public async Task RemoveStream(IUserMessage msg, [Remainder] string username)
+            {
+                var channel = (ITextChannel)msg.Channel;
 
-//                        var toRemove = config.ObservingStreams
-//                            .FirstOrDefault(snc => snc.ChannelId == e.Channel.Id &&
-//                                            snc.Username.ToLower().Trim() == username);
-//                        if (toRemove == null)
-//                        {
-//                            await channel.SendMessageAsync(":anger: No such stream.").ConfigureAwait(false);
-//                            return;
-//                        }
+                username = username.ToUpperInvariant().Trim();
 
-//                        config.ObservingStreams.Remove(toRemove);
-//                        await ConfigHandler.SaveConfig().ConfigureAwait(false);
-//                        await channel.SendMessageAsync($":ok: Removed `{toRemovumsg.Authorname}`'s stream from notifications.").ConfigureAwait(false);
-//                    });
+                FollowedStream toRemove;
+                using (var uow = DbHandler.UnitOfWork())
+                {
+                    var config = uow.GuildConfigs.For(channel.Guild.Id);
+                    var streams = config.FollowedStreams;
+                    toRemove = streams.Where(fs => fs.ChannelId == channel.Id && fs.Username.ToUpperInvariant() == username).FirstOrDefault();
+                    if (toRemove != null)
+                    {
+                        config.FollowedStreams = streams.Except(new[] { toRemove }).ToList();
+                        await uow.CompleteAsync();
+                    }
+                }
+                if (toRemove == null)
+                {
+                    await channel.SendMessageAsync(":anger: No such stream.").ConfigureAwait(false);
+                    return;
+                }
+                await channel.SendMessageAsync($":ok: Removed `{toRemove.Username}`'s stream ({toRemove.Type}) from notifications.").ConfigureAwait(false);
+            }
 
-//                cgb.CreateCommand(Module.Prefix + "liststreams")
-//                    .Alias(Module.Prefix + "ls")
-//                    .Description("Lists all streams you are following on this server." +
-//                                 $" | `{Prefix}ls`")
-//                    .Do(async e =>
-//                    {
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
+            [RequireContext(ContextType.Guild)]
+            public async Task CheckStream(IUserMessage imsg, FollowedStream.FollowedStreamType platform, [Remainder] string username)
+            {
+                var channel = (ITextChannel)imsg.Channel;
 
-//                        var config = SpecificConfigurations.Default.Of(e.Server.Id);
+                var stream = username?.Trim();
+                if (string.IsNullOrWhiteSpace(stream))
+                    return;
+                try
+                {
+                    var streamStatus = (await GetStreamStatus(new FollowedStream
+                    {
+                        Username = stream,
+                        Type = platform
+                    }));
+                    if (streamStatus.Item1)
+                    {
+                        await channel.SendMessageAsync($"`Streamer {streamStatus.Item2} is online.`");
+                    }
+                }
+                catch
+                {
+                    await channel.SendMessageAsync("No channel found.");
+                }
+            }
 
-//                        var streams = config.ObservingStreams.Where(snc =>
-//                            snc.ServerId == e.Server.Id);
-
-//                        var streamsArray = streams as StreamNotificationConfig[] ?? streams.ToArray();
-
-//                        if (streamsArray.Length == 0)
-//                        {
-//                            await channel.SendMessageAsync("You are not following any streams on this server.").ConfigureAwait(false);
-//                            return;
-//                        }
-
-//                        var text = string.Join("\n", streamsArray.Select(snc =>
-//                        {
-//                            try
-//                            {
-//                                return $"`{snc.Username}`'s stream on **{e.Server.GetChannel(e.Channel.Id).Name}** channel. 【`{snc.Type.ToString()}`】";
-//                            }
-//                            catch { }
-//                            return "";
-//                        }));
-
-//                        await channel.SendMessageAsync($"You are following **{streamsArray.Length}** streams on this server.\n\n" + text).ConfigureAwait(false);
-//                    });
-//            }
-
-//            private Func<CommandEventArgs, Task> TrackStream(StreamNotificationConfig.StreamType type) =>
-//                async e =>
-//                {
-//                    var username = username?.ToLowerInvariant();
-//                    if (string.IsNullOrWhiteSpace(username))
-//                        return;
-
-//                    var config = SpecificConfigurations.Default.Of(e.Server.Id);
-
-//                    var stream = new StreamNotificationConfig
-//                    {
-//                        ServerId = e.Server.Id,
-//                        ChannelId = e.Channel.Id,
-//                        Username = username,
-//                        Type = type,
-//                    };
-//                    var exists = config.ObservingStreams.Contains(stream);
-//                    if (exists)
-//                    {
-//                        await channel.SendMessageAsync(":anger: I am already notifying that stream on this channel.").ConfigureAwait(false);
-//                        return;
-//                    }
-//                    Tuple<bool, string> data;
-//                    try
-//                    {
-//                        data = await GetStreamStatus(stream).ConfigureAwait(false);
-//                    }
-//                    catch
-//                    {
-//                        await channel.SendMessageAsync(":anger: Stream probably doesn't exist.").ConfigureAwait(false);
-//                        return;
-//                    }
-//                    var msg = $"Stream is currently **{(data.Item1 ? "ONLINE" : "OFFLINE")}** with **{data.Item2}** viewers";
-//                    if (data.Item1)
-//                        if (type == StreamNotificationConfig.StreamType.Hitbox)
-//                            msg += $"\n`Here is the Link:`【 http://www.hitbox.tv/{stream.Username}/ 】";
-//                        else if (type == StreamNotificationConfig.StreamType.Twitch)
-//                            msg += $"\n`Here is the Link:`【 http://www.twitch.tv/{stream.Username}/ 】";
-//                        else if (type == StreamNotificationConfig.StreamType.Beam)
-//                            msg += $"\n`Here is the Link:`【 https://beam.pro/{stream.Username}/ 】";
-//                        else if (type == StreamNotificationConfig.StreamType.YoutubeGaming)
-//                            msg += $"\n`Here is the Link:` not implemented yet - {stream.Username}";
-//                    stream.LastStatus = data.Item1;
-//                    if (!exists)
-//                        msg = $":ok: I will notify this channel when status changes.\n{msg}";
-//                    await channel.SendMessageAsync(msg).ConfigureAwait(false);
-//                    config.ObservingStreams.Add(stream);
-//                };
-//        }
-//    }
-//}
+            private async Task TrackStream(ITextChannel channel, string username, FollowedStream.FollowedStreamType type)
+            {
+                username = username.ToUpperInvariant().Trim();
+                var stream = new FollowedStream
+                {
+                    GuildId = channel.Guild.Id,
+                    ChannelId = channel.Id,
+                    Username = username,
+                    Type = type,
+                };
+                bool exists;
+                using (var uow = DbHandler.UnitOfWork())
+                {
+                    exists = uow.GuildConfigs.For(channel.Guild.Id).FollowedStreams.Where(fs => fs.ChannelId == channel.Id && fs.Username.ToUpperInvariant().Trim()  == username).Any();
+                }
+                if (exists)
+                {
+                    await channel.SendMessageAsync($":anger: I am already following `{username}` ({type}) stream on this channel.").ConfigureAwait(false);
+                    return;
+                }
+                Tuple<bool, string> data;
+                try
+                {
+                    data = await GetStreamStatus(stream).ConfigureAwait(false);
+                }
+                catch
+                {
+                    await channel.SendMessageAsync(":anger: Stream probably doesn't exist.").ConfigureAwait(false);
+                    return;
+                }
+                var msg = $"Stream is currently **{(data.Item1 ? "ONLINE" : "OFFLINE")}** with **{data.Item2}** viewers";
+                if (data.Item1)
+                    if (type == FollowedStream.FollowedStreamType.Hitbox)
+                        msg += $"\n`Here is the Link:`【 http://www.hitbox.tv/{stream.Username}/ 】";
+                    else if (type == FollowedStream.FollowedStreamType.Twitch)
+                        msg += $"\n`Here is the Link:`【 http://www.twitch.tv/{stream.Username}/ 】";
+                    else if (type == FollowedStream.FollowedStreamType.Beam)
+                        msg += $"\n`Here is the Link:`【 https://beam.pro/{stream.Username}/ 】";
+                //else if (type == FollowedStream.FollowedStreamType.YoutubeGaming)
+                //    msg += $"\n`Here is the Link:` not implemented yet - {stream.Username}";
+                stream.LastStatus = data.Item1;
+                using (var uow = DbHandler.UnitOfWork())
+                {
+                    uow.GuildConfigs.For(channel.Guild.Id).FollowedStreams.Add(stream);
+                    await uow.CompleteAsync();
+                }
+                msg = $":ok: I will notify this channel when status changes.\n{msg}";
+                await channel.SendMessageAsync(msg).ConfigureAwait(false);
+            }
+        }
+    }
+}

src/NadekoBot/Modules/Searches/Commands/UnitConversion.cs

@@ -0,0 +1,201 @@
+using Discord;
+using Discord.Commands;
+using NadekoBot.Attributes;
+using NadekoBot.Extensions;
+using NadekoBot.Modules.Searches.Commands.Models;
+using NadekoBot.Services;
+using NadekoBot.Services.Database.Models;
+using Newtonsoft.Json;
+using NLog;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Xml;
+
+namespace NadekoBot.Modules.Searches
+{
+    public partial class Searches
+    {
+        [Group]
+        public class UnitConverterCommands
+        {
+            private Logger _log;
+            private static Timer _timer;
+            public static TimeSpan Span = new TimeSpan(12, 0, 0);
+            public UnitConverterCommands()
+            {
+                _log = LogManager.GetCurrentClassLogger();
+
+                try
+                {
+                    using (var uow = DbHandler.UnitOfWork())
+                    {
+                        //need to do this the first time                 
+                        if (uow.ConverterUnits.Empty())
+                        {
+                            var content = JsonConvert.DeserializeObject<List<MeasurementUnit>>(File.ReadAllText("units.json")).Select(u => new ConvertUnit()
+                            {
+                                Modifier = u.Modifier,
+                                UnitType = u.UnitType,
+                                InternalTrigger = string.Join("|", u.Triggers)
+                            });
+
+                            uow.ConverterUnits.AddRange(content.ToArray());
+                            uow.Complete();
+                        }
+                        Units = uow.ConverterUnits.GetAll().ToList();
+                    }
+                }
+                catch (Exception e)
+                {
+                    _log.Warn("Could not load units: " + e.Message);
+                }
+                
+                
+                
+                _timer = new Timer(new TimerCallback(UpdateCurrency), null, 0,(int)Span.TotalMilliseconds);
+
+            }
+
+            public void UpdateCurrency(object stateInfo)
+            {
+                var currencyRates = UpdateCurrencyRates().Result;
+                var unitTypeString = "currency";
+                using (var uow = DbHandler.UnitOfWork())
+                {
+                    var toRemove = Units.Where(u => u.UnitType == unitTypeString);
+                    Units.RemoveAll(u => u.UnitType == unitTypeString);
+                    uow.ConverterUnits.RemoveRange(toRemove.ToArray());
+                    var baseType = new ConvertUnit()
+                    {
+                        Triggers = new[] { currencyRates.Base },
+                        Modifier = decimal.One,
+                        UnitType = unitTypeString
+                    };
+                    uow.ConverterUnits.Add(baseType);
+                    Units.Add(baseType);
+                    var range = currencyRates.ConversionRates.Select(u => new ConvertUnit()
+                    {
+                        InternalTrigger = u.Key,
+                        Modifier = u.Value,
+                        UnitType = unitTypeString
+                    }).ToArray();
+                    uow.ConverterUnits.AddRange(range);
+                    Units.AddRange(range);
+
+                    uow.Complete();
+                }
+                _log.Info("Updated Currency");
+            }
+
+            public List<ConvertUnit> Units { get; set; }
+
+
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
+            [RequireContext(ContextType.Guild)]
+            public async Task ConvertListE(IUserMessage msg) //extended and bugged list
+            {
+                var channel = msg.Channel as IGuildChannel;
+
+                var sb = new StringBuilder("Units that can be used by the converter: \n");
+                var res = Units.GroupBy(x => x.UnitType);
+                foreach (var group in res)
+                {
+                    sb.AppendLine($"{group.Key}: ```xl");
+                    foreach (var el in group)
+                    {
+                        sb.Append($" [{string.Join(",", el.Triggers)}] ");
+                    }
+                    sb.AppendLine("```");
+                }
+                await msg.ReplyLong(sb.ToString(), breakOn: new[] { "```xl", "\n" });
+            }
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
+            [RequireContext(ContextType.Guild)]
+            public async Task ConvertList(IUserMessage msg)
+            {
+                var sb = new StringBuilder("Units that can be used by the converter: \n");
+                var res = Units.GroupBy(x => x.UnitType);
+                foreach (var group in res)
+                {
+                    sb.AppendLine($"{group.Key}: ```xl");
+                    sb.AppendLine(string.Join(",", group.Select(x => x.Triggers.FirstOrDefault()).OrderBy(x => x)));
+                    sb.AppendLine("```");
+                }
+                await msg.ReplyLong(sb.ToString(),  breakOn: new[] { "```xl\n", "\n" });
+            }
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
+            public async Task Convert(IUserMessage msg, string origin, string target, decimal value)
+            {
+                var originUnit = Units.Find(x => x.Triggers.Select(y => y.ToLowerInvariant()).Contains(origin.ToLowerInvariant()));
+                var targetUnit = Units.Find(x => x.Triggers.Select(y => y.ToLowerInvariant()).Contains(target.ToLowerInvariant()));
+                if (originUnit == null || targetUnit == null)
+                {
+                    await msg.Reply(string.Format("Cannot convert {0} to {1}: units not found", origin, target));
+                    return;
+                }
+                if (originUnit.UnitType != targetUnit.UnitType)
+                {
+                    await msg.Reply(string.Format("Cannot convert {0} to {1}: types of unit are not equal", originUnit.Triggers.First(), targetUnit.Triggers.First()));
+                    return;
+                }
+                decimal res;
+                if (originUnit.Triggers == targetUnit.Triggers) res = value;
+                else if (originUnit.UnitType == "temperature")
+                {
+                    //don't really care too much about efficiency, so just convert to Kelvin, then to target
+                    switch (originUnit.Triggers.First().ToUpperInvariant())
+                    {
+                        case "C":
+                            res = value + (decimal)273.15; //celcius!
+                            break;
+                        case "F":
+                            res = (value + (decimal)459.67) * ((decimal)5 / 9);
+                            break;
+                        default:
+                            res = value;
+                            break;
+                    }
+                    //from Kelvin to target
+                    switch (targetUnit.Triggers.First())
+                    {
+                        case "C":
+                            res = value - (decimal)273.15; //celcius!
+                            break;
+                        case "F":
+                            res = res * ((decimal)9 / 5) - (decimal)458.67;
+                            break;
+                        default:
+                            break;
+                    }
+                }
+                else
+                {
+                    //I just love currency
+                    if (originUnit.UnitType == "currency")
+                    {
+                        res = (value * targetUnit.Modifier) / originUnit.Modifier;
+                    }
+                    else
+                        res = (value * originUnit.Modifier) / targetUnit.Modifier;
+                }
+                res = Math.Round(res, 2);
+                await msg.Reply(string.Format("{0} {1} is equal to {2} {3}", value, originUnit.Triggers.First(), res, targetUnit.Triggers.First()));
+            }
+        }
+
+        public static async Task<Rates> UpdateCurrencyRates()
+        {
+            using (var http = new HttpClient())
+            {
+                var res = await http.GetStringAsync("http://api.fixer.io/latest").ConfigureAwait(false);
+                return JsonConvert.DeserializeObject<Rates>(res);
+            }
+        }
+    }
+}

src/NadekoBot/Modules/Searches/Searches.cs

@@ -16,7 +16,7 @@ using NadekoBot.Modules.Searches.IMDB;
 
 namespace NadekoBot.Modules.Searches
 {
-    [Module("~", AppendSpace = false)]
+    [NadekoModule("Searches", "~")]
     public partial class Searches : DiscordModule
     {
         private IGoogleApiService _google { get; }
@@ -26,7 +26,7 @@ namespace NadekoBot.Modules.Searches
             _google = youtube;
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Weather(IUserMessage umsg, string city, string country)
         {
@@ -47,7 +47,7 @@ $@"🌍 **Weather for** 【{obj["target"]}】
 🌄 **Sunrise:** {obj["sunrise"]} 🌇 **Sunset:** {obj["sunset"]}").ConfigureAwait(false);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Youtube(IUserMessage umsg, [Remainder] string query = null)
         {
@@ -62,7 +62,7 @@ $@"🌍 **Weather for** 【{obj["target"]}】
             await channel.SendMessageAsync(result).ConfigureAwait(false);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Imdb(IUserMessage umsg, [Remainder] string query = null)
         {
@@ -86,7 +86,7 @@ $@"🌍 **Weather for** 【{obj["target"]}】
             await channel.SendMessageAsync(result.ToString()).ConfigureAwait(false);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task RandomCat(IUserMessage umsg)
         {
@@ -99,7 +99,7 @@ $@"🌍 **Weather for** 【{obj["target"]}】
             }
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task RandomDog(IUserMessage umsg)
         {
@@ -110,7 +110,7 @@ $@"🌍 **Weather for** 【{obj["target"]}】
             }
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task I(IUserMessage umsg, [Remainder] string query = null)
         {
@@ -140,7 +140,7 @@ $@"🌍 **Weather for** 【{obj["target"]}】
             }
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Ir(IUserMessage umsg, [Remainder] string query = null)
         {
@@ -152,7 +152,7 @@ $@"🌍 **Weather for** 【{obj["target"]}】
             {
                 using (var http = new HttpClient())
                 {
-                    var rng = new Random();
+                    var rng = new NadekoRandom();
                     var reqString = $"https://www.googleapis.com/customsearch/v1?q={Uri.EscapeDataString(query)}&cx=018084019232060951019%3Ahs5piey28-e&num=1&searchType=image&start={ rng.Next(1, 50) }&fields=items%2Flink&key={NadekoBot.Credentials.GoogleApiKey}";
                     var obj = JObject.Parse(await http.GetStringAsync(reqString).ConfigureAwait(false));
                     var items = obj["items"] as JArray;
@@ -172,7 +172,7 @@ $@"🌍 **Weather for** 【{obj["target"]}】
             }
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Lmgtfy(IUserMessage umsg, [Remainder] string ffs = null)
         {
@@ -186,7 +186,7 @@ $@"🌍 **Weather for** 【{obj["target"]}】
                            .ConfigureAwait(false);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Google(IUserMessage umsg, [Remainder] string terms = null)
         {
@@ -200,7 +200,7 @@ $@"🌍 **Weather for** 【{obj["target"]}】
                            .ConfigureAwait(false);
         }
         ////todo drawing
-        //[LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        //[LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         //[RequireContext(ContextType.Guild)]
         //public async Task Hearthstone(IUserMessage umsg, [Remainder] string name = null)
         //{
@@ -245,7 +245,7 @@ $@"🌍 **Weather for** 【{obj["target"]}】
         //    }
         //}
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Ud(IUserMessage umsg, [Remainder] string query = null)
         {
@@ -279,7 +279,7 @@ $@"🌍 **Weather for** 【{obj["target"]}】
             }
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Hashtag(IUserMessage umsg, [Remainder] string query = null)
         {
@@ -314,7 +314,7 @@ $@"🌍 **Weather for** 【{obj["target"]}】
             }
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Catfact(IUserMessage umsg)
         {
@@ -328,7 +328,7 @@ $@"🌍 **Weather for** 【{obj["target"]}】
             }
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Revav(IUserMessage umsg, [Remainder] string arg = null)
         {
@@ -338,14 +338,14 @@ $@"🌍 **Weather for** 【{obj["target"]}】
             if (string.IsNullOrWhiteSpace(usrStr))
                 return;
 
-            var usr = (await channel.Guild.GetUsersAsync()).Where(u => u.Username.ToUpperInvariant() == usrStr).FirstOrDefault();
+            var usr = channel.Guild.GetUsers().Where(u => u.Username.ToUpperInvariant() == usrStr).FirstOrDefault();
 
             if (usr == null || string.IsNullOrWhiteSpace(usr.AvatarUrl))
                 return;
             await channel.SendMessageAsync($"https://images.google.com/searchbyimage?image_url={usr.AvatarUrl}").ConfigureAwait(false);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Revimg(IUserMessage umsg, [Remainder] string imageLink = null)
         {
@@ -357,7 +357,7 @@ $@"🌍 **Weather for** 【{obj["target"]}】
             await channel.SendMessageAsync($"https://images.google.com/searchbyimage?image_url={imageLink}").ConfigureAwait(false);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Safebooru(IUserMessage umsg, [Remainder] string tag = null)
         {
@@ -371,7 +371,7 @@ $@"🌍 **Weather for** 【{obj["target"]}】
                 await channel.SendMessageAsync(link).ConfigureAwait(false);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Wiki(IUserMessage umsg, [Remainder] string query = null)
         {
@@ -392,7 +392,7 @@ $@"🌍 **Weather for** 【{obj["target"]}】
         }
 
         ////todo drawing
-        //[LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        //[LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         //[RequireContext(ContextType.Guild)]
         //public async Task Clr(IUserMessage umsg, [Remainder] string color = null)
         //{
@@ -417,7 +417,7 @@ $@"🌍 **Weather for** 【{obj["target"]}】
         //    await channel.SendFileAsync("arg1.png", img.ToStream());
         //}
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Videocall(IUserMessage umsg, [Remainder] string arg = null)
         {
@@ -428,7 +428,7 @@ $@"🌍 **Weather for** 【{obj["target"]}】
                 var allUsrs = umsg.MentionedUsers.Append(umsg.Author);
                 var allUsrsArray = allUsrs.ToArray();
                 var str = allUsrsArray.Aggregate("http://appear.in/", (current, usr) => current + Uri.EscapeUriString(usr.Username[0].ToString()));
-                str += new Random().Next();
+                str += new NadekoRandom().Next();
                 foreach (var usr in allUsrsArray)
                 {
                     await (await (usr as IGuildUser).CreateDMChannelAsync()).SendMessageAsync(str).ConfigureAwait(false);
@@ -440,7 +440,7 @@ $@"🌍 **Weather for** 【{obj["target"]}】
             }
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Avatar(IUserMessage umsg, [Remainder] string mention = null)
         {
@@ -457,7 +457,7 @@ $@"🌍 **Weather for** 【{obj["target"]}】
 
         public static async Task<string> GetSafebooruImageLink(string tag)
         {
-            var rng = new Random();
+            var rng = new NadekoRandom();
             var url =
             $"http://safebooru.org/index.php?page=dapi&s=post&q=index&limit=100&tags={tag.Replace(" ", "_")}";
             using (var http = new HttpClient())

src/NadekoBot/Modules/Translator/Translator.cs

@@ -9,14 +9,14 @@ using Discord.WebSocket;
 
 namespace NadekoBot.Modules.Translator
 {
-    [Module("~", AppendSpace = false)]
+    [NadekoModule("Translator", "~")]
     public class Translator : DiscordModule
     {
         public Translator(ILocalization loc, CommandService cmds, DiscordSocketClient client) : base(loc, cmds, client)
         {
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Translate(IUserMessage umsg, string langs, [Remainder] string text = null)
         {
@@ -44,7 +44,7 @@ namespace NadekoBot.Modules.Translator
             }
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Translangs(IUserMessage umsg)
         {

src/NadekoBot/Modules/Trello/Trello.cs

@@ -11,7 +11,7 @@
 ////todo rewrite
 //namespace NadekoBot.Modules.Trello
 //{
-//    internal class Trello : DiscordModule
+//    public class Trello : DiscordModule
 //    {
 //        private readonly Timer t = new Timer { Interval = 2000 };
 //        public override string Prefix { get; } = NadekoBot.Config.CommandPrefixes.Trello;

src/NadekoBot/Modules/Utility/Commands/InfoCommands.cs

@@ -1,5 +1,6 @@
 using Discord;
 using Discord.Commands;
+using Discord.WebSocket;
 using NadekoBot.Attributes;
 using NadekoBot.Extensions;
 using System;
@@ -11,7 +12,7 @@ namespace NadekoBot.Modules.Utility
 {
     partial class Utility : DiscordModule
     {
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task ServerInfo(IUserMessage msg, string guild = null)
         {
@@ -21,7 +22,7 @@ namespace NadekoBot.Modules.Utility
             if (guild == null)
                 server = channel.Guild;
             else
-                server = (await _client.GetGuildsAsync()).Where(g => g.Name.ToUpperInvariant() == guild.ToUpperInvariant()).FirstOrDefault();
+                server = _client.GetGuilds().Where(g => g.Name.ToUpperInvariant() == guild.ToUpperInvariant()).FirstOrDefault();
             if (server == null)
                 return;
 
@@ -46,7 +47,7 @@ namespace NadekoBot.Modules.Utility
             await msg.Reply(sb.ToString()).ConfigureAwait(false);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task ChannelInfo(IUserMessage msg, ITextChannel channel = null)
         {
@@ -62,7 +63,7 @@ namespace NadekoBot.Modules.Utility
             await msg.Reply(toReturn).ConfigureAwait(false);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task UserInfo(IUserMessage msg, IGuildUser usr = null)
         {

src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs

@@ -14,7 +14,7 @@ namespace NadekoBot.Modules.Utility
 {
     public partial class Utility
     {
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task ShowQuote(IUserMessage umsg, string keyword)
         {
@@ -37,7 +37,7 @@ namespace NadekoBot.Modules.Utility
             await channel.SendMessageAsync("📣 " + quote.Text);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task AddQuote(IUserMessage umsg, string keyword, [Remainder] string text)
         {
@@ -63,7 +63,7 @@ namespace NadekoBot.Modules.Utility
             }
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task DeleteQuote(IUserMessage umsg, string keyword)
         {
@@ -90,7 +90,7 @@ namespace NadekoBot.Modules.Utility
             await channel.SendMessageAsync("`Deleted a random quote.`");
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task DelAllQuotes(IUserMessage umsg, string keyword)
         {

src/NadekoBot/Modules/Utility/Commands/Remind.cs

@@ -67,12 +67,7 @@ namespace NadekoBot.Modules.Utility
                     }
                     else
                     {
-                        ch = NadekoBot.Client.GetGuilds()
-                                .Where(g => g.Id == r.ServerId)
-                                .FirstOrDefault()
-                                .GetTextChannels()
-                                .Where(c => c.Id == r.ChannelId)
-                                .FirstOrDefault();
+                        ch = NadekoBot.Client.GetGuild(r.ServerId)?.GetTextChannel(r.ChannelId);
                     }
                     if (ch == null)
                         return;
@@ -97,7 +92,7 @@ namespace NadekoBot.Modules.Utility
                 }
             }
 
-            [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+            [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
             [RequireContext(ContextType.Guild)]
             public async Task Remind(IUserMessage umsg, string meorchannel, string timeStr, [Remainder] string message)
             {
@@ -190,7 +185,7 @@ namespace NadekoBot.Modules.Utility
             }
 
             ////todo owner only
-            //[LocalizedCommand, LocalizedDescription, LocalizedSummary]
+            //[LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
             //[RequireContext(ContextType.Guild)]
             //public async Task RemindTemplate(IUserMessage umsg, [Remainder] string arg)
             //{

src/NadekoBot/Modules/Utility/Utility.cs

@@ -15,7 +15,7 @@ using Discord.WebSocket;
 namespace NadekoBot.Modules.Utility
 {
 
-    [Module(".", AppendSpace = false)]
+    [NadekoModule("Utility", ".")]
     public partial class Utility : DiscordModule
     {
         public Utility(ILocalization loc, CommandService cmds, DiscordSocketClient client) : base(loc, cmds, client)
@@ -23,7 +23,7 @@ namespace NadekoBot.Modules.Utility
 
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task WhosPlaying(IUserMessage umsg, [Remainder] string game = null)
         {
@@ -43,7 +43,7 @@ namespace NadekoBot.Modules.Utility
                 await channel.SendMessageAsync("```xl\n" + string.Join("\n", arr.GroupBy(item => (i++) / 3).Select(ig => string.Concat(ig.Select(el => $"• {el,-35}")))) + "\n```").ConfigureAwait(false);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task InRole(IUserMessage umsg, [Remainder] string roles = null)
         {
@@ -76,7 +76,7 @@ namespace NadekoBot.Modules.Utility
             await channel.SendMessageAsync(send).ConfigureAwait(false);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task CheckMyPerms(IUserMessage msg)
         {
@@ -93,7 +93,7 @@ namespace NadekoBot.Modules.Utility
             await msg.Reply(builder.ToString());
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task UserId(IUserMessage msg, IGuildUser target = null)
         {
@@ -101,20 +101,20 @@ namespace NadekoBot.Modules.Utility
             await msg.Reply($"Id of the user { usr.Username } is { usr.Id })").ConfigureAwait(false);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         public async Task ChannelId(IUserMessage msg)
         {
             await msg.Reply($"This Channel's ID is {msg.Channel.Id}").ConfigureAwait(false);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task ServerId(IUserMessage msg)
         {
             await msg.Reply($"This server's ID is {(msg.Channel as ITextChannel).Guild.Id}").ConfigureAwait(false);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Roles(IUserMessage msg, IGuildUser target = null)
         {
@@ -129,7 +129,7 @@ namespace NadekoBot.Modules.Utility
             }
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task ChannelTopic(IUserMessage umsg)
         {
@@ -142,7 +142,7 @@ namespace NadekoBot.Modules.Utility
                 await channel.SendMessageAsync("`Topic:` " + topic);
         }
 
-        [LocalizedCommand, LocalizedDescription, LocalizedSummary]
+        [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias]
         [RequireContext(ContextType.Guild)]
         public async Task Stats(IUserMessage umsg)
         {

src/NadekoBot/NadekoBot.cs

@@ -2,6 +2,7 @@
 using Discord.Commands;
 using Discord.WebSocket;
 using NadekoBot.Services;
+using NadekoBot.Services.Database;
 using NadekoBot.Services.Impl;
 using NLog;
 using NLog.Config;
@@ -11,6 +12,7 @@ using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
+using NLog.Fluent;
 
 namespace NadekoBot
 {
@@ -19,22 +21,26 @@ namespace NadekoBot
         private Logger _log;
 
         public static CommandService Commands { get; private set; }
+        public static CommandHandler CommandHandler { get; private set; }
         public static DiscordSocketClient Client { get; private set; }
         public static Localization Localizer { get; private set; }
         public static BotCredentials Credentials { get; private set; }
 
-        public static GoogleApiService Google { get; set; }
+        public static GoogleApiService Google { get; private set; }
         public static StatsService Stats { get; private set; }
 
         public async Task RunAsync(string[] args)
         {
             SetupLogger();
+            _log = LogManager.GetCurrentClassLogger();
+
+            _log.Info("Starting NadekoBot v" + typeof(NadekoBot).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion);
 
             //create client
             Client = new DiscordSocketClient(new DiscordSocketConfig
             {
                 AudioMode = Discord.Audio.AudioMode.Outgoing,
-                LargeThreshold = 200,
+                MessageCacheSize = 10,
                 LogLevel = LogSeverity.Warning,
             });
 
@@ -43,8 +49,14 @@ namespace NadekoBot
             Commands = new CommandService();
             Localizer = new Localization();
             Google = new GoogleApiService();
-            Stats = new StatsService(Client);
-            _log = LogManager.GetCurrentClassLogger();
+            CommandHandler = new CommandHandler(Client, Commands);
+            Stats = new StatsService(Client, CommandHandler);
+
+            //init db
+            using (var context = DbHandler.Instance.GetDbContext())
+            {
+                context.EnsureSeedData();
+            }
 
             //setup DI
             var depMap = new DependencyMap();
@@ -54,16 +66,16 @@ namespace NadekoBot
             depMap.Add<IGoogleApiService>(Google);
 
             //connect
-            await Client.LoginAsync(TokenType.Bot, Credentials.Token);
-            await Client.ConnectAsync();
+            await Client.LoginAsync(TokenType.Bot, Credentials.Token).ConfigureAwait(false);
+            await Client.ConnectAsync().ConfigureAwait(false);
+            await Client.DownloadAllUsersAsync().ConfigureAwait(false);
 
             _log.Info("Connected");
 
             //load commands
-            await Commands.LoadAssembly(Assembly.GetEntryAssembly(), depMap);
-            Client.MessageReceived += Client_MessageReceived;
+            await Commands.LoadAssembly(Assembly.GetEntryAssembly(), depMap).ConfigureAwait(false);
 
-            Console.WriteLine(await Stats.Print());
+            Console.WriteLine(await Stats.Print().ConfigureAwait(false));
 
             await Task.Delay(-1);
         }
@@ -83,57 +95,10 @@ namespace NadekoBot
 
                 LogManager.Configuration = logConfig;
             }
-            catch (Exception ex) {
+            catch (Exception ex)
+            {
                 Console.WriteLine(ex);
             }
         }
-
-        private Task Client_MessageReceived(IMessage umsg)
-        {
-            var usrMsg = umsg as IUserMessage;
-            if (usrMsg == null)
-                return Task.CompletedTask;
-            var throwaway = Task.Run(async () =>
-            {
-                var sw = new Stopwatch();
-                sw.Start();
-                var t = await Commands.Execute(usrMsg, usrMsg.Content);
-                sw.Stop();
-                var channel = (umsg.Channel as ITextChannel);
-                if (t.IsSuccess)
-                {
-
-                    _log.Info("Command Executed after {4}s\n\t" +
-                              "User: {0}\n\t" +
-                              "Server: {1}\n\t" +
-                              "Channel: {2}\n\t" +
-                              "Message: {3}",
-                              umsg.Author + " [" + umsg.Author.Id + "]", // {0}
-                              (channel == null ? "PRIVATE" : channel.Guild.Name + " [" + channel.Guild.Id + "]"), // {1}
-                              (channel == null ? "PRIVATE" : channel.Name + " [" + channel.Id + "]"), //{2}
-                              umsg.Content, // {3}
-                              sw.Elapsed.TotalSeconds // {4}
-                              );
-                }
-                else if (!t.IsSuccess && t.Error != CommandError.UnknownCommand)
-                {
-                    _log.Warn("Command Errored after {5}s\n\t" +
-                              "User: {0}\n\t" +
-                              "Server: {1}\n\t" +
-                              "Channel: {2}\n\t" +
-                              "Message: {3}\n\t" + 
-                              "Error: {4}",
-                              umsg.Author + " [" + umsg.Author.Id + "]", // {0}
-                              (channel == null ? "PRIVATE" : channel.Guild.Name + " [" + channel.Guild.Id + "]"), // {1}
-                              (channel == null ? "PRIVATE" : channel.Name + " [" + channel.Id + "]"), //{2}
-                              umsg.Content,// {3}
-                              t.ErrorReason, // {4}
-                              sw.Elapsed.TotalSeconds //{5}
-                              );
-                }
-            });
-
-            return Task.CompletedTask;
-        }
     }
 }

src/NadekoBot/Program.cs

@@ -2,6 +2,7 @@
 {
     public class Program
     {
-        public static void Main(string[] args) => new NadekoBot().RunAsync(args).GetAwaiter().GetResult();
+        public static void Main(string[] args) => 
+            new NadekoBot().RunAsync(args).GetAwaiter().GetResult();
     }
 }

src/NadekoBot/Properties/AssemblyInfo.cs

@@ -8,6 +8,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("NadekoBot")]
 [assembly: AssemblyTrademark("")]
+[assembly: AssemblyInformationalVersion("1.0-alpha")]
 
 // Setting ComVisible to false makes the types in this assembly not visible
 // to COM components.  If you need to access a type in this assembly from

src/NadekoBot/Resources/ResponseStrings.Designer.cs

@@ -28,7 +28,7 @@ namespace NadekoBot.Resources {
         
         private static global::System.Globalization.CultureInfo resourceCulture;
         
-        internal ResponseStrings() {
+        public ResponseStrings() {
         }
         
         /// <summary>

src/NadekoBot/Services/CommandHandler.cs

@@ -0,0 +1,93 @@
+using Discord.WebSocket;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Discord;
+using NLog;
+using System.Diagnostics;
+using Discord.Commands;
+
+namespace NadekoBot.Services
+{
+    public class CommandHandler
+    {
+        private DiscordSocketClient _client;
+        private CommandService _commandService;
+        private Logger _log;
+
+        public event EventHandler<CommandExecutedEventArgs> CommandExecuted = delegate { };
+
+        public CommandHandler(DiscordSocketClient client, CommandService commandService)
+        {
+            _client = client;
+            _commandService = commandService;
+            _log = LogManager.GetCurrentClassLogger();
+
+            _client.MessageReceived += MessageReceivedHandler;
+        }
+
+        private Task MessageReceivedHandler(IMessage msg)
+        {
+            var usrMsg = msg as IUserMessage;
+            if (usrMsg == null)
+                return Task.CompletedTask;
+            var throwaway = Task.Run(async () =>
+            {
+                var sw = new Stopwatch();
+                sw.Start();
+                var t = await _commandService.Execute(usrMsg, usrMsg.Content, MultiMatchHandling.Best);
+                var command = t.Item1;
+                var result = t.Item2;
+                sw.Stop();
+                var channel = (usrMsg.Channel as ITextChannel);
+                if (result.IsSuccess)
+                {
+                    CommandExecuted(this, new CommandExecutedEventArgs(usrMsg, command));
+                    _log.Info("Command Executed after {4}s\n\t" +
+                              "User: {0}\n\t" +
+                              "Server: {1}\n\t" +
+                              "Channel: {2}\n\t" +
+                              "Message: {3}",
+                              usrMsg.Author + " [" + usrMsg.Author.Id + "]", // {0}
+                              (channel == null ? "PRIVATE" : channel.Guild.Name + " [" + channel.Guild.Id + "]"), // {1}
+                              (channel == null ? "PRIVATE" : channel.Name + " [" + channel.Id + "]"), // {2}
+                              usrMsg.Content, // {3}
+                              sw.Elapsed.TotalSeconds // {4}
+                              );
+                }
+                else if (!result.IsSuccess && result.Error != CommandError.UnknownCommand)
+                {
+                    _log.Warn("Command Errored after {5}s\n\t" +
+                              "User: {0}\n\t" +
+                              "Server: {1}\n\t" +
+                              "Channel: {2}\n\t" +
+                              "Message: {3}\n\t" +
+                              "Error: {4}",
+                              usrMsg.Author + " [" + usrMsg.Author.Id + "]", // {0}
+                              (channel == null ? "PRIVATE" : channel.Guild.Name + " [" + channel.Guild.Id + "]"), // {1}
+                              (channel == null ? "PRIVATE" : channel.Name + " [" + channel.Id + "]"), // {2}
+                              usrMsg.Content,// {3}
+                              result.ErrorReason, // {4}
+                              sw.Elapsed.TotalSeconds // {5}
+                              );
+                }
+            });
+
+            return Task.CompletedTask;
+        }
+    }
+
+    public class CommandExecutedEventArgs
+    {
+        public Command Command { get; }
+        public IUserMessage Message { get; }
+
+        public CommandExecutedEventArgs(IUserMessage msg, Command cmd)
+        {
+            Message = msg;
+            Command = cmd;
+        }
+    }
+}

src/NadekoBot/Services/CurrencyHandler.cs

@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Discord;
+using NadekoBot.Services.Database;
+using NadekoBot.Extensions;
+using NadekoBot.Modules.Gambling;
+
+namespace NadekoBot.Services
+{
+    public static class CurrencyHandler
+    {
+        public static async Task<bool> RemoveCurrencyAsync(IGuildUser author, string reason, long amount, bool sendMessage)
+        {
+            if (amount < 0)
+                throw new ArgumentNullException(nameof(amount));
+
+
+            using (var uow = DbHandler.UnitOfWork())
+            {
+                var success = uow.Currency.TryUpdateState(author.Id, -amount);
+                if (!success)
+                    return false;
+                await uow.CompleteAsync();
+            }
+
+            if (sendMessage)
+                try { await author.SendMessageAsync($"`You lost:` {amount} {Gambling.CurrencySign}\n`Reason:` {reason}").ConfigureAwait(false); } catch { }
+
+            return true;
+        }
+
+        public static async Task AddCurrencyAsync(IGuildUser author, string reason, long amount, bool sendMessage)
+        {
+            if (amount < 0)
+                throw new ArgumentNullException(nameof(amount));
+
+
+            using (var uow = DbHandler.UnitOfWork())
+            {
+                uow.Currency.TryUpdateState(author.Id, amount);
+                await uow.CompleteAsync();
+            }
+
+            if (sendMessage)
+                await author.SendMessageAsync($"`You received:` {amount} {Gambling.CurrencySign}\n`Reason:` {reason}").ConfigureAwait(false);
+        }
+    }
+}

src/NadekoBot/Services/Database/IUnitOfWork.cs

@@ -16,6 +16,8 @@ namespace NadekoBot.Services.Database
         IReminderRepository Reminders { get; }
         ISelfAssignedRolesRepository SelfAssignedRoles { get; }
         IBotConfigRepository BotConfig { get; }
+        IRepeaterRepository Repeaters { get; }
+        IUnitConverterRepository ConverterUnits { get; }
 
         int Complete();
         Task<int> CompleteAsync();

src/NadekoBot/Services/Database/Models/BotConfig.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using System.Text;
@@ -15,21 +16,10 @@ namespace NadekoBot.Services.Database.Models
         public bool ForwardMessages { get; set; } = true;
         public bool ForwardToAllOwners { get; set; } = true;
 
-        public List<ModulePrefix> ModulePrefixes { get; set; } = new List<ModulePrefix>()
-        {
-           new ModulePrefix() { ModuleName="Administration", Prefix="." },
-           new ModulePrefix() { ModuleName="Searches", Prefix="~" },
-           new ModulePrefix() { ModuleName="NSFW", Prefix="~" },
-           new ModulePrefix() { ModuleName="ClashOfClans", Prefix="," },
-           new ModulePrefix() { ModuleName="Help", Prefix="-" },
-           new ModulePrefix() { ModuleName="Music", Prefix="!!" },
-           new ModulePrefix() { ModuleName="Trello", Prefix="trello" },
-           new ModulePrefix() { ModuleName="Games", Prefix=">" },
-           new ModulePrefix() { ModuleName="Gambling", Prefix="$" },
-           new ModulePrefix() { ModuleName="Permissions", Prefix=";" },
-           new ModulePrefix() { ModuleName="Pokemon", Prefix=">" },
-           new ModulePrefix() { ModuleName="Utility", Prefix="." }
-        };
+        public float CurrencyGenerationChance { get; set; } = 0.02f;
+        public int CurrencyGenerationCooldown { get; set; } = 10;
+
+        public List<ModulePrefix> ModulePrefixes { get; set; } = new List<ModulePrefix>();
 
         public List<PlayingStatus> RotatingStatusMessages { get; set; } = new List<PlayingStatus>();
 
@@ -41,43 +31,8 @@ namespace NadekoBot.Services.Database.Models
         public string CurrencyName { get; set; } = "Nadeko Flower";
         public string CurrencyPluralName { get; set; } = "Nadeko Flowers";
 
-        public List<EightBallResponse> EightBallResponses { get; set; } = new List<EightBallResponse>
-        {
-            new EightBallResponse() { Text = "Most definitely yes" },
-            new EightBallResponse() { Text = "For sure" },
-            new EightBallResponse() { Text = "Totally!" },
-            new EightBallResponse() { Text = "As I see it, yes" },
-            new EightBallResponse() { Text = "My sources say yes" },
-            new EightBallResponse() { Text = "Yes" },
-            new EightBallResponse() { Text = "Most likely" },
-            new EightBallResponse() { Text = "Perhaps" },
-            new EightBallResponse() { Text = "Maybe" },
-            new EightBallResponse() { Text = "Not sure" },
-            new EightBallResponse() { Text = "It is uncertain" },
-            new EightBallResponse() { Text = "Ask me again later" },
-            new EightBallResponse() { Text = "Don't count on it" },
-            new EightBallResponse() { Text = "Probably not" },
-            new EightBallResponse() { Text = "Very doubtful" },
-            new EightBallResponse() { Text = "Most likely no" },
-            new EightBallResponse() { Text = "Nope" },
-            new EightBallResponse() { Text = "No" },
-            new EightBallResponse() { Text = "My sources say no" },
-            new EightBallResponse() { Text = "Dont even think about it" },
-            new EightBallResponse() { Text = "Definitely no" },
-            new EightBallResponse() { Text = "NO - It may cause disease contraction" }
-        };
-
-        public List<RaceAnimal> RaceAnimals { get; set; } = new List<RaceAnimal>
-        {
-            new RaceAnimal { Icon = "🐼", Name = "Panda" },
-            new RaceAnimal { Icon = "🐻", Name = "Bear" },
-            new RaceAnimal { Icon = "🐧", Name = "Pengu" },
-            new RaceAnimal { Icon = "🐨", Name = "Koala" },
-            new RaceAnimal { Icon = "🐬", Name = "Dolphin" },
-            new RaceAnimal { Icon = "🐞", Name = "Ladybird" },
-            new RaceAnimal { Icon = "🦀", Name = "Crab" },
-            new RaceAnimal { Icon = "🦄", Name = "Unicorn" }
-        };
+        public List<EightBallResponse> EightBallResponses { get; set; } = new List<EightBallResponse>();
+        public List<RaceAnimal> RaceAnimals { get; set; } = new List<RaceAnimal>();
     }
 
     public class PlayingStatus :DbEntity
@@ -99,17 +54,59 @@ namespace NadekoBot.Services.Database.Models
     public class EightBallResponse : DbEntity
     {
         public string Text { get; set; }
+
+        public override int GetHashCode()
+        {
+            return Text.GetHashCode();
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (!(obj is EightBallResponse))
+                return base.Equals(obj);
+
+            return ((EightBallResponse)obj).Text == Text;
+        }
     }
 
     public class RaceAnimal : DbEntity
     {
         public string Icon { get; set; }
         public string Name { get; set; }
+
+        public override int GetHashCode()
+        {
+            return Icon.GetHashCode();
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (!(obj is RaceAnimal))
+                return base.Equals(obj);
+
+            return ((RaceAnimal)obj).Icon == Icon;
+        }
     }
     
     public class ModulePrefix : DbEntity
     {
         public string ModuleName { get; set; }
         public string Prefix { get; set; }
+
+        public int BotConfigId { get; set; } = 1;
+        public BotConfig BotConfig { get; set; }
+
+        public override int GetHashCode()
+        {
+            return ModuleName.GetHashCode();
+        }
+
+        public override bool Equals(object obj)
+        {
+            if(!(obj is ModulePrefix))
+                return base.Equals(obj);
+
+            return ((ModulePrefix)obj).ModuleName == ModuleName;
+        }
     }
 }

src/NadekoBot/Services/Database/Models/ClashWar.cs

@@ -29,7 +29,7 @@ namespace NadekoBot.Services.Database.Models
         public ulong ChannelId { get; set; }
 
         [NotMapped]
-        public ITextChannel Channel { get; internal set; }
+        public ITextChannel Channel { get; set; }
 
         public List<ClashCaller> Bases { get; set; }
     }

src/NadekoBot/Services/Database/Models/ConvertUnit.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace NadekoBot.Services.Database.Models
+{
+    public class ConvertUnit : DbEntity
+    {
+        public ConvertUnit() { }
+        [NotMapped]
+        private string[] _triggersValue;
+        [NotMapped]
+        public string[] Triggers
+        {
+            get
+            {
+                return _triggersValue ?? (_triggersValue = InternalTrigger.Split('|'));
+            }
+            set
+            {
+                _triggersValue = value;
+                InternalTrigger = string.Join("|", _triggersValue);
+            }
+        }
+        //protected or private?
+        /// <summary>
+        /// DO NOT CALL THIS
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public string InternalTrigger { get; set; }
+        public string UnitType { get; set; }
+        public decimal Modifier { get; set; }
+    }
+
+}

src/NadekoBot/Services/Database/Models/Currency.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace NadekoBot.Services.Database.Models
+{
+    public class Currency : DbEntity
+    {
+        public ulong UserId { get; set; }
+        public long Amount { get; set; }
+    }
+}

src/NadekoBot/Services/Database/Models/FollowedStream.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace NadekoBot.Services.Database.Models
+{
+    public class FollowedStream : DbEntity
+    {
+        public ulong ChannelId { get; set; }
+        public string Username { get; set; }
+        public FollowedStreamType Type { get; set; }
+        public bool LastStatus { get; set; }
+        public ulong GuildId { get; set; }
+
+        public enum FollowedStreamType
+        {
+            Twitch, Hitbox, Beam
+        }
+    }
+}

src/NadekoBot/Services/Database/Models/GuildConfig.cs

@@ -28,8 +28,18 @@ namespace NadekoBot.Services.Database.Models
         public bool SendChannelByeMessage { get; set; }
         public string ChannelByeMessageText { get; set; } = "%user% has left!";
 
+        public LogSetting LogSetting { get; set; } = new LogSetting();
+
         //self assignable roles
         public bool ExclusiveSelfAssignedRoles { get; set; }
         public bool AutoDeleteSelfAssignedRoleMessages { get; set; }
+        public float DefaultMusicVolume { get; set; } = 1.0f;
+        public bool VoicePlusTextEnabled { get; set; }
+
+        //stream notifications
+        public List<FollowedStream> FollowedStreams { get; set; } = new List<FollowedStream>();
+
+        //currencyGeneration
+        public ulong? GenerateCurrencyChannelId { get; set; }
     }
 }

src/NadekoBot/Services/Database/Models/IgnoredLogChannel.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace NadekoBot.Services.Database.Models
+{
+    public class IgnoredLogChannel : DbEntity
+    {
+        public LogSetting LogSetting { get; set; }
+        public ulong ChannelId { get; set; }
+    }
+}

src/NadekoBot/Services/Database/Models/LogSetting.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace NadekoBot.Services.Database.Models
+{
+    public class LogSetting : DbEntity
+    {
+        public bool IsLogging { get; set; }
+        public ulong ChannelId { get; set; }
+        public HashSet<IgnoredLogChannel> IgnoredChannels { get; set; }
+
+        public bool MessageReceived { get; set; } = true;
+        public bool MessageUpdated { get; set; } = true;
+        public bool MessageDeleted { get; set; } = true;
+
+        public bool UserJoined { get; set; } = true;
+        public bool UserLeft { get; set; } = true;
+        public bool UserBanned { get; set; } = true;
+        public bool UserUnbanned { get; set; } = true;
+        public bool UserUpdated { get; set; } = true;
+
+        public bool ChannelCreated { get; set; } = true;
+        public bool ChannelDestroyed { get; set; } = true;
+        public bool ChannelUpdated { get; set; } = true;
+
+        //userpresence
+        public bool LogUserPresence { get; set; } = false;
+        public ulong UserPresenceChannelId { get; set; }
+
+        //voicepresence
+        public bool LogVoicePresence { get; set; } = false;
+        public ulong VoicePresenceChannelId { get; set; }
+        public HashSet<IgnoredVoicePresenceChannel> IgnoredVoicePresenceChannelIds { get; set; }
+
+    }
+}

src/NadekoBot/Services/Database/Models/Repeater.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace NadekoBot.Services.Database.Models
+{
+    public class Repeater :DbEntity
+    {
+        public ulong GuildId { get; set; }
+        public ulong ChannelId { get; set; }
+        public string Message { get; set; }
+        public TimeSpan Interval { get; set; }
+    }
+}

src/NadekoBot/Services/Database/Models/TypingArticle.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace NadekoBot.Services.Database.Models
+{
+    public class TypingArticle : DbEntity
+    {
+        public string Author { get; set; }
+        public string Text { get; set; }
+    }
+}

src/NadekoBot/Services/Database/Models/VoicePresenceChannel.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace NadekoBot.Services.Database.Models
+{
+    public class IgnoredVoicePresenceChannel : DbEntity
+    {
+        public LogSetting LogSetting { get; set; }
+        public ulong ChannelId { get; set; }
+    }
+}

src/NadekoBot/Services/Database/NadekoContext.cs

@@ -18,6 +18,90 @@ namespace NadekoBot.Services.Database
         public DbSet<Reminder> Reminders { get; set; }
         public DbSet<SelfAssignedRole> SelfAssignableRoles { get; set; }
         public DbSet<BotConfig> BotConfig { get; set; }
+        public DbSet<Repeater> Repeaters { get; set; }
+        public DbSet<Currency> Currency { get; set; }
+        public DbSet<ConvertUnit> ConversionUnits { get; set; }
+        public DbSet<TypingArticle> TypingArticles { get; set; }
+
+        //logging
+        public DbSet<LogSetting> LogSettings { get; set; }
+        public DbSet<IgnoredLogChannel> IgnoredLogChannels { get; set; }
+        public DbSet<IgnoredVoicePresenceChannel> IgnoredVoicePresenceCHannels { get; set; }
+
+        //orphans xD
+        public DbSet<EightBallResponse> EightBallResponses { get; set; }
+        public DbSet<RaceAnimal> RaceAnimals { get; set; }
+        public DbSet<ModulePrefix> ModulePrefixes { get; set; }
+
+        public void EnsureSeedData()
+        {
+            if (!BotConfig.Any())
+            {
+                var bc = new BotConfig();
+
+                bc.ModulePrefixes.AddRange(new HashSet<ModulePrefix>()
+                {
+                    new ModulePrefix() { ModuleName = "Administration", Prefix = "." },
+                    new ModulePrefix() { ModuleName = "Searches", Prefix = "~" },
+                    new ModulePrefix() { ModuleName = "Translator", Prefix = "~" },
+                    new ModulePrefix() { ModuleName = "NSFW", Prefix = "~" },
+                    new ModulePrefix() { ModuleName = "ClashOfClans", Prefix = "," },
+                    new ModulePrefix() { ModuleName = "Help", Prefix = "-" },
+                    new ModulePrefix() { ModuleName = "Music", Prefix = "!!" },
+                    new ModulePrefix() { ModuleName = "Trello", Prefix = "trello" },
+                    new ModulePrefix() { ModuleName = "Games", Prefix = ">" },
+                    new ModulePrefix() { ModuleName = "Gambling", Prefix = "$" },
+                    new ModulePrefix() { ModuleName = "Permissions", Prefix = ";" },
+                    new ModulePrefix() { ModuleName = "Pokemon", Prefix = ">" },
+                    new ModulePrefix() { ModuleName = "Utility", Prefix = "." }
+                });
+                bc.RaceAnimals.AddRange(new HashSet<RaceAnimal>
+                {
+                    new RaceAnimal { Icon = "🐼", Name = "Panda" },
+                    new RaceAnimal { Icon = "🐻", Name = "Bear" },
+                    new RaceAnimal { Icon = "🐧", Name = "Pengu" },
+                    new RaceAnimal { Icon = "🐨", Name = "Koala" },
+                    new RaceAnimal { Icon = "🐬", Name = "Dolphin" },
+                    new RaceAnimal { Icon = "🐞", Name = "Ladybird" },
+                    new RaceAnimal { Icon = "🦀", Name = "Crab" },
+                    new RaceAnimal { Icon = "🦄", Name = "Unicorn" }
+                });
+                bc.EightBallResponses.AddRange(new HashSet<EightBallResponse>
+                {
+                    new EightBallResponse() { Text = "Most definitely yes" },
+                    new EightBallResponse() { Text = "For sure" },
+                    new EightBallResponse() { Text = "Totally!" },
+                    new EightBallResponse() { Text = "Of course!" },
+                    new EightBallResponse() { Text = "As I see it, yes" },
+                    new EightBallResponse() { Text = "My sources say yes" },
+                    new EightBallResponse() { Text = "Yes" },
+                    new EightBallResponse() { Text = "Most likely" },
+                    new EightBallResponse() { Text = "Perhaps" },
+                    new EightBallResponse() { Text = "Maybe" },
+                    new EightBallResponse() { Text = "Not sure" },
+                    new EightBallResponse() { Text = "It is uncertain" },
+                    new EightBallResponse() { Text = "Ask me again later" },
+                    new EightBallResponse() { Text = "Don't count on it" },
+                    new EightBallResponse() { Text = "Probably not" },
+                    new EightBallResponse() { Text = "Very doubtful" },
+                    new EightBallResponse() { Text = "Most likely no" },
+                    new EightBallResponse() { Text = "Nope" },
+                    new EightBallResponse() { Text = "No" },
+                    new EightBallResponse() { Text = "My sources say no" },
+                    new EightBallResponse() { Text = "Dont even think about it" },
+                    new EightBallResponse() { Text = "Definitely no" },
+                    new EightBallResponse() { Text = "NO - It may cause disease contraction" }
+                });
+
+                BotConfig.Add(bc);
+
+                this.SaveChanges();
+            }
+            if (!TypingArticles.Any())
+            {
+                //todo load default typing articles
+            }
+        }
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
@@ -36,7 +120,7 @@ namespace NadekoBot.Services.Database
 
             #endregion
 
-            #region Config
+            #region GuildConfig
 
             var configEntity = modelBuilder.Entity<GuildConfig>();
             configEntity
@@ -45,6 +129,15 @@ namespace NadekoBot.Services.Database
 
             #endregion
 
+            #region BotConfig
+            var botConfigEntity = modelBuilder.Entity<BotConfig>();
+            //botConfigEntity
+            //    .HasMany(c => c.ModulePrefixes)
+            //    .WithOne(mp => mp.BotConfig)
+            //    .HasForeignKey(mp => mp.BotConfigId);
+                
+            #endregion
+
             #region ClashOfClans
 
             var callersEntity = modelBuilder.Entity<ClashCaller>();
@@ -63,6 +156,38 @@ namespace NadekoBot.Services.Database
                 .IsUnique();
 
             #endregion
+
+            #region Repeater
+
+            var repeaterEntity = modelBuilder.Entity<Repeater>();
+
+            repeaterEntity
+                .HasIndex(r => r.ChannelId)
+                .IsUnique();
+
+            #endregion
+
+            #region Currency
+            var currencyEntity = modelBuilder.Entity<Currency>();
+
+            currencyEntity
+                .HasIndex(c => c.UserId)
+                .IsUnique();
+            #endregion
+
+            #region LogSettings
+
+            //var logSettingEntity = modelBuilder.Entity<LogSetting>();
+
+            //logSettingEntity
+            //    .HasMany(ls => ls.IgnoredChannels)
+            //    .WithOne(ls => ls.LogSetting)
+            //    .HasPrincipalKey(ls => ls.id;
+
+            //logSettingEntity
+            //    .HasMany(ls => ls.IgnoredVoicePresenceChannelIds)
+            //    .WithOne(ls => ls.LogSetting);
+            #endregion
         }
         protected abstract override void OnConfiguring(DbContextOptionsBuilder optionsBuilder);
     }

src/NadekoBot/Services/Database/Repositories/ICurrencyRepository.cs

@@ -0,0 +1,17 @@
+using NadekoBot.Services.Database.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace NadekoBot.Services.Database.Repositories
+{
+    public interface ICurrencyRepository : IRepository<Currency>
+    {
+        Currency GetOrCreate(ulong userId);
+        long GetUserCurrency(ulong userId);
+        bool TryUpdateState(ulong userId, long change);
+        IEnumerable<Currency> GetTopRichest(int count);
+    }
+}

src/NadekoBot/Services/Database/Repositories/IGuildConfigRepository.cs

@@ -11,5 +11,6 @@ namespace NadekoBot.Services.Database.Repositories
     public interface IGuildConfigRepository : IRepository<GuildConfig>
     {
         GuildConfig For(ulong guildId);
+        IEnumerable<FollowedStream> GetAllFollowedStreams();
     }
 }

src/NadekoBot/Services/Database/Repositories/IRepeaterRepository.cs

@@ -0,0 +1,14 @@
+using NadekoBot.Services.Database.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace NadekoBot.Services.Database.Repositories
+{
+    public interface IRepeaterRepository : IRepository<Repeater>
+    {
+        
+    }
+}

src/NadekoBot/Services/Database/Repositories/ITypingArticlesRepository.cs

@@ -0,0 +1,14 @@
+using NadekoBot.Services.Database.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace NadekoBot.Services.Database.Repositories
+{
+    public interface ITypingArticlesRepository : IRepository <TypingArticle>
+    {
+        TypingArticle GetRandom();
+    }
+}

src/NadekoBot/Services/Database/Repositories/IUnitConverterRepository.cs

@@ -0,0 +1,14 @@
+using NadekoBot.Services.Database.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace NadekoBot.Services.Database.Repositories
+{
+    public interface IUnitConverterRepository : IRepository<ConvertUnit>
+    {
+        void AddOrUpdate(Func<ConvertUnit, bool> check, ConvertUnit toAdd, Func<ConvertUnit, ConvertUnit> toUpdate);
+        bool Empty();
+    }
+}

src/NadekoBot/Services/Database/Repositories/Impl/CurrencyRepository.cs

@@ -0,0 +1,60 @@
+using NadekoBot.Services.Database.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+
+namespace NadekoBot.Services.Database.Repositories.Impl
+{
+    public class CurrencyRepository : Repository<Currency>, ICurrencyRepository
+    {
+        public CurrencyRepository(DbContext context) : base(context)
+        {
+        }
+
+        public Currency GetOrCreate(ulong userId)
+        {
+            var cur = _set.FirstOrDefault(c => c.UserId == userId);
+
+            if (cur == null)
+            {
+                _set.Add(cur = new Currency()
+                {
+                    UserId = userId,
+                    Amount = 0
+                });
+                _context.SaveChanges();
+            }
+            return cur;
+        }
+
+        public IEnumerable<Currency> GetTopRichest(int count) =>
+            _set.OrderByDescending(c => c.Amount).Take(count).ToList();
+
+        public long GetUserCurrency(ulong userId) => 
+            GetOrCreate(userId).Amount;
+
+        public bool TryUpdateState(ulong userId, long change)
+        {
+            var cur = GetOrCreate(userId);
+
+            if (change == 0)
+                return true;
+
+            if (change > 0)
+            {
+                cur.Amount += change;
+                return true;
+            }
+            //change is negative
+            if (cur.Amount + change >= 0)
+            {
+                cur.Amount += change;
+                return true;
+            }
+            return false;
+        }
+    }
+}

src/NadekoBot/Services/Database/Repositories/Impl/GuildConfigRepository.cs

@@ -13,6 +13,14 @@ namespace NadekoBot.Services.Database.Repositories.Impl
         public GuildConfigRepository(DbContext context) : base(context)
         {
         }
+
+        public new IEnumerable<GuildConfig> GetAll() =>
+            _set.Include(gc => gc.LogSetting)
+                    .ThenInclude(ls => ls.IgnoredChannels)
+                .Include(gc => gc.LogSetting)
+                    .ThenInclude(ls => ls.IgnoredVoicePresenceChannelIds)
+                .ToList();
+
         /// <summary>
         /// Gets and creates if it doesn't exist a config for a guild.
         /// </summary>
@@ -20,7 +28,10 @@ namespace NadekoBot.Services.Database.Repositories.Impl
         /// <returns></returns>
         public GuildConfig For(ulong guildId)
         {
-            var config = _set.FirstOrDefault(c => c.GuildId == guildId);
+            var config = _set.Include(gc => gc.FollowedStreams)
+                             .Include(gc => gc.LogSetting)
+                                .ThenInclude(ls=>ls.IgnoredChannels)
+                             .FirstOrDefault(c => c.GuildId == guildId);
 
             if (config == null)
             {
@@ -32,5 +43,10 @@ namespace NadekoBot.Services.Database.Repositories.Impl
             }
             return config;
         }
+
+        public IEnumerable<FollowedStream> GetAllFollowedStreams() =>
+            _set.Include(gc => gc.FollowedStreams)
+                .SelectMany(gc => gc.FollowedStreams)
+                .ToList();
     }
 }

src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs

@@ -20,7 +20,7 @@ namespace NadekoBot.Services.Database.Repositories.Impl
 
         public Task<Quote> GetRandomQuoteByKeywordAsync(ulong guildId, string keyword)
         {
-            var rng = new Random();
+            var rng = new NadekoRandom();
             return _set.Where(q => q.Keyword == keyword).OrderBy(q => rng.Next()).FirstOrDefaultAsync();
         }
     }

src/NadekoBot/Services/Database/Repositories/Impl/RepeaterRepository.cs

@@ -0,0 +1,17 @@
+using NadekoBot.Services.Database.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+
+namespace NadekoBot.Services.Database.Repositories.Impl
+{
+    public class RepeaterRepository : Repository<Repeater>, IRepeaterRepository
+    {
+        public RepeaterRepository(DbContext context) : base(context)
+        {
+        }
+    }
+}

src/NadekoBot/Services/Database/Repositories/Impl/TypingArticlesRepository.cs

@@ -0,0 +1,25 @@
+using NadekoBot.Services.Database.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+
+namespace NadekoBot.Services.Database.Repositories.Impl
+{
+    public class TypingArticlesRepository : Repository<TypingArticle>, ITypingArticlesRepository
+    {
+        private Random _rand = null;
+        private Random rand => _rand ?? (_rand = new NadekoRandom());
+        public TypingArticlesRepository(DbContext context) : base(context)
+        {
+        }
+
+        public TypingArticle GetRandom()
+        {
+            var skip = (int)(rand.NextDouble() * _set.Count());
+            return _set.Skip(skip).FirstOrDefault();
+        }
+    }
+}

src/NadekoBot/Services/Database/Repositories/Impl/UnitCOnverterRepository.cs

@@ -0,0 +1,28 @@
+using NadekoBot.Services.Database.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+
+namespace NadekoBot.Services.Database.Repositories.Impl
+{
+    public class UnitConverterRepository : Repository<ConvertUnit>, IUnitConverterRepository
+    {
+        public UnitConverterRepository(DbContext context) : base(context)
+        {
+        }
+
+        public void AddOrUpdate(Func<ConvertUnit, bool> check, ConvertUnit toAdd, Func<ConvertUnit, ConvertUnit> toUpdate)
+        {
+           var existing = _set.FirstOrDefault(check);
+            if (existing != null)
+            {
+                existing = toUpdate.Invoke(existing);
+            }
+            else _set.Add(toAdd);
+        }
+
+        public bool Empty() => !_set.Any();
+    }
+}

src/NadekoBot/Services/Database/UnitOfWork.cs

@@ -33,6 +33,17 @@ namespace NadekoBot.Services.Database
         private IBotConfigRepository _botConfig;
         public IBotConfigRepository BotConfig => _botConfig ?? (_botConfig = new BotConfigRepository(_context));
 
+        private IRepeaterRepository _repeaters;
+        public IRepeaterRepository Repeaters => _repeaters ?? (_repeaters = new RepeaterRepository(_context));
+
+        private ICurrencyRepository _currency;
+        public ICurrencyRepository Currency => _currency ?? (_currency = new CurrencyRepository(_context));
+        private IUnitConverterRepository _conUnits;
+        public IUnitConverterRepository ConverterUnits => _conUnits ?? (_conUnits = new UnitConverterRepository(_context));
+
+        private ITypingArticlesRepository _typingArticles;
+        public ITypingArticlesRepository TypingArticles => _typingArticles ?? (_typingArticles = new TypingArticlesRepository(_context));
+
         public UnitOfWork(NadekoContext context)
         {
             _context = context;

src/NadekoBot/Services/Impl/StatsService.cs

@@ -15,28 +15,31 @@ namespace NadekoBot.Services.Impl
         private int messageCounter;
         private DiscordSocketClient client;
         private DateTime started;
+        private int commandsRan = 0;
 
         public string BotVersion => "1.0-alpha";
 
         public string Heap => Math.Round((double)GC.GetTotalMemory(false) / 1.MiB(), 2).ToString();
 
 
-        public StatsService(DiscordSocketClient client)
+        public StatsService(DiscordSocketClient client, CommandHandler cmdHandler)
         {
 
             this.client = client;
 
             Reset();
             this.client.MessageReceived += _ => Task.FromResult(messageCounter++);
+            cmdHandler.CommandExecuted += (_, e) => commandsRan++;
 
             this.client.Disconnected += _ => Reset();
         }
         public Task<string> Print() => Task.FromResult($@"`Author: Kwoth` `Library: Discord.Net`
 `Bot Version: {BotVersion}`
 `Bot id: {(client.GetCurrentUser()).Id}`
-`Owners' Ids:`
+`Owners' Ids: {string.Join(", ", NadekoBot.Credentials.OwnerIds)}`
 `Uptime: {GetUptimeString()}`
 `Servers: {client.GetGuilds().Count} | TextChannels: {client.GetGuilds().SelectMany(g => g.GetChannels().Where(c => c is ITextChannel)).Count()} | VoiceChannels: {client.GetGuilds().SelectMany(g => g.GetChannels().Where(c => c is IVoiceChannel)).Count()}`
+`Commands Ran this session: {commandsRan}`
 `Messages: {messageCounter} ({messageCounter / (double)GetUptime().TotalSeconds:F2}/sec)` `Heap: {Heap} MB`");
 
         public Task Reset()

src/NadekoBot/Services/NadekoRandom.cs

@@ -0,0 +1,72 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace NadekoBot.Services
+{
+    public class NadekoRandom : Random
+    {
+        RandomNumberGenerator rng;
+
+        public NadekoRandom() : base()
+        {
+            rng = RandomNumberGenerator.Create();
+        }
+
+        private NadekoRandom(int Seed) : base(Seed)
+        {
+            rng = RandomNumberGenerator.Create();
+        }
+
+        public override int Next()
+        {
+            var bytes = new byte[sizeof(int)];
+            rng.GetBytes(bytes);
+            return Math.Abs(BitConverter.ToInt32(bytes, 0));
+        }
+
+        public override int Next(int maxValue)
+        {
+            if (maxValue <= 0)
+                throw new ArgumentOutOfRangeException();
+            var bytes = new byte[sizeof(int)];
+            rng.GetBytes(bytes);
+            return Math.Abs(BitConverter.ToInt32(bytes, 0)) % maxValue;
+        }
+
+        public override int Next(int minValue, int maxValue)
+        {
+            if (minValue > maxValue)
+                throw new ArgumentOutOfRangeException();
+            if (minValue == maxValue)
+                return minValue;
+            var bytes = new byte[sizeof(int)];
+            rng.GetBytes(bytes);
+            var num = BitConverter.ToInt32(bytes, 0);
+            var sign = Math.Sign(BitConverter.ToInt32(bytes, 0));
+            return (sign * BitConverter.ToInt32(bytes, 0)) % (maxValue - minValue) + minValue;
+        }
+
+        public override void NextBytes(byte[] buffer)
+        {
+            rng.GetBytes(buffer);
+        }
+
+        protected override double Sample()
+        {
+            var bytes = new byte[sizeof(double)];
+            rng.GetBytes(bytes);
+            return Math.Abs(BitConverter.ToDouble(bytes, 0) / double.MaxValue + 1);
+        }
+
+        public override double NextDouble()
+        {
+            var bytes = new byte[sizeof(double)];
+            rng.GetBytes(bytes);
+            return BitConverter.ToDouble(bytes, 0);
+        }
+    }
+}

src/NadekoBot/_Classes/ObservableConcurrentDictionary.cs

@@ -1,204 +0,0 @@
-//--------------------------------------------------------------------------
-// 
-//  Copyright (c) Microsoft Corporation.  All rights reserved. 
-// 
-//  File: ObservableConcurrentDictionary.cs
-//
-//--------------------------------------------------------------------------
-
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Threading;
-
-namespace System.Collections.Concurrent
-{
-    /// <summary>
-    /// Provides a thread-safe dictionary for use with data binding.
-    /// </summary>
-    /// <typeparam name="TKey">Specifies the type of the keys in this collection.</typeparam>
-    /// <typeparam name="TValue">Specifies the type of the values in this collection.</typeparam>
-    [DebuggerDisplay("Count={Count}")]
-    public class ObservableConcurrentDictionary<TKey, TValue> :
-        ICollection<KeyValuePair<TKey, TValue>>, IDictionary<TKey, TValue>,
-        INotifyCollectionChanged, INotifyPropertyChanged
-    {
-        private readonly SynchronizationContext _context;
-        private readonly ConcurrentDictionary<TKey, TValue> _dictionary;
-
-        /// <summary>
-        /// Initializes an instance of the ObservableConcurrentDictionary class.
-        /// </summary>
-        public ObservableConcurrentDictionary()
-        {
-            _context = AsyncOperationManager.SynchronizationContext;
-            _dictionary = new ConcurrentDictionary<TKey, TValue>();
-        }
-
-        /// <summary>Event raised when the collection changes.</summary>
-        public event NotifyCollectionChangedEventHandler CollectionChanged;
-        /// <summary>Event raised when a property on the collection changes.</summary>
-        public event PropertyChangedEventHandler PropertyChanged;
-
-        /// <summary>
-        /// Notifies observers of CollectionChanged or PropertyChanged of an update to the dictionary.
-        /// </summary>
-        private void NotifyObserversOfChange()
-        {
-            var collectionHandler = CollectionChanged;
-            var propertyHandler = PropertyChanged;
-            if (collectionHandler != null || propertyHandler != null)
-            {
-                _context.Post(s =>
-                {
-                    if (collectionHandler != null)
-                    {
-                        collectionHandler(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
-                    }
-                    if (propertyHandler != null)
-                    {
-                        propertyHandler(this, new PropertyChangedEventArgs("Count"));
-                        propertyHandler(this, new PropertyChangedEventArgs("Keys"));
-                        propertyHandler(this, new PropertyChangedEventArgs("Values"));
-                    }
-                }, null);
-            }
-        }
-
-        /// <summary>Attempts to add an item to the dictionary, notifying observers of any changes.</summary>
-        /// <param name="item">The item to be added.</param>
-        /// <returns>Whether the add was successful.</returns>
-        private bool TryAddWithNotification(KeyValuePair<TKey, TValue> item)
-        {
-            return TryAddWithNotification(item.Key, item.Value);
-        }
-
-        /// <summary>Attempts to add an item to the dictionary, notifying observers of any changes.</summary>
-        /// <param name="key">The key of the item to be added.</param>
-        /// <param name="value">The value of the item to be added.</param>
-        /// <returns>Whether the add was successful.</returns>
-        private bool TryAddWithNotification(TKey key, TValue value)
-        {
-            bool result = _dictionary.TryAdd(key, value);
-            if (result) NotifyObserversOfChange();
-            return result;
-        }
-
-        /// <summary>Attempts to remove an item from the dictionary, notifying observers of any changes.</summary>
-        /// <param name="key">The key of the item to be removed.</param>
-        /// <param name="value">The value of the item removed.</param>
-        /// <returns>Whether the removal was successful.</returns>
-        private bool TryRemoveWithNotification(TKey key, out TValue value)
-        {
-            bool result = _dictionary.TryRemove(key, out value);
-            if (result) NotifyObserversOfChange();
-            return result;
-        }
-
-        /// <summary>Attempts to add or update an item in the dictionary, notifying observers of any changes.</summary>
-        /// <param name="key">The key of the item to be updated.</param>
-        /// <param name="value">The new value to set for the item.</param>
-        /// <returns>Whether the update was successful.</returns>
-        private void UpdateWithNotification(TKey key, TValue value)
-        {
-            _dictionary[key] = value;
-            NotifyObserversOfChange();
-        }
-
-        #region ICollection<KeyValuePair<TKey,TValue>> Members
-        void ICollection<KeyValuePair<TKey, TValue>>.Add(KeyValuePair<TKey, TValue> item)
-        {
-            TryAddWithNotification(item);
-        }
-
-        void ICollection<KeyValuePair<TKey, TValue>>.Clear()
-        {
-            ((ICollection<KeyValuePair<TKey, TValue>>)_dictionary).Clear();
-            NotifyObserversOfChange();
-        }
-
-        bool ICollection<KeyValuePair<TKey, TValue>>.Contains(KeyValuePair<TKey, TValue> item)
-        {
-            return ((ICollection<KeyValuePair<TKey, TValue>>)_dictionary).Contains(item);
-        }
-
-        void ICollection<KeyValuePair<TKey, TValue>>.CopyTo(KeyValuePair<TKey, TValue>[] array, int arrayIndex)
-        {
-            ((ICollection<KeyValuePair<TKey, TValue>>)_dictionary).CopyTo(array, arrayIndex);
-        }
-
-        int ICollection<KeyValuePair<TKey, TValue>>.Count {
-            get { return ((ICollection<KeyValuePair<TKey, TValue>>)_dictionary).Count; }
-        }
-
-        bool ICollection<KeyValuePair<TKey, TValue>>.IsReadOnly {
-            get { return ((ICollection<KeyValuePair<TKey, TValue>>)_dictionary).IsReadOnly; }
-        }
-
-        bool ICollection<KeyValuePair<TKey, TValue>>.Remove(KeyValuePair<TKey, TValue> item)
-        {
-            TValue temp;
-            return TryRemoveWithNotification(item.Key, out temp);
-        }
-        #endregion
-
-        #region IEnumerable<KeyValuePair<TKey,TValue>> Members
-        IEnumerator<KeyValuePair<TKey, TValue>> IEnumerable<KeyValuePair<TKey, TValue>>.GetEnumerator()
-        {
-            return ((ICollection<KeyValuePair<TKey, TValue>>)_dictionary).GetEnumerator();
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return ((ICollection<KeyValuePair<TKey, TValue>>)_dictionary).GetEnumerator();
-        }
-        #endregion
-
-        #region IDictionary<TKey,TValue> Members
-        public void Add(TKey key, TValue value)
-        {
-            TryAddWithNotification(key, value);
-        }
-
-        public bool ContainsKey(TKey key)
-        {
-            return _dictionary.ContainsKey(key);
-        }
-
-        public ICollection<TKey> Keys {
-            get { return _dictionary.Keys; }
-        }
-
-        public bool Remove(TKey key)
-        {
-            TValue temp;
-            return TryRemoveWithNotification(key, out temp);
-        }
-
-        public bool TryGetValue(TKey key, out TValue value)
-        {
-            return _dictionary.TryGetValue(key, out value);
-        }
-
-        public bool TryAdd(TKey key, TValue value)
-        {
-            return TryAddWithNotification(key, value);
-        }
-
-        public ICollection<TValue> Values {
-            get { return _dictionary.Values; }
-        }
-
-        public TValue this[TKey key] {
-            get { return _dictionary[key]; }
-            set { UpdateWithNotification(key, value); }
-        }
-
-        public bool TryRemove(TKey key, out TValue value)
-        {
-            return TryRemoveWithNotification(key, out value);
-        }
-        #endregion
-    }
-}