Deukhoofd
/
DeukBot4
mirror of https://gitlab.com/Deukhoofd/DeukBot4.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Made reserved tags check permissions, fixed ulong to/from string differences breaking tags

This commit is contained in:
Deukhoofd 2018-08-25 17:28:09 +02:00
parent d2d6b7824f
commit b849c1b734
No known key found for this signature in database
GPG Key ID: B4C087AC81641654
2 changed files with 44 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
DeukBot4/Database/ReminderHandler.cs
View File

@ -8,7 +8,7 @@ namespace DeukBot4.Database
public class ReminderHandler public class ReminderHandler
{ {
public static ReminderHandler Main = new ReminderHandler(); public static ReminderHandler Main = new ReminderHandler();
public static ConnectionMultiplexer Redis = ConnectionMultiplexer.Connect("127.0.0.1"); public static ConnectionMultiplexer Redis = ConnectionMultiplexer.Connect("localhost:6379");
public async Task AddReminder(TimeSpan time, string message, ulong channel, ulong author, ulong recipient) public async Task AddReminder(TimeSpan time, string message, ulong channel, ulong author, ulong recipient)
@ -21,10 +21,10 @@ namespace DeukBot4.Database
db.SortedSetAddAsync("deukbot_reminders", (RedisValue)id, expectedTime.ToBinary()); db.SortedSetAddAsync("deukbot_reminders", (RedisValue)id, expectedTime.ToBinary());
db.HashSetAsync((RedisKey) id, new[] db.HashSetAsync((RedisKey) id, new[]
{ {
new HashEntry("channel", channel.ToString()), new HashEntry("channel", channel.ToString("D")),
new HashEntry("message", message), new HashEntry("message", message),
new HashEntry("author", author.ToString()), new HashEntry("author", author.ToString("D")),
new HashEntry("recipient", recipient.ToString()), new HashEntry("recipient", recipient.ToString("D")),
}); });
} }
catch (Exception e) catch (Exception e)
@ -36,34 +36,42 @@ namespace DeukBot4.Database
public async Task CheckReminders() public async Task CheckReminders()
{ {
var checkTime = TimeSpan.FromSeconds(70); var checkTime = TimeSpan.FromSeconds(70);
var startTime = DateTime.UtcNow; try
var desiredTopScore = (startTime + checkTime).ToBinary();
var db = Redis.GetDatabase();
var reminders = db.SortedSetRangeByScoreWithScores("deukbot_reminders", stop: desiredTopScore);
foreach (var sortedSetEntry in reminders)
{ {
var val = sortedSetEntry.Element.ToString(); var startTime = DateTime.UtcNow;
var timeLong = sortedSetEntry.Score; var desiredTopScore = (startTime + checkTime).ToBinary();
var time = DateTime.FromBinary((long) timeLong); var db = Redis.GetDatabase();
var data = db.HashGetAll(val); var reminders = db.SortedSetRangeByScoreWithScores("deukbot_reminders", start: Double.MinValue,
ulong channel = 0; stop: desiredTopScore);
ulong author = 0; foreach (var sortedSetEntry in reminders)
ulong recipient = 0;
string message = null;
foreach (var hashEntry in data)
{ {
if (hashEntry.Name == "channel") channel = ulong.Parse(hashEntry.Value); var val = sortedSetEntry.Element.ToString();
else if (hashEntry.Name == "message") message = hashEntry.Value; var timeLong = sortedSetEntry.Score;
else if (hashEntry.Name == "author") author = ulong.Parse(hashEntry.Value); var time = DateTime.FromBinary((long) timeLong);
else if (hashEntry.Name == "recipient") recipient = ulong.Parse(hashEntry.Value); var data = db.HashGetAll(val);
ulong channel = 0;
ulong author = 0;
ulong recipient = 0;
string message = null;
foreach (var hashEntry in data)
{
if (hashEntry.Name == "channel") channel = ulong.Parse(hashEntry.Value);
else if (hashEntry.Name == "message") message = hashEntry.Value;
else if (hashEntry.Name == "author") author = ulong.Parse(hashEntry.Value);
else if (hashEntry.Name == "recipient") recipient = ulong.Parse(hashEntry.Value);
}
var diff = time - DateTime.UtcNow;
FireReminderAtTime((int) diff.TotalSeconds, channel, message, author, recipient);
db.KeyDelete(val);
} }
var diff = time - DateTime.UtcNow;
FireReminderAtTime((int) diff.TotalSeconds, channel, message, author, recipient); db.SortedSetRemoveRangeByScoreAsync("deukbot_reminders", Double.MinValue, desiredTopScore);
db.KeyDelete(val); }
catch (Exception e)
{
Logger.Main.LogError(e);
} }
db.SortedSetRemoveRangeByScoreAsync("deukbot_reminders", Double.MinValue, desiredTopScore);
await Task.Delay(checkTime); await Task.Delay(checkTime);
await CheckReminders(); await CheckReminders();
} }

8
DeukBot4/MessageHandlers/CommandHandler/TagStorage.cs
View File

@ -4,6 +4,7 @@ using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using DeukBot4.Database; using DeukBot4.Database;
using DeukBot4.MessageHandlers.CommandHandler.RequestStructure; using DeukBot4.MessageHandlers.CommandHandler.RequestStructure;
using DeukBot4.MessageHandlers.Permissions;
using DeukBot4.Utilities; using DeukBot4.Utilities;
using Discord; using Discord;
using Npgsql; using Npgsql;
@ -199,6 +200,9 @@ namespace DeukBot4.MessageHandlers.CommandHandler
var first = split[0].ToLowerInvariant(); var first = split[0].ToLowerInvariant();
if (first == "create") if (first == "create")
{ {
var perms = await PermissionValidator.GetUserPermissionLevel(cmd.OriginalMessage);
if (perms < PermissionLevel.Helper)
return;
var keyword = split[1]; var keyword = split[1];
var rest = split.Skip(2).ToArray().Join(" "); var rest = split.Skip(2).ToArray().Join(" ");
var result = serverTags.AddTag(keyword, rest); var result = serverTags.AddTag(keyword, rest);
@ -214,6 +218,10 @@ namespace DeukBot4.MessageHandlers.CommandHandler
} }
if (first == "remove" || first == "delete") if (first == "remove" || first == "delete")
{ {
var perms = await PermissionValidator.GetUserPermissionLevel(cmd.OriginalMessage);
if (perms < PermissionLevel.Helper)
return;
var keyword = split[1]; var keyword = split[1];
var result = serverTags.RemoveTag(keyword); var result = serverTags.RemoveTag(keyword);
if (!result.success) if (!result.success)