Fixed .config searches followedStreams.maxCount. Version upped to 4.3.20

Updated changelog. Version upped to 4.3.19
Merge branch 'v4' of https://gitlab.com/kwoth/nadekobot into v4
2025-09-10 09:18:27 -04:00 · 2024-01-20 15:06:45 +00:00 · 2024-01-20 14:15:30 +00:00 · 2024-01-20 14:06:59 +00:00 · 2024-01-20 14:05:20 +00:00 · 2024-01-16 09:12:14 +00:00
76 changed files with 1406 additions and 721 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,8 +14,16 @@ variables:
  tests: "NadekoBot.Tests"
  LINUX_X64_OUTPUT_DIR: "nadekobot-linux-x64"
  LINUX_X64_RELEASE: "$CI_COMMIT_TAG-linux-x64-build.tar"
+  LINUX_ARM64_OUTPUT_DIR: "nadekobot-linux-arm64"
+  LINUX_ARM64_RELEASE: "$CI_COMMIT_TAG-linux-arm64-build.tar"
+  MACOS_X64_OUTPUT_DIR: "nadekobot-osx-x64"
+  MACOS_X64_RELEASE: "$CI_COMMIT_TAG-osx-x64-build.tar"
+  MACOS_ARM64_OUTPUT_DIR: "nadekobot-osx-arm64"
+  MACOS_ARM64_RELEASE: "$CI_COMMIT_TAG-osx-arm64-build.tar"
  WIN_X64_OUTPUT_DIR: "nadekobot-windows-x64"
  WIN_X64_RELEASE: "$CI_COMMIT_TAG-windows-x64-build.zip"
+  WIN_ARM64_OUTPUT_DIR: "nadekobot-windows-arm64"
+  WIN_ARM64_RELEASE: "$CI_COMMIT_TAG-windows-arm64-build.zip"
  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"
@@ -24,11 +32,19 @@ build:
  stage: build
  script:
    - "dotnet publish -c Release -r linux-x64 --self-contained -o $LINUX_X64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
+    - "dotnet publish -c Release -r linux-arm64 --self-contained -o $LINUX_ARM64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
    - "dotnet publish -c Release -r win7-x64 --self-contained -o $WIN_X64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
+    - "dotnet publish -c Release -r win7-arm64 --self-contained -o $WIN_ARM64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
+    - "dotnet publish -c Release -r osx-x64 --self-contained -o $MACOS_X64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
+    - "dotnet publish -c Release -r osx-arm64 --self-contained -o $MACOS_ARM64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj"
  artifacts:
    paths:
      - "$LINUX_X64_OUTPUT_DIR/"
+      - "$LINUX_ARM64_OUTPUT_DIR/"
      - "$WIN_X64_OUTPUT_DIR/"
+      - "$WIN_ARM64_OUTPUT_DIR/"
+      - "$MACOS_X64_OUTPUT_DIR/"
+      - "$MACOS_ARM64_OUTPUT_DIR/"

 upload-builds:
  stage: upload-builds
@@ -38,12 +54,23 @@ upload-builds:
  script:
    - apk add --no-cache curl tar zip
    - "tar cvf $LINUX_X64_RELEASE $LINUX_X64_OUTPUT_DIR/*"
+    - "tar cvf $LINUX_ARM64_RELEASE $LINUX_ARM64_OUTPUT_DIR/*"
+    - "tar cvf $MACOS_X64_RELEASE $MACOS_X64_OUTPUT_DIR/*"
+    - "tar cvf $MACOS_ARM64_RELEASE $MACOS_ARM64_OUTPUT_DIR/*"
    - "zip -r $WIN_X64_RELEASE $WIN_X64_OUTPUT_DIR/*"
+    - "zip -r $WIN_ARM64_RELEASE $WIN_ARM64_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 $LINUX_ARM64_RELEASE $PACKAGE_REGISTRY_URL/$LINUX_ARM64_RELEASE
    - |
      curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file $WIN_X64_RELEASE $PACKAGE_REGISTRY_URL/$WIN_X64_RELEASE
-
+    - |
+      curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file $WIN_ARM64_RELEASE $PACKAGE_REGISTRY_URL/$WIN_ARM64_RELEASE
+    - |
+      curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file $MACOS_X64_RELEASE $PACKAGE_REGISTRY_URL/$MACOS_X64_RELEASE
+    - |
+      curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file $MACOS_ARM64_RELEASE $PACKAGE_REGISTRY_URL/$MACOS_ARM64_RELEASE
 release:
  stage: release
  image: registry.gitlab.com/gitlab-org/release-cli:latest
@@ -53,7 +80,11 @@ release:
    - |
      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}\"}"
