Updatec changelog. Upped version to 4.3.21

Update GPT ChatterBot

See merge request Kwoth/nadekobot!313

.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

CHANGELOG.md

@@ -2,13 +2,102 @@
 
 Experimental changelog. Mostly based on [keepachangelog](https://keepachangelog.com/en/1.0.0/) except date format. a-c-f-r-o
 
-## [4.3.12] - 11.02.2023
+## [4.3.21]
+
+### Fixed
+- Possible fix for a duplicate in `.h bank`
+- Fixed `.stock` command
+- Fixed `.clubapply` and `.clubaccept`
+- Removed some redundant discriminators
+
+## [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 
+- Fixed some bugs in the medusa system
 
 ## [4.3.11] - 21.01.2023
 
@@ -44,7 +133,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
@@ -53,13 +142,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
@@ -71,7 +160,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
 

Dockerfile

@@ -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; \
+    curl -Lo /usr/local/bin/yt-dlp https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp; \
-    apt-get purge -y python3-pip; \
+    chmod a+rx /usr/local/bin/yt-dlp; \
-    chmod +x /usr/local/bin/youtube-dl; \
     apt-get autoremove -y; \
     apt-get autoclean -y
 

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

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*
 

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

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

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
+### Shard stats placeholders 
-
-- `%servers%` - Server count bot has joined
-- `%users%` - Combined user count on servers the bot has joined
-
-### 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)

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>

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

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;
 

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;
     

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; }

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; }
 }

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))
-
-        if (_exprs.ExpressionExists(ctx.Guild?.Id, input) || _exprs.ExpressionExists(null, input))
             return TypeReaderResult.FromSuccess(new CommandOrExprInfo(input, CommandOrExprInfo.Type.Custom));
 
         var cmd = await new CommandTypeReader(_commandHandler, _cmds).ReadAsync(ctx, input);

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)

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);
 }

src/NadekoBot/Db/Models/DiscordUser.cs

@@ -28,5 +28,10 @@ public class DiscordUser : DbEntity
         => UserId.GetHashCode();
 
     public override string ToString()
-        => Username + "#" + Discriminator;
+    {
+        if (string.IsNullOrWhiteSpace(Discriminator) || Discriminator == "0000")
+            return Username;
+        
+        return Username + "#" + Discriminator;
+    }
 }

src/NadekoBot/Db/Models/Waifu.cs

@@ -19,25 +19,25 @@ public class WaifuInfo : DbEntity
 
     public override string ToString()
     {
-        var claimer = "no one";
         var status = string.Empty;
 
-        var waifuUsername = Waifu.Username.TrimTo(20);
+        var waifuUsername = Waifu.ToString().TrimTo(20);
-        var claimerUsername = Claimer?.Username.TrimTo(20);
+        var claimer = Claimer?.ToString().TrimTo(20)
+            ?? "no one";
+
+        var affinity = Affinity?.ToString().TrimTo(20);
 
-        if (ClaimerId is not null)
-            claimer = $"{claimerUsername}#{Claimer.Discriminator}";
         if (AffinityId is null)
             status = $"... but {waifuUsername}'s heart is empty";
         else if (AffinityId == ClaimerId)
-            status = $"... and {waifuUsername} likes {claimerUsername} too <3";
+            status = $"... and {waifuUsername} likes {claimer} too <3";
         else
         {
             status =
-                $"... but {waifuUsername}'s heart belongs to {Affinity.Username.TrimTo(20)}#{Affinity.Discriminator}";
+                $"... but {waifuUsername}'s heart belongs to {affinity}";
         }
 
-        return $"**{waifuUsername}#{Waifu.Discriminator}** - claimed by **{claimer}**\n\t{status}";
+        return $"**{waifuUsername}** - claimed by **{claimer}**\n\t{status}";
     }
 }
 

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)
             {

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 { };

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;
 }

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)

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
+#if !GLOBAL_NADEKO
-    , INService // don't load this service on global nadeko
+        , INService // don't load this service on global nadeko
-    #endif
+#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()
+                .AsNoTracking()
-                             .Where(x => guildIds.Contains(x.GuildId))
+                .Where(x => guildIds.Contains(x.GuildId))
-                             .Include(ls => ls.LogIgnores)
+                .Include(ls => ls.LogIgnores)
-                             .ToList();
+                .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)
+                        if (!((SocketGuild)key.Guild).CurrentUser.GetPermissions(key).SendMessages)
-                                  return Task.CompletedTask;
+                            return Task.CompletedTask;
 
-                              if (PresenceUpdates.TryRemove(key, out var msgs))
+                        if (PresenceUpdates.TryRemove(key, out var msgs))
-                              {
+                        {
-                                  var title = GetText(key.Guild, strs.presence_updates);
+                            var title = GetText(key.Guild, strs.presence_updates);
-                                  var desc = string.Join(Environment.NewLine, msgs);
+                            var desc = string.Join(Environment.NewLine, msgs);
-                                  return key.SendConfirmAsync(_eb, title, desc.TrimTo(2048)!);
+                            return key.SendConfirmAsync(_eb, title, desc.TrimTo(2048)!);
-                              }
+                        }
 
