dev: v3 .catfact

This commit is contained in:
Kwoth
2024-07-28 10:10:19 +00:00
parent 17e5ff8b89
commit b5e2b6f483
2 changed files with 25 additions and 11 deletions

View File

@@ -399,10 +399,14 @@ public partial class Searches : NadekoModule<SearchesService>
[Cmd] [Cmd]
public async Task Catfact() public async Task Catfact()
{ {
using var http = _httpFactory.CreateClient(); var maybeFact = await _service.GetCatFactAsync();
var response = await http.GetStringAsync("https://catfact.ninja/fact");
var fact = JObject.Parse(response)["fact"].ToString(); if (!maybeFact.TryPickT0(out var fact, out var error))
{
await HandleErrorAsync(error);
return;
}
await Response().Confirm("🐈" + GetText(strs.catfact), fact).SendAsync(); await Response().Confirm("🐈" + GetText(strs.catfact), fact).SendAsync();
} }

View File

@@ -2,14 +2,8 @@
using NadekoBot.Modules.Searches.Common; using NadekoBot.Modules.Searches.Common;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using OneOf.Types; using System.Text.Json;
using SixLabors.Fonts; using OneOf;
using SixLabors.ImageSharp;
using SixLabors.ImageSharp.Drawing.Processing;
using SixLabors.ImageSharp.PixelFormats;
using SixLabors.ImageSharp.Processing;
using Color = SixLabors.ImageSharp.Color;
using Image = SixLabors.ImageSharp.Image;
namespace NadekoBot.Modules.Searches.Services; namespace NadekoBot.Modules.Searches.Services;
@@ -458,6 +452,22 @@ public class SearchesService : INService
return ErrorType.Unknown; return ErrorType.Unknown;
} }
} }
public async Task<OneOf<string, ErrorType>> GetCatFactAsync()
{
using var http = _httpFactory.CreateClient();
var response = await http.GetStringAsync("https://catfact.ninja/fact").ConfigureAwait(false);
var doc = JsonDocument.Parse(response);
if (!doc.RootElement.TryGetProperty("fact", out var factElement))
{
return ErrorType.Unknown;
}
return factElement.ToString();
}
} }
public enum ErrorType public enum ErrorType