Revert update to .net 7 by mistake

- Upped version to 4.3.12

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 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
+
+### Fixed
+
+- Fixed `.betstats` not working on european locales
+- Timed `.ban` will work on users who are not in the server
+- Fixed some bugs in the medusa system 
+
 ## [4.3.11] - 21.01.2023
 
 ### Added

src/NadekoBot/Common/Creds.cs

@@ -54,6 +54,9 @@ go to https://www.patreon.com/portal -> my clients -> create client")]
     [Comment(@"Official cleverbot api key.")]
     public string CleverbotApiKey { get; set; }
 
+    [Comment(@"Official GPT-3 api key.")]
+    public string Gpt3ApiKey { get; set; }
+    
     [Comment(@"Which cache implementation should bot use.
 'memory' - Cache will be in memory of the bot's process itself. Only use this on bots with a single shard. When the bot is restarted the cache is reset. 
 'redis' - Uses redis (which needs to be separately downloaded and installed). The cache will persist through bot restarts. You can configure connection string in creds.yml")]
@@ -118,7 +121,7 @@ Windows default
 
     public Creds()
     {
-        Version = 6;
+        Version = 7;
         Token = string.Empty;
         UsePrivilegedIntents = true;
         OwnerIds = new List<ulong>();
@@ -128,6 +131,7 @@ Windows default
         Patreon = new(string.Empty, string.Empty, string.Empty, string.Empty);
         BotListToken = string.Empty;
         CleverbotApiKey = string.Empty;
+        Gpt3ApiKey = string.Empty;
         BotCache = BotCacheImplemenation.Memory;
         RedisOptions = "localhost:6379,syncTimeout=30000,responseTimeout=30000,allowAdmin=true,password=";
         Db = new()

src/NadekoBot/Common/IBotCredentials.cs

@@ -14,6 +14,7 @@ public interface IBotCredentials
     int TotalShards { get; }
     Creds.PatreonSettings Patreon { get; }
     string CleverbotApiKey { get; }
+    string Gpt3ApiKey { get; }
     RestartConfig RestartCommand { get; }
     Creds.VotesSettings Votes { get; }
     string BotListToken { get; }

src/NadekoBot/Common/Medusa/MedusaLoaderService.cs

@@ -459,6 +459,9 @@ public sealed class MedusaLoaderService : IMedusaLoaderService, IReadyExecutor,
             pb.WithIsMultiple(paramData.IsParams)
               .WithIsOptional(paramData.IsOptional)
               .WithIsRemainder(paramData.IsLeftover);
+
+            if (paramData.IsOptional)
+                pb.WithDefault(paramData.DefaultValue);
         };
 
     [MethodImpl(MethodImplOptions.NoInlining)]
@@ -800,6 +803,7 @@ public sealed class MedusaLoaderService : IMedusaLoaderService, IReadyExecutor,
 
                 var leftoverAttribute = pi.GetCustomAttribute<leftoverAttribute>(true);
                 var hasDefaultValue = pi.HasDefaultValue;
+                var defaultValue = pi.DefaultValue;
                 var isLeftover = leftoverAttribute != null;
                 var isParams = pi.GetCustomAttribute<ParamArrayAttribute>() is not null;
                 var paramType = pi.ParameterType;
@@ -857,7 +861,7 @@ public sealed class MedusaLoaderService : IMedusaLoaderService, IReadyExecutor,
                     throw new ArgumentException("Leftover attribute error.");
                 }
 
-                cmdParams.Add(new ParamData(paramType, paramName, hasDefaultValue, isLeftover, isParams));
+                cmdParams.Add(new ParamData(paramType, paramName, hasDefaultValue, defaultValue, isLeftover, isParams));
             }
 
 

src/NadekoBot/Common/Medusa/Models/ParamData.cs

@@ -4,6 +4,7 @@ public sealed record ParamData(
     Type Type,
     string Name,
     bool IsOptional,
+    object? DefaultValue,
     bool IsLeftover,
     bool IsParams
 );

src/NadekoBot/Modules/Administration/Mute/MuteService.cs

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

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

@@ -402,12 +402,21 @@ public partial class Administration
         [UserPerm(GuildPerm.BanMembers)]
         [BotPerm(GuildPerm.BanMembers)]
         [Priority(1)]
