diff --git a/src/NadekoBot/Modules/Administration/ImageOnlyChannelService.cs b/src/NadekoBot/Modules/Administration/ImageOnlyChannelService.cs index c5d9b2ec1..f6ec76127 100644 --- a/src/NadekoBot/Modules/Administration/ImageOnlyChannelService.cs +++ b/src/NadekoBot/Modules/Administration/ImageOnlyChannelService.cs @@ -175,7 +175,7 @@ public sealed class SomethingOnlyChannelService : IExecOnMessage // ignore owner and admin 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; } diff --git a/src/NadekoBot/Modules/Games/ChatterBot/ChatterbotService.cs b/src/NadekoBot/Modules/Games/ChatterBot/ChatterbotService.cs index eaf0d2c16..1d1d79bca 100644 --- a/src/NadekoBot/Modules/Games/ChatterBot/ChatterbotService.cs +++ b/src/NadekoBot/Modules/Games/ChatterBot/ChatterbotService.cs @@ -67,7 +67,7 @@ public class ChatterBotService : IExecOnMessage if (!string.IsNullOrWhiteSpace(_creds.CleverbotApiKey)) 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; case ChatBotImplementation.Gpt3: if (!string.IsNullOrWhiteSpace(_creds.Gpt3ApiKey)) @@ -80,7 +80,7 @@ public class ChatterBotService : IExecOnMessage _client.CurrentUser.Username, _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; default: return null; @@ -128,7 +128,7 @@ public class ChatterBotService : IExecOnMessage var res = await _perms.CheckPermsAsync(sg, usrMsg.Channel, usrMsg.Author, - "games", + CleverBotResponseStr.CLEVERBOT_RESPONSE, CleverBotResponseStr.CLEVERBOT_RESPONSE); if (!res.IsAllowed) diff --git a/src/NadekoBot/Modules/Help/Help.cs b/src/NadekoBot/Modules/Help/Help.cs index 263416df0..b96a4f8b4 100644 --- a/src/NadekoBot/Modules/Help/Help.cs +++ b/src/NadekoBot/Modules/Help/Help.cs @@ -87,6 +87,7 @@ public sealed class Help : NadekoModule await Response() .Paginated() .Items(topLevelModules) + .PageSize(12) .CurrentPage(page) .AddFooter(false) .Page((items, _) => diff --git a/src/NadekoBot/Modules/Medusae/Medusa.cs b/src/NadekoBot/Modules/Medusae/Medusa.cs index 859c308f3..49ef4bb77 100644 --- a/src/NadekoBot/Modules/Medusae/Medusa.cs +++ b/src/NadekoBot/Modules/Medusae/Medusa.cs @@ -3,6 +3,7 @@ namespace NadekoBot.Modules; [OwnerOnly] +[NoPublicBot] public partial class Medusa : NadekoModule { private readonly IMedusaeRepositoryService _repo; diff --git a/src/NadekoBot/_common/TypeReaders/ModuleTypeReader.cs b/src/NadekoBot/_common/TypeReaders/ModuleTypeReader.cs index 77d58e401..8a99ea8c1 100644 --- a/src/NadekoBot/_common/TypeReaders/ModuleTypeReader.cs +++ b/src/NadekoBot/_common/TypeReaders/ModuleTypeReader.cs @@ -1,4 +1,6 @@ #nullable disable +using NadekoBot.Modules.Permissions; + namespace NadekoBot.Common.TypeReaders; public sealed class ModuleTypeReader : NadekoTypeReader @@ -34,7 +36,7 @@ public sealed class ModuleOrExprTypeReader : NadekoTypeReader var module = _cmds.Modules.GroupBy(m => m.GetTopLevelModule()) .FirstOrDefault(m => m.Key.Name.ToUpperInvariant() == input) ?.Key; - if (module is null && input != "ACTUALEXPRESSIONS") + if (module is null && input != "ACTUALEXPRESSIONS" && input != CleverBotResponseStr.CLEVERBOT_RESPONSE) return new(TypeReaderResult.FromError(CommandError.ParseFailed, "No such module found.")); return new(TypeReaderResult.FromSuccess(new ModuleOrExpr