minster586/nadekobot
1
0
Fork 0
mirror of https://gitlab.com/Kwoth/nadekobot.git synced 2025-09-11 17:58:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: cleverbot:response should now be a valid module name

Browse Source
This commit is contained in:
Kwoth
2024-05-10 09:53:20 +00:00
parent 6f4cbddcad
commit 75c5a003bf
5 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/NadekoBot/Modules/Administration/ImageOnlyChannelService.cs
View File

@@ -175,7 +175,7 @@ public sealed class SomethingOnlyChannelService : IExecOnMessage
// ignore owner and admin // ignore owner and admin
if (user.Id == tch.Guild.OwnerId || user.GuildPermissions.Administrator) if (user.Id == tch.Guild.OwnerId || user.GuildPermissions.Administrator)
{ {
Log.Information("{Type}-Only Channel: Ignoring owner od admin ({ChannelId})", type, msg.Channel.Id); Log.Information("{Type}-Only Channel: Ignoring owner or admin ({ChannelId})", type, msg.Channel.Id);
return false; return false;
} }

6
src/NadekoBot/Modules/Games/ChatterBot/ChatterbotService.cs
View File

@@ -67,7 +67,7 @@ public class ChatterBotService : IExecOnMessage
if (!string.IsNullOrWhiteSpace(_creds.CleverbotApiKey)) if (!string.IsNullOrWhiteSpace(_creds.CleverbotApiKey))
return new OfficialCleverbotSession(_creds.CleverbotApiKey, _httpFactory); return new OfficialCleverbotSession(_creds.CleverbotApiKey, _httpFactory);
Log.Information("Cleverbot will not work as the api key is missing."); Log.Information("Cleverbot will not work as the api key is missing");
return null; return null;
case ChatBotImplementation.Gpt3: case ChatBotImplementation.Gpt3:
if (!string.IsNullOrWhiteSpace(_creds.Gpt3ApiKey)) if (!string.IsNullOrWhiteSpace(_creds.Gpt3ApiKey))
@@ -80,7 +80,7 @@ public class ChatterBotService : IExecOnMessage
_client.CurrentUser.Username, _client.CurrentUser.Username,
_httpFactory); _httpFactory);
Log.Information("Gpt3 will not work as the api key is missing."); Log.Information("Gpt3 will not work as the api key is missing");
return null; return null;
default: default:
return null; return null;
@@ -128,7 +128,7 @@ public class ChatterBotService : IExecOnMessage
var res = await _perms.CheckPermsAsync(sg, var res = await _perms.CheckPermsAsync(sg,
usrMsg.Channel, usrMsg.Channel,
usrMsg.Author, usrMsg.Author,
"games", CleverBotResponseStr.CLEVERBOT_RESPONSE,
CleverBotResponseStr.CLEVERBOT_RESPONSE); CleverBotResponseStr.CLEVERBOT_RESPONSE);
if (!res.IsAllowed) if (!res.IsAllowed)

1
src/NadekoBot/Modules/Help/Help.cs
View File

@@ -87,6 +87,7 @@ public sealed class Help : NadekoModule<HelpService>
await Response() await Response()
.Paginated() .Paginated()
.Items(topLevelModules) .Items(topLevelModules)
.PageSize(12)
.CurrentPage(page) .CurrentPage(page)
.AddFooter(false) .AddFooter(false)
.Page((items, _) => .Page((items, _) =>

1
src/NadekoBot/Modules/Medusae/Medusa.cs
View File

@@ -3,6 +3,7 @@
namespace NadekoBot.Modules; namespace NadekoBot.Modules;
[OwnerOnly] [OwnerOnly]
[NoPublicBot]
public partial class Medusa : NadekoModule<IMedusaLoaderService> public partial class Medusa : NadekoModule<IMedusaLoaderService>
{ {
private readonly IMedusaeRepositoryService _repo; private readonly IMedusaeRepositoryService _repo;

4
src/NadekoBot/_common/TypeReaders/ModuleTypeReader.cs
View File

@@ -1,4 +1,6 @@
#nullable disable #nullable disable
using NadekoBot.Modules.Permissions;
namespace NadekoBot.Common.TypeReaders; namespace NadekoBot.Common.TypeReaders;
public sealed class ModuleTypeReader : NadekoTypeReader<ModuleInfo> public sealed class ModuleTypeReader : NadekoTypeReader<ModuleInfo>
@@ -34,7 +36,7 @@ public sealed class ModuleOrExprTypeReader : NadekoTypeReader<ModuleOrExpr>
var module = _cmds.Modules.GroupBy(m => m.GetTopLevelModule()) var module = _cmds.Modules.GroupBy(m => m.GetTopLevelModule())
.FirstOrDefault(m => m.Key.Name.ToUpperInvariant() == input) .FirstOrDefault(m => m.Key.Name.ToUpperInvariant() == input)
?.Key; ?.Key;
if (module is null && input != "ACTUALEXPRESSIONS") if (module is null && input != "ACTUALEXPRESSIONS" && input != CleverBotResponseStr.CLEVERBOT_RESPONSE)
return new(TypeReaderResult.FromError<ModuleOrExpr>(CommandError.ParseFailed, "No such module found.")); return new(TypeReaderResult.FromError<ModuleOrExpr>(CommandError.ParseFailed, "No such module found."));
return new(TypeReaderResult.FromSuccess(new ModuleOrExpr return new(TypeReaderResult.FromSuccess(new ModuleOrExpr