-        public async Task Ban(StoopidTime time, IUser user, [Leftover] string msg = null)
+        public Task Ban(StoopidTime time, IUser user, [Leftover] string msg = null)
+            => Ban(time, user.Id, msg);
+        
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        [UserPerm(GuildPerm.BanMembers)]
+        [BotPerm(GuildPerm.BanMembers)]
+        [Priority(0)]
+        public async Task Ban(StoopidTime time, ulong userId, [Leftover] string msg = null)
         {
             if (time.Time > TimeSpan.FromDays(49))
                 return;
 
-            var guildUser = await ((DiscordSocketClient)Context.Client).Rest.GetGuildUserAsync(ctx.Guild.Id, user.Id);
+            var guildUser = await ((DiscordSocketClient)Context.Client).Rest.GetGuildUserAsync(ctx.Guild.Id, userId);
+            
 
             if (guildUser is not null && !await CheckRoleHierarchy(guildUser))
                 return;
@@ -429,13 +438,14 @@ public partial class Administration
                 }
             }
 
+            var user = await ctx.Client.GetUserAsync(userId);
             var banPrune = await _service.GetBanPruneAsync(ctx.Guild.Id) ?? 7;
-            await _mute.TimedBan(ctx.Guild, user, time.Time, (ctx.User + " | " + msg).TrimTo(512), banPrune);
+            await _mute.TimedBan(ctx.Guild, userId, time.Time, (ctx.User + " | " + msg).TrimTo(512), banPrune);
             var toSend = _eb.Create()
                             .WithOkColor()
                             .WithTitle("⛔️ " + GetText(strs.banned_user))
-                            .AddField(GetText(strs.username), user.ToString(), true)
+                            .AddField(GetText(strs.username),  user?.ToString() ?? userId.ToString(), true)
-                            .AddField("ID", user.Id.ToString(), true)
+                            .AddField("ID", userId.ToString(), true)
                             .AddField(GetText(strs.duration),
                                 time.Time.Humanize(3, minUnit: TimeUnit.Minute, culture: Culture),
                                 true);

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

@@ -157,7 +157,7 @@ public class UserPunishService : INService, IReadyExecutor
                 if (minutes == 0)
                     await guild.AddBanAsync(user, reason: reason, pruneDays: banPrune);
                 else
-                    await _mute.TimedBan(user.Guild, user, TimeSpan.FromMinutes(minutes), reason, banPrune);
+                    await _mute.TimedBan(user.Guild, user.Id, TimeSpan.FromMinutes(minutes), reason, banPrune);
                 break;
             case PunishmentAction.Softban:
                 banPrune = await GetBanPruneAsync(user.GuildId) ?? 7;

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

@@ -1,6 +1,7 @@
 #nullable disable
 using NadekoBot.Common.ModuleBehaviors;
 using NadekoBot.Db.Models;
+using NadekoBot.Modules.Games.Common;
 using NadekoBot.Modules.Games.Common.ChatterBot;
 using NadekoBot.Modules.Permissions;
 using NadekoBot.Modules.Permissions.Common;
@@ -27,6 +28,7 @@ public class ChatterBotService : IExecOnMessage
     private readonly IHttpClientFactory _httpFactory;
     private readonly IPatronageService _ps;
     private readonly CmdCdService _ccs;
