[ci] updated gitlab-ci - reverted dotnet sdk and runtime versions

- Bot now support much higher XP values for global and server levels

.gitlab-ci.yml

@@ -18,41 +18,41 @@ variables:
   PACKAGE_REGISTRY_URL: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/NadekoBot-build/${CI_COMMIT_TAG}"
   INSTALLER_OUTPUT_DIR: "nadeko-installers/${CI_COMMIT_TAG}"
   INSTALLER_FILE_NAME: "nadeko-setup-${CI_COMMIT_TAG}.exe"
-  
+
 build:
   stage: build
   script:
-    - "dotnet publish -c Release -r linux-x64 -o $LINUX_X64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
-    - "dotnet publish -c Release -r win7-x64 -o $WIN_X64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
+    - "dotnet publish -c Release -r linux-x64 --self-contained -o $LINUX_X64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
+    - "dotnet publish -c Release -r win7-x64 --self-contained -o $WIN_X64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
   artifacts:
     paths:
       - "$LINUX_X64_OUTPUT_DIR/"
       - "$WIN_X64_OUTPUT_DIR/"
 
 upload-builds:
- stage: upload-builds
- image: alpine:latest
- rules:
-   - if: $CI_COMMIT_TAG
- script:    
-   - apk add --no-cache curl tar zip
-   - "tar cvf $LINUX_X64_RELEASE $LINUX_X64_OUTPUT_DIR/*"
-   - "zip -r $WIN_X64_RELEASE $WIN_X64_OUTPUT_DIR/*"
-   - |
-     curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file $LINUX_X64_RELEASE $PACKAGE_REGISTRY_URL/$LINUX_X64_RELEASE
-   - |
-     curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file $WIN_X64_RELEASE $PACKAGE_REGISTRY_URL/$WIN_X64_RELEASE
+  stage: upload-builds
+  image: alpine:latest
+  rules:
+    - if: $CI_COMMIT_TAG
+  script:
+    - apk add --no-cache curl tar zip
+    - "tar cvf $LINUX_X64_RELEASE $LINUX_X64_OUTPUT_DIR/*"
+    - "zip -r $WIN_X64_RELEASE $WIN_X64_OUTPUT_DIR/*"
+    - |
+      curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file $LINUX_X64_RELEASE $PACKAGE_REGISTRY_URL/$LINUX_X64_RELEASE
+    - |
+      curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file $WIN_X64_RELEASE $PACKAGE_REGISTRY_URL/$WIN_X64_RELEASE
 
 release:
- stage: release
- image: registry.gitlab.com/gitlab-org/release-cli:latest
- rules:
-   - if: $CI_COMMIT_TAG
- script:
-   - |
-     release-cli create --name "NadekoBot v$CI_COMMIT_TAG" --description "## [Changelog](https://gitlab.com/Kwoth/nadekobot/-/blob/v4/CHANGELOG.md#$(echo "$CI_COMMIT_TAG" | sed "s/\.//g")-$(date +%d%m%Y))" --tag-name $CI_COMMIT_TAG \
-       --assets-link "{\"name\":\"${LINUX_X64_RELEASE}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${LINUX_X64_RELEASE}\"}" \
-       --assets-link "{\"name\":\"${WIN_X64_RELEASE}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${WIN_X64_RELEASE}\"}"
+  stage: release
+  image: registry.gitlab.com/gitlab-org/release-cli:latest
+  rules:
+    - if: $CI_COMMIT_TAG
+  script:
+    - |
+      release-cli create --name "NadekoBot v$CI_COMMIT_TAG" --description "## [Changelog](https://gitlab.com/Kwoth/nadekobot/-/blob/v4/CHANGELOG.md#$(echo "$CI_COMMIT_TAG" | sed "s/\.//g")-$(date +%d%m%Y))" --tag-name $CI_COMMIT_TAG \
+        --assets-link "{\"name\":\"${LINUX_X64_RELEASE}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${LINUX_X64_RELEASE}\"}" \
+        --assets-link "{\"name\":\"${WIN_X64_RELEASE}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${WIN_X64_RELEASE}\"}"
 
 test:
   stage: test
@@ -63,63 +63,63 @@ test:
     - "dotnet test"
 
 publish-windows:
- stage: publish-windows 
- rules:
-   - if: '$CI_COMMIT_TAG'
- image: scottyhardy/docker-wine
- before_script:
-   - choco install dotnet-6.0-runtime -y
-   - choco install dotnet-6.0-sdk -y
-   - choco install innosetup -y
- artifacts:
-   paths:
-     - "$INSTALLER_OUTPUT_DIR/$INSTALLER_FILE_NAME"
- script:
-   - dotnet clean
-   - dotnet restore
-   - dotnet publish -c Release --runtime win7-x64 /p:Version=$CI_COMMIT_TAG src/NadekoBot
-   - $env:NADEKOBOT_INSTALL_VERSION = $CI_COMMIT_TAG
-   - iscc.exe "/O+" ".\exe_builder.iss"
- tags:
-   - windows
+  stage: publish-windows
+  rules:
+    - if: "$CI_COMMIT_TAG"
+  image: scottyhardy/docker-wine
+  before_script:
+    - choco install dotnet-6.0-runtime --version=6.0.4 -y
+    - choco install dotnet-6.0-sdk --version=6.0.202 -y
+    - choco install innosetup -y
+  artifacts:
+    paths:
+      - "$INSTALLER_OUTPUT_DIR/$INSTALLER_FILE_NAME"
+  script:
+    - dotnet clean
+    - dotnet restore -f --no-cache -v n
+    - dotnet publish -c Release --runtime win7-x64 /p:Version=$CI_COMMIT_TAG src/NadekoBot
+    - $env:NADEKOBOT_INSTALL_VERSION = $CI_COMMIT_TAG
+    - iscc.exe "/O+" ".\exe_builder.iss"
+  tags:
+    - windows
 
 upload-windows-updater-release:
- stage: upload-windows-updater-release
- rules:
-   - if: '$CI_COMMIT_TAG'
- image: 
-   name: amazon/aws-cli
-   entrypoint: [""]
- script:  
-   - sed -i "s/_INSTALLER_FILE_NAME_/$INSTALLER_FILE_NAME/g" releases-v3.json
-   - sed -i "s/_VERSION_/$CI_COMMIT_TAG/g" releases-v3.json
-   - aws --version
-   - aws --endpoint-url $AWS_SERVICE_URL s3api put-object --bucket "$AWS_BUCKET_NAME" --key "dl/bot/$INSTALLER_FILE_NAME" --acl public-read --body "$INSTALLER_OUTPUT_DIR/$INSTALLER_FILE_NAME"
-   - aws --endpoint-url $AWS_SERVICE_URL s3api put-object --bucket "$AWS_BUCKET_NAME" --key "dl/bot/releases-v3.json" --acl public-read --body "releases-v3.json"
+  stage: upload-windows-updater-release
+  rules:
+    - if: "$CI_COMMIT_TAG"
+  image:
+    name: amazon/aws-cli
+    entrypoint: [""]
+  script:
+    - sed -i "s/_INSTALLER_FILE_NAME_/$INSTALLER_FILE_NAME/g" releases-v3.json
+    - sed -i "s/_VERSION_/$CI_COMMIT_TAG/g" releases-v3.json
+    - aws --version
+    - aws --endpoint-url $AWS_SERVICE_URL s3api put-object --bucket "$AWS_BUCKET_NAME" --key "dl/bot/$INSTALLER_FILE_NAME" --acl public-read --body "$INSTALLER_OUTPUT_DIR/$INSTALLER_FILE_NAME"
+    - aws --endpoint-url $AWS_SERVICE_URL s3api put-object --bucket "$AWS_BUCKET_NAME" --key "dl/bot/releases-v3.json" --acl public-read --body "releases-v3.json"
 
 docker-build:
- # Use the official docker image.
- image: docker:latest
- stage: build
- services:
-   - docker:dind
- before_script:
-   - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
- # Default branch leaves tag empty (= latest tag)
- # All other branches are tagged with the escaped branch name (commit ref slug)
- script:
-   - |
-     if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then
-       tag=""
-       echo "Running on default branch '$CI_DEFAULT_BRANCH': tag = 'latest'"
-     else
-       tag=":$CI_COMMIT_REF_SLUG"
-       echo "Running on branch '$CI_COMMIT_BRANCH': tag = $tag"
-     fi
-   - docker build --pull -t "$CI_REGISTRY_IMAGE${tag}" .
-   - docker push "$CI_REGISTRY_IMAGE${tag}"
- # Run this job in a branch where a Dockerfile exists
- rules:
-   - if: $CI_COMMIT_BRANCH
-     exists:
-       - Dockerfile
+  # Use the official docker image.
+  image: docker:latest
+  stage: build
+  services:
+    - docker:dind
+  before_script:
+    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+  # Default branch leaves tag empty (= latest tag)
+  # All other branches are tagged with the escaped branch name (commit ref slug)
+  script:
+    - |
+      if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then
+        tag=""
+        echo "Running on default branch '$CI_DEFAULT_BRANCH': tag = 'latest'"
+      else
+        tag=":$CI_COMMIT_REF_SLUG"
+        echo "Running on branch '$CI_COMMIT_BRANCH': tag = $tag"
+      fi
+    - docker build --pull -t "$CI_REGISTRY_IMAGE${tag}" .
+    - docker push "$CI_REGISTRY_IMAGE${tag}"
+  # Run this job in a branch where a Dockerfile exists
+  rules:
+    - if: $CI_COMMIT_BRANCH
+      exists:
+        - Dockerfile

CHANGELOG.md

@@ -1,9 +1,83 @@
+
 # Changelog
 
 Experimental changelog. Mostly based on [keepachangelog](https://keepachangelog.com/en/1.0.0/) except date format. a-c-f-r-o
 
 ## Unreleased
 
+## [4.1.6] - 14.05.2022
+
+### Fixed
+
+- Fixed windows release and updated packages
+
+## [4.1.5] - 11.05.2022
+
+### Changed
+
+- `.clubdesc <msg>` will now have a nicer response
+
+### Fixed
+
+- `.give` DM will once again show an amount
+- Fixed an issue with filters not working and with custom reactions no longer being able to override commands.
+- Fixed `.stock` command
+
+## [4.1.4] - 06.05.2022
+
+### Fixed
+
+- Fixed `.yun`
+
+## [4.1.3] - 06.05.2022
+
+### Added 
+
+- Added support for embed arrays in commands such as .say, .greet, .bye, etc...
+  - Website to create them is live at eb.nadeko.bot (old one is moved to oldeb.nadeko.bot)
+  - Embed arrays don't have a plainText property (it's renamed to 'content')
+  - Embed arrays use color hex values instead of an integer
+  - Old embed format will still work
+  - There shouldn't be any breaking changes
+- Added `.stondel` command which, when toggled, will make the bot delete online stream messages on the server when the stream goes offline
+- Added a simple bank system.
+  - Users can deposit, withdraw and check the balance of their currency in the bank.
+  - Users can't check other user's bank balances.
+- Added a button on a .$ command which, when clicked, sends you a message with your bank balance that only you can see.
+- Added `.h <command group>`  
+  - Using this command will list all commands in the specified group
+  - Atm only .bank is a proper group (`.h bank`)
+- Added "Bank Accounts" entry to `.economy`
+
+### Changed
+
+- Reaction roles rewritten completely 
+  - Supports multiple exclusivity groups per message 
+  - Supports level requirements
+  - However they can only be added one by one
+  - Use the following commands for more information 
+    - `.h .reroa`
+    - `.h .reroli`
+    - `.h .rerot`
+    - `.h .rerorm`
+    - `.h .rerodela`
+- Pagination is now using buttons instead of reactions
+- Bot will now support much higher XP values for global and server levels
+- [dev] Small change and generation perf improvement for the localized response strings
+
+
+### Fixed
+
+- Fixed `.deletexp` command
+- `.give` command should send DMs again
+- `.modules` command now has a medusa module description
+
+## [4.1.2] - 16.04.2022
+
+### Fixed
+
+- Fixed an issue with missing `.dll` files in release versions
+
 ## [4.1.0] - 16.04.2022
 
 ### Added
@@ -30,14 +104,14 @@ Experimental changelog. Mostly based on [keepachangelog](https://keepachangelog.
 
 ## [4.0.6] - 21.03.2022
 
-### Fixes
+### Fixed
 
 - Fixed voice presence logging
 - Fixed .clubaccept, .clubban, .clubkick and .clubunban commands
 
 ## [4.0.5] - 21.03.2022
 
-### Fixes
+### Fixed
 
 - Fixed several bugs in the currency code
 - Fixed some potential memory leaks

docs/guides/linux-guide.md

@@ -92,6 +92,19 @@ Open Terminal (if you're on an installation with a window manager) and navigate
 
 ##### Release Update Instructions
 
+###### Prerequisites
+
+1. Nadeko requires redis to function
+    - ubuntu installation command: `sudo apt-get install redis-server`
+2. Playing music requires `ffmpeg`, `libopus`, `libsodium` and `youtube-dl` (which in turn requires python3)
+    - ubuntu installation command: `sudo apt-get install ffmpeg libopus0 opus-tools libopus-dev libsodium-dev -y`
+3. Make sure your python is version 3+ with `python --version`
+    - if it's not, you can install python 3 and make it the default with: `sudo apt-get install python3.8 python-is-python3`
+
+*You can use nadeko bash script [prerequisites installer](https://gitlab.com/Kwoth/nadeko-bash-installer/-/blob/v4/n-prereq.sh) as a reference*
+
+###### Installation
+
 1. Stop the bot
 2. Download the latest release from <https://gitlab.com/Kwoth/nadekobot/-/releases>
     - Look for the file called "x.x.x-linux-x64-build.tar" (where `X.X.X` is a version, for example 3.0.4) and download it

src/Nadeko.Medusa/Nadeko.Medusa.csproj

@@ -13,8 +13,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Discord.Net.Core" Version="3.5.0" />
-      <PackageReference Include="Serilog" Version="2.10.0" />
+      <PackageReference Include="Discord.Net.Core" Version="3.6.1" />
+      <PackageReference Include="Serilog" Version="2.11.0" />
       <PackageReference Include="YamlDotNet" Version="11.2.1" />
     </ItemGroup>
 

src/NadekoBot.Coordinator/NadekoBot.Coordinator.csproj

@@ -9,10 +9,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Grpc.AspNetCore" Version="2.44.0" />
-    <PackageReference Include="Serilog" Version="2.10.0" />
+    <PackageReference Include="Grpc.AspNetCore" Version="2.45.0" />
+    <PackageReference Include="Serilog" Version="2.11.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
-    <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
     <PackageReference Include="YamlDotNet" Version="11.2.1" />
   </ItemGroup>
   

src/NadekoBot.Generators/Command/CommandAttributesGenerator.cs

@@ -97,13 +97,12 @@ public class CmdAttribute : System.Attribute
             var name = $"{model.Namespace}.{string.Join(".", model.ClassHierarchy)}.g.cs";
             try
             {
-                Debug.WriteLine($"Writing {name}");
                 var source = GetSourceText(model);
                 ctx.AddSource(name, SourceText.From(source, Encoding.UTF8));
             }
             catch (Exception ex)
             {
-                Debug.WriteLine($"Error writing source file {name}\n" + ex);
+                Console.WriteLine($"Error writing source file {name}\n" + ex);
             }
         }
     }

src/NadekoBot.Generators/LocalizedStringsGenerator.cs

@@ -62,6 +62,7 @@ namespace NadekoBot.Generators
                 sw.WriteLine("{");
                 sw.Indent++;
 
+                var typedParamStrings = new List<string>(10);
                 foreach (var field in fields)
                 {
                     var matches = Regex.Matches(field.Value, @"{(?<num>\d)[}:]");
@@ -71,20 +72,30 @@ namespace NadekoBot.Generators
                         max = Math.Max(max, int.Parse(match.Groups["num"].Value) + 1);
                     }
 
-                    List<string> typedParamStrings = new List<string>();
-                    var paramStrings = string.Empty;
+                    typedParamStrings.Clear();
+                    var typeParams = new string[max];
+                    var passedParamString = string.Empty;
                     for (var i = 0; i < max; i++)
                     {
-                        typedParamStrings.Add($"object p{i}");
-                        paramStrings += $", p{i}";
+                        typedParamStrings.Add($"in T{i} p{i}");
+                        passedParamString += $", p{i}";
+                        typeParams[i] = $"T{i}";
                     }
 
-
                     var sig = string.Empty;
-                    if(max > 0)
+                    var typeParamStr = string.Empty;
+                    if (max > 0)
+                    {
                         sig = $"({string.Join(", ", typedParamStrings)})";
-                    
-                    sw.WriteLine($"public static LocStr {field.Name}{sig} => new LocStr(\"{field.Name}\"{paramStrings});");
+                        typeParamStr = $"<{string.Join(", ", typeParams)}>";
+                    }
+
+                    sw.WriteLine("public static LocStr {0}{1}{2} => new LocStr(\"{3}\"{4});",
+                        field.Name,
+                        typeParamStr,
+                        sig,
+                        field.Name,
+                        passedParamString);
                 }
 
                 sw.Indent--;

src/NadekoBot.Tests/NadekoBot.Tests.csproj

@@ -8,9 +8,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="NUnit" Version="3.13.2" />
+        <PackageReference Include="NUnit" Version="3.13.3" />
         <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
     </ItemGroup>
 
     <ItemGroup>

src/NadekoBot.VotesApi/NadekoBot.VotesApi.csproj

@@ -7,7 +7,7 @@
 
     <ItemGroup>
         <PackageReference Include="MorseCode.ITask" Version="2.0.3" />
-        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
+        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.3.1" />
     </ItemGroup>
 
 </Project>

src/NadekoBot/Bot.cs

@@ -67,12 +67,13 @@ public sealed class Bot
                 ? GatewayIntents.All
                 : GatewayIntents.AllUnprivileged,
             LogGatewayIntentWarnings = false,
+            FormatUsersInBidirectionalUnicode = false,
         });
 
         _commandService = new(new()
         {
             CaseSensitiveCommands = false,
-            DefaultRunMode = RunMode.Sync
+            DefaultRunMode = RunMode.Sync,
         });
 
         // _interactionService = new(Client.Rest);

src/NadekoBot/Common/Interaction/NadekoActionInteraction.cs

@@ -0,0 +1,27 @@
+namespace NadekoBot;
+
+public sealed class NadekoActionInteraction : NadekoOwnInteraction
+{
+    private readonly NadekoInteractionData _data;
+    private readonly Func<SocketMessageComponent, Task> _action;
+
+    public NadekoActionInteraction(
+        DiscordSocketClient client,
+        ulong authorId,
+        NadekoInteractionData data,
+        Func<SocketMessageComponent, Task> action
+    )
+        : base(client, authorId)
+    {
+        _data = data;
+        _action = action;
+    }
+
+    public override string Name
+        => _data.CustomId;
+    public override IEmote Emote
+        => _data.Emote;
+
+    public override Task ExecuteOnActionAsync(SocketMessageComponent smc)
+        => _action(smc);
+}

src/NadekoBot/Common/Interaction/NadekoInteraction.cs

@@ -0,0 +1,77 @@
+namespace NadekoBot;
+
+public abstract class NadekoInteraction
+{
+    // improvements:
+    //  - state in OnAction
+    //  - configurable delay
+    //  - 
+    public abstract string Name { get; }
+    public abstract IEmote Emote { get; }
+
+    protected readonly DiscordSocketClient _client;
+
+    protected readonly TaskCompletionSource<bool> _interactionCompletedSource;
+
+    protected IUserMessage message = null!;
+
+    protected NadekoInteraction(DiscordSocketClient client)
+    {
+        _client = client;
+        _interactionCompletedSource = new(TaskCreationOptions.RunContinuationsAsynchronously);
+    }
+
+    public async Task RunAsync(IUserMessage msg)
+    {
+        message = msg;
+
+        _client.InteractionCreated += OnInteraction;
+        await Task.WhenAny(Task.Delay(10_000), _interactionCompletedSource.Task);
+        _client.InteractionCreated -= OnInteraction;
+
+        await msg.ModifyAsync(m => m.Components = new ComponentBuilder().Build());
+    }
+
+    protected abstract ValueTask<bool> Validate(SocketMessageComponent smc);
+    private async Task OnInteraction(SocketInteraction arg)
+    {
+        if (arg is not SocketMessageComponent smc)
+            return;
+
+        if (smc.Message.Id != message.Id)
+            return;
+
+        if (smc.Data.CustomId != Name)
+            return;
+
+        if (!await Validate(smc))
+        {
+            await smc.DeferAsync();
+            return;
+        }
+
+        _ = Task.Run(async () =>
+        {
+            await ExecuteOnActionAsync(smc);
+            
+            // this should only be a thing on single-response buttons
+            _interactionCompletedSource.TrySetResult(true);
+
+            if (!smc.HasResponded)
+            {
+                await smc.DeferAsync();
+            }
+        });
+    }
+
+
+    public MessageComponent CreateComponent()
+    {
+        var comp = new ComponentBuilder()
+            .WithButton(new ButtonBuilder(style: ButtonStyle.Secondary, emote: Emote, customId: Name));
+
+        return comp.Build();
+    }
+
+    public abstract Task ExecuteOnActionAsync(SocketMessageComponent smc);
+}

src/NadekoBot/Common/Interaction/NadekoInteractionBuilder.cs

@@ -0,0 +1,41 @@
+namespace NadekoBot;
+
+/// <summary>
+/// Builder class for NadekoInteractions
+/// </summary>
+public class NadekoInteractionBuilder
+{
+    private NadekoInteractionData? iData;
+    private Func<SocketMessageComponent, Task>? action;
+    // private bool isOwn;
+
+    public NadekoInteractionBuilder WithData<T>(in T data)
+        where T : NadekoInteractionData
+    {
+        iData = data;
+        return this;
+    }
+
+    // public NadekoOwnInteractionBuiler WithIsOwn(bool isOwn = true)
+    // {
+    //     this.isOwn = isOwn;
+    //     return this;
+    // }
+    
+    public NadekoInteractionBuilder WithAction(in Func<SocketMessageComponent, Task> fn)
+    {
+        this.action = fn;
+        return this;
+    }
+
+    public NadekoActionInteraction Build(DiscordSocketClient client, ulong userId)
+    {
+        if (iData is null)
+            throw new InvalidOperationException("You have to specify the data before building the interaction");
+
+        if (action is null)
+            throw new InvalidOperationException("You have to specify the action before building the interaction");
+
+        return new(client, userId, iData, action);
+    }
+}