-                              return Task.CompletedTask;
+                        return Task.CompletedTask;
-                          })
+                    })
-                          .WhenAll();
+                    .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()
+            .WithOkColor()
-                       .WithTitle($"⚠️ User Warned")
+            .WithTitle($"⚠️ User Warned")
-                       .WithDescription($"<@{arg.UserId}> | {arg.UserId}")
+            .WithDescription($"<@{arg.UserId}> | {arg.UserId}")
-                       .AddField("Mod", arg.Moderator)
+            .AddField("Mod", arg.Moderator)
-                       .AddField("Reason", string.IsNullOrWhiteSpace(arg.Reason) ? "-" : arg.Reason, true)
+            .AddField("Reason", string.IsNullOrWhiteSpace(arg.Reason) ? "-" : arg.Reason, true)
-                       .WithFooter(CurrentTime(g));
+            .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}")
+                        .WithDescription($"{before.Username} | {before.Id}")
-                         .AddField("Old Name", $"{before.Username}", true)
+                        .AddField("Old Name", $"{before.Username}", true)
-                         .AddField("New Name", $"{after.Username}", true)
+                        .AddField("New Name", $"{after.Username}", true)
-                         .WithFooter(CurrentTime(g))
+                        .WithFooter(CurrentTime(g))
-                         .WithOkColor();
+                        .WithOkColor();
                 }
                 else if (before.AvatarId != after.AvatarId)
                 {
                     embed.WithTitle("👥" + GetText(g, strs.avatar_changed))
-                         .WithDescription($"{before.Username}#{before.Discriminator} | {before.Id}")
+                        .WithDescription($"{before.Username}#{before.Discriminator} | {before.Id}")
-                         .WithFooter(CurrentTime(g))
+                        .WithFooter(CurrentTime(g))
-                         .WithOkColor();
+                        .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)
+                    .WithAuthor(mutes)
-                               .WithTitle($"{usr.Username}#{usr.Discriminator} | {usr.Id}")
+                    .WithTitle($"{usr.Username}#{usr.Discriminator} | {usr.Id}")
-                               .WithFooter(CurrentTime(usr.Guild))
+                    .WithFooter(CurrentTime(usr.Guild))
-                               .WithOkColor();
+                    .WithOkColor();
 
                 await logChannel.EmbedAsync(embed);
             }
@@ -529,10 +591,10 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                 }
 
                 var embed = _eb.Create()
