docs: updated CHANGELOG.md

docs: Version upped to 5.1.11

CHANGELOG.md

@@ -2,6 +2,49 @@
 
 Mostly based on [keepachangelog](https://keepachangelog.com/en/1.0.0/) except date format. a-c-f-r-o
 
+## [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
+
+- Fixed `.greettest`, and other `.*test` commands if you didn't have them enabled.
+- Fixed `.greetdmtest` sending messages twice.
+- Fixed a serious bug which caused greet messages to be jumbled up, and wrong ones to be sent for the wrong events.
+  - There is no database issue, all greet messages are safe, the cache was caching any setting every 3 seconds with no regard for the type of the event
+  - This also caused `.greetdm` messages to not be sent if `.greet` is enabled
+  - This bug was introduced in 5.1.8. PLEASE UPDATE if you are on 5.1.8 
+- Selfhosters only: Fixed medusa dependency loading
+  -  Note: Make sure to not publish any other DLLs besides the ones you are sure you will need, as there can be version conflicts which didn't happen before.
+
 ## [5.1.8] - 19.09.2024
 
 ### Added

NadekoBot.sln

@@ -30,6 +30,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nadeko.Medusa", "src\Nadeko
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NadekoBot.Generators", "src\NadekoBot.Generators\NadekoBot.Generators.csproj", "{92770AF3-83EE-49F1-A0BB-79124D19A13D}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NadekoBot.GrpcApiBase", "src\NadekoBot.GrpcApiBase\NadekoBot.GrpcApiBase.csproj", "{FB74B9EA-10B9-4542-ACB1-35523A95A587}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -79,6 +81,12 @@ Global
 		{92770AF3-83EE-49F1-A0BB-79124D19A13D}.GlobalNadeko|Any CPU.Build.0 = Debug|Any CPU
 		{92770AF3-83EE-49F1-A0BB-79124D19A13D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{92770AF3-83EE-49F1-A0BB-79124D19A13D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FB74B9EA-10B9-4542-ACB1-35523A95A587}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FB74B9EA-10B9-4542-ACB1-35523A95A587}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FB74B9EA-10B9-4542-ACB1-35523A95A587}.GlobalNadeko|Any CPU.ActiveCfg = Debug|Any CPU
+		{FB74B9EA-10B9-4542-ACB1-35523A95A587}.GlobalNadeko|Any CPU.Build.0 = Debug|Any CPU
+		{FB74B9EA-10B9-4542-ACB1-35523A95A587}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FB74B9EA-10B9-4542-ACB1-35523A95A587}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -91,6 +99,7 @@ Global
 		{E685977E-31A4-46F4-A5D7-4E3E39E82E43} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2}
 		{92770AF3-83EE-49F1-A0BB-79124D19A13D} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2}
 		{2F4CF6D6-0C2F-4944-B204-9508CDA53195} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2}
+		{FB74B9EA-10B9-4542-ACB1-35523A95A587} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5F3F555C-855F-4BE8-B526-D062D3E8ACA4}

src/NadekoBot.Generators/GrpcApiPermGenerator.cs

@@ -0,0 +1,147 @@
+#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 NadekoBot.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 NadekoBot.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(
+                    "NadekoBot.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 NadekoBot.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/NadekoBot.Generators/NadekoBot.Generators.csproj

@@ -9,7 +9,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" 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/NadekoBot.GrpcApiBase/NadekoBot.GrpcApiBase.csproj

@@ -0,0 +1,21 @@
+<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/NadekoBot.GrpcApiBase/protos/econ.proto

@@ -0,0 +1,26 @@
+syntax = "proto3";
+
+option csharp_namespace = "NadekoBot.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/NadekoBot.GrpcApiBase/protos/exprs.proto

@@ -0,0 +1,50 @@
+syntax = "proto3";
+
+option csharp_namespace = "NadekoBot.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/NadekoBot.GrpcApiBase/protos/greet.proto

@@ -0,0 +1,57 @@
+syntax = "proto3";
+
+option csharp_namespace = "NadekoBot.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/NadekoBot.GrpcApiBase/protos/other.proto

@@ -0,0 +1,137 @@
+syntax = "proto3";
+
+option csharp_namespace = "NadekoBot.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/NadekoBot.GrpcApiBase/protos/warn.proto

