diff --git a/NadekoBot/Classes/SearchHelper.cs b/NadekoBot/Classes/SearchHelper.cs index 7270a47b..dbec36af 100644 --- a/NadekoBot/Classes/SearchHelper.cs +++ b/NadekoBot/Classes/SearchHelper.cs @@ -252,7 +252,7 @@ namespace NadekoBot.Classes var webpage = await GetResponseStringAsync(url).ConfigureAwait(false); var matches = Regex.Matches(webpage, "file_url=\"(?.*?)\""); if (matches.Count == 0) - throw new FileNotFoundException(); + return null; var match = matches[rng.Next(0, matches.Count)]; return matches[rng.Next(0, matches.Count)].Groups["url"].Value; } @@ -265,7 +265,7 @@ namespace NadekoBot.Classes var webpage = await GetResponseStringAsync(url).ConfigureAwait(false); var matches = Regex.Matches(webpage, "file_url=\"(?.*?)\""); if (matches.Count == 0) - throw new FileNotFoundException(); + return null; var match = matches[rng.Next(0, matches.Count)]; return "http:" + matches[rng.Next(0, matches.Count)].Groups["url"].Value; } diff --git a/NadekoBot/Modules/NSFW/NSFWModule.cs b/NadekoBot/Modules/NSFW/NSFWModule.cs index 8210e67d..d1b175c6 100644 --- a/NadekoBot/Modules/NSFW/NSFWModule.cs +++ b/NadekoBot/Modules/NSFW/NSFWModule.cs @@ -69,7 +69,11 @@ namespace NadekoBot.Modules.NSFW .Do(async e => { var tag = e.GetArg("tag")?.Trim() ?? ""; - await e.Channel.SendMessage(await SearchHelper.GetRule34ImageLink(tag).ConfigureAwait(false)).ConfigureAwait(false); + var link = await SearchHelper.GetRule34ImageLink(tag).ConfigureAwait(false); + if (string.IsNullOrWhiteSpace(link)) + await e.Channel.SendMessage("Search yielded no results ;("); + else + await e.Channel.SendMessage(link).ConfigureAwait(false); }); cgb.CreateCommand(Prefix + "e621") .Description("Shows a random hentai image from e621.net with a given tag. Tag is optional but preffered. Use spaces for multiple tags.\n**Usage**: ~e621 yuri+kissing") diff --git a/NadekoBot/Modules/Searches/SearchesModule.cs b/NadekoBot/Modules/Searches/SearchesModule.cs index 82c5721c..5fba14f3 100644 --- a/NadekoBot/Modules/Searches/SearchesModule.cs +++ b/NadekoBot/Modules/Searches/SearchesModule.cs @@ -433,7 +433,11 @@ $@"🌍 **Weather for** 【{obj["target"]}】 .Do(async e => { var tag = e.GetArg("tag")?.Trim() ?? ""; - await e.Channel.SendMessage(await SearchHelper.GetSafebooruImageLink(tag).ConfigureAwait(false)).ConfigureAwait(false); + var link = await SearchHelper.GetSafebooruImageLink(tag).ConfigureAwait(false); + if (link == null) + await e.Channel.SendMessage("`No results.`"); + else + await e.Channel.SendMessage(link).ConfigureAwait(false); }); }); }