fix(joke): added retry searching joke if current server returned error

Wittano · Apr 7, 2024 · 64936bf · 64936bf
1 parent d43d6f9
commit 64936bf
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/pkgs/command/joke.go b/pkgs/command/joke.go
@@ -58,14 +58,22 @@ func (j JokeCommand) Command() *discordgo.ApplicationCommand {
 func (j JokeCommand) Execute(ctx context.Context, _ *discordgo.Session, i *discordgo.InteractionCreate) (DiscordMessageReceiver, error) {
 	searchQuery := getJokeSearchParameters(ctx, i.Data.(discordgo.ApplicationCommandInteractionData))
 
+findJoke:
+	select {
+	case <-ctx.Done():
+		return nil, context.Canceled
+	default:
+	}
+
 	service, err := selectGetService(ctx, j.Services)
 	if err != nil {
 		return nil, ErrorResponse{err, "Nie udało mi się, znaleść żadnego żartu"}
 	}
 
 	res, err := service.Get(ctx, searchQuery)
 	if err != nil {
-		return nil, err
+		slog.With(requestIDKey, ctx.Value(requestIDKey)).ErrorContext(ctx, err.Error())
+		goto findJoke
 	}
 
 	return jokeResponse{