daan/geekbot
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity

Make errorhandler and languagehandler async, await all database actions

Browse source
This commit is contained in:
runebaas 2018-06-13 22:18:57 +02:00
parent 926a632641
commit 95618b1f8b
No known key found for this signature in database
GPG key ID: 2677AF508D0300D6
46 changed files with 181 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Geekbot.net/Commands/Admin/Admin.cs
View file

@ -35,7 +35,7 @@ namespace Geekbot.net.Commands.Admin
[Summary("Set a Welcome Message (use '$user' to mention the new joined user).")]
public async Task SetWelcomeMessage([Remainder] [Summary("message")] string welcomeMessage)
{
var guild = GetGuildSettings(Context.Guild.Id);
var guild = await GetGuildSettings(Context.Guild.Id);
guild.WelcomeMessage = welcomeMessage;
_database.GuildSettings.Update(guild);
await _database.SaveChangesAsync();
@ -52,7 +52,7 @@ namespace Geekbot.net.Commands.Admin
{
var m = await channel.SendMessageAsync("verifying...");
var guild = GetGuildSettings(Context.Guild.Id);
var guild = await GetGuildSettings(Context.Guild.Id);
guild.ModChannel = channel.Id.AsLong();
_database.GuildSettings.Update(guild);
await _database.SaveChangesAsync();
@ -65,7 +65,7 @@ namespace Geekbot.net.Commands.Admin
}
catch (Exception e)
{
_errorHandler.HandleCommandException(e, Context, "That channel doesn't seem to be valid");
await _errorHandler.HandleCommandException(e, Context, "That channel doesn't seem to be valid");
}
}
@ -75,7 +75,7 @@ namespace Geekbot.net.Commands.Admin
{
try
{
var guild = GetGuildSettings(Context.Guild.Id);
var guild = await GetGuildSettings(Context.Guild.Id);
var modChannel = await GetModChannel(guild.ModChannel.AsUlong());
if (modChannel == null) return;
@ -89,7 +89,7 @@ namespace Geekbot.net.Commands.Admin
}
catch (Exception e)
{
_errorHandler.HandleCommandException(e, Context);
await _errorHandler.HandleCommandException(e, Context);
}
}
@ -99,7 +99,7 @@ namespace Geekbot.net.Commands.Admin
{
try
{
var guild = GetGuildSettings(Context.Guild.Id);
var guild = await GetGuildSettings(Context.Guild.Id);
var modChannel = await GetModChannel(guild.ModChannel.AsUlong());
if (modChannel == null) return;
@ -113,7 +113,7 @@ namespace Geekbot.net.Commands.Admin
}
catch (Exception e)
{
_errorHandler.HandleCommandException(e, Context);
await _errorHandler.HandleCommandException(e, Context);
}
}
@ -124,15 +124,15 @@ namespace Geekbot.net.Commands.Admin
try
{
var language = languageRaw.ToUpper();
var success = _translation.SetLanguage(Context.Guild.Id, language);
var success = await _translation.SetLanguage(Context.Guild.Id, language);
if (success)
{
var guild = GetGuildSettings(Context.Guild.Id);
var guild = await GetGuildSettings(Context.Guild.Id);
guild.Language = language;
_database.GuildSettings.Update(guild);
await _database.SaveChangesAsync();
var trans = _translation.GetDict(Context);
var trans = await _translation.GetDict(Context);
await ReplyAsync(trans["NewLanguageSet"]);
return;
}
@ -142,7 +142,7 @@ namespace Geekbot.net.Commands.Admin
}
catch (Exception e)
{
_errorHandler.HandleCommandException(e, Context);
await _errorHandler.HandleCommandException(e, Context);
}
}
@ -153,7 +153,7 @@ namespace Geekbot.net.Commands.Admin
try
{
var language = languageRaw.ToLower();
var guild = GetGuildSettings(Context.Guild.Id);
var guild = await GetGuildSettings(Context.Guild.Id);
guild.WikiLang = language;
_database.GuildSettings.Update(guild);
await _database.SaveChangesAsync();
@ -162,7 +162,7 @@ namespace Geekbot.net.Commands.Admin
}
catch (Exception e)
{
_errorHandler.HandleCommandException(e, Context);
await _errorHandler.HandleCommandException(e, Context);
}
}
@ -172,7 +172,7 @@ namespace Geekbot.net.Commands.Admin
{
try
{
var guild = GetGuildSettings(Context.Guild.Id);
var guild = await GetGuildSettings(Context.Guild.Id);
guild.Ping = !guild.Ping;
_database.GuildSettings.Update(guild);
await _database.SaveChangesAsync();
@ -180,7 +180,7 @@ namespace Geekbot.net.Commands.Admin
}
catch (Exception e)
{
_errorHandler.HandleCommandException(e, Context);
await _errorHandler.HandleCommandException(e, Context);
}
}
@ -190,7 +190,7 @@ namespace Geekbot.net.Commands.Admin
{
try
{
var guild = GetGuildSettings(Context.Guild.Id);
var guild = await GetGuildSettings(Context.Guild.Id);
guild.Hui = !guild.Hui;
_database.GuildSettings.Update(guild);
await _database.SaveChangesAsync();
@ -198,11 +198,11 @@ namespace Geekbot.net.Commands.Admin
}
catch (Exception e)
{
_errorHandler.HandleCommandException(e, Context);
await _errorHandler.HandleCommandException(e, Context);
}
}
private GuildSettingsModel GetGuildSettings(ulong guildId)
private async Task<GuildSettingsModel> GetGuildSettings(ulong guildId)
{
var guild = _database.GuildSettings.FirstOrDefault(g => g.GuildId.Equals(guildId.AsLong()));
if (guild != null) return guild;
@ -212,12 +212,12 @@ namespace Geekbot.net.Commands.Admin
GuildId = guildId.AsLong(),
Hui = false,
Ping = false,
Language = "en",
Language = "EN",
ShowDelete = false,
ShowLeave = false,
WikiLang = "en"
});
_database.SaveChanges();
await _database.SaveChangesAsync();
return _database.GuildSettings.FirstOrDefault(g => g.GuildId.Equals(guildId.AsLong()));
}