+        --assets-link "{\"name\":\"${LINUX_ARM64_RELEASE}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${LINUX_ARM64_RELEASE}\"}" \
+        --assets-link "{\"name\":\"${WIN_X64_RELEASE}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${WIN_X64_RELEASE}\"}" \
+        --assets-link "{\"name\":\"${WIN_ARM64_RELEASE}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${WIN_ARM64_RELEASE}\"}" \
+        --assets-link "{\"name\":\"${MACOS_X64_RELEASE}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${MACOS_X64_RELEASE}\"}" \
+        --assets-link "{\"name\":\"${MACOS_ARM64_RELEASE}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${MACOS_ARM64_RELEASE}\"}"

 test:
  stage: test
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,95 @@

 Experimental changelog. Mostly based on [keepachangelog](https://keepachangelog.com/en/1.0.0/) except date format. a-c-f-r-o

+## [4.3.20] - 20.01.2024
+
+### Fixed
+- Fixed `.config searches followedStreams.maxCount` not working
+
+## [4.3.19] - 20.01.2024
+
+### Added
+- Added `followedStreams.maxCount` to `searches.yml` which lets bot owners change the default of 10 per server
+
+### Changed
+- Improvements to GPT ChatterBot (thx alexandra) 
+- Add a personality prompt to tweak the way chatgpt bot behaves 
+- Added Chat history support to chatgpt ChatterBot
+- Chatgpt token usage now correctly calculated
+- More chatgpt configs in `games.yml`
+
+## [4.3.18] - 26.12.2023
+
+### Added
+
+- Added `.cacheusers` command (thx Kotz) 
+- Added `.clubreject` which lets you reject club applications
+
+### Changed
+
+- Updated discord lib, there should be less console errors now
+
+### Fixed
+
+- Fixed `icon_url` when using `.showembed`
+- Fixed `.quoteshow` not showing sometimes (thx Cata)
+- Notifications will no longer be sent if dms are off when using `.give`
+- Users should no longer be able to apply to clubs while in a club already (especially not to the same club they're already in)
+
+### Removed
+
+- `.revimg` and `.revav` as google removed reverse image search
+
+## [4.3.17] - 06.09.2023
+
+### Fixed 
+
+- Fix to waifu gifts being character limited
+- Fixes UserUpdated and UserPresence not correctly ignoring users that are logignored
+- Added Trim() to activity names since apparently some activities have trailing spaces.
+
+## [4.3.16] - 24.05.2023
+
+### Fixed
+
+- Fixed missing events from `.logevents`
+- Fixed `.log` thread deleted and thread created events not working properly
+
+## [4.3.15] - 21.05.2023
+
+### Fixed
+
+- Fixed -w 0 in trivia
+- Fixed `.rps` amount field in the response
+- Fixed `.showembed` output
+- Fixed bank award's incorrect output message
+
+## [4.3.14] - 02.04.2023
+
+### Fixed
+
+- Fixed voice hearbeat issue
+- `.banktake` had ok/error responses flipped. No functional change
+- PermRole should deny messages in threads todo
+- Fixed chucknorris jokes
+- `.logserver` will now
+
+## [4.3.13] - 20.02.2023
+
+### Fixed
+
+- Fixed `.log userpresence`
+- `.q` will now use `yt-dlp` if anything other than `ytProvider: Ytdl` is set in `data/searches.yml`
+- Fixed Title links on some embeds
+
+## [4.3.12] - 12.02.2023
+
+### Fixed
+
+- Fixed `.betstats` not working on european locales
+- Timed `.ban` will work on users who are not in the server
+- Fixed some bugs in the medusa system
+
 ## [4.3.11] - 21.01.2023

 ### Added
@@ -36,7 +125,7 @@ Experimental changelog. Mostly based on [keepachangelog](https://keepachangelog.

 ## [4.3.10] - 10.11.2022

-### Added 
+### Added

 - `.filterlist` / `.fl` command which lists link and invite filtering channels and status
 - Added support for `%target%` placeholder in `.alias` command
@@ -45,13 +134,13 @@ Experimental changelog. Mostly based on [keepachangelog](https://keepachangelog.

 ### Changed

- .meload and .meunload are now case sensitive. Previously loaded medusae may need to be reloaded or data/medusae/medusa.yml may need to be edited manually 
+- .meload and .meunload are now case sensitive. Previously loaded medusae may need to be reloaded or data/medusae/medusa.yml may need to be edited manually
 - Several club related command have their error messages improved
 - Updated help text for .antispam and .antiraid
 - You can now specify time and date (time is optional) in `.remind` command instead of relative time, in the format `HH:mm dd.MM.YYYY`
- OwnerId will be automatically added to `creds.yml` at bot startup if it's missing 
+- OwnerId will be automatically added to `creds.yml` at bot startup if it's missing

-### Fixed 
+### Fixed

 - Fixed `.cmdcd` console error
 - Fixed an error when currency is add per xp
@@ -63,7 +152,7 @@ Experimental changelog. Mostly based on [keepachangelog](https://keepachangelog.

 ## [4.3.9] - 12.10.2022

-### Added 
+### Added

 - `.betstats` shows sum of all bets, payouts and the payout rate in %. Updates once an hour

--- a/7
+++ b/7
@@ -28,12 +28,11 @@ WORKDIR /app
 RUN set -xe; \
    useradd -m nadeko; \
    apt-get update; \
-    apt-get install -y --no-install-recommends libopus0 libsodium23 libsqlite3-0 curl ffmpeg python3 python3-pip sudo; \
+    apt-get install -y --no-install-recommends libopus0 libsodium23 libsqlite3-0 curl ffmpeg python3 sudo; \
    update-alternatives --install /usr/bin/python python /usr/bin/python3.9 1; \
    echo 'Defaults>nadeko env_keep+="ASPNETCORE_* DOTNET_* NadekoBot_* shard_id total_shards TZ"' > /etc/sudoers.d/nadeko; \
-    pip3 install --no-cache-dir --upgrade youtube-dl; \
-    apt-get purge -y python3-pip; \
-    chmod +x /usr/local/bin/youtube-dl; \
+    curl -Lo /usr/local/bin/yt-dlp https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp; \
+    chmod a+rx /usr/local/bin/yt-dlp; \
    apt-get autoremove -y; \
    apt-get autoclean -y

--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -0,0 +1,23 @@
+version: "3.7"
+
+services:
+  nadeko:
+    image: insert-image-name-here:latest
+    depends_on:
+      - redis
+    environment:
+      TZ: Europe/Paris
+      NadekoBot_RedisOptions: redis,name=nadeko
+      #NadekoBot_ShardRunCommand: dotnet
+      #NadekoBot_ShardRunArguments: /app/NadekoBot.dll {0} {1}
+    volumes:
+      - /srv/nadeko/conf:/app/conf:ro
+      - /srv/nadeko/data:/app/data
+
+  redis:
+    image: redis:4-alpine
+    sysctls:
+      - net.core.somaxconn=511
+    command: redis-server --maxmemory 32M --maxmemory-policy volatile-lru
+    volumes:
+      - /srv/nadeko/redis-data:/data
--- a/docs/config-guide.md
+++ b/docs/config-guide.md
@@ -24,6 +24,10 @@ The list below is not complete. Use commands above to see up-to-date list for yo

 `trivia.min_win_req` - Restricts a user's ability to make a trivia game with a win requirement less than the set value.   
 `trivia.currency_reward` - Sets the amount of currency a user will win if they place first in a completed trivia game.  
+`hangman.currency_reward` - Sets the amount of currency a user will win if they win a game of hangman.  
+`chatbot` - Sets which chatbot API the bot should use, values: `gpt3`, `cleverbot`.  
+`gpt.model` - Sets which GPT-3 model the bot should use, values: `ada001`, `babbage001`, `curie001`, `davinci003`.  
+`gpt.max_tokens` - Sets the limit of tokens GPT-3 can use per call. Find out more about tokens [here](https://help.openai.com/en/articles/4936856-what-are-tokens-and-how-to-count-them).

 *more settings may be available in `data/games.yml` file*

--- a/docs/guides/linux-guide.md
+++ b/docs/guides/linux-guide.md
@@ -20,7 +20,7 @@ It is recommended that you use **Ubuntu 20.04**, as there have been nearly no pr

 ##### Compatible operating systems:

- Ubuntu: 16.04, 18.04, 20.04, 21.04, 21.10
+- Ubuntu: 16.04, 18.04, 20.04
 - Mint: 19, 20
 - Debian: 10, 11
 - CentOS: 7
--- a/docs/guides/windows-guide.md
+++ b/docs/guides/windows-guide.md
@@ -123,7 +123,7 @@ In order to use music commands, you need ffmpeg and youtube-dl installed.
 - [ffmpeg-32bit] | [ffmpeg-64bit] - Download the **appropriate version** for your system (32 bit if you're running a 32 bit OS, or 64 if you're running a 64bit OS). Unzip it, and move `ffmpeg.exe` to a path that's in your PATH environment variable. If you don't know what that is, just move the `ffmpeg.exe` file to `NadekoBot/output`.
 - [youtube-dl] - Click to download the file, then move `youtube-dl.exe` to a path that's in your PATH environment variable. If you don't know what that is, just move the `youtube-dl.exe` file to `NadekoBot/system`.

-[Updater]: https://dl.nadeko.bot/
+[Updater]: https://dl.nadeko.bot/v3/
 [Notepad++]: https://notepad-plus-plus.org/
 [.net]: https://dotnet.microsoft.com/download/dotnet/5.0
 [Redis]: https://github.com/MicrosoftArchive/redis/releases/download/win-3.0.504/Redis-x64-3.0.504.msi
--- a/docs/placeholders.md
+++ b/docs/placeholders.md
@@ -68,12 +68,7 @@ Some features have their own specific placeholders which are noted in that featu
 - `%ban.reason%` - Reason for the ban, if provided  
 - `%ban.duration%` - Duration of the ban in the form Days.Hours:Minutes (6.05:04)  

-### Bot stats placeholders
-
- `%servers%` - Server count bot has joined
- `%users%` - Combined user count on servers the bot has joined
-
-### Shard stats placeholders
+### Shard stats placeholders 

 - `%shard.servercount%` - Server count on current shard
 - `%shard.usercount%` - Combined user count on current shard
@@ -89,6 +84,5 @@ Some features have their own specific placeholders which are noted in that featu

 - `%rngX-Y%` - Returns a random number between X and Y
 - `%target%` - Returns anything the user has written after the trigger (only works on Expressions)
- `%img:stuff%` - Returns an `imgur.com` search for "stuff" (only works on Expressions)

 ![img](https://puu.sh/B7mgI.png)
--- a/src/NadekoBot.Generators/NadekoBot.Generators.csproj
+++ b/src/NadekoBot.Generators/NadekoBot.Generators.csproj
@@ -10,7 +10,7 @@
    <ItemGroup>
        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" PrivateAssets="all" />
        <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" PrivateAssets="all" />
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" PrivateAssets="all" GeneratePathProperty="true" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" PrivateAssets="all" GeneratePathProperty="true" />
    </ItemGroup>
    
    <PropertyGroup>
--- a/src/NadekoBot/Common/Creds.cs
+++ b/src/NadekoBot/Common/Creds.cs
@@ -53,6 +53,9 @@ go to https://www.patreon.com/portal -> my clients -> create client")]

    [Comment(@"Official cleverbot api key.")]
    public string CleverbotApiKey { get; set; }
+
+    [Comment(@"Official GPT-3 api key.")]
+    public string Gpt3ApiKey { get; set; }
    
    [Comment(@"Which cache implementation should bot use.
 'memory' - Cache will be in memory of the bot's process itself. Only use this on bots with a single shard. When the bot is restarted the cache is reset. 
@@ -118,7 +121,7 @@ Windows default

    public Creds()
    {
-        Version = 6;
+        Version = 7;
        Token = string.Empty;
        UsePrivilegedIntents = true;
        OwnerIds = new List<ulong>();
@@ -128,6 +131,7 @@ Windows default
        Patreon = new(string.Empty, string.Empty, string.Empty, string.Empty);
        BotListToken = string.Empty;
        CleverbotApiKey = string.Empty;
+        Gpt3ApiKey = string.Empty;
        BotCache = BotCacheImplemenation.Memory;
        RedisOptions = "localhost:6379,syncTimeout=30000,responseTimeout=30000,allowAdmin=true,password=";
        Db = new()
--- a/src/NadekoBot/Common/IBotCredentials.cs
+++ b/src/NadekoBot/Common/IBotCredentials.cs
@@ -14,6 +14,7 @@ public interface IBotCredentials
    int TotalShards { get; }
    Creds.PatreonSettings Patreon { get; }
    string CleverbotApiKey { get; }
+    string Gpt3ApiKey { get; }
    RestartConfig RestartCommand { get; }
    Creds.VotesSettings Votes { get; }
    string BotListToken { get; }
--- a/src/NadekoBot/Common/Medusa/MedusaLoaderService.cs
+++ b/src/NadekoBot/Common/Medusa/MedusaLoaderService.cs
@@ -459,6 +459,9 @@ public sealed class MedusaLoaderService : IMedusaLoaderService, IReadyExecutor,
            pb.WithIsMultiple(paramData.IsParams)
              .WithIsOptional(paramData.IsOptional)
              .WithIsRemainder(paramData.IsLeftover);
+
+            if (paramData.IsOptional)
+                pb.WithDefault(paramData.DefaultValue);
        };

    [MethodImpl(MethodImplOptions.NoInlining)]
@@ -800,6 +803,7 @@ public sealed class MedusaLoaderService : IMedusaLoaderService, IReadyExecutor,

                var leftoverAttribute = pi.GetCustomAttribute<leftoverAttribute>(true);
                var hasDefaultValue = pi.HasDefaultValue;
+                var defaultValue = pi.DefaultValue;
                var isLeftover = leftoverAttribute != null;
                var isParams = pi.GetCustomAttribute<ParamArrayAttribute>() is not null;
                var paramType = pi.ParameterType;
@@ -836,7 +840,7 @@ public sealed class MedusaLoaderService : IMedusaLoaderService, IReadyExecutor,
                    continue;
                }

-                canInject = false;
+                canInject = false;                                                                                           

                if (isParams)
                {
@@ -857,7 +861,7 @@ public sealed class MedusaLoaderService : IMedusaLoaderService, IReadyExecutor,
                    throw new ArgumentException("Leftover attribute error.");
                }

-                cmdParams.Add(new ParamData(paramType, paramName, hasDefaultValue, isLeftover, isParams));
+                cmdParams.Add(new ParamData(paramType, paramName, hasDefaultValue, defaultValue, isLeftover, isParams));
            }


--- a/src/NadekoBot/Common/Medusa/Models/ParamData.cs
+++ b/src/NadekoBot/Common/Medusa/Models/ParamData.cs
@@ -4,6 +4,7 @@ public sealed record ParamData(
    Type Type,
    string Name,
    bool IsOptional,
+    object? DefaultValue,
    bool IsLeftover,
    bool IsParams
 );
--- a/src/NadekoBot/Common/SmartText/SmartEmbedText.cs
+++ b/src/NadekoBot/Common/SmartText/SmartEmbedText.cs
@@ -1,5 +1,6 @@
 #nullable disable warnings
 using SixLabors.ImageSharp.PixelFormats;
+using System.Text.Json.Serialization;

 namespace NadekoBot;

@@ -7,14 +8,14 @@ public sealed record SmartEmbedArrayElementText : SmartEmbedTextBase
 {
    public string Color { get; init; } = string.Empty;

-    public SmartEmbedArrayElementText() : base()
+    public SmartEmbedArrayElementText()
    {
        
    }
    
    public SmartEmbedArrayElementText(IEmbed eb) : base(eb)
    {
-        
+        Color = eb.Color is { } c ? new Rgba32(c.R, c.G, c.B).ToHex() : string.Empty;
    }

    protected override EmbedBuilder GetEmbedInternal()
@@ -63,6 +64,7 @@ public abstract record SmartEmbedTextBase : SmartText
    public SmartTextEmbedFooter Footer { get; init; }
    public SmartTextEmbedField[] Fields { get; init; }

+    [JsonIgnore]
    public bool IsValid
        => !string.IsNullOrWhiteSpace(Title)
           || !string.IsNullOrWhiteSpace(Description)
@@ -100,7 +102,7 @@ public abstract record SmartEmbedTextBase : SmartText
                IconUrl = ef.IconUrl
            }
            : null;
-        
+
        if (eb.Fields.Length > 0)
        {
            Fields = eb.Fields.Select(field
--- a/src/NadekoBot/Common/SmartText/SmartEmbedTextArray.cs
+++ b/src/NadekoBot/Common/SmartText/SmartEmbedTextArray.cs
@@ -1,4 +1,6 @@
 #nullable disable
+using System.Text.Json.Serialization;
+
 namespace NadekoBot;

 public sealed record SmartEmbedTextArray : SmartText
@@ -6,6 +8,7 @@ public sealed record SmartEmbedTextArray : SmartText
    public string Content { get; set; }
    public SmartEmbedArrayElementText[] Embeds { get; set; }

+    [JsonIgnore]
    public bool IsValid
        => Embeds?.All(x => x.IsValid) ?? false;

--- a/src/NadekoBot/Common/SmartText/SmartText.cs
+++ b/src/NadekoBot/Common/SmartText/SmartText.cs
@@ -1,16 +1,20 @@
 #nullable disable
 using Newtonsoft.Json.Linq;
+using System.Text.Json.Serialization;

 namespace NadekoBot;

 public abstract record SmartText
 {
+    [JsonIgnore]
    public bool IsEmbed
        => this is SmartEmbedText;

+    [JsonIgnore]
    public bool IsPlainText
        => this is SmartPlainText;

+    [JsonIgnore]
    public bool IsEmbedArray
        => this is SmartEmbedTextArray;
    
--- a/src/NadekoBot/Common/SmartText/SmartTextEmbedAuthor.cs
+++ b/src/NadekoBot/Common/SmartText/SmartTextEmbedAuthor.cs
@@ -1,5 +1,6 @@
 #nullable disable
 using Newtonsoft.Json;
+using System.Text.Json.Serialization;

 namespace NadekoBot;

@@ -8,6 +9,7 @@ public class SmartTextEmbedAuthor
    public string Name { get; set; }

    [JsonProperty("icon_url")]
+    [JsonPropertyName("icon_url")]
    public string IconUrl { get; set; }

    public string Url { get; set; }
--- a/src/NadekoBot/Common/SmartText/SmartTextEmbedFooter.cs
+++ b/src/NadekoBot/Common/SmartText/SmartTextEmbedFooter.cs
@@ -1,5 +1,6 @@
 #nullable disable
 using Newtonsoft.Json;
+using System.Text.Json.Serialization;

 namespace NadekoBot;

@@ -8,5 +9,6 @@ public class SmartTextEmbedFooter
    public string Text { get; set; }

    [JsonProperty("icon_url")]
+    [JsonPropertyName("icon_url")]
    public string IconUrl { get; set; }
 }
--- a/src/NadekoBot/Common/TypeReaders/BotCommandTypeReader.cs
+++ b/src/NadekoBot/Common/TypeReaders/BotCommandTypeReader.cs
@@ -46,9 +46,7 @@ public sealed class CommandOrExprTypeReader : NadekoTypeReader<CommandOrExprInfo

    public override async ValueTask<TypeReaderResult<CommandOrExprInfo>> ReadAsync(ICommandContext ctx, string input)
    {
-        input = input.ToUpperInvariant();
-
-        if (_exprs.ExpressionExists(ctx.Guild?.Id, input) || _exprs.ExpressionExists(null, input))
+        if (_exprs.ExpressionExists(ctx.Guild?.Id, input))
            return TypeReaderResult.FromSuccess(new CommandOrExprInfo(input, CommandOrExprInfo.Type.Custom));

        var cmd = await new CommandTypeReader(_commandHandler, _cmds).ReadAsync(ctx, input);
--- a/src/NadekoBot/Db/Extensions/DiscordUserExtensions.cs
+++ b/src/NadekoBot/Db/Extensions/DiscordUserExtensions.cs
@@ -4,11 +4,60 @@ using LinqToDB.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Db.Models;
 using NadekoBot.Services.Database;
+using System.Collections.Immutable;

 namespace NadekoBot.Db;

 public static class DiscordUserExtensions
 {
+    /// <summary>
+    /// Adds the specified <paramref name="users"/> to the database. If a database user with placeholder name
+    /// and discriminator is present in <paramref name="users"/>, their name and discriminator get updated accordingly.
+    /// </summary>
+    /// <param name="ctx">This database context.</param>
+    /// <param name="users">The users to add or update in the database.</param>
+    /// <returns>A tuple with the amount of new users added and old users updated.</returns>
+    public static async Task<(long UsersAdded, long UsersUpdated)> RefreshUsersAsync(this NadekoContext ctx, List<IUser> users)
+    {
+        var presentDbUsers = await ctx.DiscordUser
+            .Select(x => new { x.UserId, x.Username, x.Discriminator })
+            .Where(x => users.Select(y => y.Id).Contains(x.UserId))
+            .ToArrayAsyncEF();
+
+        var usersToAdd = users
+            .Where(x => !presentDbUsers.Select(x => x.UserId).Contains(x.Id))
+            .Select(x => new DiscordUser()
+            {
+                UserId = x.Id,
+                AvatarId = x.AvatarId,
+                Username = x.Username,
+                Discriminator = x.Discriminator
+            });
+
+        var added = (await ctx.BulkCopyAsync(usersToAdd)).RowsCopied;
+        var toUpdateUserIds = presentDbUsers
+            .Where(x => x.Username == "Unknown" && x.Discriminator == "????")
+            .Select(x => x.UserId)
+            .ToArray();
+
+        foreach (var user in users.Where(x => toUpdateUserIds.Contains(x.Id)))
+        {
+            await ctx.DiscordUser
+                .Where(x => x.UserId == user.Id)
+                .UpdateAsync(x => new DiscordUser()
+                {
+                    Username = user.Username,
+                    Discriminator = user.Discriminator,
+
+                    // .award tends to set AvatarId and DateAdded to NULL, so account for that.
+                    AvatarId = user.AvatarId,
+                    DateAdded = x.DateAdded ?? DateTime.UtcNow
+                });
+        }
+
+        return (added, toUpdateUserIds.Length);
+    }
+
    public static Task<DiscordUser> GetByUserIdAsync(
        this IQueryable<DiscordUser> set,
        ulong userId)
--- a/src/NadekoBot/Db/Extensions/NadekoExpressionExtensions.cs
+++ b/src/NadekoBot/Db/Extensions/NadekoExpressionExtensions.cs
@@ -12,10 +12,4 @@ public static class NadekoExpressionExtensions

    public static IEnumerable<NadekoExpression> ForId(this DbSet<NadekoExpression> exprs, ulong id)
        => exprs.AsNoTracking().AsQueryable().Where(x => x.GuildId == id).ToList();
-
-    public static NadekoExpression GetByGuildIdAndInput(
-        this DbSet<NadekoExpression> exprs,
-        ulong? guildId,
-        string input)
-        => exprs.FirstOrDefault(x => x.GuildId == guildId && x.Trigger.ToUpper() == input);
 }
--- a/src/NadekoBot/Modules/Administration/LocalizationCommands.cs
+++ b/src/NadekoBot/Modules/Administration/LocalizationCommands.cs
@@ -65,7 +65,10 @@ public partial class Administration
                    _localization.SetGuildCulture(ctx.Guild, ci);
                }

-                await ReplyConfirmLocalizedAsync(strs.lang_set(Format.Bold(ci.ToString()), Format.Bold(ci.NativeName)));
+                var nativeName = ci.NativeName;
+                if (ci.Name == "ts-TS")
+                    nativeName = _supportedLocales[ci.Name];
+                await ReplyConfirmLocalizedAsync(strs.lang_set(Format.Bold(ci.ToString()), Format.Bold(nativeName)));
            }
            catch (Exception)
            {
--- a/src/NadekoBot/Modules/Administration/Mute/MuteService.cs
+++ b/src/NadekoBot/Modules/Administration/Mute/MuteService.cs
@@ -19,6 +19,7 @@ public class MuteService : INService

    private static readonly OverwritePermissions _denyOverwrite = new(addReactions: PermValue.Deny,
        sendMessages: PermValue.Deny,
+        sendMessagesInThreads: PermValue.Deny,
        attachFiles: PermValue.Deny);

    public event Action<IGuildUser, IUser, MuteType, string> UserMuted = delegate { };
@@ -356,24 +357,24 @@ public class MuteService : INService

    public async Task TimedBan(
        IGuild guild,
-        IUser user,
+        ulong userId,
        TimeSpan after,
        string reason,
        int pruneDays)
    {
-        await guild.AddBanAsync(user.Id, pruneDays, reason);
+        await guild.AddBanAsync(userId, pruneDays, reason);
        await using (var uow = _db.GetDbContext())
        {
            var config = uow.GuildConfigsForId(guild.Id, set => set.Include(x => x.UnbanTimer));
            config.UnbanTimer.Add(new()
            {
-                UserId = user.Id,
+                UserId = userId,
                UnbanAt = DateTime.UtcNow + after
            }); // add teh unmute timer to the database
-            uow.SaveChanges();
+            await uow.SaveChangesAsync();
        }

-        StartUn_Timer(guild.Id, user.Id, after, TimerType.Ban); // start the timer
+        StartUn_Timer(guild.Id, userId, after, TimerType.Ban); // start the timer
    }

    public async Task TimedRole(
--- a/src/NadekoBot/Modules/Administration/Self/DoAsUserMessage.cs
+++ b/src/NadekoBot/Modules/Administration/Self/DoAsUserMessage.cs
@@ -5,7 +5,7 @@ namespace NadekoBot.Modules.Administration;
 public sealed class DoAsUserMessage : IUserMessage
 {
    private readonly string _message;
-    private IUserMessage _msg;
+    private readonly IUserMessage _msg;
    private readonly IUser _user;

    public DoAsUserMessage(SocketUserMessage msg, IUser user, string message)
@@ -49,6 +49,13 @@ public sealed class DoAsUserMessage : IUserMessage
        return _msg.RemoveAllReactionsForEmoteAsync(emote, options);
    }

+    public IAsyncEnumerable<IReadOnlyCollection<IUser>> GetReactionUsersAsync(
+        IEmote emoji,
+        int limit,
+        RequestOptions? options = null,
+        ReactionType type = ReactionType.Normal)
+        => _msg.GetReactionUsersAsync(emoji, limit, options, type);
+
    public IAsyncEnumerable<IReadOnlyCollection<IUser>> GetReactionUsersAsync(IEmote emoji, int limit,
        RequestOptions? options = null)
    {
@@ -78,6 +85,7 @@ public sealed class DoAsUserMessage : IUserMessage
    public IMessageChannel Channel => _msg.Channel;

    public IUser Author => _user;
+    public IThreadChannel Thread => _msg.Thread;

    public IReadOnlyCollection<IAttachment> Attachments => _msg.Attachments;

@@ -106,6 +114,7 @@ public sealed class DoAsUserMessage : IUserMessage
    public MessageFlags? Flags => _msg.Flags;

    public IMessageInteraction Interaction => _msg.Interaction;
+    public MessageRoleSubscriptionData RoleSubscriptionData  => _msg.RoleSubscriptionData;

    public Task ModifyAsync(Action<MessageProperties> func, RequestOptions? options = null)
    {
@@ -134,5 +143,7 @@ public sealed class DoAsUserMessage : IUserMessage
        return _msg.Resolve(userHandling, channelHandling, roleHandling, everyoneHandling, emojiHandling);
    }

+    public MessageResolvedData ResolvedData => _msg.ResolvedData;
+
    public IUserMessage ReferencedMessage => _msg.ReferencedMessage;
 }
--- a/src/NadekoBot/Modules/Administration/Self/SelfCommands.cs
+++ b/src/NadekoBot/Modules/Administration/Self/SelfCommands.cs
@@ -1,5 +1,6 @@
 #nullable disable
 using Nadeko.Medusa;
+using NadekoBot.Db;
 using NadekoBot.Modules.Administration.Services;
 using NadekoBot.Services.Database.Models;

@@ -22,19 +23,53 @@ public partial class Administration
        private readonly IBotStrings _strings;
        private readonly IMedusaLoaderService _medusaLoader;
        private readonly ICoordinator _coord;
+        private readonly DbService _db;

        public SelfCommands(
            DiscordSocketClient client,
+            DbService db,
            IBotStrings strings,
            ICoordinator coord,
            IMedusaLoaderService medusaLoader)
        {
            _client = client;
+            _db = db;
            _strings = strings;
            _coord = coord;
            _medusaLoader = medusaLoader;
        }

+
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        [OwnerOnly]
+        public Task CacheUsers()
+            => CacheUsers(ctx.Guild);
+
+        [Cmd]
+        [OwnerOnly]
+        public async Task CacheUsers(IGuild guild)
+        {
+            var downloadUsersTask = guild.DownloadUsersAsync();
+            var message = await ReplyPendingLocalizedAsync(strs.cache_users_pending);
+            using var dbContext = _db.GetDbContext();
+
+            await downloadUsersTask;
+
+            var users = (await guild.GetUsersAsync(CacheMode.CacheOnly))
+                .Cast<IUser>()
+                .ToList();
+
+            var (added, updated) = await dbContext.RefreshUsersAsync(users);
+
+            await message.ModifyAsync(x =>
+                x.Embed = _eb.Create()
+                    .WithDescription(GetText(strs.cache_users_done(added, updated)))
+                    .WithOkColor()
+                    .Build()
+            );
+        }
+
        [Cmd]
        [OwnerOnly]
        public async Task DoAs(IUser user, [Leftover] string message)
--- a/src/NadekoBot/Modules/Administration/ServerLog/ServerLogCommandService.cs
+++ b/src/NadekoBot/Modules/Administration/ServerLog/ServerLogCommandService.cs
@@ -9,9 +9,9 @@ using NadekoBot.Services.Database.Models;
 namespace NadekoBot.Modules.Administration;

 public sealed class LogCommandService : ILogCommandService, IReadyExecutor
-    #if !GLOBAL_NADEKO
-    , INService // don't load this service on global nadeko
-    #endif
+#if !GLOBAL_NADEKO
+        , INService // don't load this service on global nadeko
+#endif
 {
    public ConcurrentDictionary<ulong, LogSetting> GuildLogSettings { get; }

@@ -49,15 +49,15 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
        _prot = prot;
        _tz = tz;
        _punishService = punishService;
-        
+
        using (var uow = db.GetDbContext())
        {
            var guildIds = client.Guilds.Select(x => x.Id).ToList();
            var configs = uow.LogSettings.AsQueryable()
-                             .AsNoTracking()
-                             .Where(x => guildIds.Contains(x.GuildId))
-                             .Include(ls => ls.LogIgnores)
-                             .ToList();
+                .AsNoTracking()
+                .Where(x => guildIds.Contains(x.GuildId))
+                .Include(ls => ls.LogIgnores)
+                .ToList();

            GuildLogSettings = configs.ToDictionary(ls => ls.GuildId).ToConcurrent();
        }
@@ -73,12 +73,13 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
        _client.UserVoiceStateUpdated += _client_UserVoiceStateUpdated;
        _client.UserVoiceStateUpdated += _client_UserVoiceStateUpdated_TTS;
        _client.GuildMemberUpdated += _client_GuildUserUpdated;
+        _client.PresenceUpdated += _client_PresenceUpdated;
        _client.UserUpdated += _client_UserUpdated;
        _client.ChannelCreated += _client_ChannelCreated;
        _client.ChannelDestroyed += _client_ChannelDestroyed;
        _client.ChannelUpdated += _client_ChannelUpdated;
        _client.RoleDeleted += _client_RoleDeleted;
-        
+
        _client.ThreadCreated += _client_ThreadCreated;
        _client.ThreadDeleted += _client_ThreadDeleted;

@@ -86,19 +87,75 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
        _mute.UserUnmuted += MuteCommands_UserUnmuted;

        _prot.OnAntiProtectionTriggered += TriggeredAntiProtection;
-        
+
        _punishService.OnUserWarned += PunishServiceOnOnUserWarned;
    }

+    private async Task _client_PresenceUpdated(SocketUser user, SocketPresence? before, SocketPresence? after)
+    {
+        if (user is not SocketGuildUser gu)
+            return;
+
+        if (!GuildLogSettings.TryGetValue(gu.Guild.Id, out var logSetting)
+            || before is null
+            || after is null
+            || logSetting.LogIgnores.Any(ilc => ilc.LogItemId == gu.Id && ilc.ItemType == IgnoredItemType.User))
+            return;
+
+        ITextChannel? logChannel;
+
+        if (!user.IsBot
+            && logSetting.LogUserPresenceId is not null
+            && (logChannel =
+                await TryGetLogChannel(gu.Guild, logSetting, LogType.UserPresence)) is not null)
+        {
+            if (before.Status != after.Status)
+            {
+                var str = "🎭"
+                          + Format.Code(PrettyCurrentTime(gu.Guild))
+                          + GetText(logChannel.Guild,
+                              strs.user_status_change("👤" + Format.Bold(gu.Username),
+                                  Format.Bold(after.Status.ToString())));
+                PresenceUpdates.AddOrUpdate(logChannel,
+                    new List<string>
+                    {
+                        str
+                    },
+                    (_, list) =>
+                    {
+                        list.Add(str);
+                        return list;
+                    });
+            }
+            else if (before.Activities.FirstOrDefault()?.Name != after.Activities.FirstOrDefault()?.Name)
+            {
+                var str =
+                    $"👾`{PrettyCurrentTime(gu.Guild)}`👤__**{gu.Username}**__ is now playing **{after.Activities.FirstOrDefault()?.Name ?? "-"}**.";
+                PresenceUpdates.AddOrUpdate(logChannel,
+                    new List<string>
+                    {
+                        str
+                    },
+                    (_, list) =>
+                    {
+                        list.Add(str);
+                        return list;
+                    });
+            }
+        }
+    }
+
    private Task _client_ThreadDeleted(Cacheable<SocketThreadChannel, ulong> sch)
    {
        _ = Task.Run(async () =>
        {
            try
            {
-                if (sch.HasValue || sch.Value is not IGuildChannel ch)
+                if (!sch.HasValue)
                    return;

+                var ch = sch.Value;
+
                if (!GuildLogSettings.TryGetValue(ch.Guild.Id, out var logSetting)
                    || logSetting.ThreadDeletedId is null)
                    return;
@@ -111,7 +168,7 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor

                await logChannel.EmbedAsync(_eb.Create()
                    .WithOkColor()
-                    .WithTitle("🆕 " + title)
+                    .WithTitle("🗑 " + title)
                    .WithDescription($"{ch.Name} | {ch.Id}")
                    .WithFooter(CurrentTime(ch.Guild)));
            }
@@ -123,15 +180,12 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
        return Task.CompletedTask;
    }

-    private Task _client_ThreadCreated(SocketThreadChannel sch)
+    private Task _client_ThreadCreated(SocketThreadChannel ch)
    {
        _ = Task.Run(async () =>
        {
            try
            {
-                if (sch.Guild is not IGuildChannel ch)
-                    return;
-
                if (!GuildLogSettings.TryGetValue(ch.Guild.Id, out var logSetting)
                    || logSetting.ThreadCreatedId is null)
                    return;
@@ -139,7 +193,7 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                ITextChannel? logChannel;
                if ((logChannel = await TryGetLogChannel(ch.Guild, logSetting, LogType.ThreadCreated)) is null)
                    return;
-                
+
                var title = GetText(logChannel.Guild, strs.thread_created);

                await logChannel.EmbedAsync(_eb.Create()
@@ -177,22 +231,24 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                var keys = PresenceUpdates.Keys.ToList();

                await keys.Select(key =>
-                          {
-                              if (!((SocketGuild)key.Guild).CurrentUser.GetPermissions(key).SendMessages)
-                                  return Task.CompletedTask;
+                    {
+                        if (!((SocketGuild)key.Guild).CurrentUser.GetPermissions(key).SendMessages)
+                            return Task.CompletedTask;

-                              if (PresenceUpdates.TryRemove(key, out var msgs))
-                              {
-                                  var title = GetText(key.Guild, strs.presence_updates);
-                                  var desc = string.Join(Environment.NewLine, msgs);
-                                  return key.SendConfirmAsync(_eb, title, desc.TrimTo(2048)!);
-                              }
+                        if (PresenceUpdates.TryRemove(key, out var msgs))
+                        {
+                            var title = GetText(key.Guild, strs.presence_updates);
+                            var desc = string.Join(Environment.NewLine, msgs);
+                            return key.SendConfirmAsync(_eb, title, desc.TrimTo(2048)!);
+                        }

-                              return Task.CompletedTask;
-                          })
-                          .WhenAll();
+                        return Task.CompletedTask;
+                    })
+                    .WhenAll();
+            }
+            catch
+            {
            }
-            catch { }
        }
    }

@@ -255,35 +311,35 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
            logSetting.UserLeftId = logSetting.UserBannedId = logSetting.UserUnbannedId = logSetting.UserUpdatedId =
                logSetting.ChannelCreatedId = logSetting.ChannelDestroyedId = logSetting.ChannelUpdatedId =
                    logSetting.LogUserPresenceId = logSetting.LogVoicePresenceId = logSetting.UserMutedId =
-                        logSetting.LogVoicePresenceTTSId = value ? channelId : null;
+                        logSetting.LogVoicePresenceTTSId = logSetting.ThreadCreatedId = logSetting.ThreadDeletedId
+                            = logSetting.LogWarnsId = value ? channelId : null;
        await uow.SaveChangesAsync();
        GuildLogSettings.AddOrUpdate(guildId, _ => logSetting, (_, _) => logSetting);
    }

-    

    private async Task PunishServiceOnOnUserWarned(Warning arg)
    {
        if (!GuildLogSettings.TryGetValue(arg.GuildId, out var logSetting) || logSetting.LogWarnsId is null)
            return;
-        
+
        var g = _client.GetGuild(arg.GuildId);
-        
+
        ITextChannel? logChannel;
        if ((logChannel = await TryGetLogChannel(g, logSetting, LogType.UserWarned)) is null)
            return;

        var embed = _eb.Create()
-                       .WithOkColor()
-                       .WithTitle($"⚠️ User Warned")
-                       .WithDescription($"<@{arg.UserId}> | {arg.UserId}")
-                       .AddField("Mod", arg.Moderator)
-                       .AddField("Reason", string.IsNullOrWhiteSpace(arg.Reason) ? "-" : arg.Reason, true)
-                       .WithFooter(CurrentTime(g));
+            .WithOkColor()
+            .WithTitle($"⚠️ User Warned")
+            .WithDescription($"<@{arg.UserId}> | {arg.UserId}")
+            .AddField("Mod", arg.Moderator)
+            .AddField("Reason", string.IsNullOrWhiteSpace(arg.Reason) ? "-" : arg.Reason, true)
+            .WithFooter(CurrentTime(g));

        await logChannel.EmbedAsync(embed);
    }
-    
+
    private Task _client_UserUpdated(SocketUser before, SocketUser uAfter)
    {
        _ = Task.Run(async () =>
@@ -295,7 +351,7 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor

                var g = after.Guild;

-                if (!GuildLogSettings.TryGetValue(g.Id, out var logSetting) || logSetting.UserUpdatedId is null)
+                if (!GuildLogSettings.TryGetValue(g.Id, out var logSetting) || logSetting.UserUpdatedId is null || logSetting.LogIgnores.Any(ilc => ilc.LogItemId == after.Id && ilc.ItemType == IgnoredItemType.User))
                    return;

                ITextChannel? logChannel;
@@ -307,18 +363,18 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                if (before.Username != after.Username)
                {
                    embed.WithTitle("👥 " + GetText(g, strs.username_changed))
-                         .WithDescription($"{before.Username}#{before.Discriminator} | {before.Id}")
-                         .AddField("Old Name", $"{before.Username}", true)
-                         .AddField("New Name", $"{after.Username}", true)
-                         .WithFooter(CurrentTime(g))
-                         .WithOkColor();
+                        .WithDescription($"{before.Username}#{before.Discriminator} | {before.Id}")
+                        .AddField("Old Name", $"{before.Username}", true)
+                        .AddField("New Name", $"{after.Username}", true)
+                        .WithFooter(CurrentTime(g))
+                        .WithOkColor();
                }
                else if (before.AvatarId != after.AvatarId)
                {
                    embed.WithTitle("👥" + GetText(g, strs.avatar_changed))
-                         .WithDescription($"{before.Username}#{before.Discriminator} | {before.Id}")
-                         .WithFooter(CurrentTime(g))
-                         .WithOkColor();
+                        .WithDescription($"{before.Username}#{before.Discriminator} | {before.Id}")
+                        .WithFooter(CurrentTime(g))
+                        .WithOkColor();

                    var bav = before.RealAvatarUrl();
                    if (bav.IsAbsoluteUri)
@@ -400,6 +456,12 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                case LogType.UserWarned:
                    channelId = logSetting.LogWarnsId = logSetting.LogWarnsId is null ? cid : default;
                    break;
+                case LogType.ThreadDeleted:
+                    channelId = logSetting.ThreadDeletedId = logSetting.ThreadDeletedId is null ? cid : default;
+                    break;
+                case LogType.ThreadCreated:
+                    channelId = logSetting.ThreadCreatedId = logSetting.ThreadCreatedId is null ? cid : default;
+                    break;
            }

            uow.SaveChanges();
@@ -482,10 +544,10 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                }

                var embed = _eb.Create()
-                               .WithAuthor(mutes)
-                               .WithTitle($"{usr.Username}#{usr.Discriminator} | {usr.Id}")
-                               .WithFooter(CurrentTime(usr.Guild))
-                               .WithOkColor();
+                    .WithAuthor(mutes)
+                    .WithTitle($"{usr.Username}#{usr.Discriminator} | {usr.Id}")
+                    .WithFooter(CurrentTime(usr.Guild))
+                    .WithOkColor();

                await logChannel.EmbedAsync(embed);
            }
@@ -529,10 +591,10 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                }

                var embed = _eb.Create()
-                               .WithAuthor(mutes)
-                               .WithTitle($"{usr.Username}#{usr.Discriminator} | {usr.Id}")
-                               .WithFooter($"{CurrentTime(usr.Guild)}")
-                               .WithOkColor();
+                    .WithAuthor(mutes)
+                    .WithTitle($"{usr.Username}#{usr.Discriminator} | {usr.Id}")
+                    .WithFooter($"{CurrentTime(usr.Guild)}")
+                    .WithOkColor();

                if (!string.IsNullOrWhiteSpace(reason))
                    embed.WithDescription(reason);
@@ -583,11 +645,11 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                }

                var embed = _eb.Create()
-                               .WithAuthor($"🛡 Anti-{protection}")
-                               .WithTitle(GetText(logChannel.Guild, strs.users) + " " + punishment)
-                               .WithDescription(string.Join("\n", users.Select(u => u.ToString())))
-                               .WithFooter(CurrentTime(logChannel.Guild))
-                               .WithOkColor();
+                    .WithAuthor($"🛡 Anti-{protection}")
+                    .WithTitle(GetText(logChannel.Guild, strs.users) + " " + punishment)
+                    .WithDescription(string.Join("\n", users.Select(u => u.ToString())))
+                    .WithFooter(CurrentTime(logChannel.Guild))
+                    .WithOkColor();

                await logChannel.EmbedAsync(embed);
            }
@@ -636,16 +698,16 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                    && (logChannel = await TryGetLogChannel(before.Guild, logSetting, LogType.UserUpdated)) is not null)
                {
                    var embed = _eb.Create()
-                                   .WithOkColor()
-                                   .WithFooter(CurrentTime(before.Guild))
-                                   .WithTitle($"{before.Username}#{before.Discriminator} | {before.Id}");
+                        .WithOkColor()
+                        .WithFooter(CurrentTime(before.Guild))
+                        .WithTitle($"{before.Username}#{before.Discriminator} | {before.Id}");
                    if (before.Nickname != after.Nickname)
                    {
                        embed.WithAuthor("👥 " + GetText(logChannel.Guild, strs.nick_change))
-                             .AddField(GetText(logChannel.Guild, strs.old_nick),
-                                 $"{before.Nickname}#{before.Discriminator}")
-                             .AddField(GetText(logChannel.Guild, strs.new_nick),
-                                 $"{after.Nickname}#{after.Discriminator}");
+                            .AddField(GetText(logChannel.Guild, strs.old_nick),
+                                $"{before.Nickname}#{before.Discriminator}")
+                            .AddField(GetText(logChannel.Guild, strs.new_nick),
+                                $"{after.Nickname}#{after.Discriminator}");

                        await logChannel.EmbedAsync(embed);
                    }
@@ -655,7 +717,7 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                        {
                            var diffRoles = after.Roles.Where(r => !before.Roles.Contains(r)).Select(r => r.Name);
                            embed.WithAuthor("⚔ " + GetText(logChannel.Guild, strs.user_role_add))
-                                 .WithDescription(string.Join(", ", diffRoles).SanitizeMentions());
+                                .WithDescription(string.Join(", ", diffRoles).SanitizeMentions());

                            await logChannel.EmbedAsync(embed);
                        }
@@ -663,59 +725,19 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                        {
                            await Task.Delay(1000);
                            var diffRoles = before.Roles.Where(r => !after.Roles.Contains(r) && !IsRoleDeleted(r.Id))
-                                                  .Select(r => r.Name)
-                                                  .ToList();
+                                .Select(r => r.Name)
+                                .ToList();

                            if (diffRoles.Any())
                            {
                                embed.WithAuthor("⚔ " + GetText(logChannel.Guild, strs.user_role_rem))
-                                     .WithDescription(string.Join(", ", diffRoles).SanitizeMentions());
+                                    .WithDescription(string.Join(", ", diffRoles).SanitizeMentions());

                                await logChannel.EmbedAsync(embed);
                            }
                        }
                    }
                }
-
-                if (!before.IsBot
-                    && logSetting.LogUserPresenceId is not null
-                    && (logChannel =
-                        await TryGetLogChannel(before.Guild, logSetting, LogType.UserPresence)) is not null)
-                {
-                    if (before.Status != after.Status)
-                    {
-                        var str = "🎭"
-                                  + Format.Code(PrettyCurrentTime(after.Guild))
-                                  + GetText(logChannel.Guild,
-                                      strs.user_status_change("👤" + Format.Bold(after.Username),
-                                          Format.Bold(after.Status.ToString())));
-                        PresenceUpdates.AddOrUpdate(logChannel,
-                            new List<string>
-                            {
-                                str
-                            },
-                            (_, list) =>
-                            {
-                                list.Add(str);
-                                return list;
-                            });
-                    }
-                    else if (before.Activities.FirstOrDefault()?.Name != after.Activities.FirstOrDefault()?.Name)
-                    {
-                        var str =
-                            $"👾`{PrettyCurrentTime(after.Guild)}`👤__**{after.Username}**__ is now playing **{after.Activities.FirstOrDefault()?.Name ?? "-"}**.";
-                        PresenceUpdates.AddOrUpdate(logChannel,
-                            new List<string>
-                            {
-                                str
-                            },
-                            (_, list) =>
-                            {
-                                list.Add(str);
-                                return list;
-                            });
-                    }
-                }
            }
            catch
            {
@@ -754,15 +776,15 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                if (before.Name != after.Name)
                {
                    embed.WithTitle("ℹ️ " + GetText(logChannel.Guild, strs.ch_name_change))
-                         .WithDescription($"{after} | {after.Id}")
-                         .AddField(GetText(logChannel.Guild, strs.ch_old_name), before.Name);
+                        .WithDescription($"{after} | {after.Id}")
+                        .AddField(GetText(logChannel.Guild, strs.ch_old_name), before.Name);
                }
                else if (beforeTextChannel?.Topic != afterTextChannel?.Topic)
                {
                    embed.WithTitle("ℹ️ " + GetText(logChannel.Guild, strs.ch_topic_change))
-                         .WithDescription($"{after} | {after.Id}")
-                         .AddField(GetText(logChannel.Guild, strs.old_topic), beforeTextChannel?.Topic ?? "-")
-                         .AddField(GetText(logChannel.Guild, strs.new_topic), afterTextChannel?.Topic ?? "-");
+                        .WithDescription($"{after} | {after.Id}")
+                        .AddField(GetText(logChannel.Guild, strs.old_topic), beforeTextChannel?.Topic ?? "-")
+                        .AddField(GetText(logChannel.Guild, strs.new_topic), afterTextChannel?.Topic ?? "-");
                }
                else
                    return;
@@ -795,7 +817,7 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                ITextChannel? logChannel;
                if ((logChannel = await TryGetLogChannel(ch.Guild, logSetting, LogType.ChannelDestroyed)) is null)
                    return;
-                
+
                string title;
                if (ch is IVoiceChannel)
                    title = GetText(logChannel.Guild, strs.voice_chan_destroyed);
@@ -803,10 +825,10 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                    title = GetText(logChannel.Guild, strs.text_chan_destroyed);

                await logChannel.EmbedAsync(_eb.Create()
-                                               .WithOkColor()
-                                               .WithTitle("🆕 " + title)
-                                               .WithDescription($"{ch.Name} | {ch.Id}")
-                                               .WithFooter(CurrentTime(ch.Guild)));
+                    .WithOkColor()
+                    .WithTitle("🆕 " + title)
+                    .WithDescription($"{ch.Name} | {ch.Id}")
+                    .WithFooter(CurrentTime(ch.Guild)));
            }
            catch
            {
@@ -815,7 +837,7 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
        });
        return Task.CompletedTask;
    }
-    
+
    private Task _client_ChannelCreated(IChannel ich)
    {
        _ = Task.Run(async () =>
@@ -839,10 +861,10 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                    title = GetText(logChannel.Guild, strs.text_chan_created);

                await logChannel.EmbedAsync(_eb.Create()
-                                               .WithOkColor()
-                                               .WithTitle("🆕 " + title)
-                                               .WithDescription($"{ch.Name} | {ch.Id}")
-                                               .WithFooter(CurrentTime(ch.Guild)));
+                    .WithOkColor()
+                    .WithTitle("🆕 " + title)
+                    .WithDescription($"{ch.Name} | {ch.Id}")
+                    .WithFooter(CurrentTime(ch.Guild)));
            }
            catch (Exception)
            {
@@ -942,11 +964,11 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                if ((logChannel = await TryGetLogChannel(guild, logSetting, LogType.UserLeft)) is null)
                    return;
                var embed = _eb.Create()
-                               .WithOkColor()
-                               .WithTitle("❌ " + GetText(logChannel.Guild, strs.user_left))
-                               .WithDescription(usr.ToString())
-                               .AddField("Id", usr.Id.ToString())
-                               .WithFooter(CurrentTime(guild));
+                    .WithOkColor()
+                    .WithTitle("❌ " + GetText(logChannel.Guild, strs.user_left))
+                    .WithDescription(usr.ToString())
+                    .AddField("Id", usr.Id.ToString())
+                    .WithFooter(CurrentTime(guild));

                if (Uri.IsWellFormedUriString(usr.GetAvatarUrl(), UriKind.Absolute))
                    embed.WithThumbnailUrl(usr.GetAvatarUrl());
@@ -975,17 +997,17 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                    return;

                var embed = _eb.Create()
-                               .WithOkColor()
-                               .WithTitle("✅ " + GetText(logChannel.Guild, strs.user_joined))
-                               .WithDescription($"{usr.Mention} `{usr}`")
-                               .AddField("Id", usr.Id.ToString())
-                               .AddField(GetText(logChannel.Guild, strs.joined_server),
-                                   $"{usr.JoinedAt?.ToString("dd.MM.yyyy HH:mm") ?? "?"}",
-                                   true)
-                               .AddField(GetText(logChannel.Guild, strs.joined_discord),
-                                   $"{usr.CreatedAt:dd.MM.yyyy HH:mm}",
-                                   true)
-                               .WithFooter(CurrentTime(usr.Guild));
+                    .WithOkColor()
+                    .WithTitle("✅ " + GetText(logChannel.Guild, strs.user_joined))
+                    .WithDescription($"{usr.Mention} `{usr}`")
+                    .AddField("Id", usr.Id.ToString())
+                    .AddField(GetText(logChannel.Guild, strs.joined_server),
+                        $"{usr.JoinedAt?.ToString("dd.MM.yyyy HH:mm") ?? "?"}",
+                        true)
+                    .AddField(GetText(logChannel.Guild, strs.joined_discord),
+                        $"{usr.CreatedAt:dd.MM.yyyy HH:mm}",
+                        true)
+                    .WithFooter(CurrentTime(usr.Guild));

                if (Uri.IsWellFormedUriString(usr.GetAvatarUrl(), UriKind.Absolute))
                    embed.WithThumbnailUrl(usr.GetAvatarUrl());
@@ -1016,11 +1038,11 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                if ((logChannel = await TryGetLogChannel(guild, logSetting, LogType.UserUnbanned)) is null)
                    return;
                var embed = _eb.Create()
-                               .WithOkColor()
-                               .WithTitle("♻️ " + GetText(logChannel.Guild, strs.user_unbanned))
-                               .WithDescription(usr.ToString()!)
-                               .AddField("Id", usr.Id.ToString())
-                               .WithFooter(CurrentTime(guild));
+                    .WithOkColor()
+                    .WithTitle("♻️ " + GetText(logChannel.Guild, strs.user_unbanned))
+                    .WithDescription(usr.ToString()!)
+                    .AddField("Id", usr.Id.ToString())
+                    .WithFooter(CurrentTime(guild));

                if (Uri.IsWellFormedUriString(usr.GetAvatarUrl(), UriKind.Absolute))
                    embed.WithThumbnailUrl(usr.GetAvatarUrl());
@@ -1060,16 +1082,15 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                }
                catch
                {
-                    
                }
-                
+
                var embed = _eb.Create()
-                               .WithOkColor()
-                               .WithTitle("🚫 " + GetText(logChannel.Guild, strs.user_banned))
-                               .WithDescription(usr.ToString()!)
-                               .AddField("Id", usr.Id.ToString())
-                               .AddField("Reason", string.IsNullOrWhiteSpace(reason) ? "-" : reason)
-                               .WithFooter(CurrentTime(guild));
+                    .WithOkColor()
+                    .WithTitle("🚫 " + GetText(logChannel.Guild, strs.user_banned))
+                    .WithDescription(usr.ToString()!)
+                    .AddField("Id", usr.Id.ToString())
+                    .AddField("Reason", string.IsNullOrWhiteSpace(reason) ? "-" : reason)
+                    .WithFooter(CurrentTime(guild));

                var avatarUrl = usr.GetAvatarUrl();

@@ -1115,14 +1136,14 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor

                var resolvedMessage = msg.Resolve(TagHandling.FullName);
                var embed = _eb.Create()
-                               .WithOkColor()
-                               .WithTitle("🗑 "
-                                          + GetText(logChannel.Guild, strs.msg_del(((ITextChannel)msg.Channel).Name)))
-                               .WithDescription(msg.Author.ToString()!)
-                               .AddField(GetText(logChannel.Guild, strs.content),
-                                   string.IsNullOrWhiteSpace(resolvedMessage) ? "-" : resolvedMessage)
-                               .AddField("Id", msg.Id.ToString())
-                               .WithFooter(CurrentTime(channel.Guild));
+                    .WithOkColor()
+                    .WithTitle("🗑 "
+                               + GetText(logChannel.Guild, strs.msg_del(((ITextChannel)msg.Channel).Name)))
+                    .WithDescription(msg.Author.ToString()!)
+                    .AddField(GetText(logChannel.Guild, strs.content),
+                        string.IsNullOrWhiteSpace(resolvedMessage) ? "-" : resolvedMessage)
+                    .AddField("Id", msg.Id.ToString())
+                    .WithFooter(CurrentTime(channel.Guild));
                if (msg.Attachments.Any())
                {
                    embed.AddField(GetText(logChannel.Guild, strs.attachments),
@@ -1175,19 +1196,19 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                    return;

                var embed = _eb.Create()
-                               .WithOkColor()
-                               .WithTitle("📝 "
-                                          + GetText(logChannel.Guild,
-                                              strs.msg_update(((ITextChannel)after.Channel).Name)))
-                               .WithDescription(after.Author.ToString()!)
-                               .AddField(GetText(logChannel.Guild, strs.old_msg),
-                                   string.IsNullOrWhiteSpace(before.Content)
-                                       ? "-"
-                                       : before.Resolve(TagHandling.FullName))
-                               .AddField(GetText(logChannel.Guild, strs.new_msg),
-                                   string.IsNullOrWhiteSpace(after.Content) ? "-" : after.Resolve(TagHandling.FullName))
-                               .AddField("Id", after.Id.ToString())
-                               .WithFooter(CurrentTime(channel.Guild));
+                    .WithOkColor()
+                    .WithTitle("📝 "
+                               + GetText(logChannel.Guild,
+                                   strs.msg_update(((ITextChannel)after.Channel).Name)))
+                    .WithDescription(after.Author.ToString()!)
+                    .AddField(GetText(logChannel.Guild, strs.old_msg),
+                        string.IsNullOrWhiteSpace(before.Content)
+                            ? "-"
+                            : before.Resolve(TagHandling.FullName))
+                    .AddField(GetText(logChannel.Guild, strs.new_msg),
+                        string.IsNullOrWhiteSpace(after.Content) ? "-" : after.Resolve(TagHandling.FullName))
+                    .AddField("Id", after.Id.ToString())
+                    .WithFooter(CurrentTime(channel.Guild));

                await logChannel.EmbedAsync(embed);
            }
@@ -1252,6 +1273,12 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
            case LogType.UserWarned:
                id = logSetting.LogWarnsId;
                break;
+            case LogType.ThreadCreated:
+                id = logSetting.ThreadCreatedId;
+                break;
+            case LogType.ThreadDeleted:
+                id = logSetting.ThreadDeletedId;
+                break;
        }

        if (id is null or 0)
@@ -1330,4 +1357,4 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
        GuildLogSettings.AddOrUpdate(guildId, newLogSetting, (_, _) => newLogSetting);
        uow.SaveChanges();
    }
-}
+}
--- a/src/NadekoBot/Modules/Administration/ServerLog/ServerLogCommands.cs
+++ b/src/NadekoBot/Modules/Administration/ServerLog/ServerLogCommands.cs
@@ -143,6 +143,12 @@ public partial class Administration
                    return l.LogVoicePresenceTTSId;
                case LogType.UserMuted:
                    return l.UserMutedId;
