mattburchett/NadekoBot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixes from yesterday

Browse Source
This commit is contained in:
Master Kwoth 2016-03-12 10:02:29 +01:00
parent 5275058553
commit fc19ec1f0b
13 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NadekoBot/Classes/JSONModels/Configuration.cs
View File

@ -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 {

2
NadekoBot/Modules/ClashOfClans.cs
View File

@ -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<ulong, List<ClashWar>> ClashWars { get; } = new ConcurrentDictionary<ulong, List<ClashWar>>();

2
NadekoBot/Modules/Conversations.cs
View File

@ -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();

2
NadekoBot/Modules/Gambling.cs
View File

@ -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)
{

2
NadekoBot/Modules/Games.cs
View File

@ -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 => {

2
NadekoBot/Modules/Help.cs
View File

@ -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 => {

2
NadekoBot/Modules/Music.cs
View File

@ -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;

2
NadekoBot/Modules/NSFW.cs
View File

@ -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 => {

2
NadekoBot/Modules/Permissions.cs
View File

@ -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));

2
NadekoBot/Modules/Searches.cs
View File

@ -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 => {

2
NadekoBot/Modules/Trello.cs
View File

@ -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) {

2
NadekoBot/NadekoBot.cs
View File

@ -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);

3
NadekoBot/bin/Debug/data/config_example.json
View File

@ -14,7 +14,8 @@
"Music": "!m",
"Trello": "trello",
"Games": ">",
"Gambling": "$"
"Gambling": "$",
"Permissions": ";"
},
"ServerBlacklist": [],
"ChannelBlacklist": [],