Updated common files

src/EllieBot/_common/AddRemove.cs

@@ -1,4 +1,4 @@
-#nullable disable
+#nullable disable
 namespace EllieBot.Common;
 
 public enum AddRemove

src/EllieBot/_common/Attributes/CmdAttribute.cs

@@ -1,4 +1,4 @@
-using System.Runtime.CompilerServices;
+using System.Runtime.CompilerServices;
 
 namespace EllieBot.Common.Attributes;
 

src/EllieBot/_common/Attributes/DIIgnoreAttribute.cs

@@ -7,5 +7,5 @@ namespace EllieBot.Common;
 [AttributeUsage(AttributeTargets.Class)]
 public class DIIgnoreAttribute : Attribute
 {
-
+    
 }

src/EllieBot/_common/Attributes/EllieOptionsAttribute.cs

@@ -1,4 +1,4 @@
-namespace EllieBot.Common.Attributes;
+namespace EllieBot.Common.Attributes;
 
 [AttributeUsage(AttributeTargets.Method)]
 public sealed class EllieOptionsAttribute<TOption> : Attribute

src/EllieBot/_common/Attributes/OnlyPublicBotAttribute.cs

@@ -1,4 +1,4 @@
-#nullable disable
+#nullable disable
 using System.Diagnostics.CodeAnalysis;
 
 namespace EllieBot.Common;

src/EllieBot/_common/Attributes/OwnerOnlyAttribute.cs

@@ -1,4 +1,4 @@
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace EllieBot.Common.Attributes;
 
@@ -16,4 +16,4 @@ public sealed class OwnerOnlyAttribute : PreconditionAttribute
             ? PreconditionResult.FromSuccess()
             : PreconditionResult.FromError("Not owner"));
     }
-}
+}

src/EllieBot/_common/Attributes/RatelimitAttribute.cs

@@ -1,4 +1,4 @@
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace EllieBot.Common.Attributes;
 

src/EllieBot/_common/Attributes/UserPermAttribute.cs

@@ -1,4 +1,4 @@
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Discord;
 

src/EllieBot/_common/CommandNameLoadHelper.cs

@@ -1,4 +1,4 @@
-using EllieBot.Common.Yml;
+using EllieBot.Common.Yml;
 using YamlDotNet.Serialization;
 
 namespace EllieBot.Common.Attributes;

src/EllieBot/_common/Configs/BotConfig.cs

@@ -44,13 +44,13 @@ public sealed partial class BotConfig : ICloneable<BotConfig>
             or all owners? (this might cause the bot to lag if there's a lot of owners specified)
             """)]
     public bool ForwardToAllOwners { get; set; }
-
+    
     [Comment("""
         Any messages sent by users in Bot's DM to be forwarded to the specified channel.
         This option will only work when ForwardToAllOwners is set to false
         """)]
     public ulong? ForwardToChannel { get; set; }
-
+    
     [Comment("""
              Should the bot ignore messages from other bots?
              Settings this to false might get your bot banned if it gets into a spam loop with another bot.
@@ -155,11 +155,11 @@ public sealed partial class BotConfig : ICloneable<BotConfig>
         ];
     }
 
-    //         [Comment(@"Whether the prefix will be a suffix, or prefix.
-    // For example, if your prefix is ! you will run a command called 'cash' by typing either
-    // '!cash @Someone' if your prefixIsSuffix: false or
-    // 'cash @Someone!' if your prefixIsSuffix: true")]
-    //         public bool PrefixIsSuffix { get; set; }
+//         [Comment(@"Whether the prefix will be a suffix, or prefix.
+// For example, if your prefix is ! you will run a command called 'cash' by typing either
+// '!cash @Someone' if your prefixIsSuffix: false or
+// 'cash @Someone!' if your prefixIsSuffix: true")]
+//         public bool PrefixIsSuffix { get; set; }
 
     // public string Prefixed(string text) => PrefixIsSuffix
     //     ? text + Prefix

src/EllieBot/_common/Configs/IConfigSeria.cs

@@ -1,4 +1,4 @@
-namespace EllieBot.Common.Configs;
+namespace EllieBot.Common.Configs;
 
 /// <summary>
 ///     Base interface for available config serializers

src/EllieBot/_common/Creds.cs

@@ -1,7 +1,7 @@
-#nullable disable
+#nullable disable
 using EllieBot.Common.Yml;
 