+                case LogType.UserWarned:
+                    return l.LogWarnsId;
+                case LogType.ThreadDeleted:
+                    return l.ThreadDeletedId;
+                case LogType.ThreadCreated:
+                    return l.ThreadCreatedId;
                default:
                    return null;
            }
--- a/src/NadekoBot/Modules/Administration/UserPunish/UserPunishCommands.cs
+++ b/src/NadekoBot/Modules/Administration/UserPunish/UserPunishCommands.cs
@@ -402,12 +402,21 @@ public partial class Administration
        [UserPerm(GuildPerm.BanMembers)]
        [BotPerm(GuildPerm.BanMembers)]
        [Priority(1)]
-        public async Task Ban(StoopidTime time, IUser user, [Leftover] string msg = null)
+        public Task Ban(StoopidTime time, IUser user, [Leftover] string msg = null)
+            => Ban(time, user.Id, msg);
+        
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        [UserPerm(GuildPerm.BanMembers)]
+        [BotPerm(GuildPerm.BanMembers)]
+        [Priority(0)]
+        public async Task Ban(StoopidTime time, ulong userId, [Leftover] string msg = null)
        {
            if (time.Time > TimeSpan.FromDays(49))
                return;

-            var guildUser = await ((DiscordSocketClient)Context.Client).Rest.GetGuildUserAsync(ctx.Guild.Id, user.Id);
+            var guildUser = await ((DiscordSocketClient)Context.Client).Rest.GetGuildUserAsync(ctx.Guild.Id, userId);
+            

            if (guildUser is not null && !await CheckRoleHierarchy(guildUser))
                return;
@@ -429,13 +438,14 @@ public partial class Administration
                }
            }

+            var user = await ctx.Client.GetUserAsync(userId);
            var banPrune = await _service.GetBanPruneAsync(ctx.Guild.Id) ?? 7;
-            await _mute.TimedBan(ctx.Guild, user, time.Time, (ctx.User + " | " + msg).TrimTo(512), banPrune);
+            await _mute.TimedBan(ctx.Guild, userId, time.Time, (ctx.User + " | " + msg).TrimTo(512), banPrune);
            var toSend = _eb.Create()
                            .WithOkColor()
                            .WithTitle("⛔️ " + GetText(strs.banned_user))