@@ -0,0 +1,83 @@
+syntax = "proto3";
+
+option csharp_namespace = "NadekoBot.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/NadekoBot/Modules/Administration/GreetBye/GreetService.cs

@@ -75,16 +75,27 @@ public class GreetService : INService, IReadyExecutor
 
         _client.GuildMemberUpdated += ClientOnGuildMemberUpdated;
 
-        var timer = new PeriodicTimer(TimeSpan.FromSeconds(2));
+        while (true)
-        while (await timer.WaitForNextTickAsync())
+        {
+            try
             {
                 var (conf, user, ch) = await _greetQueue.Reader.ReadAsync();
                 await GreetUsers(conf, ch, user);
             }
+            catch (Exception ex)
+            {
+                Log.Error(ex, "Greet Loop almost crashed. Please report this!");
+            }
+
+            await Task.Delay(2016);
+        }
     }
 
     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 })
@@ -126,21 +137,63 @@ public class GreetService : INService, IReadyExecutor
                  .DeleteAsync();
     }
 
-    private Task OnUserLeft(SocketGuild guild, SocketUser user)
+    private Task OnUserJoined(IGuildUser user)
     {
         _ = Task.Run(async () =>
         {
             try
             {
-                var conf = await GetGreetSettingsAsync(guild.Id, GreetType.Bye);
+                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 (conf is null)
+
+                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;
 
-                var channel = guild.TextChannels.FirstOrDefault(c => c.Id == conf.ChannelId);
+            try
+            {
+                var conf = await GetGreetSettingsAsync(guild.Id, GreetType.Bye);
 
+                if (conf?.ChannelId is not { } cid)
+                    return;
+
+                var channel = guild.GetChannel(cid) as ITextChannel;
                 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;
                 }
@@ -155,10 +208,11 @@ public class GreetService : INService, IReadyExecutor
         return Task.CompletedTask;
     }
 
-    private readonly TypedKey<GreetSettings?> _greetSettingsKey = new("greet_settings");
+    private TypedKey<GreetSettings?> GreetSettingsKey(GreetType type)
+        => new($"greet_settings:{type}");
 
     public async Task<GreetSettings?> GetGreetSettingsAsync(ulong gid, GreetType type)
-        => await _cache.GetOrAddAsync<GreetSettings?>(_greetSettingsKey,
+        => await _cache.GetOrAddAsync<GreetSettings?>(GreetSettingsKey(type),
             () => InternalGetGreetSettingsAsync(gid, type),
             TimeSpan.FromSeconds(3));
 
@@ -207,9 +261,10 @@ public class GreetService : INService, IReadyExecutor
                                            or DiscordErrorCode.UnknownChannel)
         {
             Log.Warning(ex,
-                "Missing permissions to send a bye message, the greet message will be disabled on server: {GuildId}",
+                "Missing permissions to send a {GreetType} message, it will be disabled on server: {GuildId}",
+                conf.GreetType,
                 channel.GuildId);
-            await SetGreet(channel.GuildId, channel.Id, GreetType.Greet, false);
+            await SetGreet(channel.GuildId, channel.Id, conf.GreetType, false);
         }
         catch (Exception ex)
         {
@@ -217,14 +272,6 @@ public class GreetService : INService, IReadyExecutor
         }
     }
 
-
-    private async Task<bool> GreetDmUser(GreetSettings conf, IGuildUser user)
-    {
-        var completionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
-        await _greetQueue.Writer.WriteAsync((conf, user, null));
-        return await completionSource.Task;
-    }
-
     private async Task<bool> GreetDmUserInternal(GreetSettings conf, IGuildUser user)
     {
         try
@@ -290,8 +337,9 @@ public class GreetService : INService, IReadyExecutor
 
             await _sender.Response(user).Text(smartText).Sanitize(false).SendAsync();
         }
-        catch
+        catch (Exception ex)
         {
+            Log.Error(ex, "Error sending greet dm");
             return false;
         }
 
@@ -305,36 +353,6 @@ public class GreetService : INService, IReadyExecutor
             IconUrl = user.Guild.IconUrl
         };
 
-    private Task OnUserJoined(IGuildUser user)
-    {
-        _ = Task.Run(async () =>
-        {
-            try
-            {
-                var conf = await GetGreetSettingsAsync(user.GuildId, GreetType.Greet);
-
-                if (conf is not null && conf.IsEnabled && conf.ChannelId is { } channelId)
-                {
-                    var channel = await user.Guild.GetTextChannelAsync(channelId);
-                    if (channel is not null)
-                    {
-                        await _greetQueue.Writer.WriteAsync((conf, user, channel));
-                    }
-                }
-
-                var confDm = await GetGreetSettingsAsync(user.GuildId, GreetType.GreetDm);
-
-                if (confDm?.IsEnabled ?? false)
-                    await GreetDmUser(confDm, user);
-            }
-            catch
-            {
-                // ignored
-            }
-        });
-        return Task.CompletedTask;
-    }
-
 
     public static string GetDefaultGreet(GreetType greetType)
         => greetType switch
@@ -477,7 +495,8 @@ public class GreetService : INService, IReadyExecutor
     {
         if (conf.GreetType == GreetType.GreetDm)
         {
-            return await GreetDmUser(conf, user);
+            await _greetQueue.Writer.WriteAsync((conf, user, null));
+            return true;
         }
 
         if (channel is not ITextChannel ch)

src/NadekoBot/Modules/Expressions/NadekoExpressionsService.cs

@@ -789,7 +789,7 @@ public sealed class NadekoExpressionsService : IExecOnMessage, IReadyExecutor
 
         if (newguildExpressions.TryGetValue(guildId, out var exprs))
         {
-            return (exprs.Where(x => x.Trigger.Contains(query))
+            return (exprs.Where(x => x.Trigger.Contains(query) || x.Response.Contains(query))
                          .Skip(page * 9)
                          .Take(9)
                          .ToArray(), exprs.Length);

src/NadekoBot/Modules/Gambling/Gambling.cs

@@ -1,6 +1,7 @@
 #nullable disable
 using LinqToDB;
 using LinqToDB.EntityFrameworkCore;
+using LinqToDB.Tools;
 using NadekoBot.Db.Models;
 using NadekoBot.Modules.Gambling.Bank;
 using NadekoBot.Modules.Gambling.Common;
@@ -625,8 +626,6 @@ 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;
@@ -640,13 +639,18 @@ 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();
 
-                var cleanRichest = await uow.Set<DiscordUser>()
+                return cleanRichest;
-                                            .GetTopRichest(_client.CurrentUser.Id, 0, 1000);
-
-                var sg = (SocketGuild)ctx.Guild!;
-                return cleanRichest.Where(x => sg.GetUser(x.UserId) is not null).ToList();
             }
             else
             {
@@ -655,13 +659,9 @@ 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/NadekoBot/Modules/Gambling/Waifus/WaifuClaimCommands.cs

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

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

@@ -300,10 +300,10 @@ public class WaifuService : INService, IReadyExecutor
         return (oldAff, success, remaining);
     }
 
-    public IEnumerable<WaifuLbResult> GetTopWaifusAtPage(int page, int perPage = 9)
+    public async Task<IReadOnlyList<WaifuLbResult>> GetTopWaifusAtPage(int page, int perPage = 9)
     {
-        using var uow = _db.GetDbContext();
+        await using var uow = _db.GetDbContext();
-        return uow.Set<WaifuInfo>().GetTop(perPage, page * perPage);
+        return await uow.Set<WaifuInfo>().GetTop(perPage, page * perPage);
     }
 
     public ulong GetWaifuUserId(ulong ownerId, string name)
@@ -577,7 +577,7 @@ public class WaifuService : INService, 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/NadekoBot/Modules/Gambling/Waifus/db/WaifuExtensions.cs

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

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

@@ -43,8 +43,7 @@ public sealed class YtdlYoutubeResolver : IYoutubeResolver
                                      + "--no-check-certificate "
                                      + "-i "
                                      + "--yes-playlist "
-                                     + "-- \"{0}\"",
+                                     + "-- \"{0}\"");
-            scs.Data.YtProvider != YoutubeSearcher.Ytdl);
 
         _ytdlIdOperation = new("-4 "
                                + "--geo-bypass "
@@ -56,8 +55,7 @@ public sealed class YtdlYoutubeResolver : IYoutubeResolver
                                + "--get-thumbnail "
                                + "--get-duration "
                                + "--no-check-certificate "
-                               + "-- \"{0}\"",
+                               + "-- \"{0}\"");
-            scs.Data.YtProvider != YoutubeSearcher.Ytdl);
 
         _ytdlSearchOperation = new("-4 "
                                    + "--geo-bypass "
@@ -70,8 +68,7 @@ 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)
@@ -291,6 +288,7 @@ public sealed class YtdlYoutubeResolver : IYoutubeResolver
 
     public Task<string?> GetStreamUrl(string videoId)
         => CreateCacherFactory(videoId)();