src/NadekoBot/Common/Interaction/NadekoInteractionData.cs

@@ -0,0 +1,8 @@
+namespace NadekoBot;
+
+/// <summary>
+/// Represents essential interacation data
+/// </summary>
+/// <param name="Emote">Emote which will show on a button</param>
+/// <param name="CustomId">Custom interaction id</param>
+public record NadekoInteractionData(IEmote Emote, string CustomId);

src/NadekoBot/Common/Interaction/NadekoOwnInteraction.cs

@@ -0,0 +1,15 @@
+namespace NadekoBot;
+
+/// <summary>
+/// Interaction which only the author can use
+/// </summary>
+public abstract class NadekoOwnInteraction : NadekoInteraction
+{
+    protected readonly ulong _authorId;
+
+    protected NadekoOwnInteraction(DiscordSocketClient client, ulong authorId) : base(client)
+        => _authorId = authorId;
+
+    protected override ValueTask<bool> Validate(SocketMessageComponent smc)
+        => new(smc.User.Id == _authorId);
+}

src/NadekoBot/Common/Linq2DbExpressions.cs

@@ -0,0 +1,16 @@
+#nullable disable
+using LinqToDB;
+using System.Linq.Expressions;
+
+namespace NadekoBot.Common;
+
+public static class Linq2DbExpressions
+{
+    [ExpressionMethod(nameof(GuildOnShardExpression))]
+    public static bool GuildOnShard(ulong guildId, int totalShards, int shardId)
+        => throw new NotSupportedException();
+    
+    private static Expression<Func<ulong, int, int, bool>> GuildOnShardExpression()
+        => (guildId, totalShards, shardId)
+            => guildId / 4194304 % (ulong)totalShards == (ulong)shardId;
+}

src/NadekoBot/Common/Medusa/Config/MedusaConfig.cs

@@ -1,4 +1,5 @@
-using Cloneable;
+#nullable enable
+using Cloneable;
 using NadekoBot.Common.Yml;
 
 namespace Nadeko.Medusa;
@@ -10,7 +11,7 @@ public sealed partial class MedusaConfig : ICloneable<MedusaConfig>
     public int Version { get; set; } = 1;
     
     [Comment("List of medusae automatically loaded at startup")]
-    public List<string> Loaded { get; set; }
+    public List<string>? Loaded { get; set; }
 
     public MedusaConfig()
     {

src/NadekoBot/Common/Medusa/Config/MedusaConfigService.cs

@@ -18,7 +18,7 @@ public sealed class MedusaConfigService : ConfigServiceBase<MedusaConfig>, IMedu
     }
 
     public IReadOnlyCollection<string> GetLoadedMedusae()
-        => Data.Loaded.ToList();
+        => Data.Loaded?.ToList() ?? new List<string>();
 
     public void AddLoadedMedusa(string name)
     {
@@ -26,6 +26,9 @@ public sealed class MedusaConfigService : ConfigServiceBase<MedusaConfig>, IMedu
         
         ModifyConfig(conf =>
         {
+            if (conf.Loaded is null)
+                conf.Loaded = new();
+            
             if(!conf.Loaded.Contains(name))
                 conf.Loaded.Add(name);
         });
@@ -37,6 +40,9 @@ public sealed class MedusaConfigService : ConfigServiceBase<MedusaConfig>, IMedu
         
         ModifyConfig(conf =>
         {
+            if (conf.Loaded is null)
+                conf.Loaded = new();
+            
             conf.Loaded.Remove(name);
         });
     }

src/NadekoBot/Common/Medusa/MedusaLoaderService.cs

@@ -191,14 +191,12 @@ public sealed class MedusaLoaderService : IMedusaLoaderService, IReadyExecutor,
         await _lock.WaitAsync();
         try
         {
-            var success = LoadAssemblyInternal(safeName,
-                out var ctx,
-                out var snekData,
-                out var services,
-                out var strings,
-                out var typeReaders);
-
-            if (success)
+            if (LoadAssemblyInternal(safeName,
+                    out var ctx,
+                    out var snekData,
+                    out var services,
+                    out var strings,
+                    out var typeReaders))
             {
                 var moduleInfos = new List<ModuleInfo>();
 
@@ -769,7 +767,7 @@ public sealed class MedusaLoaderService : IMedusaLoaderService, IReadyExecutor,
                 var paramName = pi.Name ?? "unnamed";
                 var isContext = paramCounter == 0 && pi.ParameterType.IsAssignableTo(typeof(AnyContext));
 
-                var leftoverAttribute = pi.GetCustomAttribute<Nadeko.Snake.leftoverAttribute>(true);
+                var leftoverAttribute = pi.GetCustomAttribute<leftoverAttribute>(true);
                 var hasDefaultValue = pi.HasDefaultValue;
                 var isLeftover = leftoverAttribute != null;
                 var isParams = pi.GetCustomAttribute<ParamArrayAttribute>() is not null;

src/NadekoBot/Common/NadekoModule.cs

@@ -1,5 +1,6 @@
 #nullable disable
 using System.Globalization;
+using MessageType = NadekoBot.Extensions.MessageType;
 
 // ReSharper disable InconsistentNaming
 
@@ -29,20 +30,15 @@ public abstract class NadekoModule : ModuleBase
 
     protected string GetText(in LocStr data)
         => Strings.GetText(data, Culture);
-
-    public Task<IUserMessage> SendErrorAsync(string error)
-        => ctx.Channel.SendErrorAsync(_eb, error);
-
+    
     public Task<IUserMessage> SendErrorAsync(
         string title,
         string error,
         string url = null,
-        string footer = null)
+        string footer = null, 
+        NadekoInteraction inter = null)
         => ctx.Channel.SendErrorAsync(_eb, title, error, url, footer);
-
-    public Task<IUserMessage> SendConfirmAsync(string text)
-        => ctx.Channel.SendConfirmAsync(_eb, text);
-
+    
     public Task<IUserMessage> SendConfirmAsync(
         string title,
         string text,
@@ -50,25 +46,33 @@ public abstract class NadekoModule : ModuleBase
         string footer = null)
         => ctx.Channel.SendConfirmAsync(_eb, title, text, url, footer);
 
-    public Task<IUserMessage> SendPendingAsync(string text)
-        => ctx.Channel.SendPendingAsync(_eb, text);
+    // 
+    public Task<IUserMessage> SendErrorAsync(string text, NadekoInteraction inter = null)
+        => ctx.Channel.SendAsync(_eb, text, MessageType.Error, inter);
+    public Task<IUserMessage> SendConfirmAsync(string text, NadekoInteraction inter = null)
+        => ctx.Channel.SendAsync(_eb, text, MessageType.Ok, inter);
+    public Task<IUserMessage> SendPendingAsync(string text, NadekoInteraction inter = null)
+        => ctx.Channel.SendAsync(_eb, text, MessageType.Pending, inter);
 
-    public Task<IUserMessage> ErrorLocalizedAsync(LocStr str)
-        => SendErrorAsync(GetText(str));
+    
+    // localized normal
+    public Task<IUserMessage> ErrorLocalizedAsync(LocStr str, NadekoInteraction inter = null)
+        => SendErrorAsync(GetText(str), inter);
 
-    public Task<IUserMessage> PendingLocalizedAsync(LocStr str)
-        => SendPendingAsync(GetText(str));
+    public Task<IUserMessage> PendingLocalizedAsync(LocStr str, NadekoInteraction inter = null)
+        => SendPendingAsync(GetText(str), inter);
 
-    public Task<IUserMessage> ConfirmLocalizedAsync(LocStr str)
-        => SendConfirmAsync(GetText(str));
+    public Task<IUserMessage> ConfirmLocalizedAsync(LocStr str, NadekoInteraction inter = null)
+        => SendConfirmAsync(GetText(str), inter);
 
-    public Task<IUserMessage> ReplyErrorLocalizedAsync(LocStr str)
+    // localized replies
+    public Task<IUserMessage> ReplyErrorLocalizedAsync(LocStr str, NadekoInteraction inter = null)
         => SendErrorAsync($"{Format.Bold(ctx.User.ToString())} {GetText(str)}");
 
-    public Task<IUserMessage> ReplyPendingLocalizedAsync(LocStr str)
+    public Task<IUserMessage> ReplyPendingLocalizedAsync(LocStr str, NadekoInteraction inter = null)
         => SendPendingAsync($"{Format.Bold(ctx.User.ToString())} {GetText(str)}");
 
-    public Task<IUserMessage> ReplyConfirmLocalizedAsync(LocStr str)
+    public Task<IUserMessage> ReplyConfirmLocalizedAsync(LocStr str, NadekoInteraction inter = null)
         => SendConfirmAsync($"{Format.Bold(ctx.User.ToString())} {GetText(str)}");
 
     public async Task<bool> PromptUserConfirmAsync(IEmbedBuilder embed)

src/NadekoBot/Common/Replacements/Replacer.cs

@@ -34,61 +34,59 @@ public class Replacer
     public SmartText Replace(SmartText data)
         => data switch
         {
-            SmartEmbedText embedData => Replace(embedData),
+            SmartEmbedText embedData => Replace(embedData) with
+            {
+                PlainText = Replace(embedData.PlainText),
+                Color = embedData.Color
+            },
             SmartPlainText plain => Replace(plain),
+            SmartEmbedTextArray arr => Replace(arr), 
             _ => throw new ArgumentOutOfRangeException(nameof(data), "Unsupported argument type")
         };
 
-    public SmartPlainText Replace(SmartPlainText plainText)
-        => Replace(plainText.Text);
-
-    public SmartEmbedText Replace(SmartEmbedText embedData)
-    {
-        var newEmbedData = new SmartEmbedText
+    private SmartEmbedTextArray Replace(SmartEmbedTextArray embedArr)
+        => new()
+        {
+            Embeds = embedArr.Embeds.Map(e => Replace(e) with
+            {
+                Color = e.Color
+            }),
+            Content = Replace(embedArr.Content)
+        };
+
+    private SmartPlainText Replace(SmartPlainText plain)
+        => Replace(plain.Text);
+
+    private T Replace<T>(T embedData) where T: SmartEmbedTextBase, new()
+    {
+        var newEmbedData = new T
         {
-            PlainText = Replace(embedData.PlainText),
             Description = Replace(embedData.Description),
             Title = Replace(embedData.Title),
             Thumbnail = Replace(embedData.Thumbnail),
             Image = Replace(embedData.Image),
-            Url = Replace(embedData.Url)
-        };
-        if (embedData.Author is not null)
-        {
-            newEmbedData.Author = new()
-            {
-                Name = Replace(embedData.Author.Name),
-                IconUrl = Replace(embedData.Author.IconUrl)
-            };
-        }
-
-        if (embedData.Fields is not null)
-        {
-            var fields = new List<SmartTextEmbedField>();
-            foreach (var f in embedData.Fields)
-            {
-                var newF = new SmartTextEmbedField
+            Url = Replace(embedData.Url),
+            Author = embedData.Author is null
+                ? null
+                : new()
                 {
-                    Name = Replace(f.Name),
-                    Value = Replace(f.Value),
-                    Inline = f.Inline
-                };
-                fields.Add(newF);
-            }
-
-            newEmbedData.Fields = fields.ToArray();
-        }
-
-        if (embedData.Footer is not null)
-        {
-            newEmbedData.Footer = new()
+                    Name = Replace(embedData.Author.Name),
+                    IconUrl = Replace(embedData.Author.IconUrl)
+                },
+            Fields = embedData.Fields?.Map(f => new SmartTextEmbedField
             {
-                Text = Replace(embedData.Footer.Text),
-                IconUrl = Replace(embedData.Footer.IconUrl)
-            };
-        }
-
-        newEmbedData.Color = embedData.Color;
+                Name = Replace(f.Name),
+                Value = Replace(f.Value),
+                Inline = f.Inline
+            }),
+            Footer = embedData.Footer is null
+                ? null
+                : new()
+                {
+                    Text = Replace(embedData.Footer.Text),
+                    IconUrl = Replace(embedData.Footer.IconUrl)
+                }
+        };
 
         return newEmbedData;
     }

src/NadekoBot/Common/SmartText/SmartEmbedText.cs

@@ -1,20 +1,67 @@
-#nullable disable
+using SixLabors.ImageSharp.PixelFormats;
+
+#nullable disable
 namespace NadekoBot;
 
-public sealed record SmartEmbedText : SmartText
+public sealed record SmartEmbedArrayElementText : SmartEmbedTextBase
 {
-    public string PlainText { get; set; }
-    public string Title { get; set; }
-    public string Description { get; set; }
-    public string Url { get; set; }
-    public string Thumbnail { get; set; }
-    public string Image { get; set; }
+    public string Color { get; init; } = string.Empty;
 
-    public SmartTextEmbedAuthor Author { get; set; }
-    public SmartTextEmbedFooter Footer { get; set; }
-    public SmartTextEmbedField[] Fields { get; set; }
+    public SmartEmbedArrayElementText() : base()
+    {
+        
+    }
+    
+    public SmartEmbedArrayElementText(IEmbed eb) : base(eb)
+    {
+        
+    }
 
-    public uint Color { get; set; } = 7458112;
+    protected override EmbedBuilder GetEmbedInternal()
+    {
+        var embed = base.GetEmbedInternal();
+        if (Rgba32.TryParseHex(Color, out var color))
+            return embed.WithColor(color.ToDiscordColor());
+
+        return embed;
+    }
+}
+
+public sealed record SmartEmbedText : SmartEmbedTextBase
+{
+    public string PlainText { get; init; }
+
+    public uint Color { get; init; } = 7458112;
+
+    public SmartEmbedText()
+    {
+    }
+
+    private SmartEmbedText(IEmbed eb, string plainText = null)
+        : base(eb)
+        => (PlainText, Color) = (plainText, eb.Color?.RawValue ?? 0);
+
+    public static SmartEmbedText FromEmbed(IEmbed eb, string plainText = null)
+        => new(eb, plainText);
+
+    protected override EmbedBuilder GetEmbedInternal()
+    {
+        var embed = base.GetEmbedInternal();
+        return embed.WithColor(Color);
+    }
+}
+
+public abstract record SmartEmbedTextBase : SmartText
+{
+    public string Title { get; init; }
+    public string Description { get; init; }
+    public string Url { get; init; }
+    public string Thumbnail { get; init; }
+    public string Image { get; init; }
+
+    public SmartTextEmbedAuthor Author { get; init; }
+    public SmartTextEmbedFooter Footer { get; init; }
+    public SmartTextEmbedField[] Fields { get; init; }
 
     public bool IsValid
         => !string.IsNullOrWhiteSpace(Title)
@@ -26,36 +73,37 @@ public sealed record SmartEmbedText : SmartText
                && (!string.IsNullOrWhiteSpace(Footer.Text) || !string.IsNullOrWhiteSpace(Footer.IconUrl)))
            || Fields is { Length: > 0 };
 
-    public static SmartEmbedText FromEmbed(IEmbed eb, string plainText = null)
+    protected SmartEmbedTextBase()
     {
-        var set = new SmartEmbedText
-        {
-            PlainText = plainText,
-            Title = eb.Title,
-            Description = eb.Description,
-            Url = eb.Url,
-            Thumbnail = eb.Thumbnail?.Url,
-            Image = eb.Image?.Url,
-            Author = eb.Author is { } ea
-                ? new()
-                {
-                    Name = ea.Name,
-                    Url = ea.Url,
-                    IconUrl = ea.IconUrl
-                }
-                : null,
-            Footer = eb.Footer is { } ef
-                ? new()
-                {
-                    Text = ef.Text,
-                    IconUrl = ef.IconUrl
-                }
-                : null
-        };
-
+        
+    }
+    
+    protected SmartEmbedTextBase(IEmbed eb)
+    {
+        Title = eb.Title;
+        Description = eb.Description;
+        Url = eb.Url;
+        Thumbnail = eb.Thumbnail?.Url;
+        Image = eb.Image?.Url;
+        Author = eb.Author is { } ea
+            ? new()
+            {
+                Name = ea.Name,
+                Url = ea.Url,
+                IconUrl = ea.IconUrl
+            }
+            : null;
+        Footer = eb.Footer is { } ef
+            ? new()
+            {
+                Text = ef.Text,
+                IconUrl = ef.IconUrl
+            }
+            : null;
+        
         if (eb.Fields.Length > 0)
         {
-            set.Fields = eb.Fields.Select(field
+            Fields = eb.Fields.Select(field
                                => new SmartTextEmbedField
                                {
                                    Inline = field.Inline,
@@ -64,14 +112,14 @@ public sealed record SmartEmbedText : SmartText
                                })
                            .ToArray();
         }
-
-        set.Color = eb.Color?.RawValue ?? 0;
-        return set;
     }
 
     public EmbedBuilder GetEmbed()
+        => GetEmbedInternal();
+    
+    protected virtual EmbedBuilder GetEmbedInternal()
     {
-        var embed = new EmbedBuilder().WithColor(Color);
+        var embed = new EmbedBuilder();
 
         if (!string.IsNullOrWhiteSpace(Title))
             embed.WithTitle(Title);

src/NadekoBot/Common/SmartText/SmartEmbedTextArray.cs

@@ -0,0 +1,28 @@
+#nullable disable
+namespace NadekoBot;
+
+public sealed record SmartEmbedTextArray : SmartText
+{
+    public string Content { get; set; }
+    public SmartEmbedArrayElementText[] Embeds { get; set; }
+
+    public bool IsValid
+        => Embeds?.All(x => x.IsValid) ?? false;
+
+    public EmbedBuilder[] GetEmbedBuilders()
+    {
+        if (Embeds is null)
+            return Array.Empty<EmbedBuilder>();
+
+        return Embeds.Map(em => em.GetEmbed());
+    }
+
+    public void NormalizeFields()
+    {
+        if (Embeds is null)
+            return;
+        
+        foreach(var eb in Embeds)
+            eb.NormalizeFields();
+    }
+}

src/NadekoBot/Common/SmartText/SmartText.cs

@@ -1,5 +1,6 @@
 #nullable disable
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace NadekoBot;
 
@@ -11,6 +12,9 @@ public abstract record SmartText
     public bool IsPlainText
         => this is SmartPlainText;
 
+    public bool IsEmbedArray
+        => this is SmartEmbedTextArray;
+    
     public static SmartText operator +(SmartText text, string input)
         => text switch
         {
@@ -19,6 +23,10 @@ public abstract record SmartText
                 PlainText = set.PlainText + input
             },
             SmartPlainText spt => new SmartPlainText(spt.Text + input),
+            SmartEmbedTextArray arr => arr with
+            {
+                Content = arr.Content + input
+            },
             _ => throw new ArgumentOutOfRangeException(nameof(text))
         };
 
@@ -30,27 +38,46 @@ public abstract record SmartText
                 PlainText = input + set.PlainText
             },
             SmartPlainText spt => new SmartPlainText(input + spt.Text),
+            SmartEmbedTextArray arr => arr with
+            {
+                Content = input + arr.Content
+            },
             _ => throw new ArgumentOutOfRangeException(nameof(text))
         };
 
