Code style adheres to .editorconfig

not-ilinked · Sep 25, 2022 · 0ac9311 · 0ac9311
1 parent 20175df
commit 0ac9311
Show file tree

Hide file tree

Showing 246 changed files with 117 additions and 1,220 deletions.
diff --git a/Anarchy/Anarchy.csproj b/Anarchy/Anarchy.csproj
@@ -6,7 +6,8 @@
 	  <DebugSymbols>true</DebugSymbols>
 	  <DebugType>full</DebugType>
 	  <ErrorReport>prompt</ErrorReport>
-	  <WarningLevel>4</WarningLevel>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <WarningLevel>4</WarningLevel>
 	  <PlatformTarget>AnyCPU</PlatformTarget>
 	  <NoWarn>IDE1006, CS0649, CS0414, IDE0051</NoWarn>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>

diff --git a/Anarchy/Commands/Command/CommandHandler.cs b/Anarchy/Commands/Command/CommandHandler.cs
@@ -30,7 +30,6 @@ internal CommandHandler(string prefix, DiscordSocketClient client)
             }
         }
 
-
         private void Client_OnMessageReceived(DiscordSocketClient client, MessageEventArgs args)
         {
             if (args.Message.Content.StartsWith(Prefix))
@@ -41,7 +40,7 @@ private void Client_OnMessageReceived(DiscordSocketClient client, MessageEventAr
                 {
                     parts.RemoveAt(0);
 
-                    CommandBase inst = (CommandBase)Activator.CreateInstance(command.Type);
+                    CommandBase inst = (CommandBase) Activator.CreateInstance(command.Type);
                     inst.Prepare(_client, args.Message);
 
                     for (int i = 0; i < command.Parameters.Count; i++)
@@ -171,7 +170,7 @@ internal static bool TryGetAttribute<TAttr>(IEnumerable<object> attributes, out
             {
                 if (attribute.GetType() == typeof(TAttr))
                 {
-                    attr = (TAttr)attribute;
+                    attr = (TAttr) attribute;
                     return true;
                 }
             }

diff --git a/Anarchy/Commands/SlashCommands/SlashCommand.cs b/Anarchy/Commands/SlashCommands/SlashCommand.cs
@@ -14,7 +14,7 @@ public abstract class SlashCommand
 
         internal void Prepare(DiscordInteraction interaction)
         {
-            Client = (DiscordSocketClient)interaction.Client;
+            Client = (DiscordSocketClient) interaction.Client;
 
             Caller = interaction.User;
             CallerMember = interaction.Member;

diff --git a/Anarchy/Commands/SlashCommands/SlashCommandHandler.cs b/Anarchy/Commands/SlashCommands/SlashCommandHandler.cs
@@ -50,7 +50,7 @@ public SlashCommandHandler(DiscordSocketClient client, ulong appId, ulong? guild
                                     {
                                         if (choices == null) choices = new List<CommandOptionChoice>();
 
-                                        var choiceAttr = (SlashParameterChoiceAttribute)ok;
+                                        var choiceAttr = (SlashParameterChoiceAttribute) ok;
 
                                         if (choiceAttr.Value.GetType() != typeof(string) && !IsInteger(choiceAttr.Value.GetType()))
                                             throw new InvalidOperationException("All choice values must either be strings or integers");
@@ -177,7 +177,7 @@ private void Handle(string cmdName, DiscordInteraction interaction, List<SlashCo
         {
             var localCommand = _handlerDict[cmdName];
 
-            var handler = (SlashCommand)Activator.CreateInstance(localCommand.HandlerType);
+            var handler = (SlashCommand) Activator.CreateInstance(localCommand.HandlerType);
             handler.Prepare(interaction);
 
             if (arguments != null)
@@ -239,7 +239,7 @@ private static bool TryGetAttribute<TAttr>(IEnumerable<object> attributes, out T
             {
                 if (attribute.GetType() == typeof(TAttr))
                 {
-                    attr = (TAttr)attribute;
+                    attr = (TAttr) attribute;
                     return true;
                 }
             }

diff --git a/Anarchy/Local/Controllable/Controllable.cs b/Anarchy/Local/Controllable/Controllable.cs
@@ -20,7 +20,6 @@ public DiscordClient Client
             }
         }
 
-
         public void Dispose()
         {
             _client = null;

diff --git a/Anarchy/Local/Controllable/Extensions.cs b/Anarchy/Local/Controllable/Extensions.cs
@@ -11,7 +11,6 @@ public static T SetClient<T>(this T @class, DiscordClient client) where T : Cont
             return @class;
         }
 
-
         internal static IReadOnlyList<T> SetClientsInList<T>(this IReadOnlyList<T> classes, DiscordClient client) where T : Controllable
         {
             if (classes != null)

diff --git a/Anarchy/Local/Controllable/JsonExtensions.cs b/Anarchy/Local/Controllable/JsonExtensions.cs
@@ -24,7 +24,7 @@ public static T ParseDeterministic<T>(this JObject obj)
             if (TryFindTypes(typeof(T), out Dictionary<int, Type> types))
             {
                 int type = obj.Value<int>("type");
-                return (T)obj.ToObject(types.TryGetValue(type, out var t) ? t : typeof(T));
+                return (T) obj.ToObject(types.TryGetValue(type, out var t) ? t : typeof(T));
             }
             else
                 throw new InvalidCastException("Unable to find any implementations for T");

diff --git a/Anarchy/Local/DiscordImage.cs b/Anarchy/Local/DiscordImage.cs
@@ -5,7 +5,7 @@
 
 namespace Discord
 {
-    class ImageJsonConverter : JsonConverter<DiscordImage>
+    internal class ImageJsonConverter : JsonConverter<DiscordImage>
     {
         public override bool CanRead => false;
 

diff --git a/Anarchy/Local/DiscordParameter.cs b/Anarchy/Local/DiscordParameter.cs
@@ -17,13 +17,11 @@ public T Value
             }
         }
 
-
         public static implicit operator T(DiscordParameter<T> instance)
         {
             return instance.Value;
         }
 
-
         public override string ToString()
         {
             return Value.ToString();

diff --git a/Anarchy/REST/Billing/BillingAddress.cs b/Anarchy/REST/Billing/BillingAddress.cs
@@ -7,27 +7,21 @@ public class BillingAddress
         [JsonProperty("name")]
         public string Name { get; private set; }
 
-
         [JsonProperty("line_1")]
         public string Address1 { get; private set; }
 
-
         [JsonProperty("line_2")]
         public string Address2 { get; private set; }
 
-
         [JsonProperty("city")]
         public string City { get; private set; }
 
-
         [JsonProperty("state")]
         public string State { get; private set; }
 
-
         [JsonProperty("country")]
         public string Country { get; private set; }
 
-
         [JsonProperty("postal_code")]
         public dynamic PostalCode { get; private set; }
     }

diff --git a/Anarchy/REST/Billing/CardPaymentMethod.cs b/Anarchy/REST/Billing/CardPaymentMethod.cs
@@ -7,19 +7,15 @@ public class CardPaymentMethod : PaymentMethod
         [JsonProperty("brand")]
         public string Brand { get; private set; }
 
-
         [JsonProperty("country")]
         public string Country { get; private set; }
 
-
         [JsonProperty("last_4")]
         public int Last4 { get; private set; }
 
-
         [JsonProperty("expires_month")]
         public int ExpirationMonth { get; private set; }
 
-
         [JsonProperty("expires_year")]
         public int ExpirationYear { get; private set; }
     }

diff --git a/Anarchy/REST/Billing/DiscordPayment.cs b/Anarchy/REST/Billing/DiscordPayment.cs
@@ -13,31 +13,24 @@ public DiscordPayment()
         [JsonProperty("id")]
         public ulong Id { get; private set; }
 
-
         [JsonProperty("created_at")]
         public DateTime Timestamp { get; private set; }
 
-
         [JsonProperty("currency")]
         public string Currency { get; private set; }
 
-
         [JsonProperty("amount")]
         public string Amount { get; private set; }
 
-
         [JsonProperty("status")]
         public DiscordPaymentStatus Status { get; private set; }
 
-
         [JsonProperty("description")]
         public string Description { get; private set; }
 
-
         [JsonProperty("flags")]
         public DiscordPaymentFlags Flags { get; private set; }
 
-
         [JsonProperty("payment_source")]
         [JsonConverter(typeof(DeepJsonConverter<PaymentMethod>))]
         public PaymentMethod PaymentMethod { get; private set; }

diff --git a/Anarchy/REST/Billing/Extensions.cs b/Anarchy/REST/Billing/Extensions.cs
@@ -16,7 +16,6 @@ public static IReadOnlyList<DiscordPayment> GetPayments(this DiscordClient clien
             return client.GetPaymentsAsync(limit).GetAwaiter().GetResult();
         }
 
-
         public static async Task<IReadOnlyList<PaymentMethod>> GetPaymentMethodsAsync(this DiscordClient client)
         {
             return (await client.HttpClient.GetAsync("/users/@me/billing/payment-sources"))

diff --git a/Anarchy/REST/Billing/PaymentMethod.cs b/Anarchy/REST/Billing/PaymentMethod.cs
@@ -8,27 +8,21 @@ public class PaymentMethod : Controllable
         [JsonProperty("id")]
         public ulong Id { get; private set; }
 
-
         [JsonProperty("type")]
         public PaymentMethodType Type { get; private set; }
 
-
         [JsonProperty("invalid")]
         public bool Invalid { get; private set; }
 
-
         [JsonProperty("billing_address")]
         public BillingAddress BillingAddress { get; private set; }
 
-
         [JsonProperty("country")]
         public string County { get; private set; }
 
-
         [JsonProperty("default")]
         public bool Default { get; private set; }
 
-
         public async Task<string> PurchaseGiftAsync(ulong skuId, ulong subPlanId, int expectedAmount)
         {
             return await Client.PurchaseGiftAsync(Id, skuId, subPlanId, expectedAmount);
@@ -39,7 +33,6 @@ public string PurchaseGift(ulong skuId, ulong subPlanId, int expectedAmount)
             return PurchaseGiftAsync(skuId, subPlanId, expectedAmount).GetAwaiter().GetResult();
         }
 
-
         public async Task<string> PurchaseNitroGiftAsync(DiscordNitroSubType nitroType)
         {
             return await Client.PurchaseNitroGiftAsync(Id, nitroType);

diff --git a/Anarchy/REST/Channel/Channel/CreationProperties.cs b/Anarchy/REST/Channel/Channel/CreationProperties.cs
@@ -10,11 +10,9 @@ public class ChannelCreationProperties
         [JsonProperty("name")]
         public string Name { get; set; }
 
-
         [JsonProperty("type")]
         public ChannelType Type { get; set; }
 
-
         public override string ToString()
         {
             return Type.ToString();

diff --git a/Anarchy/REST/Channel/Channel/DiscordChannel.cs b/Anarchy/REST/Channel/Channel/DiscordChannel.cs
@@ -8,11 +8,9 @@ public class DiscordChannel : MinimalChannel
         [JsonProperty("name")]
         public string Name { get; private set; }
 
-
         [JsonProperty("type")]
         public ChannelType Type { get; protected set; }
 
-
         public bool InGuild
         {
             get { return Type != ChannelType.DM && Type != ChannelType.Group; }
@@ -28,7 +26,6 @@ public bool IsVoice
             get { return Type == ChannelType.Voice || Type == ChannelType.DM || Type == ChannelType.Group || Type == ChannelType.Stage; }
         }
 
-
         protected void Update(DiscordChannel channel)
         {
             Name = channel.Name;
@@ -47,17 +44,14 @@ public void Update()
             UpdateAsync().GetAwaiter().GetResult();
         }
 
-
         // retarded solution but it's the best i could come up with
         internal virtual void SetLastMessageId(ulong id) { }
 
-
         public override string ToString()
         {
             return Name;
         }
 
-
         public static implicit operator ulong(DiscordChannel instance)
         {
             return instance.Id;

diff --git a/Anarchy/REST/Channel/Channel/Extensions.cs b/Anarchy/REST/Channel/Channel/Extensions.cs
@@ -19,7 +19,6 @@ public static DiscordChannel GetChannel(this DiscordClient client, ulong channel
             return client.GetChannelAsync(channelId).GetAwaiter().GetResult();
         }
 
-
         public static async Task<DiscordGroup> ModifyGroupAsync(this DiscordClient client, ulong groupId, GroupProperties properties)
         {
             return (await client.HttpClient.PatchAsync($"/channels/{groupId}", properties))
@@ -31,7 +30,6 @@ public static DiscordGroup ModifyGroup(this DiscordClient client, ulong groupId,
             return client.ModifyGroupAsync(groupId, properties).GetAwaiter().GetResult();
         }
 
-
         public static async Task<GuildChannel> ModifyGuildChannelAsync(this DiscordClient client, ulong channelId, GuildChannelProperties properties)
         {
             return (await client.HttpClient.PatchAsync($"/channels/{channelId}", properties))
@@ -43,7 +41,6 @@ public static GuildChannel ModifyGuildChannel(this DiscordClient client, ulong c
             return client.ModifyGuildChannelAsync(channelId, properties).GetAwaiter().GetResult();
         }
 
-
         public static async Task<DiscordChannel> DeleteChannelAsync(this DiscordClient client, ulong channelId)
         {
             return (await client.HttpClient.DeleteAsync($"/channels/{channelId}"))

diff --git a/Anarchy/REST/Channel/Channel/MinimalTextChannel.cs b/Anarchy/REST/Channel/Channel/MinimalTextChannel.cs
@@ -23,7 +23,6 @@ public void TriggerTyping()
             TriggerTypingAsync().GetAwaiter().GetResult();
         }
 
-
         public Task<DiscordMessage> SendMessageAsync(MessageProperties properties)
         {
             return Client.SendMessageAsync(Id, properties);
@@ -60,7 +59,6 @@ public DiscordMessage SendMessage(EmbedMaker embed)
             return SendMessageAsync(embed).GetAwaiter().GetResult();
         }
 
-
         public async Task<DiscordMessage> SendFileAsync(string fileName, byte[] fileData, string message = null, bool tts = false)
         {
             return await Client.SendFileAsync(Id, fileName, fileData, message, tts);
@@ -71,7 +69,6 @@ public DiscordMessage SendFile(string fileName, byte[] fileData, string message
             return SendFileAsync(fileName, fileData, message, tts).GetAwaiter().GetResult();
         }
 
-
         public async Task<DiscordMessage> SendFileAsync(string filePath, string message = null, bool tts = false)
         {
             return await Client.SendFileAsync(Id, filePath, message, tts);
@@ -82,7 +79,6 @@ public DiscordMessage SendFile(string filePath, string message = null, bool tts
             return SendFileAsync(filePath, message, tts).GetAwaiter().GetResult();
         }
 
-
         public async Task DeleteMessagesAsync(List<ulong> messages)
         {
             await Client.DeleteMessagesAsync(Id, messages);
@@ -98,7 +94,6 @@ public void DeleteMessages(List<ulong> messages)
             DeleteMessagesAsync(messages).GetAwaiter().GetResult();
         }
 
-
         public async Task<IReadOnlyList<DiscordMessage>> GetMessagesAsync(MessageFilters filters = null)
         {
             return await Client.GetChannelMessagesAsync(Id, filters);
@@ -113,7 +108,6 @@ public IReadOnlyList<DiscordMessage> GetMessages(MessageFilters filters = null)
             return GetMessagesAsync(filters).GetAwaiter().GetResult();
         }
 
-
         public async Task<IReadOnlyList<DiscordMessage>> GetPinnedMessagesAsync()
         {
             return await Client.GetPinnedMessagesAsync(Id);
@@ -127,7 +121,6 @@ public IReadOnlyList<DiscordMessage> GetPinnedMessages()
             return GetPinnedMessagesAsync().GetAwaiter().GetResult();
         }
 
-
         public async Task PinMessageAsync(ulong messageId)
         {
             await Client.PinMessageAsync(Id, messageId);
@@ -142,7 +135,6 @@ public void PinMessage(ulong messageId)
             PinMessageAsync(messageId).GetAwaiter().GetResult();
         }
 
-
         public async Task UnpinMessageAsync(ulong messageId)
         {
             await Client.UnpinChannelMessageAsync(Id, messageId);