+    private readonly GamesConfigService _gcs;
 
     public ChatterBotService(
         DiscordSocketClient client,
@@ -38,7 +40,8 @@ public class ChatterBotService : IExecOnMessage
         IBotCredentials creds,
         IEmbedBuilderService eb,
         IPatronageService ps,
-        CmdCdService cmdCdService)
+        CmdCdService cmdCdService,
+        GamesConfigService gcs)
     {
         _client = client;
         _perms = perms;
@@ -49,6 +52,7 @@ public class ChatterBotService : IExecOnMessage
         _httpFactory = factory;
         _ps = ps;
         _ccs = cmdCdService;
+        _gcs = gcs;
 
         _flKey = new FeatureLimitKey()
         {
@@ -64,11 +68,26 @@ public class ChatterBotService : IExecOnMessage
 
     public IChatterBotSession CreateSession()
     {
+        switch (_gcs.Data.ChatBot)
+        {
+            case ChatBotImplementation.Cleverbot:
                 if (!string.IsNullOrWhiteSpace(_creds.CleverbotApiKey))
                     return new OfficialCleverbotSession(_creds.CleverbotApiKey, _httpFactory);
 
                 Log.Information("Cleverbot will not work as the api key is missing.");
                 return null;
+            case ChatBotImplementation.Gpt3:
+                if (!string.IsNullOrWhiteSpace(_creds.Gpt3ApiKey))
+                    return new OfficialGpt3Session(_creds.Gpt3ApiKey,
+                        _gcs.Data.ChatGpt.Model,
+                        _gcs.Data.ChatGpt.MaxTokens,
+                        _httpFactory);
+
+                Log.Information("Gpt3 will not work as the api key is missing.");
+                return null;
+            default:
+                return null;
+        }
     }
 
     public string PrepareMessage(IUserMessage msg, out IChatterBotSession cleverbot)

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

@@ -1,8 +0,0 @@
-#nullable disable
-namespace NadekoBot.Modules.Games.Common.ChatterBot;
-
-public class ChatterBotResponse
-{
-    public string Convo_id { get; set; }
-    public string BotSay { get; set; }
-}

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

@@ -0,0 +1,30 @@
+#nullable disable
+using System.Text.Json.Serialization;
+
+namespace NadekoBot.Modules.Games.Common.ChatterBot;
+
+public class Gpt3Response
+{
+    [JsonPropertyName("choices")]
+    public Choice[] Choices { get; set; }
+}
+
+public class Choice
+{
+    public string Text { get; set; }
+}
+
+public class Gpt3ApiRequest
+{
+    [JsonPropertyName("model")]
+    public string Model { get; init; }
+
+    [JsonPropertyName("prompt")]
+    public string Prompt { get; init; }
+
+    [JsonPropertyName("temperature")]
+    public int Temperature { get; init; }
+
+    [JsonPropertyName("max_tokens")]
+    public int MaxTokens { get; init; }
+}

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

@@ -0,0 +1,69 @@
+#nullable disable
+using Newtonsoft.Json;
+using System.Net.Http.Json;
+
+namespace NadekoBot.Modules.Games.Common.ChatterBot;
+
+public class OfficialGpt3Session : IChatterBotSession
+{
+    private string Uri
+        => $"https://api.openai.com/v1/completions";
+
+    private readonly string _apiKey;
+    private readonly string _model;
+    private readonly int _maxTokens;
+    private readonly IHttpClientFactory _httpFactory;
+
+    public OfficialGpt3Session(
+        string apiKey,
+        Gpt3Model model,
+        int maxTokens,
+        IHttpClientFactory factory)
+    {
+        _apiKey = apiKey;
+        _httpFactory = factory;
+        switch (model)
+        {
+            case Gpt3Model.Ada001:
+                _model = "text-ada-001";
+                break;
+            case Gpt3Model.Babbage001:
+                _model = "text-babbage-001";
+                break;
+            case Gpt3Model.Curie001:
+                _model = "text-curie-001";
+                break;
+            case Gpt3Model.Davinci003:
+                _model = "text-davinci-003";
+                break;
+        }
+
+        _maxTokens = maxTokens;
+    }
+
+    public async Task<string> Think(string input)
+    {
+        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,
+            Temperature = 1,
+        });
+        var dataString = await data.Content.ReadAsStringAsync();
+        try
+        {
+            var response = JsonConvert.DeserializeObject<Gpt3Response>(dataString);
+
+            return response?.Choices[0]?.Text;
+        }
+        catch
+        {
+            Log.Warning("Unexpected GPT-3 response received: {ResponseString}", dataString);
+            return null;
+        }
+    }
+}
+

src/NadekoBot/Modules/Games/GamesConfig.cs

@@ -8,7 +8,7 @@ namespace NadekoBot.Modules.Games.Common;
 public sealed partial class GamesConfig : ICloneable<GamesConfig>
 {
     [Comment("DO NOT CHANGE")]
-    public int Version { get; set; }
+    public int Version { get; set; } = 2;
 
     [Comment("Hangman related settings (.hangman command)")]
     public HangmanConfig Hangman { get; set; } = new()
@@ -95,6 +95,27 @@ public sealed partial class GamesConfig : ICloneable<GamesConfig>
             Name = "Unicorn"
         }
     };