-namespace Ellie.Common;
+namespace EllieBot.Common;
 
 public sealed class Creds : IBotCredentials
 {
@@ -16,7 +16,7 @@ public sealed class Creds : IBotCredentials
         **DO NOT ADD PEOPLE YOU DON'T TRUST**
         """)]
     public ICollection<ulong> OwnerIds { get; set; }
-
+    
     [Comment("Keep this on 'true' unless you're sure your bot shouldn't use privileged intents or you're waiting to be accepted")]
     public bool UsePrivilegedIntents { get; set; }
 
@@ -29,15 +29,24 @@ public sealed class Creds : IBotCredentials
         """)]
     public int TotalShards { get; set; }
 
-    [Comment(
+    [Comment("""
+             Pledge 5$ or more on https://patreon.com/elliebot and connect your discord account to Patreon.
+             Go to https://dashy.elliebot.net and login with your discord account
+             Go to the Keys page and click "Generate New Key" and copy it here
+             You and anyone else with the permission to run `.prompt` command will be able to use natural language to run bot's commands.
+             For example '@Bot how's the weather in Paris' will return the current weather in Paris as if you were to run `.weather Paris` command
+             """)]
+    public string EllieAiToken { get; set; }
+    
+    [Comment(   
         """
             Login to https://console.cloud.google.com, create a new project, go to APIs & Services -> Library -> YouTube Data API and enable it.
             Then, go to APIs and Services -> Credentials and click Create credentials -> API key.
             Used only for Youtube Data Api (at the moment).
             """)]
     public string GoogleApiKey { get; set; }
-
-    [Comment(
+    
+    [Comment(   
         """
             Create a new custom search here https://programmablesearchengine.google.com/cse/create/new
             Enable SafeSearch
@@ -64,16 +73,16 @@ public sealed class Creds : IBotCredentials
     [Comment("""Official cleverbot api key.""")]
     public string CleverbotApiKey { get; set; }
 
-    [Comment(@"Official GPT-3 api key.")]
+    [Comment(@"OpenAi api key.")]
     public string Gpt3ApiKey { get; set; }
-
+    
     [Comment("""
         Which cache implementation should bot use.
         'memory' - Cache will be in memory of the bot's process itself. Only use this on bots with a single shard. When the bot is restarted the cache is reset. 
         'redis' - Uses redis (which needs to be separately downloaded and installed). The cache will persist through bot restarts. You can configure connection string in creds.yml
         """)]
     public BotCacheImplemenation BotCache { get; set; }
-
+    
     [Comment("""
         Redis connection string. Don't change if you don't know what you're doing.
         Only used if botCache is set to 'redis'
@@ -110,10 +119,10 @@ public sealed class Creds : IBotCredentials
         Used for cryptocurrency related commands.
         """)]
     public string CoinmarketcapApiKey { get; set; }
-
-    //     [Comment(@"https://polygon.io/dashboard/api-keys api key. Free plan allows for 5 queries per minute.
-    // Used for stocks related commands.")]
-    //     public string PolygonIoApiKey { get; set; }
+    
+//     [Comment(@"https://polygon.io/dashboard/api-keys api key. Free plan allows for 5 queries per minute.
+// Used for stocks related commands.")]
+//     public string PolygonIoApiKey { get; set; }
 
     [Comment("""Api key used for Osu related commands. Obtain this key at https://osu.ppy.sh/p/api""")]
     public string OsuApiKey { get; set; }
@@ -171,7 +180,7 @@ public sealed class Creds : IBotCredentials
         RestartCommand = new RestartConfig();
         Google = new GoogleApiConfig();
     }
-
+    
     public class DbOptions
         : IDbOptions
     {
@@ -270,3 +279,6 @@ public class GoogleApiConfig : IGoogleApiConfig
     public string SearchId { get; init; }
     public string ImageSearchId { get; init; }
 }
+
+
+

src/EllieBot/_common/DoAsUserMessage.cs

@@ -1,4 +1,4 @@
-using MessageType = Discord.MessageType;
+using MessageType = Discord.MessageType;
 
 namespace EllieBot.Modules.Administration;
 

src/EllieBot/_common/DownloadTracker.cs

@@ -1,4 +1,4 @@
-#nullable disable
+#nullable disable
 namespace EllieBot.Common;
 
 public class DownloadTracker : IEService

src/EllieBot/_common/EllieModule.cs

@@ -91,7 +91,7 @@ public abstract class EllieModule : ModuleBase
 
                 if (validate is not null && !validate(arg.Content))
                     return Task.CompletedTask;
-
+                
                 if (userInputTask.TrySetResult(arg.Content))
                     userMsg.DeleteAfter(1);
 

src/EllieBot/_common/ILogCommandService.cs

@@ -28,7 +28,7 @@ public enum LogType
     VoicePresence,
     UserMuted,
     UserWarned,
-
+    
     ThreadDeleted,
     ThreadCreated
 }

src/EllieBot/_common/IPermissionChecker.cs

@@ -17,14 +17,14 @@ public partial class PermCheckResult
 {
     public bool IsAllowed
         => IsT0;
-
-    public bool IsCooldown
+    
+    public bool IsCooldown 
         => IsT1;
-
-    public bool IsGlobalBlock
+    
+    public bool IsGlobalBlock 
         => IsT2;
-
-    public bool IsDisallowed
+    
+    public bool IsDisallowed 
         => IsT3;
 }
 

src/EllieBot/_common/IPlaceholderProvider.cs

@@ -1,4 +1,4 @@
-#nullable disable
+#nullable disable
 namespace EllieBot.Common;
 
 public interface IPlaceholderProvider

src/EllieBot/_common/ImageUrls.cs

@@ -5,7 +5,7 @@ using Cloneable;
 namespace EllieBot.Common;
 
 [Cloneable]
-public partial class ImageUrls : ICloneable<ImageUrls>
+public partial class ImageUrls : ICloneable<ImageUrls> 
 {
     [Comment("DO NOT CHANGE")]
     public int Version { get; set; } = 3;

src/EllieBot/_common/Interaction/EllieInteraction.cs

@@ -1,4 +1,4 @@
-namespace EllieBot;
+namespace EllieBot;
 
 public abstract class EllieInteractionBase
 {
@@ -85,6 +85,9 @@ public abstract class EllieInteractionBase
 
     public Task ExecuteOnActionAsync(SocketMessageComponent smc)
         => _onAction(smc);
+
+    public void SetCompleted()
+        => _interactionCompletedSource.TrySetResult(true);
 }
 
 public sealed class EllieModalSubmitHandler

src/EllieBot/_common/Interaction/IEllieInteractionService.cs

@@ -20,9 +20,9 @@ public interface IEllieInteractionService
         SelectMenuBuilder menu,
         Func<SocketMessageComponent, Task> onTrigger,
         bool singleUse = true);
-
+    
     EllieInteractionBase Create(
-        ulong userId,
+        ulong userId, 
         ButtonBuilder button,
         ModalBuilder modal,
         Func<SocketModal, Task> onTrigger,

src/EllieBot/_common/Interaction/Models/EllieButtonInteraction.cs

@@ -1,4 +1,4 @@
-namespace EllieBot;
+namespace EllieBot;
 
 public sealed class EllieButtonInteractionHandler : EllieInteractionBase
 {
@@ -16,6 +16,6 @@ public sealed class EllieButtonInteractionHandler : EllieInteractionBase
 
     public ButtonBuilder Button { get; }
 
-    public override void AddTo(ComponentBuilder cb) 
+    public override void AddTo(ComponentBuilder cb)
         => cb.WithButton(Button);
 }

src/EllieBot/_common/JsonConverters/CultureInfoConverter.cs

@@ -7,8 +7,8 @@ namespace EllieBot.Common.JsonConverters;
 public class CultureInfoConverter : JsonConverter<CultureInfo>
 {
     public override CultureInfo Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        => new(reader.GetString() ?? "en_US");
+        => new(reader.GetString() ?? "en-US");
 
-    public override void Write(Utf8JsonWriter writer, CultureInfo value, JsonSerializerOptions options) 
+    public override void Write(Utf8JsonWriter writer, CultureInfo value, JsonSerializerOptions options)
         => writer.WriteStringValue(value.Name);
 }

src/EllieBot/_common/JsonConverters/NumberToStringConverter.cs

@@ -0,0 +1,30 @@
+using System.Globalization;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+public class NumberToStringConverter : JsonConverter<object>
+{
+    public override bool CanConvert(Type typeToConvert)
+        => typeof(string) == typeToConvert;
+
+    public override object Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        switch (reader.TokenType)
+        {
+            case JsonTokenType.Number:
+                return reader.TryGetInt64(out var l)
+                    ? l.ToString()
+                    : reader.GetDouble().ToString(CultureInfo.InvariantCulture);
+            case JsonTokenType.String:
+                return reader.GetString() ?? string.Empty;
+            default:
+                {
+                    using var document = JsonDocument.ParseValue(ref reader);
+                    return document.RootElement.Clone().ToString();
+                }
+        }
+    }
+    
+    public override void Write(Utf8JsonWriter writer, object value, JsonSerializerOptions options)
+        => writer.WriteStringValue(value.ToString());
+}

src/EllieBot/_common/JsonConverters/Rgba32Converter.cs

@@ -1,4 +1,4 @@
-using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.PixelFormats;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 

src/EllieBot/_common/Linq2DbExpressions.cs

@@ -9,7 +9,7 @@ public static class Linq2DbExpressions
     [ExpressionMethod(nameof(GuildOnShardExpression))]
     public static bool GuildOnShard(ulong guildId, int totalShards, int shardId)
         => throw new NotSupportedException();
-
+    
     private static Expression<Func<ulong, int, int, bool>> GuildOnShardExpression()
         => (guildId, totalShards, shardId)
             => guildId / 4194304 % (ulong)totalShards == (ulong)shardId;

src/EllieBot/_common/ModuleBehaviors/IExecNoCommand.cs

@@ -1,4 +1,4 @@
-namespace EllieBot.Common.ModuleBehaviors;
+namespace EllieBot.Common.ModuleBehaviors;
 
 /// <summary>
 ///     Executed if no command was found for this message

src/EllieBot/_common/ModuleBehaviors/IExecOnMessage.cs

@@ -1,4 +1,4 @@
-namespace EllieBot.Common.ModuleBehaviors;
+namespace EllieBot.Common.ModuleBehaviors;
 
 /// <summary>
 ///     Implemented by modules to handle non-bot messages received

src/EllieBot/_common/ModuleBehaviors/IExecPostCommand.cs

@@ -1,4 +1,4 @@
-namespace EllieBot.Common.ModuleBehaviors;
+namespace EllieBot.Common.ModuleBehaviors;
 
 /// <summary>
 /// This interface's method is executed after the command successfully finished execution.

src/EllieBot/_common/ModuleBehaviors/IExecPreCommand.cs

@@ -1,4 +1,4 @@
-namespace EllieBot.Common.ModuleBehaviors;
+namespace EllieBot.Common.ModuleBehaviors;
 
 /// <summary>
 /// This interface's method is executed after a command was found but before it was executed.

src/EllieBot/_common/ModuleBehaviors/IInputTransformer.cs

@@ -1,4 +1,4 @@
-namespace EllieBot.Common.ModuleBehaviors;
+namespace EllieBot.Common.ModuleBehaviors;
 
 /// <summary>
 /// Implemented by services which may transform input before a command is searched for

src/EllieBot/_common/ModuleBehaviors/IReadyExecutor.cs

@@ -1,4 +1,4 @@
-namespace EllieBot.Common.ModuleBehaviors;
+namespace EllieBot.Common.ModuleBehaviors;
 
 /// <summary>
 ///     All services which need to execute something after

src/EllieBot/_common/NinjectIKernelExtensions.cs

@@ -1,4 +1,4 @@
-using DryIoc;
+using DryIoc;
 
 namespace EllieBot.Extensions;
 
@@ -11,7 +11,7 @@ public static class DryIocExtensions
 
         return container;
     }
-
+    
     public static IContainer AddSingleton<TSvc, TImpl>(this IContainer container, TImpl obj)
         where TImpl : TSvc
     {
@@ -41,7 +41,7 @@ public static class DryIocExtensions
 
         return container;
     }
-
+    
     public static IContainer AddSingleton<TImpl>(this IContainer container, Func<IResolverContext, TImpl> factory)
     {
         container.RegisterDelegate(factory);

src/EllieBot/_common/Patronage/FeatureLimitKey.cs

@@ -1,5 +1,12 @@
 namespace EllieBot.Modules.Patronage;
 
+public enum LimitedFeatureName
+{
+    ChatBot,
+    ReactionRole,
+    Prune,
+    
+}
 public readonly struct FeatureLimitKey
 {
     public string PrettyName { get; init; }

src/EllieBot/_common/Patronage/FeatureQuotaStats.cs

@@ -1,8 +0,0 @@
-namespace EllieBot.Modules.Patronage;
-
-public readonly struct FeatureQuotaStats
-{
-    public (uint Cur, uint Max) Hourly { get; init; }
-    public (uint Cur, uint Max) Daily { get; init; }
-    public (uint Cur, uint Max) Monthly { get; init; }
-}

src/EllieBot/_common/Patronage/IPatronageService.cs

@@ -31,26 +31,15 @@ public interface IPatronageService
     /// </summary>
     /// <param name="userId">UserId for which to get the patron data for.</param>
     /// <returns>A patron with the specifeid userId</returns>
-    public Task<Patron> GetPatronAsync(ulong userId);
+    public Task<Patron?> GetPatronAsync(ulong userId);
     
-    /// <summary>
-    /// Gets the quota statistic for the user/patron specified by the userId
-    /// </summary>
-    /// <param name="userId">UserId of the user for which to get the quota statistic for</param>
-    /// <returns>Quota stats for the specified user</returns>
-    Task<UserQuotaStats> GetUserQuotaStatistic(ulong userId);
-
+    Task<bool> LimitHitAsync(LimitedFeatureName key, ulong userId, int amount = 1);
+    Task<bool> LimitForceHit(LimitedFeatureName key, ulong userId, int amount);
+    Task<QuotaLimit> GetUserLimit(LimitedFeatureName name, ulong userId);
     
-    Task<FeatureLimit> TryGetFeatureLimitAsync(FeatureLimitKey key, ulong userId, int? defaultValue);
-
-    ValueTask<OneOf<(uint Hourly, uint Daily, uint Monthly), QuotaLimit>> TryIncrementQuotaCounterAsync(
-        ulong userId,
-        bool isSelf,
-        FeatureType featureType,
-        string featureName,
-        uint? maybeHourly,
-        uint? maybeDaily,
-        uint? maybeMonthly);
+    Task<Dictionary<LimitedFeatureName, (int, QuotaLimit)>> LimitStats(ulong userId);
 
     PatronConfigData GetConfig();
+    int PercentBonus(Patron? user);
+    int PercentBonus(long amount);
 }

src/EllieBot/_common/Patronage/Patron.cs

@@ -13,7 +13,7 @@ public readonly struct Patron
     public ulong UserId { get; init; }
 
     /// <summary>
-    /// Amount the Patron is currently pledging or paid
+    /// Amount the Patron is currently pledging or paid in cents
     /// </summary>
     public int Amount { get; init; }
 

src/EllieBot/_common/Patronage/PatronConfigData.cs

@@ -7,31 +7,11 @@ namespace EllieBot.Modules.Patronage;
 public partial class PatronConfigData : ICloneable<PatronConfigData>
 {
     [Comment("DO NOT CHANGE")]
-    public int Version { get; set; } = 2;
-    
+    public int Version { get; set; } = 3;
+
     [Comment("Whether the patronage feature is enabled")]
     public bool IsEnabled { get; set; }
 
-    [Comment("List of patron only features and relevant quota data")]
-    public FeatureQuotas Quotas { get; set; }
-
-    public PatronConfigData()
-    {
-        Quotas = new();
-    }
-
-    public class FeatureQuotas
-    {
-        [Comment("Dictionary of feature names with their respective limits. Set to null for unlimited")]
-        public Dictionary<string, Dictionary<PatronTier, int?>> Features { get; set; } = new();
-        
-        [Comment("Dictionary of commands with their respective quota data")]
-        public Dictionary<string, Dictionary<PatronTier, Dictionary<QuotaPer, uint>?>> Commands { get; set; } = new();
-
-        [Comment("Dictionary of groups with their respective quota data")]
-        public Dictionary<string, Dictionary<PatronTier, Dictionary<QuotaPer, uint>?>> Groups { get; set; } = new();
-
-        [Comment("Dictionary of modules with their respective quota data")]
-        public Dictionary<string, Dictionary<PatronTier, Dictionary<QuotaPer, uint>?>> Modules { get; set; } = new();
-    }
+    [Comment("Who can do how much of what")]
+    public Dictionary<int, Dictionary<LimitedFeatureName, QuotaLimit>> Limits { get; set; } = new();
 }

src/EllieBot/_common/Patronage/PatronExtensions.cs

@@ -8,15 +8,6 @@ public static class PatronExtensions
             _ => $"Patron Tier {tier}",
         };
 
-    public static string ToFullName(this QuotaPer per)
-        => per switch
-        {
-            QuotaPer.PerDay => "per day",
-            QuotaPer.PerHour => "per hour",
-            QuotaPer.PerMonth => "per month",
-            _ => "Unknown",
-        };
-
     public static DateTime DayOfNextMonth(this DateTime date, int day)
     {
         var nextMonth = date.AddMonths(1);

src/EllieBot/_common/Patronage/QuotaLimit.cs

@@ -10,57 +10,16 @@ public readonly struct QuotaLimit
     /// <summary>
     /// Amount of usages reached, which is the limit
     /// </summary>
-    public uint Quota { get; init; }
+    public int Quota { get; init; }
     
     /// <summary>
     /// Which period is this quota limit for (hourly, daily, monthly, etc...)
     /// </summary>
     public QuotaPer QuotaPeriod { get; init; }
     
-    /// <summary>
-    /// When does this quota limit reset
-    /// </summary>
-    public DateTime ResetsAt { get; init; }
-    
-    /// <summary>
-    /// Type of the feature this quota limit is for
-    /// </summary>
-    public FeatureType FeatureType { get; init; }
-    
-    /// <summary>
-    /// Name of the feature this quota limit is for
-    /// </summary>
-    public string Feature { get; init; }
-    
-    /// <summary>
-    /// Whether it is the user's own quota (true), or server owners (false)
-    /// </summary>
-    public bool IsOwnQuota { get; init; }
-}
-
-
-/// <summary>
-/// Respresent information about the feature limit
-/// </summary>
-public readonly struct FeatureLimit
-{
-
-    /// <summary>
-    /// Whether this limit comes from the patronage system 
-    /// </summary>
-    public bool IsPatronLimit { get; init; } = false;
-
-    /// <summary>
-    /// Maximum limit allowed
-    /// </summary>
-    public int? Quota { get; init; } = null;
-
-    /// <summary>
-    /// Name of the limit
-    /// </summary>
-    public string Name { get; init; } = string.Empty;
-    
-    public FeatureLimit()
+    public QuotaLimit(int quota, QuotaPer quotaPeriod)
     {
+        Quota = quota;
+        QuotaPeriod = quotaPeriod;
     }
 }

src/EllieBot/_common/Patronage/QuotaPer.cs

@@ -5,4 +5,5 @@ public enum QuotaPer
     PerHour,
     PerDay,
     PerMonth,
+    Total,
 }

src/EllieBot/_common/Patronage/UserQuotaStats.cs

@@ -1,25 +0,0 @@
-namespace EllieBot.Modules.Patronage;
-
-public readonly struct UserQuotaStats
-{
-    private static readonly IReadOnlyDictionary<string, FeatureQuotaStats> _emptyDictionary
-        = new Dictionary<string, FeatureQuotaStats>();
-    public PatronTier Tier { get; init; } 
-        = PatronTier.None;
-
-    public IReadOnlyDictionary<string, FeatureQuotaStats> Features { get; init; }
-        = _emptyDictionary;
-    
-    public IReadOnlyDictionary<string, FeatureQuotaStats> Commands { get; init; }
-        = _emptyDictionary;
-
-    public IReadOnlyDictionary<string, FeatureQuotaStats> Groups { get; init; }
-        = _emptyDictionary;
-
-    public IReadOnlyDictionary<string, FeatureQuotaStats> Modules { get; init; }
-        = _emptyDictionary;
-
-    public UserQuotaStats()
-    {
-    }
-}

src/EllieBot/_common/Pokemon/SearchPokemonAbility.cs

@@ -1,4 +1,4 @@
-#nullable disable
+#nullable disable
 namespace EllieBot.Common.Pokemon;
 
 public class SearchPokemonAbility

src/EllieBot/_common/Replacements/Impl/ReplacementRegistrator.default.cs

@@ -95,7 +95,7 @@ public sealed partial class ReplacementPatternStore
         Register(_rngRegex,
             match =>
             {
-                var rng = new EllieRandom();
+                var rng = new NadekoRandom();
                 if (!int.TryParse(match.Groups["from"].ToString(), out var from))
                     from = 0;
                 if (!int.TryParse(match.Groups["to"].ToString(), out var to))

src/EllieBot/_common/Sender/MessageSenderService.cs

@@ -33,15 +33,15 @@ public sealed class MessageSenderService : IMessageSenderService, IEService
         => new ResponseBuilder(_bs, _bcs, _client)
             .Channel(smc.Channel);
 
-    public EllieEmbedBuilder CreateEmbed()
-        => new EllieEmbedBuilder(_bcs);
+    public NadekoEmbedBuilder CreateEmbed()
+        => new NadekoEmbedBuilder(_bcs);
 }
 
-public class EllieEmbedBuilder : EmbedBuilder
+public class NadekoEmbedBuilder : EmbedBuilder
 {
     private readonly BotConfig _bc;
 
-    public EllieEmbedBuilder(BotConfigService bcs)
+    public NadekoEmbedBuilder(BotConfigService bcs)
     {
         _bc = bcs.Data;
     }

src/EllieBot/_common/Sender/ResponseBuilder.PaginationSender.cs

@@ -11,6 +11,10 @@ public partial class ResponseBuilder
         private readonly ResponseBuilder _builder;
         private readonly DiscordSocketClient _client;
         private int currentPage;
+        
+        private EllieButtonInteractionHandler left;
+        private EllieButtonInteractionHandler right;
+        private EllieInteractionBase? extra;
 
         public PaginationSender(
             SourcedPaginatedResponseBuilder<T> paginationBuilder,
@@ -106,6 +110,8 @@ public partial class ResponseBuilder
 
                 return (leftBtnInter, maybeInter, rightBtnInter);
             }
+            
+            (left, extra, right) = await GetInteractions();
 
             async Task UpdatePageAsync(SocketMessageComponent smc)
             {
@@ -114,21 +120,25 @@ public partial class ResponseBuilder
                 if (_paginationBuilder.AddPaginatedFooter)
                     toSend.AddPaginatedFooter(currentPage, lastPage);
 
-                var (left, extra, right) = (await GetInteractions());
+                left.SetCompleted();
+                right.SetCompleted();
+                extra?.SetCompleted();
+                (left, extra, right) = (await GetInteractions());
 
                 var cb = new ComponentBuilder();
                 left.AddTo(cb);
                 right.AddTo(cb);
                 extra?.AddTo(cb);
-
+                
                 await smc.ModifyOriginalResponseAsync(x =>
                 {
                     x.Embed = toSend.Build();
                     x.Components = cb.Build();
                 });
+                
+                await Task.WhenAll(left.RunAsync(smc.Message), extra?.RunAsync(smc.Message) ?? Task.CompletedTask, right.RunAsync(smc.Message));
             }
 
-            var (left, extra, right) = await GetInteractions();
 
             var cb = new ComponentBuilder();
             left.AddTo(cb);
@@ -144,9 +154,11 @@ public partial class ResponseBuilder
 
             if (lastPage == 0 && _paginationBuilder.InteractionFunc is null)
                 return;
-
+            
             await Task.WhenAll(left.RunAsync(msg), extra?.RunAsync(msg) ?? Task.CompletedTask, right.RunAsync(msg));
 
+            await Task.Delay(30_000);
+            
             await msg.ModifyAsync(mp => mp.Components = new ComponentBuilder().Build());
         }
     }

src/EllieBot/_common/ServiceCollectionExtensions.cs

@@ -1,4 +1,4 @@
-using DryIoc;
+using DryIoc;
 using LinqToDB.Extensions;
 using Microsoft.Extensions.DependencyInjection;
 using EllieBot.Modules.Music;
@@ -33,7 +33,7 @@ public static class ServiceCollectionExtensions
 
     public static IContainer AddConfigServices(this IContainer svcs, Assembly a)
     {
-
+        
         foreach (var type in a.GetTypes()
                            .Where(x => !x.IsAbstract && x.IsAssignableToGenericType(typeof(ConfigServiceBase<>))))
         {
@@ -41,7 +41,7 @@ public static class ServiceCollectionExtensions
                 getServiceTypes: type => type.GetImplementedTypes(ReflectionTools.AsImplementedType.SourceType),
                 getImplFactory: type => ReflectionFactory.Of(type, Reuse.Singleton));
         }
-
+        
         return svcs;
     }
 
@@ -95,7 +95,7 @@ public static class ServiceCollectionExtensions
                  });
 
         var prov = proxySvcs.BuildServiceProvider();