-                            .AddField(GetText(strs.username), user.ToString(), true)
-                            .AddField("ID", user.Id.ToString(), true)
+                            .AddField(GetText(strs.username),  user?.ToString() ?? userId.ToString(), true)
+                            .AddField("ID", userId.ToString(), true)
                            .AddField(GetText(strs.duration),
                                time.Time.Humanize(3, minUnit: TimeUnit.Minute, culture: Culture),
                                true);
--- a/src/NadekoBot/Modules/Administration/UserPunish/UserPunishService.cs
+++ b/src/NadekoBot/Modules/Administration/UserPunish/UserPunishService.cs
@@ -157,7 +157,7 @@ public class UserPunishService : INService, IReadyExecutor
                if (minutes == 0)
                    await guild.AddBanAsync(user, reason: reason, pruneDays: banPrune);
                else
-                    await _mute.TimedBan(user.Guild, user, TimeSpan.FromMinutes(minutes), reason, banPrune);
+                    await _mute.TimedBan(user.Guild, user.Id, TimeSpan.FromMinutes(minutes), reason, banPrune);
                break;
            case PunishmentAction.Softban:
                banPrune = await GetBanPruneAsync(user.GuildId) ?? 7;
--- a/src/NadekoBot/Modules/Expressions/NadekoExpressionsService.cs
+++ b/src/NadekoBot/Modules/Expressions/NadekoExpressionsService.cs
@@ -34,14 +34,14 @@ public sealed class NadekoExpressionsService : IExecOnMessage, IReadyExecutor
 ";

    private static readonly ISerializer _exportSerializer = new SerializerBuilder()
-                                                            .WithEventEmitter(args
-                                                                => new MultilineScalarFlowStyleEmitter(args))
-                                                            .WithNamingConvention(CamelCaseNamingConvention.Instance)
-                                                            .WithIndentedSequences()
-                                                            .ConfigureDefaultValuesHandling(DefaultValuesHandling
-                                                                .OmitDefaults)
-                                                            .DisableAliases()
-                                                            .Build();
+        .WithEventEmitter(args
+            => new MultilineScalarFlowStyleEmitter(args))
+        .WithNamingConvention(CamelCaseNamingConvention.Instance)
+        .WithIndentedSequences()
+        .ConfigureDefaultValuesHandling(DefaultValuesHandling
+            .OmitDefaults)
+        .DisableAliases()
+        .Build();

    public int Priority
        => 0;
@@ -57,8 +57,8 @@ public sealed class NadekoExpressionsService : IExecOnMessage, IReadyExecutor
    // 1. expressions are almost never added (compared to how many times they are being looped through)
    // 2. only need write locks for this as we'll rebuild+replace the array on every edit
    // 3. there's never many of them (at most a thousand, usually < 100)
-    private NadekoExpression[] globalExpressions;
-    private ConcurrentDictionary<ulong, NadekoExpression[]> newguildExpressions;
+    private NadekoExpression[] globalExpressions = Array.Empty<NadekoExpression>();
+    private ConcurrentDictionary<ulong, NadekoExpression[]> newguildExpressions = new();

    private readonly DbService _db;
    private readonly DiscordSocketClient _client;
@@ -112,20 +112,20 @@ public sealed class NadekoExpressionsService : IExecOnMessage, IReadyExecutor
    {
        await using var uow = _db.GetDbContext();
        var guildItems = await uow.Expressions.AsNoTracking()
-                                  .Where(x => allGuildIds.Contains(x.GuildId.Value))
-                                  .ToListAsync();
+            .Where(x => allGuildIds.Contains(x.GuildId.Value))
+            .ToListAsync();

        newguildExpressions = guildItems.GroupBy(k => k.GuildId!.Value)
-                                      .ToDictionary(g => g.Key,
-                                          g => g.Select(x =>
-                                                {
-                                                    x.Trigger = x.Trigger.Replace(MENTION_PH, _bot.Mention);
-                                                    return x;
-                                                })
-                                                .ToArray())
-                                      .ToConcurrent();
+            .ToDictionary(g => g.Key,
+                g => g.Select(x =>
+                    {
+                        x.Trigger = x.Trigger.Replace(MENTION_PH, _bot.Mention);
+                        return x;
+                    })
+                    .ToArray())
+            .ToConcurrent();

-        _disabledGlobalExpressionGuilds = new (await uow.GuildConfigs
+        _disabledGlobalExpressionGuilds = new(await uow.GuildConfigs
            .Where(x => x.DisableGlobalExpressions)
            .Select(x => x.GuildId)
            .ToListAsyncLinqToDB());
@@ -133,14 +133,14 @@ public sealed class NadekoExpressionsService : IExecOnMessage, IReadyExecutor
        lock (_gexprWriteLock)
        {
            var globalItems = uow.Expressions.AsNoTracking()
-                                 .Where(x => x.GuildId == null || x.GuildId == 0)
-                                 .AsEnumerable()
-                                 .Select(x =>
-                                 {
-                                     x.Trigger = x.Trigger.Replace(MENTION_PH, _bot.Mention);
-                                     return x;
-                                 })
-                                 .ToArray();
+                .Where(x => x.GuildId == null || x.GuildId == 0)
+                .AsEnumerable()
+                .Select(x =>
+                {
+                    x.Trigger = x.Trigger.Replace(MENTION_PH, _bot.Mention);
+                    return x;
+                })
+                .ToArray();

            globalExpressions = globalItems;
        }
@@ -167,7 +167,7 @@ public sealed class NadekoExpressionsService : IExecOnMessage, IReadyExecutor

        if (_disabledGlobalExpressionGuilds.Contains(channel.Guild.Id))
            return null;
-        
+
        var localGrs = globalExpressions;

        return MatchExpressions(content, localGrs);
@@ -466,7 +466,7 @@ public sealed class NadekoExpressionsService : IExecOnMessage, IReadyExecutor
        await using (var uow = _db.GetDbContext())
        {
            expr = uow.Expressions.GetById(id);
-            
+
            if (expr is null || expr.GuildId != guildId)
                return (false, false);
            if (field == ExprField.AutoDelete)
@@ -509,9 +509,25 @@ public sealed class NadekoExpressionsService : IExecOnMessage, IReadyExecutor

    public bool ExpressionExists(ulong? guildId, string input)
    {
-        using var uow = _db.GetDbContext();
-        var expr = uow.Expressions.GetByGuildIdAndInput(guildId, input);
-        return expr is not null;
+        input = input.ToLowerInvariant();
+
+        var gexprs = globalExpressions;
+        foreach (var t in gexprs)
+        {
+            if (t.Trigger == input)
+                return true;
+        }
+
+        if (guildId is ulong gid && newguildExpressions.TryGetValue(gid, out var guildExprs))
+        {
+            foreach (var t in guildExprs)
+            {
+                if (t.Trigger == input)
+                    return true;
+            }
+        }
+
+        return false;
    }

    public string ExportExpressions(ulong? guildId)
@@ -542,17 +558,17 @@ public sealed class NadekoExpressionsService : IExecOnMessage, IReadyExecutor
        {
            var trigger = entry.Key;
            await uow.Expressions.AddRangeAsync(entry.Value.Where(expr => !string.IsNullOrWhiteSpace(expr.Res))
-                                                     .Select(expr => new NadekoExpression
-                                                     {
-                                                         GuildId = guildId,
-                                                         Response = expr.Res,
-                                                         Reactions = expr.React?.Join("@@@"),
-                                                         Trigger = trigger,
-                                                         AllowTarget = expr.At,
-                                                         ContainsAnywhere = expr.Ca,
-                                                         DmResponse = expr.Dm,
-                                                         AutoDeleteTrigger = expr.Ad
-                                                     }));
+                .Select(expr => new NadekoExpression
+                {
+                    GuildId = guildId,
+                    Response = expr.Res,
+                    Reactions = expr.React?.Join("@@@"),
+                    Trigger = trigger,
+                    AllowTarget = expr.At,
+                    ContainsAnywhere = expr.Ca,
+                    DmResponse = expr.Dm,
+                    AutoDeleteTrigger = expr.Ad
+                }));
        }

        await uow.SaveChangesAsync();
@@ -725,12 +741,12 @@ public sealed class NadekoExpressionsService : IExecOnMessage, IReadyExecutor
        var gc = ctx.GuildConfigsForId(guildId, set => set);
        var toReturn = gc.DisableGlobalExpressions = !gc.DisableGlobalExpressions;
        await ctx.SaveChangesAsync();
-        
+
        if (toReturn)
            _disabledGlobalExpressionGuilds.Add(guildId);
        else
            _disabledGlobalExpressionGuilds.TryRemove(guildId);
-        
+
        return toReturn;
    }
 }
--- a/src/NadekoBot/Modules/Gambling/Bank/BankCommands.cs
+++ b/src/NadekoBot/Modules/Gambling/Bank/BankCommands.cs
@@ -77,28 +77,24 @@ public partial class Gambling
        {
            if (await _bank.TakeAsync(userId, amount))
            {
-                await ReplyErrorLocalizedAsync(strs.take_fail(N(amount),
-                    _client.GetUser(userId)?.ToString()
-                    ?? userId.ToString(),
-                    CurrencySign));
+                await ctx.OkAsync();
                return;
            }
-            
-            await ctx.OkAsync();
+
+            await ReplyErrorLocalizedAsync(strs.take_fail(N(amount),
+                _client.GetUser(userId)?.ToString()
+                ?? userId.ToString(),
+                CurrencySign));
        }
        
        private async Task BankAwardInternalAsync(long amount, ulong userId)
        {
            if (await _bank.AwardAsync(userId, amount))
            {
-                await ReplyErrorLocalizedAsync(strs.take_fail(N(amount),
-                    _client.GetUser(userId)?.ToString()
-                    ?? userId.ToString(),
-                    CurrencySign));
+                await ctx.OkAsync();
                return;
            }
-            
-            await ctx.OkAsync();
+
        }

        [Cmd]
--- a/src/NadekoBot/Modules/Gambling/Gambling.cs
+++ b/src/NadekoBot/Modules/Gambling/Gambling.cs
@@ -840,7 +840,7 @@ public partial class Gambling : GamblingModule<GamblingService>
        else if (result.Result == RpsResultType.Win)
        {
            if ((long)result.Won > 0)
-                embed.AddField(GetText(strs.won), N(amount.Value));
+                embed.AddField(GetText(strs.won), N((long)result.Won));

            msg = GetText(strs.rps_win(ctx.User.Mention,
                GetRpsPick(pick),
--- a/src/NadekoBot/Modules/Gambling/Waifus/WaifuClaimCommands.cs
+++ b/src/NadekoBot/Modules/Gambling/Waifus/WaifuClaimCommands.cs
@@ -250,8 +250,9 @@ public partial class Gambling
                ? "-"
                : string.Join("\n",
                    itemList.Where(x => waifuItems.TryGetValue(x.ItemEmoji, out _))
-                        .OrderBy(x => waifuItems[x.ItemEmoji].Price)
+                        .OrderByDescending(x => waifuItems[x.ItemEmoji].Price)
                        .GroupBy(x => x.ItemEmoji)
+                        .Take(60)
                        .Select(x => $"{x.Key} x{x.Count(),-3}")
                        .Chunk(2)
                        .Select(x => string.Join(" ", x)));
@@ -264,7 +265,10 @@ public partial class Gambling

            var fansList = await _service.GetFansNames(wi.WaifuId);
            var fansStr = fansList
-                .Select((x) => claimsNames.Contains(x) ? $"{x} 💞" : x).Join('\n');
+                .Shuffle()
+                .Take(30)
+                .Select((x) => claimsNames.Contains(x) ? $"{x} 💞" : x)
+                .Join('\n');

            
            if (string.IsNullOrWhiteSpace(fansStr))
@@ -350,4 +354,4 @@ public partial class Gambling
                await ReplyErrorLocalizedAsync(strs.not_enough(CurrencySign));
        }
    }
-}
+}
--- a/src/NadekoBot/Modules/Games/ChatterBot/ChatterbotService.cs
+++ b/src/NadekoBot/Modules/Games/ChatterBot/ChatterbotService.cs
@@ -1,6 +1,7 @@
 #nullable disable
 using NadekoBot.Common.ModuleBehaviors;
 using NadekoBot.Db.Models;
+using NadekoBot.Modules.Games.Common;
 using NadekoBot.Modules.Games.Common.ChatterBot;
 using NadekoBot.Modules.Permissions;
 using NadekoBot.Modules.Permissions.Common;
@@ -27,6 +28,7 @@ public class ChatterBotService : IExecOnMessage
    private readonly IHttpClientFactory _httpFactory;
    private readonly IPatronageService _ps;
    private readonly CmdCdService _ccs;
+    private readonly GamesConfigService _gcs;

    public ChatterBotService(
        DiscordSocketClient client,
@@ -38,7 +40,8 @@ public class ChatterBotService : IExecOnMessage
        IBotCredentials creds,
        IEmbedBuilderService eb,
        IPatronageService ps,
-        CmdCdService cmdCdService)
+        CmdCdService cmdCdService,
+        GamesConfigService gcs)
    {
        _client = client;
        _perms = perms;
@@ -49,6 +52,7 @@ public class ChatterBotService : IExecOnMessage
        _httpFactory = factory;
        _ps = ps;
        _ccs = cmdCdService;
+        _gcs = gcs;

        _flKey = new FeatureLimitKey()
        {
@@ -64,11 +68,30 @@ public class ChatterBotService : IExecOnMessage

    public IChatterBotSession CreateSession()
    {
-        if (!string.IsNullOrWhiteSpace(_creds.CleverbotApiKey))
-            return new OfficialCleverbotSession(_creds.CleverbotApiKey, _httpFactory);
+        switch (_gcs.Data.ChatBot)
+        {
+            case ChatBotImplementation.Cleverbot:
+                if (!string.IsNullOrWhiteSpace(_creds.CleverbotApiKey))
+                    return new OfficialCleverbotSession(_creds.CleverbotApiKey, _httpFactory);

-        Log.Information("Cleverbot will not work as the api key is missing.");
-        return null;
+                Log.Information("Cleverbot will not work as the api key is missing.");
+                return null;
+            case ChatBotImplementation.Gpt3:
+                if (!string.IsNullOrWhiteSpace(_creds.Gpt3ApiKey))
+                    return new OfficialGpt3Session(_creds.Gpt3ApiKey,
+                        _gcs.Data.ChatGpt.ModelName,
+                        _gcs.Data.ChatGpt.ChatHistory,
+                        _gcs.Data.ChatGpt.MaxTokens,
+                        _gcs.Data.ChatGpt.MinTokens,
+                        _gcs.Data.ChatGpt.PersonalityPrompt,
+                        _client.CurrentUser.Username,
+                        _httpFactory);
+
+                Log.Information("Gpt3 will not work as the api key is missing.");
+                return null;
+            default:
+                return null;
+        }
    }

    public string PrepareMessage(IUserMessage msg, out IChatterBotSession cleverbot)
@@ -102,7 +125,7 @@ public class ChatterBotService : IExecOnMessage
    {
        if (guild is not SocketGuild sg)
            return false;
-        
+
        try
        {
            var message = PrepareMessage(usrMsg, out var cbs);
@@ -147,7 +170,7 @@ public class ChatterBotService : IExecOnMessage
                uint? monthly = quota.Quota is int mVal and >= 0
                    ? (uint)mVal
                    : null;
-                
+
                var maybeLimit = await _ps.TryIncrementQuotaCounterAsync(sg.OwnerId,
                    sg.OwnerId == usrMsg.Author.Id,
                    FeatureType.Limit,
@@ -155,7 +178,7 @@ public class ChatterBotService : IExecOnMessage
                    null,
                    daily,
                    monthly);
-                
+
                if (maybeLimit.TryPickT1(out var ql, out var counters))
                {
                    if (ql.Quota == 0)
@@ -166,7 +189,7 @@ public class ChatterBotService : IExecOnMessage
                            "In order to use the cleverbot feature, the owner of this server should be [Patron Tier X](https://patreon.com/join/nadekobot) on patreon.",
                            footer:
                            "You may disable the cleverbot feature, and this message via '.cleverbot' command");
-                        
+
                        return true;
                    }

@@ -174,18 +197,18 @@ public class ChatterBotService : IExecOnMessage
                        null!,
                        $"You've reached your quota limit of **{ql.Quota}** responses {ql.QuotaPeriod.ToFullName()} for the cleverbot feature.",
                        footer: "You may wait for the quota reset or .");
-                    
+
                    return true;
                }
            }

            _ = channel.TriggerTypingAsync();
-            var response = await cbs.Think(message);
+            var response = await cbs.Think(message, usrMsg.Author.ToString());
            await channel.SendConfirmAsync(_eb,
                title: null,
                response.SanitizeMentions(true)
                // , footer: counter > 0 ? counter.ToString() : null
-                );
+            );

            Log.Information(@"CleverBot Executed
 Server: {GuildName} [{GuildId}]
--- a/src/NadekoBot/Modules/Games/ChatterBot/_Common/ChatterBotResponse.cs
+++ b/src/NadekoBot/Modules/Games/ChatterBot/_Common/ChatterBotResponse.cs
@@ -1,8 +0,0 @@
-#nullable disable
-namespace NadekoBot.Modules.Games.Common.ChatterBot;
-
-public class ChatterBotResponse
-{
-    public string Convo_id { get; set; }
-    public string BotSay { get; set; }
-}
--- a/src/NadekoBot/Modules/Games/ChatterBot/_Common/Gpt3Response.cs
+++ b/src/NadekoBot/Modules/Games/ChatterBot/_Common/Gpt3Response.cs
@@ -0,0 +1,46 @@
+#nullable disable
+using System.Text.Json.Serialization;
+
+namespace NadekoBot.Modules.Games.Common.ChatterBot;
+
+public class Gpt3Response
+{
+    [JsonPropertyName("choices")]
+    public Choice[] Choices { get; set; }
+}
+
+public class Choice
+{
+    [JsonPropertyName("message")]
+    public Message Message { get; init; }
+}
+
+public class Message {
+    [JsonPropertyName("content")]
+    public string Content { get; init; }
+}
+
+public class Gpt3ApiRequest
+{
+    [JsonPropertyName("model")]
+    public string Model { get; init; }
+
+    [JsonPropertyName("messages")]
+    public List<GPTMessage> Messages { get; init; }
+
+    [JsonPropertyName("temperature")]
+    public int Temperature { get; init; }
+
+    [JsonPropertyName("max_tokens")]
+    public int MaxTokens { get; init; }
+}
+
+public class GPTMessage
+{
+    [JsonPropertyName("role")]
+    public string Role {get; init;}
+    [JsonPropertyName("content")]
+    public string Content {get; init;}
+    [JsonPropertyName("name")]
+    public string Name {get; init;}
+}
--- a/src/NadekoBot/Modules/Games/ChatterBot/_Common/IChatterBotSession.cs
+++ b/src/NadekoBot/Modules/Games/ChatterBot/_Common/IChatterBotSession.cs
@@ -3,5 +3,5 @@ namespace NadekoBot.Modules.Games.Common.ChatterBot;

 public interface IChatterBotSession
 {
-    Task<string> Think(string input);
+    Task<string> Think(string input, string username);
 }
--- a/src/NadekoBot/Modules/Games/ChatterBot/_Common/OfficialCleverbotSession.cs
+++ b/src/NadekoBot/Modules/Games/ChatterBot/_Common/OfficialCleverbotSession.cs
@@ -18,7 +18,7 @@ public class OfficialCleverbotSession : IChatterBotSession
        _httpFactory = factory;
    }

-    public async Task<string> Think(string input)
+    public async Task<string> Think(string input, string username)
    {
        using var http = _httpFactory.CreateClient();
        var dataString = await http.GetStringAsync(string.Format(QueryString, input, cs ?? ""));
--- a/src/NadekoBot/Modules/Games/ChatterBot/_Common/OfficialGpt3Session.cs
+++ b/src/NadekoBot/Modules/Games/ChatterBot/_Common/OfficialGpt3Session.cs
@@ -0,0 +1,107 @@
+#nullable disable
+using Newtonsoft.Json;
+using System.Net.Http.Json;
+using SharpToken;
+using Antlr.Runtime;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace NadekoBot.Modules.Games.Common.ChatterBot;
+
+public class OfficialGpt3Session : IChatterBotSession
+{
+    private string Uri
+        => $"https://api.openai.com/v1/chat/completions";
+
+    private readonly string _apiKey;
+    private readonly string _model;
+    private readonly int _maxHistory;
+    private readonly int _maxTokens;
+    private readonly int _minTokens;
+    private readonly string _nadekoUsername;
+    private readonly GptEncoding _encoding;
+    private List<GPTMessage> messages =  new();
+    private readonly IHttpClientFactory _httpFactory;
+
+    
+
+    public OfficialGpt3Session(
+        string apiKey,
+        ChatGptModel model,
+        int chatHistory,
+        int maxTokens,
+        int minTokens,
+        string personality,
+        string nadekoUsername,
+        IHttpClientFactory factory)
+    {
+        _apiKey = apiKey;
+        _httpFactory = factory;
+        switch (model)
+        {
+            case ChatGptModel.Gpt35Turbo:
+                _model = "gpt-3.5-turbo";
+                break;
+            case ChatGptModel.Gpt4:
+                _model = "gpt-4";
+                break;
+            case ChatGptModel.Gpt432k:
+                _model = "gpt-4-32k";
+                break;
+        }
+        _maxHistory = chatHistory;
+        _maxTokens = maxTokens;
+        _minTokens = minTokens;
+        _nadekoUsername = nadekoUsername;
+        _encoding = GptEncoding.GetEncodingForModel(_model);
+        messages.Add(new GPTMessage(){Role = "user", Content = personality, Name = _nadekoUsername});
+    }
+
+    public async Task<string> Think(string input, string username)
+    {
+        messages.Add(new GPTMessage(){Role = "user", Content = input, Name = username});
+        while(messages.Count > _maxHistory + 2){
+            messages.RemoveAt(1);
+        }
+        int tokensUsed = 0;
+        foreach(GPTMessage message in messages){
+            tokensUsed += _encoding.Encode(message.Content).Count;
+        }
+        tokensUsed *= 2; //Unsure why this is the case, but the token count chatgpt reports back is double what I calculate.
+        //check if we have the minimum number of tokens available to use. Remove messages until we have enough, otherwise exit out and inform the user why.
+        while(_maxTokens - tokensUsed <= _minTokens){
+            if(messages.Count > 2){
+                int tokens = _encoding.Encode(messages[1].Content).Count * 2;
+                tokensUsed -= tokens;
+                messages.RemoveAt(1);
+            }
+            else{
+                return "Token count exceeded, please increase the number of tokens in the bot config and restart.";
+            }
+        }
+        using var http = _httpFactory.CreateClient();
+        http.DefaultRequestHeaders.Authorization = new("Bearer", _apiKey);
+        var data = await http.PostAsJsonAsync(Uri, new Gpt3ApiRequest()
+        {
+            Model = _model,
+            Messages = messages,
+            MaxTokens = _maxTokens - tokensUsed,
+            Temperature = 1,
+        });
+        var dataString = await data.Content.ReadAsStringAsync();
+        try
+        {
+            var response = JsonConvert.DeserializeObject<Gpt3Response>(dataString);
+            string message = response?.Choices[0]?.Message?.Content;
+            //Can't rely on the return to except, now that we need to add it to the messages list.
+            _ = message ?? throw new ArgumentNullException(nameof(message));
+            messages.Add(new GPTMessage(){Role = "assistant", Content = message, Name = _nadekoUsername});
+            return message;
+        }
+        catch
+        {
+            Log.Warning("Unexpected GPT-3 response received: {ResponseString}", dataString);
+            return null;
+        }
+    }
+}
+
--- a/src/NadekoBot/Modules/Games/GamesConfig.cs
+++ b/src/NadekoBot/Modules/Games/GamesConfig.cs
@@ -8,7 +8,7 @@ namespace NadekoBot.Modules.Games.Common;
 public sealed partial class GamesConfig : ICloneable<GamesConfig>
 {
    [Comment("DO NOT CHANGE")]
-    public int Version { get; set; }
+    public int Version { get; set; } = 3;

    [Comment("Hangman related settings (.hangman command)")]
    public HangmanConfig Hangman { get; set; } = new()
@@ -95,6 +95,35 @@ public sealed partial class GamesConfig : ICloneable<GamesConfig>
            Name = "Unicorn"
        }
    };
