fix: ytdataapiv3 searches will no longer duplicate youtube urls

change: initial canvas price down to 3 from 10, 10 is way too expensive

src/NadekoBot.GrpcApiBase/protos/fin.proto

@@ -0,0 +1,60 @@
+syntax = "proto3";
+
+option csharp_namespace = "NadekoBot.GrpcApi";
+
+import "google/protobuf/timestamp.proto";
+
+package fin;
+
+service GrpcFin {
+  rpc GetTransactions(GetTransactionsRequest) returns (GetTransactionsReply);
+  rpc GetHoldings(GetHoldingsRequest) returns (GetHoldingsReply);
+  rpc Withdraw(WithdrawRequest) returns (WithdrawReply);
+  rpc Deposit(DepositRequest) returns (DepositReply);
+}
+
+message GetTransactionsRequest {
+  int32 page = 1;
+  uint64 userId = 2;
+}
+
+message GetTransactionsReply {
+  repeated TransactionReply transactions = 1;
+  int32 total = 2;
+}
+
+message TransactionReply {
+  int64 amount = 1;
+  string note = 2;
+  string type = 3;
+  string extra = 4;
+  google.protobuf.Timestamp timestamp = 5;
+  string id = 6;
+}
+
+message GetHoldingsRequest {
+  uint64 userId = 1;
+}
+
+message GetHoldingsReply {
+  int64 cash = 1;
+  int64 bank = 2;
+}
+
+message WithdrawRequest {
+  uint64 userId = 1;
+  int64 amount = 2;
+}
+
+message WithdrawReply {
+  bool success = 1;
+}
+
+message DepositRequest {
+  uint64 userId = 1;
+  int64 amount = 2;
+}
+
+message DepositReply {
+  bool success = 1;
+}

src/NadekoBot/Modules/Administration/AutoAssignableRoles/AutoAssignRoleCommands.cs

@@ -24,6 +24,13 @@ public partial class Administration
                 await Response().Error(strs.hierarchy).SendAsync();
                 return;
             }
+            
+            // the user can't aar the role which is greater or equal to the bot's highest role
+            if (role.Position >= ((SocketGuild)ctx.Guild).CurrentUser.GetRoles().Max(x => x.Position))
+            {
+                await Response().Error(strs.hierarchy).SendAsync();
+                return;
+            }
 
             var roles = await _service.ToggleAarAsync(ctx.Guild.Id, role.Id);
             if (roles.Count == 0)

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

@@ -339,7 +339,7 @@ public class GreetService : INService, IReadyExecutor
         }
         catch (Exception ex)
         {
-            Log.Error(ex, "Error sending greet dm");
+            Log.Warning(ex, "Unable to send Greet DM. Probably the user has closed DMs");
             return false;
         }
 

src/NadekoBot/Modules/Games/NCanvas/NCanvasService.cs

@@ -20,7 +20,7 @@ public sealed class NCanvasService : INCanvasService, IReadyExecutor, INService
 
     public const int CANVAS_WIDTH = 500;
     public const int CANVAS_HEIGHT = 350;
-    public const int INITIAL_PRICE = 10;
+    public const int INITIAL_PRICE = 3;
 
     public NCanvasService(
         DbService db,
@@ -110,7 +110,7 @@ public sealed class NCanvasService : INCanvasService, IReadyExecutor, INService
 
         var wallet = await _cs.GetWalletAsync(userId);
 
-        var paid = await wallet.Take(price, new("canvas", "pixel", $"Bought pixel #{position}"));
+        var paid = await wallet.Take(price, new("canvas", "pixel-buy", $"Bought pixel {new kwum(position)}"));
         if (!paid)
         {
             return SetPixelResult.NotEnoughMoney;
@@ -138,7 +138,7 @@ public sealed class NCanvasService : INCanvasService, IReadyExecutor, INService
 
         if (!success)
         {
-            await wallet.Add(price, new("canvas", "pixel-refund", $"Refund pixel #{position} purchase"));
+            await wallet.Add(price, new("canvas", "pixel-refund", $"Refund pixel {new kwum(position)} purchase"));
         }
 
         return success ? SetPixelResult.Success : SetPixelResult.InsufficientPayment;

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

@@ -18,6 +18,9 @@ public sealed class YoutubeDataApiSearchService : IYoutubeSearchService, INServi
         if(results.Count == 0)
             return null;
         
-        return results.Map(r => new VideoInfo(r));
+        return results.Map(r => new VideoInfo()
+        {
+            Url = r
+        });
     }
 }

src/NadekoBot/Services/GrpcApi/FinSvc.cs