-
+        
         svcs.RegisterDelegate<IHttpClientFactory>(_ => prov.GetRequiredService<IHttpClientFactory>());
         svcs.RegisterDelegate<HttpClient>(_ => prov.GetRequiredService<HttpClient>());
 
@@ -113,7 +113,7 @@ public static class ServiceCollectionExtensions
             typeof(IInputTransformer),
             typeof(IEService)
         ];
-
+        
         foreach (var svc in a.GetTypes()
                            .Where(type => type.IsClass && types.Any(t => type.IsAssignableTo(t)) && !type.HasAttribute<DIIgnoreAttribute>()
 #if GLOBAL_ELLIE

src/EllieBot/_common/Services/CommandHandler.cs

@@ -9,7 +9,7 @@ namespace EllieBot.Services;
 
 public class CommandHandler : IEService, IReadyExecutor, ICommandHandler
 {
-    private const int GLOBAL_COMMANDS_COOLDOWN = 750;
+    private const int GLOBAL_COMMANDS_COOLDOWN = 200;
 
     private const float ONE_THOUSANDTH = 1.0f / 1000;
 
@@ -262,7 +262,7 @@ public class CommandHandler : IEService, IReadyExecutor, ICommandHandler
         var blockTime = Environment.TickCount - startTime;
 
         var messageContent = await _behaviorHandler.RunInputTransformersAsync(guild, usrMsg);
-
+        
         var prefix = GetPrefix(guild?.Id);
         var isPrefixCommand = messageContent.StartsWith(".prefix", StringComparison.InvariantCultureIgnoreCase);
         // execute the command and measure the time it took

src/EllieBot/_common/Services/IBehaviourHandler.cs

@@ -1,4 +1,4 @@
-#nullable disable
+#nullable disable
 namespace EllieBot.Services;
 
 public interface IBehaviorHandler
@@ -7,7 +7,7 @@ public interface IBehaviorHandler
     Task AddRangeAsync(IEnumerable<ICustomBehavior> behavior);
     Task<bool> RemoveAsync(ICustomBehavior behavior);
     Task RemoveRangeAsync(IEnumerable<ICustomBehavior> behs);
-
+    
     Task<bool> RunExecOnMessageAsync(SocketGuild guild, IUserMessage usrMsg);
     Task<string> RunInputTransformersAsync(SocketGuild guild, IUserMessage usrMsg);
     Task<bool> RunPreCommandAsync(ICommandContext context, CommandInfo cmd);

src/EllieBot/_common/Services/ILocalization.cs

@@ -1,4 +1,4 @@
-#nullable disable
+#nullable disable
 using System.Globalization;
 
 namespace EllieBot.Services;

src/EllieBot/_common/Services/ITimezoneService.cs

@@ -1,4 +1,4 @@
-namespace EllieBot.Common;
+namespace EllieBot.Common;
 
 public interface ITimezoneService
 {

src/EllieBot/_common/Services/Impl/YtdlOperation.cs

@@ -53,7 +53,7 @@ public class YtdlOperation
         }
         catch (Win32Exception)
         {
-            Log.Error("youtube-dl is likely not installed. " + "Please install it before running the command again");
+            Log.Error("youtube-dl is likely not installed. Please install it before running the command again");
             return default;
         }
         catch (Exception ex)

src/EllieBot/_common/Settings/BotConfigService.cs

@@ -49,21 +49,21 @@ public sealed class BotConfigService : ConfigServiceBase<BotConfig>
                                      .ToHashSet();
             });
         }