2
Geekbot.net/Commands/Admin/Mod.cs
View file

@ -40,7 +40,7 @@ namespace Geekbot.net.Commands.Admin
}
catch (Exception e)
{
_errorHandler.HandleCommandException(e, Context,
await _errorHandler.HandleCommandException(e, Context,
$"I don't have enough permissions do that");
}
}

16
Geekbot.net/Commands/Admin/Owner.cs
View file

@ -52,14 +52,14 @@ namespace Geekbot.net.Commands.Admin
}
await ReplyAsync("starting migration");
_globalSettings.SetKey("MigrationStatus", "Running");
await _globalSettings.SetKey("MigrationStatus", "Running");
var redisMigration = new RedisMigration(_database, _redis, _logger, _client);
await redisMigration.Migrate();
_globalSettings.SetKey("MigrationStatus", "Done");
await _globalSettings.SetKey("MigrationStatus", "Done");
}
catch (Exception e)
{
_errorHandler.HandleCommandException(e, Context);
await _errorHandler.HandleCommandException(e, Context);
}
await ReplyAsync("done");
@ -69,7 +69,7 @@ namespace Geekbot.net.Commands.Admin
[Summary("Set the youtube api key")]
public async Task SetYoutubeKey([Summary("API Key")] string key)
{
_globalSettings.SetKey("YoutubeKey", key);
await _globalSettings.SetKey("YoutubeKey", key);
await ReplyAsync("Apikey has been set");
}
@ -77,7 +77,7 @@ namespace Geekbot.net.Commands.Admin
[Summary("Set the game that the bot is playing")]
public async Task SetGame([Remainder] [Summary("Game")] string key)
{
_globalSettings.SetKey("Game", key);
await _globalSettings.SetKey("Game", key);
await _client.SetGameAsync(key);
_logger.Information(LogSource.Geekbot, $"Changed game to {key}");
await ReplyAsync($"Now Playing {key}");
@ -109,14 +109,14 @@ namespace Geekbot.net.Commands.Admin
}
catch (Exception e)
{
_errorHandler.HandleCommandException(e, Context,
await _errorHandler.HandleCommandException(e, Context,
"Couldn't complete User Repository, see console for more info");
}
}
[Command("error", RunMode = RunMode.Async)]
[Summary("Throw an error un purpose")]
public void PurposefulError()
public async Task PurposefulError()
{
try
{
@ -124,7 +124,7 @@ namespace Geekbot.net.Commands.Admin
}
catch (Exception e)
{
_errorHandler.HandleCommandException(e, Context);
await _errorHandler.HandleCommandException(e, Context);
}
}
}

10
Geekbot.net/Commands/Admin/Role.cs
View file

@ -48,7 +48,7 @@ namespace Geekbot.net.Commands.Admin
}
catch (Exception e)
{
_errorHandler.HandleCommandException(e, Context);
await _errorHandler.HandleCommandException(e, Context);
}
}
@ -87,11 +87,11 @@ namespace Geekbot.net.Commands.Admin
}
catch (HttpException e)
{
_errorHandler.HandleHttpException(e, Context);
await _errorHandler.HandleHttpException(e, Context);
}
catch (Exception e)
{
_errorHandler.HandleCommandException(e, Context);
await _errorHandler.HandleCommandException(e, Context);
}
}
@ -130,7 +130,7 @@ namespace Geekbot.net.Commands.Admin
}
catch (Exception e)
{
_errorHandler.HandleCommandException(e, Context);
await _errorHandler.HandleCommandException(e, Context);
}
}
@ -155,7 +155,7 @@ namespace Geekbot.net.Commands.Admin
}
catch (Exception e)
{
_errorHandler.HandleCommandException(e, Context);
await _errorHandler.HandleCommandException(e, Context);
}
}

2
Geekbot.net/Commands/Admin/Say.cs
View file

@ -27,7 +27,7 @@ namespace Geekbot.net.Commands.Admin
}
catch (Exception e)
{
_errorHandler.HandleCommandException(e, Context);
await _errorHandler.HandleCommandException(e, Context);
}
}
}