CHANGELOG.md

@@ -2,64 +2,6 @@
 
 Mostly based on [keepachangelog](https://keepachangelog.com/en/1.1.0/) except date format. a-c-f-r-o
 
-## [5.1.14] - 03.10.2024
-
-## Changed
-
-- Improved `.xplb -c`, it will now correctly only show users who are still in the server with no count limit
-
-## Fixed
-
-- Fixed marmalade load error on startup
-
-## [5.1.13] - 03.10.2024
-
-### Fixed
-
-- Grpc api server will no longer start unless enabled in creds
-- Seq comment in creds fixed
-
-## [5.1.12] - 03.10.2024
-
-### Added
-
-- Added support for `seq` for logging. If you fill in seq url and apiKey in creds.yml, bot will sends logs to it
-
-### Fixed
-
-- Fixed the Check for updates service not using the right URL and spitting an error in the console.
-- Fixed another bug in `.greet` / `.bye` system, which caused it to show wrong message on a wrong server occasionally
-
-## [5.1.11] - 03.10.2024
-
-### Added
-
-- Added `%user.displayname%` placeholder. It will show users nickname, if there is one, otherwise it will show the username.
-  - Nickname won't be shown in bye messages.
-- Added initial version of grpc api. Beta
- 
-### Fixed
-
-- Fixed a bug which caused `.bye` and `.greet` messages to be randomly disabled
-- Fixed `.lb -c` breaking sometimes, and fixed pagination
-
-### Changed
-
-- Youtube now always uses `yt-dlp`. Dropped support for `youtube-dl`
-  - If you've previously renamed your yt-dlp file to youtube-dl, please rename it back.
-- ytProvider in data/searches.yml now also controls where you're getting your song streams from.
-  - (Invidious support added for .q)
-
-## [5.1.10] - 24.09.2024
-
-### Fixed
-
-- Fixed claimed waifu decay in `games.yml`
-
-### Changed
-
-- Added some logs for greet service in case there are unforeseen issues, for easier debugging
-
 ## [5.1.9] - 21.09.2024
 
 ### Fixed

EllieBot.sln

@@ -30,8 +30,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ellie.Marmalade", "src\Elli
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EllieBot.Voice", "src\EllieBot.Voice\EllieBot.Voice.csproj", "{1D93CE3C-80B4-49C7-A9A2-99988920AAEC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EllieBot.GrpcApiBase", "src\EllieBot.GrpcApiBase\EllieBot.GrpcApiBase.csproj", "{3B71F0BF-AE6C-480C-AB88-FCE23EDC7D91}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -66,10 +64,6 @@ Global
 		{1D93CE3C-80B4-49C7-A9A2-99988920AAEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1D93CE3C-80B4-49C7-A9A2-99988920AAEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1D93CE3C-80B4-49C7-A9A2-99988920AAEC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3B71F0BF-AE6C-480C-AB88-FCE23EDC7D91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3B71F0BF-AE6C-480C-AB88-FCE23EDC7D91}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3B71F0BF-AE6C-480C-AB88-FCE23EDC7D91}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3B71F0BF-AE6C-480C-AB88-FCE23EDC7D91}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -82,7 +76,6 @@ Global
 		{F1A77F56-71B0-430E-AE46-94CDD7D43874} = {B28FB883-9688-41EB-BF5A-945F4A4EB628}
 		{76AC715D-12FF-4CBE-9585-A861139A2D0C} = {B28FB883-9688-41EB-BF5A-945F4A4EB628}
 		{1D93CE3C-80B4-49C7-A9A2-99988920AAEC} = {B28FB883-9688-41EB-BF5A-945F4A4EB628}
-		{3B71F0BF-AE6C-480C-AB88-FCE23EDC7D91} = {B28FB883-9688-41EB-BF5A-945F4A4EB628}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {79F61C2C-CDBB-4361-A234-91A0B334CFE4}

src/EllieBot.Generators/EllieBot.Generators.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" PrivateAssets="all" />
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" PrivateAssets="all" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" PrivateAssets="all" GeneratePathProperty="true" />
   </ItemGroup>

src/EllieBot.Generators/GrpcApiPermGenerator.cs

@@ -1,147 +0,0 @@
-#nullable enable
-using System.CodeDom.Compiler;
-using System.Collections.Immutable;
-using System.Diagnostics;
-using System.Text;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Text;
-using Newtonsoft.Json;
-
-namespace EllieBot.Generators
-{
-    public readonly record struct MethodPermData
-    {
-        public readonly string Name;
-        public readonly string Value;
-
-        public MethodPermData(string name, string value)
-        {
-            Name = name;
-            Value = value;
-        }
-    }
-
-
-    [Generator]
-    public class GrpcApiPermGenerator : IIncrementalGenerator
-    {
-        public const string Attribute =
-            """
-            namespace EllieBot.GrpcApi;
-
-            [System.AttributeUsage(System.AttributeTargets.Method)]
-            public class GrpcApiPermAttribute : System.Attribute
-            {
-                public GuildPerm Value { get; }
-                public GrpcApiPermAttribute(GuildPerm value) => Value = value;
-            }
-            """;
-
-        public void Initialize(IncrementalGeneratorInitializationContext context)
-        {
-            context.RegisterPostInitializationOutput(ctx => ctx.AddSource("GrpcApiPermAttribute.cs",
-                SourceText.From(Attribute, Encoding.UTF8)));
-
-            var enumsToGenerate = context.SyntaxProvider
-                .ForAttributeWithMetadataName(
-                    "EllieBot.GrpcApi.GrpcApiPermAttribute",
-                    predicate: static (s, _) => s is MethodDeclarationSyntax,
-                    transform: static (ctx, _) => GetMethodSemanticTargets(ctx.SemanticModel, ctx.TargetNode))
-                .Where(static m => m is not null)
-                .Select(static (x, _) => x!.Value)
-                .Collect();
-
-            context.RegisterSourceOutput(enumsToGenerate,
-                static (spc, source) => Execute(source, spc));
-        }
-
-        private static MethodPermData? GetMethodSemanticTargets(SemanticModel model, SyntaxNode node)
-        {
-            var method = (MethodDeclarationSyntax)node;
-
-            var name = method.Identifier.Text;
-            var attr = method.AttributeLists
-                .SelectMany(x => x.Attributes)
-                .FirstOrDefault();
-            // .FirstOrDefault(x => x.Name.ToString() == "GrpcApiPermAttribute");
-
-
-            if (attr is null)
-                return null;
-
-            // if (model.GetSymbolInfo(attr).Symbol is not IMethodSymbol attrSymbol)
-            //     return null;
-
-            return new MethodPermData(name, attr.ArgumentList.Arguments[0].ToString() ?? "__missing_perm__");
-            // return new MethodPermData(name, attrSymbol.Parameters[0].ContainingType.ToDisplayString() + "." + attrSymbol.Parameters[0].Name);
-        }
-
-        private static void Execute(ImmutableArray<MethodPermData> fields, SourceProductionContext ctx)
-        {
-            using (var stringWriter = new StringWriter())
-            using (var sw = new IndentedTextWriter(stringWriter))
-            {
-                sw.WriteLine("using System.Collections.Frozen;");
-                sw.WriteLine();
-                sw.WriteLine("namespace EllieBot.GrpcApi;");
-                sw.WriteLine();
-
-                sw.WriteLine("public partial class PermsInterceptor");
-                sw.WriteLine("{");
-
-                sw.Indent++;
-
-                sw.WriteLine("public static FrozenDictionary<string, GuildPerm> perms = new Dictionary<string, GuildPerm>()");
-                sw.WriteLine("{");
-
-                sw.Indent++;
-                foreach (var field in fields)
-                {
-                    sw.WriteLine("{{ \"{0}\", {1} }},", field.Name, field.Value);
-                }
-
-                sw.Indent--;
-                sw.WriteLine("}.ToFrozenDictionary();");
-
-                sw.Indent--;
-                sw.WriteLine("}");
-
-                sw.Flush();
-                ctx.AddSource("GrpcApiInterceptor.g.cs", stringWriter.ToString());
-            }
-        }
-
-        private List<TranslationPair> GetFields(string? dataText)
-        {
-            if (string.IsNullOrWhiteSpace(dataText))
-                return new();
-
-            Dictionary<string, string> data;
-            try
-            {
-                var output = JsonConvert.DeserializeObject<Dictionary<string, string>>(dataText!);
-                if (output is null)
-                    return new();
-
-                data = output;
-            }
-            catch
-            {
-                Debug.WriteLine("Failed parsing responses file.");
-                return new();
-            }
-
-            var list = new List<TranslationPair>();
-            foreach (var entry in data)
-            {
-                list.Add(new(
-                    entry.Key,
-                    entry.Value
-                ));
-            }
-
-            return list;
-        }
-    }
-}

src/EllieBot.GrpcApiBase/EllieBot.GrpcApiBase.csproj

@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.28.2" />
-    <PackageReference Include="Grpc" Version="2.46.6" />
-    <PackageReference Include="Grpc.Tools" Version="2.66.0" PrivateAssets="All" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Protobuf Include="protos/*.proto">
-      <GrpcServices>Server</GrpcServices>
-    </Protobuf>
-  </ItemGroup>
-
-</Project>

src/EllieBot.GrpcApiBase/protos/econ.proto

@@ -1,26 +0,0 @@
-syntax = "proto3";
-
-option csharp_namespace = "EllieBot.GrpcApi";
-
-package econ;
-
-service GrpcEcon {
-  rpc GetEconomy(EconomyRequest) returns (EconomyReply);
-}
-
-message EconomyRequest {
-  string guildId = 1;
-}
-
-message EconomyReply {
-  uint64 totalOwned = 1;
-  uint64 byTopOnePercent = 2;
-  uint64 plantedAmount = 3;
-  uint64 ownedByTheBot = 4;
-  uint64 inTheBank = 5;
-  uint64 totalEconomy = 6;
-}
-
-message CurrencyLbRequest {
-  int32 page = 1;
-}

src/EllieBot.GrpcApiBase/protos/exprs.proto

@@ -1,50 +0,0 @@
-syntax = "proto3";
-
-option csharp_namespace = "EllieBot.GrpcApi";
-
-import "google/protobuf/empty.proto"; 
-
-package exprs;
-
-service GrpcExprs {
-  rpc GetExprs(GetExprsRequest) returns (GetExprsReply);
-  rpc AddExpr(AddExprRequest) returns (AddExprReply);
-  rpc DeleteExpr(DeleteExprRequest) returns (google.protobuf.Empty);
-}
-
-message DeleteExprRequest {
-  string id = 1;
-  uint64 guildId = 2;
-}
-
-message GetExprsRequest {
-  uint64 guildId = 1;
-  string query = 2;
-  int32 page = 3;
-}
-
-message GetExprsReply {
-  repeated ExprDto expressions = 1;
-  int32 totalCount = 2;
-}
-
-message ExprDto {
-  string id = 1;
-  string trigger = 2;
-  string response = 3;
-  
-  bool ca = 4;
-  bool ad = 5;
-  bool dm = 6;
-  bool at = 7;
-}
-
-message AddExprRequest {
-  uint64 guildId = 1;
-  ExprDto expr = 2;
-}
-
-message AddExprReply {
-  string id = 1;
-  bool success = 2;
-}

src/EllieBot.GrpcApiBase/protos/greet.proto

@@ -1,57 +0,0 @@
-syntax = "proto3";
-
-option csharp_namespace = "EllieBot.GrpcApi";
-
-package greet;
-
-service GrpcGreet {
-  rpc GetGreetSettings (GetGreetRequest) returns (GetGreetReply);
-  rpc UpdateGreet (UpdateGreetRequest) returns (UpdateGreetReply);
-  rpc TestGreet (TestGreetRequest) returns (TestGreetReply);
-}
-
-message GetGreetReply {
-  GrpcGreetSettings greet = 1;
-  GrpcGreetSettings greetDm = 2;
-  GrpcGreetSettings bye = 3;
-  GrpcGreetSettings boost = 4;
-}
-
-message GrpcGreetSettings {
-  optional uint64 channelId = 1;
-  string message = 2;
-  bool isEnabled = 3;
-  GrpcGreetType type = 4;
-}
-
-message GetGreetRequest {
-  uint64 guildId = 1;
-}
-
-message UpdateGreetRequest {
-  uint64 guildId = 1;
-  GrpcGreetSettings settings = 2;
-}
-
-enum GrpcGreetType {
-  Greet = 0;
-  GreetDm = 1;
-  Bye = 2;
-  Boost = 3;
-}
-
-message UpdateGreetReply {
-  bool success = 1;
-}
-
-message TestGreetRequest {
-  uint64 guildId = 1;
-  uint64 channelId = 2;
-  uint64 userId = 3;
-  GrpcGreetType type = 4;
-}
-
-message TestGreetReply {
-  bool success = 1;
-  string error = 2;
-}

src/EllieBot.GrpcApiBase/protos/other.proto

@@ -1,137 +0,0 @@
-syntax = "proto3";
-
-option csharp_namespace = "EllieBot.GrpcApi";
-
-import "google/protobuf/empty.proto";
-import "google/protobuf/timestamp.proto";
-
-package other;
-
-service GrpcOther {
-
-  rpc GetGuilds(google.protobuf.Empty) returns (GetGuildsReply);
-  rpc GetTextChannels(GetTextChannelsRequest) returns (GetTextChannelsReply);
-
-  rpc GetCurrencyLb(GetLbRequest) returns (CurrencyLbReply);
-  rpc GetXpLb(GetLbRequest) returns (XpLbReply);
-  rpc GetWaifuLb(GetLbRequest) returns (WaifuLbReply);
-
-  rpc GetShardStatuses(google.protobuf.Empty) returns (GetShardStatusesReply);
-  rpc GetServerInfo(ServerInfoRequest) returns (GetServerInfoReply);
-}
-
-message GetGuildsReply {
-  repeated GuildReply guilds = 1;
-}
-
-message GuildReply {
-  uint64 id = 1;
-  string name = 2;
-  string iconUrl = 3;
-}
-
-message GetShardStatusesReply {
-  repeated ShardStatusReply shards = 1;
-}
-
-message ShardStatusReply {
-  int32 id = 1;
-  string status = 2;
-
-  int32 guildCount = 3;
-  google.protobuf.Timestamp lastUpdate = 4;
-}
-
-message GetTextChannelsRequest{
-  uint64 guildId = 1;
-}
-
-message GetTextChannelsReply {
-  repeated TextChannelReply textChannels = 1;
-}
-
-message TextChannelReply {
-  uint64 id = 1;
-  string name = 2;
-}
-
-message CurrencyLbReply {
-  repeated CurrencyLbEntryReply entries = 1;
-}
-
-message CurrencyLbEntryReply {
-  string user = 1;
-  uint64 userId = 2;
-  int64 amount = 3;
-  string avatar = 4;
-}
-
-message GetLbRequest {
-  int32 page = 1;
-  int32 perPage = 2;
-}
-
-message XpLbReply {
-  repeated XpLbEntryReply entries = 1;
-}
-
-message XpLbEntryReply {
-  string user = 1;
-  uint64 userId = 2;
-  int64 totalXp = 3;
-  int64 level = 4;
-}
-
-message WaifuLbReply {
-  repeated WaifuLbEntry entries = 1;
-}
-
-message WaifuLbEntry {
-  string user = 1;
-  string claimedBy = 2;
-  int64 value = 3;
-  bool isMutual = 4;
-}
-
-message ServerInfoRequest {
-  uint64 guildId = 1;
-}
-
-message GetServerInfoReply {
-  uint64 id = 1;
-  string name = 2;
-  string iconUrl = 3;
-  uint64 ownerId = 4;
-  string ownerName = 5;
-  repeated RoleReply roles = 6;
-  repeated EmojiReply emojis = 7;
-  repeated string features = 8;
-  int32 textChannels = 9;
-  int32 voiceChannels = 10;
-  int32 memberCount = 11;
-  int64 createdAt = 12;
-}
-
-message RoleReply {
-  uint64 id = 1;
-  string name = 2;
-  string iconUrl = 3;
-  string color = 4;
-}
-
-message EmojiReply {
-  string name = 1;
-  string url = 2;
-  string code = 3;
-}
-
-message ChannelReply {
-  uint64 id = 1;
-  string name = 2;
-  ChannelType type = 3;
-}
-
-enum ChannelType {
-  Text = 0;
-  Voice = 1;
-}

src/EllieBot.GrpcApiBase/protos/warn.proto