+
+    [Comment(@"Which chatbot API should bot use.
+'cleverbot' - bot will use Cleverbot API. 
+'gpt3' - bot will use GPT-3 API")]
+    public ChatBotImplementation ChatBot { get; set; } = ChatBotImplementation.Gpt3;
+
+    public ChatGptConfig ChatGpt { get; set; } = new();
+}
+
+[Cloneable]
+public sealed partial class ChatGptConfig
+{
+    [Comment(@"Which GPT-3 Model should bot use.
+    gpt35turbo - cheapest
+    gpt4 - 30x more expensive, higher quality
+    gp432k - same model as above, but with a 32k token limit")]
+    public ChatGptModel ModelName { get; set; } = ChatGptModel.Gpt35Turbo;
+
+    [Comment(@"How should the chat bot behave, what's its personality? (Usage of this counts towards the max tokens)")]
+    public string PersonalityPrompt { get; set; } = "You are a chat bot willing to have a conversation with anyone about anything.";
+
+    [Comment(@"The maximum number of messages in a conversation that can be remembered. (This will increase the number of tokens used)")]
+    public int ChatHistory { get; set; } = 5;
+
+    [Comment(@"The maximum number of tokens to use per GPT-3 API call")]
+    public int MaxTokens { get; set; } = 100;
+
+    [Comment(@"The minimum number of tokens to use per GPT-3 API call, such that chat history is removed to make room.")]
+    public int MinTokens { get; set; } = 30;
 }

 [Cloneable]
@@ -120,4 +149,17 @@ public sealed partial class RaceAnimal
 {
    public string Icon { get; set; }
    public string Name { get; set; }
+}
+
+public enum ChatBotImplementation
+{
+    Cleverbot,
+    Gpt3
+}
+
+public enum ChatGptModel
+{
+    Gpt35Turbo,
+    Gpt4,
+    Gpt432k
 }
--- a/src/NadekoBot/Modules/Games/GamesConfigService.cs
+++ b/src/NadekoBot/Modules/Games/GamesConfigService.cs
@@ -28,6 +28,33 @@ public sealed class GamesConfigService : ConfigServiceBase<GamesConfig>
            long.TryParse,
            ConfigPrinters.ToString,
            val => val >= 0);
+        AddParsedProp("chatbot",
+            gs => gs.ChatBot,
+            ConfigParsers.InsensitiveEnum,
+            ConfigPrinters.ToString);
+        AddParsedProp("gpt.modelName",
+            gs => gs.ChatGpt.ModelName,
+            ConfigParsers.InsensitiveEnum,
+            ConfigPrinters.ToString);
+        AddParsedProp("gpt.personality",
+            gs => gs.ChatGpt.PersonalityPrompt,
+            ConfigParsers.String,
+            ConfigPrinters.ToString);
+        AddParsedProp("gpt.chathistory",
+            gs => gs.ChatGpt.ChatHistory,
+            int.TryParse,
+            ConfigPrinters.ToString,
+            val => val > 0);
+        AddParsedProp("gpt.max_tokens",
+            gs => gs.ChatGpt.MaxTokens,
+            int.TryParse,
+            ConfigPrinters.ToString,
+            val => val > 0);
+        AddParsedProp("gpt.min_tokens",
+            gs => gs.ChatGpt.MinTokens,
+            int.TryParse,
+            ConfigPrinters.ToString,
+            val => val > 0);

        Migrate();
    }
@@ -45,5 +72,23 @@ public sealed class GamesConfigService : ConfigServiceBase<GamesConfig>
                };
            });
        }
+
+        if (data.Version < 2)
+        {
+            ModifyConfig(c =>
+            {
+                c.Version = 2;
+                c.ChatBot = ChatBotImplementation.Cleverbot;
+            });
+        }
+
+        if (data.Version < 3)
+        {
+            ModifyConfig(c =>
+            {
+                c.Version = 3;
+                c.ChatGpt.ModelName = ChatGptModel.Gpt35Turbo;
+            });
+        }
    }
 }
--- a/src/NadekoBot/Modules/Games/GamesService.cs
+++ b/src/NadekoBot/Modules/Games/GamesService.cs
@@ -23,7 +23,6 @@ public class GamesService : INService, IReadyExecutor

    //channelId, game
    public ConcurrentDictionary<ulong, AcrophobiaGame> AcrophobiaGames { get; } = new();
-    public ConcurrentDictionary<ulong, TriviaGame> RunningTrivias { get; } = new();
    public Dictionary<ulong, TicTacToe> TicTacToeGames { get; } = new();
    public ConcurrentDictionary<ulong, TypingGame> RunningContests { get; } = new();
    public ConcurrentDictionary<ulong, NunchiGame> NunchiGames { get; } = new();
--- a/src/NadekoBot/Modules/Games/Trivia/Games.cs
+++ b/src/NadekoBot/Modules/Games/Trivia/Games.cs
@@ -36,7 +36,7 @@ public partial class Games
            var (opts, _) = OptionsParser.ParseFrom(new TriviaOptions(), args);

            var config = _gamesConfig.Data;
-            if (config.Trivia.MinimumWinReq > 0 && config.Trivia.MinimumWinReq > opts.WinRequirement)
+            if (opts.WinRequirement != 0 && config.Trivia.MinimumWinReq > 0 && config.Trivia.MinimumWinReq > opts.WinRequirement)
                return;

            var trivia = new TriviaGame(opts, _cache);
--- a/src/NadekoBot/Modules/Games/Trivia/TriviaGame.cs
+++ b/src/NadekoBot/Modules/Games/Trivia/TriviaGame.cs
@@ -157,7 +157,7 @@ public sealed class TriviaGame

                        var isWin = false;
                        // if user won the game, tell the game to stop
-                        if (val >= _opts.WinRequirement)
+                        if (_opts.WinRequirement != 0 && val >= _opts.WinRequirement)
                        {
                            _isStopped = true;
                            isWin = true;
--- a/src/NadekoBot/Modules/Music/_Common/Resolvers/YtdlYoutubeResolver.cs
+++ b/src/NadekoBot/Modules/Music/_Common/Resolvers/YtdlYoutubeResolver.cs
@@ -1,5 +1,6 @@
 using System.Globalization;
 using System.Text.RegularExpressions;
+using NadekoBot.Modules.Searches;

 namespace NadekoBot.Modules.Music;

@@ -27,10 +28,11 @@ public sealed class YtdlYoutubeResolver : IYoutubeResolver

    private readonly IGoogleApiService _google;

-    public YtdlYoutubeResolver(ITrackCacher trackCacher, IGoogleApiService google)
+    public YtdlYoutubeResolver(ITrackCacher trackCacher, IGoogleApiService google, SearchesConfigService scs)
    {
        _trackCacher = trackCacher;
        _google = google;
+        

        _ytdlPlaylistOperation = new("-4 "
                                     + "--geo-bypass "
@@ -44,7 +46,7 @@ public sealed class YtdlYoutubeResolver : IYoutubeResolver
                                     + "--no-check-certificate "
                                     + "-i "
                                     + "--yes-playlist "
-                                     + "-- \"{0}\"");
+                                     + "-- \"{0}\"", scs.Data.YtProvider != YoutubeSearcher.Ytdl);

        _ytdlIdOperation = new("-4 "
                               + "--geo-bypass "
@@ -56,7 +58,7 @@ public sealed class YtdlYoutubeResolver : IYoutubeResolver
                               + "--get-thumbnail "
                               + "--get-duration "
                               + "--no-check-certificate "
-                               + "-- \"{0}\"");
+                               + "-- \"{0}\"", scs.Data.YtProvider != YoutubeSearcher.Ytdl);

        _ytdlSearchOperation = new("-4 "
                                   + "--geo-bypass "
@@ -69,7 +71,7 @@ public sealed class YtdlYoutubeResolver : IYoutubeResolver
                                   + "--get-duration "
                                   + "--no-check-certificate "
                                   + "--default-search "
-                                   + "\"ytsearch:\" -- \"{0}\"");
+                                   + "\"ytsearch:\" -- \"{0}\"", scs.Data.YtProvider != YoutubeSearcher.Ytdl);
    }

    private YtTrackData ResolveYtdlData(string ytdlOutputString)
--- a/src/NadekoBot/Modules/Nsfw/ISearchImagesService.cs
+++ b/src/NadekoBot/Modules/Nsfw/ISearchImagesService.cs
@@ -22,6 +22,6 @@ public interface ISearchImagesService
    ValueTask<bool> ToggleBlacklistTag(ulong guildId, string tag);
    ValueTask<string[]> GetBlacklistedTags(ulong guildId);
    Task<UrlReply> Butts();
-    Task<Gallery> GetNhentaiByIdAsync(uint id);
-    Task<Gallery> GetNhentaiBySearchAsync(string search);
+    // Task<Gallery> GetNhentaiByIdAsync(uint id);
+    // Task<Gallery> GetNhentaiBySearchAsync(string search);
 }
--- a/src/NadekoBot/Modules/Nsfw/Nhentai/INhentaiService.cs
+++ b/src/NadekoBot/Modules/Nsfw/Nhentai/INhentaiService.cs
@@ -1,9 +1,9 @@
-using NadekoBot.Modules.Searches.Common;
-
-namespace NadekoBot.Modules.Nsfw;
-
-public interface INhentaiService
-{
-    Task<Gallery?> GetAsync(uint id);
-    Task<IReadOnlyList<uint>> GetIdsBySearchAsync(string search);
-}
+// using NadekoBot.Modules.Searches.Common;
+//
+// namespace NadekoBot.Modules.Nsfw;
+//
+// public interface INhentaiService
+// {
+//     Task<Gallery?> GetAsync(uint id);
+//     Task<IReadOnlyList<uint>> GetIdsBySearchAsync(string search);
+// }
--- a/src/NadekoBot/Modules/Nsfw/Nhentai/NhentaiScraperService.cs
+++ b/src/NadekoBot/Modules/Nsfw/Nhentai/NhentaiScraperService.cs
@@ -1,115 +1,115 @@
-using AngleSharp.Html.Dom;
-using AngleSharp.Html.Parser;
-using NadekoBot.Modules.Searches.Common;
-
-namespace NadekoBot.Modules.Nsfw;
-
-public sealed class NhentaiScraperService : INhentaiService, INService
-{
-    private readonly IHttpClientFactory _httpFactory;
-
-    private static readonly HtmlParser _htmlParser = new(new()
-    {
-        IsScripting = false,
-        IsEmbedded = false,
-        IsSupportingProcessingInstructions = false,
-        IsKeepingSourceReferences = false,
-        IsNotSupportingFrames = true
-    });
-
-    public NhentaiScraperService(IHttpClientFactory httpFactory)
-    {
-        _httpFactory = httpFactory;
-    }
-
-    private HttpClient GetHttpClient()
-    {
-        var http = _httpFactory.CreateClient();
-        http.DefaultRequestHeaders.Add("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.5060.114 Safari/537.36");
-        http.DefaultRequestHeaders.Add("Cookie", "cf_clearance=I5pR71P4wJkRBFTLFjBndI.GwfKwT.Gx06uS8XNmRJo-1657214595-0-150; csrftoken=WMWRLtsQtBVQYvYkbqXKJHI9T1JwWCdd3tNhoxHn7aHLUYHAqe60XFUKAoWsJtda");
-        return http;
-    }
-    
-    public async Task<Gallery?> GetAsync(uint id)
-    {
-        using var http = GetHttpClient();
-        try
-        {
-            var url = $"https://nhentai.net/g/{id}/";
-            var strRes = await http.GetStringAsync(url);
-            var doc = await _htmlParser.ParseDocumentAsync(strRes);
-
-            var title = doc.QuerySelector("#info .title")?.TextContent;
-            var fullTitle = doc.QuerySelector("meta[itemprop=\"name\"]")?.Attributes["content"]?.Value
-                            ?? title;
-            var thumb = (doc.QuerySelector("#cover a img") as IHtmlImageElement)?.Dataset["src"];
-
-            var tagsElem = doc.QuerySelector("#tags");
-            
-            var pageCount = tagsElem?.QuerySelector("a.tag[href^=\"/search/?q=pages\"] span")?.TextContent;
-            var likes = doc.QuerySelector(".buttons .btn-disabled.btn.tooltip span span")?.TextContent?.Trim('(', ')');
-            var uploadedAt = (tagsElem?.QuerySelector(".tag-container .tags time.nobold") as IHtmlTimeElement)?.DateTime;
-
-            var tags = tagsElem?.QuerySelectorAll(".tag-container .tags > a.tag[href^=\"/tag\"]")
-                .Cast<IHtmlAnchorElement>()
-                .Select(x => new Tag()
-                {
-                    Name = x.QuerySelector("span:first-child")?.TextContent,
-                    Url = $"https://nhentai.net{x.PathName}"
-                })
-                .ToArray();
-
-            if (string.IsNullOrWhiteSpace(fullTitle))
-                return null;
-
-            if (!int.TryParse(pageCount, out var pc))
-                return null;
-
-            if (!int.TryParse(likes, out var lc))
-                return null;
-
-            if (!DateTime.TryParse(uploadedAt, out var ua))
-                return null;
-
-            return new Gallery(id,
-                url,
-                fullTitle,
-                title,
-                thumb,
-                pc,
-                lc,
-                ua,
-                tags);
-        }
-        catch (HttpRequestException)
-        {
-            Log.Warning("Nhentai with id {NhentaiId} not found", id);
-            return null;
-        }
-    }
-
-    public async Task<IReadOnlyList<uint>> GetIdsBySearchAsync(string search)
-    {
-        using var http = GetHttpClient();
-        try
-        {
-            var url = $"https://nhentai.net/search/?q={Uri.EscapeDataString(search)}&sort=popular-today";
-            var strRes = await http.GetStringAsync(url);
-            var doc = await _htmlParser.ParseDocumentAsync(strRes);
-
-            var elems = doc.QuerySelectorAll(".container .gallery a")
-                .Cast<IHtmlAnchorElement>()
-                .Where(x => x.PathName.StartsWith("/g/"))
-                .Select(x => x.PathName[3..^1])
-                .Select(uint.Parse)
-                .ToArray();
-            
-            return elems;
-        }
-        catch (HttpRequestException)
-        {
-            Log.Warning("Nhentai search for {NhentaiSearch} failed", search);
-            return Array.Empty<uint>();
-        }
-    }
-}
+// using AngleSharp.Html.Dom;
+// using AngleSharp.Html.Parser;
+// using NadekoBot.Modules.Searches.Common;
+//
+// namespace NadekoBot.Modules.Nsfw;
+//
+// public sealed class NhentaiScraperService : INhentaiService, INService
+// {
+//     private readonly IHttpClientFactory _httpFactory;
+//
+//     private static readonly HtmlParser _htmlParser = new(new()
+//     {
+//         IsScripting = false,
+//         IsEmbedded = false,
+//         IsSupportingProcessingInstructions = false,
+//         IsKeepingSourceReferences = false,
+//         IsNotSupportingFrames = true
+//     });
+//
+//     public NhentaiScraperService(IHttpClientFactory httpFactory)
+//     {
+//         _httpFactory = httpFactory;
+//     }
+//
+//     private HttpClient GetHttpClient()
+//     {
+//         var http = _httpFactory.CreateClient();
+//         http.DefaultRequestHeaders.Add("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.5060.114 Safari/537.36");
+//         http.DefaultRequestHeaders.Add("Cookie", "cf_clearance=I5pR71P4wJkRBFTLFjBndI.GwfKwT.Gx06uS8XNmRJo-1657214595-0-150; csrftoken=WMWRLtsQtBVQYvYkbqXKJHI9T1JwWCdd3tNhoxHn7aHLUYHAqe60XFUKAoWsJtda");
+//         return http;
+//     }
+//     
+//     public async Task<Gallery?> GetAsync(uint id)
+//     {
+//         using var http = GetHttpClient();
+//         try
+//         {
+//             var url = $"https://nhentai.net/g/{id}/";
+//             var strRes = await http.GetStringAsync(url);
+//             var doc = await _htmlParser.ParseDocumentAsync(strRes);
+//
+//             var title = doc.QuerySelector("#info .title")?.TextContent;
+//             var fullTitle = doc.QuerySelector("meta[itemprop=\"name\"]")?.Attributes["content"]?.Value
+//                             ?? title;
+//             var thumb = (doc.QuerySelector("#cover a img") as IHtmlImageElement)?.Dataset["src"];
+//
+//             var tagsElem = doc.QuerySelector("#tags");
+//             
+//             var pageCount = tagsElem?.QuerySelector("a.tag[href^=\"/search/?q=pages\"] span")?.TextContent;
+//             var likes = doc.QuerySelector(".buttons .btn-disabled.btn.tooltip span span")?.TextContent?.Trim('(', ')');
+//             var uploadedAt = (tagsElem?.QuerySelector(".tag-container .tags time.nobold") as IHtmlTimeElement)?.DateTime;
+//
+//             var tags = tagsElem?.QuerySelectorAll(".tag-container .tags > a.tag[href^=\"/tag\"]")
+//                 .Cast<IHtmlAnchorElement>()
+//                 .Select(x => new Tag()
+//                 {
+//                     Name = x.QuerySelector("span:first-child")?.TextContent,
+//                     Url = $"https://nhentai.net{x.PathName}"
+//                 })
+//                 .ToArray();
+//
+//             if (string.IsNullOrWhiteSpace(fullTitle))
+//                 return null;
+//
+//             if (!int.TryParse(pageCount, out var pc))
+//                 return null;
+//
+//             if (!int.TryParse(likes, out var lc))
+//                 return null;
+//
+//             if (!DateTime.TryParse(uploadedAt, out var ua))
+//                 return null;
+//
+//             return new Gallery(id,
+//                 url,
+//                 fullTitle,
+//                 title,
+//                 thumb,
+//                 pc,
+//                 lc,
+//                 ua,
+//                 tags);
+//         }
+//         catch (HttpRequestException)
+//         {
+//             Log.Warning("Nhentai with id {NhentaiId} not found", id);
+//             return null;
+//         }
+//     }
+//
+//     public async Task<IReadOnlyList<uint>> GetIdsBySearchAsync(string search)
+//     {
+//         using var http = GetHttpClient();
+//         try
+//         {
+//             var url = $"https://nhentai.net/search/?q={Uri.EscapeDataString(search)}&sort=popular-today";
+//             var strRes = await http.GetStringAsync(url);
+//             var doc = await _htmlParser.ParseDocumentAsync(strRes);
+//
+//             var elems = doc.QuerySelectorAll(".container .gallery a")
+//                 .Cast<IHtmlAnchorElement>()
+//                 .Where(x => x.PathName.StartsWith("/g/"))
+//                 .Select(x => x.PathName[3..^1])
+//                 .Select(uint.Parse)
+//                 .ToArray();
+//             
+//             return elems;
+//         }
+//         catch (HttpRequestException)
+//         {
+//             Log.Warning("Nhentai search for {NhentaiSearch} failed", search);
+//             return Array.Empty<uint>();
+//         }
+//     }
+// }
--- a/src/NadekoBot/Modules/Nsfw/Nsfw.cs
+++ b/src/NadekoBot/Modules/Nsfw/Nsfw.cs
@@ -360,67 +360,65 @@ public partial class NSFW : NadekoModule<ISearchImagesService>
        }
    }