-                               .WithAuthor(mutes)
+                    .WithAuthor(mutes)
-                               .WithTitle($"{usr.Username}#{usr.Discriminator} | {usr.Id}")
+                    .WithTitle($"{usr.Username}#{usr.Discriminator} | {usr.Id}")
-                               .WithFooter($"{CurrentTime(usr.Guild)}")
+                    .WithFooter($"{CurrentTime(usr.Guild)}")
-                               .WithOkColor();
+                    .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}")
+                    .WithAuthor($"🛡 Anti-{protection}")
-                               .WithTitle(GetText(logChannel.Guild, strs.users) + " " + punishment)
+                    .WithTitle(GetText(logChannel.Guild, strs.users) + " " + punishment)
-                               .WithDescription(string.Join("\n", users.Select(u => u.ToString())))
+                    .WithDescription(string.Join("\n", users.Select(u => u.ToString())))
-                               .WithFooter(CurrentTime(logChannel.Guild))
+                    .WithFooter(CurrentTime(logChannel.Guild))
-                               .WithOkColor();
+                    .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()
+                        .WithOkColor()
-                                   .WithFooter(CurrentTime(before.Guild))
+                        .WithFooter(CurrentTime(before.Guild))
-                                   .WithTitle($"{before.Username}#{before.Discriminator} | {before.Id}");
+                        .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),
+                            .AddField(GetText(logChannel.Guild, strs.old_nick),
-                                 $"{before.Nickname}#{before.Discriminator}")
+                                $"{before.Nickname}#{before.Discriminator}")
-                             .AddField(GetText(logChannel.Guild, strs.new_nick),
+                            .AddField(GetText(logChannel.Guild, strs.new_nick),
-                                 $"{after.Nickname}#{after.Discriminator}");
+                                $"{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)
+                                .Select(r => r.Name)
-                                                  .ToList();
+                                .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}")
+                        .WithDescription($"{after} | {after.Id}")
-                         .AddField(GetText(logChannel.Guild, strs.ch_old_name), before.Name);
+                        .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}")
+                        .WithDescription($"{after} | {after.Id}")
-                         .AddField(GetText(logChannel.Guild, strs.old_topic), beforeTextChannel?.Topic ?? "-")
+                        .AddField(GetText(logChannel.Guild, strs.old_topic), beforeTextChannel?.Topic ?? "-")
-                         .AddField(GetText(logChannel.Guild, strs.new_topic), afterTextChannel?.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()
+                    .WithOkColor()
-                                               .WithTitle("🆕 " + title)
+                    .WithTitle("🆕 " + title)
-                                               .WithDescription($"{ch.Name} | {ch.Id}")
+                    .WithDescription($"{ch.Name} | {ch.Id}")
-                                               .WithFooter(CurrentTime(ch.Guild)));
+                    .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()
+                    .WithOkColor()
-                                               .WithTitle("🆕 " + title)
+                    .WithTitle("🆕 " + title)
-                                               .WithDescription($"{ch.Name} | {ch.Id}")
+                    .WithDescription($"{ch.Name} | {ch.Id}")
-                                               .WithFooter(CurrentTime(ch.Guild)));
+                    .WithFooter(CurrentTime(ch.Guild)));
             }
             catch (Exception)
             {
@@ -883,7 +905,7 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                     str = "🎙"
                           + Format.Code(PrettyCurrentTime(usr.Guild))
                           + GetText(logChannel.Guild,
-                              strs.user_vmoved("👤" + Format.Bold(usr.Username + "#" + usr.Discriminator),
+                              strs.user_vmoved("👤" + Format.Bold(usr.Username),
                                   Format.Bold(beforeVch?.Name ?? ""),
                                   Format.Bold(afterVch?.Name ?? "")));
                 }
@@ -892,7 +914,7 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                     str = "🎙"
                           + Format.Code(PrettyCurrentTime(usr.Guild))
                           + GetText(logChannel.Guild,
-                              strs.user_vjoined("👤" + Format.Bold(usr.Username + "#" + usr.Discriminator),
+                              strs.user_vjoined("👤" + Format.Bold(usr.Username),
                                   Format.Bold(afterVch?.Name ?? "")));
                 }
                 else if (afterVch is null)
@@ -900,7 +922,7 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                     str = "🎙"
                           + Format.Code(PrettyCurrentTime(usr.Guild))
                           + GetText(logChannel.Guild,
-                              strs.user_vleft("👤" + Format.Bold(usr.Username + "#" + usr.Discriminator),
+                              strs.user_vleft("👤" + Format.Bold(usr.Username),
                                   Format.Bold(beforeVch.Name ?? "")));
                 }
 
@@ -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()
+                    .WithOkColor()
-                               .WithTitle("❌ " + GetText(logChannel.Guild, strs.user_left))
+                    .WithTitle("❌ " + GetText(logChannel.Guild, strs.user_left))
-                               .WithDescription(usr.ToString())
+                    .WithDescription(usr.ToString())
-                               .AddField("Id", usr.Id.ToString())
+                    .AddField("Id", usr.Id.ToString())
-                               .WithFooter(CurrentTime(guild));
+                    .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()
+                    .WithOkColor()
-                               .WithTitle("✅ " + GetText(logChannel.Guild, strs.user_joined))
+                    .WithTitle("✅ " + GetText(logChannel.Guild, strs.user_joined))
-                               .WithDescription($"{usr.Mention} `{usr}`")
+                    .WithDescription($"{usr.Mention} `{usr}`")
-                               .AddField("Id", usr.Id.ToString())
+                    .AddField("Id", usr.Id.ToString())
-                               .AddField(GetText(logChannel.Guild, strs.joined_server),
+                    .AddField(GetText(logChannel.Guild, strs.joined_server),
-                                   $"{usr.JoinedAt?.ToString("dd.MM.yyyy HH:mm") ?? "?"}",
+                        $"{usr.JoinedAt?.ToString("dd.MM.yyyy HH:mm") ?? "?"}",
-                                   true)
+                        true)
-                               .AddField(GetText(logChannel.Guild, strs.joined_discord),
+                    .AddField(GetText(logChannel.Guild, strs.joined_discord),
-                                   $"{usr.CreatedAt:dd.MM.yyyy HH:mm}",
+                        $"{usr.CreatedAt:dd.MM.yyyy HH:mm}",
-                                   true)
+                        true)
-                               .WithFooter(CurrentTime(usr.Guild));
+                    .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()
+                    .WithOkColor()
-                               .WithTitle("♻️ " + GetText(logChannel.Guild, strs.user_unbanned))
+                    .WithTitle("♻️ " + GetText(logChannel.Guild, strs.user_unbanned))
-                               .WithDescription(usr.ToString()!)
+                    .WithDescription(usr.ToString()!)
-                               .AddField("Id", usr.Id.ToString())
+                    .AddField("Id", usr.Id.ToString())
-                               .WithFooter(CurrentTime(guild));
+                    .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()
+                    .WithOkColor()
-                               .WithTitle("🚫 " + GetText(logChannel.Guild, strs.user_banned))
+                    .WithTitle("🚫 " + GetText(logChannel.Guild, strs.user_banned))
-                               .WithDescription(usr.ToString()!)
+                    .WithDescription(usr.ToString()!)
-                               .AddField("Id", usr.Id.ToString())
+                    .AddField("Id", usr.Id.ToString())
-                               .AddField("Reason", string.IsNullOrWhiteSpace(reason) ? "-" : reason)
+                    .AddField("Reason", string.IsNullOrWhiteSpace(reason) ? "-" : reason)
-                               .WithFooter(CurrentTime(guild));
+                    .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()
+                    .WithOkColor()
-                               .WithTitle("🗑 "
+                    .WithTitle("🗑 "
-                                          + GetText(logChannel.Guild, strs.msg_del(((ITextChannel)msg.Channel).Name)))
+                               + GetText(logChannel.Guild, strs.msg_del(((ITextChannel)msg.Channel).Name)))
-                               .WithDescription(msg.Author.ToString()!)
+                    .WithDescription(msg.Author.ToString()!)
-                               .AddField(GetText(logChannel.Guild, strs.content),
+                    .AddField(GetText(logChannel.Guild, strs.content),
-                                   string.IsNullOrWhiteSpace(resolvedMessage) ? "-" : resolvedMessage)
+                        string.IsNullOrWhiteSpace(resolvedMessage) ? "-" : resolvedMessage)
-                               .AddField("Id", msg.Id.ToString())
+                    .AddField("Id", msg.Id.ToString())
-                               .WithFooter(CurrentTime(channel.Guild));
+                    .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()
+                    .WithOkColor()
-                               .WithTitle("📝 "
+                    .WithTitle("📝 "
-                                          + GetText(logChannel.Guild,
+                               + GetText(logChannel.Guild,
-                                              strs.msg_update(((ITextChannel)after.Channel).Name)))
+                                   strs.msg_update(((ITextChannel)after.Channel).Name)))
-                               .WithDescription(after.Author.ToString()!)
+                    .WithDescription(after.Author.ToString()!)
-                               .AddField(GetText(logChannel.Guild, strs.old_msg),
+                    .AddField(GetText(logChannel.Guild, strs.old_msg),
-                                   string.IsNullOrWhiteSpace(before.Content)
+                        string.IsNullOrWhiteSpace(before.Content)
-                                       ? "-"
+                            ? "-"
-                                       : before.Resolve(TagHandling.FullName))
+                            : before.Resolve(TagHandling.FullName))
-                               .AddField(GetText(logChannel.Guild, strs.new_msg),
+                    .AddField(GetText(logChannel.Guild, strs.new_msg),
-                                   string.IsNullOrWhiteSpace(after.Content) ? "-" : after.Resolve(TagHandling.FullName))
+                        string.IsNullOrWhiteSpace(after.Content) ? "-" : after.Resolve(TagHandling.FullName))
-                               .AddField("Id", after.Id.ToString())
+                    .AddField("Id", after.Id.ToString())
-                               .WithFooter(CurrentTime(channel.Guild));
+                    .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();
     }
