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

Update GPT ChatterBot

See merge request Kwoth/nadekobot!313

CHANGELOG.md

@@ -2,6 +2,45 @@
 
 Experimental changelog. Mostly based on [keepachangelog](https://keepachangelog.com/en/1.0.0/) except date format. a-c-f-r-o
 
+## [4.3.20] - 20.01.2024
+
+### Fixed
+- Fixed `.config searches followedStreams.maxCount` not working
+
+## [4.3.19] - 20.01.2024
+
+### Added
+- Added `followedStreams.maxCount` to `searches.yml` which lets bot owners change the default of 10 per server
+
+### Changed
+- Improvements to GPT ChatterBot (thx alexandra) 
+- Add a personality prompt to tweak the way chatgpt bot behaves 
+- Added Chat history support to chatgpt ChatterBot
+- Chatgpt token usage now correctly calculated
+- More chatgpt configs in `games.yml`
+
+## [4.3.18] - 26.12.2023
+
+### Added
+
+- Added `.cacheusers` command (thx Kotz) 
+- Added `.clubreject` which lets you reject club applications
+
+### Changed
+
+- Updated discord lib, there should be less console errors now
+
+### Fixed
+
+- Fixed `icon_url` when using `.showembed`
+- Fixed `.quoteshow` not showing sometimes (thx Cata)
+- Notifications will no longer be sent if dms are off when using `.give`
+- Users should no longer be able to apply to clubs while in a club already (especially not to the same club they're already in)
+
+### Removed
+
+- `.revimg` and `.revav` as google removed reverse image search
+
 ## [4.3.17] - 06.09.2023
 
 ### Fixed 

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/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/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/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/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/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")]
-    public string Prompt { get; init; }
+    [JsonPropertyName("messages")]
+    public List<GPTMessage> Messages { get; init; }
 
     [JsonPropertyName("temperature")]
     public int Temperature { get; init; }
 
     [JsonPropertyName("max_tokens")]
     public int MaxTokens { get; init; }
+}
+
+public class GPTMessage
+{
+    [JsonPropertyName("role")]
+    public string Role {get; init;}
+    [JsonPropertyName("content")]
+    public string Content {get; init;}
+    [JsonPropertyName("name")]
+    public string Name {get; init;}
 }

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:
-                _model = "text-ada-001";
+            case ChatGptModel.Gpt35Turbo:
+                _model = "gpt-3.5-turbo";
                 break;
-            case Gpt3Model.Babbage001:
-                _model = "text-babbage-001";
+            case ChatGptModel.Gpt4:
+                _model = "gpt-4";
                 break;
-            case Gpt3Model.Curie001:
-                _model = "text-curie-001";
-                break;
-            case Gpt3Model.Davinci003:
-                _model = "text-davinci-003";
+            case ChatGptModel.Gpt432k:
+                _model = "gpt-4-32k";
                 break;
         }
-
+        _maxHistory = chatHistory;
         _maxTokens = maxTokens;
+        _minTokens = minTokens;
+        _nadekoUsername = nadekoUsername;
+        _encoding = GptEncoding.GetEncodingForModel(_model);
+        messages.Add(new GPTMessage(){Role = "user", Content = personality, Name = _nadekoUsername});
     }
 
