Cleanup, Module prefixes now being loaded from DB.

This commit is contained in:
Kwoth 2016-09-10 21:45:12 +02:00
parent 5d08e0f14c
commit 2fc06b5223
12 changed files with 11 additions and 16 deletions

View File

@ -16,7 +16,7 @@ using NadekoBot.Services.Database.Models;
namespace NadekoBot.Modules.Administration namespace NadekoBot.Modules.Administration
{ {
[Module(".", AppendSpace = false)] [NadekoModule("Administration", ".")]
public partial class Administration : DiscordModule public partial class Administration : DiscordModule
{ {
public Administration(ILocalization loc, CommandService cmds, DiscordSocketClient client) : base(loc, cmds, client) public Administration(ILocalization loc, CommandService cmds, DiscordSocketClient client) : base(loc, cmds, client)

View File

@ -14,7 +14,7 @@ using NadekoBot.Services.Database;
namespace NadekoBot.Modules.ClashOfClans namespace NadekoBot.Modules.ClashOfClans
{ {
[Module(",", AppendSpace = false)] [NadekoModule("ClashOfClans", ",")]
public class ClashOfClans : DiscordModule public class ClashOfClans : DiscordModule
{ {
public static ConcurrentDictionary<ulong, List<ClashWar>> ClashWars { get; set; } = new ConcurrentDictionary<ulong, List<ClashWar>>(); public static ConcurrentDictionary<ulong, List<ClashWar>> ClashWars { get; set; } = new ConcurrentDictionary<ulong, List<ClashWar>>();

View File

@ -14,7 +14,7 @@ using System.Collections.Generic;
namespace NadekoBot.Modules.Gambling namespace NadekoBot.Modules.Gambling
{ {
[Module("$", AppendSpace = false)] [NadekoModule("Gambling", "$")]
public partial class Gambling : DiscordModule public partial class Gambling : DiscordModule
{ {
public static string CurrencyName { get; set; } public static string CurrencyName { get; set; }

View File

@ -12,7 +12,7 @@ using NadekoBot.Services.Database;
namespace NadekoBot.Modules.Games namespace NadekoBot.Modules.Games
{ {
[Module(">", AppendSpace = false)] [NadekoModule("Games", ">")]
public partial class Games : DiscordModule public partial class Games : DiscordModule
{ {
private IEnumerable<string> _8BallResponses { private IEnumerable<string> _8BallResponses {

View File

@ -12,7 +12,7 @@ using Discord.WebSocket;
namespace NadekoBot.Modules.Help namespace NadekoBot.Modules.Help
{ {
[Module("-", AppendSpace = false)] [NadekoModule("Help", "-")]
public partial class Help : DiscordModule public partial class Help : DiscordModule
{ {
public string HelpString { public string HelpString {

View File

@ -17,7 +17,7 @@ using NadekoBot.Services.Database;
namespace NadekoBot.Modules.Music namespace NadekoBot.Modules.Music
{ {
[Module("!!", AppendSpace = false)] [NadekoModule("ClashOfClans", "!!")]
public partial class Music : DiscordModule public partial class Music : DiscordModule
{ {
public static ConcurrentDictionary<ulong, MusicPlayer> MusicPlayers = new ConcurrentDictionary<ulong, MusicPlayer>(); public static ConcurrentDictionary<ulong, MusicPlayer> MusicPlayers = new ConcurrentDictionary<ulong, MusicPlayer>();

View File

@ -15,7 +15,7 @@ using NadekoBot.Extensions;
namespace NadekoBot.Modules.NSFW namespace NadekoBot.Modules.NSFW
{ {
[Module("~", AppendSpace = false)] [NadekoModule("NSFW", "~")]
public class NSFW : DiscordModule public class NSFW : DiscordModule
{ {
public NSFW(ILocalization loc, CommandService cmds, DiscordSocketClient client) : base(loc, cmds, client) public NSFW(ILocalization loc, CommandService cmds, DiscordSocketClient client) : base(loc, cmds, client)

View File

@ -16,7 +16,7 @@ using NadekoBot.Modules.Searches.IMDB;
namespace NadekoBot.Modules.Searches namespace NadekoBot.Modules.Searches
{ {
[Module("~", AppendSpace = false)] [NadekoModule("Searches", "~")]
public partial class Searches : DiscordModule public partial class Searches : DiscordModule
{ {
private IGoogleApiService _google { get; } private IGoogleApiService _google { get; }

View File

@ -9,7 +9,7 @@ using Discord.WebSocket;
namespace NadekoBot.Modules.Translator namespace NadekoBot.Modules.Translator
{ {
[Module("~", AppendSpace = false)] [NadekoModule("Translator", "~")]
public class Translator : DiscordModule public class Translator : DiscordModule
{ {
public Translator(ILocalization loc, CommandService cmds, DiscordSocketClient client) : base(loc, cmds, client) public Translator(ILocalization loc, CommandService cmds, DiscordSocketClient client) : base(loc, cmds, client)

View File

@ -15,7 +15,7 @@ using Discord.WebSocket;
namespace NadekoBot.Modules.Utility namespace NadekoBot.Modules.Utility
{ {
[Module(".", AppendSpace = false)] [NadekoModule("Utility", ".")]
public partial class Utility : DiscordModule public partial class Utility : DiscordModule
{ {
public Utility(ILocalization loc, CommandService cmds, DiscordSocketClient client) : base(loc, cmds, client) public Utility(ILocalization loc, CommandService cmds, DiscordSocketClient client) : base(loc, cmds, client)

View File

@ -32,12 +32,6 @@ namespace NadekoBot
{ {
SetupLogger(); SetupLogger();
for (int i = 0; i < 100; i++)
{
var rnd = new NadekoRandom();
Console.WriteLine(rnd.Next(-10, -1));
}
//create client //create client
Client = new DiscordSocketClient(new DiscordSocketConfig Client = new DiscordSocketClient(new DiscordSocketConfig
{ {

View File

@ -43,6 +43,7 @@ namespace NadekoBot.Services.Database
{ {
new ModulePrefix() { ModuleName = "Administration", Prefix = "." }, new ModulePrefix() { ModuleName = "Administration", Prefix = "." },
new ModulePrefix() { ModuleName = "Searches", Prefix = "~" }, new ModulePrefix() { ModuleName = "Searches", Prefix = "~" },
new ModulePrefix() { ModuleName = "Translator", Prefix = "~" },
new ModulePrefix() { ModuleName = "NSFW", Prefix = "~" }, new ModulePrefix() { ModuleName = "NSFW", Prefix = "~" },
new ModulePrefix() { ModuleName = "ClashOfClans", Prefix = "," }, new ModulePrefix() { ModuleName = "ClashOfClans", Prefix = "," },
new ModulePrefix() { ModuleName = "Help", Prefix = "-" }, new ModulePrefix() { ModuleName = "Help", Prefix = "-" },