-    [Cmd]
-    [RequireContext(ContextType.Guild)]
-    [RequireNsfw(Group = "nsfw_or_dm")]
-    [RequireContext(ContextType.DM, Group = "nsfw_or_dm")]
-    [Priority(1)]
-    public async Task Nhentai(uint id)
-    {
-        var g = await _service.GetNhentaiByIdAsync(id);
-
-        if (g is null)
-        {
-            await ReplyErrorLocalizedAsync(strs.not_found);
-            return;
-        }
-
-        await SendNhentaiGalleryInternalAsync(g);
-    }
-
-    [Cmd]
-    [RequireContext(ContextType.Guild)]
-    [RequireNsfw(Group = "nsfw_or_dm")]
-    [RequireContext(ContextType.DM, Group = "nsfw_or_dm")]
-    [Priority(0)]
-    public async Task Nhentai([Leftover] string query)
-    {
-        var g = await _service.GetNhentaiBySearchAsync(query);
-
-        if (g is null)
-        {
-            await ReplyErrorLocalizedAsync(strs.not_found);
-            return;
-        }
-
-        await SendNhentaiGalleryInternalAsync(g);
-    }
-
-    private async Task SendNhentaiGalleryInternalAsync(Gallery g)
-    {
-        var count = 0;
-        var tagString = g.Tags.Shuffle()
-                         .Select(tag => $"[{tag.Name}]({tag.Url})")
-                         .TakeWhile(tag => (count += tag.Length) < 1000)
-                         .Join(" ");
-
-        var embed = _eb.Create()
-            .WithTitle(g.Title)
-            .WithDescription(g.FullTitle)
-            .WithImageUrl(g.Thumbnail)
-            .WithUrl(g.Url)
-            .AddField(GetText(strs.favorites), g.Likes, true)
-            .AddField(GetText(strs.pages), g.PageCount, true)
-            .AddField(GetText(strs.tags),
-                string.IsNullOrWhiteSpace(tagString)
-                    ? "?"
-                    : tagString,
-                true)
-            .WithFooter(g.UploadedAt.ToString("f"))
-            .WithOkColor();
-
-        await ctx.Channel.EmbedAsync(embed);
-    }
+    // [RequireNsfw(Group = "nsfw_or_dm")]
+    // [RequireContext(ContextType.DM, Group = "nsfw_or_dm")]
+    // [Priority(1)]
+    // public async Task Nhentai(uint id)
+    // {
+    //     var g = await _service.GetNhentaiByIdAsync(id);
+    //
+    //     if (g is null)
+    //     {
+    //         await ReplyErrorLocalizedAsync(strs.not_found);
+    //         return;
+    //     }
+    //
+    //     await SendNhentaiGalleryInternalAsync(g);
+    // }
+    //
+    // [Cmd]
+    // [RequireContext(ContextType.Guild)]
+    // [RequireNsfw(Group = "nsfw_or_dm")]
+    // [RequireContext(ContextType.DM, Group = "nsfw_or_dm")]
+    // [Priority(0)]
+    // public async Task Nhentai([Leftover] string query)
+    // {
+    //     var g = await _service.GetNhentaiBySearchAsync(query);
+    //
+    //     if (g is null)
+    //     {
+    //         await ReplyErrorLocalizedAsync(strs.not_found);
+    //         return;
+    //     }
+    //
+    //     await SendNhentaiGalleryInternalAsync(g);
+    // }
+    //
+    // private async Task SendNhentaiGalleryInternalAsync(Gallery g)
+    // {
+    //     var count = 0;
+    //     var tagString = g.Tags.Shuffle()
+    //                      .Select(tag => $"[{tag.Name}]({tag.Url})")
+    //                      .TakeWhile(tag => (count += tag.Length) < 1000)
+    //                      .Join(" ");
+    //
+    //     var embed = _eb.Create()
+    //         .WithTitle(g.Title)
+    //         .WithDescription(g.FullTitle)
+    //         .WithImageUrl(g.Thumbnail)
+    //         .WithUrl(g.Url)
+    //         .AddField(GetText(strs.favorites), g.Likes, true)
+    //         .AddField(GetText(strs.pages), g.PageCount, true)
+    //         .AddField(GetText(strs.tags),
+    //             string.IsNullOrWhiteSpace(tagString)
+    //                 ? "?"
+    //                 : tagString,
+    //             true)
+    //         .WithFooter(g.UploadedAt.ToString("f"))
+    //         .WithOkColor();
+    //
+    //     await ctx.Channel.EmbedAsync(embed);
+    // }

    private async Task InternalDapiCommand(
        string[] tags,
--- a/src/NadekoBot/Modules/Nsfw/SearchImagesService.cs
+++ b/src/NadekoBot/Modules/Nsfw/SearchImagesService.cs
@@ -19,17 +19,15 @@ public class SearchImagesService : ISearchImagesService, INService
    private readonly SearchImageCacher _cache;
    private readonly IHttpClientFactory _httpFactory;
    private readonly DbService _db;
-    private readonly INhentaiService _nh;

    private readonly object _taglock = new();

    public SearchImagesService(
        DbService db,
        SearchImageCacher cacher,
-        IHttpClientFactory httpFactory,
-        INhentaiService nh)
+        IHttpClientFactory httpFactory
+        )
    {
-        _nh = nh;
        _db = db;
        _rng = new NadekoRandom();
        _cache = cacher;
@@ -277,6 +275,7 @@ public class SearchImagesService : ISearchImagesService, INService
        }
    }

+    /*
    #region Nhentai

    public Task<Gallery?> GetNhentaiByIdAsync(uint id)
@@ -294,4 +293,5 @@ public class SearchImagesService : ISearchImagesService, INService
    }

    #endregion
+    */
 }
--- a/src/NadekoBot/Modules/Searches/JokeCommands.cs
+++ b/src/NadekoBot/Modules/Searches/JokeCommands.cs
@@ -39,7 +39,7 @@ public partial class Searches
        [Cmd]
        public async Task MagicItem()
        {
-            if (!_service.WowJokes.Any())
+            if (!_service.MagicItems.Any())
            {
                await ReplyErrorLocalizedAsync(strs.magicitems_not_loaded);
                return;
--- a/src/NadekoBot/Modules/Searches/Searches.cs
+++ b/src/NadekoBot/Modules/Searches/Searches.cs
@@ -1,4 +1,4 @@
-#nullable disable
+#nullable disable
 using Microsoft.Extensions.Caching.Memory;
 using NadekoBot.Modules.Administration.Services;
 using NadekoBot.Modules.Searches.Common;
@@ -199,7 +199,7 @@ public partial class Searches : NadekoModule<SearchesService>
        if (!await ValidateQuery(ffs))
            return;

-        var shortenedUrl = await _google.ShortenUrl($"https://lmgtfy.com/?q={Uri.EscapeDataString(ffs)}");
+        var shortenedUrl = await _google.ShortenUrl($"https://letmegooglethat.com/?q={Uri.EscapeDataString(ffs)}");
        await SendConfirmAsync($"<{shortenedUrl}>");
    }

@@ -325,7 +325,7 @@ public partial class Searches : NadekoModule<SearchesService>
                            return _eb.Create()
                                      .WithOkColor()
                                      .WithUrl(item.Permalink)
-                                      .WithAuthor(item.Word)
+                                      .WithTitle(item.Word)
                                      .WithDescription(item.Definition);
                        },
                        items.Length,
@@ -422,30 +422,6 @@ public partial class Searches : NadekoModule<SearchesService>
        await SendConfirmAsync("🐈" + GetText(strs.catfact), fact);
    }

-    //done in 3.0
-    [Cmd]
-    [RequireContext(ContextType.Guild)]
-    public async Task Revav([Leftover] IGuildUser usr = null)
-    {
-        if (usr is null)
-            usr = (IGuildUser)ctx.User;
-
-        var av = usr.RealAvatarUrl();
-        await SendConfirmAsync($"https://images.google.com/searchbyimage?image_url={av}");
-    }
-
-    //done in 3.0
-    [Cmd]
-    public async Task Revimg([Leftover] string imageLink = null)
-    {
-        imageLink = imageLink?.Trim() ?? "";
-
-        if (string.IsNullOrWhiteSpace(imageLink))
-            return;
-
-        await SendConfirmAsync($"https://images.google.com/searchbyimage?image_url={imageLink}");
-    }
-
    [Cmd]
    public async Task Wiki([Leftover] string query = null)
    {
@@ -612,4 +588,4 @@ public partial class Searches : NadekoModule<SearchesService>
        [JsonProperty("result_url")]
        public string ResultUrl { get; set; }
    }
-}
+}
--- a/src/NadekoBot/Modules/Searches/SearchesService.cs
+++ b/src/NadekoBot/Modules/Searches/SearchesService.cs
@@ -9,6 +9,9 @@ using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Drawing.Processing;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
+using System.Collections;
+using System.Net.Http.Json;
+using System.Text.Json.Serialization;
 using Color = SixLabors.ImageSharp.Color;
 using Image = SixLabors.ImageSharp.Image;

@@ -296,8 +299,8 @@ public class SearchesService : INService
    public async Task<string> GetChuckNorrisJoke()
    {
        using var http = _httpFactory.CreateClient();
-        var response = await http.GetStringAsync(new Uri("http://api.icndb.com/jokes/random/"));
-        return JObject.Parse(response)["value"]["joke"] + " 😆";
+        var response = await http.GetStringAsync(new Uri("https://api.chucknorris.io/jokes/random"));
+        return JObject.Parse(response)["value"] + " 😆";
    }

    public async Task<MtgData> GetMtgCardAsync(string search)
--- a/src/NadekoBot/Modules/Searches/StreamNotification/StreamNotificationService.cs
+++ b/src/NadekoBot/Modules/Searches/StreamNotification/StreamNotificationService.cs
@@ -28,6 +28,7 @@ public sealed class StreamNotificationService : INService, IReadyExecutor

    private readonly IPubSub _pubSub;
    private readonly IEmbedBuilderService _eb;
+    private readonly SearchesConfigService _config;

    public TypedKey<List<StreamData>> StreamsOnlineKey { get; }
    public TypedKey<List<StreamData>> StreamsOfflineKey { get; }
@@ -49,14 +50,16 @@ public sealed class StreamNotificationService : INService, IReadyExecutor
        IHttpClientFactory httpFactory,
        Bot bot,
        IPubSub pubSub,
-        IEmbedBuilderService eb)
+        IEmbedBuilderService eb,
+        SearchesConfigService config)
    {
        _db = db;
        _client = client;
        _strings = strings;
        _pubSub = pubSub;
        _eb = eb;
-        
+        _config = config;
+
        _streamTracker = new(httpFactory, creds);

        StreamsOnlineKey = new("streams.online");
@@ -69,34 +72,34 @@ public sealed class StreamNotificationService : INService, IReadyExecutor
        {
            var ids = client.GetGuildIds();
            var guildConfigs = uow.Set<GuildConfig>()
-                                  .AsQueryable()
-                                  .Include(x => x.FollowedStreams)
-                                  .Where(x => ids.Contains(x.GuildId))
-                                  .ToList();
+                .AsQueryable()
+                .Include(x => x.FollowedStreams)
+                .Where(x => ids.Contains(x.GuildId))
+                .ToList();

            _offlineNotificationServers = new(guildConfigs
-                                              .Where(gc => gc.NotifyStreamOffline)
-                                              .Select(x => x.GuildId)
-                                              .ToList());
-            
+                .Where(gc => gc.NotifyStreamOffline)
+                .Select(x => x.GuildId)
+                .ToList());
+
            _deleteOnOfflineServers = new(guildConfigs
-                                              .Where(gc => gc.DeleteStreamOnlineMessage)
-                                              .Select(x => x.GuildId)
-                                              .ToList());
+                .Where(gc => gc.DeleteStreamOnlineMessage)
+                .Select(x => x.GuildId)
+                .ToList());

            var followedStreams = guildConfigs.SelectMany(x => x.FollowedStreams).ToList();

            _shardTrackedStreams = followedStreams.GroupBy(x => new
-                                                  {
-                                                      x.Type,
-                                                      Name = x.Username.ToLower()
-                                                  })
-                                                  .ToList()
-                                                  .ToDictionary(
-                                                      x => new StreamDataKey(x.Key.Type, x.Key.Name.ToLower()),
-                                                      x => x.GroupBy(y => y.GuildId)
-                                                            .ToDictionary(y => y.Key,
-                                                                y => y.AsEnumerable().ToHashSet()));
+                {
+                    x.Type,
+                    Name = x.Username.ToLower()
+                })
+                .ToList()
+                .ToDictionary(
+                    x => new StreamDataKey(x.Key.Type, x.Key.Name.ToLower()),
+                    x => x.GroupBy(y => y.GuildId)
+                        .ToDictionary(y => y.Key,
+                            y => y.AsEnumerable().ToHashSet()));

            // shard 0 will keep track of when there are no more guilds which track a stream
            if (client.ShardId == 0)
@@ -107,12 +110,12 @@ public sealed class StreamNotificationService : INService, IReadyExecutor
                    _streamTracker.AddLastData(fs.CreateKey(), null, false);

                _trackCounter = allFollowedStreams.GroupBy(x => new
-                                                  {
-                                                      x.Type,
-                                                      Name = x.Username.ToLower()
-                                                  })
-                                                  .ToDictionary(x => new StreamDataKey(x.Key.Type, x.Key.Name),
-                                                      x => x.Select(fs => fs.GuildId).ToHashSet());
+                    {
+                        x.Type,
+                        Name = x.Username.ToLower()
+                    })
+                    .ToDictionary(x => new StreamDataKey(x.Key.Type, x.Key.Name),
+                        x => x.Select(fs => fs.GuildId).ToHashSet());
            }
        }

@@ -152,7 +155,7 @@ public sealed class StreamNotificationService : INService, IReadyExecutor
                    continue;

                var deleteGroups = failingStreams.GroupBy(x => x.Type)
-                                                 .ToDictionary(x => x.Key, x => x.Select(y => y.Name).ToList());
+                    .ToDictionary(x => x.Key, x => x.Select(y => y.Name).ToList());

                await using var uow = _db.GetDbContext();
                foreach (var kvp in deleteGroups)
@@ -165,9 +168,9 @@ public sealed class StreamNotificationService : INService, IReadyExecutor
                        string.Join(", ", kvp.Value));

                    var toDelete = uow.Set<FollowedStream>()
-                                      .AsQueryable()
-                                      .Where(x => x.Type == kvp.Key && kvp.Value.Contains(x.Username))
-                                      .ToList();
+                        .AsQueryable()
+                        .Where(x => x.Type == kvp.Key && kvp.Value.Contains(x.Username))
+                        .ToList();

                    uow.RemoveRange(toDelete);
                    await uow.SaveChangesAsync();
@@ -246,17 +249,17 @@ public sealed class StreamNotificationService : INService, IReadyExecutor
            if (_shardTrackedStreams.TryGetValue(key, out var fss))
            {
                await fss
-                      // send offline stream notifications only to guilds which enable it with .stoff
-                      .SelectMany(x => x.Value)
-                      .Where(x => _offlineNotificationServers.Contains(x.GuildId))
-                      .Select(fs => _client.GetGuild(fs.GuildId)
-                                           ?.GetTextChannel(fs.ChannelId)
-                                           ?.EmbedAsync(GetEmbed(fs.GuildId, stream)))
-                      .WhenAll();
+                    // send offline stream notifications only to guilds which enable it with .stoff
+                    .SelectMany(x => x.Value)
+                    .Where(x => _offlineNotificationServers.Contains(x.GuildId))
+                    .Select(fs => _client.GetGuild(fs.GuildId)
+                        ?.GetTextChannel(fs.ChannelId)
+                        ?.EmbedAsync(GetEmbed(fs.GuildId, stream)))
+                    .WhenAll();
            }
        }
    }