-    public async Task<string> Think(string input)
+    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,
-            MaxTokens = _maxTokens,
+            Messages = messages,
+            MaxTokens = _maxTokens - tokensUsed,
             Temperature = 1,
         });
         var dataString = await data.Content.ReadAsStringAsync();
         try
         {
             var response = JsonConvert.DeserializeObject<Gpt3Response>(dataString);
-
-            return response?.Choices[0]?.Text;
+            string message = response?.Choices[0]?.Message?.Content;
+            //Can't rely on the return to except, now that we need to add it to the messages list.
+            _ = message ?? throw new ArgumentNullException(nameof(message));
+            messages.Add(new GPTMessage(){Role = "assistant", Content = message, Name = _nadekoUsername});
+            return message;
         }
         catch
         {

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.
-'ada001' - cheapest and fastest 
-'babbage001' - 2nd option
-'curie001' - 3rd option
-'davinci003' - Most expensive, slowest")]
-    public Gpt3Model Model { get; set; } = Gpt3Model.Ada001;
+    gpt35turbo - cheapest
+    gpt4 - 30x more expensive, higher quality
+    gp432k - same model as above, but with a 32k token limit")]
+    public ChatGptModel ModelName { get; set; } = ChatGptModel.Gpt35Turbo;
+
+    [Comment(@"How should the chat bot behave, what's its personality? (Usage of this counts towards the max tokens)")]
+    public string PersonalityPrompt { get; set; } = "You are a chat bot willing to have a conversation with anyone about anything.";
+
+    [Comment(@"The maximum number of messages in a conversation that can be remembered. (This will increase the number of tokens used)")]
+    public int ChatHistory { get; set; } = 5;
 
     [Comment(@"The maximum number of tokens to use per GPT-3 API call")]
     public int MaxTokens { get; set; } = 100;
+
+    [Comment(@"The minimum number of tokens to use per GPT-3 API call, such that chat history is removed to make room.")]
+    public int MinTokens { get; set; } = 30;
 }
 
 [Cloneable]
@@ -149,10 +157,9 @@ public enum ChatBotImplementation
     Gpt3
 }
 
-public enum Gpt3Model
+public enum ChatGptModel
 {
-    Ada001,
-    Babbage001,
-    Curie001,
-    Davinci003
+    Gpt35Turbo,
+    Gpt4,
+    Gpt432k
 }

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",
-            gs => gs.ChatGpt.Model,
+        AddParsedProp("gpt.modelName",
+            gs => gs.ChatGpt.ModelName,
             ConfigParsers.InsensitiveEnum,
             ConfigPrinters.ToString);
+        AddParsedProp("gpt.personality",
+            gs => gs.ChatGpt.PersonalityPrompt,
+            ConfigParsers.String,
+            ConfigPrinters.ToString);
+        AddParsedProp("gpt.chathistory",
+            gs => gs.ChatGpt.ChatHistory,
+            int.TryParse,
+            ConfigPrinters.ToString,
+            val => val > 0);
         AddParsedProp("gpt.max_tokens",
             gs => gs.ChatGpt.MaxTokens,
             int.TryParse,
             ConfigPrinters.ToString,
             val => val > 0);
+        AddParsedProp("gpt.min_tokens",
+            gs => gs.ChatGpt.MinTokens,
+            int.TryParse,
+            ConfigPrinters.ToString,
+            val => val > 0);
 
         Migrate();
     }
@@ -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/Searches/Searches.cs

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

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;
 

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

@@ -28,6 +28,7 @@ public sealed class StreamNotificationService : INService, IReadyExecutor
 
     private readonly IPubSub _pubSub;
     private readonly IEmbedBuilderService _eb;
+    private readonly SearchesConfigService _config;
 
     public TypedKey<List<StreamData>> StreamsOnlineKey { get; }
     public TypedKey<List<StreamData>> StreamsOfflineKey { get; }
@@ -49,14 +50,16 @@ public sealed class StreamNotificationService : INService, IReadyExecutor
         IHttpClientFactory httpFactory,
         Bot bot,
         IPubSub pubSub,
