* Merged v4

* Completed some todos * Fixed PermChecker * Updated packages * Upped version to alpha2 * Cleanup
2025-09-11 09:48:26 -04:00 · 2024-03-25 13:41:44 +00:00
parent 45b654eab1 127a46a9b8
commit 043ad98473
44 changed files with 519 additions and 370 deletions
--- a/src/NadekoBot/Bot.cs
+++ b/src/NadekoBot/Bot.cs
@@ -125,10 +125,10 @@ public sealed class Bot : IBot

        var svcs = new StandardKernel(new NinjectSettings()
        {
-            ThrowOnGetServiceNotFound = true,
+            // ThrowOnGetServiceNotFound = true,
            ActivationCacheDisabled = true,
        });
-
+        
        // this is required in order for medusa unloading to work
        svcs.Components.Remove<IPlanner, Planner>();
        svcs.Components.Add<IPlanner, RemovablePlanner>();
@@ -197,7 +197,7 @@ public sealed class Bot : IBot

    private void LoadTypeReaders(Assembly assembly)
    {
-        var filteredTypes = assembly.GetTypes()
+        var filteredTypes = assembly.GetExportedTypes()
                                    .Where(x => x.IsSubclassOf(typeof(TypeReader))
                                                && x.BaseType?.GetGenericArguments().Length > 0
                                                && !x.IsAbstract);
@@ -208,6 +208,7 @@ public sealed class Bot : IBot
            if (baseType is null)
                continue;

+            Log.Information(ft.Name);
            var typeReader = (TypeReader)ActivatorUtilities.CreateInstance(Services, ft);
            var typeArgs = baseType.GetGenericArguments();
            _commandService.AddTypeReader(typeArgs[0], typeReader);
--- a/src/NadekoBot/NadekoBot.csproj
+++ b/src/NadekoBot/NadekoBot.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
        <Nullable>enable</Nullable>
        <ImplicitUsings>true</ImplicitUsings>

@@ -20,15 +20,15 @@
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="AngleSharp" Version="1.0.1">
+        <PackageReference Include="AngleSharp" Version="1.1.2">
            <PrivateAssets>all</PrivateAssets>
            <Publish>True</Publish>
        </PackageReference>
-        <PackageReference Include="AWSSDK.S3" Version="3.7.101.58" />
+        <PackageReference Include="AWSSDK.S3" Version="3.7.307" />
        <PackageReference Include="CodeHollow.FeedReader" Version="1.2.6" />
        <PackageReference Include="CommandLineParser" Version="2.9.1" />
        <PackageReference Include="Discord.Net" Version="3.203.0" />
-        <PackageReference Include="CoreCLR-NCalc" Version="2.2.110" />
+        <PackageReference Include="CoreCLR-NCalc" Version="3.0.203" />
        <PackageReference Include="Google.Apis.Urlshortener.v1" Version="1.41.1.138" />
        <PackageReference Include="Google.Apis.YouTube.v3" Version="1.62.1.3205" />
        <PackageReference Include="Google.Apis.Customsearch.v1" Version="1.49.0.2084" />
@@ -38,12 +38,12 @@
            <PrivateAssets>all</PrivateAssets>
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
        </PackageReference>
-        <PackageReference Include="Html2Markdown" Version="5.1.0.703" />
+        <PackageReference Include="Html2Markdown" Version="6.2.0.3" />
        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.5.0" />

-        <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />

        <PackageReference Include="MorseCode.ITask" Version="2.0.3" />
        <PackageReference Include="NetEscapades.Configuration.Yaml" Version="3.0.0" />
@@ -51,51 +51,53 @@
        <!-- DI -->
        <PackageReference Include="Ninject" Version="3.3.6" />
        <PackageReference Include="Ninject.Extensions.Conventions" Version="3.3.0" />
-        <!--        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />-->
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
+        <!--        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />-->
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
        <!--        <PackageReference Include="Scrutor" Version="4.2.0" />-->

-        <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
        <PackageReference Include="Microsoft.SyndicationFeed.ReaderWriter" Version="1.0.2" />
        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-        <PackageReference Include="NonBlocking" Version="2.1.1" />
-        <PackageReference Include="OneOf" Version="3.0.243" />
-        <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
+        <PackageReference Include="NonBlocking" Version="2.1.2" />
+        <PackageReference Include="OneOf" Version="3.0.263" />
+        <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
        <PackageReference Include="Serilog.Sinks.Seq" Version="5.2.2" />
+        <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" Version="2.1.7" />
        <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta14" />
        <PackageReference Include="SixLabors.Shapes" Version="1.0.0-beta0009" />
-        <PackageReference Include="StackExchange.Redis" Version="2.6.104" />
-        <PackageReference Include="YamlDotNet" Version="13.0.2" />
+        <PackageReference Include="StackExchange.Redis" Version="2.6.122" />
+        <PackageReference Include="YamlDotNet" Version="15.1.2" />

        <PackageReference Include="Humanizer" Version="2.14.1">
            <PrivateAssets>all</PrivateAssets>
            <Publish>True</Publish>
        </PackageReference>

-        <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" />
+        <PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />


        <!-- Db-related packages -->
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.4" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.4">
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.3" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.3">
            <PrivateAssets>all</PrivateAssets>
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
        </PackageReference>

-        <PackageReference Include="linq2db.EntityFrameworkCore" Version="7.3.0" />
+        <PackageReference Include="linq2db.EntityFrameworkCore" Version="8.1.0" />

-        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.4" />
-        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.3" />
-        <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.3" />
+        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.2" />
+        <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />

-        <PackageReference Include="EFCore.NamingConventions" Version="7.0.2" />
+        <PackageReference Include="EFCore.NamingConventions" Version="8.0.3" />

        <!-- Used by stream notifications -->
-        <PackageReference Include="TwitchLib.Api" Version="3.4.1" />
+<!--        <PackageReference Include="TwitchLib.Api" Version="[3.4.1]" />-->

    </ItemGroup>

@@ -111,9 +113,9 @@
        <ProjectReference Include="..\Nadeko.Bot.Modules.Permisssions\Nadeko.Bot.Modules.Permisssions.csproj" />
        <ProjectReference Include="..\Nadeko.Bot.Modules.Utility\Nadeko.Bot.Modules.Utility.csproj" />
        <ProjectReference Include="..\Nadeko.Bot.Modules.Xp\Nadeko.Bot.Modules.Xp.csproj" />
-        <!--        <ProjectReference Include="..\Nadeko.Common\Nadeko.Common.csproj" />-->
        <ProjectReference Include="..\Nadeko.Bot.Modules.Expresssions\Nadeko.Bot.Modules.Expresssions.csproj" />
        <ProjectReference Include="..\Nadeko.Bot.Modules.Gambling\Nadeko.Bot.Modules.Gambling.csproj" />
+        <ProjectReference Include="..\Nadeko.Bot.Modules.Searches\Nadeko.Bot.Modules.Searches.csproj" />

        <ProjectReference Include="..\Nadeko.Bot.Generators.Cloneable\Nadeko.Bot.Generators.Cloneable.csproj" OutputItemType="Analyzer" />
    </ItemGroup>
--- a/src/NadekoBot/PermissionChecker.cs
+++ b/src/NadekoBot/PermissionChecker.cs
@@ -14,9 +14,10 @@ public sealed class PermissionChecker : IPermissionChecker, INService
    private readonly IEmbedBuilderService _ebs;
    private readonly CommandHandler _ch;

-    // todo .GetPrefix should be in a different place
-    public PermissionChecker(PermissionService perms,
-        GlobalPermissionService gperm, CmdCdService cmdCds,
+    public PermissionChecker(
+        PermissionService perms,
+        GlobalPermissionService gperm,
+        CmdCdService cmdCds,
        IEmbedBuilderService ebs,
        CommandHandler ch)
    {
@@ -27,58 +28,41 @@ public sealed class PermissionChecker : IPermissionChecker, INService
        _ch = ch;
    }

-    public async Task<OneOf<Success, Error<LocStr>>> CheckAsync(
+    public async Task<PermCheckResult> CheckPermsAsync(
        IGuild guild,
        IMessageChannel channel,
        IUser author,
        string module,
-        string? cmd)
+        string? cmdName)
    {
        module = module.ToLowerInvariant();
-        cmd = cmd?.ToLowerInvariant();
-        // todo add proper string
-        if (cmd is not null && await _cmdCds.TryBlock(guild, author, cmd))
-            return new Error<LocStr>(new());
+        cmdName = cmdName?.ToLowerInvariant();
+
+        if (cmdName is not null && await _cmdCds.TryBlock(guild, author, cmdName))
+        {
+            return new PermCooldown();
+        }

        try
        {
            if (_gperm.BlockedModules.Contains(module))
            {
-                Log.Information("u:{UserId} tried to use module {Module} which is globally disabled.",
-                    author.Id,
-                    module
-                );
-
-                return new Success();
+                return new PermGlobalBlock();
+            }
+
+            if (cmdName is not null && _gperm.BlockedCommands.Contains(cmdName))
+            {
+                return new PermGlobalBlock();
            }

-            // todo check if this even works
            if (guild is SocketGuild sg)
            {
-                var pc = _perms.GetCacheFor(guild.Id);
-                if (!pc.Permissions.CheckPermissions(author, channel, cmd, module, out var index))
+                var pc = _perms.GetCacheFor(sg.Id);
+                if (!pc.Permissions.CheckPermissions(author, channel, cmdName, module, out var index))
                {
-                    if (pc.Verbose)
-                    {
-                        // todo fix
-                        var permissionMessage = strs.perm_prevent(index + 1,
-                            Format.Bold(pc.Permissions[index].GetCommand(_ch.GetPrefix(guild), sg)));
-                        
-                        try
-                        {
-                            // await channel.SendErrorAsync(_ebs,
-                            //     title: null,
-                            //     text: GettextpermissionMessage);
-                        }
-                        catch
-                        {
-                        }
-                        
-                        Log.Information("{PermissionMessage}", permissionMessage);
-                    }
-
-                    // todo add proper string
-                    return new Error<LocStr>(new());
+                    return new PermDisallowed(index,
+                        pc.Permissions[index].GetCommand(_ch.GetPrefix(guild), sg),
+                        pc.Verbose);
                }
            }
        }
@@ -86,6 +70,6 @@ public sealed class PermissionChecker : IPermissionChecker, INService
        {
        }

-        return new Success();
+        return new PermAllowed();
    }
 }
--- a/src/NadekoBot/Services/Impl/PubSub/RedisPubSub.cs
+++ b/src/NadekoBot/Services/Impl/PubSub/RedisPubSub.cs
@@ -20,7 +20,9 @@ public sealed class RedisPubSub : IPubSub
    {
        var serialized = _serializer.Serialize(data);
        return _multi.GetSubscriber()
-                     .PublishAsync($"{_creds.RedisKey()}:{key.Key}", serialized, CommandFlags.FireAndForget);
+                     .PublishAsync(new RedisChannel($"{_creds.RedisKey()}:{key.Key}", RedisChannel.PatternMode.Literal),
+                         serialized,
+                         CommandFlags.FireAndForget);
    }

    public Task Sub<TData>(in TypedKey<TData> key, Func<TData, ValueTask> action)
@@ -47,6 +49,9 @@ public sealed class RedisPubSub : IPubSub
            }
        }

-        return _multi.GetSubscriber().SubscribeAsync($"{_creds.RedisKey()}:{eventName}", OnSubscribeHandler);
+        return _multi.GetSubscriber()
+                     .SubscribeAsync(
+                         new RedisChannel($"{_creds.RedisKey()}:{eventName}", RedisChannel.PatternMode.Literal),
+                         OnSubscribeHandler);
    }
 }
--- a/src/NadekoBot/data/games.yml
+++ b/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
--- a/src/NadekoBot/data/searches.yml
+++ b/src/NadekoBot/data/searches.yml
@@ -1,5 +1,5 @@
 # DO NOT CHANGE
-version: 1
+version: 2
 # Which engine should .search command
 # 'google_scrape' - default. Scrapes the webpage for results. May break. Requires no api keys.
 # 'google' - official google api. Requires googleApiKey and google.searchId set in creds.yml
@@ -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