-}
+}

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;
             }

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
+        .WithEventEmitter(args
-                                                                => new MultilineScalarFlowStyleEmitter(args))
+            => new MultilineScalarFlowStyleEmitter(args))
-                                                            .WithNamingConvention(CamelCaseNamingConvention.Instance)
+        .WithNamingConvention(CamelCaseNamingConvention.Instance)
-                                                            .WithIndentedSequences()
+        .WithIndentedSequences()
-                                                            .ConfigureDefaultValuesHandling(DefaultValuesHandling
+        .ConfigureDefaultValuesHandling(DefaultValuesHandling
-                                                                .OmitDefaults)
+            .OmitDefaults)
-                                                            .DisableAliases()
+        .DisableAliases()
-                                                            .Build();
+        .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 NadekoExpression[] globalExpressions = Array.Empty<NadekoExpression>();
-    private ConcurrentDictionary<ulong, NadekoExpression[]> newguildExpressions;
+    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))
+            .Where(x => allGuildIds.Contains(x.GuildId.Value))
-                                  .ToListAsync();
+            .ToListAsync();
 
         newguildExpressions = guildItems.GroupBy(k => k.GuildId!.Value)
-                                      .ToDictionary(g => g.Key,
+            .ToDictionary(g => g.Key,
-                                          g => g.Select(x =>
+                g => g.Select(x =>
-                                                {
+                    {
-                                                    x.Trigger = x.Trigger.Replace(MENTION_PH, _bot.Mention);
+                        x.Trigger = x.Trigger.Replace(MENTION_PH, _bot.Mention);
-                                                    return x;
+                        return x;
-                                                })
+                    })
-                                                .ToArray())
+                    .ToArray())
-                                      .ToConcurrent();
+            .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)
+                .Where(x => x.GuildId == null || x.GuildId == 0)
-                                 .AsEnumerable()
+                .AsEnumerable()
-                                 .Select(x =>
+                .Select(x =>
-                                 {
+                {
-                                     x.Trigger = x.Trigger.Replace(MENTION_PH, _bot.Mention);
+                    x.Trigger = x.Trigger.Replace(MENTION_PH, _bot.Mention);
-                                     return x;
+                    return x;
-                                 })
+                })
-                                 .ToArray();
+                .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();
+        input = input.ToLowerInvariant();
-        var expr = uow.Expressions.GetByGuildIdAndInput(guildId, input);
+
-        return expr is not null;
+        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
+                .Select(expr => new NadekoExpression
-                                                     {
+                {
-                                                         GuildId = guildId,
+                    GuildId = guildId,
-                                                         Response = expr.Res,
+                    Response = expr.Res,
-                                                         Reactions = expr.React?.Join("@@@"),
+                    Reactions = expr.React?.Join("@@@"),
-                                                         Trigger = trigger,
+                    Trigger = trigger,
-                                                         AllowTarget = expr.At,
+                    AllowTarget = expr.At,
-                                                         ContainsAnywhere = expr.Ca,
+                    ContainsAnywhere = expr.Ca,
-                                                         DmResponse = expr.Dm,
+                    DmResponse = expr.Dm,
-                                                         AutoDeleteTrigger = expr.Ad
+                    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;
     }
 }

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),
+                await ctx.OkAsync();
-                    _client.GetUser(userId)?.ToString()
-                    ?? userId.ToString(),
-                    CurrencySign));
                 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),
+                await ctx.OkAsync();
-                    _client.GetUser(userId)?.ToString()
-                    ?? userId.ToString(),
-                    CurrencySign));
                 return;
             }
-            
+
-            await ctx.OkAsync();
         }
 
         [Cmd]

src/NadekoBot/Modules/Gambling/Gambling.cs

@@ -239,7 +239,7 @@ public partial class Gambling : GamblingModule<GamblingService>
 
         var usr = membersArray[new NadekoRandom().Next(0, membersArray.Length)];
         await SendConfirmAsync("🎟 " + GetText(strs.raffled_user),
-            $"**{usr.Username}#{usr.Discriminator}**",
+            $"**{usr.Username}**",
             footer: $"ID: {usr.Id}");
     }
 
@@ -258,7 +258,7 @@ public partial class Gambling : GamblingModule<GamblingService>
 
         var usr = membersArray[new NadekoRandom().Next(0, membersArray.Length)];
         await SendConfirmAsync("🎟 " + GetText(strs.raffled_user),
-            $"**{usr.Username}#{usr.Discriminator}**",
+            $"**{usr.Username}**",
             footer: $"ID: {usr.Id}");
     }
 
@@ -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),

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));
         }
     }
-}
+}

src/NadekoBot/Modules/Games/ChatterBot/ChatterbotService.cs

@@ -79,8 +79,12 @@ public class ChatterBotService : IExecOnMessage
             case ChatBotImplementation.Gpt3:
                 if (!string.IsNullOrWhiteSpace(_creds.Gpt3ApiKey))
                     return new OfficialGpt3Session(_creds.Gpt3ApiKey,
-                        _gcs.Data.ChatGpt.Model,
+                        _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.");
@@ -199,7 +203,7 @@ public class ChatterBotService : IExecOnMessage
             }
 
             _ = 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)

