Deukhoofd/DeukBot4
1
0
Fork 0
mirror of https://gitlab.com/Deukhoofd/DeukBot4.git synced 2026-04-02 10:40:05 +00:00
Code Issues Releases Wiki Activity

Work on permission system, along with initial work on database(postgres) system

Browse Source
This commit is contained in:
Deukhoofd
2018-03-29 15:35:00 +02:00
parent 3a85a9f18f
commit 25d691c4e9
13 changed files with 337 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DeukBot4/MessageHandlers/CommandHandler/CommandHandler.cs
View File

@@ -39,7 +39,7 @@ namespace DeukBot4.MessageHandlers.CommandHandler
public static async Task HandleMessage(SocketMessage message)
{
if (message.Content[0] != CommandTrigger) return;
var req = CommandRequest.Create(message);
var req = await CommandRequest.Create(message);
var resultCode = req.Item2;
if (resultCode == CommandRequest.RequestCode.Invalid)
{

14
DeukBot4/MessageHandlers/CommandHandler/RequestStructure/CommandRequest.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using DeukBot4.MessageHandlers.Permissions;
using Discord.WebSocket;
@@ -30,7 +31,7 @@ namespace DeukBot4.MessageHandlers.CommandHandler.RequestStructure
OK, Invalid, Forbidden
}
public static (CommandRequest, RequestCode) Create(SocketMessage message)
public static async Task<(CommandRequest, RequestCode)> Create(SocketMessage message)
{
var originalMessage = message;
var content = message.Content;
@@ -45,7 +46,16 @@ namespace DeukBot4.MessageHandlers.CommandHandler.RequestStructure
return (null, RequestCode.Invalid);
}
var permission = PermissionValidator.GetUserPermissionLevel(message);
PermissionLevel permission;
try
{
permission = await PermissionValidator.GetUserPermissionLevel(message);
}
catch (Exception e)
{
await Logger.LogError(e.Message);
return (null, RequestCode.Forbidden);
}
if (permission < command.Permission)
{
return (null, RequestCode.Forbidden);

100
DeukBot4/MessageHandlers/CommandHandler/RolePermissionCommands.cs Normal file
View File

@@ -0,0 +1,100 @@
using System;
using System.Text;
using System.Threading.Tasks;
using DeukBot4.Database;
using DeukBot4.MessageHandlers.CommandHandler.RequestStructure;
using DeukBot4.MessageHandlers.Permissions;
using Discord;
namespace DeukBot4.MessageHandlers.CommandHandler
{
public class RolePermissionCommands : CommandContainerBase
{
public override string Name => "Role Related";
[Command("roles", PermissionLevel.Admin)]
[CommandHelp("Lists all roles on the server along with their IDs", "Lists all roles on the server along with their IDs")]
public async Task ListServerRoles(CommandRequest request)
{
var channel = request.OriginalMessage.Channel;
if (!(channel is IGuildChannel serverChannel))
return;
var roles = serverChannel.Guild.Roles;
var sb = new StringBuilder();
foreach (var role in roles)
{
sb.Append($"``{role.Name}`` --> {role.Id}\n");
}
await channel.SendMessageAsync(sb.ToString());
}
[Command("adminrole", PermissionLevel.ServerOwner)]
[CommandParameters(new []{ParameterMatcher.ParameterType.Number})]
public async Task SetAdminRole(CommandRequest request)
{
await SetRolePermission(request, PermissionLevel.Admin);
}
[Command("moderatorrole", PermissionLevel.ServerOwner)]
[CommandParameters(new []{ParameterMatcher.ParameterType.Number})]
public async Task SetModRole(CommandRequest request)
{
await SetRolePermission(request, PermissionLevel.Moderator);
}
[Command("helperrole", PermissionLevel.ServerOwner)]
[CommandParameters(new []{ParameterMatcher.ParameterType.Number})]
public async Task SetHelperRole(CommandRequest request)
{
await SetRolePermission(request, PermissionLevel.Helper);
}
[Command("bannedrole", PermissionLevel.ServerOwner)]
[CommandParameters(new []{ParameterMatcher.ParameterType.Number})]
public async Task SetBannedRole(CommandRequest request)
{
await SetRolePermission(request, PermissionLevel.Banned);
}
private static async Task SetRolePermission(CommandRequest request, PermissionLevel permissionLevel)
{
var channel = request.OriginalMessage.Channel;
if (!(channel is IGuildChannel serverChannel))
return;
if (request.Parameters.Length == 0)
{
await request.OriginalMessage.Channel.SendMessageAsync(
$"You did not give a valid role ID. Use ``!roles`` to list all current server roles, along with their ids");
return;
}
if (!ulong.TryParse(request.Parameters[0].AsString(), out var roleId))
{
await request.OriginalMessage.Channel.SendMessageAsync(
$"You did not give a valid role ID. Use ``!roles`` to list all current server roles, along with their ids");
return;
}
var role = serverChannel.Guild.GetRole(roleId);
if (role == null)
{
await request.OriginalMessage.Channel.SendMessageAsync("No role with that id exists on this server");
return;
}
try
{
await DatabaseRolePermissions.SetRolePermission(serverChannel.GuildId, roleId, permissionLevel);
PermissionValidator.UpdateCache(serverChannel.GuildId, roleId, permissionLevel);
}
catch(Exception e)
{
await Logger.LogError(e.Message);
}
}
}
}

12
DeukBot4/MessageHandlers/MainHandler.cs
View File

@@ -1,4 +1,5 @@
using System.Threading.Tasks;
using System;
using System.Threading.Tasks;
using Discord.WebSocket;
namespace DeukBot4.MessageHandlers
@@ -7,7 +8,14 @@ namespace DeukBot4.MessageHandlers
{
public static async Task HandleMessage(SocketMessage message)
{
await CommandHandler.CommandHandler.HandleMessage(message);
try
{
await CommandHandler.CommandHandler.HandleMessage(message);
}
catch (Exception e)
{
await Logger.LogError(e.ToString());
}
}
}
}

3
DeukBot4/MessageHandlers/Permissions/PermissionLevels.cs
View File

@@ -8,6 +8,7 @@
Helper = 20,
Moderator = 40,
Admin = 60,
Owner = 100
ServerOwner = 80,
BotCreator = 100
}
}

