Emotions-stuff/elliebot
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 23 Packages Wiki Activity

.qimport will is no longer owner only on the public bot

Browse source 
Creds issues should now be properly caught and logged, instead of showing unhandled exceptions
This commit is contained in:
Toastie (DCS Team) 2024-09-11 20:41:00 +12:00
parent 140a35b82a
commit 78366ab7e4
Signed by: toastie_t0ast
GPG key ID: 27F3B6855AFD40A4
4 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -21,6 +21,7 @@ src/EllieBot/old_credentials.json
src/EllieBot/credentials.json.bak
src/EllieBot/data/EllieBot.db
ellie-menu.ps1
package.sh
# Created by https://www.gitignore.io/api/visualstudio,visualstudiocode,windows,linux,macos

1
src/EllieBot/Modules/Expressions/EllieExpressions.cs
View file

@ -401,6 +401,7 @@ public partial class EllieExpressions : EllieModule<EllieExpressionsService>
}
[Cmd]
[Ratelimit(300)]
public async Task ExprsImport([Leftover] string input = null)
{
// todo cooldown on public bot for 1 day, limit 100

3
src/EllieBot/Modules/Utility/Quote/QuoteCommands.cs
View file

@ -351,9 +351,6 @@ public partial class Utility
[RequireContext(ContextType.Guild)]
[UserPerm(GuildPerm.Administrator)]
[Ratelimit(300)]
#if GLOBAL_NADEKO
[OwnerOnly]
#endif
public async Task QuotesImport([Leftover] string? input = null)
{
input = input?.Trim();

20
src/EllieBot/Services/Impl/BotCredsProvider.cs
View file

@ -49,18 +49,18 @@ public sealed class BotCredsProvider : IBotCredsProvider
// this can fail in docker containers
}
MigrateCredentials();
if (!File.Exists(CredsPath))
{
Log.Warning(
"{CredsPath} is missing. Attempting to load creds from environment variables prefixed with 'EllieBot_'. Example is in {CredsExamplePath}",
CredsPath,
CredsExamplePath);
}
try
{
MigrateCredentials();
if (!File.Exists(CredsPath))
{
Log.Warning(
"{CredsPath} is missing. Attempting to load creds from environment variables prefixed with 'EllieBot_'. Example is in {CredsExamplePath}",
CredsPath,
CredsExamplePath);
}
_config = new ConfigurationBuilder().AddYamlFile(CredsPath, false, true)
.AddEnvironmentVariables("EllieBot_")
.Build();