@@ -1,83 +0,0 @@
-syntax = "proto3";
-
-option csharp_namespace = "EllieBot.GrpcApi";
-
-package warn;
-
-service GrpcWarn {
-  rpc GetWarnSettings (WarnSettingsRequest) returns (WarnSettingsReply);
-  rpc AddWarnp (AddWarnpRequest) returns (AddWarnpReply);
-  rpc DeleteWarnp (DeleteWarnpRequest) returns (DeleteWarnpReply);
-  rpc GetUserWarnings(GetUserWarningsRequest) returns (GetUserWarningsReply);
-  rpc ClearWarning(ClearWarningRequest) returns (ClearWarningReply);
-  rpc SetWarnExpiry(SetWarnExpiryRequest) returns (SetWarnExpiryReply);
-}
-message WarnSettingsRequest {
-  uint64 guildId = 1;
-}
-
-message WarnPunishment {
-  int32 threshold = 1;
-  string action = 2;
-  int64 duration = 3;
-}
-
-message WarnSettingsReply {
-  repeated WarnPunishment punishments = 1;
-  int32 expiryDays = 2;
-}
-
-message AddWarnpRequest {
-  uint64 guildId = 1;
-  WarnPunishment punishment = 2;
-}
-
-message AddWarnpReply {
-  bool success = 1;
-}
-
-message DeleteWarnpRequest {
-  uint64 guildId = 1;
-  int32 warnpIndex = 2;
-}
-
-message DeleteWarnpReply {
-  bool success = 1;
-}
-
-message GetUserWarningsRequest {
-  uint64 guildId = 1;
-  uint64 user_id = 2;
-}
-
-message GetUserWarningsReply {
-  repeated Warning warnings = 1;
-}
-
-message Warning {
-  int32 id = 1;
-  string reason = 2;
-  int64 timestamp = 3;
-  int64 expiry_timestamp = 4;
-  bool cleared = 5;
-  string clearedBy = 6;
-}
-
-message ClearWarningRequest {
-  uint64 guildId = 1;
-  uint64 userId = 2;
-  optional int32 warnId = 3;
-}
-
-message ClearWarningReply {
-  bool success = 1;
-}
-
-message SetWarnExpiryRequest {
-  uint64 guildId = 1;
-  int32 expiryDays = 2;
-}
-
-message SetWarnExpiryReply {
-  bool success = 1;
-}

src/EllieBot/Bot.cs

@@ -25,7 +25,7 @@ public sealed class Bot : IBot
     public bool IsReady { get; private set; }
     public int ShardId { get; set; }
 
-    private readonly IBotCreds _creds;
+    private readonly IBotCredentials _creds;
     private readonly CommandService _commandService;
     private readonly DbService _db;
 
@@ -42,9 +42,6 @@ public sealed class Bot : IBot
         _credsProvider = new BotCredsProvider(totalShards, credPath);
         _creds = _credsProvider.GetCreds();
 
-        LogSetup.SetupLogger(shardId, _creds);
-        Log.Information("Pid: {ProcessId}", Environment.ProcessId);
-
         _db = new EllieDbService(_credsProvider);
 
         var messageCacheSize =
@@ -118,7 +115,7 @@ public sealed class Bot : IBot
         // svcs.Components.Remove<IPlanner, Planner>();
         // svcs.Components.Add<IPlanner, RemovablePlanner>();
 
-        svcs.AddSingleton<IBotCreds>(_ => _credsProvider.GetCreds());
+        svcs.AddSingleton<IBotCredentials>(_ => _credsProvider.GetCreds());
         svcs.AddSingleton<DbService, DbService>(_db);
         svcs.AddSingleton<IBotCredsProvider>(_credsProvider);
         svcs.AddSingleton<DiscordSocketClient>(Client);

src/EllieBot/Db/Extensions/UserXpExtensions.cs

@@ -26,6 +26,17 @@ public static class UserXpExtensions
         return usr;
     }
 
+    public static async Task<IReadOnlyCollection<UserXpStats>> GetUsersFor(
+        this DbSet<UserXpStats> xps,
+        ulong guildId,
+        int page)
+        => await xps.ToLinqToDBTable()
+                    .Where(x => x.GuildId == guildId)
+                    .OrderByDescending(x => x.Xp + x.AwardedXp)
+                    .Skip(page * 9)
+                    .Take(9)
+                    .ToArrayAsyncLinqToDB();
+
     public static async Task<List<UserXpStats>> GetTopUserXps(this DbSet<UserXpStats> xps, ulong guildId, int count)
         => await xps.ToLinqToDBTable()
                     .Where(x => x.GuildId == guildId)

src/EllieBot/EllieBot.csproj

@@ -4,7 +4,7 @@
         <Nullable>enable</Nullable>
         <ImplicitUsings>true</ImplicitUsings>
         <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
-        <Version>5.1.14</Version>
+        <Version>5.1.9</Version>
 
         <!-- Output/build -->
         <RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
@@ -34,12 +34,13 @@
     <PackageReference Include="Google.Apis.Urlshortener.v1" Version="1.41.1.138" />
     <PackageReference Include="Google.Apis.YouTube.v3" Version="1.68.0.3414" />
     <PackageReference Include="Google.Apis.Customsearch.v1" Version="1.49.0.2084" />
-    
+    <!--        <PackageReference Include="Grpc.AspNetCore" Version="2.62.0" />-->
-    <PackageReference Include="Google.Protobuf" Version="3.28.2" />
+    <PackageReference Include="Google.Protobuf" Version="3.26.1" />
-    <PackageReference Include="Grpc" Version="2.46.6" />
+    <PackageReference Include="Grpc.Net.ClientFactory" Version="2.62.0" />
-    <PackageReference Include="Grpc.Net.Client" Version="2.62.0" />
+    <PackageReference Include="Grpc.Tools" Version="2.63.0">
-    <PackageReference Include="Grpc.Tools" Version="2.66.0" PrivateAssets="All" />
+      <PrivateAssets>all</PrivateAssets>
-    
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.5.0" />
 
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
@@ -102,7 +103,6 @@
   </ItemGroup>
 
   <ItemGroup>
-        <ProjectReference Include="..\EllieBot.GrpcApiBase\EllieBot.GrpcApiBase.csproj" />
         <ProjectReference Include="..\Ellie.Marmalade\Ellie.Marmalade.csproj" />
         <ProjectReference Include="..\EllieBot.Voice\EllieBot.Voice.csproj" />
         <ProjectReference Include="..\EllieBot.Generators\EllieBot.Generators.csproj" OutputItemType="Analyzer" />
@@ -113,6 +113,9 @@
     </ItemGroup>
 
     <ItemGroup>
+        <Protobuf Include="..\EllieBot.Coordinator\Protos\coordinator.proto" GrpcServices="Client">
+            <Link>Protos\coordinator.proto</Link>
+        </Protobuf>
         <None Update="data\**\*">
             <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -128,10 +131,7 @@
     </ItemGroup>
   
     <ItemGroup>
-        <Protobuf Include="..\EllieBot.Coordinator\Protos\coordinator.proto">
+      <Folder Include="Grpc\" />
-            <Link>_common\CoordinatorProtos\coordinator.proto</Link>
-<!--            <GrpcServices>Client</GrpcServices>-->
-        </Protobuf>
     </ItemGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'GlobalEllie' ">

src/EllieBot/Modules/Administration/GreetBye/GreetService.cs

