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

- Removed usage of obsolete methods

Browse Source 
- Removed unneeded argument from ValidateQuery in Searches.cs
- Using split query when loading all guild configs
This commit is contained in:
Kwoth
2021-12-20 03:48:42 +01:00
parent da2ee0c158
commit edd60ae656
4 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/NadekoBot/Db/Extensions/GuildConfigExtensions.cs
View File

@@ -45,9 +45,9 @@ public static class GuildConfigExtensions
private static IQueryable<GuildConfig> IncludeEverything(this DbSet<GuildConfig> configs) private static IQueryable<GuildConfig> IncludeEverything(this DbSet<GuildConfig> configs)
{ {
// todo split query
return configs return configs
.AsQueryable() .AsQueryable()
.AsSplitQuery()
.Include(gc => gc.CommandCooldowns) .Include(gc => gc.CommandCooldowns)
.Include(gc => gc.FollowedStreams) .Include(gc => gc.FollowedStreams)
.Include(gc => gc.StreamRole) .Include(gc => gc.StreamRole)

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

@@ -16,6 +16,7 @@ using SixLabors.ImageSharp.Drawing.Processing;
using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.PixelFormats;
using SixLabors.ImageSharp.Processing; using SixLabors.ImageSharp.Processing;
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.Diagnostics.CodeAnalysis;
using System.Net; using System.Net;
using System.Net.Http; using System.Net.Http;
using System.Threading.Tasks; using System.Threading.Tasks;
@@ -45,7 +46,7 @@ public partial class Searches : NadekoModule<SearchesService>
[NadekoCommand, Aliases] [NadekoCommand, Aliases]
public async Task Rip([Leftover] IGuildUser usr) public async Task Rip([Leftover] IGuildUser usr)
{ {
var av = usr.RealAvatarUrl(128); var av = usr.RealAvatarUrl();
if (av is null) if (av is null)
return; return;
await using (var picStream = await _service.GetRipPictureAsync(usr.Nickname ?? usr.Username, av).ConfigureAwait(false)) await using (var picStream = await _service.GetRipPictureAsync(usr.Nickname ?? usr.Username, av).ConfigureAwait(false))
@@ -62,7 +63,7 @@ public partial class Searches : NadekoModule<SearchesService>
[NadekoCommand, Aliases] [NadekoCommand, Aliases]
public async Task Weather([Leftover] string query) public async Task Weather([Leftover] string query)
{ {
if (!await ValidateQuery(ctx.Channel, query).ConfigureAwait(false)) if (!await ValidateQuery(query).ConfigureAwait(false))
return; return;
var embed = _eb.Create(); var embed = _eb.Create();
@@ -104,7 +105,7 @@ public partial class Searches : NadekoModule<SearchesService>
[NadekoCommand, Aliases] [NadekoCommand, Aliases]
public async Task Time([Leftover] string query) public async Task Time([Leftover] string query)
{ {
if (!await ValidateQuery(ctx.Channel, query).ConfigureAwait(false)) if (!await ValidateQuery(query).ConfigureAwait(false))
return; return;
await ctx.Channel.TriggerTypingAsync().ConfigureAwait(false); await ctx.Channel.TriggerTypingAsync().ConfigureAwait(false);
@@ -150,10 +151,10 @@ public partial class Searches : NadekoModule<SearchesService>
[NadekoCommand, Aliases] [NadekoCommand, Aliases]
public async Task Youtube([Leftover] string query = null) public async Task Youtube([Leftover] string query = null)
{ {
if (!await ValidateQuery(ctx.Channel, query).ConfigureAwait(false)) if (!await ValidateQuery(query).ConfigureAwait(false))
return; return;
var result = (await _google.GetVideoLinksByKeywordAsync(query, 1).ConfigureAwait(false)).FirstOrDefault(); var result = (await _google.GetVideoLinksByKeywordAsync(query).ConfigureAwait(false)).FirstOrDefault();
if (string.IsNullOrWhiteSpace(result)) if (string.IsNullOrWhiteSpace(result))
{ {
await ReplyErrorLocalizedAsync(strs.no_results).ConfigureAwait(false); await ReplyErrorLocalizedAsync(strs.no_results).ConfigureAwait(false);
@@ -166,7 +167,7 @@ public partial class Searches : NadekoModule<SearchesService>
[NadekoCommand, Aliases] [NadekoCommand, Aliases]
public async Task Movie([Leftover] string query = null) public async Task Movie([Leftover] string query = null)
{ {
if (!await ValidateQuery(ctx.Channel, query).ConfigureAwait(false)) if (!await ValidateQuery(query).ConfigureAwait(false))
return; return;
await ctx.Channel.TriggerTypingAsync().ConfigureAwait(false); await ctx.Channel.TriggerTypingAsync().ConfigureAwait(false);
@@ -211,7 +212,7 @@ public partial class Searches : NadekoModule<SearchesService>
public async Task Image([Leftover] string query = null) public async Task Image([Leftover] string query = null)
{ {
var oterms = query?.Trim(); var oterms = query?.Trim();
if (!await ValidateQuery(ctx.Channel, query).ConfigureAwait(false)) if (!await ValidateQuery(query).ConfigureAwait(false))
return; return;
query = WebUtility.UrlEncode(oterms).Replace(' ', '+'); query = WebUtility.UrlEncode(oterms).Replace(' ', '+');
try try
@@ -263,10 +264,10 @@ public partial class Searches : NadekoModule<SearchesService>
[NadekoCommand, Aliases] [NadekoCommand, Aliases]
public async Task Lmgtfy([Leftover] string ffs = null) public async Task Lmgtfy([Leftover] string ffs = null)
{ {
if (!await ValidateQuery(ctx.Channel, ffs).ConfigureAwait(false)) if (!await ValidateQuery(ffs).ConfigureAwait(false))
return; return;
var shortenedUrl = await _google.ShortenUrl($"http://lmgtfy.com/?q={Uri.EscapeUriString(ffs)}"); var shortenedUrl = await _google.ShortenUrl($"http://lmgtfy.com/?q={Uri.EscapeDataString(ffs)}");
await SendConfirmAsync($"<{shortenedUrl}>"); await SendConfirmAsync($"<{shortenedUrl}>");
} }
@@ -281,7 +282,7 @@ public partial class Searches : NadekoModule<SearchesService>
[NadekoCommand, Aliases] [NadekoCommand, Aliases]
public async Task Shorten([Leftover] string query) public async Task Shorten([Leftover] string query)
{ {
if (!await ValidateQuery(ctx.Channel, query).ConfigureAwait(false)) if (!await ValidateQuery(query).ConfigureAwait(false))
return; return;
query = query.Trim(); query = query.Trim();
@@ -329,7 +330,7 @@ public partial class Searches : NadekoModule<SearchesService>
public async Task Google([Leftover] string query = null) public async Task Google([Leftover] string query = null)
{ {
query = query?.Trim(); query = query?.Trim();
if (!await ValidateQuery(ctx.Channel, query).ConfigureAwait(false)) if (!await ValidateQuery(query).ConfigureAwait(false))
return; return;
_ = ctx.Channel.TriggerTypingAsync(); _ = ctx.Channel.TriggerTypingAsync();
@@ -362,7 +363,7 @@ public partial class Searches : NadekoModule<SearchesService>
public async Task DuckDuckGo([Leftover] string query = null) public async Task DuckDuckGo([Leftover] string query = null)
{ {
query = query?.Trim(); query = query?.Trim();
if (!await ValidateQuery(ctx.Channel, query).ConfigureAwait(false)) if (!await ValidateQuery(query).ConfigureAwait(false))
return; return;
_ = ctx.Channel.TriggerTypingAsync(); _ = ctx.Channel.TriggerTypingAsync();
@@ -392,7 +393,7 @@ public partial class Searches : NadekoModule<SearchesService>
[NadekoCommand, Aliases] [NadekoCommand, Aliases]
public async Task MagicTheGathering([Leftover] string search) public async Task MagicTheGathering([Leftover] string search)
{ {
if (!await ValidateQuery(ctx.Channel, search)) if (!await ValidateQuery(search))
return; return;
await ctx.Channel.TriggerTypingAsync().ConfigureAwait(false); await ctx.Channel.TriggerTypingAsync().ConfigureAwait(false);
@@ -419,7 +420,7 @@ public partial class Searches : NadekoModule<SearchesService>
public async Task Hearthstone([Leftover] string name) public async Task Hearthstone([Leftover] string name)
{ {
var arg = name; var arg = name;
if (!await ValidateQuery(ctx.Channel, name).ConfigureAwait(false)) if (!await ValidateQuery(name).ConfigureAwait(false))
return; return;
if (string.IsNullOrWhiteSpace(_creds.RapidApiKey)) if (string.IsNullOrWhiteSpace(_creds.RapidApiKey))
@@ -448,13 +449,13 @@ public partial class Searches : NadekoModule<SearchesService>
[NadekoCommand, Aliases] [NadekoCommand, Aliases]
public async Task UrbanDict([Leftover] string query = null) public async Task UrbanDict([Leftover] string query = null)
{ {
if (!await ValidateQuery(ctx.Channel, query).ConfigureAwait(false)) if (!await ValidateQuery(query).ConfigureAwait(false))
return; return;
await ctx.Channel.TriggerTypingAsync().ConfigureAwait(false); await ctx.Channel.TriggerTypingAsync().ConfigureAwait(false);
using (var http = _httpFactory.CreateClient()) using (var http = _httpFactory.CreateClient())
{ {
var res = await http.GetStringAsync($"http://api.urbandictionary.com/v0/define?term={Uri.EscapeUriString(query)}").ConfigureAwait(false); var res = await http.GetStringAsync($"http://api.urbandictionary.com/v0/define?term={Uri.EscapeDataString(query)}").ConfigureAwait(false);
try try
{ {
var items = JsonConvert.DeserializeObject<UrbanResponse>(res).List; var items = JsonConvert.DeserializeObject<UrbanResponse>(res).List;
@@ -483,7 +484,7 @@ public partial class Searches : NadekoModule<SearchesService>
[NadekoCommand, Aliases] [NadekoCommand, Aliases]
public async Task Define([Leftover] string word) public async Task Define([Leftover] string word)
{ {
if (!await ValidateQuery(ctx.Channel, word).ConfigureAwait(false)) if (!await ValidateQuery(word).ConfigureAwait(false))
return; return;
using (var _http = _httpFactory.CreateClient()) using (var _http = _httpFactory.CreateClient())
@@ -591,7 +592,7 @@ public partial class Searches : NadekoModule<SearchesService>
{ {
query = query?.Trim(); query = query?.Trim();
if (!await ValidateQuery(ctx.Channel, query).ConfigureAwait(false)) if (!await ValidateQuery(query).ConfigureAwait(false))
return; return;
using (var http = _httpFactory.CreateClient()) using (var http = _httpFactory.CreateClient())
@@ -650,8 +651,8 @@ public partial class Searches : NadekoModule<SearchesService>
} }
await ctx.Channel.EmbedAsync(_eb.Create().WithOkColor() await ctx.Channel.EmbedAsync(_eb.Create().WithOkColor()
.AddField("Username", usr.ToString(), false) .AddField("Username", usr.ToString())
.AddField("Avatar Url", avatarUrl, false) .AddField("Avatar Url", avatarUrl)
.WithThumbnailUrl(avatarUrl.ToString()), ctx.User.Mention).ConfigureAwait(false); .WithThumbnailUrl(avatarUrl.ToString()), ctx.User.Mention).ConfigureAwait(false);
} }
@@ -669,11 +670,11 @@ public partial class Searches : NadekoModule<SearchesService>
http.DefaultRequestHeaders.Clear(); http.DefaultRequestHeaders.Clear();
try try
{ {
var res = await http.GetStringAsync($"https://{Uri.EscapeUriString(target)}.fandom.com/api.php" + var res = await http.GetStringAsync($"https://{Uri.EscapeDataString(target)}.fandom.com/api.php" +
$"?action=query" + $"?action=query" +
$"&format=json" + $"&format=json" +
$"&list=search" + $"&list=search" +
$"&srsearch={Uri.EscapeUriString(query)}" + $"&srsearch={Uri.EscapeDataString(query)}" +
$"&srlimit=1").ConfigureAwait(false); $"&srlimit=1").ConfigureAwait(false);
var items = JObject.Parse(res); var items = JObject.Parse(res);
var title = items["query"]?["search"]?.FirstOrDefault()?["title"]?.ToString(); var title = items["query"]?["search"]?.FirstOrDefault()?["title"]?.ToString();
@@ -684,8 +685,8 @@ public partial class Searches : NadekoModule<SearchesService>
return; return;
} }
var url = Uri.EscapeUriString($"https://{target}.fandom.com/wiki/{title}"); var url = Uri.EscapeDataString($"https://{target}.fandom.com/wiki/{title}");
var response = $@"`{GetText(strs.title)}` {title?.SanitizeMentions()} var response = $@"`{GetText(strs.title)}` {title.SanitizeMentions()}
`{GetText(strs.url)}:` {url}"; `{GetText(strs.url)}:` {url}";
await ctx.Channel.SendMessageAsync(response).ConfigureAwait(false); await ctx.Channel.SendMessageAsync(response).ConfigureAwait(false);
} }
@@ -754,7 +755,7 @@ public partial class Searches : NadekoModule<SearchesService>
await ctx.Channel.SendMessageAsync($"https://store.steampowered.com/app/{appId}").ConfigureAwait(false); await ctx.Channel.SendMessageAsync($"https://store.steampowered.com/app/{appId}").ConfigureAwait(false);
} }
public async Task<bool> ValidateQuery(IMessageChannel ch, string query) public async Task<bool> ValidateQuery(string query)
{ {
if (!string.IsNullOrWhiteSpace(query)) if (!string.IsNullOrWhiteSpace(query))
{ {

6
src/NadekoBot/Modules/Searches/Services/SearchesService.cs
View File

@@ -358,7 +358,7 @@ public class SearchesService : INService
$"newSearch=false&" + $"newSearch=false&" +
$"ProductType=All&" + $"ProductType=All&" +
$"IsProductNameExact=false&" + $"IsProductNameExact=false&" +
$"ProductName={Uri.EscapeUriString(card.Name)}").ConfigureAwait(false); $"ProductName={Uri.EscapeDataString(card.Name)}").ConfigureAwait(false);
} }
catch { storeUrl = "<url can't be found>"; } catch { storeUrl = "<url can't be found>"; }
@@ -376,7 +376,7 @@ public class SearchesService : INService
using (var http = _httpFactory.CreateClient()) using (var http = _httpFactory.CreateClient())
{ {
http.DefaultRequestHeaders.Clear(); http.DefaultRequestHeaders.Clear();
var response = await http.GetStringAsync($"https://api.magicthegathering.io/v1/cards?name={Uri.EscapeUriString(search)}") var response = await http.GetStringAsync($"https://api.magicthegathering.io/v1/cards?name={Uri.EscapeDataString(search)}")
.ConfigureAwait(false); .ConfigureAwait(false);
var responseObject = JsonConvert.DeserializeObject<MtgResponse>(response); var responseObject = JsonConvert.DeserializeObject<MtgResponse>(response);
@@ -417,7 +417,7 @@ public class SearchesService : INService
try try
{ {
var response = await http.GetStringAsync($"https://omgvamp-hearthstone-v1.p.rapidapi.com/" + var response = await http.GetStringAsync($"https://omgvamp-hearthstone-v1.p.rapidapi.com/" +
$"cards/search/{Uri.EscapeUriString(name)}").ConfigureAwait(false); $"cards/search/{Uri.EscapeDataString(name)}").ConfigureAwait(false);
var objs = JsonConvert.DeserializeObject<HearthstoneCardData[]>(response); var objs = JsonConvert.DeserializeObject<HearthstoneCardData[]>(response);
if (objs is null || objs.Length == 0) if (objs is null || objs.Length == 0)
return null; return null;

3
src/NadekoBot/Modules/Utility/Utility.cs
View File

@@ -9,6 +9,7 @@ using System.Diagnostics;
using System.Net.Http; using System.Net.Http;
using System.Text; using System.Text;
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using NadekoBot.Common.Replacements; using NadekoBot.Common.Replacements;
@@ -373,7 +374,7 @@ public partial class Utility : NadekoModule
private static readonly JsonSerializerOptions _showEmbedSerializerOptions = new JsonSerializerOptions() private static readonly JsonSerializerOptions _showEmbedSerializerOptions = new JsonSerializerOptions()
{ {
WriteIndented = true, WriteIndented = true,
IgnoreNullValues = true, DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
PropertyNamingPolicy = LowerCaseNamingPolicy.Default PropertyNamingPolicy = LowerCaseNamingPolicy.Default
}; };