diff --git a/NadekoBot/Classes/JSONModels/Configuration.cs b/NadekoBot/Classes/JSONModels/Configuration.cs index 99bfd3c6..6ebce831 100644 --- a/NadekoBot/Classes/JSONModels/Configuration.cs +++ b/NadekoBot/Classes/JSONModels/Configuration.cs @@ -59,6 +59,7 @@ namespace NadekoBot.Classes.JSONModels { public string Trello { get; set; } = "trello"; public string Games { get; set; } = ">"; public string Gambling { get; set; } = "$"; + public string Permissions { get; set; } = ";"; } public static class ConfigHandler { diff --git a/NadekoBot/Modules/ClashOfClans.cs b/NadekoBot/Modules/ClashOfClans.cs index 3f4c412d..888826f4 100644 --- a/NadekoBot/Modules/ClashOfClans.cs +++ b/NadekoBot/Modules/ClashOfClans.cs @@ -13,7 +13,7 @@ using NadekoBot.Modules; namespace NadekoBot.Commands { internal class ClashOfClans : DiscordModule { - public override string Prefix { get; } = ","; + public override string Prefix { get; } = NadekoBot.Config.CommandPrefixes.ClashOfClans; public static ConcurrentDictionary> ClashWars { get; } = new ConcurrentDictionary>(); diff --git a/NadekoBot/Modules/Conversations.cs b/NadekoBot/Modules/Conversations.cs index f0d3018c..2b01a5b7 100644 --- a/NadekoBot/Modules/Conversations.cs +++ b/NadekoBot/Modules/Conversations.cs @@ -21,7 +21,7 @@ namespace NadekoBot.Modules { commands.Add(new RequestsCommand(this)); } - public override string Prefix { get; } = String.Format("<@{0}>", NadekoBot.Creds.BotId); + public override string Prefix { get; } = String.Format(NadekoBot.Config.CommandPrefixes.Conversations, NadekoBot.Creds.BotId); public override void Install(ModuleManager manager) { var rng = new Random(); diff --git a/NadekoBot/Modules/Gambling.cs b/NadekoBot/Modules/Gambling.cs index 4f73c3ab..5df7b863 100644 --- a/NadekoBot/Modules/Gambling.cs +++ b/NadekoBot/Modules/Gambling.cs @@ -16,7 +16,7 @@ namespace NadekoBot.Modules commands.Add(new DiceRollCommand(this)); } - public override string Prefix { get; } = "$"; + public override string Prefix { get; } = NadekoBot.Config.CommandPrefixes.Gambling; public override void Install(ModuleManager manager) { diff --git a/NadekoBot/Modules/Games.cs b/NadekoBot/Modules/Games.cs index 65a8be92..3ac3ab7c 100644 --- a/NadekoBot/Modules/Games.cs +++ b/NadekoBot/Modules/Games.cs @@ -20,7 +20,7 @@ namespace NadekoBot.Modules { _8BallAnswers = JArray.Parse(File.ReadAllText("data/8ball.json")).Select(t => t.ToString()).ToArray(); } - public override string Prefix { get; } = ">"; + public override string Prefix { get; } = NadekoBot.Config.CommandPrefixes.Games; public override void Install(ModuleManager manager) { manager.CreateCommands("", cgb => { diff --git a/NadekoBot/Modules/Help.cs b/NadekoBot/Modules/Help.cs index beaa6c3c..8cc383df 100644 --- a/NadekoBot/Modules/Help.cs +++ b/NadekoBot/Modules/Help.cs @@ -11,7 +11,7 @@ namespace NadekoBot.Modules { commands.Add(new HelpCommand(this)); } - public override string Prefix { get; } = "-"; + public override string Prefix { get; } = NadekoBot.Config.CommandPrefixes.Help; public override void Install(ModuleManager manager) { manager.CreateCommands("", cgb => { diff --git a/NadekoBot/Modules/Music.cs b/NadekoBot/Modules/Music.cs index cb343280..afd472e1 100644 --- a/NadekoBot/Modules/Music.cs +++ b/NadekoBot/Modules/Music.cs @@ -33,7 +33,7 @@ namespace NadekoBot.Modules { } - public override string Prefix { get; } = "!m"; + public override string Prefix { get; } = NadekoBot.Config.CommandPrefixes.Music; public override void Install(ModuleManager manager) { var client = NadekoBot.Client; diff --git a/NadekoBot/Modules/NSFW.cs b/NadekoBot/Modules/NSFW.cs index 42d297b2..fc191afa 100644 --- a/NadekoBot/Modules/NSFW.cs +++ b/NadekoBot/Modules/NSFW.cs @@ -9,7 +9,7 @@ namespace NadekoBot.Modules { private readonly Random rng = new Random(); - public override string Prefix { get; } = "~"; + public override string Prefix { get; } = NadekoBot.Config.CommandPrefixes.NSFW; public override void Install(ModuleManager manager) { manager.CreateCommands("", cgb => { diff --git a/NadekoBot/Modules/Permissions.cs b/NadekoBot/Modules/Permissions.cs index e4d34695..cfb2c3d3 100644 --- a/NadekoBot/Modules/Permissions.cs +++ b/NadekoBot/Modules/Permissions.cs @@ -11,7 +11,7 @@ using NadekoBot.Extensions; namespace NadekoBot.Modules { internal class PermissionModule : DiscordModule { - public override string Prefix { get; } = ";"; + public override string Prefix { get; } = NadekoBot.Config.CommandPrefixes.Permissions; public PermissionModule() { commands.Add(new FilterInvitesCommand(this)); diff --git a/NadekoBot/Modules/Searches.cs b/NadekoBot/Modules/Searches.cs index a8b084a7..ae6b8774 100644 --- a/NadekoBot/Modules/Searches.cs +++ b/NadekoBot/Modules/Searches.cs @@ -19,7 +19,7 @@ namespace NadekoBot.Modules { rng = new Random(); } - public override string Prefix { get; } = "~"; + public override string Prefix { get; } = NadekoBot.Config.CommandPrefixes.Searches; public override void Install(ModuleManager manager) { manager.CreateCommands("", cgb => { diff --git a/NadekoBot/Modules/Trello.cs b/NadekoBot/Modules/Trello.cs index eaaf8ab1..5c2da0ee 100644 --- a/NadekoBot/Modules/Trello.cs +++ b/NadekoBot/Modules/Trello.cs @@ -11,7 +11,7 @@ using Action = Manatee.Trello.Action; namespace NadekoBot.Modules { internal class Trello : DiscordModule { private readonly Timer t = new Timer { Interval = 2000 }; - public override string Prefix { get; } = "trello"; + public override string Prefix { get; } = NadekoBot.Config.CommandPrefixes.Trello; public override void Install(ModuleManager manager) { diff --git a/NadekoBot/NadekoBot.cs b/NadekoBot/NadekoBot.cs index bc24c14f..c1c12839 100644 --- a/NadekoBot/NadekoBot.cs +++ b/NadekoBot/NadekoBot.cs @@ -119,7 +119,7 @@ namespace NadekoBot { modules.Add(new Conversations(), "Conversations", ModuleFilter.None); modules.Add(new Gambling(), "Gambling", ModuleFilter.None); modules.Add(new Games(), "Games", ModuleFilter.None); - //modules.Add(new Music(), "Music", ModuleFilter.None); + modules.Add(new Music(), "Music", ModuleFilter.None); modules.Add(new Searches(), "Searches", ModuleFilter.None); modules.Add(new NSFW(), "NSFW", ModuleFilter.None); modules.Add(new ClashOfClans(), "ClashOfClans", ModuleFilter.None); diff --git a/NadekoBot/bin/Debug/data/config_example.json b/NadekoBot/bin/Debug/data/config_example.json index cca3f3bd..94fd6eb9 100644 --- a/NadekoBot/bin/Debug/data/config_example.json +++ b/NadekoBot/bin/Debug/data/config_example.json @@ -14,7 +14,8 @@ "Music": "!m", "Trello": "trello", "Games": ">", - "Gambling": "$" + "Gambling": "$", + "Permissions": ";" }, "ServerBlacklist": [], "ChannelBlacklist": [],