diff --git a/PluralKit.Bot/Commands/Random.cs b/PluralKit.Bot/Commands/Random.cs index faaf5146..d5414c45 100644 --- a/PluralKit.Bot/Commands/Random.cs +++ b/PluralKit.Bot/Commands/Random.cs @@ -44,7 +44,7 @@ public class Random { if (target == null) throw Errors.NoSystemError; - + ctx.CheckSystemPrivacy(target.Id, target.GroupListPrivacy); var groups = await ctx.Repository.GetSystemGroups(target.Id).ToListAsync(); @@ -55,8 +55,8 @@ public class Random if (groups == null || !groups.Any()) throw new PKError( - ctx.System?.Id == target.Id ? - "Your system has no groups! Please create at least one group before using this command." : + ctx.System?.Id == target.Id ? + "Your system has no groups! Please create at least one group before using this command." : $"This system has no groups!"); var randInt = randGen.Next(groups.Count()); @@ -75,7 +75,7 @@ public class Random if (members == null || !members.Any()) throw new PKError( "This group has no members!" - + ( ctx.System?.Id == group.System ? " Please add at least one member to this group before using this command." : "")); + + (ctx.System?.Id == group.System ? " Please add at least one member to this group before using this command." : "")); if (!ctx.MatchFlag("all", "a")) members = members.Where(g => g.MemberVisibility == PrivacyLevel.Public); diff --git a/PluralKit.Bot/Services/WebhookExecutorService.cs b/PluralKit.Bot/Services/WebhookExecutorService.cs index 5099e8a8..0ff51b01 100644 --- a/PluralKit.Bot/Services/WebhookExecutorService.cs +++ b/PluralKit.Bot/Services/WebhookExecutorService.cs @@ -159,9 +159,10 @@ public class WebhookExecutorService var json = JsonConvert.DeserializeObject(e.FormError); var error = json.Value("username").Value("_errors").First.Value("message"); - await _rest.CreateMessage(req.ChannelId, new MessageRequest { + await _rest.CreateMessage(req.ChannelId, new MessageRequest + { Content = $"{Emojis.Error} Discord rejected your proxy name: {error.AsCode()}", - AllowedMentions = new AllowedMentions { Parse = {} }, + AllowedMentions = new AllowedMentions { Parse = { } }, }); Sentry.SentrySdk.CaptureException(e); @@ -183,9 +184,10 @@ public class WebhookExecutorService { try { - await _rest.CreateMessage(req.ChannelId, new MessageRequest { + 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 = {} }, + AllowedMentions = new AllowedMentions { Parse = { } }, }); throw new ProxyService.ProxyChecksFailedException("_internal_discord_rejected_message"); @@ -304,7 +306,7 @@ public static class ProxyNameExt .FixDiscord() .FixBackticks() .FixSingleCharacterName(); - // .ThrowOnInvalidCharacters(); + // .ThrowOnInvalidCharacters(); static string ThrowOnInvalidCharacters(this string name) {