Merge pull request #51 from GravityWolfNotAmused/Status-Format-Update

User Defined Status Update
GravityWolfNotAmused · Sep 25, 2022 · 3171a98 · 3171a98
2 parents 7dc7571 + 66695e0
commit 3171a98
Show file tree

Hide file tree

Showing 65 changed files with 464 additions and 552 deletions.
diff --git a/DiscordPlayerCountBot.Tests/JsonTests.cs b/DiscordPlayerCountBot.Tests/JsonTests.cs
@@ -1,4 +1,4 @@
-using DiscordPlayerCountBot.Json;
+using PlayerCountBot.Json;
 
 namespace DiscordPlayerCountBot.Tests;
 

diff --git a/DiscordPlayerCountBot/Attributes/AttributeHelper.cs b/DiscordPlayerCountBot/Attributes/AttributeHelper.cs
@@ -1,6 +1,4 @@
-using System.Linq;
-
-namespace DiscordPlayerCountBot.Attributes
+namespace PlayerCountBot.Attributes
 {
     public static class AttributeHelper
     {

diff --git a/DiscordPlayerCountBot/Attributes/NameAttribute.cs b/DiscordPlayerCountBot/Attributes/NameAttribute.cs
@@ -1,11 +1,10 @@
-using System;
-
-namespace DiscordPlayerCountBot.Attributes
+namespace PlayerCountBot.Attributes
 {
+
     [AttributeUsage(AttributeTargets.Property | AttributeTargets.Class)]
     public class NameAttribute : Attribute
     {
-        public string Name { get; set; }
+        public string Name { get; private set; }
 
         public NameAttribute(string name)
         {

diff --git a/DiscordPlayerCountBot/Bot/Bot.cs b/DiscordPlayerCountBot/Bot/Bot.cs
@@ -1,33 +1,19 @@
-using Discord;
-using Discord.WebSocket;
-using DiscordPlayerCountBot;
-using DiscordPlayerCountBot.Enum;
-using DiscordPlayerCountBot.Http;
-using DiscordPlayerCountBot.Providers;
-using DiscordPlayerCountBot.Providers.Base;
-using log4net;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace PlayerCountBot
+namespace PlayerCountBot
 {
-    public class Bot
+
+    [Name("Bot")]
+    public class Bot : LoggableClass
     {
-        public BotInformation Information { get; set; }
         public DiscordSocketClient DiscordClient { get; set; }
         public Dictionary<int, IServerInformationProvider> DataProviders { get; set; } = new();
         public Dictionary<string, string> ApplicationTokens { get; set; } = new();
 
-        private ILog Logger = LogManager.GetLogger(typeof(Bot));
-
-        public Bot(BotInformation info, Dictionary<string, string> applicationTokens)
+        public Bot(BotInformation info, Dictionary<string, string> applicationTokens) : base(info)
         {
             if (info is null) throw new ArgumentNullException(nameof(info));
             if (applicationTokens is null) throw new ArgumentException(nameof(applicationTokens));
 
             ApplicationTokens = applicationTokens;
-            Information = info;
 
             DiscordClient = new DiscordSocketClient(new DiscordSocketConfig()
             {
@@ -39,11 +25,10 @@ public Bot(BotInformation info, Dictionary<string, string> applicationTokens)
 
         public void InitDataProviders()
         {
-            DataProviders.Add((int)DataProvider.STEAM, new SteamProvider());
-            DataProviders.Add((int)DataProvider.CFX, new CFXProvider());
-            DataProviders.Add((int)DataProvider.SCUM, new ScumProvider());
-            DataProviders.Add((int)DataProvider.MINECRAFT, new MinecraftProvider());
-            DataProviders.Add((int)DataProvider.BATTLEMETRICS, new BattleMetricsProvider());
+            DataProviders.Add((int)DataProvider.STEAM, new SteamProvider(Information));
+            DataProviders.Add((int)DataProvider.CFX, new CFXProvider(Information));
+            DataProviders.Add((int)DataProvider.MINECRAFT, new MinecraftProvider(Information));
+            DataProviders.Add((int)DataProvider.BATTLEMETRICS, new BattleMetricsProvider(Information));
         }
 
         public async Task StartAsync(bool shouldStart)
@@ -53,7 +38,7 @@ public async Task StartAsync(bool shouldStart)
                 Information.Address = await AddressHelper.ResolveAddress(Information.Address);
             }
 
-            Logger.Info($"[Bot] - Loaded {Information.Name} at address and port: {Information.Address}, {Information.ProviderType}");
+            Info($"Loaded {Information.Name} at address and port: {Information.Address}, {Information.ProviderType}");
             await DiscordClient.LoginAndStartAsync(Information.Token, Information.Address, shouldStart);
         }
 
@@ -68,7 +53,14 @@ public async Task UpdateAsync()
 
             if (dataProviderType != Information.ProviderType)
             {
-                Logger.Warn($"[Bot] - Config for bot at address: {Information.Address} has an invalid provider type: {Information.ProviderType}");
+                Warn($"Config for bot at address: {Information.Address} has an invalid provider type: {Information.ProviderType}");
+            }
+
+            var activityInteger = EnumHelper.GetActivityType(Information.Status);
+
+            if (Information.Status != activityInteger)
+            {
+                Warn($"Config for bot at address: {Information.Address} has an invalid activity type: {Information.Status}");
             }
 
             var dataProvider = DataProviders[dataProviderType];
@@ -79,16 +71,9 @@ public async Task UpdateAsync()
                 return;
             }
 
-            var gameStatus = serverInformation.GetStatusString(Information.Name, Information.UseNameAsLabel);
-            var activityInteger = EnumHelper.GetActivityType(Information.Status);
-
-            if (Information.Status != activityInteger)
-            {
-                Logger.Warn($"[Bot] - Config for bot at address: {Information.Address} has an invalid activity type: {Information.Status}");
-            }
+            var gameStatus = serverInformation.ReplaceTagsWithValues(Information.StatusFormat, Information.UseNameAsLabel, Information.Name);
 
-            var activityType = (ActivityType)(activityInteger);
-            await DiscordClient.SetGameAsync(gameStatus, null, activityType);
+            await DiscordClient.SetGameAsync(gameStatus, null, (ActivityType)activityInteger);
             await DiscordClient.SetChannelName(Information.ChannelID, gameStatus);
         }
     }

diff --git a/DiscordPlayerCountBot/Bot/BotConfig.cs b/DiscordPlayerCountBot/Bot/BotConfig.cs
@@ -1,23 +1,14 @@
-using System.Collections.Generic;
-using Newtonsoft.Json;
-
-namespace PlayerCountBot
+namespace PlayerCountBot
 {
     public class BotConfig
     {
-        [JsonProperty]
         public int UpdateTime { get; set; }
-
-        [JsonProperty]
         public List<BotInformation> ServerInformation { get; set; } = new();
-
-        [JsonProperty]
         public Dictionary<string, string> ApplicationTokens { get; set; } = new();
-
         public void CreateDefaults()
         {
 
-            ServerInformation.Add(new BotInformation()
+            ServerInformation.Add(new()
             {
                 Name = "TestBot",
                 Address = "127.0.0.1:27014",

diff --git a/DiscordPlayerCountBot/Bot/BotInformation.cs b/DiscordPlayerCountBot/Bot/BotInformation.cs
@@ -1,32 +1,17 @@
-using log4net.Repository.Hierarchy;
-using Microsoft.VisualBasic;
-using Newtonsoft.Json;
-using System;
-
-namespace PlayerCountBot
+namespace PlayerCountBot
 {
     public class BotInformation
     {
-        [JsonProperty]
+        [JsonIgnore]
+        public Guid Id { get; set; } = Guid.NewGuid();
         public string Name { get; set; }
-
-        [JsonProperty]
         public string Address { get; set; }
-
-        [JsonProperty]
         public string Token { get; set; }
-
-        [JsonProperty]
         public int Status { get; set; }
-
-        [JsonProperty]
         public bool UseNameAsLabel { get; set; }
-
-        [JsonProperty]
         public int ProviderType { get; set; } = 0;
-
-        [JsonProperty]
         public ulong? ChannelID { get; set; }
+        public string? StatusFormat { get; set; }
 
         public Tuple<string, ushort> GetAddressAndPort()
         {

diff --git a/DiscordPlayerCountBot/Bot/GenericServerInformation.cs b/DiscordPlayerCountBot/Bot/GenericServerInformation.cs
diff --git a/DiscordPlayerCountBot/Configuration/Base/IConfigurable.cs b/DiscordPlayerCountBot/Configuration/Base/IConfigurable.cs
@@ -1,9 +1,4 @@
-using PlayerCountBot;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace DiscordPlayerCountBot.Configuration.Base
+namespace PlayerCountBot.Configuration.Base
 {
     public interface IConfigurable
     {