+    [CanBeNull]
     public static SmartText CreateFrom(string input)
     {
-        if (string.IsNullOrWhiteSpace(input) || !input.TrimStart().StartsWith("{"))
+        if (string.IsNullOrWhiteSpace(input))
             return new SmartPlainText(input);
 
         try
         {
-            var smartEmbedText = JsonConvert.DeserializeObject<SmartEmbedText>(input);
+            var doc = JObject.Parse(input);
+            var root = doc.Root;
+            if (root.Type == JTokenType.Object)
+            {
+                if (((JObject)root).TryGetValue("embeds", out _))
+                {
+                    var arr = root.ToObject<SmartEmbedTextArray>();
 
-            if (smartEmbedText is null)
-                throw new FormatException();
+                    if (arr is null)
+                        return new SmartPlainText(input);
 
-            smartEmbedText.NormalizeFields();
+                    arr!.NormalizeFields();
+                    return arr;
+                }
 
-            if (!smartEmbedText.IsValid)
-                return new SmartPlainText(input);
+                var obj = root.ToObject<SmartEmbedText>();
 
-            return smartEmbedText;
+                if (obj is null)
+                    return new SmartPlainText(input);
+
+                obj.NormalizeFields();
+                return obj;
+            }
+            
+            return new SmartPlainText(input);
         }
         catch
         {

src/NadekoBot/Common/SocketMessageEventWrapper.cs

@@ -1,95 +0,0 @@
-#nullable disable
-namespace NadekoBot.Common;
-
-public sealed class ReactionEventWrapper : IDisposable
-{
-    public event Action<SocketReaction> OnReactionAdded = delegate { };
-    public event Action<SocketReaction> OnReactionRemoved = delegate { };
-    public event Action OnReactionsCleared = delegate { };
-
-    public IUserMessage Message { get; }
-    private readonly DiscordSocketClient _client;
-
-    private bool disposing;
-
-    public ReactionEventWrapper(DiscordSocketClient client, IUserMessage msg)
-    {
-        Message = msg ?? throw new ArgumentNullException(nameof(msg));
-        _client = client;
-
-        _client.ReactionAdded += Discord_ReactionAdded;
-        _client.ReactionRemoved += Discord_ReactionRemoved;
-        _client.ReactionsCleared += Discord_ReactionsCleared;
-    }
-
-    public void Dispose()
-    {
-        if (disposing)
-            return;
-        disposing = true;
-        UnsubAll();
-    }
-
-    private Task Discord_ReactionsCleared(Cacheable<IUserMessage, ulong> msg, Cacheable<IMessageChannel, ulong> channel)
-    {
-        Task.Run(() =>
-        {
-            try
-            {
-                if (msg.Id == Message.Id)
-                    OnReactionsCleared?.Invoke();
-            }
-            catch { }
-        });
-
-        return Task.CompletedTask;
-    }
-
-    private Task Discord_ReactionRemoved(
-        Cacheable<IUserMessage, ulong> msg,
-        Cacheable<IMessageChannel, ulong> cacheable,
-        SocketReaction reaction)
-    {
-        Task.Run(() =>
-        {
-            try
-            {
-                if (msg.Id == Message.Id)
-                    OnReactionRemoved?.Invoke(reaction);
-            }
-            catch { }
-        });
-
-        return Task.CompletedTask;
-    }
-
-    private Task Discord_ReactionAdded(
-        Cacheable<IUserMessage, ulong> msg,
-        Cacheable<IMessageChannel, ulong> cacheable,
-        SocketReaction reaction)
-    {
-        Task.Run(() =>
-        {
-            try
-            {
-                if (msg.Id == Message.Id)
-                    OnReactionAdded?.Invoke(reaction);
-            }
-            catch
-            {
-            }
-        });
-
-        return Task.CompletedTask;
-    }
-
-    public void UnsubAll()
-    {
-        _client.ReactionAdded -= Discord_ReactionAdded;
-        _client.ReactionRemoved -= Discord_ReactionRemoved;
-        _client.ReactionsCleared -= Discord_ReactionsCleared;
-        OnReactionAdded = null;
-        OnReactionRemoved = null;
-        OnReactionsCleared = null;
-    }
-}

src/NadekoBot/Db/Extensions/GuildConfigExtensions.cs

@@ -50,9 +50,7 @@ public static class GuildConfigExtensions
                   .Include(gc => gc.StreamRole)
                   .Include(gc => gc.XpSettings)
                   .ThenInclude(x => x.ExclusionList)
-                  .Include(gc => gc.DelMsgOnCmdChannels)
-                  .Include(gc => gc.ReactionRoleMessages)
-                  .ThenInclude(x => x.ReactionRoles);
+                  .Include(gc => gc.DelMsgOnCmdChannels);
 
     public static IEnumerable<GuildConfig> GetAllGuildConfigs(
         this DbSet<GuildConfig> configs,

src/NadekoBot/Db/Models/BankUser.cs

@@ -0,0 +1,9 @@
+using NadekoBot.Services.Database.Models;
+
+namespace NadekoBot.Db.Models;
+
+public class BankUser : DbEntity
+{
+    public ulong UserId { get; set; }
+    public long Balance { get; set; }
+}

src/NadekoBot/Db/Models/DiscordUser.cs

@@ -14,7 +14,7 @@ public class DiscordUser : DbEntity
     public ClubInfo Club { get; set; }
     public bool IsClubAdmin { get; set; }
 
-    public int TotalXp { get; set; }
+    public long TotalXp { get; set; }
     public DateTime LastLevelUp { get; set; } = DateTime.UtcNow;
     public DateTime LastXpGain { get; set; } = DateTime.MinValue;
     public XpNotificationLocation NotifyOnLevelUp { get; set; }

src/NadekoBot/Db/Models/GuildConfig.cs

@@ -90,8 +90,8 @@ public class GuildConfig : DbEntity
 
     public XpSettings XpSettings { get; set; }
     public List<FeedSub> FeedSubs { get; set; } = new();
-    public IndexedCollection<ReactionRoleMessage> ReactionRoleMessages { get; set; } = new();
     public bool NotifyStreamOffline { get; set; }
+    public bool DeleteStreamOnlineMessage { get; set; }
     public List<GroupName> SelfAssignableRoleGroupNames { get; set; }
     public int WarnExpireHours { get; set; }
     public WarnExpireAction WarnExpireAction { get; set; } = WarnExpireAction.Clear;

src/NadekoBot/Db/Models/ReactionRole.cs

@@ -1,22 +1,18 @@
 #nullable disable
+using System.ComponentModel.DataAnnotations;
+
 namespace NadekoBot.Services.Database.Models;
 
-public class ReactionRoleMessage : DbEntity, IIndexed
+public class ReactionRoleV2 : DbEntity
 {
-    public int Index { get; set; }
-
-    public int GuildConfigId { get; set; }
-    public GuildConfig GuildConfig { get; set; }
-
+    public ulong GuildId { get; set; }
     public ulong ChannelId { get; set; }
+    
     public ulong MessageId { get; set; }
-
-    public List<ReactionRole> ReactionRoles { get; set; }
-    public bool Exclusive { get; set; }
-}
-
-public class ReactionRole : DbEntity
-{
-    public string EmoteName { get; set; }
+    
+    [MaxLength(100)]
+    public string Emote { get; set; }
     public ulong RoleId { get; set; }
+    public int Group { get; set; }
+    public int LevelReq { get; set; }
 }

src/NadekoBot/Db/Models/UserXpStats.cs

@@ -5,8 +5,8 @@ public class UserXpStats : DbEntity
 {
     public ulong UserId { get; set; }
     public ulong GuildId { get; set; }
-    public int Xp { get; set; }
-    public int AwardedXp { get; set; }
+    public long Xp { get; set; }
+    public long AwardedXp { get; set; }
     public XpNotificationLocation NotifyOnLevelUp { get; set; }
     public DateTime LastLevelUp { get; set; } = DateTime.UtcNow;
 }

src/NadekoBot/Db/NadekoContext.cs

@@ -51,6 +51,10 @@ public abstract class NadekoContext : DbContext
     public DbSet<AutoTranslateUser> AutoTranslateUsers { get; set; }
 
     public DbSet<Permissionv2> Permissions { get; set; }
+    
+    public DbSet<BankUser> BankUsers { get; set; }
+    
+    public DbSet<ReactionRoleV2> ReactionRoles { get; set; }
 
     #region Mandatory Provider-Specific Values
 
@@ -359,11 +363,18 @@ public abstract class NadekoContext : DbContext
 
         #region Reaction roles
 
-        modelBuilder.Entity<ReactionRoleMessage>(rrm => rrm
-                                                        .HasMany(x => x.ReactionRoles)
-                                                        .WithOne()
-                                                        .OnDelete(DeleteBehavior.Cascade));
+        modelBuilder.Entity<ReactionRoleV2>(rr2 =>
+        {
+            rr2.HasIndex(x => x.GuildId)
+               .IsUnique(false);
 
+            rr2.HasIndex(x => new
+            {
+                x.MessageId,
+                x.Emote
+            }).IsUnique();
+        });
+        
         #endregion
 
         #region LogSettings
@@ -402,6 +413,13 @@ public abstract class NadekoContext : DbContext
             x.ChannelId,
             x.UserId
         }));
+
+        #region BANK
+
+        modelBuilder.Entity<BankUser>(bu => bu.HasIndex(x => x.UserId).IsUnique());
+
+        #endregion
+        
     }
 
 #if DEBUG

src/NadekoBot/Migrations/MigrationQueries.cs

@@ -0,0 +1,16 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace NadekoBot.Migrations;
+
+public static class MigrationQueries
+{
+    public static void MigrateRero(MigrationBuilder migrationBuilder)
+    {
+        migrationBuilder.Sql(
+            @"insert or ignore into reactionroles(guildid, channelid, messageid, emote, roleid, 'group', levelreq, dateadded)
+select guildid, channelid, messageid, emotename, roleid, exclusive, 0, reactionrolemessage.dateadded
+from reactionrole
+left join reactionrolemessage on reactionrolemessage.id = reactionrole.reactionrolemessageid
+left join guildconfigs on reactionrolemessage.guildconfigid = guildconfigs.id;");
+    }
+}

src/NadekoBot/Migrations/MySql/20220428044612_stondel.cs

@@ -0,0 +1,26 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace NadekoBot.Migrations.Mysql
+{
+    public partial class stondel : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "deletestreamonlinemessage",
+                table: "guildconfigs",
+                type: "tinyint(1)",
+                nullable: false,
+                defaultValue: false);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "deletestreamonlinemessage",
+                table: "guildconfigs");
+        }
+    }
+}

src/NadekoBot/Migrations/MySql/20220429044757_bank.cs

@@ -0,0 +1,42 @@
+using System;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace NadekoBot.Migrations.Mysql
+{
+    public partial class bank : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "bankusers",
+                columns: table => new
+                {
+                    id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
+                    userid = table.Column<ulong>(type: "bigint unsigned", nullable: false),
+                    balance = table.Column<long>(type: "bigint", nullable: false),
+                    dateadded = table.Column<DateTime>(type: "datetime(6)", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_bankusers", x => x.id);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateIndex(
+                name: "ix_bankusers_userid",
+                table: "bankusers",
+                column: "userid",
+                unique: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "bankusers");
+        }
+    }
+}

src/NadekoBot/Migrations/MySql/20220504162509_new-rero.cs

@@ -0,0 +1,121 @@
+using System;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace NadekoBot.Migrations.Mysql
+{
+    public partial class newrero : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+
+            migrationBuilder.CreateTable(
+                name: "reactionroles",
+                columns: table => new
+                {
+                    id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
+                    guildid = table.Column<ulong>(type: "bigint unsigned", nullable: false),
+                    channelid = table.Column<ulong>(type: "bigint unsigned", nullable: false),
+                    messageid = table.Column<ulong>(type: "bigint unsigned", nullable: false),
+                    emote = table.Column<string>(type: "varchar(100)", maxLength: 100, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    roleid = table.Column<ulong>(type: "bigint unsigned", nullable: false),
+                    group = table.Column<int>(type: "int", nullable: false),
+                    levelreq = table.Column<int>(type: "int", nullable: false),
+                    dateadded = table.Column<DateTime>(type: "datetime(6)", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_reactionroles", x => x.id);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateIndex(
+                name: "ix_reactionroles_guildid",
+                table: "reactionroles",
+                column: "guildid");
+
+            migrationBuilder.CreateIndex(
+                name: "ix_reactionroles_messageid_emote",
+                table: "reactionroles",
+                columns: new[] { "messageid", "emote" },
+                unique: true);
+            
+            MigrationQueries.MigrateRero(migrationBuilder);
+            
+            migrationBuilder.DropTable(
+                name: "reactionrole");
+
+            migrationBuilder.DropTable(
+                name: "reactionrolemessage");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "reactionroles");
+
+            migrationBuilder.CreateTable(
+                name: "reactionrolemessage",
+                columns: table => new
+                {
+                    id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
+                    guildconfigid = table.Column<int>(type: "int", nullable: false),
+                    channelid = table.Column<ulong>(type: "bigint unsigned", nullable: false),
+                    dateadded = table.Column<DateTime>(type: "datetime(6)", nullable: true),
+                    exclusive = table.Column<bool>(type: "tinyint(1)", nullable: false),
+                    index = table.Column<int>(type: "int", nullable: false),
+                    messageid = table.Column<ulong>(type: "bigint unsigned", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_reactionrolemessage", x => x.id);
+                    table.ForeignKey(
+                        name: "fk_reactionrolemessage_guildconfigs_guildconfigid",
+                        column: x => x.guildconfigid,
+                        principalTable: "guildconfigs",
+                        principalColumn: "id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "reactionrole",
+                columns: table => new
+                {
+                    id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
+                    dateadded = table.Column<DateTime>(type: "datetime(6)", nullable: true),
+                    emotename = table.Column<string>(type: "longtext", nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    reactionrolemessageid = table.Column<int>(type: "int", nullable: true),
+                    roleid = table.Column<ulong>(type: "bigint unsigned", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_reactionrole", x => x.id);
+                    table.ForeignKey(
+                        name: "fk_reactionrole_reactionrolemessage_reactionrolemessageid",
+                        column: x => x.reactionrolemessageid,
+                        principalTable: "reactionrolemessage",
+                        principalColumn: "id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateIndex(
+                name: "ix_reactionrole_reactionrolemessageid",
+                table: "reactionrole",
+                column: "reactionrolemessageid");
+
+            migrationBuilder.CreateIndex(
+                name: "ix_reactionrolemessage_guildconfigid",
+                table: "reactionrolemessage",
+                column: "guildconfigid");
+        }
+    }
+}

src/NadekoBot/Migrations/MySql/MysqlContextModelSnapshot.cs

@@ -16,9 +16,38 @@ namespace NadekoBot.Migrations.Mysql
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "6.0.3")
+                .HasAnnotation("ProductVersion", "6.0.4")
                 .HasAnnotation("Relational:MaxIdentifierLength", 64);
 
+            modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int")
+                        .HasColumnName("id");
+
+                    b.Property<long>("Balance")
+                        .HasColumnType("bigint")
+                        .HasColumnName("balance");
+
+                    b.Property<DateTime?>("DateAdded")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnName("dateadded");
+
+                    b.Property<ulong>("UserId")
+                        .HasColumnType("bigint unsigned")
+                        .HasColumnName("userid");
+
+                    b.HasKey("Id")
+                        .HasName("pk_bankusers");
+
+                    b.HasIndex("UserId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_bankusers_userid");
+
+                    b.ToTable("bankusers", (string)null);
+                });
+
             modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b =>
                 {
                     b.Property<int>("ClubId")
@@ -1032,6 +1061,10 @@ namespace NadekoBot.Migrations.Mysql
                         .HasColumnType("tinyint(1)")
                         .HasColumnName("deletemessageoncommand");
 
+                    b.Property<bool>("DeleteStreamOnlineMessage")
+                        .HasColumnType("tinyint(1)")
+                        .HasColumnName("deletestreamonlinemessage");
+
                     b.Property<string>("DmGreetMessageText")
                         .HasColumnType("longtext")
                         .HasColumnName("dmgreetmessagetext");
@@ -1780,39 +1813,7 @@ namespace NadekoBot.Migrations.Mysql
                     b.ToTable("quotes", (string)null);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ReactionRole", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int")
-                        .HasColumnName("id");
-
-                    b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("datetime(6)")
-                        .HasColumnName("dateadded");
-
-                    b.Property<string>("EmoteName")
-                        .HasColumnType("longtext")
-                        .HasColumnName("emotename");
-
-                    b.Property<int?>("ReactionRoleMessageId")
-                        .HasColumnType("int")
-                        .HasColumnName("reactionrolemessageid");
-
-                    b.Property<ulong>("RoleId")
-                        .HasColumnType("bigint unsigned")
-                        .HasColumnName("roleid");
-
-                    b.HasKey("Id")
-                        .HasName("pk_reactionrole");
-
-                    b.HasIndex("ReactionRoleMessageId")
-                        .HasDatabaseName("ix_reactionrole_reactionrolemessageid");
-
-                    b.ToTable("reactionrole", (string)null);
-                });
-
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ReactionRoleMessage", b =>
+            modelBuilder.Entity("NadekoBot.Services.Database.Models.ReactionRoleV2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -1827,29 +1828,42 @@ namespace NadekoBot.Migrations.Mysql
                         .HasColumnType("datetime(6)")
                         .HasColumnName("dateadded");
 
-                    b.Property<bool>("Exclusive")
-                        .HasColumnType("tinyint(1)")
-                        .HasColumnName("exclusive");
+                    b.Property<string>("Emote")
+                        .HasMaxLength(100)
+                        .HasColumnType("varchar(100)")
+                        .HasColumnName("emote");
 
-                    b.Property<int>("GuildConfigId")
+                    b.Property<int>("Group")
                         .HasColumnType("int")
-                        .HasColumnName("guildconfigid");
+                        .HasColumnName("group");
 
-                    b.Property<int>("Index")
+                    b.Property<ulong>("GuildId")
+                        .HasColumnType("bigint unsigned")
+                        .HasColumnName("guildid");
+
+                    b.Property<int>("LevelReq")
                         .HasColumnType("int")
-                        .HasColumnName("index");
+                        .HasColumnName("levelreq");
 
                     b.Property<ulong>("MessageId")
                         .HasColumnType("bigint unsigned")
                         .HasColumnName("messageid");
 
+                    b.Property<ulong>("RoleId")
+                        .HasColumnType("bigint unsigned")
+                        .HasColumnName("roleid");
+
                     b.HasKey("Id")
-                        .HasName("pk_reactionrolemessage");
+                        .HasName("pk_reactionroles");
 
-                    b.HasIndex("GuildConfigId")
-                        .HasDatabaseName("ix_reactionrolemessage_guildconfigid");
+                    b.HasIndex("GuildId")
+                        .HasDatabaseName("ix_reactionroles_guildid");
 
-                    b.ToTable("reactionrolemessage", (string)null);
+                    b.HasIndex("MessageId", "Emote")
+                        .IsUnique()
+                        .HasDatabaseName("ix_reactionroles_messageid_emote");
+
+                    b.ToTable("reactionroles", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
@@ -3075,27 +3089,6 @@ namespace NadekoBot.Migrations.Mysql
                         .HasConstraintName("fk_pollvote_poll_pollid");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ReactionRole", b =>
-                {
-                    b.HasOne("NadekoBot.Services.Database.Models.ReactionRoleMessage", null)
-                        .WithMany("ReactionRoles")
-                        .HasForeignKey("ReactionRoleMessageId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .HasConstraintName("fk_reactionrole_reactionrolemessage_reactionrolemessageid");
-                });
-
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ReactionRoleMessage", b =>
-                {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
-                        .WithMany("ReactionRoleMessages")
-                        .HasForeignKey("GuildConfigId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("fk_reactionrolemessage_guildconfigs_guildconfigid");
-
-                    b.Navigation("GuildConfig");
-                });
-
             modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
                 {
                     b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null)
@@ -3345,8 +3338,6 @@ namespace NadekoBot.Migrations.Mysql
 
                     b.Navigation("Permissions");
 
-                    b.Navigation("ReactionRoleMessages");
-
                     b.Navigation("SelfAssignableRoleGroupNames");
 
                     b.Navigation("ShopEntries");
@@ -3387,11 +3378,6 @@ namespace NadekoBot.Migrations.Mysql
                     b.Navigation("Votes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ReactionRoleMessage", b =>
-                {
-                    b.Navigation("ReactionRoles");
-                });
-
             modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
                 {
                     b.Navigation("Items");

src/NadekoBot/Migrations/Postgresql/20220428044547_stondel.cs

@@ -0,0 +1,26 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace NadekoBot.Migrations.PostgreSql
+{
+    public partial class stondel : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "deletestreamonlinemessage",
+                table: "guildconfigs",
+                type: "boolean",
+                nullable: false,
+                defaultValue: false);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "deletestreamonlinemessage",
+                table: "guildconfigs");
+        }
+    }
+}

src/NadekoBot/Migrations/Postgresql/20220429044808_bank.cs

@@ -0,0 +1,41 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace NadekoBot.Migrations.PostgreSql
+{
+    public partial class bank : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "bankusers",
+                columns: table => new
+                {
+                    id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    userid = table.Column<decimal>(type: "numeric(20,0)", nullable: false),
+                    balance = table.Column<long>(type: "bigint", nullable: false),
+                    dateadded = table.Column<DateTime>(type: "timestamp with time zone", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_bankusers", x => x.id);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "ix_bankusers_userid",
+                table: "bankusers",
+                column: "userid",
+                unique: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "bankusers");
+        }
+    }
+}

src/NadekoBot/Migrations/Postgresql/20220504162457_new-rero.cs

@@ -0,0 +1,115 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace NadekoBot.Migrations.PostgreSql
+{
+    public partial class newrero : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "reactionroles",
+                columns: table => new
+                {
+                    id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    guildid = table.Column<decimal>(type: "numeric(20,0)", nullable: false),
+                    channelid = table.Column<decimal>(type: "numeric(20,0)", nullable: false),
+                    messageid = table.Column<decimal>(type: "numeric(20,0)", nullable: false),
+                    emote = table.Column<string>(type: "character varying(100)", maxLength: 100, nullable: true),
+                    roleid = table.Column<decimal>(type: "numeric(20,0)", nullable: false),
+                    group = table.Column<int>(type: "integer", nullable: false),
+                    levelreq = table.Column<int>(type: "integer", nullable: false),
+                    dateadded = table.Column<DateTime>(type: "timestamp with time zone", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_reactionroles", x => x.id);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "ix_reactionroles_guildid",
+                table: "reactionroles",
+                column: "guildid");
+
+            migrationBuilder.CreateIndex(
+                name: "ix_reactionroles_messageid_emote",
+                table: "reactionroles",
+                columns: new[] { "messageid", "emote" },
+                unique: true);
+            
+            MigrationQueries.MigrateRero(migrationBuilder);
+            
+            migrationBuilder.DropTable(
+                name: "reactionrole");
+
+            migrationBuilder.DropTable(
+                name: "reactionrolemessage");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "reactionroles");
+
+            migrationBuilder.CreateTable(
+                name: "reactionrolemessage",
+                columns: table => new
+                {
+                    id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    guildconfigid = table.Column<int>(type: "integer", nullable: false),
+                    channelid = table.Column<decimal>(type: "numeric(20,0)", nullable: false),
+                    dateadded = table.Column<DateTime>(type: "timestamp with time zone", nullable: true),
+                    exclusive = table.Column<bool>(type: "boolean", nullable: false),
+                    index = table.Column<int>(type: "integer", nullable: false),
+                    messageid = table.Column<decimal>(type: "numeric(20,0)", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_reactionrolemessage", x => x.id);
+                    table.ForeignKey(
+                        name: "fk_reactionrolemessage_guildconfigs_guildconfigid",
+                        column: x => x.guildconfigid,
+                        principalTable: "guildconfigs",
+                        principalColumn: "id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "reactionrole",
+                columns: table => new
+                {
+                    id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    dateadded = table.Column<DateTime>(type: "timestamp with time zone", nullable: true),
+                    emotename = table.Column<string>(type: "text", nullable: true),
+                    reactionrolemessageid = table.Column<int>(type: "integer", nullable: true),
+                    roleid = table.Column<decimal>(type: "numeric(20,0)", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_reactionrole", x => x.id);
+                    table.ForeignKey(
+                        name: "fk_reactionrole_reactionrolemessage_reactionrolemessageid",
+                        column: x => x.reactionrolemessageid,
+                        principalTable: "reactionrolemessage",
+                        principalColumn: "id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "ix_reactionrole_reactionrolemessageid",
+                table: "reactionrole",
+                column: "reactionrolemessageid");
+
+            migrationBuilder.CreateIndex(
+                name: "ix_reactionrolemessage_guildconfigid",
+                table: "reactionrolemessage",
+                column: "guildconfigid");
+        }
+    }
+}

src/NadekoBot/Migrations/Postgresql/PostgreSqlContextModelSnapshot.cs

@@ -17,11 +17,42 @@ namespace NadekoBot.Migrations.PostgreSql
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "6.0.3")
+                .HasAnnotation("ProductVersion", "6.0.4")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
 
+            modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<long>("Balance")
+                        .HasColumnType("bigint")
+                        .HasColumnName("balance");
+
+                    b.Property<DateTime?>("DateAdded")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("dateadded");
+
+                    b.Property<decimal>("UserId")
+                        .HasColumnType("numeric(20,0)")
+                        .HasColumnName("userid");
+
+                    b.HasKey("Id")
+                        .HasName("pk_bankusers");
+
+                    b.HasIndex("UserId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_bankusers_userid");
+
+                    b.ToTable("bankusers", (string)null);
+                });
+
             modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b =>
                 {
                     b.Property<int>("ClubId")
@@ -1086,6 +1117,10 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnType("boolean")
                         .HasColumnName("deletemessageoncommand");
 
+                    b.Property<bool>("DeleteStreamOnlineMessage")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deletestreamonlinemessage");
+
                     b.Property<string>("DmGreetMessageText")
                         .HasColumnType("text")
                         .HasColumnName("dmgreetmessagetext");
@@ -1866,41 +1901,7 @@ namespace NadekoBot.Migrations.PostgreSql
                     b.ToTable("quotes", (string)null);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ReactionRole", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasColumnName("id");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("dateadded");
-
-                    b.Property<string>("EmoteName")
-                        .HasColumnType("text")
-                        .HasColumnName("emotename");
-
-                    b.Property<int?>("ReactionRoleMessageId")
-                        .HasColumnType("integer")
-                        .HasColumnName("reactionrolemessageid");
-
-                    b.Property<decimal>("RoleId")
-                        .HasColumnType("numeric(20,0)")
-                        .HasColumnName("roleid");
-
-                    b.HasKey("Id")
-                        .HasName("pk_reactionrole");
-
-                    b.HasIndex("ReactionRoleMessageId")
-                        .HasDatabaseName("ix_reactionrole_reactionrolemessageid");
-
-                    b.ToTable("reactionrole", (string)null);
-                });
-
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ReactionRoleMessage", b =>
+            modelBuilder.Entity("NadekoBot.Services.Database.Models.ReactionRoleV2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -1917,29 +1918,42 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("dateadded");
 
-                    b.Property<bool>("Exclusive")
-                        .HasColumnType("boolean")
-                        .HasColumnName("exclusive");
+                    b.Property<string>("Emote")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)")
+                        .HasColumnName("emote");
 
