Merge pull request #100 from nullinside-development-group/chore/sync

Chore/sync

Author: ProgrammingByPermutation

src/Nullinside.Api.TwitchBot.Tests/.editorconfig

@@ -25,15 +25,13 @@ end_of_line = lf
 insert_final_newline = false
 
 #### .NET Coding Conventions ####
-[*.{cs,vb}]
 
 # Organize usings
 dotnet_separate_import_directive_groups = true
 dotnet_sort_system_directives_first = true
-file_header_template = # this. and Me. preferences
-
-
+file_header_template = unset
 
+# this. and Me. preferences
 dotnet_style_qualification_for_event = false:silent
 dotnet_style_qualification_for_field = false:silent
 dotnet_style_qualification_for_method = false:silent
@@ -79,7 +77,6 @@ dotnet_code_quality_unused_parameters = all:suggestion
 dotnet_remove_unnecessary_suppression_exclusions = none
 
 #### C# Coding Conventions ####
-[*.cs]
 
 # var preferences
 csharp_style_var_elsewhere = false:silent
@@ -176,7 +173,6 @@ csharp_preserve_single_line_blocks = true
 csharp_preserve_single_line_statements = true
 
 #### Naming styles ####
-[*.{cs,vb}]
 
 # Naming rules
 
@@ -230,19 +226,19 @@ dotnet_naming_rule.private_static_fields_should_be_s_camelcase.style = s_camelca
 
 dotnet_naming_rule.public_constant_fields_should_be_pascalcase.severity = suggestion
 dotnet_naming_rule.public_constant_fields_should_be_pascalcase.symbols = public_constant_fields
-dotnet_naming_rule.public_constant_fields_should_be_pascalcase.style = pascalcase
+dotnet_naming_rule.public_constant_fields_should_be_pascalcase.style = all_upper
 
 dotnet_naming_rule.private_constant_fields_should_be_pascalcase.severity = suggestion
 dotnet_naming_rule.private_constant_fields_should_be_pascalcase.symbols = private_constant_fields
-dotnet_naming_rule.private_constant_fields_should_be_pascalcase.style = pascalcase
+dotnet_naming_rule.private_constant_fields_should_be_pascalcase.style = all_upper
 
 dotnet_naming_rule.public_static_readonly_fields_should_be_pascalcase.severity = suggestion
 dotnet_naming_rule.public_static_readonly_fields_should_be_pascalcase.symbols = public_static_readonly_fields
-dotnet_naming_rule.public_static_readonly_fields_should_be_pascalcase.style = pascalcase
+dotnet_naming_rule.public_static_readonly_fields_should_be_pascalcase.style = all_upper
 
 dotnet_naming_rule.private_static_readonly_fields_should_be_pascalcase.severity = suggestion
 dotnet_naming_rule.private_static_readonly_fields_should_be_pascalcase.symbols = private_static_readonly_fields
-dotnet_naming_rule.private_static_readonly_fields_should_be_pascalcase.style = pascalcase
+dotnet_naming_rule.private_static_readonly_fields_should_be_pascalcase.style = all_upper
 
 dotnet_naming_rule.enums_should_be_pascalcase.severity = suggestion
 dotnet_naming_rule.enums_should_be_pascalcase.symbols = enums
@@ -366,3 +362,7 @@ dotnet_naming_style.s_camelcase.required_suffix =
 dotnet_naming_style.s_camelcase.word_separator =
 dotnet_naming_style.s_camelcase.capitalization = camel_case
 
+dotnet_naming_style.all_upper.required_prefix =
+dotnet_naming_style.all_upper.required_suffix =
+dotnet_naming_style.all_upper.word_separator = _
+dotnet_naming_style.all_upper.capitalization = all_upper

src/Nullinside.Api.TwitchBot.Tests/ChatRules/BestCheapViewersTests.cs

