5.1.3

I am slowly losing my sanity

CHANGELOG.md

@@ -2,6 +2,23 @@
 
 Mostly based on [keepachangelog](https://keepachangelog.com/en/1.0.0/) except date format. a-c-f-r-o
 
+## [5.1.3] - 08.07.2024
+
+### Added
+
+- Added `'quran` command, which will show the provided ayah in english and arabic, including recitation by Alafasy
+
+### Changed
+
+- Replying to the bot's message in the channel where chatterbot is enabled will also trigger the ai response, as if you pinged the bot. This only works for chatterbot, but not for ellie ai command prompts
+
+### Fixed
+
+- Fixed `'stickeradd` it now properly supports 300x300 image uploads.
+- Bot should now trim the invalid characters from chatterbot usernames to avoid openai errors
+- Fixed prompt triggering chatterbot responses twice
+- Honeypot commands now actually works
+
 ## [5.1.2] - 29.06.2024
 
 ### Fixed

src/Ellie.Marmalade/Attributes/svcAttribute.cs

@@ -1,7 +1,7 @@
 namespace EllieBot.Marmalade;
 
 /// <summary>
-/// Marks the class as a service which can be used within the same Medusa
+/// Marks the class as a service which can be used within the same Marmalade
 /// </summary>
 [AttributeUsage(AttributeTargets.Class)]
 public class svcAttribute : Attribute

src/EllieBot/Bot.cs

@@ -110,7 +110,7 @@ public sealed class Bot : IBot
 
         var svcs = new Container();
 
-        // this is required in order for medusa unloading to work
+        // this is required in order for marmalade unloading to work
         // svcs.Components.Remove<IPlanner, Planner>();
         // svcs.Components.Add<IPlanner, RemovablePlanner>();
 

src/EllieBot/Db/EllieContext.cs

@@ -282,10 +282,10 @@ public abstract class EllieContext : DbContext
         var selfassignableRolesEntity = modelBuilder.Entity<SelfAssignedRole>();
 
         selfassignableRolesEntity.HasIndex(s => new
-                                 {
+        {
-                                     s.GuildId,
+            s.GuildId,
-                                     s.RoleId
+            s.RoleId
-                                 })
+        })
                                  .IsUnique();
 
         selfassignableRolesEntity.Property(x => x.Group).HasDefaultValue(0);
@@ -358,10 +358,10 @@ public abstract class EllieContext : DbContext
 
         var xps = modelBuilder.Entity<UserXpStats>();
         xps.HasIndex(x => new
-           {
+        {
-               x.UserId,
+            x.UserId,
-               x.GuildId
+            x.GuildId
-           })
+        })
            .IsUnique();
 
         xps.HasIndex(x => x.UserId);
@@ -407,9 +407,9 @@ public abstract class EllieContext : DbContext
           .OnDelete(DeleteBehavior.SetNull);
 
         ci.HasIndex(x => new
-          {
+        {
-              x.Name
+            x.Name
-          })
+        })
           .IsUnique();
 
         #endregion
@@ -528,10 +528,10 @@ public abstract class EllieContext : DbContext
                .IsUnique(false);
 
             rr2.HasIndex(x => new
-               {
+            {
-                   x.MessageId,
+                x.MessageId,
-                   x.Emote
+                x.Emote
-               })
+            })
                .IsUnique();
         });
 
@@ -606,11 +606,11 @@ public abstract class EllieContext : DbContext
             {
                 // user can own only one of each item
                 x.HasIndex(model => new
-                 {
+                {
-                     model.UserId,
+                    model.UserId,
-                     model.ItemType,
+                    model.ItemType,
-                     model.ItemKey
+                    model.ItemKey
-                 })
+                })
                  .IsUnique();
             });
 
@@ -635,10 +635,10 @@ public abstract class EllieContext : DbContext
         #region Sticky Roles
 
         modelBuilder.Entity<StickyRole>(sr => sr.HasIndex(x => new
-                                                {
+        {
-                                                    x.GuildId,
+            x.GuildId,
-                                                    x.UserId
+            x.UserId
-                                                })
+        })
                                                 .IsUnique());
 
         #endregion

src/EllieBot/EllieBot.csproj

@@ -4,7 +4,7 @@
         <Nullable>enable</Nullable>
         <ImplicitUsings>true</ImplicitUsings>
         <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