src/NadekoBot/Modules/Games/ChatterBot/_Common/Gpt3Response.cs

@@ -11,7 +11,13 @@ public class Gpt3Response
 
 public class Choice
 {
-    public string Text { get; set; }
+    [JsonPropertyName("message")]
+    public Message Message { get; init; }
+}
+
+public class Message {
+    [JsonPropertyName("content")]
+    public string Content { get; init; }
 }
 
 public class Gpt3ApiRequest
@@ -19,12 +25,22 @@ public class Gpt3ApiRequest
     [JsonPropertyName("model")]
     public string Model { get; init; }
 
-    [JsonPropertyName("prompt")]
+    [JsonPropertyName("messages")]
-    public string Prompt { get; init; }
+    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;}
 }

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);
 }

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 ?? ""));

src/NadekoBot/Modules/Games/ChatterBot/_Common/OfficialGpt3Session.cs

@@ -1,63 +1,101 @@
 #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/completions";
+        => $"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,
-        Gpt3Model model,
+        ChatGptModel model,
+        int chatHistory,
         int maxTokens,
+        int minTokens,
+        string personality,
+        string nadekoUsername,
         IHttpClientFactory factory)
     {
         _apiKey = apiKey;
         _httpFactory = factory;
         switch (model)
         {
-            case Gpt3Model.Ada001:
+            case ChatGptModel.Gpt35Turbo:
-                _model = "text-ada-001";
+                _model = "gpt-3.5-turbo";
                 break;
-            case Gpt3Model.Babbage001:
+            case ChatGptModel.Gpt4:
-                _model = "text-babbage-001";
+                _model = "gpt-4";
                 break;
-            case Gpt3Model.Curie001:
+            case ChatGptModel.Gpt432k:
-                _model = "text-curie-001";
+                _model = "gpt-4-32k";
-                break;
-            case Gpt3Model.Davinci003:
-                _model = "text-davinci-003";
                 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)
+    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,
-            Prompt = input,
+            Messages = messages,
-            MaxTokens = _maxTokens,
+            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;
-            return response?.Choices[0]?.Text;
+            //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
         {

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; } = 2;
+    public int Version { get; set; } = 3;
 
     [Comment("Hangman related settings (.hangman command)")]
     public HangmanConfig Hangman { get; set; } = new()
@@ -108,14 +108,22 @@ public sealed partial class GamesConfig : ICloneable<GamesConfig>
 public sealed partial class ChatGptConfig
 {
     [Comment(@"Which GPT-3 Model should bot use.
-'ada' - cheapest and fastest 
+    gpt35turbo - cheapest
-'babbage' - 2nd option
+    gpt4 - 30x more expensive, higher quality
-'curie' - 3rd option
+    gp432k - same model as above, but with a 32k token limit")]
-'davinci' - Most expensive, slowest")]
+    public ChatGptModel ModelName { get; set; } = ChatGptModel.Gpt35Turbo;
-    public Gpt3Model Model { get; set; } = Gpt3Model.Ada001;
+
+    [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]
@@ -149,10 +157,9 @@ public enum ChatBotImplementation
     Gpt3
 }
 
-public enum Gpt3Model
+public enum ChatGptModel
 {
-    Ada001,
+    Gpt35Turbo,
-    Babbage001,
+    Gpt4,
-    Curie001,
+    Gpt432k
-    Davinci003
 }

src/NadekoBot/Modules/Games/GamesConfigService.cs

@@ -28,20 +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.model",
+        AddParsedProp("gpt.modelName",
-            gs => gs.ChatGpt.Model,
+            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();
     }
@@ -65,7 +78,16 @@ public sealed class GamesConfigService : ConfigServiceBase<GamesConfig>
             ModifyConfig(c =>
             {
                 c.Version = 2;
-                c.ChatBot = ChatBotImplementation.Cleverbot;  
+                c.ChatBot = ChatBotImplementation.Cleverbot;
+            });
+        }
+
+        if (data.Version < 3)
+        {
+            ModifyConfig(c =>
+            {
+                c.Version = 3;
+                c.ChatGpt.ModelName = ChatGptModel.Gpt35Turbo;
             });
         }
     }

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);

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;

src/NadekoBot/Modules/Help/Help.cs

@@ -292,7 +292,7 @@ public partial class Help : NadekoModule<HelpService>
                     .WithTitle(GetText(strs.cmd_group_commands(group.Name)))
                     .WithOkColor();
 
-        foreach (var cmd in group.Commands)
+        foreach (var cmd in group.Commands.DistinctBy(x => x.Aliases[0]))
         {
             eb.AddField(prefix + cmd.Aliases.First(), cmd.RealSummary(_strings, _medusae, Culture, prefix));
         }

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)

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

@@ -85,11 +85,11 @@ public partial class Searches
                         .WithUrl($"https://www.tradingview.com/chart/?symbol={stock.Symbol}")
                         .WithTitle(stock.Name)
                         .AddField(GetText(strs.price), $"{sign} **{price}**", true)
-                        .AddField(GetText(strs.market_cap), stock.MarketCap.ToString("C0", localCulture), true)
+                        .AddField(GetText(strs.market_cap), stock.MarketCap, true)
                         .AddField(GetText(strs.volume_24h), stock.DailyVolume.ToString("C0", localCulture), true)
                         .AddField("Change", $"{change} ({changePercent})", true)
-                        .AddField("Change 50d", $"{sign50}{change50}", true)
+                        // .AddField("Change 50d", $"{sign50}{change50}", true)
-                        .AddField("Change 200d", $"{sign200}{change200}", true)
+                        // .AddField("Change 200d", $"{sign200}{change200}", true)
                         .WithFooter(stock.Exchange);
             
             var message = await ctx.Channel.EmbedAsync(eb);

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