-        IEmbedBuilderService eb)
+        IEmbedBuilderService eb,
+        SearchesConfigService config)
     {
         _db = db;
         _client = client;
         _strings = strings;
         _pubSub = pubSub;
         _eb = eb;
-        
+        _config = config;
+
         _streamTracker = new(httpFactory, creds);
 
         StreamsOnlineKey = new("streams.online");
@@ -69,34 +72,34 @@ public sealed class StreamNotificationService : INService, IReadyExecutor
         {
             var ids = client.GetGuildIds();
             var guildConfigs = uow.Set<GuildConfig>()
-                                  .AsQueryable()
-                                  .Include(x => x.FollowedStreams)
-                                  .Where(x => ids.Contains(x.GuildId))
-                                  .ToList();
+                .AsQueryable()
+                .Include(x => x.FollowedStreams)
+                .Where(x => ids.Contains(x.GuildId))
+                .ToList();
 
             _offlineNotificationServers = new(guildConfigs
-                                              .Where(gc => gc.NotifyStreamOffline)
-                                              .Select(x => x.GuildId)
-                                              .ToList());
-            
+                .Where(gc => gc.NotifyStreamOffline)
+                .Select(x => x.GuildId)
+                .ToList());
+
             _deleteOnOfflineServers = new(guildConfigs
-                                              .Where(gc => gc.DeleteStreamOnlineMessage)
-                                              .Select(x => x.GuildId)
-                                              .ToList());
+                .Where(gc => gc.DeleteStreamOnlineMessage)
+                .Select(x => x.GuildId)
+                .ToList());
 
             var followedStreams = guildConfigs.SelectMany(x => x.FollowedStreams).ToList();
 
             _shardTrackedStreams = followedStreams.GroupBy(x => new
-                                                  {
-                                                      x.Type,
-                                                      Name = x.Username.ToLower()
-                                                  })
-                                                  .ToList()
-                                                  .ToDictionary(
-                                                      x => new StreamDataKey(x.Key.Type, x.Key.Name.ToLower()),
-                                                      x => x.GroupBy(y => y.GuildId)
-                                                            .ToDictionary(y => y.Key,
-                                                                y => y.AsEnumerable().ToHashSet()));
+                {
+                    x.Type,
+                    Name = x.Username.ToLower()
+                })
+                .ToList()
+                .ToDictionary(
+                    x => new StreamDataKey(x.Key.Type, x.Key.Name.ToLower()),
+                    x => x.GroupBy(y => y.GuildId)
+                        .ToDictionary(y => y.Key,
+                            y => y.AsEnumerable().ToHashSet()));
 
             // shard 0 will keep track of when there are no more guilds which track a stream
             if (client.ShardId == 0)
@@ -107,12 +110,12 @@ public sealed class StreamNotificationService : INService, IReadyExecutor
                     _streamTracker.AddLastData(fs.CreateKey(), null, false);
 
                 _trackCounter = allFollowedStreams.GroupBy(x => new
-                                                  {
-                                                      x.Type,
-                                                      Name = x.Username.ToLower()
-                                                  })
-                                                  .ToDictionary(x => new StreamDataKey(x.Key.Type, x.Key.Name),
-                                                      x => x.Select(fs => fs.GuildId).ToHashSet());
+                    {
+                        x.Type,
+                        Name = x.Username.ToLower()
+                    })
+                    .ToDictionary(x => new StreamDataKey(x.Key.Type, x.Key.Name),
+                        x => x.Select(fs => fs.GuildId).ToHashSet());
             }
         }
 
@@ -152,7 +155,7 @@ public sealed class StreamNotificationService : INService, IReadyExecutor
                     continue;
 
                 var deleteGroups = failingStreams.GroupBy(x => x.Type)
-                                                 .ToDictionary(x => x.Key, x => x.Select(y => y.Name).ToList());
+                    .ToDictionary(x => x.Key, x => x.Select(y => y.Name).ToList());
 
                 await using var uow = _db.GetDbContext();
                 foreach (var kvp in deleteGroups)
@@ -165,9 +168,9 @@ public sealed class StreamNotificationService : INService, IReadyExecutor
                         string.Join(", ", kvp.Value));
 
                     var toDelete = uow.Set<FollowedStream>()
-                                      .AsQueryable()
-                                      .Where(x => x.Type == kvp.Key && kvp.Value.Contains(x.Username))
-                                      .ToList();
+                        .AsQueryable()
+                        .Where(x => x.Type == kvp.Key && kvp.Value.Contains(x.Username))
+                        .ToList();
 
                     uow.RemoveRange(toDelete);
                     await uow.SaveChangesAsync();