-        <Version>5.1.2</Version>
+        <Version>5.1.3</Version>
 
         <!-- Output/build -->
         <RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>

src/EllieBot/Modules/Administration/Honeypot/HoneyPotService.cs

@@ -5,7 +5,7 @@ using EllieBot.Db.Models;
 using System.Threading.Channels;
 
 namespace EllieBot.Modules.Administration.Honeypot;
-/*
+
 public sealed class HoneyPotService : IHoneyPotService, IReadyExecutor, IExecNoCommand, IEService
 {
     private readonly DbService _db;
@@ -93,4 +93,3 @@ public sealed class HoneyPotService : IHoneyPotService, IReadyExecutor, IExecNoC
         }
     }
 }
-*/

src/EllieBot/Modules/Administration/Honeypot/HoneypotCommands.cs

@@ -1,7 +1,7 @@
 using EllieBot.Modules.Administration.Honeypot;
 
 namespace EllieBot.Modules.Administration;
-/*
+
 public partial class Administration
 {
     [Group]
@@ -27,4 +27,3 @@ public partial class Administration
         }
     }
 }
-*/

src/EllieBot/Modules/Administration/Honeypot/IHoneyPotService.cs

@@ -1,7 +1,6 @@
 namespace EllieBot.Modules.Administration.Honeypot;
-/*
+
 public interface IHoneyPotService
 {
     public Task<bool> ToggleHoneypotChannel(ulong guildId, ulong channelId);
 }
-*/

src/EllieBot/Modules/Administration/ServerLog/DummyLogCommandService.cs

@@ -3,7 +3,7 @@
 namespace EllieBot.Modules.Administration;
 
 public sealed class DummyLogCommandService : ILogCommandService