-                    b.Property<int>("GuildConfigId")
+                    b.Property<int>("Group")
                         .HasColumnType("integer")
-                        .HasColumnName("guildconfigid");
+                        .HasColumnName("group");
 
-                    b.Property<int>("Index")
+                    b.Property<decimal>("GuildId")
+                        .HasColumnType("numeric(20,0)")
+                        .HasColumnName("guildid");
+
+                    b.Property<int>("LevelReq")
                         .HasColumnType("integer")
-                        .HasColumnName("index");
+                        .HasColumnName("levelreq");
 
                     b.Property<decimal>("MessageId")
                         .HasColumnType("numeric(20,0)")
                         .HasColumnName("messageid");
 
+                    b.Property<decimal>("RoleId")
+                        .HasColumnType("numeric(20,0)")
+                        .HasColumnName("roleid");
+
                     b.HasKey("Id")
-                        .HasName("pk_reactionrolemessage");
+                        .HasName("pk_reactionroles");
 
-                    b.HasIndex("GuildConfigId")
-                        .HasDatabaseName("ix_reactionrolemessage_guildconfigid");
+                    b.HasIndex("GuildId")
+                        .HasDatabaseName("ix_reactionroles_guildid");
 
-                    b.ToTable("reactionrolemessage", (string)null);
+                    b.HasIndex("MessageId", "Emote")
+                        .IsUnique()
+                        .HasDatabaseName("ix_reactionroles_messageid_emote");
+
+                    b.ToTable("reactionroles", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
@@ -3215,27 +3229,6 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasConstraintName("fk_pollvote_poll_pollid");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ReactionRole", b =>
-                {
-                    b.HasOne("NadekoBot.Services.Database.Models.ReactionRoleMessage", null)
-                        .WithMany("ReactionRoles")
-                        .HasForeignKey("ReactionRoleMessageId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .HasConstraintName("fk_reactionrole_reactionrolemessage_reactionrolemessageid");
-                });
-
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ReactionRoleMessage", b =>
-                {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
-                        .WithMany("ReactionRoleMessages")
-                        .HasForeignKey("GuildConfigId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
-                        .HasConstraintName("fk_reactionrolemessage_guildconfigs_guildconfigid");
-
-                    b.Navigation("GuildConfig");
-                });
-
             modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
                 {
                     b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null)
@@ -3485,8 +3478,6 @@ namespace NadekoBot.Migrations.PostgreSql
 
                     b.Navigation("Permissions");
 
-                    b.Navigation("ReactionRoleMessages");
-
                     b.Navigation("SelfAssignableRoleGroupNames");
 
                     b.Navigation("ShopEntries");
@@ -3527,11 +3518,6 @@ namespace NadekoBot.Migrations.PostgreSql
                     b.Navigation("Votes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ReactionRoleMessage", b =>
-                {
-                    b.Navigation("ReactionRoles");
-                });
-
             modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
                 {
                     b.Navigation("Items");

src/NadekoBot/Migrations/Sqlite/20220427200557_stondel.cs

@@ -0,0 +1,26 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace NadekoBot.Migrations
+{
+    public partial class stondel : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "DeleteStreamOnlineMessage",
+                table: "GuildConfigs",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: false);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "DeleteStreamOnlineMessage",
+                table: "GuildConfigs");
+        }
+    }
+}

src/NadekoBot/Migrations/Sqlite/20220428051304_bank.cs

@@ -0,0 +1,40 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace NadekoBot.Migrations
+{
+    public partial class bank : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "BankUsers",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "INTEGER", nullable: false)
+                        .Annotation("Sqlite:Autoincrement", true),
+                    UserId = table.Column<ulong>(type: "INTEGER", nullable: false),
+                    Balance = table.Column<long>(type: "INTEGER", nullable: false),
+                    DateAdded = table.Column<DateTime>(type: "TEXT", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_BankUsers", x => x.Id);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_BankUsers_UserId",
+                table: "BankUsers",
+                column: "UserId",
+                unique: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "BankUsers");
+        }
+    }
+}

src/NadekoBot/Migrations/Sqlite/20220503234243_new-rero.cs

@@ -0,0 +1,114 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace NadekoBot.Migrations
+{
+    public partial class newrero : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "ReactionRoles",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "INTEGER", nullable: false)
+                              .Annotation("Sqlite:Autoincrement", true),
+                    GuildId = table.Column<ulong>(type: "INTEGER", nullable: false),
+                    ChannelId = table.Column<ulong>(type: "INTEGER", nullable: false),
+                    MessageId = table.Column<ulong>(type: "INTEGER", nullable: false),
+                    Emote = table.Column<string>(type: "TEXT", maxLength: 100, nullable: true),
+                    RoleId = table.Column<ulong>(type: "INTEGER", nullable: false),
+                    Group = table.Column<int>(type: "INTEGER", nullable: false),
+                    LevelReq = table.Column<int>(type: "INTEGER", nullable: false),
+                    DateAdded = table.Column<DateTime>(type: "TEXT", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_ReactionRoles", x => x.Id);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ReactionRoles_GuildId",
+                table: "ReactionRoles",
+                column: "GuildId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ReactionRoles_MessageId_Emote",
+                table: "ReactionRoles",
+                columns: new[] { "MessageId", "Emote" },
+                unique: true);
+            
+            MigrationQueries.MigrateRero(migrationBuilder);
+            
+            migrationBuilder.DropTable(
+                name: "ReactionRole");
+
+            migrationBuilder.DropTable(
+                name: "ReactionRoleMessage");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "ReactionRoles");
+
+            migrationBuilder.CreateTable(
+                name: "ReactionRoleMessage",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "INTEGER", nullable: false)
+                        .Annotation("Sqlite:Autoincrement", true),
+                    GuildConfigId = table.Column<int>(type: "INTEGER", nullable: false),
+                    ChannelId = table.Column<ulong>(type: "INTEGER", nullable: false),
+                    DateAdded = table.Column<DateTime>(type: "TEXT", nullable: true),
+                    Exclusive = table.Column<bool>(type: "INTEGER", nullable: false),
+                    Index = table.Column<int>(type: "INTEGER", nullable: false),
+                    MessageId = table.Column<ulong>(type: "INTEGER", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_ReactionRoleMessage", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_ReactionRoleMessage_GuildConfigs_GuildConfigId",
+                        column: x => x.GuildConfigId,
+                        principalTable: "GuildConfigs",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "ReactionRole",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "INTEGER", nullable: false)
+                        .Annotation("Sqlite:Autoincrement", true),
+                    DateAdded = table.Column<DateTime>(type: "TEXT", nullable: true),
+                    EmoteName = table.Column<string>(type: "TEXT", nullable: true),
+                    ReactionRoleMessageId = table.Column<int>(type: "INTEGER", nullable: true),
+                    RoleId = table.Column<ulong>(type: "INTEGER", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_ReactionRole", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_ReactionRole_ReactionRoleMessage_ReactionRoleMessageId",
+                        column: x => x.ReactionRoleMessageId,
+                        principalTable: "ReactionRoleMessage",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ReactionRole_ReactionRoleMessageId",
+                table: "ReactionRole",
+                column: "ReactionRoleMessageId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ReactionRoleMessage_GuildConfigId",
+                table: "ReactionRoleMessage",
+                column: "GuildConfigId");
+        }
+    }
+}

src/NadekoBot/Migrations/Sqlite/NadekoSqliteContextModelSnapshot.cs

@@ -17,6 +17,29 @@ namespace NadekoBot.Migrations
 #pragma warning disable 612, 618
             modelBuilder.HasAnnotation("ProductVersion", "6.0.3");
 