95
DeukBot4/MessageHandlers/Permissions/PermissionValidator.cs
View File

@@ -1,27 +1,104 @@
using DeukBot4.MessageHandlers.CommandHandler.RequestStructure;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using DeukBot4.Database;
using DeukBot4.MessageHandlers.CommandHandler.RequestStructure;
using Discord;
using Discord.WebSocket;
namespace DeukBot4.MessageHandlers.Permissions
{
public static class PermissionValidator
{
public static PermissionLevel GetUserPermissionLevel(SocketMessage message)
private static readonly ConcurrentDictionary<ulong, ConcurrentDictionary<ulong, PermissionLevel>> PermissionCache =
new ConcurrentDictionary<ulong, ConcurrentDictionary<ulong, PermissionLevel>>();
private static async Task<PermissionLevel> GetDatabasePermissionLevelForRole(ulong serverId, ulong roleId)
{
if (PermissionCache.TryGetValue(serverId, out var serverPermissions))
{
if (serverPermissions.TryGetValue(roleId, out var permissions))
{
return permissions;
}
}
else
{
PermissionCache.TryAdd(serverId, new ConcurrentDictionary<ulong, PermissionLevel>());
}
serverPermissions = PermissionCache[serverId];
try
{
var permission = await DatabaseRolePermissions.GetRolePermission(serverId, roleId);
serverPermissions.TryAdd(serverId, permission);
return permission;
}
catch(Exception e)
{
await Logger.LogError(e.ToString());
return PermissionLevel.Everyone;
}
}
public static void UpdateCache(ulong serverId, ulong roleId, PermissionLevel level)
{
if (PermissionCache.TryGetValue(serverId, out var serverPermissions))
{
if (serverPermissions.ContainsKey(roleId))
{
serverPermissions[roleId] = level;
}
else
{
serverPermissions.TryAdd(roleId, level);
}
}
}
private static async Task<PermissionLevel> GetDatabasePermissionLevel(ulong serverId, ulong[] roles)
{
var highestRole = (PermissionLevel)sbyte.MinValue;
foreach (var role in roles)
{
var perms = await GetDatabasePermissionLevelForRole(serverId, role);
if (perms > highestRole)
{
highestRole = perms;
}
}
if (highestRole == (PermissionLevel) sbyte.MinValue)
{
return PermissionLevel.Everyone;
}
return highestRole;
}
public static async Task<PermissionLevel> GetUserPermissionLevel(SocketMessage message)
{
if (message.Author.Id == Program.Settings.OwnerId)
{
return PermissionLevel.Owner;
return PermissionLevel.BotCreator;
}
if (message.Author.IsBot)
{
return PermissionLevel.Bot;
}
return PermissionLevel.Everyone;
}
if (!(message.Channel is IGuildChannel serverChannel))
return PermissionLevel.Everyone;
public static bool CanUse(this CommandRequest req)
{
var level = GetUserPermissionLevel(req.OriginalMessage);
return level >= req.Command.Permission;
if (serverChannel.Guild.OwnerId == message.Author.Id)
return PermissionLevel.ServerOwner;
if (!(message.Author is IGuildUser user))
return PermissionLevel.Everyone;
var perms = await GetDatabasePermissionLevel(serverChannel.GuildId, user.RoleIds.ToArray());
return perms;
}
}
}