-#if GLOBAL_NADEKO
+#if GLOBAL_ELLIE
 , IEService
 #endif
 {

src/EllieBot/Modules/Administration/ServerLog/ServerLogCommandService.cs

@@ -8,8 +8,8 @@ using EllieBot.Db.Models;
 namespace EllieBot.Modules.Administration;
 
 public sealed class LogCommandService : ILogCommandService, IReadyExecutor
-#if !GLOBAL_NADEKO
+#if !GLOBAL_ELLIE
-        , IEService // don't load this service on global nadeko
+        , IEService // don't load this service on global ellie
 #endif
 {
     public ConcurrentDictionary<ulong, LogSetting> GuildLogSettings { get; }

src/EllieBot/Modules/Administration/UserPunish/UserPunishService.cs

@@ -228,7 +228,7 @@ public class UserPunishService : IEService, IReadyExecutor
             case PunishmentAction.RemoveRoles:
                 return botUser.GuildPermissions.ManageRoles;
             case PunishmentAction.ChatMute:
-                return botUser.GuildPermissions.ManageRoles; // adds nadeko-mute role
+                return botUser.GuildPermissions.ManageRoles; // adds ellie-mute role
             case PunishmentAction.VoiceMute:
                 return botUser.GuildPermissions.MuteMembers;
             case PunishmentAction.AddRole:

src/EllieBot/Modules/Games/ChatterBot/ChatterbotService.cs

@@ -88,14 +88,16 @@ public class ChatterBotService : IExecOnMessage
 
     public string PrepareMessage(IUserMessage msg)
     {
-        var nadekoId = _client.CurrentUser.Id;
+        var ellieId = _client.CurrentUser.Id;
-        var normalMention = $"<@{nadekoId}> ";
+        var normalMention = $"<@{ellieId}> ";
-        var nickMention = $"<@!{nadekoId}> ";
+        var nickMention = $"<@!{ellieId}> ";
         string message;
         if (msg.Content.StartsWith(normalMention, StringComparison.InvariantCulture))
             message = msg.Content[normalMention.Length..].Trim();
         else if (msg.Content.StartsWith(nickMention, StringComparison.InvariantCulture))
             message = msg.Content[nickMention.Length..].Trim();
+        else if (msg.ReferencedMessage?.Author.Id == ellieId)
+            message = msg.Content;
         else
             return null;
 

src/EllieBot/Modules/Games/ChatterBot/_common/OfficialGptSession.cs

@@ -3,10 +3,12 @@ using Newtonsoft.Json;
 using OneOf.Types;
 using System.Net.Http.Json;
 using SharpToken;
+using System.CodeDom;
+using System.Text.RegularExpressions;
 
 namespace EllieBot.Modules.Games.Common.ChatterBot;
 
-public class OfficialGptSession : IChatterBotSession
+public partial class OfficialGptSession : IChatterBotSession
 {
     private string Uri
         => $"https://api.openai.com/v1/chat/completions";
@@ -16,7 +18,7 @@ public class OfficialGptSession : IChatterBotSession
     private readonly int _maxHistory;
     private readonly int _maxTokens;
     private readonly int _minTokens;
-    private readonly string _nadekoUsername;
+    private readonly string _ellieUsername;
     private readonly GptEncoding _encoding;
     private List<GPTMessage> messages = new();
     private readonly IHttpClientFactory _httpFactory;
@@ -29,7 +31,7 @@ public class OfficialGptSession : IChatterBotSession
         int maxTokens,
         int minTokens,
         string personality,
-        string nadekoUsername,
+        string ellieUsername,
         IHttpClientFactory factory)
     {
         _apiKey = apiKey;
@@ -45,24 +47,31 @@ public class OfficialGptSession : IChatterBotSession
         _maxHistory = chatHistory;
         _maxTokens = maxTokens;
         _minTokens = minTokens;
-        _nadekoUsername = nadekoUsername;
+        _ellieUsername = UsernameCleaner().Replace(ellieUsername, "");
         _encoding = GptEncoding.GetEncodingForModel(_model);
         messages.Add(new()
         {
             Role = "system",
             Content = personality,
-            Name = _nadekoUsername
+            Name = _ellieUsername
         });
     }
 
+
+    [GeneratedRegex("[^a-zA-Z0-9_-]")]
+    private static partial Regex UsernameCleaner();
+    
     public async Task<OneOf.OneOf<ThinkResult, Error<string>>> Think(string input, string username)
     {
+        username = UsernameCleaner().Replace(username, "");
+        
         messages.Add(new()
         {
             Role = "user",
             Content = input,
             Name = username
         });
+        
         while (messages.Count > _maxHistory + 2)
         {
             messages.RemoveAt(1);
@@ -104,7 +113,7 @@ public class OfficialGptSession : IChatterBotSession
         {
             var response = JsonConvert.DeserializeObject<OpenAiCompletionResponse>(dataString);
             
-            Log.Information("Received response: {response}", dataString);
+            Log.Information("Received response: {response} ", dataString);
             var res = response?.Choices?[0];
             var message = res?.Message?.Content;
 
@@ -117,7 +126,7 @@ public class OfficialGptSession : IChatterBotSession
             {
                 Role = "assistant",
                 Content = message,
-                Name = _nadekoUsername
+                Name = _ellieUsername
             });
             
             return new ThinkResult()

src/EllieBot/Modules/Help/Help.cs

@@ -9,8 +9,8 @@ namespace EllieBot.Modules.Help;
 
 public sealed partial class Help : EllieModule<HelpService>
 {
-    public const string PATREON_URL = "https://patreon.com/toastie_t0ast";
+    public const string PATREON_URL = "https://patreon.com/elliebot";
-    public const string PAYPAL_URL = "https://paypal.me/EmotionChild";
+    public const string PAYPAL_URL = "https://paypal.me/toastiet0ast";
 
     private readonly ICommandsUtilityService _cus;
     private readonly CommandService _cmds;
@@ -529,7 +529,7 @@ public sealed partial class Help : EllieModule<HelpService>
             *Keep in mind that running the bot on your computer means that the bot will be offline when you turn off your computer*
 
             - You can find the selfhosting guides by using the `.guide` command and clicking on the second link that pops up.
-            - If you decide to selfhost the bot, still consider [supporting the project](https://patreon.com/join/toastie_t0ast) to keep the development going :)
+            - If you decide to selfhost the bot, still consider [supporting the project](https://patreon.com/join/elliebot) to keep the development going :)
             """,
             true);
 
@@ -551,7 +551,7 @@ public sealed partial class Help : EllieModule<HelpService>
         eb
             .WithDescription("""
                              EllieBot relies on donations to keep the servers, services and APIs running.
-                             Donating will give you access to some exclusive features. You can read about them on the [patreon page](https://patreon.com/join/toastie_t0ast)
+                             Donating will give you access to some exclusive features. You can read about them on the [patreon page](https://patreon.com/join/elliebot)
                              """)
             .AddField("Donation Instructions",
                 $"""
@@ -559,7 +559,7 @@ public sealed partial class Help : EllieModule<HelpService>
 
                  **Step 1:** ❤️ Pledge on Patreon ❤️
 
-                 `1.` Go to <https://patreon.com/join/toastie_t0ast> and choose a tier.
+                 `1.` Go to <https://patreon.com/join/elliebot> and choose a tier.
                  `2.` Make sure your payment is processed and accepted.
 
                  **Step 2** 🤝 Connect your Discord account 🤝

src/EllieBot/Modules/Searches/Crypto/CryptoService.cs

@@ -130,7 +130,7 @@ public class CryptoService : IEService
         await _getCryptoLock.WaitAsync();
         try
         {
-            var data = await _cache.GetOrAddAsync(new("nadeko:crypto_data"),
+            var data = await _cache.GetOrAddAsync(new("ellie:crypto_data"),
                 async () =>
                 {
                     try

src/EllieBot/Modules/Searches/ReligiousCommands.cs

@@ -0,0 +1,102 @@
+using EllieBot.Modules.Searches.Common;
+using System.Net.Http.Json;
+using System.Text.Json.Serialization;
+
+namespace EllieBot.Modules.Searches;
+
+public partial class Searches
+{
+    public partial class ReligiousCommands : EllieModule
+    {
+        private readonly IHttpClientFactory _httpFactory;
+        
+        public ReligiousCommands(IHttpClientFactory httpFactory)
+        {
+            _httpFactory = httpFactory;
+        }
+        
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        public async Task Bible(string book, string chapterAndVerse)
+        {
+            var obj = new BibleVerses();
+            try
+            {
+                using var http = _httpFactory.CreateClient();
+                obj = await http.GetFromJsonAsync<BibleVerses>($"https://bible-api.com/{book} {chapterAndVerse}");
+            }
+            catch
+            {
+            }
+
+            if (obj.Error is not null || obj.Verses is null || obj.Verses.Length == 0)
+                await Response().Error(obj.Error ?? "No verse found.").SendAsync();
+            else
+            {
+                var v = obj.Verses[0];
+                await Response()
+                      .Embed(_sender.CreateEmbed()
+                                    .WithOkColor()
+                                    .WithTitle($"{v.BookName} {v.Chapter}:{v.Verse}")
+                                    .WithDescription(v.Text))
+                      .SendAsync();
+            }
+        }
+
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        public async Task Quran(string ayah)
+        {
+            using var http = _httpFactory.CreateClient(); 
+            
+            var obj = await http.GetFromJsonAsync<QuranResponse<QuranAyah>>($"https://api.alquran.cloud/v1/ayah/{Uri.EscapeDataString(ayah)}/editions/en.asad,ar.alafasy");
+            if(obj is null or not { Code: 200 })
+            {
+                await Response().Error("No verse found.").SendAsync();
+                return;
+            }
+
+            var english = obj.Data[0];
+            var arabic = obj.Data[1];
+
+            await using var audio = await http.GetStreamAsync(arabic.Audio);
+
+            await Response()
+                  .Embed(_sender.CreateEmbed()
+                                .WithOkColor()
+                                .AddField("Arabic", arabic.Text)
+                                .AddField("English", english.Text)
+                                .WithFooter(arabic.Number.ToString()))
+                  .File(audio, Uri.EscapeDataString(ayah) + ".mp3")
+                  .SendAsync();
+        }
+    }
+}
+
+public sealed class QuranResponse<T>
+{
+    [JsonPropertyName("code")]
+    public int Code { get; set; }
+    
+    [JsonPropertyName("status")]
+    public string Status { get; set; }
+    
+    [JsonPropertyName("data")]
+    public T[] Data { get; set; }
+}
+
+public sealed class QuranAyah
+{
+    [JsonPropertyName("number")]
+    public int Number { get; set; }
+    
+    [JsonPropertyName("audio")]
+    public string Audio { get; set; }
+    
+    [JsonPropertyName("name")]
+    public string Name { get; set; }
+    
+    [JsonPropertyName("text")]
+    public string Text { get; set; }
+    
+}

src/EllieBot/Modules/Searches/Searches.cs

@@ -528,34 +528,6 @@ public partial class Searches : EllieModule<SearchesService>
         }
     }
 
-    [Cmd]
-    [RequireContext(ContextType.Guild)]
-    public async Task Bible(string book, string chapterAndVerse)
-    {
-        var obj = new BibleVerses();
-        try
-        {
-            using var http = _httpFactory.CreateClient();
-            obj = await http.GetFromJsonAsync<BibleVerses>($"https://bible-api.com/{book} {chapterAndVerse}");
-        }
-        catch
-        {
-        }
-
-        if (obj.Error is not null || obj.Verses is null || obj.Verses.Length == 0)
-            await Response().Error(obj.Error ?? "No verse found.").SendAsync();
-        else
-        {
-            var v = obj.Verses[0];
-            await Response()
-                  .Embed(_sender.CreateEmbed()
-                         .WithOkColor()
-                         .WithTitle($"{v.BookName} {v.Chapter}:{v.Verse}")
-                         .WithDescription(v.Text))
-                  .SendAsync();
-        }
-    }
-
     [Cmd]
     public async Task Steam([Leftover] string query)
     {

src/EllieBot/Modules/Searches/SearchesService.cs

@@ -126,7 +126,7 @@ public class SearchesService : IEService
     {
         query = query.Trim().ToLowerInvariant();
 
-        return await _c.GetOrAddAsync(new($"nadeko_weather_{query}"),
+        return await _c.GetOrAddAsync(new($"ellie_weather_{query}"),
             async () => await GetWeatherDataFactory(query),
             TimeSpan.FromHours(3));
     }
@@ -156,7 +156,7 @@ public class SearchesService : IEService
     public Task<((string Address, DateTime Time, string TimeZoneName), TimeErrors?)> GetTimeDataAsync(string arg)
         => GetTimeDataFactory(arg);
 
-    //return _cache.GetOrAddCachedDataAsync($"nadeko_time_{arg}",
+    //return _cache.GetOrAddCachedDataAsync($"ellie_time_{arg}",
     //    GetTimeDataFactory,
     //    arg,
     //    TimeSpan.FromMinutes(1));

src/EllieBot/Modules/Utility/Ai/AiAssistantService.cs

@@ -196,14 +196,14 @@ public sealed class AiAssistantService
         if (guild is not SocketGuild sg)
             return false;
 
-        var nadekoId = _client.CurrentUser.Id;
+        var ellieId = _client.CurrentUser.Id;
 
         var channel = msg.Channel as ITextChannel;
         if (channel is null)
             return false;
 
-        var normalMention = $"<@{nadekoId}> ";
+        var normalMention = $"<@{ellieId}> ";
-        var nickMention = $"<@!{nadekoId}> ";
+        var nickMention = $"<@!{ellieId}> ";
         string query;
         if (msg.Content.StartsWith(normalMention, StringComparison.InvariantCulture))
             query = msg.Content[normalMention.Length..].Trim();
@@ -251,7 +251,7 @@ public sealed class AiAssistantService
                     return false;
 
                 await _cbs.RunChatterBot(sg, msg, channel, sess, query);
-                return false;
+                return true;
             }
 
             var commandString = GetCommandString(model);
@@ -293,7 +293,7 @@ public sealed class AiAssistantService
             GetCommandErrorResult.RateLimitHit
                 => "You've spent your daily requests quota.",
             GetCommandErrorResult.NotAuthorized
-                => "In order to use this command you have to have a 5$ or higher subscription at <https://patreon.com/nadekobot>",
+                => "In order to use this command you have to have a 5$ or higher subscription at <https://patreon.com/elliebot>",
             GetCommandErrorResult.Unknown
                 => "The service is temporarily unavailable.",
             _ => throw new ArgumentOutOfRangeException()

src/EllieBot/Modules/Utility/ConfigCommands.cs

@@ -8,7 +8,7 @@ public partial class Utility
         private readonly IEnumerable<IConfigService> _settingServices;
 
         public ConfigCommands(IEnumerable<IConfigService> settingServices)
-            => _settingServices = settingServices.Where(x => x.Name != "medusa");
+            => _settingServices = settingServices.Where(x => x.Name != "marmalade");
 
         [Cmd]
         [OwnerOnly]

src/EllieBot/Modules/Utility/Utility.cs

@@ -459,47 +459,82 @@ public partial class Utility : EllieModule
     public async Task StickerAdd(string name = null, string description = null, params string[] tags)
     {
         string format;
-        Stream stream;
+        Stream stream = null;
-
-        if (ctx.Message.Stickers.Count is 1 && ctx.Message.Stickers.First() is SocketSticker ss)
-        {
-            name ??= ss.Name;
-            description = ss.Description;
-            tags = tags is null or { Length: 0 } ? ss.Tags.ToArray() : tags;
-            format = FormatToExtension(ss.Format);
-
-            using var http = _httpFactory.CreateClient();
-            stream = await http.GetStreamAsync(ss.GetStickerUrl());
-        }
-        else
-        {
-            await Response().Error(strs.sticker_error).SendAsync();
-            return;
-        }
 
         try
         {
-            if (tags.Length == 0)
+            if (ctx.Message.Stickers.Count is 1 && ctx.Message.Stickers.First() is SocketSticker ss)
-                tags = [name];
+            {
+                name ??= ss.Name;
+                description = ss.Description;
+                tags = tags is null or { Length: 0 } ? ss.Tags.ToArray() : tags;
+                format = FormatToExtension(ss.Format);
 
-            await ctx.Guild.CreateStickerAsync(
+                using var http = _httpFactory.CreateClient();
-                name,
+                stream = await http.GetStreamAsync(ss.GetStickerUrl());
-                stream,
+            }
-                $"{name}.{format}",
+            else if (ctx.Message.Attachments.Count is 1 && name is not null)
-                tags,
+            {
-                string.IsNullOrWhiteSpace(description) ? "Missing description" : description
+                if (tags.Length == 0)
-            );
+                    tags = [name];
 
-            await ctx.OkAsync();
+                if (ctx.Message.Attachments.Count != 1)
-        }
+                {
-        catch (Exception ex)
+                    await Response().Error(strs.sticker_error).SendAsync();
-        {
+                    return;
-            Log.Warning(ex, "Error occurred while adding a sticker: {Message}", ex.Message);
+                }
-            await Response().Error(strs.error_occured).SendAsync();
+
+                var attach = ctx.Message.Attachments.First();
+
+
+                if (attach.Size > 512_000 || attach.Width != 300 || attach.Height != 300)
+                {
+                    await Response().Error(strs.sticker_error).SendAsync();
+                    return;
+                }
+
+                format = attach.Filename
+                               .Split('.')
+                               .Last()
+                               .ToLowerInvariant();
+
+                if (string.IsNullOrWhiteSpace(format) || (format != "png" && format != "apng"))
+                {
+                    await Response().Error(strs.sticker_error).SendAsync();
+                    return;
+                }
+
+                using var http = _httpFactory.CreateClient();
+                stream = await http.GetStreamAsync(attach.Url);
+            }
+            else
+            {
+                await Response().Error(strs.sticker_error).SendAsync();
+                return;
+            }
+
+            try
+            {
+                await ctx.Guild.CreateStickerAsync(
+                    name,
+                    stream,
+                    $"{name}.{format}",
+                    tags,
+                    string.IsNullOrWhiteSpace(description) ? "Missing description" : description
+                );
+
+                await ctx.OkAsync();
+            }
+            catch
+                (Exception ex)
+            {
+                Log.Warning(ex, "Error occurred while adding a sticker: {Message}", ex.Message);
+                await Response().Error(strs.error_occured).SendAsync();
+            }
         }
         finally
         {
-            await stream.DisposeAsync();
+            await (stream?.DisposeAsync() ?? ValueTask.CompletedTask);
         }
     }
 

src/EllieBot/_common/Creds.cs

@@ -34,7 +34,7 @@ public sealed class Creds : IBotCredentials
              Go to https://dashy.elliebot.net/me 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
+             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; }
     

src/EllieBot/_common/DbService.cs

@@ -11,5 +11,5 @@ public abstract class DbService
     public abstract Task SetupAsync();
 
     public abstract DbContext CreateRawDbContext(string dbType, string connString);
-    public abstract DbContext GetDbContext();
+    public abstract EllieContext GetDbContext();
 }

src/EllieBot/_common/Interaction/EllieInteractionService.cs

@@ -29,7 +29,8 @@ public class EllieInteractionService : IEllieInteractionService, IEService
         Func<SocketMessageComponent, T, Task> onTrigger,
         in T state,
         bool singleUse = true,
-        bool clearAfter = true)
+        bool clearAfter = true
+    )
         => Create(userId,
             button,
             ((Func<T, Func<SocketMessageComponent, Task>>)((data)

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

@@ -10,7 +10,7 @@ public sealed class EllieButtonInteractionHandler : EllieInteractionBase
         bool onlyAuthor,
         bool singleUse = true,
         bool clearAfter = true)
-        : base(client, authorId, button.CustomId, onAction, onlyAuthor, singleUse)
+        : base(client, authorId, button.CustomId, onAction, onlyAuthor, singleUse, clearAfter)
     {
         Button = button;
     }

src/EllieBot/_common/Marmalade/Common/Adapters/FilterAdapter.cs

@@ -19,11 +19,11 @@ public class FilterAdapter : PreconditionAttribute
         CommandInfo command,
         IServiceProvider services)
     {
-        var medusaContext = ContextAdapterFactory.CreateNew(context,
+        var marmaladeContext = ContextAdapterFactory.CreateNew(context,
             _strings,
             services);
 
-        var result = await _filterAttribute.CheckAsync(medusaContext);
+        var result = await _filterAttribute.CheckAsync(marmaladeContext);
         
         if (!result)
             return PreconditionResult.FromError($"Precondition '{_filterAttribute.GetType().Name}' failed.");

src/EllieBot/creds_example.yml

@@ -1,4 +1,4 @@
-# DO NOT CHANGE
+# DO NOT CHANGE
 version: 7
 # Bot token. Do not share with anyone ever -> https://discordapp.com/developers/applications/
 token: ""
@@ -18,6 +18,7 @@ totalShards: 1
 # 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.
+# ⚠ This does not currently work and is a work in progress.
 ellieAiToken: 
 # 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.

src/EllieBot/data/aliases.yml

@@ -1192,6 +1192,8 @@ xpreset:
   - xpreset
 bible:
   - bible
+quran:
+  - quran
 edit:
   - edit
 delete:

src/EllieBot/data/strings/commands/commands.en-US.yml

@@ -64,7 +64,7 @@ greetmsg:
   desc: |-
     Sets a new join announcement message which will be shown in the current channel.
     Write `%user.mention%` if you want to mention the new member.   
-    Full list of placeholders can be found here <https://docs.elliebot.net/ellie/placeholders/>
+    Full list of placeholders can be found here <https://docs.elliebot.net/ellie/features/placeholders/>
     Using this command with no message will show the current greet message.  
     You can use embed json from <https://eb.elliebot.net/> instead of regular text, if you want the message to be embedded.
   ex:
@@ -82,7 +82,7 @@ byemsg:
   desc: |-
     Sets a new leave announcement message which will be shown in the current channel. 
     Type `%user.name%` to show the name of the user who left. 
-    Full list of placeholders can be found here <https://docs.elliebot.net/ellie/placeholders/>  
+    Full list of placeholders can be found here <https://docs.elliebot.net/ellie/features/placeholders/>  
     Using this command with no message will show the current bye message. 
     You can use embed json from <https://eb.elliebot.net/> instead of regular text, if you want the message to be embedded.
   ex:
@@ -138,7 +138,7 @@ boostmsg:
   desc: |-
     Sets a new boost announcement message which will be shown in the current channel. 
     Type `%user.mention%` if you want to mention the booster.
-    Full list of placeholders can be found here <https://docs.elliebot.net/ellie/placeholders/>
+    Full list of placeholders can be found here <https://docs.elliebot.net/ellie/features/placeholders/>
     Using this command with no message will show the current boost message. 
     You can use embed json from <https://eb.elliebot.net/> instead of regular text, if you want the message to be embedded.
   ex:
@@ -378,7 +378,7 @@ iamnot:
     - role:
         desc: "The role to remove."
 expradd:
-  desc: 'Add an expression with a trigger and a response. Bot will post a response whenever someone types the trigger word.  Running this command in a server requires the Administrator permission. Running this command in DM is Bot Owner only and adds a new global expression. Guide [here](<https://docs.elliebot.net/ellie/expressions/>)'
+  desc: 'Add an expression with a trigger and a response. Bot will post a response whenever someone types the trigger word.  Running this command in a server requires the Administrator permission. Running this command in DM is Bot Owner only and adds a new global expression. Guide [here](<https://docs.elliebot.net/ellie/features/expressions/>)'
   ex:
     - '"hello" Hi there %user.mention%'
   params:
@@ -387,7 +387,7 @@ expradd:
       response:
         desc: "The text of the message that shows up when a user types the trigger word."
 expraddserver:
-  desc: 'Add an expression with a trigger and a response in this server. Bot will post a response whenever someone types the trigger word. This command is useful if you want to lower the permission requirement for managing expressions by using `{0}dpo`. Guide [here](<https://docs.elliebot.net/ellie/expressions/>).'
+  desc: 'Add an expression with a trigger and a response in this server. Bot will post a response whenever someone types the trigger word. This command is useful if you want to lower the permission requirement for managing expressions by using `{0}dpo`. Guide [here](<https://docs.elliebot.net/ellie/features/expressions/>).'
   ex:
     - '"hello" Hi there %user.mention%'
   params:
@@ -2180,7 +2180,7 @@ delallquotes:
     - keyword:
         desc: "The keyword to search for in the text."
 greetdmmsg:
-  desc: Sets a new join announcement message which will be sent to the user who joined. Type `%user.mention%` if you want to mention the new member. Using it with no message will show the current DM greet message. You can use embed json from <https://eb.elliebot.net/> instead of a regular text, if you want the message to be embedded.
+  desc: Sets a new join announcement message which will be sent to the user who joined. Type `%user.mention%` if you want to mention the new member. Using it with no message will show the current DM greet message. You can use embed json from <https://eb.elliebot.net> instead of a regular text, if you want the message to be embedded.
   ex:
     - Welcome to the server, %user.mention%
   params:
@@ -2289,7 +2289,11 @@ emojiremove:
     - emotes:
         desc: "The list of emojis to be removed from the server."
 stickeradd:
-  desc: Adds the sticker from your message to this server. Send the sticker along with this command (in the same message).
+  desc: |-
+    Adds the sticker from your message to this server.
+    Send the sticker along with this command (in the same message).
+    Alternatively you can upload an image along with this command but you have to specify the name.
+    The image must be 300x300 in .png or .apng format and up to 512KB in size.
   ex:
     - ''
     - name "description" tag1 tag2 tagN
@@ -4076,6 +4080,16 @@ bible:
         desc: "The name of the biblical book being referenced."
       chapterAndVerse:
         desc: "The reference to a specific passage in the Bible, such as 'Genesis 3:15'"
+quran:
+  desc: |-
+    Shows the text of an ayah of the Quran, as well as the recitation by Alafasy.
+    Supply surah:ayah, or ayah number. For instance, 262 or 2:255 will both get you Ayat Al Kursi
+  ex:
+    - 2:255
+    - 262
+  params:
+    - ayah:
+        desc: "The number of the ayah in the Quran, for example 2:255."
 edit:
   desc: Edits bot's message, you have to specify message ID and new text. You can optionally specify target channel. Supports embeds.
   ex:
@@ -4200,7 +4214,7 @@ marmaladeunload:
         desc: "The name of a specific marmalade to be unloaded."
 marmaladeinfo:
   desc: |-
-    Shows information about the specified marmalade such as the author, name, description, list of sneks, number of commands etc.
+    Shows information about the specified marmalade such as the author, name, description, list of canaries, number of commands etc.
     Provide no name to see the basic information about all loaded marmalades. 
     Read about the marmalade system [here](https://docs.elliebot.net/ellie/marmalade/creating-a-marmalade/)
   ex:

src/EllieBot/data/strings/responses/responses.en-US.json

@@ -1067,8 +1067,7 @@
   "xpshop_already_owned": "You already own this item.",
   "xpshop_item_not_found": "An item with that key doesn't exist.",
   "xpshop_website": "You can see the list of all Xp Shop items here: <https://beta.elliebot.net>",
-  "sticker_invalid_size": "Stickers must be exactly 300x300 pixels.",
+  "sticker_error": "You must either send a sticker along with this command, or upload a 300x300 .png or .apng image. Up to 512KB in size.",
-  "sticker_error": "You must either send a sticker along with this command, or upload a 300x300 .png or .apng image.",
   "sticker_missing_name": "Please specify a name for the sticker.",
   "thread_deleted": "Thread Deleted",
   "thread_created": "Thread Created",