-    
+

    private async ValueTask HandleStreamsOnline(List<StreamData> onlineStreams)
    {
@@ -266,30 +269,30 @@ public sealed class StreamNotificationService : INService, IReadyExecutor
            if (_shardTrackedStreams.TryGetValue(key, out var fss))
            {
                var messages = await fss.SelectMany(x => x.Value)
-                         .Select(async fs =>
-                         {
-                             var textChannel = _client.GetGuild(fs.GuildId)?.GetTextChannel(fs.ChannelId);
+                    .Select(async fs =>
+                    {
+                        var textChannel = _client.GetGuild(fs.GuildId)?.GetTextChannel(fs.ChannelId);

-                             if (textChannel is null)
-                                 return default;
+                        if (textChannel is null)
+                            return default;

-                             var rep = new ReplacementBuilder().WithOverride("%user%", () => fs.Username)
-                                                               .WithOverride("%platform%", () => fs.Type.ToString())
-                                                               .Build();
+                        var rep = new ReplacementBuilder().WithOverride("%user%", () => fs.Username)
+                            .WithOverride("%platform%", () => fs.Type.ToString())
+                            .Build();

-                             var message = string.IsNullOrWhiteSpace(fs.Message) ? "" : rep.Replace(fs.Message);
+                        var message = string.IsNullOrWhiteSpace(fs.Message) ? "" : rep.Replace(fs.Message);

-                             var msg = await textChannel.EmbedAsync(GetEmbed(fs.GuildId, stream, false), message);
+                        var msg = await textChannel.EmbedAsync(GetEmbed(fs.GuildId, stream, false), message);
+
+                        // only cache the ids of channel/message pairs 
+                        if (_deleteOnOfflineServers.Contains(fs.GuildId))
+                            return (textChannel.Id, msg.Id);
+                        else
+                            return default;
+                    })
+                    .WhenAll();

-                             // 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
@@ -297,16 +300,15 @@ public sealed class StreamNotificationService : INService, IReadyExecutor
                try
                {
                    var pairs = messages
-                                .Where(x => x != default)
-                                .Select(x => (x.Item1, x.Item2))
-                                .ToList();
+                        .Where(x => x != default)
+                        .Select(x => (x.Item1, x.Item2))
+                        .ToList();

                    if (pairs.Count > 0)
                        await OnlineMessagesSent(key.Type, key.Name, pairs);
                }
                catch
                {
-
                }
            }
        }
@@ -384,10 +386,10 @@ public sealed class StreamNotificationService : INService, IReadyExecutor
        await using (var uow = _db.GetDbContext())
        {
            var fss = uow.Set<FollowedStream>()
-                         .AsQueryable()
-                         .Where(x => x.GuildId == guildId)
-                         .OrderBy(x => x.Id)
-                         .ToList();
+                .AsQueryable()
+                .Where(x => x.GuildId == guildId)
+                .OrderBy(x => x.Id)
+                .ToList();

            // out of range
            if (fss.Count <= index)
@@ -450,7 +452,9 @@ public sealed class StreamNotificationService : INService, IReadyExecutor
                GuildId = guildId
            };

-            if (gc.FollowedStreams.Count >= 10)
+            var config = _config.Data;
+            if (config.FollowedStreams.MaxCount is not -1
+                && gc.FollowedStreams.Count >= config.FollowedStreams.MaxCount)
                return null;

            gc.FollowedStreams.Add(fs);
@@ -475,10 +479,10 @@ public sealed class StreamNotificationService : INService, IReadyExecutor
    public IEmbedBuilder GetEmbed(ulong guildId, StreamData status, bool showViewers = true)
    {
        var embed = _eb.Create()
-                       .WithTitle(status.Name)
-                       .WithUrl(status.StreamUrl)
-                       .WithDescription(status.StreamUrl)
-                       .AddField(GetText(guildId, strs.status), status.IsLive ? "🟢 Online" : "🔴 Offline", true);
+            .WithTitle(status.Name)
+            .WithUrl(status.StreamUrl)
+            .WithDescription(status.StreamUrl)
+            .AddField(GetText(guildId, strs.status), status.IsLive ? "🟢 Online" : "🔴 Offline", true);

        if (showViewers)
        {
@@ -527,7 +531,7 @@ public sealed class StreamNotificationService : INService, IReadyExecutor

        return newValue;
    }
-    
+
    public bool ToggleStreamOnlineDelete(ulong guildId)
    {
        using var uow = _db.GetDbContext();
--- a/src/NadekoBot/Modules/Searches/_Common/Config/SearchesConfig.cs
+++ b/src/NadekoBot/Modules/Searches/_Common/Config/SearchesConfig.cs
@@ -8,18 +8,18 @@ public partial class SearchesConfig : ICloneable<SearchesConfig>
 {
    [Comment("DO NOT CHANGE")]
    public int Version { get; set; } = 0;
-    
+
    [Comment(@"Which engine should .search command
 'google_scrape' - default. Scrapes the webpage for results. May break. Requires no api keys.
 'google' - official google api. Requires googleApiKey and google.searchId set in creds.yml
 'searx' - requires at least one searx instance specified in the 'searxInstances' property below")]
    public WebSearchEngine WebSearchEngine { get; set; } = WebSearchEngine.Google_Scrape;
-    
+
    [Comment(@"Which engine should .image command use
 'google'- official google api. googleApiKey and google.imageSearchId set in creds.yml
 'searx' requires at least one searx instance specified in the 'searxInstances' property below")]
    public ImgSearchEngine ImgSearchEngine { get; set; } = ImgSearchEngine.Google;
-    
+

    [Comment(@"Which search provider will be used for the `.youtube` command.

@@ -30,7 +30,7 @@ public partial class SearchesConfig : ICloneable<SearchesConfig>
 - `ytdlp` - recommended easy, uses `yt-dlp`. Requires `yt-dlp` to be installed and it's path added to env variables

 - `invidious` - recommended advanced, uses invidious api. Requires at least one invidious instance specified in the `invidiousInstances` property")]
-    public YoutubeSearcher YtProvider { get; set; } = YoutubeSearcher.Ytdl;
+    public YoutubeSearcher YtProvider { get; set; } = YoutubeSearcher.Ytdlp;

    [Comment(@"Set the searx instance urls in case you want to use 'searx' for either img or web search.
 Nadeko will use a random one for each request.
@@ -55,6 +55,15 @@ Use a fully qualified url. Example: https://my-invidious-instance.mydomain.com
 Instances specified must have api available.
 You check that by opening an api endpoint in your browser. For example: https://my-invidious-instance.mydomain.com/api/v1/trending")]
    public List<string> InvidiousInstances { get; set; } = new List<string>();
+
+    [Comment("Maximum number of followed streams per server")]
+    public FollowedStreamConfig FollowedStreams { get; set; } = new FollowedStreamConfig();
+}
+
+public sealed class FollowedStreamConfig
+{
+    [Comment("Maximum number of streams that each server can follow. -1 for infinite")]
+    public int MaxCount { get; set; } = 10;
 }

 public enum YoutubeSearcher
--- a/src/NadekoBot/Modules/Searches/_Common/Config/SearchesConfigService.cs
+++ b/src/NadekoBot/Modules/Searches/_Common/Config/SearchesConfigService.cs
@@ -17,17 +17,22 @@ public class SearchesConfigService : ConfigServiceBase<SearchesConfig>
            sc => sc.WebSearchEngine,
            ConfigParsers.InsensitiveEnum,
            ConfigPrinters.ToString);
-        
+
        AddParsedProp("imgEngine",
            sc => sc.ImgSearchEngine,
            ConfigParsers.InsensitiveEnum,
            ConfigPrinters.ToString);
-        
+
        AddParsedProp("ytProvider",
            sc => sc.YtProvider,
            ConfigParsers.InsensitiveEnum,
            ConfigPrinters.ToString);

+        AddParsedProp("followedStreams.maxCount",
+            sc => sc.FollowedStreams.MaxCount,
+            int.TryParse,
+            ConfigPrinters.ToString);
+
        Migrate();
    }

@@ -41,5 +46,13 @@ public class SearchesConfigService : ConfigServiceBase<SearchesConfig>
                c.WebSearchEngine = WebSearchEngine.Google_Scrape;
            });
        }
+
+        if (data.Version < 2)
+        {
+            ModifyConfig(c =>
+            {
+                c.Version = 2;
+            });
+        }
    }
 }
--- a/src/NadekoBot/Modules/Utility/Quote/QuoteCommands.cs
+++ b/src/NadekoBot/Modules/Utility/Quote/QuoteCommands.cs
@@ -127,15 +127,27 @@ public partial class Utility
        }

        private async Task ShowQuoteData(Quote data)
-            => await ctx.Channel.EmbedAsync(_eb.Create(ctx)
-                .WithOkColor()
-                .WithTitle(GetText(strs.quote_id($"#{data.Id}")))
-                .AddField(GetText(strs.trigger), data.Keyword)
-                .AddField(GetText(strs.response),
-                    Format.Sanitize(data.Text).Replace("](", "]\\("))
-                .WithFooter(
-                    GetText(strs.created_by($"{data.AuthorName} ({data.AuthorId})"))));
+        {
+            var eb = _eb.Create(ctx)
+                          .WithOkColor()
+                          .WithTitle($"{GetText(strs.quote_id($"#{data.Id}"))} | {GetText(strs.response)}:")
+                          .WithDescription(Format.Sanitize(data.Text).Replace("](", "]\\(").TrimTo(4096))
+                          .AddField(GetText(strs.trigger), data.Keyword)
+                          .WithFooter(
+                              GetText(strs.created_by($"{data.AuthorName} ({data.AuthorId})")))
+                          .Build();

+            if (!(data.Text.Length > 4096))
+            {
+                await ctx.Channel.SendMessageAsync(embed: eb);
+                return;
+            }
+            
+            await ctx.Channel.SendFileAsync(
+                attachment: new FileAttachment(await data.Text.ToStream(), "quote.txt"),
+                embed: eb);
+        }
+            
        private async Task QuoteSearchinternalAsync(string? keyword, string textOrAuthor)
        {
            if (string.IsNullOrWhiteSpace(textOrAuthor))
--- a/src/NadekoBot/Modules/Utility/Utility.cs
+++ b/src/NadekoBot/Modules/Utility/Utility.cs
@@ -94,7 +94,7 @@ public partial class Utility : NadekoModule

        var rng = new NadekoRandom();
        var arr = await Task.Run(() => socketGuild.Users
-                                                  .Where(u => u.Activities.FirstOrDefault()?.Name?.ToUpperInvariant()
+                                                  .Where(u => u.Activities.FirstOrDefault()?.Name?.Trim().ToUpperInvariant()
                                                              == game)
                                                  .Select(u => u.Username)
                                                  .OrderBy(_ => rng.Next())
@@ -464,12 +464,14 @@ public partial class Utility : NadekoModule
        {
            if (tags.Length == 0)
                tags = new[] { name };
-            
-            await ctx.Guild.CreateStickerAsync(name,
-                string.IsNullOrWhiteSpace(description) ? "Missing description" : description,
-                tags,
+
+            await ctx.Guild.CreateStickerAsync(
+                name,
                stream,
-                $"{name}.{format}");
+                $"{name}.{format}",
+                tags,
+                string.IsNullOrWhiteSpace(description) ? "Missing description" : description
+            );

            await ctx.OkAsync();
        }
@@ -550,15 +552,20 @@ public partial class Utility : NadekoModule
            return;
        }

-        var embed = msg.Embeds.FirstOrDefault();
-        if (embed is null)
+        if (!msg.Embeds.Any())
        {
            await ReplyErrorLocalizedAsync(strs.not_found);
            return;
        }

-        var json = SmartEmbedText.FromEmbed(embed, msg.Content).ToJson(_showEmbedSerializerOptions);
-        await SendConfirmAsync(Format.Sanitize(json).Replace("](", "]\\("));
+        var json = new SmartEmbedTextArray()
+        {
+            Content = msg.Content,
+            Embeds = msg.Embeds
+                        .Map(x => new SmartEmbedArrayElementText(x))
+        }.ToJson(_showEmbedSerializerOptions);
+        
+        await SendConfirmAsync(Format.Code(json, "json").Replace("](", "]\\("));
    }

    [Cmd]
@@ -634,4 +641,4 @@ public partial class Utility : NadekoModule
        else
            await ReplyConfirmLocalizedAsync(strs.verbose_errors_disabled);
    }
-}
+}
--- a/src/NadekoBot/Modules/Xp/Club/Club.cs
+++ b/src/NadekoBot/Modules/Xp/Club/Club.cs
@@ -282,6 +282,24 @@ public partial class Xp
            else if(result == ClubAcceptResult.NotOwnerOrAdmin)
                await ReplyErrorLocalizedAsync(strs.club_admin_perms);
        }
+        
+        [Cmd]
+        [Priority(1)]
+        public Task ClubReject(IUser user)
+            => ClubReject(user.ToString());
+
+        [Cmd]
+        [Priority(0)]
+        public async Task ClubReject([Leftover] string userName)
+        {
+            var result = _service.RejectApplication(ctx.User.Id, userName, out var discordUser);
+            if (result == ClubDenyResult.Rejected)
+                await ReplyConfirmLocalizedAsync(strs.club_rejected(Format.Bold(discordUser.ToString())));
+            else if(result == ClubDenyResult.NoSuchApplicant)
+                await ReplyErrorLocalizedAsync(strs.club_accept_invalid_applicant);
+            else if(result == ClubDenyResult.NotOwnerOrAdmin)
+                await ReplyErrorLocalizedAsync(strs.club_admin_perms);
+        }

        [Cmd]
        public async Task ClubLeave()
--- a/src/NadekoBot/Modules/Xp/Club/ClubService.cs
+++ b/src/NadekoBot/Modules/Xp/Club/ClubService.cs
@@ -19,7 +19,6 @@ public class ClubService : INService, IClubService
        _httpFactory = httpFactory;
    }

-    
    public async Task<ClubCreateResult> CreateClubAsync(IUser user, string clubName)
    {
        //must be lvl 5 and must not be in a club already
@@ -140,7 +139,7 @@ public class ClubService : INService, IClubService

        //user banned or a member of a club, or already applied,
        // or doesn't min minumum level requirement, can't apply
-        if (du.Club is not null)
+        if (du.ClubId is not null)
            return ClubApplyResult.AlreadyInAClub;
        
        if (club.Bans.Any(x => x.UserId == du.Id))
@@ -186,6 +185,26 @@ public class ClubService : INService, IClubService
        uow.SaveChanges();
        return ClubAcceptResult.Accepted;
    }
+    
+    public ClubDenyResult RejectApplication(ulong clubOwnerUserId, string userName, out DiscordUser discordUser)
+    {
+        discordUser = null;
+        using var uow = _db.GetDbContext();
+        var club = uow.Clubs.GetByOwnerOrAdmin(clubOwnerUserId);
+        if (club is null)
+            return ClubDenyResult.NotOwnerOrAdmin;
+
+        var applicant =
+            club.Applicants.FirstOrDefault(x => x.User.ToString().ToUpperInvariant() == userName.ToUpperInvariant());
+        if (applicant is null)
+            return ClubDenyResult.NoSuchApplicant;
+        
+        club.Applicants.Remove(applicant);
+        
+        discordUser = applicant.User;
+        uow.SaveChanges();
+        return ClubDenyResult.Rejected;
+    }

    public ClubInfo GetClubWithBansAndApplications(ulong ownerUserId)
    {
--- a/src/NadekoBot/Modules/Xp/Club/IClubService.cs
+++ b/src/NadekoBot/Modules/Xp/Club/IClubService.cs
@@ -13,6 +13,7 @@ public interface IClubService
    bool GetClubByName(string clubName, out ClubInfo club);
    ClubApplyResult ApplyToClub(IUser user, ClubInfo club);
    ClubAcceptResult AcceptApplication(ulong clubOwnerUserId, string userName, out DiscordUser discordUser);
+    ClubDenyResult RejectApplication(ulong clubOwnerUserId, string userName, out DiscordUser discordUser);
    ClubInfo? GetClubWithBansAndApplications(ulong ownerUserId);
    ClubLeaveResult LeaveClub(IUser user);
    bool SetDescription(ulong userId, string? desc);
--- a/src/NadekoBot/Modules/Xp/Club/Results/ClubAcceptResult.cs
+++ b/src/NadekoBot/Modules/Xp/Club/Results/ClubAcceptResult.cs
@@ -5,4 +5,11 @@ public enum ClubAcceptResult
    Accepted,
    NotOwnerOrAdmin,
    NoSuchApplicant,
+}
+
+public enum ClubDenyResult
+{
+    Rejected,
+    NoSuchApplicant,
+    NotOwnerOrAdmin
 }
--- a/src/NadekoBot/NadekoBot.csproj
+++ b/src/NadekoBot/NadekoBot.csproj
@@ -27,10 +27,10 @@
        <PackageReference Include="CodeHollow.FeedReader" Version="1.2.4" />
        <PackageReference Include="CommandLineParser" Version="2.9.1" />
        <PackageReference Include="CsvHelper" Version="28.0.1" />
-        <PackageReference Include="Discord.Net" Version="3.104.0" />
+        <PackageReference Include="Discord.Net" Version="3.203.0" />
        <PackageReference Include="CoreCLR-NCalc" Version="2.2.110" />
        <PackageReference Include="Google.Apis.Urlshortener.v1" Version="1.41.1.138" />
-        <PackageReference Include="Google.Apis.YouTube.v3" Version="1.57.0.2749" />
+        <PackageReference Include="Google.Apis.YouTube.v3" Version="1.62.1.3205" />
        <PackageReference Include="Google.Apis.Customsearch.v1" Version="1.49.0.2084" />
        <PackageReference Include="Google.Protobuf" Version="3.21.2" />
        <PackageReference Include="Grpc.Net.ClientFactory" Version="2.47.0" />
@@ -40,7 +40,7 @@
        </PackageReference>
        <PackageReference Include="Html2Markdown" Version="5.0.2.561" />
        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.2.0" />
-        
+
        <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
        <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
@@ -52,48 +52,49 @@
        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
        <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
        <PackageReference Include="Microsoft.SyndicationFeed.ReaderWriter" Version="1.0.2" />
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
        <PackageReference Include="NonBlocking" Version="2.1.0" />
        <PackageReference Include="OneOf" Version="3.0.223" />
        <PackageReference Include="Scrutor" Version="4.2.0" />
        <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
        <PackageReference Include="Serilog.Sinks.Seq" Version="5.1.1" />
+        <PackageReference Include="SharpToken" Version="1.2.14" />
        <PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta17" />
        <PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
        <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta14" />
        <PackageReference Include="SixLabors.Shapes" Version="1.0.0-beta0009" />
        <PackageReference Include="StackExchange.Redis" Version="2.6.48" />
        <PackageReference Include="YamlDotNet" Version="11.2.1" />
-        
+
        <PackageReference Include="Humanizer" Version="2.14.1">
            <PrivateAssets>all</PrivateAssets>
            <Publish>True</Publish>
        </PackageReference>
-        
+
        <PackageReference Include="JetBrains.Annotations" Version="2022.1.0" />
-        
+
        <!-- Db-related packages -->
        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.7" />
        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.7">
            <PrivateAssets>all</PrivateAssets>
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
        </PackageReference>
-        
+
        <PackageReference Include="linq2db.EntityFrameworkCore" Version="6.8.0" />
-        
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.7" />        
+
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.7" />
        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.5" />
        <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.1" />
-        
+
        <!-- Used by stream notifications -->
        <PackageReference Include="TwitchLib.Api" Version="3.4.1" />
-        
+
        <!-- Uncomment to check for disposable issues -->
 <!--        <PackageReference Include="IDisposableAnalyzers" Version="4.0.2">-->
 <!--            <PrivateAssets>all</PrivateAssets>-->
 <!--            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>-->
 <!--        </PackageReference>-->
-        
+
        <PackageReference Include="EFCore.NamingConventions" Version="6.0.0" />
    </ItemGroup>

@@ -128,7 +129,7 @@
        <Version Condition=" '$(VersionSuffix)' != '' ">$(VersionPrefix).$(VersionSuffix)</Version>
        <Version Condition=" '$(Version)' == '' ">$(VersionPrefix)</Version>
    </PropertyGroup>
-    
+
    <PropertyGroup Condition=" '$(Configuration)' == 'GlobalNadeko' ">
        <!-- Define trace doesn't seem to affect the build at all so I had to remove $(DefineConstants)-->
        <DefineTrace>false</DefineTrace>
--- a/src/NadekoBot/Services/Currency/CurrencyServiceExtensions.cs
+++ b/src/NadekoBot/Services/Currency/CurrencyServiceExtensions.cs
@@ -1,4 +1,4 @@
-using NadekoBot.Services.Currency;
+using NadekoBot.Services.Currency;

 namespace NadekoBot.Services;

@@ -27,13 +27,19 @@ public static class CurrencyServiceExtensions

        if (await fromWallet.Transfer(amount, toWallet, extra))
        {
-            await to.SendConfirmAsync(ebs,
-                string.IsNullOrWhiteSpace(note)
-                    ? $"Received {formattedAmount} from {from} "
-                    : $"Received {formattedAmount} from {from}: {note}");
+            try
+            {
+                await to.SendConfirmAsync(ebs,
+                    string.IsNullOrWhiteSpace(note)
+                        ? $"Received {formattedAmount} from {from} "
+                        : $"Received {formattedAmount} from {from}: {note}");
+            }
+            catch
+            {
+                //ignored
+            }
            return true;
        }
-
        return false;
    }
-}
+}
--- a/src/NadekoBot/Services/Currency/GamblingTxTracker.cs
+++ b/src/NadekoBot/Services/Currency/GamblingTxTracker.cs
@@ -104,8 +104,7 @@ public sealed class GamblingTxTracker : ITxTracker, INService, IReadyExecutor
    public async Task<IReadOnlyCollection<GamblingStats>> GetAllAsync()
    {
        await using var ctx = _db.GetDbContext();
-        return await ctx
-            .GetTable<GamblingStats>()
-            .ToListAsync();
+        return await ctx.Set<GamblingStats>()
+            .ToListAsyncEF();
    }
 }
--- a/src/NadekoBot/Services/Impl/BotCredsProvider.cs
+++ b/src/NadekoBot/Services/Impl/BotCredsProvider.cs
@@ -34,19 +34,19 @@ public sealed class BotCredsProvider : IBotCredsProvider

    public BotCredsProvider(int? totalShards = null, string credPath = null)
    {
-        _totalShards = totalShards;
-
-        if (!string.IsNullOrWhiteSpace(credPath))
-        {
-            CredsPath = credPath;
-            CredsExamplePath = Path.Combine(Path.GetDirectoryName(credPath), CREDS_EXAMPLE_FILE_NAME);
-        }
-        else
-        {
-            CredsPath = Path.Combine(Directory.GetCurrentDirectory(), CREDS_FILE_NAME);
-            CredsExamplePath = Path.Combine(Directory.GetCurrentDirectory(), CREDS_EXAMPLE_FILE_NAME);
+        _totalShards = totalShards;
+
+        if (!string.IsNullOrWhiteSpace(credPath))
+        {
+            CredsPath = credPath;
+            CredsExamplePath = Path.Combine(Path.GetDirectoryName(credPath), CREDS_EXAMPLE_FILE_NAME);
        }
-
+        else
+        {
+            CredsPath = Path.Combine(Directory.GetCurrentDirectory(), CREDS_FILE_NAME);
+            CredsExamplePath = Path.Combine(Directory.GetCurrentDirectory(), CREDS_EXAMPLE_FILE_NAME);
+        }
+
        try
        {
            if (!File.Exists(CredsExamplePath))
@@ -69,8 +69,8 @@ public sealed class BotCredsProvider : IBotCredsProvider

        _config = new ConfigurationBuilder().AddYamlFile(CredsPath, false, true)
                                            .AddEnvironmentVariables("NadekoBot_")
-                                            .Build();
-
+                                            .Build();
+
        _changeToken = ChangeToken.OnChange(() => _config.GetReloadToken(), Reload);
        Reload();
    }
@@ -131,14 +131,14 @@ public sealed class BotCredsProvider : IBotCredsProvider

        ymlData = Yaml.Serializer.Serialize(creds);
        File.WriteAllText(CREDS_FILE_NAME, ymlData);
-    }
-
+    }
+
    private string OldCredsJsonPath
        => Path.Combine(Directory.GetCurrentDirectory(), "credentials.json");

    private string OldCredsJsonBackupPath
-        => Path.Combine(Directory.GetCurrentDirectory(), "credentials.json.bak");
-
+        => Path.Combine(Directory.GetCurrentDirectory(), "credentials.json.bak");
+
    private void MigrateCredentials()
    {
        if (File.Exists(OldCredsJsonPath))
@@ -177,15 +177,18 @@ public sealed class BotCredsProvider : IBotCredsProvider

            Log.Warning(
                "Data from credentials.json has been moved to creds.yml\nPlease inspect your creds.yml for correctness");
-        }
-
+        }
+
        if (File.Exists(CREDS_FILE_NAME))
        {
            var creds = Yaml.Deserializer.Deserialize<Creds>(File.ReadAllText(CREDS_FILE_NAME));
            if (creds.Version <= 5)
            {
-                creds.Version = 6;
                creds.BotCache = BotCacheImplemenation.Redis;
+            }
+            if (creds.Version <= 6)
+            {
+                creds.Version = 7;
                File.WriteAllText(CREDS_FILE_NAME, Yaml.Serializer.Serialize(creds));
            }
        }
--- a/src/NadekoBot/Services/Impl/GoogleApiService.cs
+++ b/src/NadekoBot/Services/Impl/GoogleApiService.cs
@@ -57,7 +57,7 @@ public sealed partial class GoogleApiService : IGoogleApiService, INService
        return (await query.ExecuteAsync()).Items.Select(i => i.Id.PlaylistId);
    }

-    public async Task<IEnumerable<string>> GetRelatedVideosAsync(string id, int count = 1, string user = null)
+    public async Task<IEnumerable<string>> GetRelatedVideosAsync(string id, int count = 2, string user = null)
    {
        if (string.IsNullOrWhiteSpace(id))
            throw new ArgumentNullException(nameof(id));
@@ -67,10 +67,14 @@ public sealed partial class GoogleApiService : IGoogleApiService, INService
        
        var query = _yt.Search.List("snippet");
        query.MaxResults = count;
-        query.RelatedToVideoId = id;
+        query.Q = id;
+        // query.RelatedToVideoId = id;
        query.Type = "video";
        query.QuotaUser = user;
-        return (await query.ExecuteAsync()).Items.Select(i => "https://www.youtube.com/watch?v=" + i.Id.VideoId);
+        // bad workaround as there's no replacement for related video querying right now.
+        // Query youtube with the id of the video, take a second video in the results
+        // skip the first one as that's probably the same video.
+        return (await query.ExecuteAsync()).Items.Select(i => "https://www.youtube.com/watch?v=" + i.Id.VideoId).Skip(1);
    }

    public async Task<IEnumerable<string>> GetVideoLinksByKeywordAsync(string keywords, int count = 1)