+
+    [Comment(@"Which chatbot API should bot use.
+'cleverbot' - bot will use Cleverbot API. 
+'gpt3' - bot will use GPT-3 API")]
+    public ChatBotImplementation ChatBot { get; set; } = ChatBotImplementation.Gpt3;
+
+    public ChatGptConfig ChatGpt { get; set; } = new();
+}
+
+[Cloneable]
+public sealed partial class ChatGptConfig
+{
+    [Comment(@"Which GPT-3 Model should bot use.
+'ada' - cheapest and fastest 
+'babbage' - 2nd option
+'curie' - 3rd option
+'davinci' - Most expensive, slowest")]
+    public Gpt3Model Model { get; set; } = Gpt3Model.Ada001;
+
+    [Comment(@"The maximum number of tokens to use per GPT-3 API call")]
+    public int MaxTokens { get; set; } = 100;
 }
 
 [Cloneable]
@@ -121,3 +142,17 @@ public sealed partial class RaceAnimal
     public string Icon { get; set; }
     public string Name { get; set; }
 }
+
+public enum ChatBotImplementation
+{
+    Cleverbot,
+    Gpt3
+}
+
+public enum Gpt3Model
+{
+    Ada001,
+    Babbage001,
+    Curie001,
+    Davinci003
+}

src/NadekoBot/Modules/Games/GamesConfigService.cs

@@ -29,6 +29,20 @@ public sealed class GamesConfigService : ConfigServiceBase<GamesConfig>
             ConfigPrinters.ToString,
             val => val >= 0);
         
+        AddParsedProp("chatbot",
+            gs => gs.ChatBot,
+            ConfigParsers.InsensitiveEnum,
+            ConfigPrinters.ToString);
+        AddParsedProp("gpt.model",
+            gs => gs.ChatGpt.Model,
+            ConfigParsers.InsensitiveEnum,
+            ConfigPrinters.ToString);
+        AddParsedProp("gpt.max_tokens",
+            gs => gs.ChatGpt.MaxTokens,
+            int.TryParse,
+            ConfigPrinters.ToString,
+            val => val > 0);
+
         Migrate();
     }
 
@@ -45,5 +59,14 @@ public sealed class GamesConfigService : ConfigServiceBase<GamesConfig>
                 };
             });
         }
+
+        if (data.Version < 2)
+        {
+            ModifyConfig(c =>
+            {
+                c.Version = 2;
+                c.ChatBot = ChatBotImplementation.Cleverbot;  
+            });
+        }
     }
 }

src/NadekoBot/Modules/Games/GamesService.cs

@@ -23,7 +23,6 @@ public class GamesService : INService, IReadyExecutor
 
     //channelId, game
     public ConcurrentDictionary<ulong, AcrophobiaGame> AcrophobiaGames { get; } = new();
-    public ConcurrentDictionary<ulong, TriviaGame> RunningTrivias { get; } = new();
     public Dictionary<ulong, TicTacToe> TicTacToeGames { get; } = new();
     public ConcurrentDictionary<ulong, TypingGame> RunningContests { get; } = new();
     public ConcurrentDictionary<ulong, NunchiGame> NunchiGames { get; } = new();

src/NadekoBot/Modules/Nsfw/ISearchImagesService.cs

@@ -22,6 +22,6 @@ public interface ISearchImagesService
     ValueTask<bool> ToggleBlacklistTag(ulong guildId, string tag);
     ValueTask<string[]> GetBlacklistedTags(ulong guildId);
     Task<UrlReply> Butts();
-    Task<Gallery> GetNhentaiByIdAsync(uint id);
+    // Task<Gallery> GetNhentaiByIdAsync(uint id);
-    Task<Gallery> GetNhentaiBySearchAsync(string search);
+    // Task<Gallery> GetNhentaiBySearchAsync(string search);
 }

src/NadekoBot/Modules/Nsfw/Nhentai/INhentaiService.cs

