From a54880c71f500979a5c9f90f902a9e518339720c Mon Sep 17 00:00:00 2001
From: Toastie <toastie@toastiet0ast.com>
Date: Sun, 2 Mar 2025 22:01:05 +1300
Subject: [PATCH] small insignificant internal changes
---
src/EllieBot/_common/Services/CommandHandler.cs | 17 -----------------
.../_common/Services/ICommandHandler.cs | 1 -
2 files changed, 18 deletions(-)
diff --git a/src/EllieBot/_common/Services/CommandHandler.cs b/src/EllieBot/_common/Services/CommandHandler.cs
index 18db670..8f845c5 100644
--- a/src/EllieBot/_common/Services/CommandHandler.cs
+++ b/src/EllieBot/_common/Services/CommandHandler.cs
@@ -15,15 +15,9 @@ public class CommandHandler : IEService, ICommandHandler
public event Func<IUserMessage, CommandInfo, Task> CommandExecuted = delegate { return Task.CompletedTask; };
public event Func<CommandInfo, ITextChannel, string, Task> CommandErrored = delegate { return Task.CompletedTask; };
- //userid/msg count
- public ConcurrentDictionary<ulong, uint> UserMessagesSent { get; } = new();
-
- public ConcurrentHashSet<ulong> UsersOnShortCooldown { get; } = new();
-
private readonly DiscordSocketClient _client;
private readonly CommandService _commandService;
private readonly BotConfigService _bcs;
- private readonly IBot _bot;
private readonly IBehaviorHandler _behaviorHandler;
private readonly IServiceProvider _services;
private readonly ShardData _shardData;
@@ -39,7 +33,6 @@ public class CommandHandler : IEService, ICommandHandler
DbService db,
CommandService commandService,
BotConfigService bcs,
- IBot bot,
IBehaviorHandler behaviorHandler,
IServiceProvider services,
ShardData shardData)
@@ -48,7 +41,6 @@ public class CommandHandler : IEService, ICommandHandler
_commandService = commandService;
_bc = bcs.Data;
_bcs = bcs;
- _bot = bot;
_behaviorHandler = behaviorHandler;
_db = db;
_services = services;
@@ -224,11 +216,6 @@ public class CommandHandler : IEService, ICommandHandler
{
try
{
-#if !GLOBAL_NADEKO
- // track how many messages each user is sending
- UserMessagesSent.AddOrUpdate(usrMsg.Author.Id, 1, (_, old) => ++old);
-#endif
-
var channel = msg.Channel;
var guild = (msg.Channel as SocketTextChannel)?.Guild;
@@ -403,10 +390,6 @@ public class CommandHandler : IEService, ICommandHandler
var cmd = successfulParses[0].Key.Command;
- // Bot will ignore commands which are ran more often than what specified by
- // GlobalCommandsCooldown constant (miliseconds)
- if (!UsersOnShortCooldown.Add(context.Message.Author.Id))
- return (false, null, cmd);
//return SearchResult.FromError(CommandError.Exception, "You are on a global cooldown.");
var blocked = await _behaviorHandler.RunPreCommandAsync(context, cmd);
diff --git a/src/EllieBot/_common/Services/ICommandHandler.cs b/src/EllieBot/_common/Services/ICommandHandler.cs
index f838743..fdb3bf9 100644
--- a/src/EllieBot/_common/Services/ICommandHandler.cs
+++ b/src/EllieBot/_common/Services/ICommandHandler.cs
@@ -6,7 +6,6 @@ public interface ICommandHandler
string GetPrefix(ulong? id = null);
string SetDefaultPrefix(string toSet);
string SetPrefix(IGuild ctxGuild, string toSet);
- ConcurrentDictionary<ulong, uint> UserMessagesSent { get; }
Task TryRunCommand(SocketGuild guild, ISocketMessageChannel channel, IUserMessage usrMsg);
}
\ No newline at end of file