+
     private readonly struct YtTrackData
     {
         public readonly string Title;

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

@@ -7,10 +7,9 @@ public sealed class DefaultSearchServiceFactory : ISearchServiceFactory, INServi
 {
     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;
@@ -20,19 +19,17 @@ public sealed class DefaultSearchServiceFactory : ISearchServiceFactory, INServi
         GoogleSearchService gss,
         GoogleScrapeService gscs,
         SearxSearchService sss,
-        YtdlpYoutubeSearchService ytdlp,
+        YtDlpSearchService 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;
     }
 
@@ -57,9 +54,8 @@ public sealed class DefaultSearchServiceFactory : ISearchServiceFactory, INServi
         => _scs.Data.YtProvider switch
         {
             YoutubeSearcher.YtDataApiv3 => _ytdata,
-            YoutubeSearcher.Ytdlp => _ytdlp,
-            YoutubeSearcher.Ytdl => _ytdl,
             YoutubeSearcher.Invidious => _iYtSs,
-            _ => _ytdl
+            YoutubeSearcher.Ytdlp => _ytdlp,
+            _ => throw new ArgumentOutOfRangeException()
         };
 }

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

@@ -93,16 +93,12 @@ 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);
             }
 
@@ -120,55 +116,50 @@ 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:youtube:{query}");
+            => new($"search:yt:{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 url) || string.IsNullOrWhiteSpace(url))
+            if (!result.TryGetValue(out var urls) || urls.Length == 0)
                 return null;
 
-            return new VideoInfo()
+            return urls.Map(url => new VideoInfo()
             {
                 Url = url
-            };
+            });
         }
 
         [Cmd]