--- a/src/NadekoBot/Services/Impl/StatsService.cs
+++ b/src/NadekoBot/Services/Impl/StatsService.cs
@@ -7,7 +7,7 @@ namespace NadekoBot.Services;

 public sealed class StatsService : IStatsService, IReadyExecutor, INService
 {
-    public const string BOT_VERSION = "4.3.11";
+    public const string BOT_VERSION = "4.3.20";

    public string Author
        => "Kwoth#2452";
--- a/src/NadekoBot/creds_example.yml
+++ b/src/NadekoBot/creds_example.yml
@@ -1,5 +1,5 @@
 # DO NOT CHANGE
-version: 6
+version: 7
 # Bot token. Do not share with anyone ever -> https://discordapp.com/developers/applications/
 token: ''
 # List of Ids of the users who have bot owner permissions
@@ -56,6 +56,8 @@ patreon:
 botListToken: ''
 # Official cleverbot api key.
 cleverbotApiKey: ''
+# Official GPT-3 api key.
+gpt3ApiKey: ''
 # Which cache implementation should bot use.
 # 'memory' - Cache will be in memory of the bot's process itself. Only use this on bots with a single shard. When the bot is restarted the cache is reset.
 # 'redis' - Uses redis (which needs to be separately downloaded and installed). The cache will persist through bot restarts. You can configure connection string in creds.yml
--- a/src/NadekoBot/data/aliases.yml
+++ b/src/NadekoBot/data/aliases.yml
@@ -647,10 +647,6 @@ chucknorris:
 magicitem:
  - magicitem
  - mi
-revav:
-  - revav
-revimg:
-  - revimg
 safebooru:
  - safebooru
 wiki:
@@ -664,8 +660,6 @@ avatar:
  - av
 hentai:
  - hentai
-nhentai:
-  - nhentai
 danbooru:
  - danbooru
 derpibooru:
@@ -807,6 +801,7 @@ hentaibomb:
  - hentaibomb
 cleverbot:
  - cleverbot
+  - chatgpt
 shorten:
  - shorten
 wikia:
@@ -1117,6 +1112,8 @@ clubapply:
  - clubapply
 clubaccept:
  - clubaccept
+clubreject:
+  - clubreject
 clubleave:
  - clubleave
 clubdisband:
@@ -1389,4 +1386,6 @@ autopublish:
  - autopublish
 doas:
  - doas
-  - execas 
+  - execas
+cacheusers:
+  - cacheusers
--- a/src/NadekoBot/data/games.yml
+++ b/src/NadekoBot/data/games.yml
@@ -1,5 +1,5 @@
 # DO NOT CHANGE
-version: 1
+version: 3
 # Hangman related settings (.hangman command)
 hangman:
 # The amount of currency awarded to the winner of a hangman game
@@ -8,8 +8,8 @@ hangman:
 trivia:
 # The amount of currency awarded to the winner of the trivia game.
  currencyReward: 0
-  # Users won't be able to start trivia games which have 
-# a smaller win requirement than the one specified by this setting.
+  # Users won't be able to start trivia games which have
+  # a smaller win requirement than the one specified by this setting.
  minimumWinReq: 1
 # List of responses for the .8ball command. A random one will be selected every time
 eightBallResponses:
@@ -54,3 +54,22 @@ raceAnimals:
    name: Crab
  - icon: "🦄"
    name: Unicorn
+# Which chatbot API should bot use.
+# 'cleverbot' - bot will use Cleverbot API.
+# 'gpt3' - bot will use GPT-3 API
+chatBot: Gpt3
+
+chatGpt:
+# Which GPT-3 Model should bot use.
+  # gpt35turbo - cheapest
+  # gpt4 - 30x more expensive, higher quality
+  # gp432k - same model as above, but with a 32k token limit
+  modelName: Gpt35Turbo
+  # How should the chat bot behave, whats its personality? (Usage of this counts towards the max tokens)
+  personalityPrompt: You are a chat bot willing to have a conversation with anyone about anything.
+  # The maximum number of messages in a conversation that can be remembered. (This will increase the number of tokens used)
+  chatHistory: 5
+  # The maximum number of tokens to use per GPT-3 API call
+  maxTokens: 100
+  # The minimum number of tokens to use per GPT-3 API call, such that chat history is removed to make room.
+  minTokens: 30
--- a/src/NadekoBot/data/searches.yml
+++ b/src/NadekoBot/data/searches.yml
@@ -1,5 +1,5 @@
 # DO NOT CHANGE
-version: 1
+version: 2
 # Which engine should .search command
 # 'google_scrape' - default. Scrapes the webpage for results. May break. Requires no api keys.
 # 'google' - official google api. Requires googleApiKey and google.searchId set in creds.yml
@@ -18,7 +18,7 @@ imgSearchEngine: Google
 # - `ytdlp` - recommended easy, uses `yt-dlp`. Requires `yt-dlp` to be installed and it's path added to env variables
 # 
 # - `invidious` - recommended advanced, uses invidious api. Requires at least one invidious instance specified in the `invidiousInstances` property
-ytProvider: Ytdl
+ytProvider: Ytdlp
 # Set the searx instance urls in case you want to use 'searx' for either img or web search.
 # Nadeko will use a random one for each request.
 # Use a fully qualified url. Example: `https://my-searx-instance.mydomain.com`
@@ -41,3 +41,7 @@ searxInstances: []
 # Instances specified must have api available.
 # You check that by opening an api endpoint in your browser. For example: https://my-invidious-instance.mydomain.com/api/v1/trending
 invidiousInstances: []
+# Maximum number of followed streams per server
+followedStreams:
+# Maximum number of streams that each server can follow. -1 for infinite
+  maxCount: 10
--- a/src/NadekoBot/data/strings/commands/commands.en-US.yml
+++ b/src/NadekoBot/data/strings/commands/commands.en-US.yml
@@ -1117,11 +1117,6 @@ hentai:
  desc: "Shows a hentai image from a random website (gelbooru, danbooru, konachan or yandere) with a given tag. Tag(s) are optional but preferred. Maximum is usually 2 tags. Only 1 tag allowed."
  args:
    - "yuri"
-nhentai:
-  desc: "Shows basic information about a hentai with the specified id, or a valid nhentai search query."
-  args:
-    - "273426"
-    - "cute girl"
 autohentai:
  desc: "Posts a hentai every X seconds with a random tag from the provided tags. Use `|` to separate tag groups. Random group will be chosen every time the image is sent. Max 2 tags per group. 20 seconds minimum. Provide no parameters to disable."
  args:
@@ -1377,7 +1372,7 @@ listservers:
  args:
    - "3"
 cleverbot:
-  desc: "Toggles cleverbot session. When enabled, the bot will reply to messages starting with bot mention in the server. Expressions starting with %bot.mention% won't work if cleverbot is enabled."
+  desc: "Toggles cleverbot/chatgpt session. When enabled, the bot will reply to messages starting with bot mention in the server. Expressions starting with %bot.mention% won't work if cleverbot/chatgpt is enabled."
  args:
    - ""
 shorten:
@@ -1564,7 +1559,7 @@ timezones:
  args:
    - ""
 timezone:
-  desc: "Sets this guilds timezone. This affects bot's time output in this server (logs, etc..)"
+  desc: "Sets this guilds timezone. This affects bot's time output in this server (logs, etc..) **Setting timezone requires Administrator server permission.**"
  args:
    - ""
    - "GMT Standard Time"
@@ -1934,6 +1929,10 @@ clubaccept:
  desc: "Accept a user who applied to your club."
  args:
    - "user#1337"
+clubreject:
+  desc: "Reject a user who applied to your club."
+  args:
+    - "user#1337"
 clubleave:
  desc: "Leaves the club you're currently in."
  args:
@@ -2364,3 +2363,8 @@ doas:
  desc: "Execute the command as if you were the target user. Requires bot ownership and server administrator permission."
  args:
    - "@Thief .give all @Admin"
+cacheusers:
+  desc: Caches users of a Discord server and saves them to the database.
+  args:
+    - ""
+    - "serverId"
--- a/src/NadekoBot/data/strings/responses/responses.en-US.json
+++ b/src/NadekoBot/data/strings/responses/responses.en-US.json
@@ -848,6 +848,7 @@
  "club_not_exists": "That club doesn't exist.",
  "club_applied": "You've applied for membership in {0} club.",
  "club_accepted": "Accepted user {0} to the club.",
+  "club_rejected": "The application by {0} has been rejected.",
  "club_accept_invalid_applicant": "That user has not applied to your club.",
  "club_left": "You've left the club.",
  "club_not_in_a_club": "You are not in a club.",
@@ -1057,5 +1058,7 @@
  "sticker_missing_name": "Please specify a name for the sticker.",
  "thread_deleted": "Thread Deleted",
  "thread_created": "Thread Created",
-  "supported_languages": "Supported Languages"
+  "supported_languages": "Supported Languages",
+  "cache_users_pending": "Updating users, please wait...",
+  "cache_users_done": "{0} users were added and {1} users were updated."
 }
--- a/src/ayu/Ayu.Discord.Voice/Ayu.Discord.Voice.csproj
+++ b/src/ayu/Ayu.Discord.Voice/Ayu.Discord.Voice.csproj
@@ -7,7 +7,7 @@
    <Version>1.0.2</Version>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
    <PackageReference Include="Serilog" Version="2.11.0" />
    <PackageReference Include="System.Threading.Channels" Version="6.0.0" />
  </ItemGroup>
--- a/src/ayu/Ayu.Discord.Voice/VoiceGateway.cs
+++ b/src/ayu/Ayu.Discord.Voice/VoiceGateway.cs
@@ -237,20 +237,25 @@ namespace Ayu.Discord.Voice
            _udpEp = new(IPAddress.Parse(ready.Ip), ready.Port);

            var ssrcBytes = BitConverter.GetBytes(Ssrc);
-            var ipDiscoveryData = new byte[70];
-            Buffer.BlockCopy(ssrcBytes, 0, ipDiscoveryData, 0, ssrcBytes.Length);
+            Array.Reverse(ssrcBytes);
+            var ipDiscoveryData = new byte[74];
+            Buffer.BlockCopy(ssrcBytes, 0, ipDiscoveryData, 4, ssrcBytes.Length);
+            ipDiscoveryData[0] = 0x00;
+            ipDiscoveryData[1] = 0x01;
+            ipDiscoveryData[2] = 0x00;
+            ipDiscoveryData[3] = 0x46;
            await _udpClient.SendAsync(ipDiscoveryData, ipDiscoveryData.Length, _udpEp);
            while (true)
            {
                var buffer = _udpClient.Receive(ref _udpEp);

-                if (buffer.Length == 70)
+                if (buffer.Length == 74)
                {
                    //Log.Information("Received IP discovery data.");

-                    var myIp = Encoding.UTF8.GetString(buffer, 4, buffer.Length - 8);
+                    var myIp = Encoding.UTF8.GetString(buffer, 8, buffer.Length - 10);
                    MyIp = myIp.TrimEnd('\0');
-                    MyPort = BitConverter.ToUInt16(buffer, buffer.Length - 2);
+                    MyPort = (ushort)((buffer[^2] << 8) | buffer[^1]);

                    //Log.Information("{MyIp}:{MyPort}", MyIp, MyPort);

@@ -367,4 +372,4 @@ namespace Ayu.Discord.Voice
            await complete.Task;
        }
    }
-}
+}
Author	SHA1	Message	Date
Kwoth	a7e1e8a982	Fixed .config searches followedStreams.maxCount. Version upped to 4.3.20	2024-01-20 15:06:45 +00:00
Kwoth	b0ac35b82e	Updated changelog. Version upped to 4.3.19	2024-01-20 14:15:30 +00:00
Kwoth	367135be6a	Merge branch 'v4' of https://gitlab.com/kwoth/nadekobot into v4	2024-01-20 14:06:59 +00:00
Kwoth	f69f8548b0	Added followedStreams.maxCount to searches configx	2024-01-20 14:05:20 +00:00
Kwoth	449dbafff7	Merge branch 'v4' into 'v4' Update GPT ChatterBot See merge request Kwoth/nadekobot!313	2024-01-16 09:12:14 +00:00
Alexandra	afba004d85	Update GPT ChatterBot * Updates endpoint from v1/completions to v1/chat/completions * Add SharpTokens as a library to calculate input token usage * Subtract input tokens from max_tokens to ensure the API tokens don't exceed the max specified * Add Chat history support since this API supports it * Add a personality prompt to tweak the way the bot behaves * Add a min_tokens config to increase the quality of chat messages when history is enabled * Adjust the response function to throw an exception so that a null message isn't added to the list.	2024-01-16 09:12:14 +00:00
Kwoth	ef4d38bc87	Changelog updated, version updated to 4.3.18	2023-12-26 17:10:44 +00:00
Kwoth	96851c7c2d	Updated lib, fixed icon_url in .showembed	2023-12-26 17:02:02 +00:00
Kwoth	41ae182373	Removed .revimg and .revav, closes #417	2023-12-24 07:51:42 +00:00
Kwoth	9bf5a5a3cd	Merge branch 'force-add' into 'v4' Implemented command to force users into the database, closes #425 Closes #425 See merge request Kwoth/nadekobot!312	2023-12-21 12:45:34 +00:00
Kaoticz	bab23c25a5	Implemented owner-only command `.cacheusers` to force users into the database, closes #425	2023-12-21 12:45:34 +00:00
Kwoth	0ba8555f56	Merge branch 'v4' into 'v4' Potential fix for no-show quoteshow See merge request Kwoth/nadekobot!311	2023-12-11 23:24:04 +00:00
Cata	340c5b2268	Potential fix for no-show quoteshow	2023-12-11 23:24:04 +00:00
Kwoth	77e8c66b73	Merge branch 'hokutochen-v4-patch-27691' into 'v4' Notifications will be sent even if dms are off when using .give See merge request Kwoth/nadekobot!310	2023-11-29 12:26:26 +00:00
Hokuto Chen	9d9f8f7f98	Notifications will be sent even if dms are off when using .give	2023-11-29 12:26:26 +00:00
Kwoth	77358a563d	Added .clubreject which lets you reject applications to the club. Updated some dependencies.	2023-10-23 17:48:54 +00:00
Kwoth	82a48b101b	Fix for langset ts-ts, closes #419	2023-10-17 18:57:17 +00:00
Kwoth	6ebe321de9	Shouldn't be able to apply to clubs while in a club anymore. Fixes #423	2023-10-17 18:44:47 +00:00
Kwoth	b4fec10ee6	Updated changelog. Version upped to 4.3.17	2023-09-06 04:21:14 +00:00
Kwoth	42b9a01550	ci: osx-64 is the correct runtime identifier for macos	2023-09-06 03:59:56 +00:00
Kwoth	5f94b20015	First attempt at creating arm and x64 releases for all 3 platforms	2023-09-06 03:29:41 +00:00
Kwoth	201aa45c6b	Merge branch 'v4' into 'v4' Fixes for MRs 298 / 303 and 305 See merge request Kwoth/nadekobot!307	2023-09-04 04:08:08 +00:00
Ene	97ae7b5a5b	fix to gift being character limited (!302 ), and fixes UserUpdated and UserPresence not correctly ignoring users that are logignored.	2023-09-04 04:08:07 +00:00
Kwoth	9b09f223d9	Merge branch 'dylan.snijder93-v4-patch-73879' into 'v4' Install yt-dlp instead of youtube-dl See merge request Kwoth/nadekobot!300	2023-08-16 07:14:39 +00:00
Clithulhu	2caf406254	Install yt-dlp instead of youtube-dl	2023-08-16 07:14:39 +00:00
Kwoth	ce5e04b398	Merge branch 'Amie-chan-v4-patch-89425' into 'v4' Added Trim() to activity names since apparently some activities have trailing spaces. See merge request Kwoth/nadekobot!297	2023-06-30 14:15:16 +00:00
Amie	775487ad47	Added Trim() to activity names since apparently some activities have trailing spaces.	2023-06-30 14:15:15 +00:00
Kwoth	41e4936f52	- Fixed .logevents and .log bugs related to thread logging - Upped version to 4.3.16 - closes #418	2023-05-24 10:33:45 +02:00
Kwoth	d831a116d9	Merge branch 'hokutochen-v4-patch-63450' into 'v4' Remove %users% See merge request Kwoth/nadekobot!296	2023-05-20 22:42:56 +00:00
Hokuto Chen	8f43b44677	Remove %users% placeholder from docs	2023-05-20 22:42:56 +00:00
Kwoth	93df4f3bf3	Upped version to 4.3.15, Updated CHANGELOG.md	2023-05-21 00:37:29 +02:00
Kwoth	073b832065	Fixed .rps 'amount' field, closes #415	2023-05-17 17:39:25 +02:00
Kwoth	a01e580e03	Merge branch 'hokutochen-v4-patch-69027' into 'v4' %img:stuff% Deprecated See merge request Kwoth/nadekobot!295	2023-05-07 16:14:48 +00:00
Hokuto Chen	6124e2fab5	%img:stuff% Deprecated	2023-05-07 16:14:48 +00:00
Kwoth	4dd31d6a0b	Fixed .showembed, closes #410	2023-05-03 02:23:10 +02:00
Kwoth	e8706d4006	Fixed -w 0 for .trivia which allows for infinite games, closes #413	2023-05-02 09:36:27 +02:00
Kwoth	140cc43c98	Merge branch 'hokutochen-v4-patch-43149' into 'v4' updated updater link See merge request Kwoth/nadekobot!292	2023-04-06 00:40:30 +00:00
Hokuto Chen	26b7149435	updated updater link	2023-04-06 00:40:29 +00:00
Kwoth	b354ee7269	Merge branch 'v4' into 'v4' fixed bank award giving error message instead of checkmark See merge request Kwoth/nadekobot!294	2023-04-06 00:40:02 +00:00
Kamal Tufekcic	b829ca0109	fixed bank award giving error message instead of checkmark	2023-04-06 00:40:02 +00:00
Kwoth	37acdb81e8	Updated CHANGELOG.md, upped version to 4.3.14	2023-04-02 20:46:54 +02:00
Kwoth	a9aea65134	Possible fix for voice issues, thanks to anonymous contributor	2023-04-02 20:37:12 +02:00
Kwoth	5c03c5ba16	.banktake had ok/error responses flipped. No functional change, closes #409	2023-03-23 16:14:45 +01:00
Kwoth	42f00c08fa	PermRole should deny messages in threads too, closes #407	2023-03-23 16:13:20 +01:00
Kwoth	598d3b8967	Merge branch 'v4' into 'v4' Replaced CN API See merge request Kwoth/nadekobot!291	2023-03-12 05:50:35 +00:00
Kamal Tufekcic	8df41c749b	Replaced CN API	2023-03-12 05:50:35 +00:00
Kwoth	0eaa8be2d2	Merge branch 'v4' into 'v4' Updated LMGTFY to be more offensive like before See merge request Kwoth/nadekobot!289	2023-03-03 14:54:47 +00:00
Kamal Tufekcic	bdbe76f9f8	Update file Searches.cs	2023-03-03 14:21:59 +00:00
Kamal Tufekcic	08b609a4b4	Update file JokeCommands.cs	2023-02-28 19:50:52 +00:00
Snake26183	42d13b32b2	Merge branch 'v4' of https://gitlab.com/Kwoth/nadekobot into v4	2023-02-28 21:43:53 +00:00
Kwoth	096ada367f	Cleanup	2023-02-28 14:49:50 +01:00
Kwoth	0fed33ebda	Fixed .h <customeraction> not working with non-ascii characters	2023-02-28 13:22:44 +01:00
snake	cb9e918681	Merge branch 'v4' of https://gitlab.com/Kwoth/nadekobot into v4	2023-02-25 23:39:51 +02:00
Kwoth	bbf167df4d	.logserver will now enable newer log events as well, closes #403	2023-02-22 14:43:29 +01:00
Kwoth	595a2b401c	Merge branch 'v4' into 'v4' Fixed incorrect `gpt.model` values, added ChatGPT to docs See merge request Kwoth/nadekobot!287	2023-02-22 13:37:39 +00:00
Kamal Tufekcic	5713e8414e	Fixed incorrect `gpt.model` values, added ChatGPT to docs	2023-02-22 13:37:39 +00:00
Kwoth	a551caf0da	Merge branch 'hokutochen-v4-patch-39233' into 'v4' removed 21.04 and 21.10 (EOL) See merge request Kwoth/nadekobot!288	2023-02-21 20:42:14 +00:00
Hokuto Chen	b13f05c4c0	removed 21.04 and 21.10 (EOL)	2023-02-21 20:42:14 +00:00
Kwoth	6d6a3a811f	Upped version to 4.2.13, updated changelog	2023-02-20 21:57:42 +01:00
Kwoth	fb4aac9f0d	Fixed .log userpresence, closes #402	2023-02-20 21:53:25 +01:00
Kwoth	a98981de86	Changing the searches.yml ytprovider setting should now properly affect music queueing provider, but will require bot restart, closes #401	2023-02-20 02:12:00 +01:00
Kamal Tufekcic	9ef3646711	Update file config-guide.md	2023-02-13 12:26:21 +00:00
Kamal Tufekcic	9c174b8b6f	Update file config-guide.md	2023-02-13 12:24:08 +00:00
Kamal Tufekcic	657c1e461c	Update file config-guide.md	2023-02-13 12:01:33 +00:00
Kamal Tufekcic	f5a4a698bd	Update file GamesConfig.cs	2023-02-13 11:52:33 +00:00
Kwoth	8112337aaf	Merge branch 'hokutochen-v4-patch-25972' into 'v4' fixed withURL not working See merge request Kwoth/nadekobot!286	2023-02-12 10:20:22 +00:00
Hokuto Chen	73f7394e31	fixed withURL not working	2023-02-12 09:52:56 +00:00
Kwoth	987d88287a	Revert update to .net 7 by mistake	2023-02-12 04:36:03 +01:00
Kwoth	9dc783b36f	Fixed .betstats not working on european locales. - Upped version to 4.3.12	2023-02-11 23:04:31 +01:00
Kwoth	13741b8317	Use ytdlp instead of ytdl by default, not retroactive, only new users affected	2023-02-11 22:35:07 +01:00
Kwoth	313ca2674e	timed ban should now work with userids (users who are not in the server yet), closes #400	2023-02-11 22:32:36 +01:00
Kwoth	98956481e9	Nhentai removed as it's currently unfixable, closes #396	2023-02-11 22:17:39 +01:00
Kwoth	51e887fe04	Merge branch 'v4' of https://gitlab.com/Kwoth/nadekobot into v4	2023-02-10 20:17:20 +01:00
Kwoth	8ceab64b96	Added default value support to medusa system, thanks to kotz	2023-02-10 20:17:13 +01:00
Kwoth	92b8511cf1	Merge branch 'gpt' into 'v4' Added GPT-3 See merge request Kwoth/nadekobot!284	2023-02-10 13:10:45 +00:00
Alan Beatty	a6a052571e	Added GPT-3 as an alternative to cleverbot in `.config games` and `data/games.yml`	2023-02-10 13:10:45 +00:00