+            modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("Balance")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("DateAdded")
+                        .HasColumnType("TEXT");
+
+                    b.Property<ulong>("UserId")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("BankUsers");
+                });
+
             modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b =>
                 {
                     b.Property<int>("ClubId")
@@ -809,6 +832,9 @@ namespace NadekoBot.Migrations
                     b.Property<bool>("DeleteMessageOnCommand")
                         .HasColumnType("INTEGER");
 
+                    b.Property<bool>("DeleteStreamOnlineMessage")
+                        .HasColumnType("INTEGER");
+
                     b.Property<string>("DmGreetMessageText")
                         .HasColumnType("TEXT");
 
@@ -1389,32 +1415,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ReactionRole", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("EmoteName")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int?>("ReactionRoleMessageId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<ulong>("RoleId")
-                        .HasColumnType("INTEGER");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ReactionRoleMessageId");
-
-                    b.ToTable("ReactionRole");
-                });
-
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ReactionRoleMessage", b =>
+            modelBuilder.Entity("NadekoBot.Services.Database.Models.ReactionRoleV2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -1426,23 +1427,33 @@ namespace NadekoBot.Migrations
                     b.Property<DateTime?>("DateAdded")
                         .HasColumnType("TEXT");
 
-                    b.Property<bool>("Exclusive")
+                    b.Property<string>("Emote")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Group")
                         .HasColumnType("INTEGER");
 
-                    b.Property<int>("GuildConfigId")
+                    b.Property<ulong>("GuildId")
                         .HasColumnType("INTEGER");
 
-                    b.Property<int>("Index")
+                    b.Property<int>("LevelReq")
                         .HasColumnType("INTEGER");
 
                     b.Property<ulong>("MessageId")
                         .HasColumnType("INTEGER");
 
+                    b.Property<ulong>("RoleId")
+                        .HasColumnType("INTEGER");
+
                     b.HasKey("Id");
 
-                    b.HasIndex("GuildConfigId");
+                    b.HasIndex("GuildId");
 
-                    b.ToTable("ReactionRoleMessage");
+                    b.HasIndex("MessageId", "Emote")
+                        .IsUnique();
+
+                    b.ToTable("ReactionRoles");
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
@@ -2430,25 +2441,6 @@ namespace NadekoBot.Migrations
                         .HasForeignKey("PollId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ReactionRole", b =>
-                {
-                    b.HasOne("NadekoBot.Services.Database.Models.ReactionRoleMessage", null)
-                        .WithMany("ReactionRoles")
-                        .HasForeignKey("ReactionRoleMessageId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ReactionRoleMessage", b =>
-                {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
-                        .WithMany("ReactionRoleMessages")
-                        .HasForeignKey("GuildConfigId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("GuildConfig");
-                });
-
             modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
                 {
                     b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", null)
@@ -2676,8 +2668,6 @@ namespace NadekoBot.Migrations
 
                     b.Navigation("Permissions");
 
-                    b.Navigation("ReactionRoleMessages");
-
                     b.Navigation("SelfAssignableRoleGroupNames");
 
                     b.Navigation("ShopEntries");
@@ -2718,11 +2708,6 @@ namespace NadekoBot.Migrations
                     b.Navigation("Votes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ReactionRoleMessage", b =>
-                {
-                    b.Navigation("ReactionRoles");
-                });
-
             modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
                 {
                     b.Navigation("Items");

src/NadekoBot/Modules/Administration/DangerousCommands/DangerousCommandsService.cs

@@ -19,7 +19,7 @@ public class DangerousCommandsService : INService
         await using var ctx = _db.GetDbContext();
         await ctx.DiscordUser.UpdateAsync(_ => new DiscordUser()
         {
-            Club = null,
+            ClubId = null,
             // IsClubAdmin = false,
             TotalXp = 0
         });

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

@@ -256,15 +256,54 @@ public class GreetService : INService, IReadyExecutor
             {
                 text = new SmartEmbedText()
                 {
-                    PlainText = pt.Text
+                    Description = pt.Text
                 };
             }
-
-            ((SmartEmbedText)text).Footer = new()
+            else if (text is SmartEmbedText set)
             {
-                Text = $"This message was sent from {user.Guild} server.",
-                IconUrl = user.Guild.IconUrl
-            };
+                text = set with
+                {
+                    Footer = CreateFooterSource(user)
+                };
+            }
+            else if (text is SmartEmbedTextArray seta)
+            {
+                // if the greet dm message is a text array
+                var ebElem = seta.Embeds.LastOrDefault();
+                if (ebElem is null)
+                {
+                    // if there are no embeds, add an embed with the footer
+                    text = seta with
+                    {
+                        Embeds = new[]
+                        {
+                            new SmartEmbedArrayElementText()
+                            {
+                                Footer = CreateFooterSource(user)
+                            }
+                        }
+                    };
+                }
+                else
+                {
+                    // if the maximum amount of embeds is reached, edit the last embed
+                    if (seta.Embeds.Length >= 10)
+                    {
+                        seta.Embeds[^1] = seta.Embeds[^1] with
+                        {
+                            Footer = CreateFooterSource(user)
+                        };
+                    }
+                    else
+                    {
+                        // if there is less than 10 embeds, add an embed with footer only
+                        seta.Embeds = seta.Embeds.Append(new SmartEmbedArrayElementText()
+                        {
+                            Footer = CreateFooterSource(user)
+                        }).ToArray();
+                    }
+                }
+            }
 
             await user.SendAsync(text);
         }
@@ -276,6 +315,13 @@ public class GreetService : INService, IReadyExecutor
         return true;
     }
 
+    private static SmartTextEmbedFooter CreateFooterSource(IGuildUser user)
+        => new()
+        {
+            Text = $"This message was sent from {user.Guild} server.",
+            IconUrl = user.Guild.IconUrl
+        };
+
     private Task OnUserJoined(IGuildUser user)
     {
         _ = Task.Run(async () =>

src/NadekoBot/Modules/Administration/Role/IReactionRoleService.cs

@@ -0,0 +1,52 @@
+#nullable disable
+using NadekoBot.Services.Database.Models;
+using System.Collections;
+
+namespace NadekoBot.Modules.Administration.Services;
+
+public interface IReactionRoleService
+{
+    /// <summary>
+    /// Adds a single reaction role
+    /// </summary>
+    /// <param name="guildId"></param>
+    /// <param name="msg"></param>
+    /// <param name="channel"></param>
+    /// <param name="emote"></param>
+    /// <param name="role"></param>
+    /// <param name="group"></param>
+    /// <param name="levelReq"></param>
+    /// <returns></returns>
+    Task<bool> AddReactionRole(
+        ulong guildId,
+        IMessage msg,
+        ITextChannel channel,
+        string emote,
+        IRole role,
+        int group = 0,
+        int levelReq = 0);
+
+    /// <summary>
+    /// Get all reaction roles on the specified server
+    /// </summary>
+    /// <param name="guildId"></param>
+    /// <returns></returns>
+    Task<IReadOnlyCollection<ReactionRoleV2>> GetReactionRolesAsync(ulong guildId);
+
+    /// <summary>
+    /// Remove reaction roles on the specified message
+    /// </summary>
+    /// <param name="guildId"></param>
+    /// <param name="messageId"></param>
+    /// <returns></returns>
+    Task<bool> RemoveReactionRoles(ulong guildId, ulong messageId);
+
+    /// <summary>
+    /// Remove all reaction roles in the specified server
+    /// </summary>
+    /// <param name="guildId"></param>
+    /// <returns></returns>
+    Task<int> RemoveAllReactionRoles(ulong guildId);
+
+    Task<IReadOnlyCollection<IEmote>> TransferReactionRolesAsync(ulong guildId, ulong fromMessageId, ulong toMessageId);
+}

src/NadekoBot/Modules/Administration/Role/ReactionRoleCommands.cs

@@ -0,0 +1,166 @@
+using NadekoBot.Modules.Administration.Services;
+
+namespace NadekoBot.Modules.Administration;
+
+public partial class Administration
+{
+    public partial class ReactionRoleCommands : NadekoModule
+    {
+        private readonly IReactionRoleService _rero;
+
+        public ReactionRoleCommands(IReactionRoleService rero)
+        {
+            _rero = rero;
+        }
+        
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        [NoPublicBot]
+        [UserPerm(GuildPerm.ManageRoles)]
+        [BotPerm(GuildPerm.ManageRoles)]
+        public async partial Task ReactionRoleAdd(
+            ulong messageId,
+            string emoteStr,
+            IRole role,
+            int group = 0,
+            int levelReq = 0)
+        {
+            if (group < 0)
+                return;
+
+            if (levelReq < 0)
+                return;
+            
+            var msg = await ctx.Channel.GetMessageAsync(messageId);
+            if (msg is null)
+            {
+                await ReplyErrorLocalizedAsync(strs.not_found);
+                return;
+            }
+            
+            if (ctx.User.Id != ctx.Guild.OwnerId && ((IGuildUser)ctx.User).GetRoles().Max(x => x.Position) <= role.Position)
+            {
+                await ReplyErrorLocalizedAsync(strs.hierarchy);
+                return;
+            }
+
+            var emote = emoteStr.ToIEmote();
+            await msg.AddReactionAsync(emote);
+            var succ = await _rero.AddReactionRole(ctx.Guild.Id,
+                msg,
+                (ITextChannel)ctx.Channel,
+                emoteStr,
+                role,
+                group,
+                levelReq);
+            
+            if (succ)
+            {
+                await ctx.OkAsync();
+            }
+            else
+            {
+                await ctx.ErrorAsync();
+            }
+        }
+
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        [NoPublicBot]
+        [UserPerm(GuildPerm.ManageRoles)]
+        [BotPerm(GuildPerm.ManageRoles)]
+        public async partial Task ReactionRolesList()
+        {
+            var reros = await _rero.GetReactionRolesAsync(ctx.Guild.Id);
+
+            var embed = _eb.Create(ctx)
+                           .WithOkColor();
+
+            var content = string.Empty;
+            foreach (var g in reros.GroupBy(x => x.MessageId).OrderBy(x => x.Key))
+            {
+                var messageId = g.Key;
+                content +=
+                    $"[{messageId}](https://discord.com/channels/{ctx.Guild.Id}/{g.First().ChannelId}/{g.Key})\n";
+
+                var groupGroups = g.GroupBy(x => x.Group);
+
+                foreach (var ggs in groupGroups)
+                {
+                    content += $"`< {(g.Key == 0 ? ("Not Exclusive (Group 0)") : ($"Group {ggs.Key}"))} >`\n";
+
+                    foreach (var rero in ggs)
+                    {
+                        content += $"\t{rero.Emote} -> {(ctx.Guild.GetRole(rero.RoleId)?.Mention ?? "<missing role>")}";
+                        if (rero.LevelReq > 0)
+                            content += $" (lvl {rero.LevelReq}+)";
+                        content += '\n';
+                    }
+                }
+
+            }
+
+            embed.WithDescription(string.IsNullOrWhiteSpace(content)
+                ? "There are no reaction roles on this server"
+                : content);
+
+            await ctx.Channel.EmbedAsync(embed);
+        }
+
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        [NoPublicBot]
+        [UserPerm(GuildPerm.ManageRoles)]
+        [BotPerm(GuildPerm.ManageRoles)]
+        public async partial Task ReactionRolesRemove(ulong messageId)
+        {
+            var succ = await _rero.RemoveReactionRoles(ctx.Guild.Id, messageId);
+            if (succ)
+                await ctx.OkAsync();
+            else
+                await ctx.ErrorAsync();
+        }
+
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        [NoPublicBot]
+        [UserPerm(GuildPerm.ManageRoles)]
+        [BotPerm(GuildPerm.ManageRoles)]
+        public async partial Task ReactionRolesDeleteAll()
+        {
+            await _rero.RemoveAllReactionRoles(ctx.Guild.Id);
+            await ctx.OkAsync();
+        }
+
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        [NoPublicBot]
+        [UserPerm(GuildPerm.ManageRoles)]
+        [BotPerm(GuildPerm.ManageRoles)]
+        [Ratelimit(60)]
+        public async partial Task ReactionRolesTransfer(ulong fromMessageId, ulong toMessageId)
+        {
+            var msg = await ctx.Channel.GetMessageAsync(toMessageId);
+
+            if (msg is null)
+            {
+                await ctx.ErrorAsync();
+                return;
+            }
+
+            var reactions = await _rero.TransferReactionRolesAsync(ctx.Guild.Id, fromMessageId, toMessageId);
+
+            if (reactions.Count == 0)
+            {
+                await ctx.ErrorAsync();
+            }
+            else
+            {
+                foreach (var r in reactions)
+                {
+                    await msg.AddReactionAsync(r);
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,356 @@
+#nullable disable
+using LinqToDB;
+using LinqToDB.EntityFrameworkCore;
+using NadekoBot.Common.ModuleBehaviors;
+using NadekoBot.Modules.Xp.Extensions;
+using NadekoBot.Services.Database.Models;
+
+namespace NadekoBot.Modules.Administration.Services;
+
+public sealed class ReactionRolesService : IReadyExecutor, INService, IReactionRoleService
+{
+    private readonly DbService _db;
+    private readonly DiscordSocketClient _client;
+    private readonly IBotCredentials _creds;
+
+    private ConcurrentDictionary<ulong, List<ReactionRoleV2>> _cache;
+    private readonly object _cacheLock = new();
+    private readonly SemaphoreSlim _assignementLock = new(1, 1);
+
+    public ReactionRolesService(DiscordSocketClient client, DbService db, IBotCredentials creds)
+    {
+        _db = db;
+        _client = client;
+        _creds = creds;
+        _cache = new();
+    }
+    
+    public async Task OnReadyAsync()
+    {
+        await using var uow = _db.GetDbContext();
+        var reros = await uow.GetTable<ReactionRoleV2>()
+                             .Where(x => Linq2DbExpressions.GuildOnShard(x.GuildId, _creds.TotalShards, _client.ShardId))
+                             .ToListAsyncLinqToDB();
+
+        foreach (var group in reros.GroupBy(x => x.MessageId))
+        {
+            _cache[group.Key] = group.ToList();
+        }
+
+        _client.ReactionAdded += ClientOnReactionAdded;
+        _client.ReactionRemoved += ClientOnReactionRemoved;
+    }
+
+    private async Task<(IGuildUser, IRole)> GetUserAndRoleAsync(
+        SocketReaction r,
+        ReactionRoleV2 rero)
+    {
+        var guild = _client.GetGuild(rero.GuildId);
+        var role = guild?.GetRole(rero.RoleId);
+
+        if (role is null)
+            return default;
+
+        var user = guild.GetUser(r.UserId) as IGuildUser
+                   ?? await _client.Rest.GetGuildUserAsync(guild.Id, r.UserId);
+
+        if (user is null)
+            return default;
+
+        return (user, role);
+    }
+
+    private Task ClientOnReactionRemoved(
+        Cacheable<IUserMessage, ulong> msg,
+        Cacheable<IMessageChannel, ulong> ch,
+        SocketReaction r)
+    {
+        if (!_cache.TryGetValue(msg.Id, out var reros))
+            return Task.CompletedTask;
+
+        _ = Task.Run(async () =>
+        {
+            var rero = reros.FirstOrDefault(x => x.Emote == r.Emote.Name || x.Emote == r.Emote.ToString());
+            if (rero is null)
+                return;
+
+            var (user, role) = await GetUserAndRoleAsync(r, rero);
+
+            if (user.IsBot)
+                return;
+
+            await _assignementLock.WaitAsync();
+            try
+            {
+                if (user.RoleIds.Contains(role.Id))
+                {
+                    await user.RemoveRoleAsync(role.Id);
+                }
+            }
+            finally
+            {
+                _assignementLock.Release();
+            }
+        });
+
+        return Task.CompletedTask;
+    }
+
+    private Task ClientOnReactionAdded(
+        Cacheable<IUserMessage, ulong> msg,
+        Cacheable<IMessageChannel, ulong> ch,
+        SocketReaction r)
+    {
+        if (!_cache.TryGetValue(msg.Id, out var reros))
+            return Task.CompletedTask;
+
+        _ = Task.Run(async () =>
+        {
+            var rero = reros.FirstOrDefault(x => x.Emote == r.Emote.Name || x.Emote == r.Emote.ToString());
+            if (rero is null)
+                return;
+
+            var (user, role) = await GetUserAndRoleAsync(r, rero);
+
+            if (user.IsBot)
+                return;
+
+            await _assignementLock.WaitAsync();
+            try
+            {
+                if (!user.RoleIds.Contains(role.Id))
+                {
+                    // first check if there is a level requirement
+                    // and if there is, make sure user satisfies it
+                    if (rero.LevelReq > 0)
+                    {
+                        await using var ctx = _db.GetDbContext();
+                        var levelData = await ctx.GetTable<UserXpStats>()
+                                 .GetLevelDataFor(user.GuildId, user.Id);
+
+                        if (levelData.Level < rero.LevelReq)
+                            return;
+                    }
+                    
+                    // remove all other roles from the same group from the user
+                    // execept in group 0, which is a special, non-exclusive group
+                    if (rero.Group != 0)
+                    {
+                        var exclusive = reros
+                                        .Where(x => x.Group == rero.Group && x.RoleId != role.Id)
+                                        .Select(x => x.RoleId)
+                                        .Distinct();
+
+                        
+                        try { await user.RemoveRolesAsync(exclusive); }
+                        catch { }
+
+                        // remove user's previous reaction
+                        try
+                        {
+                            var m = await msg.GetOrDownloadAsync();
+                            if (m is not null)
+                            {
+                                var reactToRemove = m.Reactions
+                                                     .FirstOrDefault(x => x.Key.ToString() != r.Emote.ToString())
+                                                     .Key;
+
+                                if (reactToRemove is not null)
+                                {
+                                    await m.RemoveReactionAsync(reactToRemove, user);
+                                }
+                            }
+                        }
+                        catch
+                        {
+                        }
+                    }
+
+                    await user.AddRoleAsync(role.Id);
+                }
+            }
+            finally
+            {
+                _assignementLock.Release();
+            }
+        });
+
+        return Task.CompletedTask;
+    }
+
+    /// <summary>
+    /// Adds a single reaction role
+    /// </summary>
+    /// <param name="guildId"></param>
+    /// <param name="msg"></param>
+    /// <param name="channel"></param>
+    /// <param name="emote"></param>
+    /// <param name="role"></param>
+    /// <param name="group"></param>
+    /// <param name="levelReq"></param>
+    /// <returns></returns>
+    public async Task<bool> AddReactionRole(
+        ulong guildId,
+        IMessage msg,
+        ITextChannel channel,
+        string emote,
+        IRole role,
+        int group = 0,
+        int levelReq = 0)
+    {
+        if (group < 0)
+            throw new ArgumentOutOfRangeException(nameof(group));
+
+        if (levelReq < 0)
+            throw new ArgumentOutOfRangeException(nameof(group));
+
+        await using var ctx = _db.GetDbContext();
+        var activeReactionRoles = await ctx.GetTable<ReactionRoleV2>()
+                                           .Where(x => x.GuildId == guildId)
+                                           .CountAsync();
+
+        if (activeReactionRoles >= 50)
+            return false;
+
+        var changed = await ctx.GetTable<ReactionRoleV2>()
+                               .InsertOrUpdateAsync(() => new()
+                                   {
+                                       GuildId = guildId,
+                                       ChannelId = channel.Id,
+
+                                       MessageId = msg.Id,
+                                       Emote = emote,
+
+                                       RoleId = role.Id,
+                                       Group = group,
+                                       LevelReq = levelReq
+                                   },
+                                   (old) => new()
+                                   {
+                                       RoleId = role.Id,
+                                       Group = group,
+                                       LevelReq = levelReq
+                                   },
+                                   () => new()
+                                   {
+                                       MessageId = msg.Id,
+                                       Emote = emote,
+                                   });
+
+        if (changed == 0)
+            return false;
+
+        var obj = new ReactionRoleV2()
+        {
+            GuildId = guildId,
+            MessageId = msg.Id,
+            Emote = emote,
+            RoleId = role.Id,
+            Group = group,
+            LevelReq = levelReq
+        };
+
+        lock (_cacheLock)
+        {
+            _cache.AddOrUpdate(msg.Id,
+                _ => new()
+                {
+                    obj
+                },
+                (_, list) =>
+                {
+                    list.RemoveAll(x => x.Emote == emote);
+                    list.Add(obj);
+                    return list;
+                });
+        }
+
+        return true;
+    }
+
+    /// <summary>
+    /// Get all reaction roles on the specified server
+    /// </summary>
+    /// <param name="guildId"></param>
+    /// <returns></returns>
+    public async Task<IReadOnlyCollection<ReactionRoleV2>> GetReactionRolesAsync(ulong guildId)
+    {
+        await using var ctx = _db.GetDbContext();
+        return await ctx.GetTable<ReactionRoleV2>()
+                        .Where(x => x.GuildId == guildId)
+                        .ToListAsync();
+    }
+
+    /// <summary>
+    /// Remove reaction roles on the specified message
+    /// </summary>
+    /// <param name="guildId"></param>
+    /// <param name="messageId"></param>
+    /// <returns></returns>
+    public async Task<bool> RemoveReactionRoles(ulong guildId, ulong messageId)
+    {
+        // guildid is used for quick index lookup
+        await using var ctx = _db.GetDbContext();
+        var changed = await ctx.GetTable<ReactionRoleV2>()
+                               .Where(x => x.GuildId == guildId && x.MessageId == messageId)
+                               .DeleteAsync();
+
+        _cache.TryRemove(messageId, out _);
+
+        if (changed == 0)
+            return false;
+
+        return true;
+    }
+
+    /// <summary>
+    /// Remove all reaction roles in the specified server
+    /// </summary>
+    /// <param name="guildId"></param>
+    /// <returns></returns>
+    public async Task<int> RemoveAllReactionRoles(ulong guildId)
+    {
+        await using var ctx = _db.GetDbContext();
+        var output = await ctx.GetTable<ReactionRoleV2>()
+                              .Where(x => x.GuildId == guildId)
+                              .DeleteWithOutputAsync(x => x.MessageId);
+
+        lock (_cacheLock)
+        {
+            foreach (var o in output)
+            {
+                _cache.TryRemove(o, out _);
+            }
+        }
+
+        return output.Length;
+    }
+
+    public async Task<IReadOnlyCollection<IEmote>> TransferReactionRolesAsync(ulong guildId, ulong fromMessageId, ulong toMessageId)
+    {
+        await using var ctx = _db.GetDbContext();
+        var updated = ctx.GetTable<ReactionRoleV2>()
+                         .Where(x => x.GuildId == guildId && x.MessageId == fromMessageId)
+                         .UpdateWithOutput(old => new()
+                             {
+                                 MessageId = toMessageId
+                             },
+                             (old, neu) => neu);
+        lock (_cacheLock)
+        {
+            if (_cache.TryRemove(fromMessageId, out var data))
+            {
+                if (_cache.TryGetValue(toMessageId, out var newData))
+                {
+                    newData.AddRange(data);
+                }
+                else
+                {
+                    _cache[toMessageId] = data;
+                }
+            }
+        }
+
+        return updated.Select(x => x.Emote.ToIEmote()).ToList();
+    }
+}

src/NadekoBot/Modules/Administration/Role/RoleCommands.cs

@@ -7,172 +7,18 @@ using Color = SixLabors.ImageSharp.Color;
 
 namespace NadekoBot.Modules.Administration;
 
+
 public partial class Administration
 {
-    public partial class RoleCommands : NadekoModule<RoleCommandsService>
+    public partial class RoleCommands : NadekoModule
     {
         public enum Exclude { Excl }
 
         private readonly IServiceProvider _services;
 
         public RoleCommands(IServiceProvider services)
-            => _services = services;
-
-        public async Task InternalReactionRoles(bool exclusive, ulong? messageId, params string[] input)
         {
-            var target = messageId is { } msgId
-                ? await ctx.Channel.GetMessageAsync(msgId)
-                : (await ctx.Channel.GetMessagesAsync(2).FlattenAsync()).Skip(1).FirstOrDefault();
-
-            if (input.Length % 2 != 0 || target is null)
-                return;
-
-            var all = await input.Chunk(2)
-                                 .Select(async x =>
-                                 {
-                                     var inputRoleStr = x.First();
-                                     var roleReader = new RoleTypeReader<SocketRole>();
-                                     var roleResult = await roleReader.ReadAsync(ctx, inputRoleStr, _services);
-                                     if (!roleResult.IsSuccess)
-                                     {
-                                         Log.Warning("Role {Role} not found", inputRoleStr);
-                                         return null;
-                                     }
-
-                                     var role = (IRole)roleResult.BestMatch;
-                                     if (role.Position
-                                         > ((IGuildUser)ctx.User).GetRoles()
-                                                                 .Select(r => r.Position)
-                                                                 .Max()
-                                         && ctx.User.Id != ctx.Guild.OwnerId)
-                                         return null;
-                                     var emote = x.Last().ToIEmote();
-                                     return new
-                                     {
-                                         role,
-                                         emote
-                                     };
-                                 })
-                                 .Where(x => x is not null)
-                                 .WhenAll();
-
-            if (!all.Any())
-                return;
-
-            foreach (var x in all)
-            {
-                try
-                {
-                    await target.AddReactionAsync(x.emote,
-                        new()
-                        {
-                            RetryMode = RetryMode.Retry502 | RetryMode.RetryRatelimit
-                        });
-                }
-                catch (HttpException ex) when (ex.HttpCode == HttpStatusCode.BadRequest)
-                {
-                    await ReplyErrorLocalizedAsync(strs.reaction_cant_access(Format.Code(x.emote.ToString())));
-                    return;
-                }
-
-                await Task.Delay(500);
-            }
-
-            if (_service.Add(ctx.Guild.Id,
-                    new()
-                    {
-                        Exclusive = exclusive,
-                        MessageId = target.Id,
-                        ChannelId = target.Channel.Id,
-                        ReactionRoles = all.Select(x =>
-                                           {
-                                               return new ReactionRole
-                                               {
-                                                   EmoteName = x.emote.ToString(),
-                                                   RoleId = x.role.Id
-                                               };
-                                           })
-                                           .ToList()
-                    }))
-                await ctx.OkAsync();
-            else
-                await ReplyErrorLocalizedAsync(strs.reaction_roles_full);
-        }
-
-        [Cmd]
-        [RequireContext(ContextType.Guild)]
-        [NoPublicBot]
-        [UserPerm(GuildPerm.ManageRoles)]
-        [BotPerm(GuildPerm.ManageRoles)]
-        [Priority(0)]
-        public partial Task ReactionRoles(ulong messageId, params string[] input)
-            => InternalReactionRoles(false, messageId, input);
-
-        [Cmd]
-        [RequireContext(ContextType.Guild)]
-        [NoPublicBot]
-        [UserPerm(GuildPerm.ManageRoles)]
-        [BotPerm(GuildPerm.ManageRoles)]
-        [Priority(1)]
-        public partial Task ReactionRoles(ulong messageId, Exclude _, params string[] input)
-            => InternalReactionRoles(true, messageId, input);
-
-        [Cmd]
-        [RequireContext(ContextType.Guild)]
-        [NoPublicBot]
-        [UserPerm(GuildPerm.ManageRoles)]
-        [BotPerm(GuildPerm.ManageRoles)]
-        [Priority(0)]
-        public partial Task ReactionRoles(params string[] input)
-            => InternalReactionRoles(false, null, input);
-
-        [Cmd]
-        [RequireContext(ContextType.Guild)]
-        [NoPublicBot]
-        [UserPerm(GuildPerm.ManageRoles)]
-        [BotPerm(GuildPerm.ManageRoles)]
-        [Priority(1)]
-        public partial Task ReactionRoles(Exclude _, params string[] input)
-            => InternalReactionRoles(true, null, input);
-
-        [Cmd]
-        [RequireContext(ContextType.Guild)]
-        [NoPublicBot]
-        [UserPerm(GuildPerm.ManageRoles)]
-        public async partial Task ReactionRolesList()
-        {
-            var embed = _eb.Create().WithOkColor();
-            if (!_service.Get(ctx.Guild.Id, out var rrs) || !rrs.Any())
-                embed.WithDescription(GetText(strs.no_reaction_roles));
-            else
-            {
-                var g = (SocketGuild)ctx.Guild;
-                foreach (var rr in rrs)
-                {
-                    var ch = g.GetTextChannel(rr.ChannelId);
-                    IUserMessage msg = null;
-                    if (ch is not null)
-                        msg = await ch.GetMessageAsync(rr.MessageId) as IUserMessage;
-                    var content = msg?.Content.TrimTo(30) ?? "DELETED!";
-                    embed.AddField($"**{rr.Index + 1}.** {ch?.Name ?? "DELETED!"}",
-                        GetText(strs.reaction_roles_message(rr.ReactionRoles?.Count ?? 0, content)));
-                }
-            }
-
-            await ctx.Channel.EmbedAsync(embed);
-        }
-
-        [Cmd]
-        [RequireContext(ContextType.Guild)]
-        [NoPublicBot]
-        [UserPerm(GuildPerm.ManageRoles)]
-        public async partial Task ReactionRolesRemove(int index)
-        {
-            if (index < 1 || !_service.Get(ctx.Guild.Id, out var rrs) || !rrs.Any() || rrs.Count < index)
-                return;
-            index--;
-            _service.Remove(ctx.Guild.Id, index);
-            await ReplyConfirmLocalizedAsync(strs.reaction_role_removed(index + 1));
+            _services = services;
         }
 
         [Cmd]

src/NadekoBot/Modules/Administration/Role/RoleCommandsService.cs

@@ -1,253 +0,0 @@
-#nullable disable
-using LinqToDB;
-using LinqToDB.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore;
-using NadekoBot.Common.Collections;
-using NadekoBot.Db;
-using NadekoBot.Services.Database.Models;
-
-namespace NadekoBot.Modules.Administration.Services;
-
-public class RoleCommandsService : INService
-{
-    private readonly DbService _db;
-    private readonly DiscordSocketClient _client;
-    private readonly ConcurrentDictionary<ulong, IndexedCollection<ReactionRoleMessage>> _models;
-
-    /// <summary>
-    ///     Contains the (Message ID, User ID) of reaction roles that are currently being processed.
-    /// </summary>
-    private readonly ConcurrentHashSet<(ulong, ulong)> _reacting = new();
-
-    public RoleCommandsService(DiscordSocketClient client, DbService db, Bot bot)
-    {
-        _db = db;
-        _client = client;
-#if !GLOBAL_NADEKO
-        _models = bot.AllGuildConfigs.ToDictionary(x => x.GuildId, x => x.ReactionRoleMessages).ToConcurrent();
-
-        _client.ReactionAdded += _client_ReactionAdded;
-        _client.ReactionRemoved += _client_ReactionRemoved;
-#endif
-    }
-
-    private Task _client_ReactionAdded(
-        Cacheable<IUserMessage, ulong> msg,
-        Cacheable<IMessageChannel, ulong> chan,
-        SocketReaction reaction)
-    {
-        _ = Task.Run(async () =>
-        {
-            if (!reaction.User.IsSpecified
-                || reaction.User.Value.IsBot
-                || reaction.User.Value is not SocketGuildUser gusr
-                || chan.Value is not SocketGuildChannel gch
-                || !_models.TryGetValue(gch.Guild.Id, out var confs))
-                return;
-
-            var conf = confs.FirstOrDefault(x => x.MessageId == msg.Id);
-
-            if (conf is null)
-                return;
-
-            // compare emote names for backwards compatibility :facepalm:
-            var reactionRole = conf.ReactionRoles.FirstOrDefault(x
-                => x.EmoteName == reaction.Emote.Name || x.EmoteName == reaction.Emote.ToString());
-
-            if (reactionRole is not null)
-            {
-                if (!conf.Exclusive)
-                {
-                    await AddReactionRoleAsync(gusr, reactionRole);
-                    return;
-                }
-
-                // If same (message, user) are being processed in an exclusive rero, quit
-                if (!_reacting.Add((msg.Id, reaction.UserId)))
-                    return;
-
-                try
-                {
-                    var removeExclusiveTask = RemoveExclusiveReactionRoleAsync(msg,
-                        gusr,
-                        reaction,
-                        conf,
-                        reactionRole,
-                        CancellationToken.None);
-                    var addRoleTask = AddReactionRoleAsync(gusr, reactionRole);
-
-                    await Task.WhenAll(removeExclusiveTask, addRoleTask);
-                }
-                finally
-                {
-                    // Free (message/user) for another exclusive rero
-                    _reacting.TryRemove((msg.Id, reaction.UserId));
-                }
-            }
-            else
-            {
-                var dl = await msg.GetOrDownloadAsync();
-                await dl.RemoveReactionAsync(reaction.Emote,
-                    dl.Author,
-                    new()
-                    {
-                        RetryMode = RetryMode.RetryRatelimit | RetryMode.Retry502
-                    });
-                Log.Warning("User {Author} is adding unrelated reactions to the reaction roles message", dl.Author);
-            }
-        });
-
-        return Task.CompletedTask;
-    }
-
-    private Task _client_ReactionRemoved(
-        Cacheable<IUserMessage, ulong> msg,
-        Cacheable<IMessageChannel, ulong> chan,
-        SocketReaction reaction)
-    {
-        _ = Task.Run(async () =>
-        {
-            try
-            {
-                if (!reaction.User.IsSpecified
-                    || reaction.User.Value.IsBot
-                    || reaction.User.Value is not SocketGuildUser gusr)
-                    return;
-
-                if (chan.Value is not SocketGuildChannel gch)
-                    return;
-
-                if (!_models.TryGetValue(gch.Guild.Id, out var confs))
-                    return;
-
-                var conf = confs.FirstOrDefault(x => x.MessageId == msg.Id);
-
-                if (conf is null)
-                    return;
-
-                var reactionRole = conf.ReactionRoles.FirstOrDefault(x
-                    => x.EmoteName == reaction.Emote.Name || x.EmoteName == reaction.Emote.ToString());
-
-                if (reactionRole is not null)
-                {
-                    var role = gusr.Guild.GetRole(reactionRole.RoleId);
-                    if (role is null)
-                        return;
-                    await gusr.RemoveRoleAsync(role);
-                }
-            }
-            catch { }
-        });
-
-        return Task.CompletedTask;
-    }
-
-    public bool Get(ulong id, out IndexedCollection<ReactionRoleMessage> rrs)
-        => _models.TryGetValue(id, out rrs);
-
-    public bool Add(ulong id, ReactionRoleMessage rrm)
-    {
-        using var uow = _db.GetDbContext();
-        var table = uow.GetTable<ReactionRoleMessage>();
-        table.Delete(x => x.MessageId == rrm.MessageId);
-
-        var gc = uow.GuildConfigsForId(id,
-            set => set.Include(x => x.ReactionRoleMessages).ThenInclude(x => x.ReactionRoles));
-
-        if (gc.ReactionRoleMessages.Count >= 10)
-            return false;
-
-        gc.ReactionRoleMessages.Add(rrm);
-        uow.SaveChanges();
-
-        _models.AddOrUpdate(id, gc.ReactionRoleMessages, delegate { return gc.ReactionRoleMessages; });
-        return true;
-    }
-
-    public void Remove(ulong id, int index)
-    {
-        using var uow = _db.GetDbContext();
-        var gc = uow.GuildConfigsForId(id,
-            set => set.Include(x => x.ReactionRoleMessages).ThenInclude(x => x.ReactionRoles));
-        uow.Set<ReactionRole>().RemoveRange(gc.ReactionRoleMessages[index].ReactionRoles);
-        gc.ReactionRoleMessages.RemoveAt(index);
-        _models.AddOrUpdate(id, gc.ReactionRoleMessages, delegate { return gc.ReactionRoleMessages; });
-        uow.SaveChanges();
-    }
-
-    /// <summary>
-    ///     Adds a reaction role to the specified user.
-    /// </summary>
-    /// <param name="user">A Discord guild user.</param>
-    /// <param name="dbRero">The database settings of this reaction role.</param>
-    private Task AddReactionRoleAsync(SocketGuildUser user, ReactionRole dbRero)
-    {
-        var toAdd = user.Guild.GetRole(dbRero.RoleId);
-
-        return toAdd is not null && !user.Roles.Contains(toAdd) ? user.AddRoleAsync(toAdd) : Task.CompletedTask;
-    }
-
-    /// <summary>
-    ///     Removes the exclusive reaction roles and reactions from the specified user.
-    /// </summary>
-    /// <param name="reactionMessage">The Discord message that contains the reaction roles.</param>
-    /// <param name="user">A Discord guild user.</param>
-    /// <param name="reaction">The Discord reaction of the user.</param>
-    /// <param name="dbReroMsg">The database entry of the reaction role message.</param>
-    /// <param name="dbRero">The database settings of this reaction role.</param>
-    /// <param name="cToken">A cancellation token to cancel the operation.</param>
-    /// <exception cref="OperationCanceledException">Occurs when the operation is cancelled before it began.</exception>
-    /// <exception cref="TaskCanceledException">Occurs when the operation is cancelled while it's still executing.</exception>
-    private Task RemoveExclusiveReactionRoleAsync(
-        Cacheable<IUserMessage, ulong> reactionMessage,
-        SocketGuildUser user,
-        SocketReaction reaction,
-        ReactionRoleMessage dbReroMsg,
-        ReactionRole dbRero,
-        CancellationToken cToken = default)
-    {
-        cToken.ThrowIfCancellationRequested();
-
-        var roleIds = dbReroMsg.ReactionRoles.Select(x => x.RoleId)
-                               .Where(x => x != dbRero.RoleId)
-                               .Select(x => user.Guild.GetRole(x))
-                               .Where(x => x is not null);
-
-        var removeReactionsTask = RemoveOldReactionsAsync(reactionMessage, user, reaction, cToken);
-
-        var removeRolesTask = user.RemoveRolesAsync(roleIds);
-
-        return Task.WhenAll(removeReactionsTask, removeRolesTask);
-    }
-
-    /// <summary>
-    ///     Removes old reactions from an exclusive reaction role.
-    /// </summary>
-    /// <param name="reactionMessage">The Discord message that contains the reaction roles.</param>
-    /// <param name="user">A Discord guild user.</param>
-    /// <param name="reaction">The Discord reaction of the user.</param>
-    /// <param name="cToken">A cancellation token to cancel the operation.</param>
-    /// <exception cref="OperationCanceledException">Occurs when the operation is cancelled before it began.</exception>
-    /// <exception cref="TaskCanceledException">Occurs when the operation is cancelled while it's still executing.</exception>
-    private async Task RemoveOldReactionsAsync(
-        Cacheable<IUserMessage, ulong> reactionMessage,
-        SocketGuildUser user,
-        SocketReaction reaction,
-        CancellationToken cToken = default)
-    {
-        cToken.ThrowIfCancellationRequested();
-
-        //if the role is exclusive,
-        // remove all other reactions user added to the message
-        var dl = await reactionMessage.GetOrDownloadAsync();
-        foreach (var r in dl.Reactions)
-        {
-            if (r.Key.Name == reaction.Emote.Name)
-                continue;
-            try { await dl.RemoveReactionAsync(r.Key, user); }
-            catch { }
-
-            await Task.Delay(100, cToken);
-        }
-    }
-}

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

@@ -530,7 +530,7 @@ public class UserPunishService : INService, IReadyExecutor
             return default;
         // if template is an embed, send that embed with replacements
         // otherwise, treat template as a regular string with replacements
-        else if (!SmartText.CreateFrom(template).IsEmbed)
+        else if (SmartText.CreateFrom(template) is not { IsEmbed: true } or { IsEmbedArray: true })
         {
             template = JsonConvert.SerializeObject(new
             {

src/NadekoBot/Modules/Gambling/Bank/BankCommands.cs

@@ -0,0 +1,72 @@
+using NadekoBot.Modules.Gambling.Bank;
+using NadekoBot.Modules.Gambling.Common;
+using NadekoBot.Modules.Gambling.Services;
+
+namespace NadekoBot.Modules.Gambling;
+
+public partial class Gambling
+{
+    [Name("Bank")]
+    [Group("bank")]
+    public partial class BankCommands : GamblingModule<IBankService>
+    {
+        private readonly IBankService _bank;
+
+        public BankCommands(GamblingConfigService gcs, IBankService bank) : base(gcs)
+        {
+            _bank = bank;
+        }
+
+        [Cmd]
+        public async partial Task BankDeposit(ShmartNumber amount)
+        {
+            if (amount <= 0)
+                return;
+            
+            if (await _bank.DepositAsync(ctx.User.Id, amount))
+            {
+                await ReplyConfirmLocalizedAsync(strs.bank_deposited(N(amount)));
+            }
+            else
+            {
+                await ReplyErrorLocalizedAsync(strs.not_enough(CurrencySign));
+            }
+        }
+        
+        [Cmd]
+        public async partial Task BankWithdraw(ShmartNumber amount)
+        {
+            if (amount <= 0)
+                return;
+            
+            if (await _bank.WithdrawAsync(ctx.User.Id, amount))
+            {
+                await ReplyConfirmLocalizedAsync(strs.bank_withdrew(N(amount)));
+            }
+            else
+            {
+                await ReplyErrorLocalizedAsync(strs.bank_withdraw_insuff(CurrencySign));
+            }
+        }
+        
+        [Cmd]
+        public async partial Task BankBalance()
+        {
+            var bal = await _bank.GetBalanceAsync(ctx.User.Id);
+
+            var eb = _eb.Create(ctx)
+                        .WithOkColor()
+                        .WithDescription(GetText(strs.bank_balance(N(bal))));
+
+            try
+            {
+                await ctx.User.EmbedAsync(eb);
+                await ctx.OkAsync();
+            }
+            catch
+            {
+                await ReplyErrorLocalizedAsync(strs.unable_to_dm_user);
+            }
+        }
+    }
+}

src/NadekoBot/Modules/Gambling/Bank/BankService.cs

@@ -0,0 +1,77 @@
+using LinqToDB;
+using LinqToDB.EntityFrameworkCore;
+
+namespace NadekoBot.Modules.Gambling.Bank;
+
+public sealed class BankService : IBankService, INService
+{
+    private readonly ICurrencyService _cur;
+    private readonly DbService _db;
+
+    public BankService(ICurrencyService cur, DbService db)
+    {
+        _cur = cur;
+        _db = db;
+    }
+
+    public async Task<bool> DepositAsync(ulong userId, long amount)
+    {
+        if (amount <= 0)
+            throw new ArgumentOutOfRangeException(nameof(amount));
+        
+        if (!await _cur.RemoveAsync(userId, amount, new("bank", "deposit")))
+            return false;
+
+        await using var ctx = _db.GetDbContext();
+        await ctx.BankUsers
+                 .ToLinqToDBTable()
+                 .InsertOrUpdateAsync(() => new()
+                     {
+                         UserId = userId,
+                         Balance = amount
+                     },
+                     (old) => new()
+                     {
+                         Balance = old.Balance + amount
+                     },
+                     () => new()
+                     {
+                         UserId = userId
+                     });
+
+        return true;
+    }
+
+    public async Task<bool> WithdrawAsync(ulong userId, long amount)
+    {
+        if (amount <= 0)
+            throw new ArgumentOutOfRangeException(nameof(amount));
+        
+        await using var ctx = _db.GetDbContext();
+        var rows = await ctx.BankUsers
+                 .ToLinqToDBTable()
+                 .Where(x => x.UserId == userId && x.Balance >= amount)
+                 .UpdateAsync((old) => new()
+                 {
+                     Balance = old.Balance - amount
+                 });
+
+        if (rows > 0)
+        {
+            await _cur.AddAsync(userId, amount, new("bank", "withdraw"));
+            return true;
+        }
+
+        return false;
+    }
+
+    public async Task<long> GetBalanceAsync(ulong userId)
+    {
+        await using var ctx = _db.GetDbContext();
+        return (await ctx.BankUsers
+                         .ToLinqToDBTable()
+                         .FirstOrDefaultAsync(x => x.UserId == userId))
+               ?.Balance
+               ?? 0;
+    }
+}

src/NadekoBot/Modules/Gambling/Bank/IBankService.cs

@@ -0,0 +1,8 @@
+namespace NadekoBot.Modules.Gambling.Bank;
+
+public interface IBankService
+{
+    Task<bool> DepositAsync(ulong userId, long amount);
+    Task<bool> WithdrawAsync(ulong userId, long amount);
+    Task<long> GetBalanceAsync(ulong userId);
+}

src/NadekoBot/Modules/Gambling/CashInteraction.cs

@@ -0,0 +1,17 @@
+#nullable disable
+namespace NadekoBot.Modules.Gambling;
+
+public class CashInteraction
+{
+    public static NadekoInteractionData Data =
+        new NadekoInteractionData(new Emoji("🏦"), "cash:bank_show_balance");
+
+    public static NadekoInteraction CreateInstance(
+        DiscordSocketClient client,
+        ulong userId,
+        Func<SocketMessageComponent, Task> action)
+        => new NadekoInteractionBuilder()
+           .WithData(Data)
+           .WithAction(action)
+           .Build(client, userId);
+}

src/NadekoBot/Modules/Gambling/Gambling.cs

@@ -3,6 +3,7 @@ using LinqToDB;
 using LinqToDB.EntityFrameworkCore;
 using NadekoBot.Db;
 using NadekoBot.Db.Models;
+using NadekoBot.Modules.Gambling.Bank;
 using NadekoBot.Modules.Gambling.Common;
 using NadekoBot.Modules.Gambling.Services;
 using NadekoBot.Services.Currency;
@@ -40,6 +41,7 @@ public partial class Gambling : GamblingModule<GamblingService>
     private readonly NumberFormatInfo _enUsCulture;
     private readonly DownloadTracker _tracker;
     private readonly GamblingConfigService _configService;
+    private readonly IBankService _bank;
 
     private IUserMessage rdMsg;
 
@@ -49,13 +51,16 @@ public partial class Gambling : GamblingModule<GamblingService>
         IDataCache cache,
         DiscordSocketClient client,
         DownloadTracker tracker,
-        GamblingConfigService configService)
+        GamblingConfigService configService,
+        IBankService bank)
         : base(configService)
     {
         _db = db;
         _cs = currency;
         _cache = cache;
         _client = client;
+        _bank = bank;
+
         _enUsCulture = new CultureInfo("en-US", false).NumberFormat;
         _enUsCulture.NumberDecimalDigits = 0;
         _enUsCulture.NumberGroupSeparator = " ";
@@ -72,7 +77,7 @@ public partial class Gambling : GamblingModule<GamblingService>
     [Cmd]
     public async partial Task Economy()
     {
-        var ec = _service.GetEconomy();
+        var ec = await _service.GetEconomyAsync();
         decimal onePercent = 0;
 
         // This stops the top 1% from owning more than 100% of the money
@@ -84,13 +89,13 @@ public partial class Gambling : GamblingModule<GamblingService>
         // [21:03] Bob Page: Kinda remids me of US economy
         var embed = _eb.Create()
                        .WithTitle(GetText(strs.economy_state))
-                       .AddField(GetText(strs.currency_owned),
-                           N(ec.Cash - ec.Bot))
+                       .AddField(GetText(strs.currency_owned), N(ec.Cash - ec.Bot))
                        .AddField(GetText(strs.currency_one_percent), (onePercent * 100).ToString("F2") + "%")
                        .AddField(GetText(strs.currency_planted), N(ec.Planted))
                        .AddField(GetText(strs.owned_waifus_total), N(ec.Waifus))
                        .AddField(GetText(strs.bot_currency), N(ec.Bot))
-                       .AddField(GetText(strs.total), N(ec.Cash + ec.Planted + ec.Waifus))
+                       .AddField(GetText(strs.bank_accounts), N(ec.Bank))
+                       .AddField(GetText(strs.total), N(ec.Cash + ec.Planted + ec.Waifus + ec.Bank))
                        .WithOkColor();
 
         // ec.Cash already contains ec.Bot as it's the total of all values in the CurrencyAmount column of the DiscordUser table
@@ -232,7 +237,6 @@ public partial class Gambling : GamblingModule<GamblingService>
             var kwumId = new kwum(tr.Id).ToString();
             var date = $"#{Format.Code(kwumId)} `〖{GetFormattedCurtrDate(tr)}〗`";
 
-
             sb.AppendLine($"\\{change} {date} {Format.Bold(N(tr.Amount))}");
             var transactionString = GetHumanReadableTransaction(tr.Type, tr.Extra, tr.OtherId);
             if (transactionString is not null)
@@ -260,8 +264,7 @@ public partial class Gambling : GamblingModule<GamblingService>
         int intId = id;
         await using var uow = _db.GetDbContext();
 
-        var tr = await uow.CurrencyTransactions
-                          .ToLinqToDBTable()
+        var tr = await uow.CurrencyTransactions.ToLinqToDBTable()
                           .Where(x => x.Id == intId && x.UserId == ctx.User.Id)
                           .FirstOrDefaultAsync();
 
@@ -271,8 +274,7 @@ public partial class Gambling : GamblingModule<GamblingService>
             return;
         }
 
-        var eb = _eb.Create(ctx)
-                    .WithOkColor();
+        var eb = _eb.Create(ctx).WithOkColor();
 
         eb.WithAuthor(ctx.User);
         eb.WithTitle(GetText(strs.transaction));
@@ -291,7 +293,6 @@ public partial class Gambling : GamblingModule<GamblingService>
             eb.AddField("Note", tr.Note);
         }
 
-
         eb.WithFooter(GetFormattedCurtrDate(tr));
 
         await ctx.Channel.EmbedAsync(eb);
@@ -311,7 +312,7 @@ public partial class Gambling : GamblingModule<GamblingService>
             (_, _, ulong userId) => $"{type.Titleize()} - {subType.Titleize()} | [{userId}]",
             _ => $"{type.Titleize()} - {subType.Titleize()}"
         };
-
+    
     [Cmd]
     [Priority(0)]
     public async partial Task Cash(ulong userId)
@@ -320,13 +321,36 @@ public partial class Gambling : GamblingModule<GamblingService>
         await ReplyConfirmLocalizedAsync(strs.has(Format.Code(userId.ToString()), cur));
     }
 
+    private async Task BankAction(SocketMessageComponent smc)
+    {
+        var balance = await _bank.GetBalanceAsync(ctx.User.Id);
+
+        await N(balance)
+              .Pipe(strs.bank_balance)
+              .Pipe(GetText)
+              .Pipe(text => smc.RespondConfirmAsync(_eb, text, ephemeral: true));
+    }
+
+    private NadekoInteraction CreateCashInteraction()
+        => CashInteraction.CreateInstance(_client, ctx.User.Id, BankAction);
+
     [Cmd]
     [Priority(1)]
     public async partial Task Cash([Leftover] IUser user = null)
     {
         user ??= ctx.User;
         var cur = await GetBalanceStringAsync(user.Id);
-        await ConfirmLocalizedAsync(strs.has(Format.Bold(user.ToString()), cur));
+        
+        var inter = user == ctx.User
+            ? CreateCashInteraction()
+            : null;
+
+        await ConfirmLocalizedAsync(
+            user.ToString()
+                .Pipe(Format.Bold)
+                .With(cur)
+                .Pipe(strs.has),
+            inter);
     }
 
     [Cmd]
@@ -339,7 +363,7 @@ public partial class Gambling : GamblingModule<GamblingService>
             return;
         }
 
-        if (!await _cs.TransferAsync(ctx.User.Id, receiver.Id, amount, ctx.User.ToString(), msg))
+        if (!await _cs.TransferAsync(_eb, ctx.User, receiver, amount, msg, N(amount)))
         {
             await ReplyErrorLocalizedAsync(strs.not_enough(CurrencySign));
             return;
@@ -386,10 +410,7 @@ public partial class Gambling : GamblingModule<GamblingService>
             return;
         }
 
-        await _cs.AddAsync(usr.Id,
-            amount,
-            new("award", ctx.User.ToString()!, msg, ctx.User.Id)
-        );
+        await _cs.AddAsync(usr.Id, amount, new("award", ctx.User.ToString()!, msg, ctx.User.Id));
         await ReplyConfirmLocalizedAsync(strs.awarded(N(amount), $"<@{usrId}>"));
     }
 
@@ -403,10 +424,7 @@ public partial class Gambling : GamblingModule<GamblingService>
 
         await _cs.AddBulkAsync(users.Select(x => x.Id).ToList(),
             amount,
-            new("award",
-                ctx.User.ToString()!,
-                role.Name,
-                ctx.User.Id));
+            new("award", ctx.User.ToString()!, role.Name, ctx.User.Id));
 
         await ReplyConfirmLocalizedAsync(strs.mass_award(N(amount),
             Format.Bold(users.Count.ToString()),
@@ -423,10 +441,7 @@ public partial class Gambling : GamblingModule<GamblingService>
 
         await _cs.RemoveBulkAsync(users.Select(x => x.Id).ToList(),
             amount,
-            new("take",
-                ctx.User.ToString()!,
-                null,
-                ctx.User.Id));
+            new("take", ctx.User.ToString()!, null, ctx.User.Id));
 
         await ReplyConfirmLocalizedAsync(strs.mass_take(N(amount),
             Format.Bold(users.Count.ToString()),
@@ -444,10 +459,7 @@ public partial class Gambling : GamblingModule<GamblingService>
             return;
         }
 
-        var extra = new TxData("take",
-            ctx.User.ToString()!,
-            null,
-            ctx.User.Id);
+        var extra = new TxData("take", ctx.User.ToString()!, null, ctx.User.Id);
 
         if (await _cs.RemoveAsync(user.Id, amount, extra))
         {
@@ -459,7 +471,6 @@ public partial class Gambling : GamblingModule<GamblingService>
         }
     }
 
-
     [Cmd]
     [OwnerOnly]
     public async partial Task Take(long amount, [Leftover] ulong usrId)
@@ -469,10 +480,7 @@ public partial class Gambling : GamblingModule<GamblingService>
             return;
         }
 
-        var extra = new TxData("take",
-            ctx.User.ToString()!,
-            null,
-            ctx.User.Id);
+        var extra = new TxData("take", ctx.User.ToString()!, null, ctx.User.Id);
 
         if (await _cs.RemoveAsync(usrId, amount, extra))
         {
@@ -560,10 +568,7 @@ public partial class Gambling : GamblingModule<GamblingService>
             }
             else
             {
-                await rdMsg.ModifyAsync(x =>
-                {
-                    x.Embed = embed.Build();
-                });
+                await rdMsg.ModifyAsync(x => { x.Embed = embed.Build(); });
             }
         }
 
@@ -613,7 +618,6 @@ public partial class Gambling : GamblingModule<GamblingService>
 
         var result = br.Roll();
 
-
         var str = Format.Bold(ctx.User.ToString()) + Format.Code(GetText(strs.roll(result.Roll)));
         if (result.Multiplier > 0)
         {
@@ -742,9 +746,7 @@ public partial class Gambling : GamblingModule<GamblingService>
 
         if (amount > 0)
         {
-            if (!await _cs.RemoveAsync(ctx.User.Id,
-                    amount,
-                    new("rps", "bet", "")))
+            if (!await _cs.RemoveAsync(ctx.User.Id, amount, new("rps", "bet", "")))
             {
                 await ReplyErrorLocalizedAsync(strs.not_enough(CurrencySign));
                 return;

src/NadekoBot/Modules/Gambling/GamblingService.cs

@@ -1,8 +1,11 @@
 #nullable disable
 using LinqToDB;
+using LinqToDB.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Common.ModuleBehaviors;
 using NadekoBot.Db;
+using NadekoBot.Db.Models;
+using NadekoBot.Migrations;
 using NadekoBot.Modules.Gambling.Common;
 using NadekoBot.Modules.Gambling.Common.Connect4;
 using NadekoBot.Modules.Gambling.Common.Slot;
@@ -158,7 +161,7 @@ public class GamblingService : INService, IReadyExecutor
         return toReturn;
     }
 
-    public EconomyResult GetEconomy()
+    public async Task<EconomyResult> GetEconomyAsync()
     {
         if (_cache.TryGetEconomy(out var data))
         {
@@ -173,6 +176,7 @@ public class GamblingService : INService, IReadyExecutor
         decimal onePercent;
         decimal planted;
         decimal waifus;
+        decimal bank;
         long bot;
 
         using (var uow = _db.GetDbContext())
@@ -182,6 +186,8 @@ public class GamblingService : INService, IReadyExecutor
             planted = uow.PlantedCurrency.AsQueryable().Sum(x => x.Amount);
             waifus = uow.WaifuInfo.GetTotalValue();
             bot = uow.DiscordUser.GetUserCurrency(_client.CurrentUser.Id);
+            bank = await uow.GetTable<BankUser>()
+                      .SumAsyncLinqToDB(x => x.Balance);
         }
 
         var result = new EconomyResult
@@ -190,7 +196,8 @@ public class GamblingService : INService, IReadyExecutor
             Planted = planted,
             Bot = bot,
             Waifus = waifus,
-            OnePercent = onePercent
+            OnePercent = onePercent,
+            Bank = bank
         };
 
         _cache.SetEconomy(JsonConvert.SerializeObject(result));
@@ -207,6 +214,7 @@ public class GamblingService : INService, IReadyExecutor
         public decimal Planted { get; set; }
         public decimal Waifus { get; set; }
         public decimal OnePercent { get; set; }
+        public decimal Bank { get; set; }
         public long Bot { get; set; }
     }
 }

src/NadekoBot/Modules/Gambling/GamblingTopLevelModule.cs

@@ -39,13 +39,19 @@ public abstract class GamblingModule<TService> : NadekoModule<TService>
         return true;
     }
 
+    public static string N(long cur, IFormatProvider format)
+        => cur.ToString("C0", format);
+    
+    public static string N(decimal cur, IFormatProvider format)
+        => cur.ToString("C0", format);
+    
     protected string N(long cur)
-        => cur.ToString("C0", GetFlowersCiInternal());
+        => N(cur, GetFlowersCiInternal());
 
     protected string N(decimal cur)
-        => cur.ToString("C0", GetFlowersCiInternal());
+        => N(cur, GetFlowersCiInternal());
 
-    private IFormatProvider GetFlowersCiInternal()
+    protected IFormatProvider GetFlowersCiInternal()
     {
         var flowersCi = (CultureInfo)Culture.Clone();
         flowersCi.NumberFormat.CurrencySymbol = CurrencySign;

src/NadekoBot/Modules/Help/Help.cs

@@ -129,6 +129,8 @@ public partial class Help : NadekoModule<HelpService>
                 return strs.module_description_permissions;
             case "xp":
                 return strs.module_description_xp;
+            case "medusa":
+                return strs.module_description_medusa;
             default:
                 return strs.module_description_missing;
         }
@@ -264,6 +266,20 @@ public partial class Help : NadekoModule<HelpService>
         await ctx.Channel.EmbedAsync(embed);
     }
 
+    private async Task Group(ModuleInfo group)
+    {
+        var eb = _eb.Create(ctx)
+                    .WithTitle(GetText(strs.cmd_group_commands(group.Name)))
+                    .WithOkColor();
+
+        foreach (var cmd in group.Commands)
+        {
+            eb.AddField(prefix + cmd.Aliases.First(), cmd.RealSummary(_strings, _medusae, Culture, prefix));
+        }
+
+        await ctx.Channel.EmbedAsync(eb);
+    }
+
     [Cmd]
     [Priority(0)]
     public async partial Task H([Leftover] string fail)
@@ -276,6 +292,20 @@ public partial class Help : NadekoModule<HelpService>
             return;
         }
 
+        if (fail.StartsWith(prefix))
+            fail = fail.Substring(prefix.Length);
+        
+        var group = _cmds.Modules
+                         .SelectMany(x => x.Submodules)
+                         .Where(x => !string.IsNullOrWhiteSpace(x.Group))
+                         .FirstOrDefault(x => x.Group.Equals(fail, StringComparison.InvariantCultureIgnoreCase));
+
+        if (group is not null)
+        {
+            await Group(group);
+            return;
+        }
+
         await ReplyErrorLocalizedAsync(strs.command_not_found);
     }
 

src/NadekoBot/Modules/Help/HelpService.cs

@@ -81,8 +81,7 @@ public class HelpService : IExecNoCommand, INService
             em.AddField(GetText(strs.requires, guild), string.Join("\n", reqs));
 
         em.AddField(_strings.GetText(strs.usage),
-              string.Join("\n",
-                  Array.ConvertAll(com.RealRemarksArr(_strings,_medusae, culture, prefix), arg => Format.Code(arg))))
+              string.Join("\n", com.RealRemarksArr(_strings,_medusae, culture, prefix).Map(arg => Format.Code(arg))))
           .WithFooter(GetText(strs.module(com.Module.GetTopLevelModule().Name), guild))
           .WithOkColor();
 

src/NadekoBot/Modules/Nsfw/SearchImageCacher.cs

@@ -264,18 +264,18 @@ public class SearchImageCacher : INService
         return new();
     }
 
-    private IImageDownloader GetImageDownloader(Booru booru, HttpClient http)
+    private IImageDownloader GetImageDownloader(Booru booru)
         => booru switch
         {
-            Booru.Danbooru => new DanbooruImageDownloader(http),
-            Booru.Yandere => new YandereImageDownloader(http),
-            Booru.Konachan => new KonachanImageDownloader(http),
-            Booru.Safebooru => new SafebooruImageDownloader(http),
-            Booru.E621 => new E621ImageDownloader(http),
-            Booru.Derpibooru => new DerpibooruImageDownloader(http),
-            Booru.Gelbooru => new GelbooruImageDownloader(http),
-            Booru.Rule34 => new Rule34ImageDownloader(http),
-            Booru.Sankaku => new SankakuImageDownloader(http),
+            Booru.Danbooru => new DanbooruImageDownloader(_httpFactory),
+            Booru.Yandere => new YandereImageDownloader(_httpFactory),
+            Booru.Konachan => new KonachanImageDownloader(_httpFactory),
+            Booru.Safebooru => new SafebooruImageDownloader(_httpFactory),
+            Booru.E621 => new E621ImageDownloader(_httpFactory),
+            Booru.Derpibooru => new DerpibooruImageDownloader(_httpFactory),
+            Booru.Gelbooru => new GelbooruImageDownloader(_httpFactory),
+            Booru.Rule34 => new Rule34ImageDownloader(_httpFactory),
+            Booru.Sankaku => new SankakuImageDownloader(_httpFactory),
             _ => throw new NotImplementedException($"{booru} downloader not implemented.")
         };
 
@@ -290,8 +290,7 @@ public class SearchImageCacher : INService
         {
             Log.Information("Downloading from {Type} (page {Page})...", type, page);
 
-            using var http = _httpFactory.CreateClient();
-            var downloader = GetImageDownloader(type, http);
+            var downloader = GetImageDownloader(type);
 
             var images = await downloader.DownloadImageDataAsync(tags, page, isExplicit, cancel);
             if (images.Count == 0)

src/NadekoBot/Modules/Nsfw/_Common/Downloaders/DanbooruImageDownloader.cs

@@ -9,7 +9,7 @@ public sealed class DanbooruImageDownloader : DapiImageDownloader
     private static readonly ConcurrentDictionary<string, bool> _existentTags = new();
     private static readonly ConcurrentDictionary<string, bool> _nonexistentTags = new();
 
-    public DanbooruImageDownloader(HttpClient http)
+    public DanbooruImageDownloader(IHttpClientFactory http)
         : base(Booru.Danbooru, http, "http://danbooru.donmai.us")
     {
     }
@@ -22,7 +22,8 @@ public sealed class DanbooruImageDownloader : DapiImageDownloader
         if (_nonexistentTags.ContainsKey(tag))
             return false;
 
-        var tags = await _http.GetFromJsonAsync<DapiTag[]>(
+        using var http = _http.CreateClient();
+        var tags = await http.GetFromJsonAsync<DapiTag[]>(
             _baseUrl + "/tags.json" + $"?search[name_or_alias_matches]={tag}",
             _serializerOptions,
             cancel);

src/NadekoBot/Modules/Nsfw/_Common/Downloaders/DapiImageDownloader.cs

@@ -7,7 +7,7 @@ public abstract class DapiImageDownloader : ImageDownloader<DapiImageObject>
 {
     protected readonly string _baseUrl;
 
-    public DapiImageDownloader(Booru booru, HttpClient http, string baseUrl)
+    public DapiImageDownloader(Booru booru, IHttpClientFactory http, string baseUrl)
         : base(booru, http)
         => _baseUrl = baseUrl;
 
@@ -43,7 +43,8 @@ public abstract class DapiImageDownloader : ImageDownloader<DapiImageObject>
         var tagString = ImageDownloaderHelper.GetTagString(tags, isExplicit);
 
         var uri = $"{_baseUrl}/posts.json?limit=200&tags={tagString}&page={page}";
-        var imageObjects = await _http.GetFromJsonAsync<DapiImageObject[]>(uri, _serializerOptions, cancel);
+        using var http = _http.CreateClient();
+        var imageObjects = await http.GetFromJsonAsync<DapiImageObject[]>(uri, _serializerOptions, cancel);
         if (imageObjects is null)
             return new();
         return imageObjects.Where(x => x.FileUrl is not null).ToList();

src/NadekoBot/Modules/Nsfw/_Common/Downloaders/DerpibooruImageDownloader.cs

@@ -5,7 +5,7 @@ namespace NadekoBot.Modules.Nsfw.Common;
 
 public class DerpibooruImageDownloader : ImageDownloader<DerpiImageObject>
 {
-    public DerpibooruImageDownloader(HttpClient http)
+    public DerpibooruImageDownloader(IHttpClientFactory http)
         : base(Booru.Derpibooru, http)
     {
     }
@@ -21,7 +21,8 @@ public class DerpibooruImageDownloader : ImageDownloader<DerpiImageObject>
             $"https://www.derpibooru.org/api/v1/json/search/images?q={tagString.Replace('+', ',')}&per_page=49&page={page}";
         using var req = new HttpRequestMessage(HttpMethod.Get, uri);
         req.Headers.AddFakeHeaders();
-        using var res = await _http.SendAsync(req, cancel);
+        using var http = _http.CreateClient();
+        using var res = await http.SendAsync(req, cancel);
         res.EnsureSuccessStatusCode();
 
         var container = await res.Content.ReadFromJsonAsync<DerpiContainer>(_serializerOptions, cancel);

src/NadekoBot/Modules/Nsfw/_Common/Downloaders/E621ImageDownloader.cs

@@ -5,7 +5,7 @@ namespace NadekoBot.Modules.Nsfw.Common;
 
 public class E621ImageDownloader : ImageDownloader<E621Object>
 {
-    public E621ImageDownloader(HttpClient http)
+    public E621ImageDownloader(IHttpClientFactory http)
         : base(Booru.E621, http)
     {
     }
@@ -20,7 +20,8 @@ public class E621ImageDownloader : ImageDownloader<E621Object>
         var uri = $"https://e621.net/posts.json?limit=32&tags={tagString}&page={page}";
         using var req = new HttpRequestMessage(HttpMethod.Get, uri);
         req.Headers.AddFakeHeaders();
-        using var res = await _http.SendAsync(req, cancel);
+        using var http = _http.CreateClient();
+        using var res = await http.SendAsync(req, cancel);
         res.EnsureSuccessStatusCode();
 
         var data = await res.Content.ReadFromJsonAsync<E621Response>(_serializerOptions, cancel);

src/NadekoBot/Modules/Nsfw/_Common/Downloaders/GelbooruImageDownloader.cs

@@ -6,7 +6,7 @@ namespace NadekoBot.Modules.Nsfw.Common;
 
 public class GelbooruImageDownloader : ImageDownloader<DapiImageObject>
 {
-    public GelbooruImageDownloader(HttpClient http)
+    public GelbooruImageDownloader(IHttpClientFactory http)
         : base(Booru.Gelbooru, http)
     {
     }
@@ -26,7 +26,8 @@ public class GelbooruImageDownloader : ImageDownloader<DapiImageObject>
                   + $"&tags={tagString}"
                   + $"&pid={page}";
         using var req = new HttpRequestMessage(HttpMethod.Get, uri);
-        using var res = await _http.SendAsync(req, cancel);
+        using var http = _http.CreateClient();
+        using var res = await http.SendAsync(req, cancel);
         res.EnsureSuccessStatusCode();
         var resString = await res.Content.ReadAsStringAsync(cancel);
         if (string.IsNullOrWhiteSpace(resString))

src/NadekoBot/Modules/Nsfw/_Common/Downloaders/ImageDownloader.cs

@@ -8,7 +8,7 @@ public abstract class ImageDownloader<T> : IImageDownloader
     where T : IImageData
 {
     public Booru Booru { get; }
-    protected readonly HttpClient _http;
+    protected readonly IHttpClientFactory _http;
 
     protected readonly JsonSerializerOptions _serializerOptions = new()
     {
@@ -16,7 +16,7 @@ public abstract class ImageDownloader<T> : IImageDownloader
         NumberHandling = JsonNumberHandling.WriteAsString | JsonNumberHandling.AllowReadingFromString
     };
 
-    public ImageDownloader(Booru booru, HttpClient http)
+    public ImageDownloader(Booru booru, IHttpClientFactory http)
     {
         _http = http;
         Booru = booru;

src/NadekoBot/Modules/Nsfw/_Common/Downloaders/KonachanImageDownloader.cs

@@ -7,7 +7,7 @@ public sealed class KonachanImageDownloader : ImageDownloader<DapiImageObject>
 {
     private readonly string _baseUrl;
 
-    public KonachanImageDownloader(HttpClient http)
+    public KonachanImageDownloader(IHttpClientFactory http)
         : base(Booru.Konachan, http)
         => _baseUrl = "https://konachan.com";
 
@@ -19,7 +19,8 @@ public sealed class KonachanImageDownloader : ImageDownloader<DapiImageObject>
     {
         var tagString = ImageDownloaderHelper.GetTagString(tags, isExplicit);
         var uri = $"{_baseUrl}/post.json?s=post&q=index&limit=200&tags={tagString}&page={page}";
-        var imageObjects = await _http.GetFromJsonAsync<DapiImageObject[]>(uri, _serializerOptions, cancel);
+        using var http = _http.CreateClient();
+        var imageObjects = await http.GetFromJsonAsync<DapiImageObject[]>(uri, _serializerOptions, cancel);
         if (imageObjects is null)
             return new();
         return imageObjects.Where(x => x.FileUrl is not null).ToList();

src/NadekoBot/Modules/Nsfw/_Common/Downloaders/Rule34ImageDownloader.cs

@@ -5,7 +5,7 @@ namespace NadekoBot.Modules.Nsfw.Common;
 
 public class Rule34ImageDownloader : ImageDownloader<Rule34Object>
 {
-    public Rule34ImageDownloader(HttpClient http)
+    public Rule34ImageDownloader(IHttpClientFactory http)
         : base(Booru.Rule34, http)
     {
     }
@@ -17,9 +17,21 @@ public class Rule34ImageDownloader : ImageDownloader<Rule34Object>
         CancellationToken cancel = default)
     {
         var tagString = ImageDownloaderHelper.GetTagString(tags);
-        var uri = "https://rule34.xxx/index.php?page=dapi&s=post&q=index&json=1&limit=100"
-                  + $"&tags={tagString}&pid={page}";
-        var images = await _http.GetFromJsonAsync<List<Rule34Object>>(uri, _serializerOptions, cancel);
+        var uri = $"https://api.rule34.xxx//index.php?page=dapi&s=post"
+                  + $"&q=index"
+                  + $"&json=1"
+                  + $"&limit=100"
+                  + $"&tags={tagString}"
+                  + $"&pid={page}";
+        
+        using var http = _http.CreateClient();
+        http.DefaultRequestHeaders
+            .TryAddWithoutValidation("cookie", "cf_clearance=Gg3bVffg9fOL_.9fIdKmu5PJS86eTI.yTrhbR8z2tPc-1652310659-0-250");
+
+        http.DefaultRequestHeaders
+            .TryAddWithoutValidation("user-agent",
+                "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.60 Safari/537.36");
+        var images = await http.GetFromJsonAsync<List<Rule34Object>>(uri, _serializerOptions, cancel);
 
         if (images is null)
             return new();

src/NadekoBot/Modules/Nsfw/_Common/Downloaders/SafebooruImageDownloader.cs

@@ -5,7 +5,7 @@ namespace NadekoBot.Modules.Nsfw.Common;
 
 public class SafebooruImageDownloader : ImageDownloader<SafebooruElement>
 {
-    public SafebooruImageDownloader(HttpClient http)
+    public SafebooruImageDownloader(IHttpClientFactory http)
         : base(Booru.Safebooru, http)
     {
     }
@@ -19,7 +19,9 @@ public class SafebooruImageDownloader : ImageDownloader<SafebooruElement>
         var tagString = ImageDownloaderHelper.GetTagString(tags);
         var uri =
             $"https://safebooru.org/index.php?page=dapi&s=post&q=index&limit=200&tags={tagString}&json=1&pid={page}";
-        var images = await _http.GetFromJsonAsync<List<SafebooruElement>>(uri, _serializerOptions, cancel);
+        
+        using var http = _http.CreateClient();
+        var images = await http.GetFromJsonAsync<List<SafebooruElement>>(uri, _serializerOptions, cancel);
         if (images is null)
             return new();
 

src/NadekoBot/Modules/Nsfw/_Common/Downloaders/SankakuImageDownloader.cs

@@ -7,11 +7,10 @@ public sealed class SankakuImageDownloader : ImageDownloader<SankakuImageObject>
 {
     private readonly string _baseUrl;
 
-    public SankakuImageDownloader(HttpClient http)
+    public SankakuImageDownloader(IHttpClientFactory http)
         : base(Booru.Sankaku, http)
     {
         _baseUrl = "https://capi-v2.sankakucomplex.com";
-        _http.AddFakeHeaders();
     }
 
     public override async Task<List<SankakuImageObject>> DownloadImagesAsync(
@@ -24,9 +23,12 @@ public sealed class SankakuImageDownloader : ImageDownloader<SankakuImageObject>
         var tagString = ImageDownloaderHelper.GetTagString(tags);
 
         var uri = $"{_baseUrl}/posts?tags={tagString}&limit=50";
-        var data = await _http.GetStringAsync(uri);
+        
+        using var http = _http.CreateClient();
+        http.AddFakeHeaders();
+        var data = await http.GetStringAsync(uri, cancel);
         return JsonSerializer.Deserialize<SankakuImageObject[]>(data, _serializerOptions)
-                             .Where(x => !string.IsNullOrWhiteSpace(x.FileUrl) && x.FileType.StartsWith("image"))
+                             ?.Where(x => !string.IsNullOrWhiteSpace(x.FileUrl) && x.FileType.StartsWith("image"))
                              .ToList();
     }
 }

src/NadekoBot/Modules/Nsfw/_Common/Downloaders/YandereImageDownloader.cs

@@ -7,7 +7,7 @@ public sealed class YandereImageDownloader : ImageDownloader<DapiImageObject>
 {
     private readonly string _baseUrl;
 
-    public YandereImageDownloader(HttpClient http)
+    public YandereImageDownloader(IHttpClientFactory http)
         : base(Booru.Yandere, http)
         => _baseUrl = "https://yande.re";
 
@@ -20,7 +20,9 @@ public sealed class YandereImageDownloader : ImageDownloader<DapiImageObject>
         var tagString = ImageDownloaderHelper.GetTagString(tags, isExplicit);
 
         var uri = $"{_baseUrl}/post.json?limit=200&tags={tagString}&page={page}";
-        var imageObjects = await _http.GetFromJsonAsync<DapiImageObject[]>(uri, _serializerOptions, cancel);
+        
+        using var http = _http.CreateClient();
+        var imageObjects = await http.GetFromJsonAsync<DapiImageObject[]>(uri, _serializerOptions, cancel);
         if (imageObjects is null)
             return new();
         return imageObjects.Where(x => x.FileUrl is not null).ToList();

src/NadekoBot/Modules/Nsfw/_Common/Rule34Object.cs

@@ -1,4 +1,6 @@
 #nullable disable
+using System.Text.Json.Serialization;
+
 namespace NadekoBot.Modules.Nsfw.Common;
 
 public class Rule34Object : IImageData
@@ -7,7 +9,9 @@ public class Rule34Object : IImageData
     public int Directory { get; init; }
     public string Tags { get; init; }
     public int Score { get; init; }
+    [JsonPropertyName("file_url")]
+    public string FileUrl { get; init; }
 
     public ImageData ToCachedImageData(Booru type)
-        => new($"https://img.rule34.xxx//images/{Directory}/{Image}", Booru.Rule34, Tags.Split(' '), Score.ToString());
+        => new(FileUrl, Booru.Rule34, Tags.Split(' '), Score.ToString());
 }

src/NadekoBot/Modules/Searches/Crypto/DefaultStockDataService.cs

@@ -1,5 +1,9 @@
-using System.Text.Json;
-using YahooFinanceApi;
+using CsvHelper;
+using CsvHelper.Configuration;
+using Google.Protobuf.WellKnownTypes;
+using System.Globalization;
+using System.Net.Http.Json;
+using System.Text.Json;
 
 namespace NadekoBot.Modules.Searches;
 
@@ -17,19 +21,14 @@ public sealed class DefaultStockDataService : IStockDataService, INService
             if (!query.IsAlphaNumeric())
                 return default;
 
-            var symbols = await Yahoo.Symbols(query)
-                                     .Fields(Field.LongName,
-                                         Field.Symbol,
-                                         Field.RegularMarketPrice,
-                                         Field.RegularMarketPreviousClose,
-                                         Field.MarketCap,
-                                         Field.FiftyDayAverageChangePercent,
-                                         Field.TwoHundredDayAverageChangePercent,
-                                         Field.AverageDailyVolume10Day,
-                                         Field.FullExchangeName)
-                                     .QueryAsync();
+            using var http = _httpClientFactory.CreateClient();
+            var data = await http.GetFromJsonAsync<YahooQueryModel>(
+                $"https://query1.finance.yahoo.com/v7/finance/quote?symbols={query}");
 
-            var symbol = symbols.Values.FirstOrDefault();
+            if (data is null)
+                return default; 
+            
+            var symbol = data.QuoteResponse.Result.FirstOrDefault();
 
             if (symbol is null)
                 return default;
@@ -79,11 +78,25 @@ public sealed class DefaultStockDataService : IStockDataService, INService
                   .ToList();
     }
 
+    private static CsvConfiguration _csvConfig = new(CultureInfo.InvariantCulture)
+    {
+        PrepareHeaderForMatch = args => args.Header.Humanize(LetterCasing.Title)
+    };
+
     public async Task<IReadOnlyCollection<CandleData>> GetCandleDataAsync(string query)
     {
-        var candles = await Yahoo.GetHistoricalAsync(query, DateTime.Now.Subtract(30.Days()));
+        using var http = _httpClientFactory.CreateClient();
+        await using var resStream = await http.GetStreamAsync(
+            $"https://query1.finance.yahoo.com/v7/finance/download/{query}"
+            + $"?period1={DateTime.UtcNow.Subtract(30.Days()).ToTimestamp().Seconds}"
+            + $"&period2={DateTime.UtcNow.ToTimestamp().Seconds}"
+            + "&interval=1d");
 
-        return candles
+        using var textReader = new StreamReader(resStream);
+        using var csv = new CsvReader(textReader, _csvConfig);
+        var records = csv.GetRecords<YahooFinanceCandleData>().ToArray();
+
+        return records
             .Map(static x => new CandleData(x.Open, x.Close, x.High, x.Low, x.Volume));
     }
 }

src/NadekoBot/Modules/Searches/Crypto/_Common/QuoteResponse.cs

@@ -0,0 +1,43 @@
+#nullable disable
+using System.Text.Json.Serialization;
+
+namespace NadekoBot.Modules.Searches;
+
+public class QuoteResponse
+{
+    public class ResultModel
+    {
+        [JsonPropertyName("longName")]
+        public string LongName { get; set; }
+
+        [JsonPropertyName("regularMarketPrice")]
+        public double RegularMarketPrice { get; set; }
+
+        [JsonPropertyName("regularMarketPreviousClose")]
+        public double RegularMarketPreviousClose { get; set; }
+
+        [JsonPropertyName("fullExchangeName")]
+        public string FullExchangeName { get; set; }
+
+        [JsonPropertyName("averageDailyVolume10Day")]
+        public int AverageDailyVolume10Day { get; set; }
+
+        [JsonPropertyName("fiftyDayAverageChangePercent")]
+        public double FiftyDayAverageChangePercent { get; set; }
+
+        [JsonPropertyName("twoHundredDayAverageChangePercent")]
+        public double TwoHundredDayAverageChangePercent { get; set; }
+
+        [JsonPropertyName("marketCap")]
+        public long MarketCap { get; set; }
+
+        [JsonPropertyName("symbol")]
+        public string Symbol { get; set; }
+    }
+    
+    [JsonPropertyName("result")]
+    public List<ResultModel> Result { get; set; }
+
+    [JsonPropertyName("error")]
+    public object Error { get; set; }
+}

src/NadekoBot/Modules/Searches/Crypto/_Common/YahooFinanceCandleData.cs

@@ -0,0 +1,12 @@
+namespace NadekoBot.Modules.Searches;
+
+public class YahooFinanceCandleData
+{
+    public DateTime Date { get; set; }
+    public decimal Open { get; set; }
+    public decimal High { get; set; }
+    public decimal Low { get; set; }
+    public decimal Close { get; set; }
+    public decimal AdjClose { get; set; }
+    public long Volume { get; set; }
+}

src/NadekoBot/Modules/Searches/Crypto/_Common/YahooQueryModel.cs

@@ -0,0 +1,9 @@
+using System.Text.Json.Serialization;
+
+namespace NadekoBot.Modules.Searches;
+
+public class YahooQueryModel
+{
+    [JsonPropertyName("quoteResponse")]
+    public QuoteResponse QuoteResponse { get; set; } = null!;
+}

src/NadekoBot/Modules/Searches/Feeds/FeedsService.cs

@@ -53,7 +53,7 @@ public class FeedsService : INService
                 if (kvp.Value.Count == 0)
                     continue;
 
-                var rssUrl = kvp.Key;
+                var rssUrl = kvp.Value.First().Url;
                 try
                 {
                     var feed = await FeedReader.ReadAsync(rssUrl);
@@ -143,12 +143,16 @@ public class FeedsService : INService
                         allSendTasks.Add(feedSendTasks.WhenAll());
                     }
                 }
-                catch
+                catch (Exception ex)
                 {
+                    Log.Warning("An error occured while getting rss stream {RssFeed}"
+                                + "\n {Message}",
+                        rssUrl,
+                        $"[{ex.GetType().Name}]: {ex.Message}");
                 }
             }
 
-            await Task.WhenAll(Task.WhenAll(allSendTasks), Task.Delay(10000));
+            await Task.WhenAll(Task.WhenAll(allSendTasks), Task.Delay(30000));
         }
     }
 

src/NadekoBot/Modules/Searches/StreamNotification/StreamNotificationCommands.cs

@@ -121,6 +121,18 @@ public partial class Searches
             else
                 await ReplyConfirmLocalizedAsync(strs.stream_off_disabled);
         }
+        
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        [UserPerm(GuildPerm.ManageMessages)]
+        public async partial Task StreamOnlineDelete()
+        {
+            var newValue = _service.ToggleStreamOnlineDelete(ctx.Guild.Id);
+            if (newValue)
+                await ReplyConfirmLocalizedAsync(strs.stream_online_delete_enabled);
+            else
+                await ReplyConfirmLocalizedAsync(strs.stream_online_delete_disabled);
+        }
 
         [Cmd]
         [RequireContext(ContextType.Guild)]

src/NadekoBot/Modules/Searches/StreamNotification/StreamNotificationService.cs

@@ -1,4 +1,6 @@
 #nullable disable
+using LinqToDB;
+using LinqToDB.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Common.ModuleBehaviors;
 using NadekoBot.Db;
@@ -24,6 +26,7 @@ public sealed class StreamNotificationService : INService, IReadyExecutor
 
     private readonly Dictionary<StreamDataKey, Dictionary<ulong, HashSet<FollowedStream>>> _shardTrackedStreams;
     private readonly ConcurrentHashSet<ulong> _offlineNotificationServers;
+    private readonly ConcurrentHashSet<ulong> _deleteOnOfflineServers;
 
     private readonly IPubSub _pubSub;
     private readonly IEmbedBuilderService _eb;
@@ -33,6 +36,7 @@ public sealed class StreamNotificationService : INService, IReadyExecutor
 
     private readonly TypedKey<FollowStreamPubData> _streamFollowKey;
     private readonly TypedKey<FollowStreamPubData> _streamUnfollowKey;
+    private readonly ConnectionMultiplexer _redis;
 
     public StreamNotificationService(
         DbService db,
@@ -50,6 +54,7 @@ public sealed class StreamNotificationService : INService, IReadyExecutor
         _strings = strings;
         _pubSub = pubSub;
         _eb = eb;
+        _redis = redis;
         _streamTracker = new(httpFactory, creds, redis, creds.GetCreds().RedisKey(), client.ShardId == 0);
 
         _streamsOnlineKey = new("streams.online");
@@ -71,6 +76,11 @@ public sealed class StreamNotificationService : INService, IReadyExecutor
                                               .Where(gc => gc.NotifyStreamOffline)
                                               .Select(x => x.GuildId)
                                               .ToList());
+            
+            _deleteOnOfflineServers = new(guildConfigs
+                                              .Where(gc => gc.DeleteStreamOnlineMessage)
+                                              .Select(x => x.GuildId)
+                                              .ToList());
 
             var followedStreams = guildConfigs.SelectMany(x => x.FollowedStreams).ToList();
 
@@ -243,6 +253,44 @@ public sealed class StreamNotificationService : INService, IReadyExecutor
                       .WhenAll();
             }
         }
+
+        if (_client.ShardId == 0)
+        {
+            foreach (var stream in offlineStreams)
+            {
+                await DeleteOnlineMessages(stream);
+            }
+        }
+    }
+
+    private async Task DeleteOnlineMessages(StreamData stream)
+    {
+        var db = _redis.GetDatabase();
+        var data = await db.ListRangeAsync($"streams_online_del:{stream.CreateKey()}");
+        await db.KeyDeleteAsync($"streams_online_del:{stream.CreateKey()}");
+        
+        foreach (string pair in data)
+        {
+            var pairArr = pair.Split(',');
+            if (pairArr.Length != 2)
+                continue;
+
+            if (!ulong.TryParse(pairArr[0], out var chId) || !ulong.TryParse(pairArr[1], out var msgId))
+                continue;
+
+            try
+            {
+                var textChannel = await _client.GetChannelAsync(chId) as ITextChannel;
+                if (textChannel is null)
+                    continue;
+
+                await textChannel.DeleteMessageAsync(msgId);
+            }
+            catch
+            {
+                continue;
+            }
+        }
     }
 
     private async ValueTask HandleStreamsOnline(List<StreamData> onlineStreams)
@@ -252,13 +300,13 @@ public sealed class StreamNotificationService : INService, IReadyExecutor
             var key = stream.CreateKey();
             if (_shardTrackedStreams.TryGetValue(key, out var fss))
             {
-                await fss.SelectMany(x => x.Value)
-                         .Select(fs =>
+                var messages = await fss.SelectMany(x => x.Value)
+                         .Select(async fs =>
                          {
                              var textChannel = _client.GetGuild(fs.GuildId)?.GetTextChannel(fs.ChannelId);
 
                              if (textChannel is null)
-                                 return Task.CompletedTask;
+                                 return default;
 
                              var rep = new ReplacementBuilder().WithOverride("%user%", () => fs.Username)
                                                                .WithOverride("%platform%", () => fs.Type.ToString())
@@ -266,9 +314,38 @@ public sealed class StreamNotificationService : INService, IReadyExecutor
 
                              var message = string.IsNullOrWhiteSpace(fs.Message) ? "" : rep.Replace(fs.Message);
 
-                             return textChannel.EmbedAsync(GetEmbed(fs.GuildId, stream), message);
+                             var msg = await textChannel.EmbedAsync(GetEmbed(fs.GuildId, stream), message);
+
+                             // only cache the ids of channel/message pairs 
+                             if(_deleteOnOfflineServers.Contains(fs.GuildId))
+                                return (textChannel.Id, msg.Id);
+                             else 
+                                 return default;
                          })
                          .WhenAll();
+
+                
+                // push online stream messages to redis
+                // when streams go offline, any server which
+                // has the online stream message deletion feature
+                // enabled will have the online messages deleted
+                try
+                {
+                    var pairs = messages
+                                .Where(x => x != default)
+                                .Select(x => (RedisValue)$"{x.Item1},{x.Item2}")
+                                .ToArray();
+
+                    if (pairs.Length > 0)
+                    {
+                        var db = _redis.GetDatabase();
+                        await db.ListRightPushAsync($"streams_online_del:{key}", pairs);
+                    }
+                }
+                catch
+                {
+
+                }
             }
         }
     }
@@ -484,6 +561,21 @@ public sealed class StreamNotificationService : INService, IReadyExecutor
 
         return newValue;
     }
+    
+    public bool ToggleStreamOnlineDelete(ulong guildId)
+    {
+        using var uow = _db.GetDbContext();
+        var gc = uow.GuildConfigsForId(guildId, set => set);
+        var newValue = gc.DeleteStreamOnlineMessage = !gc.DeleteStreamOnlineMessage;
+        uow.SaveChanges();
+
+        if (newValue)
+            _deleteOnOfflineServers.Add(guildId);
+        else
+            _deleteOnOfflineServers.TryRemove(guildId);
+
+        return newValue;
+    }
 
     public Task<StreamData> GetStreamDataAsync(string url)
         => _streamTracker.GetStreamDataByUrlAsync(url);

src/NadekoBot/Modules/Utility/Patreon/PatreonRewardsService.cs

@@ -84,13 +84,12 @@ public class PatreonRewardsService : INService, IReadyExecutor
         try
         {
             using var http = _httpFactory.CreateClient();
-            using var content = new StringContent(string.Empty);
             using var res = await http.PostAsync("https://www.patreon.com/api/oauth2/token"
                                            + "?grant_type=refresh_token"
                                            + $"&refresh_token={creds.Patreon.RefreshToken}"
                                            + $"&client_id={creds.Patreon.ClientId}"
                                            + $"&client_secret={creds.Patreon.ClientSecret}",
-                content);
+                null);
 
             res.EnsureSuccessStatusCode();
 
@@ -149,7 +148,7 @@ public class PatreonRewardsService : INService, IReadyExecutor
             if (!success)
                 return;
         }