@@ -1,5 +1,8 @@
-using CsvHelper;
+using AngleSharp;
+using AngleSharp.Html.Dom;
+using CsvHelper;
 using CsvHelper.Configuration;
+using CsvHelper.Configuration.Attributes;
 using Google.Protobuf.WellKnownTypes;
 using System.Globalization;
 using System.Net.Http.Json;
@@ -23,33 +26,61 @@ public sealed class DefaultStockDataService : IStockDataService, INService
                 return default;
 
             using var http = _httpClientFactory.CreateClient();
-            var data = await http.GetFromJsonAsync<YahooQueryModel>(
-                $"https://query1.finance.yahoo.com/v7/finance/quote?symbols={query}");
 
-            if (data is null)
-                return default; 
-            
-            var symbol = data.QuoteResponse.Result.FirstOrDefault();
 
-            if (symbol is null)
+
-                return default;
+            var quoteHtmlPage = $"https://finance.yahoo.com/quote/{query.ToUpperInvariant()}";
+
+            var config = Configuration.Default.WithDefaultLoader();
+            using var document = await BrowsingContext.New(config).OpenAsync(quoteHtmlPage);
+            var divElem =
+                document.QuerySelector(
+                    "#quote-header-info > div:nth-child(2) > div > div > h1");
+            var tickerName = (divElem)?.TextContent;
+
+            var marketcap = document
+                            .QuerySelectorAll("table")
+                            .Skip(1)
+                            .First()
+                            .QuerySelector("tbody > tr > td:nth-child(2)")
+                            ?.TextContent;
+
+
+            var volume = document.QuerySelector("td[data-test='AVERAGE_VOLUME_3MONTH-value']")
+                                 ?.TextContent;
             
+            var close= document.QuerySelector("td[data-test='PREV_CLOSE-value']")
+                                 ?.TextContent ?? "0";
+            
+            var price = document
+                        .QuerySelector("#quote-header-info")
+                        ?.QuerySelector("fin-streamer[data-field='regularMarketPrice']")
+                                 ?.TextContent ?? close;
+            
+            // var data = await http.GetFromJsonAsync<YahooQueryModel>(
+            //     $"https://query1.finance.yahoo.com/v7/finance/quote?symbols={query}");
+            //
+            // if (data is null)
+            //     return default;
+
+            // var symbol = data.QuoteResponse.Result.FirstOrDefault();
+
+            // if (symbol is null)
+            // return default;
+
             return new()
             {
-                Name = symbol.LongName,
+                Name = tickerName,
-                Symbol = symbol.Symbol,
+                Symbol = query,
-                Price = symbol.RegularMarketPrice,
+                Price = double.Parse(price, NumberStyles.Any, CultureInfo.InvariantCulture),
-                Close = symbol.RegularMarketPreviousClose,
+                Close = double.Parse(close, NumberStyles.Any, CultureInfo.InvariantCulture),
-                MarketCap = symbol.MarketCap,
+                MarketCap = marketcap,
-                Change50d = symbol.FiftyDayAverageChangePercent,
+                DailyVolume = (long)double.Parse(volume ?? "0", NumberStyles.Any, CultureInfo.InvariantCulture),
-                Change200d = symbol.TwoHundredDayAverageChangePercent,
-                DailyVolume = symbol.AverageDailyVolume10Day,
-                Exchange = symbol.FullExchangeName
             };
         }
-        catch (Exception)
+        catch (Exception ex)
         {
-            // Log.Warning(ex, "Error getting stock data: {ErrorMessage}", ex.Message);
+            Log.Warning(ex, "Error getting stock data: {ErrorMessage}", ex.ToString());
             return default;
         }
     }
@@ -60,9 +91,9 @@ public sealed class DefaultStockDataService : IStockDataService, INService
             throw new ArgumentNullException(nameof(query));
 
         query = Uri.EscapeDataString(query);
-        
+
         using var http = _httpClientFactory.CreateClient();
-        
+
         var res = await http.GetStringAsync(
             "https://finance.yahoo.com/_finance_doubledown/api/resource/searchassist"
             + $";searchTerm={query}"
@@ -72,11 +103,11 @@ public sealed class DefaultStockDataService : IStockDataService, INService
 
         if (data is null or { Items: null })
             return Array.Empty<SymbolData>();
-        
+
         return data.Items
-                  .Where(x => x.Type == "S")
+                   .Where(x => x.Type == "S")
-                  .Select(x => new SymbolData(x.Symbol, x.Name))
+                   .Select(x => new SymbolData(x.Symbol, x.Name))
-                  .ToList();
+                   .ToList();
     }
 
     private static CsvConfiguration _csvConfig = new(CultureInfo.InvariantCulture)

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

@@ -6,7 +6,7 @@ public class StockData
     public string Name { get; set; }
     public string Symbol { get; set; }
     public double Price { get; set; }
-    public long MarketCap { get; set; }
+    public string MarketCap { get; set; }
     public double Close { get; set; }
     public double Change50d { get; set; }
     public double Change200d { get; set; }

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;

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; }
     }