@@ -41,7 +41,7 @@ public class BestCheapViewersTests : AChatRuleUnitTestBase<BestCheapViewers> {
   [TestCase("Cheaͧp v̫iewers on *** ")]
   [TestCase("Cheap viewers ͚on followersboosters.ru  @U8y0GrKS")]
   [TestCase("Chea̓p viewers on streamboo. com (remove the space)  @ND80DOGe")]
-  [TestCase("Bestͮ vie͐wers ̷on cutt.ly/EeK6Anda")] 
+  [TestCase("Bestͮ vie͐wers ̷on cutt.ly/EeK6Anda")]
   [TestCase("Bestͮ vie͐wers ̷on viewerszone.online")]
   [TestCase("Best viěw\u0310e\u0329rs \u0333o\u032bno\u034en streamboo .com ( remove the space )  @WSZ7tPNI")]
   public async Task TestKnownStrings(string badString) {

src/Nullinside.Api.TwitchBot.Tests/Nullinside.Api.TwitchBot.Tests.csproj

@@ -15,16 +15,16 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.6" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.6" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.6"/>
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.6"/>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1"/>
         <PackageReference Include="Moq" Version="4.20.72"/>
-        <PackageReference Include="NUnit" Version="4.3.2" />
+        <PackageReference Include="NUnit" Version="4.3.2"/>
         <PackageReference Include="NUnit.Analyzers" Version="4.8.1">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
+        <PackageReference Include="NUnit3TestAdapter" Version="5.0.0"/>
     </ItemGroup>
 
     <ItemGroup>

src/Nullinside.Api.TwitchBot/.editorconfig

@@ -25,7 +25,6 @@ end_of_line = lf
 insert_final_newline = false
 
 #### .NET Coding Conventions ####
-[*.{cs,vb}]
 
 # Organize usings
 dotnet_separate_import_directive_groups = true
@@ -78,7 +77,6 @@ dotnet_code_quality_unused_parameters = all:suggestion
 dotnet_remove_unnecessary_suppression_exclusions = none
 
 #### C# Coding Conventions ####
-[*.cs]
 
 # var preferences
 csharp_style_var_elsewhere = false:silent
@@ -175,7 +173,6 @@ csharp_preserve_single_line_blocks = true
 csharp_preserve_single_line_statements = true
 
 #### Naming styles ####
-[*.{cs,vb}]
 
 # Naming rules
 
@@ -229,19 +226,19 @@ dotnet_naming_rule.private_static_fields_should_be_s_camelcase.style = s_camelca
 
 dotnet_naming_rule.public_constant_fields_should_be_pascalcase.severity = suggestion
 dotnet_naming_rule.public_constant_fields_should_be_pascalcase.symbols = public_constant_fields
-dotnet_naming_rule.public_constant_fields_should_be_pascalcase.style = pascalcase
+dotnet_naming_rule.public_constant_fields_should_be_pascalcase.style = all_upper
 
 dotnet_naming_rule.private_constant_fields_should_be_pascalcase.severity = suggestion
 dotnet_naming_rule.private_constant_fields_should_be_pascalcase.symbols = private_constant_fields
-dotnet_naming_rule.private_constant_fields_should_be_pascalcase.style = pascalcase
+dotnet_naming_rule.private_constant_fields_should_be_pascalcase.style = all_upper
 
 dotnet_naming_rule.public_static_readonly_fields_should_be_pascalcase.severity = suggestion
 dotnet_naming_rule.public_static_readonly_fields_should_be_pascalcase.symbols = public_static_readonly_fields
-dotnet_naming_rule.public_static_readonly_fields_should_be_pascalcase.style = pascalcase
+dotnet_naming_rule.public_static_readonly_fields_should_be_pascalcase.style = all_upper
 
 dotnet_naming_rule.private_static_readonly_fields_should_be_pascalcase.severity = suggestion
 dotnet_naming_rule.private_static_readonly_fields_should_be_pascalcase.symbols = private_static_readonly_fields
-dotnet_naming_rule.private_static_readonly_fields_should_be_pascalcase.style = pascalcase
+dotnet_naming_rule.private_static_readonly_fields_should_be_pascalcase.style = all_upper
 
 dotnet_naming_rule.enums_should_be_pascalcase.severity = suggestion
 dotnet_naming_rule.enums_should_be_pascalcase.symbols = enums
@@ -365,3 +362,7 @@ dotnet_naming_style.s_camelcase.required_suffix =
 dotnet_naming_style.s_camelcase.word_separator =
 dotnet_naming_style.s_camelcase.capitalization = camel_case
 
+dotnet_naming_style.all_upper.required_prefix =
+dotnet_naming_style.all_upper.required_suffix =
+dotnet_naming_style.all_upper.word_separator = _
+dotnet_naming_style.all_upper.capitalization = all_upper

src/Nullinside.Api.TwitchBot/Bots/ABotRule.cs

@@ -68,7 +68,7 @@ where string.Equals(bannedUsers.ChannelId, channelId) &&
 
     // Perform the ban and get the list of people actually banned
     IEnumerable<BannedUser> confirmedBans =
-      await botProxy.BanChannelUsers(channelId, Constants.BotId, bansToTry, reason, stoppingToken);
+      await botProxy.BanChannelUsers(channelId, Constants.BOT_ID, bansToTry, reason, stoppingToken);
 
     await db.SaveTwitchBans(channelId, users, reason, stoppingToken);
     return confirmedBans;

src/Nullinside.Api.TwitchBot/Bots/BanKnownBots.cs

@@ -195,4 +195,5 @@
 //     jsonString = null;
 //     return allBots;
 //   }
-// }
+// }
+

src/Nullinside.Api.TwitchBot/ChatRules/AChatRule.cs

@@ -2,8 +2,6 @@
 using Nullinside.Api.Model;
 using Nullinside.Api.TwitchBot.Model;
 
-using TwitchLib.Client.Models;
-
 using TwitchUserConfig = Nullinside.Api.Model.Ddl.TwitchUserConfig;
 
 namespace Nullinside.Api.TwitchBot.ChatRules;
@@ -31,7 +29,7 @@ public abstract Task<bool> Handle(string channelId, ITwitchApiProxy botProxy, Tw
   public async Task BanAndLog(string channelId, ITwitchApiProxy botProxy,
     IEnumerable<(string Id, string Username)> users, string reason, INullinsideContext db,
     CancellationToken stoppingToken = new()) {
-    await botProxy.BanChannelUsers(channelId, Constants.BotId, users, reason, stoppingToken);
+    await botProxy.BanChannelUsers(channelId, Constants.BOT_ID, users, reason, stoppingToken);
     await db.SaveTwitchBans(channelId, users, reason, stoppingToken);
   }
 }

src/Nullinside.Api.TwitchBot/ChatRules/BestCheapViewers.cs

@@ -2,8 +2,6 @@
 using Nullinside.Api.Model;
 using Nullinside.Api.TwitchBot.Model;
 
-using TwitchLib.Client.Models;
-
 using TwitchUserConfig = Nullinside.Api.Model.Ddl.TwitchUserConfig;
 
 namespace Nullinside.Api.TwitchBot.ChatRules;
@@ -13,15 +11,15 @@ namespace Nullinside.Api.TwitchBot.ChatRules;
 /// </summary>
 public class BestCheapViewers : AChatRule {
   /// <summary>
-  ///  The strings that we expect to receive if this is a bot.
+  ///   The strings that we expect to receive if this is a bot.
   /// </summary>
-  public readonly string[] EXPECTED = [
-    "best viewers on", 
+  public readonly string[] Expected = [
+    "best viewers on",
     "cheap viewers on",
     "cheap folloewrs on",
     "do you want more viewers and to rank higher on the twitch list? you can visit the website"
   ];
-  
+
   /// <inheritdoc />
   public override bool ShouldRun(TwitchUserConfig config) {
     return config is { Enabled: true, BanKnownBots: true };
@@ -33,23 +31,23 @@ public override async Task<bool> Handle(string channelId, ITwitchApiProxy botPro
     if (!message.IsFirstMessage) {
       return true;
     }
-    
+
     // The number of spaces per message may chance, so normalize that and lowercase it for comparison.
     string normalized = string.Join(' ', message.Message.Split(" ").Where(s => !string.IsNullOrWhiteSpace(s)))
       .ToLowerInvariant();
 
     // Messages will be one of two variations with random special characters mixed in. Some of those special characters
     // will be accent marks. When we receive an accent mark it'll take the position of a real character, hence why we
     // need an offset applied only to the incoming string.
-    foreach (var expected in EXPECTED) {
+    foreach (string expected in Expected) {
       if (normalized.Length > expected.Length) {
         int matches = 0;
         int offset = 0;
         for (int i = 0; i < expected.Length; i++) {
           // If this is a normal character it should be in the correct position.
           if (i + offset < normalized.Length && normalized[i + offset] == expected[i]) {
             ++matches;
-          } 
+          }
           // If this is an accent mark then the next character should match and the whole string we're evalutating
           // will be off by 1 more position.
           else if (i + offset + 1 < normalized.Length && normalized[i + offset + 1] == expected[i]) {

src/Nullinside.Api.TwitchBot/ChatRules/Botsister.cs

@@ -2,8 +2,6 @@
 using Nullinside.Api.Model;
 using Nullinside.Api.TwitchBot.Model;
 
-using TwitchLib.Client.Models;
-
 using TwitchUserConfig = Nullinside.Api.Model.Ddl.TwitchUserConfig;
 
 namespace Nullinside.Api.TwitchBot.ChatRules;

src/Nullinside.Api.TwitchBot/ChatRules/Discord.cs

@@ -2,8 +2,6 @@
 using Nullinside.Api.Model;
 using Nullinside.Api.TwitchBot.Model;
 
-using TwitchLib.Client.Models;
-
 using TwitchUserConfig = Nullinside.Api.Model.Ddl.TwitchUserConfig;
 
 namespace Nullinside.Api.TwitchBot.ChatRules;
@@ -12,7 +10,7 @@ namespace Nullinside.Api.TwitchBot.ChatRules;
 ///   Handles the add me on discord bots.
 /// </summary>
 public class Discord : AChatRule {
-  private readonly string[] KNOWN_PHRASES = [
+  private readonly string[] _knownPhrases = [
     "add me",
     "add my",
     "add up",
@@ -38,7 +36,7 @@ public override async Task<bool> Handle(string channelId, ITwitchApiProxy botPro
     if (!message.IsFirstMessage) {
       return true;
     }
-    
+
     // The number of spaces per message may chance, so normalize that and lowercase it for comparison.
     string normalized = string.Join(' ', message.Message.Split(" ").Where(s => !string.IsNullOrWhiteSpace(s)))
       .ToLowerInvariant();
@@ -47,7 +45,7 @@ public override async Task<bool> Handle(string channelId, ITwitchApiProxy botPro
       return true;
     }
 
-    foreach (var phrase in KNOWN_PHRASES) {
+    foreach (string phrase in _knownPhrases) {
       if (normalized.Contains(phrase, StringComparison.InvariantCultureIgnoreCase)) {
         await BanAndLog(channelId, botProxy, new[] { (message.UserId, message.Username) },
           "[Bot] Spam (Discord Scammers)", db, stoppingToken);