@@ -93,9 +93,6 @@ public class GreetService : IEService, IReadyExecutor
 
     private Task ClientOnGuildMemberUpdated(Cacheable<SocketGuildUser, ulong> optOldUser, SocketGuildUser newUser)
     {
-        if (!_enabled[GreetType.Boost].Contains(newUser.Guild.Id))
-            return Task.CompletedTask;
-
         // if user is a new booster
         // or boosted again the same server
         if ((optOldUser.Value is { PremiumSince: null } && newUser is { PremiumSince: not null })
@@ -137,63 +134,21 @@ public class GreetService : IEService, IReadyExecutor
                  .DeleteAsync();
     }
 
-    private Task OnUserJoined(IGuildUser user)
-    {
-        _ = Task.Run(async () =>
-        {
-            try
-            {
-                if (_enabled[GreetType.Greet].Contains(user.GuildId))
-                {
-                    var conf = await GetGreetSettingsAsync(user.GuildId, GreetType.Greet);
-                    if (conf?.ChannelId is ulong cid)
-                    {
-                        var channel = await user.Guild.GetTextChannelAsync(cid);
-                        if (channel is not null)
-                        {
-                            await _greetQueue.Writer.WriteAsync((conf, user, channel));
-                        }
-                    }
-                }
-
-
-                if (_enabled[GreetType.GreetDm].Contains(user.GuildId))
-                {
-                    var confDm = await GetGreetSettingsAsync(user.GuildId, GreetType.GreetDm);
-                    if (confDm is not null)
-                    {
-                        await _greetQueue.Writer.WriteAsync((confDm, user, null));
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                Log.Error(ex, "Error in GreetService.OnUserJoined. This should not happen. Please report it");
-            }
-        });
-        return Task.CompletedTask;
-    }
-
     private Task OnUserLeft(SocketGuild guild, SocketUser user)
     {
         _ = Task.Run(async () =>
         {
-            if (!_enabled[GreetType.Bye].Contains(guild.Id))
-                return;
-
             try
             {
                 var conf = await GetGreetSettingsAsync(guild.Id, GreetType.Bye);
 
-                if (conf?.ChannelId is not { } cid)
+                if (conf is null)
                     return;
 
-                var channel = guild.GetChannel(cid) as ITextChannel;
+                var channel = guild.TextChannels.FirstOrDefault(c => c.Id == conf.ChannelId);
+
                 if (channel is null) //maybe warn the server owner that the channel is missing
                 {
-                    Log.Warning("Channel {ChannelId} in {GuildId} was not found. Bye message will be disabled",
-                        conf.ChannelId,
-                        conf.GuildId);
                     await SetGreet(guild.Id, null, GreetType.Bye, false);
                     return;
                 }
@@ -208,11 +163,11 @@ public class GreetService : IEService, IReadyExecutor
         return Task.CompletedTask;
     }
 
-    private TypedKey<GreetSettings?> GreetSettingsKey(ulong gid, GreetType type)
+    private TypedKey<GreetSettings?> GreetSettingsKey(GreetType type)
-        => new($"greet_settings:{gid}:{type}");
+        => new($"greet_settings:{type}");
 
     public async Task<GreetSettings?> GetGreetSettingsAsync(ulong gid, GreetType type)
-        => await _cache.GetOrAddAsync<GreetSettings?>(GreetSettingsKey(gid, type),
+        => await _cache.GetOrAddAsync<GreetSettings?>(GreetSettingsKey(type),
             () => InternalGetGreetSettingsAsync(gid, type),
             TimeSpan.FromSeconds(3));
 
@@ -261,10 +216,9 @@ public class GreetService : IEService, IReadyExecutor
                                            or DiscordErrorCode.UnknownChannel)
         {
             Log.Warning(ex,
-                "Missing permissions to send a {GreetType} message, it will be disabled on server: {GuildId}",
+                "Missing permissions to send a bye message, the greet message will be disabled on server: {GuildId}",
-                conf.GreetType,
                 channel.GuildId);
-            await SetGreet(channel.GuildId, channel.Id, conf.GreetType, false);
+            await SetGreet(channel.GuildId, channel.Id, GreetType.Greet, false);
         }
         catch (Exception ex)
         {
@@ -337,9 +291,8 @@ public class GreetService : IEService, IReadyExecutor
 
             await _sender.Response(user).Text(smartText).Sanitize(false).SendAsync();
         }
-        catch (Exception ex)
+        catch
         {
-            Log.Error(ex, "Error sending greet dm");
             return false;
         }
 
@@ -353,6 +306,43 @@ public class GreetService : IEService, IReadyExecutor
             IconUrl = user.Guild.IconUrl
         };
 
+    private Task OnUserJoined(IGuildUser user)
+    {
+        _ = Task.Run(async () =>
+        {
+            try
+            {
+                if (_enabled[GreetType.Greet].Contains(user.GuildId))
+                {
+                    var conf = await GetGreetSettingsAsync(user.GuildId, GreetType.Greet);
+                    if (conf?.ChannelId is ulong cid)
+                    {
+                        var channel = await user.Guild.GetTextChannelAsync(cid);
+                        if (channel is not null)
+                        {
+                            await _greetQueue.Writer.WriteAsync((conf, user, channel));
+                        }
+                    }
+                }
+
+
+                if (_enabled[GreetType.GreetDm].Contains(user.GuildId))
+                {
+                    var confDm = await GetGreetSettingsAsync(user.GuildId, GreetType.GreetDm);
+                    if (confDm is not null)
+                    {
+                        await _greetQueue.Writer.WriteAsync((confDm, user, null));
+                    }
+                }
+            }
+            catch
+            {
+                // ignored
+            }
+        });
+        return Task.CompletedTask;
+    }
+
 
     public static string GetDefaultGreet(GreetType greetType)
         => greetType switch

src/EllieBot/Modules/Administration/Role/ReactionRolesService.cs

@@ -13,7 +13,7 @@ public sealed class ReactionRolesService : IReadyExecutor, IEService, IReactionR
 {
     private readonly DbService _db;
     private readonly DiscordSocketClient _client;
-    private readonly IBotCreds _creds;
+    private readonly IBotCredentials _creds;
 
     private ConcurrentDictionary<ulong, List<ReactionRoleV2>> _cache;
     private readonly object _cacheLock = new();
@@ -24,7 +24,7 @@ public sealed class ReactionRolesService : IReadyExecutor, IEService, IReactionR
         DiscordSocketClient client,
         IPatronageService ps,
         DbService db,
-        IBotCreds creds)
+        IBotCredentials creds)
     {
         _db = db;
         _client = client;

src/EllieBot/Modules/Administration/Role/StickyRolesService.cs

@@ -9,13 +9,13 @@ namespace EllieBot.Modules.Administration;
 public sealed class StickyRolesService : IEService, IReadyExecutor
 {
     private readonly DiscordSocketClient _client;
-    private readonly IBotCreds _creds;
+    private readonly IBotCredentials _creds;
     private readonly DbService _db;
     private HashSet<ulong> _stickyRoles = new();
 
     public StickyRolesService(
         DiscordSocketClient client,
-        IBotCreds creds,
+        IBotCredentials creds,
         DbService db)
     {
         _client = client;

src/EllieBot/Modules/Administration/Self/CheckForUpdatesService.cs

@@ -19,7 +19,7 @@ public sealed class CheckForUpdatesService : IEService, IReadyExecutor
     private readonly IMessageSenderService _sender;
 
 
-    private const string RELEASES_URL = "https://toastielab.dev/api/v1/repos/Emotions-stuff/elliebot/releases";
+    private const string RELEASES_URL = "https://toastielab.dev/Emotions-stuff/elliebot/releases";
 
     public CheckForUpdatesService(
         BotConfigService bcs,

src/EllieBot/Modules/Administration/Self/SelfService.cs

@@ -15,7 +15,7 @@ public sealed class SelfService : IExecNoCommand, IReadyExecutor, IEService
     private readonly IBotStrings _strings;
     private readonly DiscordSocketClient _client;
 
-    private readonly IBotCreds _creds;
+    private readonly IBotCredentials _creds;
 
     private ImmutableDictionary<ulong, IDMChannel> ownerChannels =
         new Dictionary<ulong, IDMChannel>().ToImmutableDictionary();
@@ -36,7 +36,7 @@ public sealed class SelfService : IExecNoCommand, IReadyExecutor, IEService
         CommandHandler cmdHandler,
         DbService db,
         IBotStrings strings,
-        IBotCreds creds,
+        IBotCredentials creds,
         IHttpClientFactory factory,
         BotConfigService bss,
         IPubSub pubSub,

src/EllieBot/Modules/Expressions/EllieExpressionExtensions.cs

@@ -6,6 +6,49 @@ namespace EllieBot.Modules.EllieExpressions;
 
 public static class EllieExpressionExtensions
 {
+    private static string ResolveTriggerString(this string str, DiscordSocketClient client)
+        => str.Replace("%bot.mention%", client.CurrentUser.Mention, StringComparison.Ordinal);
+
+    public static async Task<IUserMessage> Send(
+        this EllieExpression cr,
+        IUserMessage ctx,
+        IReplacementService repSvc,
+        DiscordSocketClient client,
+        IMessageSenderService sender)
+    {
+        var channel = cr.DmResponse ? await ctx.Author.CreateDMChannelAsync() : ctx.Channel;
+
+        var trigger = cr.Trigger.ResolveTriggerString(client);
+        var substringIndex = trigger.Length;
+        if (cr.ContainsAnywhere)
+        {
+            var pos = ctx.Content.AsSpan().GetWordPosition(trigger);
+            if (pos == WordPosition.Start)
+                substringIndex += 1;
+            else if (pos == WordPosition.End)
+                substringIndex = ctx.Content.Length;
+            else if (pos == WordPosition.Middle)
+                substringIndex += ctx.Content.IndexOf(trigger, StringComparison.InvariantCulture);
+        }
+
+        var canMentionEveryone = (ctx.Author as IGuildUser)?.GuildPermissions.MentionEveryone ?? true;
+
+        var repCtx = new ReplacementContext(client: client,
+                guild: (ctx.Channel as ITextChannel)?.Guild as SocketGuild,
+                channel: ctx.Channel,
+                user: ctx.Author
+            )
+            .WithOverride("%target%",
+                () => canMentionEveryone
+                    ? ctx.Content[substringIndex..].Trim()
+                    : ctx.Content[substringIndex..].Trim().SanitizeMentions(true));
+        
+        var text = SmartText.CreateFrom(cr.Response);
+        text = await repSvc.ReplaceAsync(text, repCtx);
+
+        return await sender.Response(channel).Text(text).Sanitize(false).SendAsync();
+    }
+
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static WordPosition GetWordPosition(this ReadOnlySpan<char> str, in ReadOnlySpan<char> word)
     {

src/EllieBot/Modules/Expressions/EllieExpressions.cs

@@ -11,10 +11,10 @@ public partial class EllieExpressions : EllieModule<EllieExpressionsService>
         All
     }
 
-    private readonly IBotCreds _creds;
+    private readonly IBotCredentials _creds;
     private readonly IHttpClientFactory _clientFactory;
 
-    public EllieExpressions(IBotCreds creds, IHttpClientFactory clientFactory)
+    public EllieExpressions(IBotCredentials creds, IHttpClientFactory clientFactory)
     {
         _creds = creds;
         _clientFactory = clientFactory;

src/EllieBot/Modules/Expressions/EllieExpressionsService.cs

@@ -249,54 +249,46 @@ public sealed class EllieExpressionsService : IExecOnMessage, IReadyExecutor
 
         try
         {
-            if (guild is not SocketGuild sg)
+            if (guild is SocketGuild sg)
-                return false;
-
-            var result = await _permChecker.CheckPermsAsync(
-                guild,
-                msg.Channel,
-                msg.Author,
-                "ACTUALEXPRESSIONS",
-                expr.Trigger
-            );
-
-            if (!result.IsAllowed)
             {
-                var cache = _pc.GetCacheFor(guild.Id);
+                var result = await _permChecker.CheckPermsAsync(
-                if (cache.Verbose)
+                    guild,
+                    msg.Channel,
+                    msg.Author,
+                    "ACTUALEXPRESSIONS",
+                    expr.Trigger
+                );
+                
+                if (!result.IsAllowed)
                 {
-                    if (result.TryPickT3(out var disallowed, out _))
+                    var cache = _pc.GetCacheFor(guild.Id);
+                    if (cache.Verbose)
                     {
-                        var permissionMessage = _strings.GetText(strs.perm_prevent(disallowed.PermIndex + 1,
+                        if (result.TryPickT3(out var disallowed, out _))
-                                Format.Bold(disallowed.PermText)),
-                            sg.Id);
-
-                        try
                         {
-                            await _sender.Response(msg.Channel)
+                            var permissionMessage = _strings.GetText(strs.perm_prevent(disallowed.PermIndex + 1,
-                                         .Error(permissionMessage)
+                                    Format.Bold(disallowed.PermText)),
-                                         .SendAsync();
+                                sg.Id);
-                        }
-                        catch
-                        {
-                        }
 
-                        Log.Information("{PermissionMessage}", permissionMessage);
+                            try
+                            {
+                                await _sender.Response(msg.Channel)
+                                             .Error(permissionMessage)
+                                             .SendAsync();
+                            }
+                            catch
+                            {
+                            }
+
+                            Log.Information("{PermissionMessage}", permissionMessage);
+                        }
                     }
-                }
 
-                return true;
+                    return true;
+                }
             }
 
-            var cu = sg.CurrentUser;
+            var sentMsg = await expr.Send(msg, _repSvc, _client, _sender);
-
-            var channel = expr.DmResponse ? await msg.Author.CreateDMChannelAsync() : msg.Channel;
-
-            // have no perms to speak in that channel
-            if (channel is ITextChannel tc && !cu.GetPermissions(tc).SendMessages)
-                return false;
-
-            var sentMsg = await Send(expr, msg, channel);
 
             var reactions = expr.GetReactions();
             foreach (var reaction in reactions)
@@ -344,47 +336,6 @@ public sealed class EllieExpressionsService : IExecOnMessage, IReadyExecutor
         return false;
     }
 
-
-    public string ResolveTriggerString(string str)
-        => str.Replace("%bot.mention%", _client.CurrentUser.Mention, StringComparison.Ordinal);
-
-    public async Task<IUserMessage> Send(
-        EllieExpression cr,
-        IUserMessage ctx,
-        IMessageChannel channel
-    )
-    {
-        var trigger = ResolveTriggerString(cr.Trigger);
-        var substringIndex = trigger.Length;
-        if (cr.ContainsAnywhere)
-        {
-            var pos = ctx.Content.AsSpan().GetWordPosition(trigger);
-            if (pos == WordPosition.Start)
-                substringIndex += 1;
-            else if (pos == WordPosition.End)
-                substringIndex = ctx.Content.Length;
-            else if (pos == WordPosition.Middle)
-                substringIndex += ctx.Content.IndexOf(trigger, StringComparison.InvariantCulture);
-        }
-
-        var canMentionEveryone = (ctx.Author as IGuildUser)?.GuildPermissions.MentionEveryone ?? true;
-
-        var repCtx = new ReplacementContext(client: _client,
-                guild: (ctx.Channel as ITextChannel)?.Guild as SocketGuild,
-                channel: ctx.Channel,
-                user: ctx.Author
-            )
-            .WithOverride("%target%",
-                () => canMentionEveryone
-                    ? ctx.Content[substringIndex..].Trim()
-                    : ctx.Content[substringIndex..].Trim().SanitizeMentions(true));
-
-        var text = SmartText.CreateFrom(cr.Response);
-        text = await _repSvc.ReplaceAsync(text, repCtx);
-
-        return await _sender.Response(channel).Text(text).Sanitize(false).SendAsync();
-    }
-
     public async Task ResetExprReactions(ulong? maybeGuildId, int id)
     {
         EllieExpression expr;
@@ -838,7 +789,7 @@ public sealed class EllieExpressionsService : IExecOnMessage, IReadyExecutor
 
         if (newguildExpressions.TryGetValue(guildId, out var exprs))
         {
-            return (exprs.Where(x => x.Trigger.Contains(query) || x.Response.Contains(query))
+            return (exprs.Where(x => x.Trigger.Contains(query))
                          .Skip(page * 9)
                          .Take(9)
                          .ToArray(), exprs.Length);

src/EllieBot/Modules/Gambling/Gambling.cs

@@ -1,7 +1,6 @@
 #nullable disable
 using LinqToDB;
 using LinqToDB.EntityFrameworkCore;
-using LinqToDB.Tools;
 using EllieBot.Db.Models;
 using EllieBot.Modules.Gambling.Bank;
 using EllieBot.Modules.Gambling.Common;
@@ -128,7 +127,7 @@ public partial class Gambling : GamblingModule<GamblingService>
                     customId: "timely:remind_me"),
                 (smc) => RemindTimelyAction(smc, DateTime.UtcNow.Add(TimeSpan.FromHours(period)))
             );
-
+            
     // Creates timely reminder button, parameter in milliseconds.
     private EllieInteractionBase CreateRemindMeInteraction(double ms)
         => _inter
@@ -167,7 +166,7 @@ public partial class Gambling : GamblingModule<GamblingService>
             await Response().Pending(strs.timely_already_claimed(relativeTag)).Interaction(interaction).SendAsync();
             return;
         }
-
+        
 
         var patron = await _ps.GetPatronAsync(ctx.User.Id);
 
@@ -626,6 +625,8 @@ public partial class Gambling : GamblingModule<GamblingService>
 
         var (opts, _) = OptionsParser.ParseFrom(new LbOpts(), args);
 
+        // List<DiscordUser> cleanRichest;
+        // it's pointless to have clean on dm context
         if (ctx.Guild is null)
         {
             opts.Clean = false;
@@ -639,18 +640,13 @@ public partial class Gambling : GamblingModule<GamblingService>
                 await ctx.Channel.TriggerTypingAsync();
                 await _tracker.EnsureUsersDownloadedAsync(ctx.Guild);
 
-                var users = ((SocketGuild)ctx.Guild).Users.Map(x => x.Id);
-                var perPage = 9;
-
                 await using var uow = _db.GetDbContext();
-                var cleanRichest = await uow.GetTable<DiscordUser>()
-                                            .Where(x => x.UserId.In(users))
-                                            .OrderByDescending(x => x.CurrencyAmount)
-                                            .Skip(curPage * perPage)
-                                            .Take(perPage)
-                                            .ToListAsync();
 
-                return cleanRichest;
+                var cleanRichest = await uow.Set<DiscordUser>()
+                                            .GetTopRichest(_client.CurrentUser.Id, 0, 1000);
+
+                var sg = (SocketGuild)ctx.Guild!;
+                return cleanRichest.Where(x => sg.GetUser(x.UserId) is not null).ToList();
             }
             else
             {
@@ -659,9 +655,13 @@ public partial class Gambling : GamblingModule<GamblingService>
             }
         }
 
+        var res = Response()
+            .Paginated();
+
         await Response()
               .Paginated()
               .PageItems(GetTopRichest)
+              .TotalElements(900)
               .PageSize(9)
               .CurrentPage(page)
               .Page((toSend, curPage) =>

src/EllieBot/Modules/Gambling/VoteRewardService.cs

@@ -14,13 +14,13 @@ public class VoteModel
 public class VoteRewardService : IEService, IReadyExecutor
 {
     private readonly DiscordSocketClient _client;
-    private readonly IBotCreds _creds;
+    private readonly IBotCredentials _creds;
     private readonly ICurrencyService _currencyService;
     private readonly GamblingConfigService _gamb;
 
     public VoteRewardService(
         DiscordSocketClient client,
-        IBotCreds creds,
+        IBotCredentials creds,
         ICurrencyService currencyService,
         GamblingConfigService gamb)
     {

src/EllieBot/Modules/Gambling/Waifus/WaifuClaimCommands.cs

@@ -227,7 +227,7 @@ public partial class Gambling
             if (page > 100)
                 page = 100;
 
-            var waifus = await _service.GetTopWaifusAtPage(page);
+            var waifus = _service.GetTopWaifusAtPage(page).ToList();
 
             if (waifus.Count == 0)
             {

src/EllieBot/Modules/Gambling/Waifus/WaifuService.cs

@@ -15,7 +15,7 @@ public class WaifuService : IEService, IReadyExecutor
     private readonly ICurrencyService _cs;
     private readonly IBotCache _cache;
     private readonly GamblingConfigService _gss;
-    private readonly IBotCreds _creds;
+    private readonly IBotCredentials _creds;
     private readonly DiscordSocketClient _client;
 
     public WaifuService(
@@ -23,7 +23,7 @@ public class WaifuService : IEService, IReadyExecutor
         ICurrencyService cs,
         IBotCache cache,
         GamblingConfigService gss,
-        IBotCreds creds,
+        IBotCredentials creds,
         DiscordSocketClient client)
     {
         _db = db;
@@ -300,10 +300,10 @@ public class WaifuService : IEService, IReadyExecutor
         return (oldAff, success, remaining);
     }
 
-    public async Task<IReadOnlyList<WaifuLbResult>> GetTopWaifusAtPage(int page, int perPage = 9)
+    public IEnumerable<WaifuLbResult> GetTopWaifusAtPage(int page, int perPage = 9)
     {
-        await using var uow = _db.GetDbContext();
+        using var uow = _db.GetDbContext();
-        return await uow.Set<WaifuInfo>().GetTop(perPage, page * perPage);
+        return uow.Set<WaifuInfo>().GetTop(perPage, page * perPage);
     }
 
     public ulong GetWaifuUserId(ulong ownerId, string name)
@@ -577,7 +577,7 @@ public class WaifuService : IEService, IReadyExecutor
                 {
                     await using var uow = _db.GetDbContext();
                     await uow.GetTable<WaifuInfo>()
-                             .Where(x => x.Price > minPrice && x.ClaimerId != null)
+                             .Where(x => x.Price > minPrice && x.ClaimerId == null)
                              .UpdateAsync(old => new()
                              {
                                  Price = (long)(old.Price * claimedMulti)

src/EllieBot/Modules/Gambling/Waifus/db/WaifuExtensions.cs

@@ -25,30 +25,30 @@ public static class WaifuExtensions
         return includes(waifus).AsQueryable().FirstOrDefault(wi => wi.Waifu.UserId == userId);
     }
 
-    public static async Task<IReadOnlyList<WaifuLbResult>> GetTop(this DbSet<WaifuInfo> waifus, int count, int skip = 0)
+    public static IEnumerable<WaifuLbResult> GetTop(this DbSet<WaifuInfo> waifus, int count, int skip = 0)
     {
         ArgumentOutOfRangeException.ThrowIfNegative(count);
 
         if (count == 0)
             return [];
 
-        return await waifus.Include(wi => wi.Waifu)
+        return waifus.Include(wi => wi.Waifu)
-                           .Include(wi => wi.Affinity)
+                     .Include(wi => wi.Affinity)
-                           .Include(wi => wi.Claimer)
+                     .Include(wi => wi.Claimer)
-                           .OrderByDescending(wi => wi.Price)
+                     .OrderByDescending(wi => wi.Price)
-                           .Skip(skip)
+                     .Skip(skip)
-                           .Take(count)
+                     .Take(count)
-                           .Select(x => new WaifuLbResult
+                     .Select(x => new WaifuLbResult
-                           {
+                     {
-                               Affinity = x.Affinity == null ? null : x.Affinity.Username,
+                         Affinity = x.Affinity == null ? null : x.Affinity.Username,
-                               AffinityDiscrim = x.Affinity == null ? null : x.Affinity.Discriminator,
+                         AffinityDiscrim = x.Affinity == null ? null : x.Affinity.Discriminator,
-                               Claimer = x.Claimer == null ? null : x.Claimer.Username,
+                         Claimer = x.Claimer == null ? null : x.Claimer.Username,
-                               ClaimerDiscrim = x.Claimer == null ? null : x.Claimer.Discriminator,
+                         ClaimerDiscrim = x.Claimer == null ? null : x.Claimer.Discriminator,
-                               Username = x.Waifu.Username,
+                         Username = x.Waifu.Username,
-                               Discrim = x.Waifu.Discriminator,
+                         Discrim = x.Waifu.Discriminator,
-                               Price = x.Price
+                         Price = x.Price
-                           })
+                     })
-                            .ToListAsyncEF();
+                     .ToList();
     }
 
     public static decimal GetTotalValue(this DbSet<WaifuInfo> waifus)

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

@@ -19,7 +19,7 @@ public class ChatterBotService : IExecOnMessage
 
     private readonly DiscordSocketClient _client;
     private readonly IPermissionChecker _perms;
-    private readonly IBotCreds _creds;
+    private readonly IBotCredentials _creds;
     private readonly IHttpClientFactory _httpFactory;
     private readonly GamesConfigService _gcs;
     private readonly IMessageSenderService _sender;
@@ -32,7 +32,7 @@ public class ChatterBotService : IExecOnMessage
         IBot bot,
         IPatronageService ps,
         IHttpClientFactory factory,
-        IBotCreds creds,
+        IBotCredentials creds,
         GamesConfigService gcs,
         IMessageSenderService sender,
         DbService db)

src/EllieBot/Modules/Help/Help.cs

@@ -77,7 +77,7 @@ public sealed partial class Help : EllieModule<HelpService>
                 m.Name,
                 null);
 
-#if GLOBAL_ELLIE
+#if GLOBAL_NADEKO
             if (m.Preconditions.Any(x => x is NoPublicBotAttribute))
                 continue;
 #endif

src/EllieBot/Modules/Music/PlaylistCommands.cs

@@ -12,9 +12,9 @@ public sealed partial class Music
     {
         private static readonly SemaphoreSlim _playlistLock = new(1, 1);
         private readonly DbService _db;
-        private readonly IBotCreds _creds;
+        private readonly IBotCredentials _creds;
 
-        public PlaylistCommands(DbService db, IBotCreds creds)
+        public PlaylistCommands(DbService db, IBotCredentials creds)
         {
             _db = db;
             _creds = creds;

src/EllieBot/Modules/Music/_common/Resolvers/YtdlYoutubeResolver.cs

@@ -43,7 +43,8 @@ public sealed class YtdlYoutubeResolver : IYoutubeResolver
                                      + "--no-check-certificate "
                                      + "-i "
                                      + "--yes-playlist "
-                                     + "-- \"{0}\"");
+                                     + "-- \"{0}\"",
+            scs.Data.YtProvider != YoutubeSearcher.Ytdl);
 
         _ytdlIdOperation = new("-4 "
                                + "--geo-bypass "
@@ -55,7 +56,8 @@ public sealed class YtdlYoutubeResolver : IYoutubeResolver
                                + "--get-thumbnail "
                                + "--get-duration "
                                + "--no-check-certificate "
-                               + "-- \"{0}\"");
+                               + "-- \"{0}\"",
+            scs.Data.YtProvider != YoutubeSearcher.Ytdl);
 
         _ytdlSearchOperation = new("-4 "
                                    + "--geo-bypass "
@@ -68,7 +70,8 @@ public sealed class YtdlYoutubeResolver : IYoutubeResolver
                                    + "--get-duration "
                                    + "--no-check-certificate "
                                    + "--default-search "
-                                   + "\"ytsearch:\" -- \"{0}\"");
+                                   + "\"ytsearch:\" -- \"{0}\"",
+            scs.Data.YtProvider != YoutubeSearcher.Ytdl);
     }
 
     private YtTrackData ResolveYtdlData(string ytdlOutputString)

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

@@ -16,11 +16,11 @@ public class CryptoService : IEService
 {
     private readonly IBotCache _cache;
     private readonly IHttpClientFactory _httpFactory;
-    private readonly IBotCreds _creds;
+    private readonly IBotCredentials _creds;
 
     private readonly SemaphoreSlim _getCryptoLock = new(1, 1);
 
-    public CryptoService(IBotCache cache, IHttpClientFactory httpFactory, IBotCreds creds)
+    public CryptoService(IBotCache cache, IHttpClientFactory httpFactory, IBotCredentials creds)
     {
         _cache = cache;
         _httpFactory = httpFactory;

src/EllieBot/Modules/Searches/Osu/OsuCommands.cs

@@ -9,10 +9,10 @@ public partial class Searches
     [Group]
     public partial class OsuCommands : EllieModule<OsuService>
     {
-        private readonly IBotCreds _creds;
+        private readonly IBotCredentials _creds;
         private readonly IHttpClientFactory _httpFactory;
 
-        public OsuCommands(IBotCreds creds, IHttpClientFactory factory)
+        public OsuCommands(IBotCredentials creds, IHttpClientFactory factory)
         {
             _creds = creds;
             _httpFactory = factory;

src/EllieBot/Modules/Searches/Osu/OsuService.cs

@@ -7,9 +7,9 @@ namespace EllieBot.Modules.Searches;
 public sealed class OsuService : IEService
 {
     private readonly IHttpClientFactory _httpFactory;
-    private readonly IBotCreds _creds;
+    private readonly IBotCredentials _creds;
 
-    public OsuService(IHttpClientFactory httpFactory, IBotCreds creds)
+    public OsuService(IHttpClientFactory httpFactory, IBotCredentials creds)
     {
         _httpFactory = httpFactory;
         _creds = creds;

src/EllieBot/Modules/Searches/Search/DefaultSearchServiceFactory.cs

@@ -7,9 +7,10 @@ public sealed class DefaultSearchServiceFactory : ISearchServiceFactory, IEServi
 {
     private readonly SearchesConfigService _scs;
     private readonly SearxSearchService _sss;
-    private readonly YtDlpSearchService _ytdlp;
     private readonly GoogleSearchService _gss;
 
+    private readonly YtdlpYoutubeSearchService _ytdlp;
+    private readonly YtdlYoutubeSearchService _ytdl;
     private readonly YoutubeDataApiSearchService _ytdata;
     private readonly InvidiousYtSearchService _iYtSs;
     private readonly GoogleScrapeService _gscs;
@@ -19,17 +20,19 @@ public sealed class DefaultSearchServiceFactory : ISearchServiceFactory, IEServi
         GoogleSearchService gss,
         GoogleScrapeService gscs,
         SearxSearchService sss,
-        YtDlpSearchService ytdlp,
+        YtdlpYoutubeSearchService ytdlp,
+        YtdlYoutubeSearchService ytdl,
         YoutubeDataApiSearchService ytdata,
         InvidiousYtSearchService iYtSs)
     {
         _scs = scs;
         _sss = sss;
-        _ytdlp = ytdlp;
         _gss = gss;
         _gscs = gscs;
         _iYtSs = iYtSs;
 
+        _ytdlp = ytdlp;
+        _ytdl = ytdl;
         _ytdata = ytdata;
     }
 
@@ -54,8 +57,9 @@ public sealed class DefaultSearchServiceFactory : ISearchServiceFactory, IEServi
         => _scs.Data.YtProvider switch
         {
             YoutubeSearcher.YtDataApiv3 => _ytdata,
-            YoutubeSearcher.Invidious => _iYtSs,
             YoutubeSearcher.Ytdlp => _ytdlp,
-            _ => throw new ArgumentOutOfRangeException()
+            YoutubeSearcher.Ytdl => _ytdl,
+            YoutubeSearcher.Invidious => _iYtSs,
+            _ => _ytdl
         };
 }

src/EllieBot/Modules/Searches/Search/SearchCommands.cs

@@ -93,12 +93,16 @@ public partial class Searches
                 return;
             }
 
+            var embeds = new List<EmbedBuilder>(4);
+
+
             EmbedBuilder CreateEmbed(IImageSearchResultEntry entry)
             {
                 return _sender.CreateEmbed()
                               .WithOkColor()
                               .WithAuthor(ctx.User)
                               .WithTitle(query)
+                              .WithUrl("https://google.com")
                               .WithImageUrl(entry.Link);
             }
 
@@ -116,81 +120,86 @@ public partial class Searches
                                         .WithDescription(GetText(strs.no_search_results));
 
                       var embed = CreateEmbed(item);
+                      embeds.Add(embed);
 
                       return embed;
                   })
                   .SendAsync();
         }
 
-        private TypedKey<string[]> GetYtCacheKey(string query)
+        private TypedKey<string> GetYtCacheKey(string query)
-            => new($"search:yt:{query}");
+            => new($"search:youtube:{query}");
 
-        private async Task AddYoutubeUrlToCacheAsync(string query, string[] url)
+        private async Task AddYoutubeUrlToCacheAsync(string query, string url)
             => await _cache.AddAsync(GetYtCacheKey(query), url, expiry: 1.Hours());
 
-        private async Task<VideoInfo[]?> GetYoutubeUrlFromCacheAsync(string query)
+        private async Task<VideoInfo?> GetYoutubeUrlFromCacheAsync(string query)
         {
             var result = await _cache.GetAsync(GetYtCacheKey(query));
 
-            if (!result.TryGetValue(out var urls) || urls.Length == 0)
+            if (!result.TryGetValue(out var url) || string.IsNullOrWhiteSpace(url))
                 return null;
 
-            return urls.Map(url => new VideoInfo()
+            return new VideoInfo()
             {
                 Url = url
-            });
+            };
         }
 
         [Cmd]
-        public async Task Youtube([Leftover] string query)
+        public async Task Youtube([Leftover] string? query = null)
         {
-            query = query.Trim();
+            query = query?.Trim();
+
+            if (string.IsNullOrWhiteSpace(query))
+            {
+                await Response().Error(strs.specify_search_params).SendAsync();
+                return;
+            }
 
             _ = ctx.Channel.TriggerTypingAsync();
 
-            var maybeResults = await GetYoutubeUrlFromCacheAsync(query)
+            var maybeResult = await GetYoutubeUrlFromCacheAsync(query)
-                               ?? await _searchFactory.GetYoutubeSearchService().SearchAsync(query);
+                              ?? await _searchFactory.GetYoutubeSearchService().SearchAsync(query);
-
+            if (maybeResult is not { } result || result is { Url: null })
-            if (maybeResults is not { } result || result.Length == 0)
             {
                 await Response().Error(strs.no_results).SendAsync();
                 return;
             }
 
-            await AddYoutubeUrlToCacheAsync(query, result.Map(x => x.Url));
+            await AddYoutubeUrlToCacheAsync(query, result.Url);
-
+            await Response().Text(result.Url).SendAsync();
-            await Response().Text(result[0].Url).SendAsync();
         }
 
-        //     [Cmd]
+//     [Cmd]
-        //     public async Task DuckDuckGo([Leftover] string query = null)
+//     public async Task DuckDuckGo([Leftover] string query = null)
-        //     {
+//     {
-        //         query = query?.Trim();
+//         query = query?.Trim();
-        //         if (!await ValidateQuery(query))
+//         if (!await ValidateQuery(query))
-        //             return;
+//             return;
-        //
+//
-        //         _ = ctx.Channel.TriggerTypingAsync();
+//         _ = ctx.Channel.TriggerTypingAsync();
-        //
+//
-        //         var data = await _service.DuckDuckGoSearchAsync(query);
+//         var data = await _service.DuckDuckGoSearchAsync(query);
-        //         if (data is null)
+//         if (data is null)
-        //         {
+//         {
-        //             await Response().Error(strs.no_results).SendAsync();
+//             await Response().Error(strs.no_results).SendAsync();
-        //             return;
+//             return;
-        //         }
+//         }
-        //
+//
-        //         var desc = data.Results.Take(5)
+//         var desc = data.Results.Take(5)
-        //                        .Select(res => $@"[**{res.Title}**]({res.Link})
+//                        .Select(res => $@"[**{res.Title}**]({res.Link})
-        // {res.Text.TrimTo(380 - res.Title.Length - res.Link.Length)}");
+// {res.Text.TrimTo(380 - res.Title.Length - res.Link.Length)}");
-        //
+//
-        //         var descStr = string.Join("\n\n", desc);
+//         var descStr = string.Join("\n\n", desc);
-        //
+//
-        //         var embed = _sender.CreateEmbed()
+//         var embed = _sender.CreateEmbed()
-        //                        .WithAuthor(ctx.User.ToString(),
+//                        .WithAuthor(ctx.User.ToString(),
-        //                            "https://upload.wikimedia.org/wikipedia/en/9/90/The_DuckDuckGo_Duck.png")
+//                            "https://upload.wikimedia.org/wikipedia/en/9/90/The_DuckDuckGo_Duck.png")
-        //                        .WithDescription($"{GetText(strs.search_for)} **{query}**\n\n" + descStr)
+//                        .WithDescription($"{GetText(strs.search_for)} **{query}**\n\n" + descStr)
-        //                        .WithOkColor();
+//                        .WithOkColor();
-        //
+//
-        //         await Response().Embed(embed).SendAsync();
+//         await Response().Embed(embed).SendAsync();
-        //     }
+//     }
     }
 }

src/EllieBot/Modules/Searches/Search/Youtube/IYoutubeSearchService.cs

@@ -2,5 +2,5 @@
 
 public interface IYoutubeSearchService
 {
-    Task<VideoInfo[]?> SearchAsync(string query);
+    Task<VideoInfo?> SearchAsync(string query);
 }

src/EllieBot/Modules/Searches/Search/Youtube/InvidiousYtSearchService.cs

@@ -18,7 +18,7 @@ public sealed class InvidiousYtSearchService : IYoutubeSearchService, IEService
         _rng = new();
     }
 
-    public async Task<VideoInfo[]?> SearchAsync(string query)
+    public async Task<VideoInfo?> SearchAsync(string query)
     {
         ArgumentNullException.ThrowIfNull(query);
 
@@ -35,7 +35,6 @@ public sealed class InvidiousYtSearchService : IYoutubeSearchService, IEService
         var url = $"{instance}/api/v1/search"
                   + $"?q={query}"
                   + $"&type=video";
-
         using var http = _http.CreateClient();
         var res = await http.GetFromJsonAsync<List<InvidiousSearchResponse>>(
             url);
@@ -43,6 +42,6 @@ public sealed class InvidiousYtSearchService : IYoutubeSearchService, IEService
         if (res is null or { Count: 0 })
             return null;
 
-        return res.Map(r => new VideoInfo(r.VideoId));
+        return new VideoInfo(res[0].VideoId);
     }
 }

src/EllieBot/Modules/Searches/Search/Youtube/YoutubeDataApiSearchService.cs

@@ -9,15 +9,18 @@ public sealed class YoutubeDataApiSearchService : IYoutubeSearchService, IEServi
         _gapi = gapi;
     }
 
-    public async Task<VideoInfo[]?> SearchAsync(string query)
+    public async Task<VideoInfo?> SearchAsync(string query)
     {
         ArgumentNullException.ThrowIfNull(query);
 
         var results = await _gapi.GetVideoLinksByKeywordAsync(query);
-
+        var first = results.FirstOrDefault();
-        if (results.Count == 0)
+        if (first is null)
             return null;
 
-        return results.Map(r => new VideoInfo(r));
+        return new()
+        {
+            Url = first
+        };
     }
 }

src/EllieBot/Modules/Searches/Search/Youtube/YtDlpSearchService.cs

@@ -1,26 +0,0 @@
-namespace EllieBot.Modules.Searches.Youtube;
-
-public class YtDlpSearchService : IYoutubeSearchService, IEService
-{
-    private YtdlOperation CreateYtdlOp(int count)
-        => new YtdlOperation("-4 "
-                             + "--ignore-errors --flat-playlist --skip-download --quiet "
-                             + "--geo-bypass "
-                             + "--encoding UTF8 "
-                             + "--get-id "
-                             + "--no-check-certificate "
-                             + "--default-search "
-                             + $"\"ytsearch{count}:\" -- \"{{0}}\"");
-
-    public async Task<VideoInfo[]?> SearchAsync(string query)
-    {
-        var op = CreateYtdlOp(5);
-        var data = await op.GetDataAsync(query);
-        var items = data?.Split('\n');
-        if (items is null or { Length: 0 })
-            return null;
-
-        return items
-            .Map(x => new VideoInfo(x));
-    }
-}

src/EllieBot/Modules/Searches/Search/Youtube/YtdlYoutubeSearchService.cs

@@ -0,0 +1,7 @@
+namespace EllieBot.Modules.Searches.Youtube;
+
+public sealed class YtdlYoutubeSearchService : YoutubedlxServiceBase, IEService
+{
+    public override async Task<VideoInfo?> SearchAsync(string query)
+        => await InternalGetInfoAsync(query, false);
+}

src/EllieBot/Modules/Searches/Search/Youtube/YtdlpYoutubeSearchService.cs

@@ -0,0 +1,7 @@
+namespace EllieBot.Modules.Searches.Youtube;
+
+public sealed class YtdlpYoutubeSearchService : YoutubedlxServiceBase, IEService
+{
+    public override async Task<VideoInfo?> SearchAsync(string query)
+        => await InternalGetInfoAsync(query, true);
+}

src/EllieBot/Modules/Searches/Search/Youtube/YtdlxServiceBase.cs

@@ -0,0 +1,34 @@
+namespace EllieBot.Modules.Searches.Youtube;
+
+public abstract class YoutubedlxServiceBase : IYoutubeSearchService
+{
+    private YtdlOperation CreateYtdlOp(bool isYtDlp)
+        => new YtdlOperation("-4 "
+                             + "--geo-bypass "
+                             + "--encoding UTF8 "
+                             + "--get-id "
+                             + "--no-check-certificate "
+                             + "--default-search "
+                             + "\"ytsearch:\" -- \"{0}\"",
+            isYtDlp: isYtDlp);
+
+    protected async Task<VideoInfo?> InternalGetInfoAsync(string query, bool isYtDlp)
+    {
+        var op = CreateYtdlOp(isYtDlp);
+        var data = await op.GetDataAsync(query);
+        var items = data?.Split('\n');
+        if (items is null or { Length: 0 })
+            return null;
+
+        var id = items.FirstOrDefault(x => x.Length is > 5 and < 15);
+        if (id is null)
+            return null;
+
+        return new VideoInfo()
+        {
+            Url = $"https://youtube.com/watch?v={id}"
+        };
+    }
+
+    public abstract Task<VideoInfo?> SearchAsync(string query);
+}

src/EllieBot/Modules/Searches/Searches.cs

@@ -13,14 +13,14 @@ namespace EllieBot.Modules.Searches;
 
 public partial class Searches : EllieModule<SearchesService>
 {
-    private readonly IBotCreds _creds;
+    private readonly IBotCredentials _creds;
     private readonly IGoogleApiService _google;
     private readonly IHttpClientFactory _httpFactory;
     private readonly IMemoryCache _cache;
     private readonly ITimezoneService _tzSvc;
 
     public Searches(
-        IBotCreds creds,
+        IBotCredentials creds,
         IGoogleApiService google,
         IHttpClientFactory factory,
         IMemoryCache cache,

src/EllieBot/Modules/Searches/_common/Config/SearchesConfig.cs

@@ -28,9 +28,11 @@ public partial class SearchesConfig : ICloneable<SearchesConfig>
     [Comment("""
              Which search provider will be used for the `.youtube` and `.q` commands.
 
-             - `ytDataApiv3` - uses google's official youtube data api. Requires `GoogleApiKey` set in creds and youtube data api enabled in developers console. `.q` is not supported for this setting. It will fallback to yt-dlp.
+             - `ytDataApiv3` - uses google's official youtube data api. Requires `GoogleApiKey` set in creds and youtube data api enabled in developers console
 
-             - `ytdlp` - default, recommended easy, uses `yt-dlp`. Requires `yt-dlp` to be installed and it's path added to env variables
+             - `ytdl` - default, uses youtube-dl. Requires `youtube-dl` to be installed and it's path added to env variables. Slow.
+
+             - `ytdlp` - recommended easy, uses `yt-dlp`. Requires `yt-dlp` to be installed and it's path added to env variables
 
              - `invidious` - recommended advanced, uses invidious api. Requires at least one invidious instance specified in the `invidiousInstances` property
              """)]
@@ -75,9 +77,9 @@ public sealed class FollowedStreamConfig
 
 public enum YoutubeSearcher
 {
-    YtDataApiv3 = 0,
+    YtDataApiv3,
-    Ytdl = 1,
+    Ytdl,
-    Ytdlp = 1,
+    Ytdlp,
-    Invid = 3,
+    Invid,
     Invidious = 3
 }

src/EllieBot/Modules/Searches/_common/Config/SearchesConfigService.cs

@@ -47,11 +47,19 @@ public class SearchesConfigService : ConfigServiceBase<SearchesConfig>
             });
         }
 
-        if (data.Version < 4)
+        if (data.Version < 2)
         {
             ModifyConfig(c =>
             {
-                c.Version = 4;
+                c.Version = 2;
+            });
+        }
+        
+        if (data.Version < 3)
+        {
+            ModifyConfig(c =>
+            {
+                c.Version = 3;
             });
         }
     }