-
+        
         if (data.Version < 4)
             ModifyConfig(c =>
             {
                 c.Version = 4;
                 c.CheckForUpdates = true;
             });
-
-        if (data.Version < 5)
+        
+        if(data.Version < 5)
             ModifyConfig(c =>
             {
                 c.Version = 5;
             });
-
-        if (data.Version < 7)
+        
+        if(data.Version < 7)
             ModifyConfig(c =>
             {
                 c.Version = 7;

src/EllieBot/_common/Settings/ConfigParsers.cs

@@ -1,4 +1,4 @@
-#nullable disable
+#nullable disable
 using SixLabors.ImageSharp.PixelFormats;
 using System.Globalization;
 
@@ -33,7 +33,7 @@ public static class ConfigParsers
     }
 
     public static bool InsensitiveEnum<T>(string input, out T output)
-        where T : struct
+        where T: struct
         => Enum.TryParse(input, true, out output);
 }
 

src/EllieBot/_common/Settings/ConfigServiceBase.cs

@@ -1,9 +1,9 @@
-using EllieBot.Common.Configs;
+using EllieBot.Common.Configs;
 using EllieBot.Common.Yml;
 using System.Linq.Expressions;
 using System.Reflection;
 
-namespace EllieBot.Services;
+namespace NadekoBot.Services;
 
 /// <summary>
 ///     Base service for all settings services