-
+        
         LastUpdate = DateTime.UtcNow;
         try
         {

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

@@ -76,6 +76,7 @@ public class RemindService : INService, IReadyExecutor
         await uow.SaveChangesAsync();
     }
 
+    // todo move isonshard to a method
     private async Task<List<Reminder>> GetRemindersBeforeAsync(DateTime now)
     {
         await using var uow = _db.GetDbContext();

src/NadekoBot/Modules/Utility/Utility.cs

@@ -48,7 +48,7 @@ public partial class Utility : NadekoModule
         _tracker = tracker;
         _httpFactory = httpFactory;
     }
-
+    
     [Cmd]
     [RequireContext(ContextType.Guild)]
     [UserPerm(GuildPerm.ManageMessages)]

src/NadekoBot/Modules/Xp/Club/Club.cs

@@ -240,7 +240,7 @@ public partial class Xp
         [Cmd]
         [Priority(1)]
         public partial Task ClubAccept(IUser user)
-            => ClubAccept($"{user.Username}#{user.Discriminator}");
+            => ClubAccept(user.ToString());
 
         [Cmd]
         [Priority(0)]
@@ -282,7 +282,7 @@ public partial class Xp
         [Cmd]
         [Priority(1)]
         public partial Task ClubBan([Leftover] IUser user)