@@ -1,9 +1,9 @@
-using NadekoBot.Modules.Searches.Common;
+// using NadekoBot.Modules.Searches.Common;
-
+//
-namespace NadekoBot.Modules.Nsfw;
+// namespace NadekoBot.Modules.Nsfw;
-
+//
-public interface INhentaiService
+// public interface INhentaiService
-{
+// {
-    Task<Gallery?> GetAsync(uint id);
+//     Task<Gallery?> GetAsync(uint id);
-    Task<IReadOnlyList<uint>> GetIdsBySearchAsync(string search);
+//     Task<IReadOnlyList<uint>> GetIdsBySearchAsync(string search);
-}
+// }

src/NadekoBot/Modules/Nsfw/Nhentai/NhentaiScraperService.cs

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

src/NadekoBot/Modules/Nsfw/Nsfw.cs

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

src/NadekoBot/Modules/Nsfw/SearchImagesService.cs

@@ -19,17 +19,15 @@ public class SearchImagesService : ISearchImagesService, INService
     private readonly SearchImageCacher _cache;
     private readonly IHttpClientFactory _httpFactory;
     private readonly DbService _db;
-    private readonly INhentaiService _nh;
 
     private readonly object _taglock = new();
 
     public SearchImagesService(
         DbService db,
         SearchImageCacher cacher,
-        IHttpClientFactory httpFactory,
+        IHttpClientFactory httpFactory
-        INhentaiService nh)
+        )
     {
-        _nh = nh;
         _db = db;
         _rng = new NadekoRandom();
         _cache = cacher;
@@ -277,6 +275,7 @@ public class SearchImagesService : ISearchImagesService, INService
         }
     }
 
+    /*
     #region Nhentai
 
     public Task<Gallery?> GetNhentaiByIdAsync(uint id)
@@ -294,4 +293,5 @@ public class SearchImagesService : ISearchImagesService, INService
     }
 
     #endregion
+    */
 }

src/NadekoBot/Modules/Searches/_Common/Config/SearchesConfig.cs

@@ -30,7 +30,7 @@ public partial class SearchesConfig : ICloneable<SearchesConfig>
 - `ytdlp` - recommended easy, uses `yt-dlp`. Requires `yt-dlp` to be installed and it's path added to env variables
 
 - `invidious` - recommended advanced, uses invidious api. Requires at least one invidious instance specified in the `invidiousInstances` property")]
-    public YoutubeSearcher YtProvider { get; set; } = YoutubeSearcher.Ytdl;
+    public YoutubeSearcher YtProvider { get; set; } = YoutubeSearcher.Ytdlp;
 
     [Comment(@"Set the searx instance urls in case you want to use 'searx' for either img or web search.
 Nadeko will use a random one for each request.

src/NadekoBot/Services/Currency/GamblingTxTracker.cs

@@ -104,8 +104,7 @@ public sealed class GamblingTxTracker : ITxTracker, INService, IReadyExecutor
     public async Task<IReadOnlyCollection<GamblingStats>> GetAllAsync()
     {
         await using var ctx = _db.GetDbContext();
-        return await ctx
+        return await ctx.Set<GamblingStats>()
-            .GetTable<GamblingStats>()
+            .ToListAsyncEF();
-            .ToListAsync();
     }
 }

src/NadekoBot/Services/Impl/BotCredsProvider.cs

@@ -184,8 +184,11 @@ public sealed class BotCredsProvider : IBotCredsProvider
             var creds = Yaml.Deserializer.Deserialize<Creds>(File.ReadAllText(CREDS_FILE_NAME));
             if (creds.Version <= 5)
             {
-                creds.Version = 6;
                 creds.BotCache = BotCacheImplemenation.Redis;
+            }
+            if (creds.Version <= 6)
+            {
+                creds.Version = 7;
                 File.WriteAllText(CREDS_FILE_NAME, Yaml.Serializer.Serialize(creds));
             }
         }

src/NadekoBot/Services/Impl/StatsService.cs