@@ -246,17 +249,17 @@ public sealed class StreamNotificationService : INService, IReadyExecutor
             if (_shardTrackedStreams.TryGetValue(key, out var fss))
             {
                 await fss
-                      // send offline stream notifications only to guilds which enable it with .stoff
-                      .SelectMany(x => x.Value)
-                      .Where(x => _offlineNotificationServers.Contains(x.GuildId))
-                      .Select(fs => _client.GetGuild(fs.GuildId)
-                                           ?.GetTextChannel(fs.ChannelId)
-                                           ?.EmbedAsync(GetEmbed(fs.GuildId, stream)))
-                      .WhenAll();
+                    // send offline stream notifications only to guilds which enable it with .stoff
+                    .SelectMany(x => x.Value)
+                    .Where(x => _offlineNotificationServers.Contains(x.GuildId))
+                    .Select(fs => _client.GetGuild(fs.GuildId)
+                        ?.GetTextChannel(fs.ChannelId)
+                        ?.EmbedAsync(GetEmbed(fs.GuildId, stream)))
+                    .WhenAll();
             }
         }
     }
-    
+
 
     private async ValueTask HandleStreamsOnline(List<StreamData> onlineStreams)
     {
@@ -266,30 +269,30 @@ public sealed class StreamNotificationService : INService, IReadyExecutor
             if (_shardTrackedStreams.TryGetValue(key, out var fss))
             {
                 var messages = await fss.SelectMany(x => x.Value)
-                         .Select(async fs =>
-                         {
-                             var textChannel = _client.GetGuild(fs.GuildId)?.GetTextChannel(fs.ChannelId);
+                    .Select(async fs =>
+                    {
+                        var textChannel = _client.GetGuild(fs.GuildId)?.GetTextChannel(fs.ChannelId);
 
-                             if (textChannel is null)
-                                 return default;
+                        if (textChannel is null)
+                            return default;
 
-                             var rep = new ReplacementBuilder().WithOverride("%user%", () => fs.Username)
-                                                               .WithOverride("%platform%", () => fs.Type.ToString())
-                                                               .Build();
+                        var rep = new ReplacementBuilder().WithOverride("%user%", () => fs.Username)
+                            .WithOverride("%platform%", () => fs.Type.ToString())
+                            .Build();
 
-                             var message = string.IsNullOrWhiteSpace(fs.Message) ? "" : rep.Replace(fs.Message);
+                        var message = string.IsNullOrWhiteSpace(fs.Message) ? "" : rep.Replace(fs.Message);
 
-                             var msg = await textChannel.EmbedAsync(GetEmbed(fs.GuildId, stream, false), message);
+                        var msg = await textChannel.EmbedAsync(GetEmbed(fs.GuildId, stream, false), message);
+
+                        // only cache the ids of channel/message pairs 
+                        if (_deleteOnOfflineServers.Contains(fs.GuildId))
+                            return (textChannel.Id, msg.Id);
+                        else
+                            return default;
+                    })
+                    .WhenAll();
 
-                             // only cache the ids of channel/message pairs 
-                             if(_deleteOnOfflineServers.Contains(fs.GuildId))
-                                return (textChannel.Id, msg.Id);
-                             else 
-                                 return default;
-                         })
-                         .WhenAll();
 
-                
                 // push online stream messages to redis
                 // when streams go offline, any server which
                 // has the online stream message deletion feature
@@ -297,16 +300,15 @@ public sealed class StreamNotificationService : INService, IReadyExecutor
                 try
                 {
                     var pairs = messages
-                                .Where(x => x != default)
-                                .Select(x => (x.Item1, x.Item2))
-                                .ToList();
+                        .Where(x => x != default)
+                        .Select(x => (x.Item1, x.Item2))
+                        .ToList();
 
                     if (pairs.Count > 0)
                         await OnlineMessagesSent(key.Type, key.Name, pairs);
                 }
                 catch
                 {
-
                 }
             }
         }