-            => ClubBan($"{user.Username}#{user.Discriminator}");
+            => ClubBan(user.ToString());
 
         [Cmd]
         [Priority(0)]
@@ -300,7 +300,7 @@ public partial class Xp
         [Cmd]
         [Priority(1)]
         public partial Task ClubUnBan([Leftover] IUser user)
-            => ClubUnBan($"{user.Username}#{user.Discriminator}");
+            => ClubUnBan(user.ToString());
 
         [Cmd]
         [Priority(0)]
@@ -319,9 +319,23 @@ public partial class Xp
         public async partial Task ClubDescription([Leftover] string desc = null)
         {
             if (_service.SetDescription(ctx.User.Id, desc))
-                await ReplyConfirmLocalizedAsync(strs.club_desc_updated(Format.Bold(desc ?? "-")));
+            {
+                desc = string.IsNullOrWhiteSpace(desc)
+                    ? "-"
+                    : desc;
+                
+                var eb = _eb.Create(ctx)
+                            .WithAuthor(ctx.User)
+                            .WithTitle(GetText(strs.club_desc_update))
+                            .WithOkColor()
+                            .WithDescription(desc);
+
+                await ctx.Channel.EmbedAsync(eb);
+            }
             else
+            {
                 await ReplyErrorLocalizedAsync(strs.club_desc_update_failed);
+            }
         }
 
         [Cmd]