-        public async Task Youtube([Leftover] string? query = null)
+        public async Task Youtube([Leftover] string query)
         {
-            query = query?.Trim();
+            query = query.Trim();
-
-            if (string.IsNullOrWhiteSpace(query))
-            {
-                await Response().Error(strs.specify_search_params).SendAsync();
-                return;
-            }
 
             _ = ctx.Channel.TriggerTypingAsync();
 
-            var maybeResult = await GetYoutubeUrlFromCacheAsync(query)
+            var maybeResults = await GetYoutubeUrlFromCacheAsync(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.Url);
+            await AddYoutubeUrlToCacheAsync(query, result.Map(x => x.Url));
-            await Response().Text(result.Url).SendAsync();
+
+            await Response().Text(result[0].Url).SendAsync();
         }
 
 //     [Cmd]

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

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

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

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

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

@@ -9,18 +9,15 @@ public sealed class YoutubeDataApiSearchService : IYoutubeSearchService, INServi
         _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 (first is null)
+        if(results.Count == 0)
             return null;
         
-        return new()
+        return results.Map(r => new VideoInfo(r));
-        {
-            Url = first
-        };
     }
 }

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

@@ -0,0 +1,26 @@
+namespace NadekoBot.Modules.Searches.Youtube;
+
+public class YtDlpSearchService : IYoutubeSearchService, INService
+{
+    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/NadekoBot/Modules/Searches/Search/Youtube/YtdlYoutubeSearchService.cs

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

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

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

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

@@ -1,34 +0,0 @@
-namespace NadekoBot.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/NadekoBot/Modules/Searches/_common/Config/SearchesConfig.cs

@@ -28,11 +28,9 @@ 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
+             - `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.
 
-             - `ytdl` - default, uses youtube-dl. Requires `youtube-dl` to be installed and it's path added to env variables. Slow.
+             - `ytdlp` - default, recommended easy, uses `yt-dlp`. Requires `yt-dlp` to be installed and it's path added to env variables
-
-             - `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
              """)]
@@ -77,9 +75,9 @@ public sealed class FollowedStreamConfig
 
 public enum YoutubeSearcher
 {
-    YtDataApiv3,
+    YtDataApiv3 = 0,
-    Ytdl,
+    Ytdl = 1,
-    Ytdlp,
+    Ytdlp = 1,
-    Invid,
+    Invid = 3,
     Invidious = 3
 }

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

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

src/NadekoBot/NadekoBot.csproj

@@ -4,7 +4,7 @@
         <Nullable>enable</Nullable>
         <ImplicitUsings>true</ImplicitUsings>
         <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
-        <Version>5.1.8</Version>
+        <Version>5.1.11</Version>
 
         <!-- Output/build -->
         <RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
@@ -34,13 +34,12 @@
         <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.26.1"/>
+        <PackageReference Include="Google.Protobuf" Version="3.28.2" />
-        <PackageReference Include="Grpc.Net.ClientFactory" Version="2.62.0"/>
+        <PackageReference Include="Grpc" Version="2.46.6" />
-        <PackageReference Include="Grpc.Tools" Version="2.63.0">
+        <PackageReference Include="Grpc.Net.Client" Version="2.62.0" />
-            <PrivateAssets>all</PrivateAssets>
+        <PackageReference Include="Grpc.Tools" Version="2.66.0" PrivateAssets="All" />
-            <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"/>
@@ -103,20 +102,17 @@
     </ItemGroup>
 
     <ItemGroup>
+        <ProjectReference Include="..\NadekoBot.GrpcApiBase\NadekoBot.GrpcApiBase.csproj"/>
         <ProjectReference Include="..\Nadeko.Medusa\Nadeko.Medusa.csproj"/>
         <ProjectReference Include="..\NadekoBot.Voice\NadekoBot.Voice.csproj"/>
         <ProjectReference Include="..\NadekoBot.Generators\NadekoBot.Generators.csproj" OutputItemType="Analyzer"/>
     </ItemGroup>
 
-
     <ItemGroup>
         <AdditionalFiles Include="data\strings\responses\responses.en-US.json"/>
     </ItemGroup>
 
     <ItemGroup>
-        <Protobuf Include="..\NadekoBot.Coordinator\Protos\coordinator.proto" GrpcServices="Client">
-            <Link>Protos\coordinator.proto</Link>
-        </Protobuf>
         <None Update="data\**\*">
             <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -131,6 +127,13 @@
         </None>
     </ItemGroup>
 
+    <ItemGroup>
+        <Protobuf Include="..\NadekoBot.Coordinator\Protos\coordinator.proto">
+            <Link>_common\CoordinatorProtos\coordinator.proto</Link>
+<!--            <GrpcServices>Client</GrpcServices>-->
+        </Protobuf>
+    </ItemGroup>
+
     <PropertyGroup Condition=" '$(Configuration)' == 'GlobalNadeko' ">
         <!-- Define trace doesn't seem to affect the build at all so I had to remove $(DefineConstants)-->
         <DefineTrace>false</DefineTrace>

src/NadekoBot/Services/GrpcApi/ExprsSvc.cs

@@ -0,0 +1,76 @@
+using Google.Protobuf.WellKnownTypes;
+using Grpc.Core;
+using NadekoBot.Db.Models;
+using NadekoBot.Modules.NadekoExpressions;
+
+namespace NadekoBot.GrpcApi;
+
+public class ExprsSvc : GrpcExprs.GrpcExprsBase, INService
+{
+    private readonly NadekoExpressionsService _svc;
+
+    public ExprsSvc(NadekoExpressionsService svc)
+    {
+        _svc = svc;
+    }
+
+    [GrpcApiPerm(GuildPerm.Administrator)]
+    public override async Task<AddExprReply> AddExpr(AddExprRequest request, ServerCallContext context)
+    {
+        NadekoExpression 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/NadekoBot/Services/GrpcApi/GreetByeSvc.cs

@@ -0,0 +1,124 @@
+using Grpc.Core;
+using GreetType = NadekoBot.Services.GreetType;
+
+namespace NadekoBot.GrpcApi;
+
+public sealed class GreetByeSvc : GrpcGreet.GrpcGreetBase, INService
+{
+    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/NadekoBot/Services/GrpcApi/OtherSvc.cs

@@ -0,0 +1,199 @@
+using Google.Protobuf.WellKnownTypes;
+using Grpc.Core;
+using NadekoBot.Modules.Gambling.Services;
+using NadekoBot.Modules.Xp.Services;
+
+namespace NadekoBot.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, INService
+{
+    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/NadekoBot/Services/GrpcApiService.cs

@@ -0,0 +1,69 @@
+using Grpc.Core;
+using Grpc.Core.Interceptors;
+using NadekoBot.Common.ModuleBehaviors;
+
+namespace NadekoBot.GrpcApi;
+
+public class GrpcApiService : INService, 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/NadekoBot/Services/PermsInterceptor.cs

@@ -0,0 +1,67 @@
+using Grpc.Core;
+using Grpc.Core.Interceptors;
+
+namespace NadekoBot.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/NadekoBot/_common/Abstractions/creds/IBotCredentials.cs

@@ -29,6 +29,7 @@ public interface IBotCredentials
     string TwitchClientSecret { get; set; }
     GoogleApiConfig Google { get; set; }
     BotCacheImplemenation BotCache { get; set; }
+    Creds.GrpcApiConfig GrpcApi { get; set; }
 }
 
 public interface IVotesSettings

src/NadekoBot/_common/Creds.cs

@@ -6,7 +6,7 @@ namespace NadekoBot.Common;
 public sealed class Creds : IBotCredentials
 {
     [Comment("""DO NOT CHANGE""")]
-    public int Version { get; set; }
+    public int Version { get; set; } = 10;
 
     [Comment("""Bot token. Do not share with anyone ever -> https://discordapp.com/developers/applications/""")]
     public string Token { get; set; }
@@ -17,7 +17,8 @@ public sealed class Creds : IBotCredentials
              """)]
     public ICollection<ulong> OwnerIds { get; set; }
 
-    [Comment("Keep this on 'true' unless you're sure your bot shouldn't use privileged intents or you're waiting to be accepted")]
+    [Comment(
+        "Keep this on 'true' unless you're sure your bot shouldn't use privileged intents or you're waiting to be accepted")]
     public bool UsePrivilegedIntents { get; set; }
 
     [Comment("""
@@ -154,9 +155,16 @@ public sealed class Creds : IBotCredentials
              """)]
     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; }
+
     public Creds()
     {
-        Version = 9;
         Token = string.Empty;
         UsePrivilegedIntents = true;
         OwnerIds = new List<ulong>();
@@ -179,6 +187,8 @@ public sealed class Creds : IBotCredentials
 
         RestartCommand = new RestartConfig();
         Google = new GoogleApiConfig();
+
+        GrpcApi = new GrpcApiConfig();
     }
 
     public class DbOptions
@@ -272,6 +282,15 @@ public sealed class Creds : IBotCredentials
             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 class GoogleApiConfig : IGoogleApiConfig
@@ -279,6 +298,3 @@ public class GoogleApiConfig : IGoogleApiConfig
     public string SearchId { get; init; }
     public string ImageSearchId { get; init; }
 }
-
-
-

src/NadekoBot/_common/DownloadTracker.cs

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

src/NadekoBot/_common/Impl/BotCredsProvider.cs

@@ -140,15 +140,9 @@ public sealed class BotCredsProvider : IBotCredsProvider
                 creds.BotCache = BotCacheImplemenation.Redis;
             }
 
-            if (creds.Version <= 6)
+            if (creds.Version <= 9)
             {
-                creds.Version = 7;
+                creds.Version = 10;
-                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));
             }
         }

src/NadekoBot/_common/Impl/GoogleApiService.cs

@@ -75,7 +75,7 @@ public sealed partial class GoogleApiService : IGoogleApiService, INService
         return (await query.ExecuteAsync()).Items.Select(i => "https://www.youtube.com/watch?v=" + i.Id.VideoId).Skip(1);
     }
 
-    public async Task<IEnumerable<string>> GetVideoLinksByKeywordAsync(string keywords, int count = 1)
+    public async Task<IReadOnlyList<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, INService
         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);
+        return (await query.ExecuteAsync()).Items.Select(i => "https://www.youtube.com/watch?v=" + i.Id.VideoId).ToArray();
     }
 
     public async Task<IEnumerable<(string Name, string Id, string Url, string Thumbnail)>> GetVideoInfosByKeywordAsync(

src/NadekoBot/_common/Impl/RemoteGrpcCoordinator.cs

@@ -90,8 +90,7 @@ public class RemoteGrpcCoordinator : ICoordinator, IReadyExecutor
                 {
                     if (!gracefulImminent)
                     {
-                        Log.Warning(ex,
+                        Log.Warning(ex, "Hearbeat failed and graceful shutdown was not expected: {Message}",
-                            "Hearbeat failed and graceful shutdown was not expected: {Message}",
                             ex.Message);
                         break;
                     }

src/NadekoBot/_common/Medusa/Common/MedusaLoaderService.cs

@@ -250,6 +250,7 @@ public sealed class MedusaLoaderService : IMedusaLoaderService, IReadyExecutor,
         }
         catch (Exception ex) when (ex is FileNotFoundException or BadImageFormatException)
         {
+            Log.Error(ex, "An error occurred loading a medusa");
             return MedusaLoadResult.NotFound;
         }
         catch (Exception ex)
@@ -334,7 +335,10 @@ public sealed class MedusaLoaderService : IMedusaLoaderService, IReadyExecutor,
         var a = ctx.LoadFromAssemblyPath(Path.GetFullPath(path));
         // ctx.LoadDependencies(a);
 
+        iocModule = null;
         // load services
+        try
+        {
             iocModule = new MedusaNinjectIocModule(_cont, a, safeName);
             iocModule.Load();
 
@@ -344,6 +348,7 @@ public sealed class MedusaLoaderService : IMedusaLoaderService, IReadyExecutor,
             if (sis.Count == 0)
             {
                 iocModule.Unload();
+                ctx.Unload();
                 return false;
             }
 
@@ -352,6 +357,13 @@ public sealed class MedusaLoaderService : IMedusaLoaderService, IReadyExecutor,
 
             return true;
         }
+        catch
+        {
+            iocModule?.Unload();
+            ctx.Unload();
+            throw;
+        }
+    }
 
     private static readonly Type _paramParserType = typeof(ParamParser<>);
 

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

@@ -65,13 +65,15 @@ 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%", static (IGuildUser user) => user.JoinedAt?.ToString("dd.MM.yyyy"));
+        Register("%user.joined_date%",
+            static (IGuildUser user) => user.JoinedAt?.ToString("dd.MM.yyyy") ?? "??.??.????");
 
         Register("%user%",
             static (IUser[] users) => string.Join(" ", users.Select(user => user.Mention)));

src/NadekoBot/_common/Services/IGoogleApiService.cs

@@ -6,7 +6,7 @@ public interface IGoogleApiService
 {
     IReadOnlyDictionary<string, string> Languages { get; }
 
-    Task<IEnumerable<string>> GetVideoLinksByKeywordAsync(string keywords, int count = 1);
+    Task<IReadOnlyList<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/NadekoBot/_common/Services/IStatsService.cs

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

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

@@ -180,19 +180,20 @@ public sealed class StatsService : IStatsService, IReadyExecutor, INService
         return _currentProcess.PrivateMemorySize64 / 1.Megabytes();
     }
 
-    public GuildInfo GetGuildInfo(string name)
+    public GuildInfo GetGuildInfoAsync(string name)
         => throw new NotImplementedException();
 
-    public GuildInfo GetGuildInfo(ulong id)
+    public async Task<GuildInfo> GetGuildInfoAsync(ulong id)
     {
         var g = _client.GetGuild(id);
+        var ig = (IGuild)g;
 
         return new GuildInfo()
         {
             Id = g.Id,
             IconUrl = g.IconUrl,
             Name = g.Name,
-            Owner = g.Owner.Username,
+            Owner = (await ig.GetUserAsync(g.OwnerId))?.Username ?? "Unknown",
             OwnerId = g.OwnerId,
             CreatedAt = g.CreatedAt.UtcDateTime,
             VoiceChannels = g.VoiceChannels.Count,

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

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

src/NadekoBot/data/medusae/medusa.yml

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

src/NadekoBot/data/searches.yml

@@ -1,5 +1,5 @@
 # DO NOT CHANGE
-version: 3
+version: 4
 # 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,14 +11,12 @@ 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
+# - `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.
 # 
-# - `ytdl` - default, uses youtube-dl. Requires `youtube-dl` to be installed and it's path added to env variables. Slow.
+# - `ytdlp` - default, recommended easy, uses `yt-dlp`. Requires `yt-dlp` to be installed and it's path added to env variables
-# 
-# - `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: Ytdlp
+ytProvider: Ytdl
 # Set the searx instance urls in case you want to use 'searx' for either img or web search.
 # Nadeko will use a random one for each request.
 # Use a fully qualified url. Example: `https://my-searx-instance.mydomain.com`