-}
+}

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/"));
+        var response = await http.GetStringAsync(new Uri("https://api.chucknorris.io/jokes/random"));
-        return JObject.Parse(response)["value"]["joke"] + " 😆";
+        return JObject.Parse(response)["value"] + " 😆";
     }
 
     public async Task<MtgData> GetMtgCardAsync(string search)

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()
+                .AsQueryable()
-                                  .Include(x => x.FollowedStreams)
+                .Include(x => x.FollowedStreams)
-                                  .Where(x => ids.Contains(x.GuildId))
+                .Where(x => ids.Contains(x.GuildId))
-                                  .ToList();
+                .ToList();
 
             _offlineNotificationServers = new(guildConfigs
-                                              .Where(gc => gc.NotifyStreamOffline)
+                .Where(gc => gc.NotifyStreamOffline)
-                                              .Select(x => x.GuildId)
+                .Select(x => x.GuildId)
-                                              .ToList());
+                .ToList());
-            
+
             _deleteOnOfflineServers = new(guildConfigs
-                                              .Where(gc => gc.DeleteStreamOnlineMessage)
+                .Where(gc => gc.DeleteStreamOnlineMessage)
-                                              .Select(x => x.GuildId)
+                .Select(x => x.GuildId)
-                                              .ToList());
+                .ToList());
 
             var followedStreams = guildConfigs.SelectMany(x => x.FollowedStreams).ToList();
 
             _shardTrackedStreams = followedStreams.GroupBy(x => new
-                                                  {
+                {
-                                                      x.Type,
+                    x.Type,
-                                                      Name = x.Username.ToLower()
+                    Name = x.Username.ToLower()
-                                                  })
+                })
-                                                  .ToList()
+                .ToList()
-                                                  .ToDictionary(
+                .ToDictionary(
-                                                      x => new StreamDataKey(x.Key.Type, x.Key.Name.ToLower()),
+                    x => new StreamDataKey(x.Key.Type, x.Key.Name.ToLower()),
-                                                      x => x.GroupBy(y => y.GuildId)
+                    x => x.GroupBy(y => y.GuildId)
-                                                            .ToDictionary(y => y.Key,
+                        .ToDictionary(y => y.Key,
-                                                                y => y.AsEnumerable().ToHashSet()));
+                            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,
+                        x.Type,
-                                                      Name = x.Username.ToLower()
+                        Name = x.Username.ToLower()
-                                                  })
+                    })
-                                                  .ToDictionary(x => new StreamDataKey(x.Key.Type, x.Key.Name),
+                    .ToDictionary(x => new StreamDataKey(x.Key.Type, x.Key.Name),
-                                                      x => x.Select(fs => fs.GuildId).ToHashSet());
+                        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()
+                        .AsQueryable()
-                                      .Where(x => x.Type == kvp.Key && kvp.Value.Contains(x.Username))
+                        .Where(x => x.Type == kvp.Key && kvp.Value.Contains(x.Username))
-                                      .ToList();
+                        .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
+                    // send offline stream notifications only to guilds which enable it with .stoff
-                      .SelectMany(x => x.Value)
+                    .SelectMany(x => x.Value)
-                      .Where(x => _offlineNotificationServers.Contains(x.GuildId))
+                    .Where(x => _offlineNotificationServers.Contains(x.GuildId))
-                      .Select(fs => _client.GetGuild(fs.GuildId)
+                    .Select(fs => _client.GetGuild(fs.GuildId)
-                                           ?.GetTextChannel(fs.ChannelId)
+                        ?.GetTextChannel(fs.ChannelId)
-                                           ?.EmbedAsync(GetEmbed(fs.GuildId, stream)))
+                        ?.EmbedAsync(GetEmbed(fs.GuildId, stream)))
-                      .WhenAll();
+                    .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 =>
+                    .Select(async fs =>
-                         {
+                    {
-                             var textChannel = _client.GetGuild(fs.GuildId)?.GetTextChannel(fs.ChannelId);
+                        var textChannel = _client.GetGuild(fs.GuildId)?.GetTextChannel(fs.ChannelId);
 
-                             if (textChannel is null)
+                        if (textChannel is null)
-                                 return default;
+                            return default;
 
-                             var rep = new ReplacementBuilder().WithOverride("%user%", () => fs.Username)
+                        var rep = new ReplacementBuilder().WithOverride("%user%", () => fs.Username)
-                                                               .WithOverride("%platform%", () => fs.Type.ToString())
+                            .WithOverride("%platform%", () => fs.Type.ToString())
-                                                               .Build();
+                            .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)
+                        .Where(x => x != default)
-                                .Select(x => (x.Item1, x.Item2))
+                        .Select(x => (x.Item1, x.Item2))
-                                .ToList();
+                        .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()
+                .AsQueryable()
-                         .Where(x => x.GuildId == guildId)
+                .Where(x => x.GuildId == guildId)
-                         .OrderBy(x => x.Id)
+                .OrderBy(x => x.Id)
-                         .ToList();
+                .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)
+            .WithTitle(status.Name)
-                       .WithUrl(status.StreamUrl)
+            .WithUrl(status.StreamUrl)
-                       .WithDescription(status.StreamUrl)
+            .WithDescription(status.StreamUrl)
-                       .AddField(GetText(guildId, strs.status), status.IsLive ? "🟢 Online" : "🔴 Offline", true);
+            .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();

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.
 
@@ -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

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;
+            });
+        }
     }
 }

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()
+            var eb = _eb.Create(ctx)
-                .WithTitle(GetText(strs.quote_id($"#{data.Id}")))
+                          .WithOkColor()
-                .AddField(GetText(strs.trigger), data.Keyword)
+                          .WithTitle($"{GetText(strs.quote_id($"#{data.Id}"))} | {GetText(strs.response)}:")
-                .AddField(GetText(strs.response),
+                          .WithDescription(Format.Sanitize(data.Text).Replace("](", "]\\(").TrimTo(4096))
-                    Format.Sanitize(data.Text).Replace("](", "]\\("))
+                          .AddField(GetText(strs.trigger), data.Keyword)
-                .WithFooter(
+                          .WithFooter(
-                    GetText(strs.created_by($"{data.AuthorName} ({data.AuthorId})"))));
+                              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))

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,
+            await ctx.Guild.CreateStickerAsync(
-                string.IsNullOrWhiteSpace(description) ? "Missing description" : description,
+                name,
-                tags,
                 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 (!msg.Embeds.Any())
-        if (embed is null)
         {
             await ReplyErrorLocalizedAsync(strs.not_found);
             return;
         }
 
-        var json = SmartEmbedText.FromEmbed(embed, msg.Content).ToJson(_showEmbedSerializerOptions);
+        var json = new SmartEmbedTextArray()
-        await SendConfirmAsync(Format.Sanitize(json).Replace("](", "]\\("));
+        {
+            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);
     }