@@ -0,0 +1,89 @@
+using Google.Protobuf.WellKnownTypes;
+using Grpc.Core;
+using NadekoBot.Db.Models;
+using NadekoBot.Modules.Gambling.Bank;
+using NadekoBot.Modules.NadekoExpressions;
+using NadekoBot.Modules.Utility;
+
+namespace NadekoBot.GrpcApi;
+
+public class FinSvc : GrpcFin.GrpcFinBase, IGrpcSvc, INService
+{
+    private readonly ICurrencyService _cs;
+    private readonly IBankService _bank;
+
+    public FinSvc(ICurrencyService cs, IBankService bank)
+    {
+        _cs = cs;
+        _bank = bank;
+    }
+
+    public ServerServiceDefinition Bind()
+        => GrpcFin.BindService(this);
+
+    [GrpcNoAuthRequired]
+    public override async Task<DepositReply> Deposit(DepositRequest request, ServerCallContext context)
+    {
+        if (request.Amount <= 0)
+            throw new RpcException(new Status(StatusCode.InvalidArgument, "Amount must be greater than 0"));
+
+        var succ = await _bank.DepositAsync(request.UserId, request.Amount);
+
+        return new DepositReply
+        {
+            Success = succ
+        };
+    }
+
+    [GrpcNoAuthRequired]
+    public override async Task<WithdrawReply> Withdraw(WithdrawRequest request, ServerCallContext context)
+    {
+        if (request.Amount <= 0)
+            throw new RpcException(new Status(StatusCode.InvalidArgument, "Amount must be greater than 0"));
+
+        var succ = await _bank.WithdrawAsync(request.UserId, request.Amount);
+
+        return new WithdrawReply
+        {
+            Success = succ
+        };
+    }
+
+    [GrpcNoAuthRequired]
+    public override async Task<GetHoldingsReply> GetHoldings(GetHoldingsRequest request, ServerCallContext context)
+    {
+        return new GetHoldingsReply
+        {
+            Bank = await _bank.GetBalanceAsync(request.UserId),
+            Cash = await _cs.GetBalanceAsync(request.UserId)
+        };
+    }
+
+    [GrpcNoAuthRequired]
+    public override async Task<GetTransactionsReply> GetTransactions(
+        GetTransactionsRequest request,
+        ServerCallContext context)
+    {
+        if (request.Page < 1)
+            throw new RpcException(new Status(StatusCode.InvalidArgument, "Page must be greater than 0"));
+        
+        var trs = await _cs.GetTransactionsAsync(request.UserId, request.Page - 1);
+
+        var reply = new GetTransactionsReply
+        {
+            Total = await _cs.GetTransactionsCountAsync(request.UserId)
+        };
+
+        reply.Transactions.AddRange(trs.Select(x => new TransactionReply()
+        {
+            Id = new kwum(x.Id).ToString(),
+            Timestamp = Timestamp.FromDateTime(DateTime.UtcNow),
+            Amount = x.Amount,
+            Extra = x.Extra ?? string.Empty,
+            Note = x.Note ?? string.Empty,
+            Type = x.Type ?? string.Empty,
+        }));
+
+        return reply;
+    }
+}

src/NadekoBot/_common/Currency/ICurrencyService.cs

@@ -40,4 +40,11 @@ public interface ICurrencyService
         TxData? txData);
     
     Task<IReadOnlyList<DiscordUser>> GetTopRichest(ulong ignoreId, int page = 0, int perPage = 9);
+
+    Task<IReadOnlyList<CurrencyTransaction>> GetTransactionsAsync(
+        ulong userId,
+        int page,
+        int perPage = 15);
+    
+    Task<int> GetTransactionsCountAsync(ulong userId);
 }

src/NadekoBot/_common/Services/Currency/CurrencyService.cs

@@ -55,14 +55,14 @@ public sealed class CurrencyService : ICurrencyService, INService
         {
             await using var ctx = _db.GetDbContext();
             await ctx
-                .GetTable<DiscordUser>()
-                .Where(x => userIds.Contains(x.UserId))
-                .UpdateAsync(du => new()
-                {
-                    CurrencyAmount = du.CurrencyAmount >= amount
-                        ? du.CurrencyAmount - amount
-                        : 0
-                });
+                  .GetTable<DiscordUser>()
+                  .Where(x => userIds.Contains(x.UserId))
+                  .UpdateAsync(du => new()
+                  {
+                      CurrencyAmount = du.CurrencyAmount >= amount
+                          ? du.CurrencyAmount - amount
+                          : 0
+                  });
             await ctx.SaveChangesAsync();
             return;
         }
@@ -112,4 +112,29 @@ public sealed class CurrencyService : ICurrencyService, INService
         await using var uow = _db.GetDbContext();
         return await uow.Set<DiscordUser>().GetTopRichest(ignoreId, page, perPage);
     }
+
+    public async Task<IReadOnlyList<CurrencyTransaction>> GetTransactionsAsync(
+        ulong userId,
+        int page,
+        int perPage = 15)
+    {
+        await using var uow = _db.GetDbContext();
+
+        var trs = await uow.GetTable<CurrencyTransaction>()
+                           .Where(x => x.UserId == userId)
+                           .OrderByDescending(x => x.DateAdded)
+                           .Skip(perPage * page)
+                           .Take(perPage)
+                           .ToListAsyncLinqToDB();
+
+        return trs;
+    }
+
+    public async Task<int> GetTransactionsCountAsync(ulong userId)
+    {
+        await using var uow = _db.GetDbContext();
+        return await uow.GetTable<CurrencyTransaction>()
+                       .Where(x => x.UserId == userId)
+                       .CountAsyncLinqToDB();
+    }
 }