@@ -384,10 +386,10 @@ public sealed class StreamNotificationService : INService, IReadyExecutor
         await using (var uow = _db.GetDbContext())
         {
             var fss = uow.Set<FollowedStream>()
-                         .AsQueryable()
-                         .Where(x => x.GuildId == guildId)
-                         .OrderBy(x => x.Id)
-                         .ToList();
+                .AsQueryable()
+                .Where(x => x.GuildId == guildId)
+                .OrderBy(x => x.Id)
+                .ToList();
 
             // out of range
             if (fss.Count <= index)
@@ -450,7 +452,9 @@ public sealed class StreamNotificationService : INService, IReadyExecutor
                 GuildId = guildId
             };
 
-            if (gc.FollowedStreams.Count >= 10)
+            var config = _config.Data;
+            if (config.FollowedStreams.MaxCount is not -1
+                && gc.FollowedStreams.Count >= config.FollowedStreams.MaxCount)
                 return null;
 
             gc.FollowedStreams.Add(fs);
@@ -475,10 +479,10 @@ public sealed class StreamNotificationService : INService, IReadyExecutor
     public IEmbedBuilder GetEmbed(ulong guildId, StreamData status, bool showViewers = true)
     {
         var embed = _eb.Create()
-                       .WithTitle(status.Name)
-                       .WithUrl(status.StreamUrl)
-                       .WithDescription(status.StreamUrl)
-                       .AddField(GetText(guildId, strs.status), status.IsLive ? "🟢 Online" : "🔴 Offline", true);
+            .WithTitle(status.Name)
+            .WithUrl(status.StreamUrl)
+            .WithDescription(status.StreamUrl)
+            .AddField(GetText(guildId, strs.status), status.IsLive ? "🟢 Online" : "🔴 Offline", true);
 
         if (showViewers)
         {
@@ -527,7 +531,7 @@ public sealed class StreamNotificationService : INService, IReadyExecutor
 
         return newValue;
     }
-    
+
     public bool ToggleStreamOnlineDelete(ulong guildId)
     {
         using var uow = _db.GetDbContext();

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()
-                .WithTitle(GetText(strs.quote_id($"#{data.Id}")))
-                .AddField(GetText(strs.trigger), data.Keyword)
-                .AddField(GetText(strs.response),
-                    Format.Sanitize(data.Text).Replace("](", "]\\("))
-                .WithFooter(
-                    GetText(strs.created_by($"{data.AuthorName} ({data.AuthorId})"))));
+        {
+            var eb = _eb.Create(ctx)
+                          .WithOkColor()
+                          .WithTitle($"{GetText(strs.quote_id($"#{data.Id}"))} | {GetText(strs.response)}:")
+                          .WithDescription(Format.Sanitize(data.Text).Replace("](", "]\\(").TrimTo(4096))
+                          .AddField(GetText(strs.trigger), data.Keyword)
+                          .WithFooter(
+                              GetText(strs.created_by($"{data.AuthorName} ({data.AuthorId})")))
+                          .Build();
 
+            if (!(data.Text.Length > 4096))
+            {
+                await ctx.Channel.SendMessageAsync(embed: eb);
+                return;
+            }
+            
+            await ctx.Channel.SendFileAsync(
+                attachment: new FileAttachment(await data.Text.ToStream(), "quote.txt"),
+                embed: eb);
+        }
+            
         private async Task QuoteSearchinternalAsync(string? keyword, string textOrAuthor)
         {
             if (string.IsNullOrWhiteSpace(textOrAuthor))

src/NadekoBot/Modules/Utility/Utility.cs

@@ -464,12 +464,14 @@ public partial class Utility : NadekoModule
         {
             if (tags.Length == 0)
                 tags = new[] { name };
-            
-            await ctx.Guild.CreateStickerAsync(name,
-                string.IsNullOrWhiteSpace(description) ? "Missing description" : description,
-                tags,
+
+            await ctx.Guild.CreateStickerAsync(
+                name,
                 stream,
-                $"{name}.{format}");
+                $"{name}.{format}",
+                tags,
+                string.IsNullOrWhiteSpace(description) ? "Missing description" : description
+            );
 
             await ctx.OkAsync();
         }

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

@@ -282,6 +282,24 @@ public partial class Xp
             else if(result == ClubAcceptResult.NotOwnerOrAdmin)
                 await ReplyErrorLocalizedAsync(strs.club_admin_perms);
         }
+        
+        [Cmd]
+        [Priority(1)]
+        public Task ClubReject(IUser user)
+            => ClubReject(user.ToString());
+
+        [Cmd]
+        [Priority(0)]
+        public async Task ClubReject([Leftover] string userName)
+        {
+            var result = _service.RejectApplication(ctx.User.Id, userName, out var discordUser);
+            if (result == ClubDenyResult.Rejected)
+                await ReplyConfirmLocalizedAsync(strs.club_rejected(Format.Bold(discordUser.ToString())));
+            else if(result == ClubDenyResult.NoSuchApplicant)
+                await ReplyErrorLocalizedAsync(strs.club_accept_invalid_applicant);
+            else if(result == ClubDenyResult.NotOwnerOrAdmin)
+                await ReplyErrorLocalizedAsync(strs.club_admin_perms);
+        }
 
         [Cmd]
         public async Task ClubLeave()

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

@@ -19,7 +19,6 @@ public class ClubService : INService, IClubService
         _httpFactory = httpFactory;
     }
 
-    
     public async Task<ClubCreateResult> CreateClubAsync(IUser user, string clubName)
     {
         //must be lvl 5 and must not be in a club already
@@ -140,7 +139,7 @@ public class ClubService : INService, IClubService
 
         //user banned or a member of a club, or already applied,
         // or doesn't min minumum level requirement, can't apply
-        if (du.Club is not null)
+        if (du.ClubId is not null)
             return ClubApplyResult.AlreadyInAClub;
         
         if (club.Bans.Any(x => x.UserId == du.Id))
@@ -186,6 +185,26 @@ public class ClubService : INService, IClubService
         uow.SaveChanges();
         return ClubAcceptResult.Accepted;
     }
+    
+    public ClubDenyResult RejectApplication(ulong clubOwnerUserId, string userName, out DiscordUser discordUser)
+    {
+        discordUser = null;
+        using var uow = _db.GetDbContext();
+        var club = uow.Clubs.GetByOwnerOrAdmin(clubOwnerUserId);
+        if (club is null)
+            return ClubDenyResult.NotOwnerOrAdmin;
+
+        var applicant =
+            club.Applicants.FirstOrDefault(x => x.User.ToString().ToUpperInvariant() == userName.ToUpperInvariant());
+        if (applicant is null)
+            return ClubDenyResult.NoSuchApplicant;
+        
+        club.Applicants.Remove(applicant);
+        
+        discordUser = applicant.User;
+        uow.SaveChanges();
+        return ClubDenyResult.Rejected;
+    }
 
     public ClubInfo GetClubWithBansAndApplications(ulong ownerUserId)
     {

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

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

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.17";
+    public const string BOT_VERSION = "4.3.20";
 
     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.
-  # 'ada001' - cheapest and fastest
-  # 'babbage001' - 2nd option
-  # 'curie001' - 3rd option
-  # 'davinci003' - Most expensive, slowest
-  model: davinci003
+# Which GPT-3 Model should bot use.
+  # gpt35turbo - cheapest
+  # gpt4 - 30x more expensive, higher quality
+  # gp432k - same model as above, but with a 32k token limit
+  modelName: Gpt35Turbo
+  # How should the chat bot behave, whats its personality? (Usage of this counts towards the max tokens)
+  personalityPrompt: You are a chat bot willing to have a conversation with anyone about anything.
+  # The maximum number of messages in a conversation that can be remembered. (This will increase the number of tokens used)
+  chatHistory: 5
   # The maximum number of tokens to use per GPT-3 API call
   maxTokens: 100
+  # The minimum number of tokens to use per GPT-3 API call, such that chat history is removed to make room.
+  minTokens: 30

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

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

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