src/NadekoBot/Modules/Xp/XpService.cs

@@ -17,7 +17,6 @@ using Image = SixLabors.ImageSharp.Image;
 
 namespace NadekoBot.Modules.Xp.Services;
 
-// todo improve xp with linqtodb
 public class XpService : INService, IReadyExecutor, IExecNoCommand
 {
     public const int XP_REQUIRED_LVL_1 = 36;
@@ -133,7 +132,7 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
         try
         {
             var toNotify =
-                new List<(IGuild Guild, IMessageChannel MessageChannel, IUser User, int Level,
+                new List<(IGuild Guild, IMessageChannel MessageChannel, IUser User, long Level,
                     XpNotificationLocation NotifyType, NotifOf NotifOf)>();
             var roleRewards = new Dictionary<ulong, List<XpRoleReward>>();
             var curRewards = new Dictionary<ulong, List<XpCurrencyReward>>();
@@ -503,7 +502,10 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
         var value = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
 
         _cache.Redis.GetDatabase()
-              .StringSet(key, value, TimeSpan.FromMinutes(_xpConfig.Data.VoiceMaxMinutes), When.NotExists);
+              .StringSet(key,
+                  value,
+                  TimeSpan.FromMinutes(_xpConfig.Data.VoiceMaxMinutes),
+                  when: When.NotExists);
     }
 
     private void UserLeftVoiceChannel(SocketGuildUser user, SocketVoiceChannel channel)
@@ -633,14 +635,17 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
         var r = _cache.Redis.GetDatabase();
         var key = $"{_creds.RedisKey()}_user_xp_gain_{userId}";
 
-        return r.StringSet(key, true, TimeSpan.FromMinutes(_xpConfig.Data.MessageXpCooldown), When.NotExists);
+        return r.StringSet(key,
+            true,
+            TimeSpan.FromMinutes(_xpConfig.Data.MessageXpCooldown),
+            when: When.NotExists);
     }
 
     public async Task<FullUserStats> GetUserStatsAsync(IGuildUser user)
     {
         DiscordUser du;
         UserXpStats stats;
-        int totalXp;
+        long totalXp;
         int globalRank;
         int guildRank;
         await using (var uow = _db.GetDbContext())

src/NadekoBot/Modules/Xp/_Common/Extensions.cs

@@ -1,29 +1,15 @@
 #nullable disable
-using NadekoBot.Modules.Xp.Services;
+using LinqToDB;
 using NadekoBot.Services.Database.Models;
 
 namespace NadekoBot.Modules.Xp.Extensions;
 
 public static class Extensions
 {
-    public static (int Level, int LevelXp, int LevelRequiredXp) GetLevelData(this UserXpStats stats)
-    {
-        var baseXp = XpService.XP_REQUIRED_LVL_1;
-
-        var required = baseXp;
-        var totalXp = 0;
-        var lvl = 1;
-        while (true)
-        {
-            required = (int)(baseXp + (baseXp / 4.0 * (lvl - 1)));
-
-            if (required + totalXp > stats.Xp)
-                break;
-
-            totalXp += required;
-            lvl++;
-        }
-
-        return (lvl - 1, stats.Xp - totalXp, required);
-    }
+    public static async Task<LevelStats> GetLevelDataFor(this ITable<UserXpStats> userXp, ulong guildId, ulong userId)
+        => await userXp
+                 .Where(x => x.GuildId == guildId && x.UserId == userId)
+                 .FirstOrDefaultAsync() is UserXpStats uxs
+            ? new(uxs.Xp + uxs.AwardedXp)
+            : new(0);
 }

src/NadekoBot/Modules/Xp/_Common/LevelStats.cs

@@ -5,12 +5,12 @@ namespace NadekoBot.Modules.Xp;
 
 public class LevelStats
 {
-    public int Level { get; }
-    public int LevelXp { get; }
-    public int RequiredXp { get; }
-    public int TotalXp { get; }
+    public long Level { get; }
+    public long LevelXp { get; }
+    public long RequiredXp { get; }
+    public long TotalXp { get; }
 
-    public LevelStats(int xp)
+    public LevelStats(long xp)
     {
         if (xp < 0)
             xp = 0;

src/NadekoBot/NadekoBot.csproj

@@ -23,17 +23,18 @@
             <PrivateAssets>all</PrivateAssets>
             <Publish>True</Publish>
         </PackageReference>
-        <PackageReference Include="AWSSDK.S3" Version="3.7.8.4" />
+        <PackageReference Include="AWSSDK.S3" Version="3.7.9.2" />
         <PackageReference Include="CodeHollow.FeedReader" Version="1.2.4" />
         <PackageReference Include="CommandLineParser" Version="2.8.0" />
-        <PackageReference Include="Discord.Net" Version="3.5.0" />
-        <PackageReference Include="CoreCLR-NCalc" Version="2.2.92" />
+        <PackageReference Include="CsvHelper" Version="27.2.1" />
+        <PackageReference Include="Discord.Net" Version="3.6.1" />
+        <PackageReference Include="CoreCLR-NCalc" Version="2.2.101" />
         <PackageReference Include="Google.Apis.Urlshortener.v1" Version="1.41.1.138" />
-        <PackageReference Include="Google.Apis.YouTube.v3" Version="1.56.0.2617" />
+        <PackageReference Include="Google.Apis.YouTube.v3" Version="1.57.0.2665" />
         <PackageReference Include="Google.Apis.Customsearch.v1" Version="1.49.0.2084" />
-        <PackageReference Include="Google.Protobuf" Version="3.19.4" />
-        <PackageReference Include="Grpc.Net.ClientFactory" Version="2.44.0" />
-        <PackageReference Include="Grpc.Tools" Version="2.44.0">
+        <PackageReference Include="Google.Protobuf" Version="3.20.1" />
+        <PackageReference Include="Grpc.Net.ClientFactory" Version="2.45.0" />
+        <PackageReference Include="Grpc.Tools" Version="2.46.1">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
@@ -55,7 +56,7 @@
         <PackageReference Include="Serilog.Sinks.Seq" Version="5.1.1" />
         <PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" />
         <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta0010" />
-        <PackageReference Include="StackExchange.Redis" Version="2.5.43" />
+        <PackageReference Include="StackExchange.Redis" Version="2.5.61" />
         <PackageReference Include="YamlDotNet" Version="11.2.1" />
         
         <PackageReference Include="Humanizer" Version="2.14.1">
@@ -63,26 +64,24 @@
             <Publish>True</Publish>
         </PackageReference>
         
-        <PackageReference Include="JetBrains.Annotations" Version="2021.3.0" />
+        <PackageReference Include="JetBrains.Annotations" Version="2022.1.0" />
         
         <!-- Db-related packages -->
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.3" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.3">
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.5" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.5">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         
-        <PackageReference Include="linq2db.EntityFrameworkCore" Version="6.6.1" />
+        <PackageReference Include="linq2db.EntityFrameworkCore" Version="6.7.1" />
         
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.3" />        
-        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.3" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.5" />        
+        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.4" />
         <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.1" />
         
-		<!-- Remove this when static abstract interface members support is released -->
-        <PackageReference Include="System.Runtime.Experimental" Version="6.0.0" />
+<!--        <PackageReference Include="System.Runtime.Experimental" Version="6.0.2" />-->
         
         <!-- Used by .crypto command -->
-        <PackageReference Include="YahooFinanceApi" Version="2.1.2" />
         
         <!-- Used by stream notifications -->
         <PackageReference Include="TwitchLib.Api" Version="3.4.1" />

src/NadekoBot/Services/Currency/CurrencyServiceExtensions.cs

@@ -13,17 +13,27 @@ public static class CurrencyServiceExtensions
     // todo transfer should be a transaction
     public static async Task<bool> TransferAsync(
         this ICurrencyService cs,
-        ulong fromId,
-        ulong toId,
+        IEmbedBuilderService ebs,
+        IUser from,
+        IUser to,
         long amount,
-        string fromName,
-        string note)
+        string? note,
+        string formattedAmount)
     {
-        var fromWallet = await cs.GetWalletAsync(fromId);
-        var toWallet = await cs.GetWalletAsync(toId);
+        var fromWallet = await cs.GetWalletAsync(from.Id);
+        var toWallet = await cs.GetWalletAsync(to.Id);
 
-        var extra = new TxData("gift", fromName, note, fromId);
+        var extra = new TxData("gift", from.ToString()!, note, from.Id);
 
-        return await fromWallet.Transfer(amount, toWallet, extra);
+        if (await fromWallet.Transfer(amount, toWallet, extra))
+        {
+            await to.SendConfirmAsync(ebs,
+                string.IsNullOrWhiteSpace(note)
+                    ? $"Received {formattedAmount} from {from} "
+                    : $"Received {formattedAmount} from {from}: {note}");
+            return true;
+        }
+
+        return false;
     }
 }