src/EllieBot/Modules/Utility/Giveaway/GiveawayService.cs

@@ -11,7 +11,7 @@ public sealed class GiveawayService : IEService, IReadyExecutor
     public static string GiveawayEmoji = "🎉";
 
     private readonly DbService _db;
-    private readonly IBotCreds _creds;
+    private readonly IBotCredentials _creds;
     private readonly DiscordSocketClient _client;
     private readonly IMessageSenderService _sender;
     private readonly IBotStrings _strings;
@@ -20,7 +20,7 @@ public sealed class GiveawayService : IEService, IReadyExecutor
     private SortedSet<GiveawayModel> _giveawayCache = new SortedSet<GiveawayModel>();
     private readonly EllieRandom _rng;
 
-    public GiveawayService(DbService db, IBotCreds creds, DiscordSocketClient client,
+    public GiveawayService(DbService db, IBotCredentials creds, DiscordSocketClient client,
         IMessageSenderService sender, IBotStrings strings, ILocalization localization, IMemoryCache cache)
     {
         _db = db;

src/EllieBot/Modules/Utility/Remind/RemindService.cs

@@ -17,14 +17,14 @@ public class RemindService : IEService, IReadyExecutor, IRemindService
 
     private readonly DiscordSocketClient _client;
     private readonly DbService _db;
-    private readonly IBotCreds _creds;
+    private readonly IBotCredentials _creds;
     private readonly IMessageSenderService _sender;
     private readonly CultureInfo _culture;
 
     public RemindService(
         DiscordSocketClient client,
         DbService db,
-        IBotCreds creds,
+        IBotCredentials creds,
         IMessageSenderService sender)
     {
         _client = client;

src/EllieBot/Modules/Utility/Repeater/RepeaterService.cs

@@ -12,7 +12,7 @@ public sealed class RepeaterService : IReadyExecutor, IEService
 
     private readonly DbService _db;
     private readonly IReplacementService _repSvc;
-    private readonly IBotCreds _creds;
+    private readonly IBotCredentials _creds;
     private readonly DiscordSocketClient _client;
     private readonly LinkedList<RunningRepeater> _repeaterQueue;
     private readonly ConcurrentHashSet<int> _noRedundant;
@@ -25,7 +25,7 @@ public sealed class RepeaterService : IReadyExecutor, IEService
         DiscordSocketClient client,
         DbService db,
         IReplacementService repSvc,
-        IBotCreds creds,
+        IBotCredentials creds,
         IMessageSenderService sender)
     {
         _db = db;

src/EllieBot/Modules/Utility/Utility.cs

@@ -34,7 +34,7 @@ public partial class Utility : EllieModule
     private readonly DiscordSocketClient _client;
     private readonly ICoordinator _coord;
     private readonly IStatsService _stats;
-    private readonly IBotCreds _creds;
+    private readonly IBotCredentials _creds;
     private readonly DownloadTracker _tracker;
     private readonly IHttpClientFactory _httpFactory;
     private readonly VerboseErrorsService _veService;
@@ -45,7 +45,7 @@ public partial class Utility : EllieModule
         DiscordSocketClient client,
         ICoordinator coord,
         IStatsService stats,
-        IBotCreds creds,
+        IBotCredentials creds,
         DownloadTracker tracker,
         IHttpClientFactory httpFactory,
         VerboseErrorsService veService,

src/EllieBot/Modules/Xp/Xp.cs

@@ -183,26 +183,27 @@ public partial class Xp : EllieModule<XpService>
 
         await ctx.Channel.TriggerTypingAsync();
 
-        
+        var socketGuild = (SocketGuild)ctx.Guild;
-        async Task<IReadOnlyCollection<UserXpStats>> GetPageItems(int curPage)
+        var allCleanUsers = new List<UserXpStats>();
+        if (opts.Clean)
         {
-            var socketGuild = (SocketGuild)ctx.Guild;
+            await ctx.Channel.TriggerTypingAsync();
-            if (opts.Clean)
+            await _tracker.EnsureUsersDownloadedAsync(ctx.Guild);
-            {
-                await ctx.Channel.TriggerTypingAsync();
-                await _tracker.EnsureUsersDownloadedAsync(ctx.Guild);
 
-                return await _service.GetTopUserXps(ctx.Guild.Id,
+            allCleanUsers = (await _service.GetTopUserXps(ctx.Guild.Id, 1000))
-                    socketGuild.Users.Select(x => x.Id).ToList(),
+                            .Where(user => socketGuild.GetUser(user.UserId) is not null)
-                    curPage);
+                            .ToList();
-            }
-
-            return await _service.GetUserXps(ctx.Guild.Id, curPage);
         }
 
-        await Response()
+        var res = opts.Clean
+            ? Response()
               .Paginated()
-              .PageItems(GetPageItems)
+              .Items(allCleanUsers)
+            : Response()
+              .Paginated()
+              .PageItems((curPage) => _service.GetUserXps(ctx.Guild.Id, curPage));
+
+        await res
               .PageSize(9)
               .CurrentPage(page)
               .Page((users, curPage) =>

src/EllieBot/Modules/Xp/XpService.cs

@@ -12,7 +12,6 @@ using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
 using System.Threading.Channels;
 using LinqToDB.EntityFrameworkCore;
-using LinqToDB.Tools;
 using EllieBot.Modules.Patronage;
 using Color = SixLabors.ImageSharp.Color;
 using Exception = System.Exception;
@@ -26,7 +25,7 @@ public class XpService : IEService, IReadyExecutor, IExecNoCommand
     private readonly IImageCache _images;
     private readonly IBotStrings _strings;
     private readonly FontProvider _fonts;
-    private readonly IBotCreds _creds;
+    private readonly IBotCredentials _creds;
     private readonly ICurrencyService _cs;
     private readonly IHttpClientFactory _httpFactory;
     private readonly XpConfigService _xpConfig;
@@ -56,7 +55,7 @@ public class XpService : IEService, IReadyExecutor, IExecNoCommand
         IImageCache images,
         IBotCache c,
         FontProvider fonts,
-        IBotCreds creds,
+        IBotCredentials creds,
         ICurrencyService cs,
         IHttpClientFactory http,
         XpConfigService xpConfig,
@@ -192,9 +191,9 @@ public class XpService : IEService, IReadyExecutor, IExecNoCommand
                     var items = await ctx.Set<DiscordUser>()
                                          .Where(x => group.Contains(x.UserId))
                                          .UpdateWithOutputAsync(old => new()
-                                         {
+                                             {
-                                             TotalXp = old.TotalXp + group.Key
+                                                 TotalXp = old.TotalXp + group.Key
-                                         },
+                                             },
                                              (_, n) => n);
 
                     await ctx.Set<ClubInfo>()
@@ -217,9 +216,9 @@ public class XpService : IEService, IReadyExecutor, IExecNoCommand
                                           .Where(x => x.GuildId == guildId)
                                           .Where(x => group.Contains(x.UserId))
                                           .UpdateWithOutputAsync(old => new()
-                                          {
+                                              {
-                                              Xp = old.Xp + group.Key
+                                                  Xp = old.Xp + group.Key
-                                          },
+                                              },
                                               (_, n) => n);
 
                         gxps.AddRange(items);
@@ -231,14 +230,14 @@ public class XpService : IEService, IReadyExecutor, IExecNoCommand
                                   .Set<UserXpStats>()
                                   .ToLinqToDBTable()
                                   .InsertOrUpdateAsync(() => new UserXpStats()
-                                  {
+                                      {
-                                      UserId = userId,
+                                          UserId = userId,
-                                      GuildId = guildId,
+                                          GuildId = guildId,
-                                      Xp = group.Key,
+                                          Xp = group.Key,
-                                      DateAdded = DateTime.UtcNow,
+                                          DateAdded = DateTime.UtcNow,
-                                      AwardedXp = 0,
+                                          AwardedXp = 0,
-                                      NotifyOnLevelUp = XpNotificationLocation.None
+                                          NotifyOnLevelUp = XpNotificationLocation.None
-                                  },
+                                      },
                                       _ => new()
                                       {
                                       },
@@ -567,24 +566,13 @@ public class XpService : IEService, IReadyExecutor, IExecNoCommand
     public async Task<IReadOnlyCollection<UserXpStats>> GetUserXps(ulong guildId, int page)
     {
         await using var uow = _db.GetDbContext();
-        return await uow
+        return await uow.Set<UserXpStats>().GetUsersFor(guildId, page);
-                     .UserXpStats
-                     .Where(x => x.GuildId == guildId)
-                     .OrderByDescending(x => x.Xp + x.AwardedXp)
-                     .Skip(page * 9)
-                     .Take(9)
-                     .ToArrayAsyncLinqToDB();
     }
 
-    public async Task<IReadOnlyCollection<UserXpStats>> GetTopUserXps(ulong guildId, List<ulong> users, int curPage)
+    public async Task<IReadOnlyCollection<UserXpStats>> GetTopUserXps(ulong guildId, int count)
     {
         await using var uow = _db.GetDbContext();
-        return await uow.Set<UserXpStats>()
+        return await uow.Set<UserXpStats>().GetTopUserXps(guildId, count);
-                        .Where(x => x.GuildId == guildId && x.UserId.In(users))
-                        .OrderByDescending(x => x.Xp + x.AwardedXp)
-                        .Skip(curPage * 9)
-                        .Take(9)
-                        .ToArrayAsyncLinqToDB();
     }
 
     public Task<IReadOnlyCollection<DiscordUser>> GetUserXps(int page, int perPage = 9)
@@ -1023,12 +1011,12 @@ public class XpService : IEService, IReadyExecutor, IExecNoCommand
                 img.Mutate(x =>
                 {
                     x.DrawText(new RichTextOptions(usernameFont)
-                    {
+                        {
-                        HorizontalAlignment = HorizontalAlignment.Left,
+                            HorizontalAlignment = HorizontalAlignment.Left,
-                        VerticalAlignment = VerticalAlignment.Center,
+                            VerticalAlignment = VerticalAlignment.Center,
-                        FallbackFontFamilies = _fonts.FallBackFonts,
+                            FallbackFontFamilies = _fonts.FallBackFonts,
-                        Origin = new(template.User.Name.Pos.X, template.User.Name.Pos.Y + 8)
+                            Origin = new(template.User.Name.Pos.X, template.User.Name.Pos.Y + 8)
-                    },
+                        },
                         "@" + username,
                         Brushes.Solid(template.User.Name.Color),
                         outlinePen);
@@ -1044,12 +1032,12 @@ public class XpService : IEService, IReadyExecutor, IExecNoCommand
                 var clubFont = _fonts.NotoSans.CreateFont(template.Club.Name.FontSize, FontStyle.Regular);
 
                 img.Mutate(x => x.DrawText(new RichTextOptions(clubFont)
-                {
+                    {
-                    HorizontalAlignment = HorizontalAlignment.Right,
+                        HorizontalAlignment = HorizontalAlignment.Right,
-                    VerticalAlignment = VerticalAlignment.Top,
+                        VerticalAlignment = VerticalAlignment.Top,
-                    FallbackFontFamilies = _fonts.FallBackFonts,
+                        FallbackFontFamilies = _fonts.FallBackFonts,
-                    Origin = new(template.Club.Name.Pos.X + 50, template.Club.Name.Pos.Y - 8)
+                        Origin = new(template.Club.Name.Pos.X + 50, template.Club.Name.Pos.Y - 8)
-                },
+                    },
                     clubName,
                     Brushes.Solid(template.Club.Name.Color),
                     outlinePen));
@@ -1261,9 +1249,9 @@ public class XpService : IEService, IReadyExecutor, IExecNoCommand
             if (template.Club.Icon.Show)
                 await DrawClubImage(img, stats);
 
-            // #if GLOBAL_ELLIE
+// #if GLOBAL_ELLIE
             await DrawFrame(img, stats.User.UserId);
-            // #endif
+// #endif
 
             var outputSize = template.OutputSize;
             if (outputSize.X != img.Width || outputSize.Y != img.Height)
@@ -1321,7 +1309,7 @@ public class XpService : IEService, IReadyExecutor, IExecNoCommand
         if (frame is not null)
             img.Mutate(x => x.DrawImage(frame, new Point(0, 0), new GraphicsOptions()));
     }
-    // #endif
+// #endif
 
     private void DrawXpBar(float percent, XpBar info, Image<Rgba32> img)
     {

src/EllieBot/Program.cs

@@ -1,4 +1,6 @@
-var shardId = 0;
+var pid = Environment.ProcessId;
+
+var shardId = 0;
 int? totalShards = null; // 0 to read from creds.yml
 if (args.Length > 0 && args[0] != "run")
 {
@@ -20,5 +22,7 @@ if (args.Length > 0 && args[0] != "run")
     }
 }
 
+LogSetup.SetupLogger(shardId);
+Log.Information("Pid: {ProcessId}", pid);
 
 await new Bot(shardId, totalShards, Environment.GetEnvironmentVariable("EllieBot__creds")).RunAndBlockAsync();

src/EllieBot/Services/GrpcApi/ExprsSvc.cs

@@ -1,76 +0,0 @@
-using Google.Protobuf.WellKnownTypes;
-using Grpc.Core;
-using EllieBot.Db.Models;
-using EllieBot.Modules.EllieExpressions;
-
-namespace EllieBot.GrpcApi;
-
-public class ExprsSvc : GrpcExprs.GrpcExprsBase, IEService
-{
-    private readonly EllieExpressionsService _svc;
-
-    public ExprsSvc(EllieExpressionsService svc)
-    {
-        _svc = svc;
-    }
-
-    [GrpcApiPerm(GuildPerm.Administrator)]
-    public override async Task<AddExprReply> AddExpr(AddExprRequest request, ServerCallContext context)
-    {
-        EllieExpression expr;
-        if (!string.IsNullOrWhiteSpace(request.Expr.Id))
-        {
-            expr = await _svc.EditAsync(request.GuildId,
-                new kwum(request.Expr.Id),
-                request.Expr.Response,
-                request.Expr.Ca,
-                request.Expr.Ad,
-                request.Expr.Dm);
-        }
-        else
-        {
-            expr = await _svc.AddAsync(request.GuildId,
-                request.Expr.Trigger,
-                request.Expr.Response,
-                request.Expr.Ca,
-                request.Expr.Ad,
-                request.Expr.Dm);
-        }
-
-
-        return new AddExprReply()
-        {
-            Id = new kwum(expr.Id).ToString(),
-            Success = true,
-        };
-    }
-
-    [GrpcApiPerm(GuildPerm.Administrator)]
-    public override async Task<GetExprsReply> GetExprs(GetExprsRequest request, ServerCallContext context)
-    {
-        var (exprs, totalCount) = await _svc.FindExpressionsAsync(request.GuildId, request.Query, request.Page);
-
-        var reply = new GetExprsReply();
-        reply.TotalCount = totalCount;
-        reply.Expressions.AddRange(exprs.Select(x => new ExprDto()
-        {
-            Ad = x.AutoDeleteTrigger,
-            At = x.AllowTarget,
-            Ca = x.ContainsAnywhere,
-            Dm = x.DmResponse,
-            Response = x.Response,
-            Id = new kwum(x.Id).ToString(),
-            Trigger = x.Trigger,
-        }));
-
-        return reply;
-    }
-
-    [GrpcApiPerm(GuildPerm.Administrator)]
-    public override async Task<Empty> DeleteExpr(DeleteExprRequest request, ServerCallContext context)
-    {
-        await _svc.DeleteAsync(request.GuildId, new kwum(request.Id));
-
-        return new Empty();
-    }
-}

src/EllieBot/Services/GrpcApi/GreetByeSvc.cs

@@ -1,124 +0,0 @@
-using Grpc.Core;
-using GreetType = EllieBot.Services.GreetType;
-
-namespace EllieBot.GrpcApi;
-
-public sealed class GreetByeSvc : GrpcGreet.GrpcGreetBase, IEService
-{
-    private readonly GreetService _gs;
-    private readonly DiscordSocketClient _client;
-
-    public GreetByeSvc(GreetService gs, DiscordSocketClient client)
-    {
-        _gs = gs;
-        _client = client;
-    }
-
-    public GreetSettings GetDefaultGreet(GreetType type)
-        => new GreetSettings()
-        {
-            GreetType = type
-        };
-
-    private static GrpcGreetSettings ToConf(GreetSettings? conf)
-    {
-        if (conf is null)
-            return new GrpcGreetSettings();
-
-        return new GrpcGreetSettings()
-        {
-            Message = conf.MessageText,
-            Type = (GrpcGreetType)conf.GreetType,
-            ChannelId = conf.ChannelId ?? 0,
-            IsEnabled = conf.IsEnabled,
-        };
-    }
-
-    [GrpcApiPerm(GuildPerm.Administrator)]
-    public override async Task<GetGreetReply> GetGreetSettings(GetGreetRequest request, ServerCallContext context)
-    {
-        var guildId = request.GuildId;
-
-        var greetConf = await _gs.GetGreetSettingsAsync(guildId, GreetType.Greet);
-        var byeConf = await _gs.GetGreetSettingsAsync(guildId, GreetType.Bye);
-        var boostConf = await _gs.GetGreetSettingsAsync(guildId, GreetType.Boost);
-        var greetDmConf = await _gs.GetGreetSettingsAsync(guildId, GreetType.GreetDm);
-        // todo timer
-
-        return new GetGreetReply()
-        {
-            Greet = ToConf(greetConf),
-            Bye = ToConf(byeConf),
-            Boost = ToConf(boostConf),
-            GreetDm = ToConf(greetDmConf)
-        };
-    }
-
-    [GrpcApiPerm(GuildPerm.Administrator)]
-    public override async Task<UpdateGreetReply> UpdateGreet(UpdateGreetRequest request, ServerCallContext context)
-    {
-        var gid = request.GuildId;
-        var s = request.Settings;
-        var msg = s.Message;
-
-        await _gs.SetMessage(gid, GetGreetType(s.Type), msg);
-        await _gs.SetGreet(gid, s.ChannelId, GetGreetType(s.Type), s.IsEnabled);
-
-        return new()
-        {
-            Success = true
-        };
-    }
-
-    [GrpcApiPerm(GuildPerm.Administrator)]
-    public override Task<TestGreetReply> TestGreet(TestGreetRequest request, ServerCallContext context)
-        => TestGreet(request.GuildId, request.ChannelId, request.UserId, request.Type);
-
-    private async Task<TestGreetReply> TestGreet(
-        ulong guildId,
-        ulong channelId,
-        ulong userId,
-        GrpcGreetType gtDto)
-    {
-        var g = _client.GetGuild(guildId) as IGuild;
-        if (g is null)
-        {
-            return new()
-            {
-                Error = "Guild doesn't exist",
-                Success = false,
-            };
-        }
-
-        var gu = await g.GetUserAsync(userId);
-        var ch = await g.GetTextChannelAsync(channelId);
-
-        if (gu is null || ch is null)
-            return new TestGreetReply()
-            {
-                Error = "Guild or channel doesn't exist",
-                Success = false,
-            };
-
-
-        var gt = GetGreetType(gtDto);
-
-        await _gs.Test(guildId, gt, ch, gu);
-        return new TestGreetReply()
-        {
-            Success = true
-        };
-    }
-
-    private static GreetType GetGreetType(GrpcGreetType gtDto)
-    {
-        return gtDto switch
-        {
-            GrpcGreetType.Greet => GreetType.Greet,
-            GrpcGreetType.GreetDm => GreetType.GreetDm,
-            GrpcGreetType.Bye => GreetType.Bye,
-            GrpcGreetType.Boost => GreetType.Boost,
-            _ => throw new ArgumentOutOfRangeException(nameof(gtDto), gtDto, null)
-        };
-    }
-}

src/EllieBot/Services/GrpcApi/OtherSvc.cs

@@ -1,199 +0,0 @@
-using Google.Protobuf.WellKnownTypes;
-using Grpc.Core;
-using EllieBot.Modules.Gambling.Services;
-using EllieBot.Modules.Xp.Services;
-
-namespace EllieBot.GrpcApi;
-
-public static class GrpcApiExtensions
-{
-    public static ulong GetUserId(this ServerCallContext context)
-        => ulong.Parse(context.RequestHeaders.FirstOrDefault(x => x.Key == "userid")!.Value);
-}
-
-public sealed class OtherSvc : GrpcOther.GrpcOtherBase, IEService
-{
-    private readonly IDiscordClient _client;
-    private readonly XpService _xp;
-    private readonly ICurrencyService _cur;
-    private readonly WaifuService _waifus;
-    private readonly ICoordinator _coord;
-    private readonly IStatsService _stats;
-
-    public OtherSvc(
-        DiscordSocketClient client,
-        XpService xp,
-        ICurrencyService cur,
-        WaifuService waifus,
-        ICoordinator coord,
-        IStatsService stats)
-    {
-        _client = client;
-        _xp = xp;
-        _cur = cur;
-        _waifus = waifus;
-        _coord = coord;
-        _stats = stats;
-    }
-
-    public override async Task<GetGuildsReply> GetGuilds(Empty request, ServerCallContext context)
-    {
-        var guilds = await _client.GetGuildsAsync(CacheMode.CacheOnly);
-
-        var reply = new GetGuildsReply();
-        var userId = context.GetUserId();
-
-        var toReturn = new List<IGuild>();
-        foreach (var g in guilds)
-        {
-            var user = await g.GetUserAsync(userId, CacheMode.AllowDownload);
-            if (user.GuildPermissions.Has(GuildPermission.Administrator))
-                toReturn.Add(g);
-        }
-
-        reply.Guilds.AddRange(toReturn
-            .Select(x => new GuildReply()
-            {
-                Id = x.Id,
-                Name = x.Name,
-                IconUrl = x.IconUrl
-            }));
-
-        return reply;
-    }
-
-    [GrpcApiPerm(GuildPerm.Administrator)]
-    public override async Task<GetTextChannelsReply> GetTextChannels(
-        GetTextChannelsRequest request,
-        ServerCallContext context)
-    {
-        var g = await _client.GetGuildAsync(request.GuildId);
-        var reply = new GetTextChannelsReply();
-
-        var chs = await g.GetTextChannelsAsync();
-
-        reply.TextChannels.AddRange(chs.Select(x => new TextChannelReply()
-        {
-            Id = x.Id,
-            Name = x.Name,
-        }));
-
-        return reply;
-    }
-
-    public override async Task<CurrencyLbReply> GetCurrencyLb(GetLbRequest request, ServerCallContext context)
-    {
-        var users = await _cur.GetTopRichest(_client.CurrentUser.Id, request.Page, request.PerPage);
-
-        var reply = new CurrencyLbReply();
-        var entries = users.Select(async x =>
-        {
-            var user = await _client.GetUserAsync(x.UserId, CacheMode.CacheOnly);
-            return new CurrencyLbEntryReply()
-            {
-                Amount = x.CurrencyAmount,
-                User = user?.ToString() ?? x.Username,
-                UserId = x.UserId,
-                Avatar = user?.RealAvatarUrl().ToString() ?? x.RealAvatarUrl()?.ToString()
-            };
-        });
-
-        reply.Entries.AddRange(await entries.WhenAll());
-
-        return reply;
-    }
-
-    public override async Task<XpLbReply> GetXpLb(GetLbRequest request, ServerCallContext context)
-    {
-        var users = await _xp.GetUserXps(request.Page, request.PerPage);
-
-        var reply = new XpLbReply();
-
-        var entries = users.Select(x =>
-        {
-            var lvl = new LevelStats(x.TotalXp);
-
-            return new XpLbEntryReply()
-            {
-                Level = lvl.Level,
-                TotalXp = x.TotalXp,
-                User = x.Username,
-                UserId = x.UserId
-            };
-        });
-
-        reply.Entries.AddRange(entries);
-
-        return reply;
-    }
-
-    public override async Task<WaifuLbReply> GetWaifuLb(GetLbRequest request, ServerCallContext context)
-    {
-        var waifus = await _waifus.GetTopWaifusAtPage(request.Page, request.PerPage);
-
-        var reply = new WaifuLbReply();
-        reply.Entries.AddRange(waifus.Select(x => new WaifuLbEntry()
-        {
-            ClaimedBy = x.Claimer ?? string.Empty,
-            IsMutual = x.Claimer == x.Affinity,
-            Value = x.Price,
-            User = x.Username,
-        }));
-        return reply;
-    }
-
-    public override Task<GetShardStatusesReply> GetShardStatuses(Empty request, ServerCallContext context)
-    {
-        var reply = new GetShardStatusesReply();
-
-        // todo cache
-        var shards = _coord.GetAllShardStatuses();
-
-        reply.Shards.AddRange(shards.Select(x => new ShardStatusReply()
-        {
-            Id = x.ShardId,
-            Status = x.ConnectionState.ToString(),
-            GuildCount = x.GuildCount,
-            LastUpdate = Timestamp.FromDateTime(x.LastUpdate),
-        }));
-
-        return Task.FromResult(reply);
-    }
-
-    [GrpcApiPerm(GuildPerm.Administrator)]
-    public override async Task<GetServerInfoReply> GetServerInfo(ServerInfoRequest request, ServerCallContext context)
-    {
-        var info = await _stats.GetGuildInfoAsync(request.GuildId);
-
-        var reply = new GetServerInfoReply()
-        {
-            Id = info.Id,
-            Name = info.Name,
-            IconUrl = info.IconUrl,
-            OwnerId = info.OwnerId,
-            OwnerName = info.Owner,
-            TextChannels = info.TextChannels,
-            VoiceChannels = info.VoiceChannels,
-            MemberCount = info.MemberCount,
-            CreatedAt = info.CreatedAt.Ticks,
-        };
-
-        reply.Features.AddRange(info.Features);
-        reply.Emojis.AddRange(info.Emojis.Select(x => new EmojiReply()
-        {
-            Name = x.Name,
-            Url = x.Url,
-            Code = x.ToString()
-        }));
-
-        reply.Roles.AddRange(info.Roles.Select(x => new RoleReply()
-        {
-            Id = x.Id,
-            Name = x.Name,
-            IconUrl = x.GetIconUrl() ?? string.Empty,
-            Color = x.Color.ToString()
-        }));
-
-        return reply;
-    }
-}

src/EllieBot/Services/GrpcApiService.cs

@@ -1,69 +0,0 @@
-using Grpc.Core;
-using Grpc.Core.Interceptors;
-using EllieBot.Common.ModuleBehaviors;
-
-namespace EllieBot.GrpcApi;
-
-public class GrpcApiService : IEService, IReadyExecutor
-{
-    private Server? _app;
-
-    private readonly DiscordSocketClient _client;
-    private readonly OtherSvc _other;
-    private readonly ExprsSvc _exprs;
-    private readonly GreetByeSvc _greet;
-    private readonly IBotCredsProvider _creds;
-
-    public GrpcApiService(
-        DiscordSocketClient client,
-        OtherSvc other,
-        ExprsSvc exprs,
-        GreetByeSvc greet,
-        IBotCredsProvider creds)
-    {
-        _client = client;
-        _other = other;
-        _exprs = exprs;
-        _greet = greet;
-        _creds = creds;
-    }
-
-    public Task OnReadyAsync()
-    {
-        var creds = _creds.GetCreds();
-        if (creds.GrpcApi is null || !creds.GrpcApi.Enabled)
-            return Task.CompletedTask;
-
-        try
-        {
-            var host = creds.GrpcApi.Host;
-            var port = creds.GrpcApi.Port + _client.ShardId;
-
-            var interceptor = new PermsInterceptor(_client);
-
-            _app = new Server()
-            {
-                Services =
-                {
-                    GrpcOther.BindService(_other).Intercept(interceptor),
-                    GrpcExprs.BindService(_exprs).Intercept(interceptor),
-                    GrpcGreet.BindService(_greet).Intercept(interceptor),
-                },
-                Ports =
-                {
-                    new(host, port, ServerCredentials.Insecure),
-                }
-            };
-
-            _app.Start();
-
-            Log.Information("Grpc Api Server started on port {Host}:{Port}", host, port);
-        }
-        catch
-        {
-            _app?.ShutdownAsync().GetAwaiter().GetResult();
-        }
-
-        return Task.CompletedTask;
-    }
-}

src/EllieBot/Services/Impl/BotCredsProvider.cs

@@ -119,7 +119,7 @@ public sealed class BotCredsProvider : IBotCredsProvider
         }
     }
 
-    public void ModifyCredsFile(Action<IBotCreds> func)
+    public void ModifyCredsFile(Action<IBotCredentials> func)
     {
         var ymlData = File.ReadAllText(CREDS_FILE_NAME);
         var creds = Yaml.Deserializer.Deserialize<Creds>(ymlData);
@@ -137,18 +137,24 @@ public sealed class BotCredsProvider : IBotCredsProvider
             var creds = Yaml.Deserializer.Deserialize<Creds>(File.ReadAllText(CREDS_FILE_NAME));
             if (creds.Version <= 5)
             {
-                creds.BotCache = BotCacheImplemenation.Memory;
+                creds.BotCache = BotCacheImplemenation.Redis;
             }
 
-            if (creds.Version < 12)
+            if (creds.Version <= 6)
             {
-                creds.Version = 12;
+                creds.Version = 7;
+                File.WriteAllText(CREDS_FILE_NAME, Yaml.Serializer.Serialize(creds));
+            }
+
+            if (creds.Version <= 8)
+            {
+                creds.Version = 9;
                 File.WriteAllText(CREDS_FILE_NAME, Yaml.Serializer.Serialize(creds));
             }
         }
     }
 
-    public IBotCreds GetCreds()
+    public IBotCredentials GetCreds()
     {
         lock (_reloadLock)
         {

src/EllieBot/Services/Impl/GoogleApiService.cs

@@ -75,7 +75,7 @@ public sealed partial class GoogleApiService : IGoogleApiService, IEService
         return (await query.ExecuteAsync()).Items.Select(i => "https://www.youtube.com/watch?v=" + i.Id.VideoId).Skip(1);
     }
 
-    public async Task<IReadOnlyList<string>> GetVideoLinksByKeywordAsync(string keywords, int count = 1)
+    public async Task<IEnumerable<string>> GetVideoLinksByKeywordAsync(string keywords, int count = 1)
     {
         if (string.IsNullOrWhiteSpace(keywords))
             throw new ArgumentNullException(nameof(keywords));
@@ -87,7 +87,7 @@ public sealed partial class GoogleApiService : IGoogleApiService, IEService
         query.Q = keywords;
         query.Type = "video";
         query.SafeSearch = SearchResource.ListRequest.SafeSearchEnum.Strict;
-        return (await query.ExecuteAsync()).Items.Select(i => "https://www.youtube.com/watch?v=" + i.Id.VideoId).ToArray();
+        return (await query.ExecuteAsync()).Items.Select(i => "https://www.youtube.com/watch?v=" + i.Id.VideoId);
     }
 
     public async Task<IEnumerable<(string Name, string Id, string Url, string Thumbnail)>> GetVideoInfosByKeywordAsync(

src/EllieBot/Services/Impl/PubSub/RedisPubSub.cs

@@ -4,11 +4,11 @@ namespace EllieBot.Common;
 
 public sealed class RedisPubSub : IPubSub
 {
-    private readonly IBotCreds _creds;
+    private readonly IBotCredentials _creds;
     private readonly ConnectionMultiplexer _multi;
     private readonly ISeria _serializer;
 
-    public RedisPubSub(ConnectionMultiplexer multi, ISeria serializer, IBotCreds creds)
+    public RedisPubSub(ConnectionMultiplexer multi, ISeria serializer, IBotCredentials creds)
     {
         _multi = multi;
         _serializer = serializer;

src/EllieBot/Services/Impl/RedisBotStringsProvider.cs

@@ -15,13 +15,13 @@ public class RedisBotStringsProvider : IBotStringsProvider
 
     private readonly ConnectionMultiplexer _redis;
     private readonly IStringsSource _source;
-    private readonly IBotCreds _creds;
+    private readonly IBotCredentials _creds;
 
     public RedisBotStringsProvider(
         ConnectionMultiplexer redis,
         DiscordSocketClient discordClient,
         IStringsSource source,
-        IBotCreds creds)
+        IBotCredentials creds)
     {
         _redis = redis;
         _source = source;

src/EllieBot/Services/Impl/RemoteGrpcCoordinator.cs

@@ -11,7 +11,7 @@ public class RemoteGrpcCoordinator : ICoordinator, IReadyExecutor
     private readonly Coordinator.Coordinator.CoordinatorClient _coordClient;
     private readonly DiscordSocketClient _client;
 
-    public RemoteGrpcCoordinator(IBotCreds creds, DiscordSocketClient client)
+    public RemoteGrpcCoordinator(IBotCredentials creds, DiscordSocketClient client)
     {
         var coordUrl = string.IsNullOrWhiteSpace(creds.CoordinatorUrl) ? "http://localhost:3442" : creds.CoordinatorUrl;
 
@@ -90,7 +90,8 @@ public class RemoteGrpcCoordinator : ICoordinator, IReadyExecutor
                 {
                     if (!gracefulImminent)
                     {
-                        Log.Warning(ex, "Hearbeat failed and graceful shutdown was not expected: {Message}",
+                        Log.Warning(ex,
+                            "Hearbeat failed and graceful shutdown was not expected: {Message}",
                             ex.Message);
                         break;
                     }

src/EllieBot/Services/PermsInterceptor.cs

@@ -1,67 +0,0 @@
-using Grpc.Core;
-using Grpc.Core.Interceptors;
-
-namespace EllieBot.GrpcApi;
-
-public sealed partial class PermsInterceptor : Interceptor
-{
-    private readonly DiscordSocketClient _client;
-
-    public PermsInterceptor(DiscordSocketClient client)
-    {
-        _client = client;
-        Log.Information("interceptor created");
-    }
-
-    public override async Task<TResponse> UnaryServerHandler<TRequest, TResponse>(
-        TRequest request,
-        ServerCallContext context,
-        UnaryServerMethod<TRequest, TResponse> continuation)
-    {
-        try
-        {
-            Log.Information("Starting receiving call. Type/Method: {Type} / {Method}",
-                MethodType.Unary,
-                context.Method);
-
-            // get metadata
-            var metadata = context
-                           .RequestHeaders
-                           .ToDictionary(x => x.Key, x => x.Value);
-
-
-            var method = context.Method[(context.Method.LastIndexOf('/') + 1)..];
-
-            if (perms.TryGetValue(method, out var perm))
-            {
-                Log.Information("Required permission for {Method} is {Perm}",
-                    method,
-                    perm);
-
-                var userId = ulong.Parse(metadata["userid"]);
-                var guildId = ulong.Parse(metadata["guildid"]);
-
-                IGuild guild = _client.GetGuild(guildId);
-                var user = guild is null ? null : await guild.GetUserAsync(userId);
-
-                if (user is null)
-                    throw new RpcException(new Status(StatusCode.NotFound, "User not found"));
-
-                if (!user.GuildPermissions.Has(perm))
-                    throw new RpcException(new Status(StatusCode.PermissionDenied,
-                        $"You need {perm} permission to use this method"));
-            }
-            else
-            {
-                Log.Information("No permission required for {Method}", method);
-            }
-
-            return await continuation(request, context);
-        }
-        catch (Exception ex)
-        {
-            Log.Error(ex, "Error thrown by {ContextMethod}", context.Method);
-            throw;
-        }
-    }
-}

src/EllieBot/_common/Abstractions/Helpers/LogSetup.cs

@@ -6,9 +6,9 @@ namespace Ellie.Common;
 
 public static class LogSetup
 {
-    public static void SetupLogger(object source, IBotCreds creds)
+    public static void SetupLogger(object source)
     {
-        var config = new LoggerConfiguration().MinimumLevel.Override("Microsoft", LogEventLevel.Information)
+        Log.Logger = new LoggerConfiguration().MinimumLevel.Override("Microsoft", LogEventLevel.Information)
                                               .MinimumLevel.Override("System", LogEventLevel.Information)
                                               .MinimumLevel.Override("Microsoft.AspNetCore", LogEventLevel.Warning)
                                               .Enrich.FromLogContext()
@@ -16,13 +16,8 @@ public static class LogSetup
                                                   theme: GetTheme(),
                                                   outputTemplate:
                                                   "[{Timestamp:HH:mm:ss} {Level:u3}] | #{LogSource} | {Message:lj}{NewLine}{Exception}")
-                                              .Enrich.WithProperty("LogSource", source);
+                                              .Enrich.WithProperty("LogSource", source)
-
+                                              .CreateLogger();
-        if (!string.IsNullOrWhiteSpace(creds.Seq.Url))
-            config = config.WriteTo.Seq(creds.Seq.Url, apiKey: creds.Seq.ApiKey);
-
-        Log.Logger = config
-            .CreateLogger();
 
         Console.OutputEncoding = Encoding.UTF8;
     }

src/EllieBot/_common/Abstractions/creds/IBotCredentials.cs

@@ -1,7 +1,7 @@
 #nullable disable
 namespace EllieBot;
 
-public interface IBotCreds
+public interface IBotCredentials
 {
     string Token { get; }
     string EllieAiToken { get; }
@@ -29,8 +29,6 @@ public interface IBotCreds
     string TwitchClientSecret { get; set; }
     GoogleApiConfig Google { get; set; }
     BotCacheImplemenation BotCache { get; set; }
-    Creds.GrpcApiConfig GrpcApi { get; set; }
-    SeqConfig Seq { get; set; }
 }
 
 public interface IVotesSettings

src/EllieBot/_common/Abstractions/creds/IBotCredsProvider.cs

@@ -3,6 +3,6 @@
 public interface IBotCredsProvider
 {
     public void Reload();
-    public IBotCreds GetCreds();
+    public IBotCredentials GetCreds();
-    public void ModifyCredsFile(Action<IBotCreds> func);
+    public void ModifyCredsFile(Action<IBotCredentials> func);
 }

src/EllieBot/_common/Configs/BotConfig.cs

@@ -28,7 +28,7 @@ public sealed partial class BotConfig : ICloneable<BotConfig>
     public CultureInfo DefaultLocale { get; set; }
 
     [Comment("""
-        Style in which executed commands will show up in the logs.
+        Style in which executed commands will show up in the console.
         Allowed values: Simple, Normal, None
         """)]
     public ConsoleOutputType ConsoleOutputType { get; set; }

src/EllieBot/_common/Creds.cs

@@ -3,31 +3,30 @@ using EllieBot.Common.Yml;
 
 namespace EllieBot.Common;
 
-public sealed class Creds : IBotCreds
+public sealed class Creds : IBotCredentials
 {
     [Comment("""DO NOT CHANGE""")]
-    public int Version { get; set; } = 12;
+    public int Version { get; set; }
 
     [Comment("""Bot token. Do not share with anyone ever -> https://discordapp.com/developers/applications/""")]
     public string Token { get; set; }
 
     [Comment("""
-             List of Ids of the users who have bot owner permissions
+        List of Ids of the users who have bot owner permissions
-             **DO NOT ADD PEOPLE YOU DON'T TRUST**
+        **DO NOT ADD PEOPLE YOU DON'T TRUST**
-             """)]
+        """)]
     public ICollection<ulong> OwnerIds { get; set; }
-
+    
-    [Comment(
+    [Comment("Keep this on 'true' unless you're sure your bot shouldn't use privileged intents or you're waiting to be accepted")]
-        "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; }
 
     [Comment("""
-             The number of shards that the bot will be running on.
+        The number of shards that the bot will be running on.
-             Leave at 1 if you don't know what you're doing.
+        Leave at 1 if you don't know what you're doing.
-
+        
-             note: If you are planning to have more than one shard, then you must change botCache to 'redis'.
+        note: If you are planning to have more than one shard, then you must change botCache to 'redis'.
-                   Also, in that case you should be using EllieBot.Coordinator to start the bot, and it will correctly override this value.
+              Also, in that case you should be using EllieBot.Coordinator to start the bot, and it will correctly override this value.
-             """)]
+        """)]
     public int TotalShards { get; set; }
 
     [Comment("""
@@ -39,34 +38,34 @@ public sealed class Creds : IBotCreds
              ⚠ This does not currently work and is a work in progress.
              """)]
     public string EllieAiToken { get; set; }
-
+    
-    [Comment(
+    [Comment(   
         """
-        Login to https://console.cloud.google.com, create a new project, go to APIs & Services -> Library -> YouTube Data API and enable it.
+            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.
+            Then, go to APIs and Services -> Credentials and click Create credentials -> API key.
-        Used only for Youtube Data Api (at the moment).
+            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
+            Create a new custom search here https://programmablesearchengine.google.com/cse/create/new
-        Enable SafeSearch
+            Enable SafeSearch
-        Remove all Sites to Search
+            Remove all Sites to Search
-        Enable Search the entire web
+            Enable Search the entire web
-        Copy the 'Search Engine ID' to the SearchId field
+            Copy the 'Search Engine ID' to the SearchId field
-
+            
-        Do all steps again but enable image search for the ImageSearchId
+            Do all steps again but enable image search for the ImageSearchId
-        """)]
+            """)]
     public GoogleApiConfig Google { get; set; }
 
     [Comment("""Settings for voting system for discordbots. Meant for use on global Ellie.""")]
     public VotesSettings Votes { get; set; }
 
     [Comment("""
-             Patreon auto reward system settings.
+        Patreon auto reward system settings.
-             go to https://www.patreon.com/portal -> my clients -> create client
+        go to https://www.patreon.com/portal -> my clients -> create client
-             """)]
+        """)]
     public PatreonSettings Patreon { get; set; }
 
     [Comment("""Api key for sending stats to DiscordBotList.""")]
@@ -77,27 +76,27 @@ public sealed class Creds : IBotCreds
 
     [Comment(@"OpenAi api key.")]
     public string Gpt3ApiKey { get; set; }
-
+    
     [Comment("""
-             Which cache implementation should bot use.
+        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. 
+        '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
+        '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.
+        Redis connection string. Don't change if you don't know what you're doing.
-             Only used if botCache is set to 'redis'
+        Only used if botCache is set to 'redis'
-             """)]
+        """)]
     public string RedisOptions { get; set; }
 
     [Comment("""Database options. Don't change if you don't know what you're doing. Leave null for default values""")]
     public DbOptions Db { get; set; }
 
     [Comment("""
-             Address and port of the coordinator endpoint. Leave empty for default.
+        Address and port of the coordinator endpoint. Leave empty for default.
-             Change only if you've changed the coordinator address or port.
+        Change only if you've changed the coordinator address or port.
-             """)]
+        """)]
     public string CoordinatorUrl { get; set; }
 
     [Comment(
@@ -105,34 +104,34 @@ public sealed class Creds : IBotCreds
     public string RapidApiKey { get; set; }
 
     [Comment("""
-             https://locationiq.com api key (register and you will receive the token in the email).
+        https://locationiq.com api key (register and you will receive the token in the email).
-             Used only for .time command.
+        Used only for .time command.
-             """)]
+        """)]
     public string LocationIqApiKey { get; set; }
 
     [Comment("""
-             https://timezonedb.com api key (register and you will receive the token in the email).
+        https://timezonedb.com api key (register and you will receive the token in the email).
-             Used only for .time command
+        Used only for .time command
-             """)]
+        """)]
     public string TimezoneDbApiKey { get; set; }
 
     [Comment("""
-             https://pro.coinmarketcap.com/account/ api key. There is a free plan for personal use.
+        https://pro.coinmarketcap.com/account/ api key. There is a free plan for personal use.
-             Used for cryptocurrency related commands.
+        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.
+//     [Comment(@"https://polygon.io/dashboard/api-keys api key. Free plan allows for 5 queries per minute.
-    // Used for stocks related commands.")]
+// Used for stocks related commands.")]
-    //     public string PolygonIoApiKey { get; set; }
+//     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; }
 
     [Comment("""
-             Optional Trovo client id.
+        Optional Trovo client id.
-             You should use this if Trovo stream notifications stopped working or you're getting ratelimit errors.
+        You should use this if Trovo stream notifications stopped working or you're getting ratelimit errors.
-             """)]
+        """)]
     public string TrovoClientId { get; set; }
 
     [Comment("""Obtain by creating an application at https://dev.twitch.tv/console/apps""")]
@@ -142,35 +141,23 @@ public sealed class Creds : IBotCreds
     public string TwitchClientSecret { get; set; }
 
     [Comment("""
-             Command and args which will be used to restart the bot.
+        Command and args which will be used to restart the bot.
-             Only used if bot is executed directly (NOT through the coordinator)
+        Only used if bot is executed directly (NOT through the coordinator)
-             placeholders: 
+        placeholders: 
-                 {0} -> shard id 
+            {0} -> shard id 
-                 {1} -> total shards
+            {1} -> total shards
-             Linux default
+        Linux default
-                 cmd: dotnet
+            cmd: dotnet
-                 args: "EllieBot.dll -- {0}"
+            args: "EllieBot.dll -- {0}"
-             Windows default
+        Windows default
-                 cmd: EllieBot.exe
+            cmd: EllieBot.exe
-                 args: "{0}"
+            args: "{0}"
-             """)]
+        """)]
     public RestartConfig RestartCommand { get; set; }
 
-
-    [Comment("""
-             Settings for the grpc api. 
-             We don't provide support for this.
-             If you leave certPath empty, the api will run on http.
-             """)]
-    public GrpcApiConfig GrpcApi { get; set; }
-
-    [Comment("""
-             Url and api key to a seq server. If url is set, bot will try to send logs to it.
-             """)]
-    public SeqConfig Seq { get; set; }
-
     public Creds()
     {
+        Version = 9;
         Token = string.Empty;
         UsePrivilegedIntents = true;
         OwnerIds = new List<ulong>();
@@ -193,27 +180,24 @@ public sealed class Creds : IBotCreds
 
         RestartCommand = new RestartConfig();
         Google = new GoogleApiConfig();
-
-        GrpcApi = new();
-        Seq = new();
     }
-
+    
     public class DbOptions
         : IDbOptions
     {
         [Comment("""
-                 Database type. "sqlite", "mysql" and "postgresql" are supported.
+            Database type. "sqlite", "mysql" and "postgresql" are supported.
-                 Default is "sqlite"
+            Default is "sqlite"
-                 """)]
+            """)]
         public string Type { get; set; }
 
         [Comment("""
-                 Database connection string.
+            Database connection string.
-                 You MUST change this if you're not using "sqlite" type.
+            You MUST change this if you're not using "sqlite" type.
-                 Default is "Data Source=data/EllieBot.db"
+            Default is "Data Source=data/EllieBot.db"
-                 Example for mysql: "Server=localhost;Port=3306;Uid=root;Pwd=my_super_secret_mysql_password;Database=ellie"
+            Example for mysql: "Server=localhost;Port=3306;Uid=root;Pwd=my_super_secret_mysql_password;Database=ellie"
-                 Example for postgresql: "Server=localhost;Port=5432;User Id=postgres;Password=my_super_secret_postgres_password;Database=ellie;"
+            Example for postgresql: "Server=localhost;Port=5432;User Id=postgres;Password=my_super_secret_postgres_password;Database=ellie;"
-                 """)]
+            """)]
         public string ConnectionString { get; set; }
     }
 
@@ -248,29 +232,29 @@ public sealed class Creds : IBotCreds
     public sealed record VotesSettings : IVotesSettings
     {
         [Comment("""
-                 top.gg votes service url
+            top.gg votes service url
-                 This is the url of your instance of the EllieBot.Votes api
+            This is the url of your instance of the EllieBot.Votes api
-                 Example: https://votes.my.cool.bot.com
+            Example: https://votes.my.cool.bot.com
-                 """)]
+            """)]
         public string TopggServiceUrl { get; set; }
 
         [Comment("""
-                 Authorization header value sent to the TopGG service url with each request
+            Authorization header value sent to the TopGG service url with each request
-                 This should be equivalent to the TopggKey in your EllieBot.Votes api appsettings.json file
+            This should be equivalent to the TopggKey in your EllieBot.Votes api appsettings.json file
-                 """)]
+            """)]
         public string TopggKey { get; set; }
 
         [Comment("""
-                 discords.com votes service url
+            discords.com votes service url
-                 This is the url of your instance of the EllieBot.Votes api
+            This is the url of your instance of the EllieBot.Votes api
-                 Example: https://votes.my.cool.bot.com
+            Example: https://votes.my.cool.bot.com
-                 """)]
+            """)]
         public string DiscordsServiceUrl { get; set; }
 
         [Comment("""
-                 Authorization header value sent to the Discords service url with each request
+            Authorization header value sent to the Discords service url with each request
-                 This should be equivalent to the DiscordsKey in your EllieBot.Votes api appsettings.json file
+            This should be equivalent to the DiscordsKey in your EllieBot.Votes api appsettings.json file
-                 """)]
+            """)]
         public string DiscordsKey { get; set; }
 
         public VotesSettings()
@@ -289,25 +273,13 @@ public sealed class Creds : IBotCreds
             DiscordsKey = discordsKey;
         }
     }
-
-    public sealed record GrpcApiConfig
-    {
-        public bool Enabled { get; set; } = false;
-        public string CertPath { get; set; } = string.Empty;
-        public string CertPassword { get; set; } = string.Empty;
-        public string Host { get; set; } = "localhost";
-        public int Port { get; set; } = 43120;
-    }
-}
-
-public sealed class SeqConfig
-{
-    public string Url { get; init; }
-    public string ApiKey { get; init; }
 }
 
 public class GoogleApiConfig : IGoogleApiConfig
 {
     public string SearchId { get; init; }
     public string ImageSearchId { get; init; }
-}
+}
+
+
+

src/EllieBot/_common/DownloadTracker.cs

@@ -14,7 +14,6 @@ public class DownloadTracker : IEService
     public async Task EnsureUsersDownloadedAsync(IGuild guild)
     {
 #if GLOBAL_ELLIE
-        await Task.CompletedTask;
         return;
 #endif
         await _downloadUsersSemaphore.WaitAsync();

src/EllieBot/_common/Marmalade/Common/MarmaladeLoaderService.cs

@@ -250,7 +250,6 @@ public sealed class MarmaladeLoaderService : IMarmaladeLoaderService, IReadyExec
         }
         catch (Exception ex) when (ex is FileNotFoundException or BadImageFormatException)
         {
-            Log.Error(ex, "An error occurred loading a marmalade");
             return MarmaladeLoadResult.NotFound;
         }
         catch (Exception ex)
@@ -335,34 +334,23 @@ public sealed class MarmaladeLoaderService : IMarmaladeLoaderService, IReadyExec
         var a = ctx.LoadFromAssemblyPath(Path.GetFullPath(path));
         // ctx.LoadDependencies(a);
 
-        iocModule = null;
         // load services
-        try
+        iocModule = new MarmaladeNinjectIocModule(_cont, a, safeName);
+        iocModule.Load();
+        
+        var sis = LoadCanariesFromAssembly(safeName, a);
+        typeReaders = LoadTypeReadersFromAssembly(a, strings);
+        
+        if (sis.Count == 0)
         {
-            iocModule = new MarmaladeNinjectIocModule(_cont, a, safeName);
+            iocModule.Unload();
-            iocModule.Load();
+            return false;
-
-            var sis = LoadCanariesFromAssembly(safeName, a);
-            typeReaders = LoadTypeReadersFromAssembly(a, strings);
-
-            if (sis.Count == 0)
-            {
-                iocModule.Unload();
-                ctx.Unload();
-                return false;
-            }
-
-            ctxWr = new(ctx);
-            canaryData = sis;
-
-            return true;
-        }
-        catch
-        {
-            iocModule?.Unload();
-            ctx.Unload();
-            throw;
         }
+
+        ctxWr = new(ctx);
+        canaryData = sis;
+
+        return true;
     }
 
     private static readonly Type _paramParserType = typeof(ParamParser<>);

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

@@ -1,3 +1,4 @@
+#nullable disable
 using System.Text.RegularExpressions;
 
 namespace EllieBot.Common;
@@ -65,16 +66,14 @@ public sealed partial class ReplacementPatternStore
         Register("%user.mention%", static (IUser user) => user.Mention);
         Register("%user.fullname%", static (IUser user) => user.ToString()!);
         Register("%user.name%", static (IUser user) => user.Username);
-        Register("%user.displayname%", static (IUser user) => user is IGuildUser gu ? gu.DisplayName : user.Username);
         Register("%user.discrim%", static (IUser user) => user.Discriminator);
         Register("%user.avatar%", static (IUser user) => user.RealAvatarUrl().ToString());
         Register("%user.id%", static (IUser user) => user.Id.ToString());
         Register("%user.created_time%", static (IUser user) => user.CreatedAt.ToString("HH:mm"));
         Register("%user.created_date%", static (IUser user) => user.CreatedAt.ToString("dd.MM.yyyy"));
-        Register("%user.joined_time%", static (IGuildUser user) => user.JoinedAt?.ToString("HH:mm") ?? "??:??");
+        Register("%user.joined_time%", static (IGuildUser user) => user.JoinedAt?.ToString("HH:mm"));
-        Register("%user.joined_date%",
+        Register("%user.joined_date%", static (IGuildUser user) => user.JoinedAt?.ToString("dd.MM.yyyy"));
-            static (IGuildUser user) => user.JoinedAt?.ToString("dd.MM.yyyy") ?? "??.??.????");
+        
-
         Register("%user%",
             static (IUser[] users) => string.Join(" ", users.Select(user => user.Mention)));
         Register("%user.mention%",

src/EllieBot/_common/ServiceCollectionExtensions.cs

@@ -61,7 +61,7 @@ public static class ServiceCollectionExtensions
         return svcs;
     }
 
-    public static IContainer AddCache(this IContainer cont, IBotCreds creds)
+    public static IContainer AddCache(this IContainer cont, IBotCredentials creds)
     {
         if (creds.BotCache == BotCacheImplemenation.Redis)
         {

src/EllieBot/_common/Services/IGoogleApiService.cs

@@ -5,7 +5,7 @@ public interface IGoogleApiService
 {
     IReadOnlyDictionary<string, string> Languages { get; }
 
-    Task<IReadOnlyList<string>> GetVideoLinksByKeywordAsync(string keywords, int count = 1);
+    Task<IEnumerable<string>> GetVideoLinksByKeywordAsync(string keywords, int count = 1);
     Task<IEnumerable<(string Name, string Id, string Url, string Thumbnail)>> GetVideoInfosByKeywordAsync(string keywords, int count = 1);
     Task<IEnumerable<string>> GetPlaylistIdsByKeywordsAsync(string keywords, int count = 1);
     Task<IEnumerable<string>> GetRelatedVideosAsync(string id, int count = 1, string user = null);

src/EllieBot/_common/Services/IStatsService.cs

@@ -49,8 +49,8 @@ public interface IStatsService
     /// </summary>
     double GetPrivateMemoryMegabytes();
 
-    GuildInfo GetGuildInfoAsync(string name);
+    GuildInfo GetGuildInfo(string name);
-    Task<GuildInfo> GetGuildInfoAsync(ulong id);
+    GuildInfo GetGuildInfo(ulong id);
 }
 
 public record struct GuildInfo

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

@@ -14,12 +14,12 @@ public sealed class BlacklistService : IExecOnMessage
 
     private readonly DbService _db;
     private readonly IPubSub _pubSub;
-    private readonly IBotCreds _creds;
+    private readonly IBotCredentials _creds;
     private IReadOnlyList<BlacklistEntry> blacklist;
 
     private readonly TypedKey<BlacklistEntry[]> _blPubKey = new("blacklist.reload");
 
-    public BlacklistService(DbService db, IPubSub pubSub, IBotCreds creds)
+    public BlacklistService(DbService db, IPubSub pubSub, IBotCredentials creds)
     {
         _db = db;
         _pubSub = pubSub;

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

@@ -5,10 +5,10 @@ namespace EllieBot.Services;
 
 public class SingleProcessCoordinator : ICoordinator
 {
-    private readonly IBotCreds _creds;
+    private readonly IBotCredentials _creds;
     private readonly DiscordSocketClient _client;
 
-    public SingleProcessCoordinator(IBotCreds creds, DiscordSocketClient client)
+    public SingleProcessCoordinator(IBotCredentials creds, DiscordSocketClient client)
     {
         _creds = creds;
         _client = client;

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

@@ -29,7 +29,7 @@ public sealed class StatsService : IStatsService, IReadyExecutor, IEService
 
     private readonly Process _currentProcess = Process.GetCurrentProcess();
     private readonly DiscordSocketClient _client;
-    private readonly IBotCreds _creds;
+    private readonly IBotCredentials _creds;
     private readonly DateTime _started;
 
     private long textChannels;
@@ -42,7 +42,7 @@ public sealed class StatsService : IStatsService, IReadyExecutor, IEService
     public StatsService(
         DiscordSocketClient client,
         CommandHandler cmdHandler,
-        IBotCreds creds,
+        IBotCredentials creds,
         IHttpClientFactory factory)
     {
         _client = client;
@@ -180,20 +180,19 @@ public sealed class StatsService : IStatsService, IReadyExecutor, IEService
         return _currentProcess.PrivateMemorySize64 / 1.Megabytes();
     }
 
-    public GuildInfo GetGuildInfoAsync(string name)
+    public GuildInfo GetGuildInfo(string name)
         => throw new NotImplementedException();
 
-    public async Task<GuildInfo> GetGuildInfoAsync(ulong id)
+    public GuildInfo GetGuildInfo(ulong id)
     {
         var g = _client.GetGuild(id);
-        var ig = (IGuild)g;
 
         return new GuildInfo()
         {
             Id = g.Id,
             IconUrl = g.IconUrl,
             Name = g.Name,
-            Owner = (await ig.GetUserAsync(g.OwnerId))?.Username ?? "Unknown",
+            Owner = g.Owner.Username,
             OwnerId = g.OwnerId,
             CreatedAt = g.CreatedAt.UtcDateTime,
             VoiceChannels = g.VoiceChannels.Count,

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

@@ -8,10 +8,12 @@ namespace EllieBot.Services;
 public class YtdlOperation
 {
     private readonly string _baseArgString;
+    private readonly bool _isYtDlp;
 
-    public YtdlOperation(string baseArgString)
+    public YtdlOperation(string baseArgString, bool isYtDlp = false)
     {
         _baseArgString = baseArgString;
+        _isYtDlp = isYtDlp;
     }
 
     private Process CreateProcess(string[] args)
@@ -21,7 +23,7 @@ public class YtdlOperation
         {
             StartInfo = new()
             {
-                FileName = "yt-dlp",
+                FileName = _isYtDlp ? "yt-dlp" : "youtube-dl",
                 Arguments = string.Format(_baseArgString, newArgs),
                 UseShellExecute = false,
                 RedirectStandardError = true,
@@ -45,18 +47,18 @@ public class YtdlOperation
             var str = await process.StandardOutput.ReadToEndAsync();
             var err = await process.StandardError.ReadToEndAsync();
             if (!string.IsNullOrEmpty(err))
-                Log.Warning("yt-dlp warning: {YtdlWarning}", err);
+                Log.Warning("YTDL warning: {YtdlWarning}", err);
 
             return str;
         }
         catch (Win32Exception)
         {
-            Log.Error("yt-dlp 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)
         {
-            Log.Error(ex, "Exception running yt-dlp: {ErrorMessage}", ex.Message);
+            Log.Error(ex, "Exception running youtube-dl: {ErrorMessage}", ex.Message);
             return default;
         }
     }

src/EllieBot/_common/_Extensions/BotCredentialsExtensions.cs

@@ -2,9 +2,9 @@ namespace EllieBot.Extensions;
 
 public static class BotCredentialsExtensions
 {
-    public static bool IsOwner(this IBotCreds creds, IUser user)
+    public static bool IsOwner(this IBotCredentials creds, IUser user)
         => creds.IsOwner(user.Id);
     
-    public static bool IsOwner(this IBotCreds creds, ulong userId)
+    public static bool IsOwner(this IBotCredentials creds, ulong userId)
         => creds.OwnerIds.Contains(userId);
 }

src/EllieBot/_common/_Extensions/Extensions.cs

@@ -103,7 +103,7 @@ public static class Extensions
     /// <summary>
     ///     First 10 characters of teh bot token.
     /// </summary>
-    public static string RedisKey(this IBotCreds bc)
+    public static string RedisKey(this IBotCredentials bc)
         => bc.Token[..10];
 
     public static bool IsAuthor(this IMessage msg, IDiscordClient client)

src/EllieBot/data/marmalades/marmalade.yml

@@ -1,4 +1,4 @@
 # DO NOT CHANGE
 version: 1
 # List of marmalades automatically loaded at startup
-loaded: []
+loaded:

src/EllieBot/data/searches.yml

@@ -1,5 +1,5 @@
 # DO NOT CHANGE
-version: 4
+version: 3
 # Which engine should .search command
 # 'google_scrape' - default. Scrapes the webpage for results. May break. Requires no api keys.
 # 'google' - official google api. Requires googleApiKey and google.searchId set in creds.yml
@@ -11,12 +11,14 @@ webSearchEngine: Google_Scrape
 imgSearchEngine: Google
 # Which search provider will be used for the `.youtube` and `.q` commands.
 # 
-# - `ytDataApiv3` - uses google's official youtube data api. Requires `GoogleApiKey` set in creds and youtube data api enabled in developers console. `.q` is not supported for this setting. It will fallback to yt-dlp.
+# - `ytDataApiv3` - uses google's official youtube data api. Requires `GoogleApiKey` set in creds and youtube data api enabled in developers console
 # 
-# - `ytdlp` - default, recommended easy, uses `yt-dlp`. Requires `yt-dlp` to be installed and it's path added to env variables
+# - `ytdl` - default, uses youtube-dl. Requires `youtube-dl` to be installed and it's path added to env variables. Slow.
+# 
+# - `ytdlp` - recommended easy, uses `yt-dlp`. Requires `yt-dlp` to be installed and it's path added to env variables
 # 
 # - `invidious` - recommended advanced, uses invidious api. Requires at least one invidious instance specified in the `invidiousInstances` property
-ytProvider: Ytdl
+ytProvider: Ytdlp
 # Set the searx instance urls in case you want to use 'searx' for either img or web search.
 # Ellie will use a random one for each request.
 # Use a fully qualified url. Example: `https://my-searx-instance.mydomain.com`