src/EllieBot/_common/Settings/IConfigService.cs

@@ -1,4 +1,4 @@
-#nullable disable
+#nullable disable
 namespace EllieBot.Services;
 
 /// <summary>

src/EllieBot/_common/Settings/SettingParser.cs

@@ -1,4 +1,4 @@
-#nullable disable
+#nullable disable
 namespace EllieBot.Services;
 
 /// <summary>

src/EllieBot/_common/Yml/CommentAttribute.cs

@@ -1,4 +1,4 @@
-#nullable disable
+#nullable disable
 namespace EllieBot.Common.Yml;
 
 [AttributeUsage(AttributeTargets.Property)]

src/EllieBot/_common/Yml/MultilineScalarFlowStyleEmitter.cs

@@ -5,7 +5,6 @@ using YamlDotNet.Serialization.EventEmitters;
 
 namespace EllieBot.Common.Yml;
 
-
 public class MultilineScalarFlowStyleEmitter : ChainedEventEmitter
 {
     public MultilineScalarFlowStyleEmitter(IEventEmitter nextEmitter)

src/EllieBot/_common/_Extensions/CommandContextExtensions.cs

@@ -27,4 +27,14 @@ public static class CommandContextExtensions
 
     public static Task WarningAsync(this ICommandContext ctx)
         => ctx.ReactAsync(MsgType.Pending);
+    
+    
+    public static Task OkAsync(this IUserMessage msg)
+        => msg.AddReactionAsync(_okEmoji);
+    
+    public static Task ErrorAsync(this IUserMessage msg)
+        => msg.AddReactionAsync(_errorEmoji);
+    
+    public static Task WarningAsync(this IUserMessage msg)
+        => msg.AddReactionAsync(_warnEmoji);
 }

src/EllieBot/_common/_Extensions/Extensions.cs

@@ -229,6 +229,7 @@ public static class Extensions
     public static IEnumerable<IRole> GetRoles(this IGuildUser user)
         => user.RoleIds.Select(r => user.Guild.GetRole(r)).Where(r => r is not null);
 
+    // todo remove
     public static void Lap(this Stopwatch sw, string checkpoint)
     {
         Log.Information("Checkpoint {CheckPoint}: {Time}ms", checkpoint, sw.Elapsed.TotalMilliseconds);