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

dev: lmgtfy should now be properly shortened, small refactor of .shorten command

Browse Source
This commit is contained in:
Kwoth
2024-08-04 17:58:04 +00:00
parent f4ed907134
commit 690c03b396
3 changed files with 62 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/NadekoBot/Modules/Searches/Searches.cs
View File

@@ -14,7 +14,6 @@ namespace NadekoBot.Modules.Searches;
public partial class Searches : NadekoModule<SearchesService>
{
private static readonly ConcurrentDictionary<string, string> _cachedShortenedLinks = new();
private readonly IBotCredentials _creds;
private readonly IGoogleApiService _google;
private readonly IHttpClientFactory _httpFactory;
@@ -172,7 +171,8 @@ public partial class Searches : NadekoModule<SearchesService>
if (!await ValidateQuery(smh))
return;
var shortenedUrl = await _google.ShortenUrl($"https://letmegooglethat.com/?q={Uri.EscapeDataString(smh)}");
var link = $"https://letmegooglethat.com/?q={Uri.EscapeDataString(smh)}";
var shortenedUrl = await _service.ShortenLink(link) ?? link;
await Response().Confirm($"<{shortenedUrl}>").SendAsync();
}
@@ -182,35 +182,12 @@ public partial class Searches : NadekoModule<SearchesService>
if (!await ValidateQuery(query))
return;
query = query.Trim();
if (!_cachedShortenedLinks.TryGetValue(query, out var shortLink))
var shortLink = await _service.ShortenLink(query);
if (shortLink is null)
{
try
{
using var http = _httpFactory.CreateClient();
using var req = new HttpRequestMessage(HttpMethod.Post, "https://goolnk.com/api/v1/shorten");
var formData = new MultipartFormDataContent
{
{ new StringContent(query), "url" }
};
req.Content = formData;
using var res = await http.SendAsync(req);
var content = await res.Content.ReadAsStringAsync();
var data = JsonConvert.DeserializeObject<ShortenData>(content);
if (!string.IsNullOrWhiteSpace(data?.ResultUrl))
_cachedShortenedLinks.TryAdd(query, data.ResultUrl);
else
return;
shortLink = data.ResultUrl;
}
catch (Exception ex)
{
Log.Error(ex, "Error shortening a link: {Message}", ex.Message);
return;
}
await Response().Error(strs.error_occured).SendAsync();
return;
}
await Response()
@@ -221,6 +198,7 @@ public partial class Searches : NadekoModule<SearchesService>
.SendAsync();
}
[Cmd]
public async Task MagicTheGathering([Leftover] string search)
{
@@ -325,15 +303,15 @@ public partial class Searches : NadekoModule<SearchesService>
if (!await ValidateQuery(word))
return;
var maybeItems = await _service.GetDefinitionsAsync(word);
if(!maybeItems.TryPickT0(out var defs, out var error))
if (!maybeItems.TryPickT0(out var defs, out var error))
{
await HandleErrorAsync(error);
return;
}
await Response()
.Paginated()
.Items(defs)
@@ -487,10 +465,4 @@ public partial class Searches : NadekoModule<SearchesService>
await Response().Error(strs.specify_search_params).SendAsync();
return false;
}
public class ShortenData
{
[JsonProperty("result_url")]
public string ResultUrl { get; set; }
}
}