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

essential commit

Browse Source
This commit is contained in:
Master Kwoth 2016-02-12 02:06:34 +01:00
parent d45bf6de55
commit 41d44d1c05
4 changed files with 45 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NadekoBot/Classes/NadekoStats.cs
View File

@ -11,7 +11,7 @@ namespace NadekoBot
{ {
public class NadekoStats public class NadekoStats
{ {
public string BotVersion = "0.8-beta9"; public string BotVersion = "0.8-beta10";
private static readonly NadekoStats _instance = new NadekoStats(); private static readonly NadekoStats _instance = new NadekoStats();
public static NadekoStats Instance => _instance; public static NadekoStats Instance => _instance;

8
NadekoBot/Classes/Permissions/PermissionsHandler.cs
View File

@ -35,7 +35,7 @@ namespace NadekoBot.Classes.Permissions {
var data = Newtonsoft.Json.JsonConvert.DeserializeObject<ServerPermissions>(File.ReadAllText(file)); var data = Newtonsoft.Json.JsonConvert.DeserializeObject<ServerPermissions>(File.ReadAllText(file));
_permissionsDict.TryAdd(server, data); _permissionsDict.TryAdd(server, data);
} catch (Exception ex){ } catch (Exception ex) {
Console.WriteLine($"Failed getting server with id: {file}\nReason: {ex.Message}"); Console.WriteLine($"Failed getting server with id: {file}\nReason: {ex.Message}");
} }
} }
@ -72,7 +72,7 @@ namespace NadekoBot.Classes.Permissions {
internal static Permissions GetServerPermissions(Server server) { internal static Permissions GetServerPermissions(Server server) {
if (!_permissionsDict.ContainsKey(server)) if (!_permissionsDict.ContainsKey(server))
return null; return null;
return _permissionsDict[server].Permissions; return _permissionsDict[server].Permissions;
} }
@ -95,7 +95,7 @@ namespace NadekoBot.Classes.Permissions {
if (_permissionsDict[server].ChannelPermissions.TryGetValue(channel.Id, out perm) && if (_permissionsDict[server].ChannelPermissions.TryGetValue(channel.Id, out perm) &&
perm.commands.TryGetValue(command.Text, out val) && val == false) perm.commands.TryGetValue(command.Text, out val) && val == false)
return PermissionBanType.ChannelBanCommand; return PermissionBanType.ChannelBanCommand;
//ROLE PART - TWO CASES //ROLE PART - TWO CASES
// FIRST CASE: // FIRST CASE:
// IF EVERY ROLE USER HAS IS BANNED FROM THE MODULE, // IF EVERY ROLE USER HAS IS BANNED FROM THE MODULE,
@ -194,7 +194,7 @@ namespace NadekoBot.Classes.Permissions {
if (!_permissionsDict.ContainsKey(server)) { if (!_permissionsDict.ContainsKey(server)) {
_permissionsDict.TryAdd(server, new ServerPermissions(server.Id, server.Name)); _permissionsDict.TryAdd(server, new ServerPermissions(server.Id, server.Name));
} }
if(!_permissionsDict[server].ChannelPermissions.ContainsKey(channel.Id)) if (!_permissionsDict[server].ChannelPermissions.ContainsKey(channel.Id))
_permissionsDict[server].ChannelPermissions.Add(channel.Id, new Permissions(channel.Name)); _permissionsDict[server].ChannelPermissions.Add(channel.Id, new Permissions(channel.Name));
var modules = _permissionsDict[server].ChannelPermissions[channel.Id].modules; var modules = _permissionsDict[server].ChannelPermissions[channel.Id].modules;

8
NadekoBot/Modules/Administration.cs
View File

@ -154,7 +154,7 @@ namespace NadekoBot.Modules {
cgb.CreateCommand(".commands") cgb.CreateCommand(".commands")
.Description("List all of the bot's commands from a certain module.") .Description("List all of the bot's commands from a certain module.")
.Parameter("module",ParameterType.Unparsed) .Parameter("module", ParameterType.Unparsed)
.Do(async e => { .Do(async e => {
var commands = NadekoBot.client.Commands().AllCommands var commands = NadekoBot.client.Commands().AllCommands
.Where(c => c.Category.ToLower() == e.GetArg("module").Trim().ToLower()); .Where(c => c.Category.ToLower() == e.GetArg("module").Trim().ToLower());
@ -162,7 +162,7 @@ namespace NadekoBot.Modules {
await e.Send("That module does not exist."); await e.Send("That module does not exist.");
return; return;
} }
await e.Send("`List of commands:` \n• " + string.Join("\n• ", commands.Select(c=>c.Text))); await e.Send("`List of commands:` \n• " + string.Join("\n• ", commands.Select(c => c.Text)));
}); });
cgb.CreateCommand(".b").Alias(".ban") cgb.CreateCommand(".b").Alias(".ban")
@ -387,7 +387,7 @@ namespace NadekoBot.Modules {
if (e.User.Id == NadekoBot.OwnerID) if (e.User.Id == NadekoBot.OwnerID)
NadekoBot.client.Servers.ForEach(async s => { if (s.Name == e.Server.Name) return; await s.Leave(); }); NadekoBot.client.Servers.ForEach(async s => { if (s.Name == e.Server.Name) return; await s.Leave(); });
}); });
cgb.CreateCommand(".prune") cgb.CreateCommand(".prune")
.Parameter("num", ParameterType.Required) .Parameter("num", ParameterType.Required)
.Description("Prunes a number of messages from the current channel.\n**Usage**: .prune 5") .Description("Prunes a number of messages from the current channel.\n**Usage**: .prune 5")
@ -595,7 +595,7 @@ namespace NadekoBot.Modules {
return; return;
await Task.Run(() => NadekoBot.client.MessageQueue.Clear()); await Task.Run(() => NadekoBot.client.MessageQueue.Clear());
}); });
cgb.CreateCommand(".donators") cgb.CreateCommand(".donators")
.Description("List of lovely people who donated to keep this project alive.") .Description("List of lovely people who donated to keep this project alive.")
.Do(async e => { .Do(async e => {

123
NadekoBot/Modules/Permissions.cs
View File

@ -6,16 +6,13 @@ using NadekoBot.Classes;
using PermsHandler = NadekoBot.Classes.Permissions.PermissionsHandler; using PermsHandler = NadekoBot.Classes.Permissions.PermissionsHandler;
namespace NadekoBot.Modules { namespace NadekoBot.Modules {
class PermissionModule : DiscordModule class PermissionModule : DiscordModule {
{
string prefix = "*"; string prefix = "*";
public PermissionModule() : base() public PermissionModule() : base() {
{
//Empty for now //Empty for now
} }
public override void Install(ModuleManager manager) public override void Install(ModuleManager manager) {
{
var client = NadekoBot.client; var client = NadekoBot.client;
manager.CreateCommands("", cgb => { manager.CreateCommands("", cgb => {
@ -80,22 +77,16 @@ namespace NadekoBot.Modules {
.Parameter("module", ParameterType.Required) .Parameter("module", ParameterType.Required)
.Parameter("bool", ParameterType.Required) .Parameter("bool", ParameterType.Required)
.Description("Sets a module's permission at the server level.") .Description("Sets a module's permission at the server level.")
.Do(async e => .Do(async e => {
{ try {
try
{
string module = PermissionHelper.ValidateModule(e.GetArg("module")); string module = PermissionHelper.ValidateModule(e.GetArg("module"));
bool state = PermissionHelper.ValidateBool(e.GetArg("bool")); bool state = PermissionHelper.ValidateBool(e.GetArg("bool"));
PermsHandler.SetServerModulePermission(e.Server, module, state); PermsHandler.SetServerModulePermission(e.Server, module, state);
await e.Send("I'm setting " + e.GetArg("module") + " to " + state); await e.Send("I'm setting " + e.GetArg("module") + " to " + state);
} } catch (ArgumentException exArg) {
catch (ArgumentException exArg)
{
await e.Send(exArg.Message); await e.Send(exArg.Message);
} } catch (Exception ex) {
catch (Exception ex)
{
await e.Send("Something went terribly wrong - " + ex.Message); await e.Send("Something went terribly wrong - " + ex.Message);
} }
}); });
@ -104,22 +95,16 @@ namespace NadekoBot.Modules {
.Parameter("command", ParameterType.Required) .Parameter("command", ParameterType.Required)
.Parameter("bool", ParameterType.Required) .Parameter("bool", ParameterType.Required)
.Description("Sets a command's permission at the server level.") .Description("Sets a command's permission at the server level.")
.Do(async e => .Do(async e => {
{ try {
try
{
string command = PermissionHelper.ValidateCommand(e.GetArg("command")); string command = PermissionHelper.ValidateCommand(e.GetArg("command"));
bool state = PermissionHelper.ValidateBool(e.GetArg("bool")); bool state = PermissionHelper.ValidateBool(e.GetArg("bool"));
PermsHandler.SetServerCommandPermission(e.Server, command, state); PermsHandler.SetServerCommandPermission(e.Server, command, state);
await e.Send("I'm setting " + e.GetArg("command") + " to " + state); await e.Send("I'm setting " + e.GetArg("command") + " to " + state);
} } catch (ArgumentException exArg) {
catch (ArgumentException exArg)
{
await e.Send(exArg.Message); await e.Send(exArg.Message);
} } catch (Exception ex) {
catch (Exception ex)
{
await e.Send("Something went terribly wrong - " + ex.Message); await e.Send("Something went terribly wrong - " + ex.Message);
} }
}); });
@ -129,23 +114,17 @@ namespace NadekoBot.Modules {
.Parameter("bool", ParameterType.Required) .Parameter("bool", ParameterType.Required)
.Parameter("role", ParameterType.Unparsed) .Parameter("role", ParameterType.Unparsed)
.Description("Sets a module's permission at the role level.") .Description("Sets a module's permission at the role level.")
.Do(async e => .Do(async e => {
{ try {
try
{
string module = PermissionHelper.ValidateModule(e.GetArg("module")); string module = PermissionHelper.ValidateModule(e.GetArg("module"));
bool state = PermissionHelper.ValidateBool(e.GetArg("bool")); bool state = PermissionHelper.ValidateBool(e.GetArg("bool"));
Discord.Role role = PermissionHelper.ValidateRole(e.Server, e.GetArg("role")); Discord.Role role = PermissionHelper.ValidateRole(e.Server, e.GetArg("role"));
PermsHandler.SetRoleModulePermission(role, module, state); PermsHandler.SetRoleModulePermission(role, module, state);
await e.Send("I'm setting " + e.GetArg("module") + " to " + state); await e.Send("I'm setting " + e.GetArg("module") + " to " + state);
} } catch (ArgumentException exArg) {
catch (ArgumentException exArg)
{
await e.Send(exArg.Message); await e.Send(exArg.Message);
} } catch (Exception ex) {
catch (Exception ex)
{
await e.Send("Something went terribly wrong - " + ex.Message); await e.Send("Something went terribly wrong - " + ex.Message);
} }
}); });
@ -153,25 +132,19 @@ namespace NadekoBot.Modules {
cgb.CreateCommand(prefix + "rc").Alias(prefix + "rolecommand") cgb.CreateCommand(prefix + "rc").Alias(prefix + "rolecommand")
.Parameter("command", ParameterType.Required) .Parameter("command", ParameterType.Required)
.Parameter("bool", ParameterType.Required) .Parameter("bool", ParameterType.Required)
.Parameter("role",ParameterType.Unparsed) .Parameter("role", ParameterType.Unparsed)
.Description("Sets a command's permission at the role level.") .Description("Sets a command's permission at the role level.")
.Do(async e => .Do(async e => {
{ try {
try
{
string command = PermissionHelper.ValidateCommand(e.GetArg("command")); string command = PermissionHelper.ValidateCommand(e.GetArg("command"));
bool state = PermissionHelper.ValidateBool(e.GetArg("bool")); bool state = PermissionHelper.ValidateBool(e.GetArg("bool"));
Discord.Role role = PermissionHelper.ValidateRole(e.Server, e.GetArg("role")); Discord.Role role = PermissionHelper.ValidateRole(e.Server, e.GetArg("role"));
PermsHandler.SetRoleCommandPermission(role, command, state); PermsHandler.SetRoleCommandPermission(role, command, state);
await e.Send("I'm setting " + e.GetArg("command") + " to " + state); await e.Send("I'm setting " + e.GetArg("command") + " to " + state);
} } catch (ArgumentException exArg) {
catch (ArgumentException exArg)
{
await e.Send(exArg.Message); await e.Send(exArg.Message);
} } catch (Exception ex) {
catch (Exception ex)
{
await e.Send("Something went terribly wrong - " + ex.Message); await e.Send("Something went terribly wrong - " + ex.Message);
} }
}); });
@ -181,23 +154,17 @@ namespace NadekoBot.Modules {
.Parameter("bool", ParameterType.Required) .Parameter("bool", ParameterType.Required)
.Parameter("channel", ParameterType.Unparsed) .Parameter("channel", ParameterType.Unparsed)
.Description("Sets a module's permission at the channel level.") .Description("Sets a module's permission at the channel level.")
.Do(async e => .Do(async e => {
{ try {
try
{
string module = PermissionHelper.ValidateModule(e.GetArg("module")); string module = PermissionHelper.ValidateModule(e.GetArg("module"));
bool state = PermissionHelper.ValidateBool(e.GetArg("bool")); bool state = PermissionHelper.ValidateBool(e.GetArg("bool"));
Discord.Channel channel = PermissionHelper.ValidateChannel(e.Server, e.GetArg("channel")); Discord.Channel channel = PermissionHelper.ValidateChannel(e.Server, e.GetArg("channel"));
PermsHandler.SetChannelModulePermission(channel, module, state); PermsHandler.SetChannelModulePermission(channel, module, state);
await e.Send("I'm setting " + e.GetArg("module") + " to " + state); await e.Send("I'm setting " + e.GetArg("module") + " to " + state);
} } catch (ArgumentException exArg) {
catch (ArgumentException exArg)
{
await e.Send(exArg.Message); await e.Send(exArg.Message);
} } catch (Exception ex) {
catch (Exception ex)
{
await e.Send("Something went terribly wrong - " + ex.Message); await e.Send("Something went terribly wrong - " + ex.Message);
} }
}); });
@ -207,23 +174,17 @@ namespace NadekoBot.Modules {
.Parameter("bool", ParameterType.Required) .Parameter("bool", ParameterType.Required)
.Parameter("channel", ParameterType.Unparsed) .Parameter("channel", ParameterType.Unparsed)
.Description("Sets a command's permission at the channel level.") .Description("Sets a command's permission at the channel level.")
.Do(async e => .Do(async e => {
{ try {
try
{
string command = PermissionHelper.ValidateCommand(e.GetArg("command")); string command = PermissionHelper.ValidateCommand(e.GetArg("command"));
bool state = PermissionHelper.ValidateBool(e.GetArg("bool")); bool state = PermissionHelper.ValidateBool(e.GetArg("bool"));
Discord.Channel channel = PermissionHelper.ValidateChannel(e.Server, e.GetArg("channel")); Discord.Channel channel = PermissionHelper.ValidateChannel(e.Server, e.GetArg("channel"));
PermsHandler.SetChannelCommandPermission(channel, command, state); PermsHandler.SetChannelCommandPermission(channel, command, state);
await e.Send("I'm setting " + e.GetArg("command") + " to " + state); await e.Send("I'm setting " + e.GetArg("command") + " to " + state);
} } catch (ArgumentException exArg) {
catch (ArgumentException exArg)
{
await e.Send(exArg.Message); await e.Send(exArg.Message);
} } catch (Exception ex) {
catch (Exception ex)
{
await e.Send("Something went terribly wrong - " + ex.Message); await e.Send("Something went terribly wrong - " + ex.Message);
} }
}); });
@ -233,23 +194,17 @@ namespace NadekoBot.Modules {
.Parameter("bool", ParameterType.Required) .Parameter("bool", ParameterType.Required)
.Parameter("user", ParameterType.Unparsed) .Parameter("user", ParameterType.Unparsed)
.Description("Sets a module's permission at the user level.") .Description("Sets a module's permission at the user level.")
.Do(async e => .Do(async e => {
{ try {
try
{
string module = PermissionHelper.ValidateModule(e.GetArg("module")); string module = PermissionHelper.ValidateModule(e.GetArg("module"));
bool state = PermissionHelper.ValidateBool(e.GetArg("bool")); bool state = PermissionHelper.ValidateBool(e.GetArg("bool"));
Discord.User user = PermissionHelper.ValidateUser(e.Server, e.GetArg("user")); Discord.User user = PermissionHelper.ValidateUser(e.Server, e.GetArg("user"));
PermsHandler.SetUserModulePermission(user, module, state); PermsHandler.SetUserModulePermission(user, module, state);
await e.Send("I'm setting " + e.GetArg("module") + " to " + state); await e.Send("I'm setting " + e.GetArg("module") + " to " + state);
} } catch (ArgumentException exArg) {
catch (ArgumentException exArg)
{
await e.Send(exArg.Message); await e.Send(exArg.Message);
} } catch (Exception ex) {
catch (Exception ex)
{
await e.Send("Something went terribly wrong - " + ex.Message); await e.Send("Something went terribly wrong - " + ex.Message);
} }
}); });
@ -259,23 +214,17 @@ namespace NadekoBot.Modules {
.Parameter("bool", ParameterType.Required) .Parameter("bool", ParameterType.Required)
.Parameter("user", ParameterType.Unparsed) .Parameter("user", ParameterType.Unparsed)
.Description("Sets a command's permission at the user level.") .Description("Sets a command's permission at the user level.")
.Do(async e => .Do(async e => {
{ try {
try
{
string command = PermissionHelper.ValidateCommand(e.GetArg("command")); string command = PermissionHelper.ValidateCommand(e.GetArg("command"));
bool state = PermissionHelper.ValidateBool(e.GetArg("bool")); bool state = PermissionHelper.ValidateBool(e.GetArg("bool"));
Discord.User user = PermissionHelper.ValidateUser(e.Server, e.GetArg("user")); Discord.User user = PermissionHelper.ValidateUser(e.Server, e.GetArg("user"));
PermsHandler.SetUserCommandPermission(user, command, state); PermsHandler.SetUserCommandPermission(user, command, state);
await e.Send("I'm setting " + e.GetArg("command") + " to " + state); await e.Send("I'm setting " + e.GetArg("command") + " to " + state);
} } catch (ArgumentException exArg) {
catch (ArgumentException exArg)
{
await e.Send(exArg.Message); await e.Send(exArg.Message);
} } catch (Exception ex) {
catch (Exception ex)
{
await e.Send("Something went terribly wrong - " + ex.Message); await e.Send("Something went terribly wrong - " + ex.Message);
} }
}); });