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

* Rewrote cmdcd service, prettified and paginated .cmdcds

Browse Source 
* Cleaned up/improved some command handler code
* Fixed .yun when channel id has an underscore
This commit is contained in:
Kwoth
2022-10-02 13:38:50 +00:00
parent e63ac07a52
commit 15e6cff14a
9 changed files with 165 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/NadekoBot/Modules/Games/Trivia/Games.cs
View File

@@ -112,25 +112,25 @@ public partial class Games
private void RegisterEvents(TriviaGame trivia)
{
trivia.OnQuestion += OnTriviaOnOnQuestion;
trivia.OnHint += OnTriviaOnOnHint;
trivia.OnGuess += OnTriviaOnOnGuess;
trivia.OnEnded += OnTriviaOnOnEnded;
trivia.OnStats += OnTriviaOnOnStats;
trivia.OnTimeout += OnTriviaOnOnTimeout;
trivia.OnQuestion += OnTriviaQuestion;
trivia.OnHint += OnTriviaHint;
trivia.OnGuess += OnTriviaGuess;
trivia.OnEnded += OnTriviaEnded;
trivia.OnStats += OnTriviaStats;
trivia.OnTimeout += OnTriviaTimeout;
}
private void UnregisterEvents(TriviaGame trivia)
{
trivia.OnQuestion -= OnTriviaOnOnQuestion;
trivia.OnHint -= OnTriviaOnOnHint;
trivia.OnGuess -= OnTriviaOnOnGuess;
trivia.OnEnded -= OnTriviaOnOnEnded;
trivia.OnStats -= OnTriviaOnOnStats;
trivia.OnTimeout -= OnTriviaOnOnTimeout;
trivia.OnQuestion -= OnTriviaQuestion;
trivia.OnHint -= OnTriviaHint;
trivia.OnGuess -= OnTriviaGuess;
trivia.OnEnded -= OnTriviaEnded;
trivia.OnStats -= OnTriviaStats;
trivia.OnTimeout -= OnTriviaTimeout;
}
private async Task OnTriviaOnOnHint(TriviaGame game, TriviaQuestion question)
private async Task OnTriviaHint(TriviaGame game, TriviaQuestion question)
{
try
{
@@ -150,11 +150,11 @@ public partial class Games
}
catch (Exception ex)
{
Log.Warning(ex, "Error editing triva message");
Log.Warning(ex, "Error editing trivia message");
}
}
private async Task OnTriviaOnOnQuestion(TriviaGame game, TriviaQuestion question)
private async Task OnTriviaQuestion(TriviaGame game, TriviaQuestion question)
{
try
{
@@ -173,19 +173,16 @@ public partial class Games
questionMessage = await ctx.Channel.EmbedAsync(questionEmbed);
}
catch (HttpException ex) when (ex.HttpCode is HttpStatusCode.NotFound or HttpStatusCode.Forbidden or HttpStatusCode.BadRequest)
catch (HttpException ex) when (ex.HttpCode is HttpStatusCode.NotFound or HttpStatusCode.Forbidden
or HttpStatusCode.BadRequest)
{
Log.Warning("Unable to send trivia questions. Stopping immediately");
game.Stop();
}
catch (Exception ex)
{
Log.Warning(ex, "Error sending trivia embed");
await Task.Delay(2000);
throw;
}
}
private async Task OnTriviaOnOnTimeout(TriviaGame _, TriviaQuestion question)
private async Task OnTriviaTimeout(TriviaGame _, TriviaQuestion question)
{
try
{
@@ -205,7 +202,7 @@ public partial class Games
}
}
private async Task OnTriviaOnOnStats(TriviaGame game)
private async Task OnTriviaStats(TriviaGame game)
{
try
{
@@ -217,7 +214,7 @@ public partial class Games
}
}
private async Task OnTriviaOnOnEnded(TriviaGame game)
private async Task OnTriviaEnded(TriviaGame game)
{
try
{
@@ -237,10 +234,9 @@ public partial class Games
}
UnregisterEvents(game);
await Task.Delay(1000);
}
private async Task OnTriviaOnOnGuess(TriviaGame _, TriviaUser user, TriviaQuestion question, bool isWin)
private async Task OnTriviaGuess(TriviaGame _, TriviaUser user, TriviaQuestion question, bool isWin)
{
try
{

16
src/NadekoBot/Modules/Games/Trivia/TriviaGame.cs
View File

@@ -1,4 +1,5 @@
using System.Threading.Channels;
using Exception = System.Exception;
namespace NadekoBot.Modules.Games.Common.Trivia;
@@ -64,7 +65,6 @@ public sealed class TriviaGame
if (errorCount >= 5)
{
Log.Warning("Trivia errored 5 times and will quit");
await OnEnded(this);
break;
}
@@ -80,7 +80,7 @@ public sealed class TriviaGame
var maybeQuestion = await _questionPool.GetQuestionAsync();
if (!(maybeQuestion is TriviaQuestion question))
if (maybeQuestion is not { } question)
{
// if question is null (ran out of question, or other bugg ) - stop
break;
@@ -110,7 +110,8 @@ public sealed class TriviaGame
var guessed = false;
while (true)
{
var readTask = _inputs.Reader.ReadAsync().AsTask();
using var readCancel = new CancellationTokenSource();
var readTask = _inputs.Reader.ReadAsync(readCancel.Token).AsTask();
// wait for either someone to attempt to guess
// or for timeout
@@ -119,6 +120,8 @@ public sealed class TriviaGame
// if the task which completed is the timeout task
if (task == halfGuessTimerTask)
{
readCancel.Cancel();
// if hint is already sent, means time expired
// break (end the round)
if (hintSent)
@@ -130,7 +133,7 @@ public sealed class TriviaGame
halfGuessTimerTask = TimeOutFactory();
// send a hint out
await OnHint(this, question);
continue;
}
@@ -147,6 +150,7 @@ public sealed class TriviaGame
// reset inactivity counter
inactivity = 0;
errorCount = 0;
var isWin = false;
// if user won the game, tell the game to stop
@@ -174,9 +178,9 @@ public sealed class TriviaGame
}
}
}
catch
catch (Exception ex)
{
Log.Error(ex, "Fatal error in trivia game: {ErrorMessage}", ex.Message);
}
finally
{