-}
+}

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

@@ -259,8 +259,8 @@ public partial class Xp
                 await ReplyConfirmLocalizedAsync(strs.club_applied(Format.Bold(club.ToString())));
             else if (result == ClubApplyResult.Banned)
                 await ReplyErrorLocalizedAsync(strs.club_join_banned);
-            else if (result == ClubApplyResult.InsufficientLevel)
+            else if (result == ClubApplyResult.AlreadyApplied)
-                await ReplyErrorLocalizedAsync(strs.club_insuff_lvl);
+                await ReplyErrorLocalizedAsync(strs.club_already_applied);
             else if (result == ClubApplyResult.AlreadyInAClub)
                 await ReplyErrorLocalizedAsync(strs.club_already_in);
         }
@@ -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()

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,14 +139,14 @@ 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))
             return ClubApplyResult.Banned;
         
         if (club.Applicants.Any(x => x.UserId == du.Id))
-            return ClubApplyResult.InsufficientLevel;
+            return ClubApplyResult.AlreadyApplied;
 
         var app = new ClubApplicants
         {
@@ -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)
     {

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);
@@ -26,8 +27,7 @@ public interface IClubService
 public enum ClubApplyResult
 {
     Success,
-
     AlreadyInAClub,
     Banned,
-    InsufficientLevel
+    AlreadyApplied
 }

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

@@ -5,4 +5,11 @@ public enum ClubAcceptResult
     Accepted,
     NotOwnerOrAdmin,
     NoSuchApplicant,
+}
+
+public enum ClubDenyResult
+{
+    Rejected,
+    NoSuchApplicant,
+    NotOwnerOrAdmin
 }

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" />
@@ -52,12 +52,13 @@
         <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" />

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,
+            try
-                string.IsNullOrWhiteSpace(note)
+            {
-                    ? $"Received {formattedAmount} from {from} "
+                await to.SendConfirmAsync(ebs,
-                    : $"Received {formattedAmount} from {from}: {note}");
+                    string.IsNullOrWhiteSpace(note)
+                        ? $"Received {formattedAmount} from {from} "
+                        : $"Received {formattedAmount} from {from}: {note}");
+            }
+            catch
+            {
+                //ignored
+            }
             return true;
         }
-
         return false;
     }
-}
+}

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)

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.12";
+    public const string BOT_VERSION = "4.3.21";
 
     public string Author
         => "Kwoth#2452";

src/NadekoBot/data/aliases.yml

@@ -647,10 +647,6 @@ chucknorris:
 magicitem:
   - magicitem
   - mi
-revav:
-  - revav
-revimg:
-  - revimg
 safebooru:
   - safebooru
 wiki:
@@ -1116,6 +1112,8 @@ clubapply:
   - clubapply
 clubaccept:
   - clubaccept
+clubreject:
+  - clubreject
 clubleave:
   - clubleave
 clubdisband:
@@ -1388,4 +1386,6 @@ autopublish:
   - autopublish
 doas:
   - doas
-  - execas 
+  - execas
+cacheusers:
+  - cacheusers

src/NadekoBot/data/games.yml

@@ -1,5 +1,5 @@
 # DO NOT CHANGE
-version: 2
+version: 3
 # Hangman related settings (.hangman command)
 hangman:
 # The amount of currency awarded to the winner of a hangman game
@@ -57,14 +57,19 @@ raceAnimals:
 # Which chatbot API should bot use.
 # 'cleverbot' - bot will use Cleverbot API.
 # 'gpt3' - bot will use GPT-3 API
-chatBot: gpt3
+chatBot: Gpt3
 
 chatGpt:
-  # Which GPT-3 Model should bot use.
+# Which GPT-3 Model should bot use.
-  # 'ada001' - cheapest and fastest
+  # gpt35turbo - cheapest
-  # 'babbage001' - 2nd option
+  # gpt4 - 30x more expensive, higher quality
-  # 'curie001' - 3rd option
+  # gp432k - same model as above, but with a 32k token limit
-  # 'davinci003' - Most expensive, slowest
+  modelName: Gpt35Turbo
-  model: davinci003
+  # 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

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
@@ -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

src/NadekoBot/data/strings/commands/commands.en-US.yml

@@ -1559,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"
@@ -1929,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:
@@ -2359,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"

src/NadekoBot/data/strings/responses/responses.en-US.json

@@ -838,7 +838,7 @@
   "server_leaderboard": "Server XP Leaderboard",
   "global_leaderboard": "Global XP Leaderboard",
   "modified": "Modified server XP of the user {0} by {1}",
-  "club_insuff_lvl": "You're insufficient level to join that club.",
+  "club_already_applied": "You've already applied to that club.",
   "club_join_banned": "You're banned from that club.",
   "club_already_in": "You are already a member of a club.",
   "club_create_error_name": "Failed creating the club. A club with that name already exists.",
@@ -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."
 }

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>

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];
+            Array.Reverse(ssrcBytes);
-            Buffer.BlockCopy(ssrcBytes, 0, ipDiscoveryData, 0, ssrcBytes.Length);
+            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;
         }
     }
-}
+}