@@ -7,7 +7,7 @@ namespace NadekoBot.Services;
 
 public sealed class StatsService : IStatsService, IReadyExecutor, INService
 {
-    public const string BOT_VERSION = "4.3.11";
+    public const string BOT_VERSION = "4.3.12";
 
     public string Author
         => "Kwoth#2452";

src/NadekoBot/creds_example.yml

@@ -1,5 +1,5 @@
 # DO NOT CHANGE
-version: 6
+version: 7
 # Bot token. Do not share with anyone ever -> https://discordapp.com/developers/applications/
 token: ''
 # List of Ids of the users who have bot owner permissions
@@ -56,6 +56,8 @@ patreon:
 botListToken: ''
 # Official cleverbot api key.
 cleverbotApiKey: ''
+# Official GPT-3 api key.
+gpt3ApiKey: ''
 # Which cache implementation should bot use.
 # 'memory' - Cache will be in memory of the bot's process itself. Only use this on bots with a single shard. When the bot is restarted the cache is reset.
 # 'redis' - Uses redis (which needs to be separately downloaded and installed). The cache will persist through bot restarts. You can configure connection string in creds.yml

src/NadekoBot/data/aliases.yml

@@ -664,8 +664,6 @@ avatar:
   - av
 hentai:
   - hentai
-nhentai:
-  - nhentai
 danbooru:
   - danbooru
 derpibooru:
@@ -807,6 +805,7 @@ hentaibomb:
   - hentaibomb
 cleverbot:
   - cleverbot
+  - chatgpt
 shorten:
   - shorten
 wikia:

src/NadekoBot/data/games.yml

@@ -1,5 +1,5 @@
 # DO NOT CHANGE
-version: 1
+version: 2
 # Hangman related settings (.hangman command)
 hangman:
 # The amount of currency awarded to the winner of a hangman game
@@ -54,3 +54,17 @@ raceAnimals:
     name: Crab
   - icon: "🦄"
     name: Unicorn
+# Which chatbot API should bot use.
+# 'cleverbot' - bot will use Cleverbot API.
+# 'gpt3' - bot will use GPT-3 API
+chatBot: gpt3
+
+chatGpt:
+  # Which GPT-3 Model should bot use.
+  # 'ada001' - cheapest and fastest
+  # 'babbage001' - 2nd option
+  # 'curie001' - 3rd option
+  # 'davinci003' - Most expensive, slowest
+  model: davinci003
+  # The maximum number of tokens to use per GPT-3 API call
+  maxTokens: 100

src/NadekoBot/data/searches.yml

@@ -18,7 +18,7 @@ imgSearchEngine: Google
 # - `ytdlp` - recommended easy, uses `yt-dlp`. Requires `yt-dlp` to be installed and it's path added to env variables
 # 
 # - `invidious` - recommended advanced, uses invidious api. Requires at least one invidious instance specified in the `invidiousInstances` property
-ytProvider: Ytdl
+ytProvider: Ytdlp
 # Set the searx instance urls in case you want to use 'searx' for either img or web search.
 # Nadeko will use a random one for each request.
 # Use a fully qualified url. Example: `https://my-searx-instance.mydomain.com`

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

@@ -1117,11 +1117,6 @@ hentai:
   desc: "Shows a hentai image from a random website (gelbooru, danbooru, konachan or yandere) with a given tag. Tag(s) are optional but preferred. Maximum is usually 2 tags. Only 1 tag allowed."
   args:
     - "yuri"
-nhentai:
-  desc: "Shows basic information about a hentai with the specified id, or a valid nhentai search query."
-  args:
-    - "273426"
-    - "cute girl"
 autohentai:
   desc: "Posts a hentai every X seconds with a random tag from the provided tags. Use `|` to separate tag groups. Random group will be chosen every time the image is sent. Max 2 tags per group. 20 seconds minimum. Provide no parameters to disable."
   args:
@@ -1377,7 +1372,7 @@ listservers:
   args:
     - "3"
 cleverbot:
-  desc: "Toggles cleverbot session. When enabled, the bot will reply to messages starting with bot mention in the server. Expressions starting with %bot.mention% won't work if cleverbot is enabled."
+  desc: "Toggles cleverbot/chatgpt session. When enabled, the bot will reply to messages starting with bot mention in the server. Expressions starting with %bot.mention% won't work if cleverbot/chatgpt is enabled."
   args:
     - ""
 shorten: