liz/PluralKit
liz/PluralKit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Show an error when a bad import URL is given

Browse Source
This commit is contained in:
Ske 2019-08-12 17:47:35 +02:00
parent 8396e17a87
commit d8503001eb
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
PluralKit.Bot/Commands/ImportExportCommands.cs
View File

@ -1,3 +1,4 @@
using System;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Net.Http; using System.Net.Http;
@ -25,7 +26,17 @@ namespace PluralKit.Bot.Commands
{ {
using (var client = new HttpClient()) using (var client = new HttpClient())
{ {
var response = await client.GetAsync(url); HttpResponseMessage response;
try
{
response = await client.GetAsync(url);
}
catch (InvalidOperationException)
{
// Invalid URL throws this, we just error back out
throw Errors.InvalidImportFile;
}
if (!response.IsSuccessStatusCode) throw Errors.InvalidImportFile; if (!response.IsSuccessStatusCode) throw Errors.InvalidImportFile;
var json = await response.Content.ReadAsStringAsync(); var json = await response.Content.ReadAsStringAsync();