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

refactor(bot): better way to throw proxy errors received from discord

Browse Source
This commit is contained in:
spiral 2022-12-29 00:52:37 +00:00
parent d332535ab1
commit 0cf0560701
No known key found for this signature in database
GPG Key ID: 244A11E4B0BCF40E
1 changed files with 10 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
PluralKit.Bot/Services/WebhookExecutorService.cs
View File

@ -158,51 +158,21 @@ public class WebhookExecutorService
{ {
var json = JsonConvert.DeserializeObject<JObject>(e.FormError); var json = JsonConvert.DeserializeObject<JObject>(e.FormError);
var error = json.Value<JObject>("username").Value<JArray>("_errors").First.Value<string>("message"); var error = json.Value<JObject>("username").Value<JArray>("_errors").First.Value<string>("message");
throw new PKError($"Discord rejected your proxy name: {error.AsCode()}");
await _rest.CreateMessage(req.ChannelId, new MessageRequest
{
Content = $"{Emojis.Error} Discord rejected your proxy name: {error.AsCode()}",
AllowedMentions = new AllowedMentions { Parse = { } },
});
Sentry.SentrySdk.CaptureException(e);
// this exception is ignored in the message handler lol
throw new ProxyService.ProxyChecksFailedException("_internal_discord_rejected_message");
} }
catch (Exception ex) catch (Exception ex)
{ {
// this exception is expected, see comment above // this exception is expected, see comment above
if (ex.GetType() == typeof(ProxyService.ProxyChecksFailedException)) if (ex.GetType() == typeof(PKError))
#pragma warning disable CA2200 throw;
throw ex;
#pragma warning restore CA2200
else else
// if something breaks, just ignore it and throw the original exception // if something breaks, just ignore it and throw the original exception
throw e; throw e;
} }
} }
catch (RequestEntityTooLargeException e) catch (RequestEntityTooLargeException)
{ {
try throw new PKError("One or more of the files attached to this message were not able to be proxied because they were too large.");
{
await _rest.CreateMessage(req.ChannelId, new MessageRequest
{
Content = $"{Emojis.Error} One or more of the files attached to this message were not able to be proxied because they were too large.",
AllowedMentions = new AllowedMentions { Parse = { } },
});
throw new ProxyService.ProxyChecksFailedException("_internal_discord_rejected_message");
}
catch (Exception ex)
{
if (ex.GetType() == typeof(ProxyService.ProxyChecksFailedException))
#pragma warning disable CA2200
throw ex;
#pragma warning restore CA2200
else
throw e;
}
} }
catch (JsonReaderException) catch (JsonReaderException)
{ {
@ -345,4 +315,9 @@ public static class ProxyNameExt
return proxyName; return proxyName;
} }
static string Replacement(Match m) => m.Groups[1].Value + "\u200A" + m.Groups[2].Value; static string Replacement(Match m) => m.Groups[1].Value + "\u200A" + m.Groups[2].Value;
}
public class DiscordRejectedMessageException: PKError
{
public DiscordRejectedMessageException(string message) : base(message) { }
} }