From ccf8c537c2a7c4a14aade85168d6fadd78e93c22 Mon Sep 17 00:00:00 2001 From: Ro5490 <17776299+ro5490@users.noreply.github.com> Date: Mon, 15 May 2023 21:51:17 +0100 Subject: [PATCH 1/3] Updates sources to show sage/linden/acacia --- CentCom.Server/BanSources/BeeBanParser.cs | 20 ++++++++++++++++---- CentCom.Server/Services/BeeBanService.cs | 10 ++++++---- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/CentCom.Server/BanSources/BeeBanParser.cs b/CentCom.Server/BanSources/BeeBanParser.cs index 0637739..14b810c 100644 --- a/CentCom.Server/BanSources/BeeBanParser.cs +++ b/CentCom.Server/BanSources/BeeBanParser.cs @@ -21,16 +21,28 @@ public BeeBanParser(DatabaseContext dbContext, BeeBanService banService, ILogger protected override Dictionary Sources => new Dictionary { + { "bee-acacia", new BanSource + { + Display = "Beestation Acacia", + Name = "bee-acacia", + RoleplayLevel = RoleplayLevel.Medium + } }, + { "bee-sage", new BanSource + { + Display = "Beestation Sage", + Name = "bee-sage", + RoleplayLevel = RoleplayLevel.Medium + } }, { "bee-lrp", new BanSource { - Display = "Beestation LRP", + Display = "Beestation Golden", Name = "bee-lrp", RoleplayLevel = RoleplayLevel.Low } }, - { "bee-mrp", new BanSource + { "bee-linden", new BanSource { - Display = "Beestation MRP", - Name = "bee-mrp", + Display = "Beestation Linden", + Name = "bee-linden", RoleplayLevel = RoleplayLevel.Medium } } }; diff --git a/CentCom.Server/Services/BeeBanService.cs b/CentCom.Server/Services/BeeBanService.cs index bb4e230..860d7e8 100644 --- a/CentCom.Server/Services/BeeBanService.cs +++ b/CentCom.Server/Services/BeeBanService.cs @@ -16,8 +16,10 @@ namespace CentCom.Server.Services; public class BeeBanService : RestBanService { private const int ParallelRequests = 1; + private static readonly BanSource AcaciaSource = new BanSource { Name = "bee-acacia" }; + private static readonly BanSource SageSource = new BanSource { Name = "bee-sage" }; private static readonly BanSource LrpSource = new BanSource { Name = "bee-lrp" }; - private static readonly BanSource MrpSource = new BanSource { Name = "bee-mrp" }; + private static readonly BanSource LindenSource = new BanSource { Name = "bee-linden" }; public BeeBanService(ILogger logger) : base(logger) { @@ -107,9 +109,9 @@ private static BanSource ParseBanSource(string raw) return (raw.ToLower()) switch { "bs_golden" => LrpSource, - "bs_sage" => MrpSource, - "bs_acacia" => MrpSource, - "bs_linden" => MrpSource, + "bs_sage" => SageSource, + "bs_acacia" => AcaciaSource, + "bs_linden" => LindenSource, _ => throw new Exception( $"Failed to convert raw value of Beestation ban source to BanSource: \"{raw}\""), }; From 7dc22a3bcfe4193adba8cbc1a7cdaa05a40cb270 Mon Sep 17 00:00:00 2001 From: Ro5490 <17776299+ro5490@users.noreply.github.com> Date: Mon, 15 May 2023 22:10:16 +0100 Subject: [PATCH 2/3] re-adjusted - acacia/linden bans arent seperate --- CentCom.Server/Services/BeeBanService.cs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/CentCom.Server/Services/BeeBanService.cs b/CentCom.Server/Services/BeeBanService.cs index 860d7e8..8034546 100644 --- a/CentCom.Server/Services/BeeBanService.cs +++ b/CentCom.Server/Services/BeeBanService.cs @@ -16,10 +16,8 @@ namespace CentCom.Server.Services; public class BeeBanService : RestBanService { private const int ParallelRequests = 1; - private static readonly BanSource AcaciaSource = new BanSource { Name = "bee-acacia" }; - private static readonly BanSource SageSource = new BanSource { Name = "bee-sage" }; + private static readonly BanSource MrpSource = new BanSource { Name = "bee-mrp" }; private static readonly BanSource LrpSource = new BanSource { Name = "bee-lrp" }; - private static readonly BanSource LindenSource = new BanSource { Name = "bee-linden" }; public BeeBanService(ILogger logger) : base(logger) { @@ -109,9 +107,9 @@ private static BanSource ParseBanSource(string raw) return (raw.ToLower()) switch { "bs_golden" => LrpSource, - "bs_sage" => SageSource, - "bs_acacia" => AcaciaSource, - "bs_linden" => LindenSource, + "bs_sage" => MrpSource, + "bs_acacia" => MrpSource, + "bs_linden" => MrpSource, _ => throw new Exception( $"Failed to convert raw value of Beestation ban source to BanSource: \"{raw}\""), }; From 168bffae60eeee5cc8a257e5d2a9af70372ae6e1 Mon Sep 17 00:00:00 2001 From: Ro5490 <17776299+ro5490@users.noreply.github.com> Date: Mon, 15 May 2023 22:10:25 +0100 Subject: [PATCH 3/3] yerp --- CentCom.Server/BanSources/BeeBanParser.cs | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/CentCom.Server/BanSources/BeeBanParser.cs b/CentCom.Server/BanSources/BeeBanParser.cs index 14b810c..d153f70 100644 --- a/CentCom.Server/BanSources/BeeBanParser.cs +++ b/CentCom.Server/BanSources/BeeBanParser.cs @@ -21,29 +21,17 @@ public BeeBanParser(DatabaseContext dbContext, BeeBanService banService, ILogger protected override Dictionary Sources => new Dictionary { - { "bee-acacia", new BanSource + { "bee-mrp", new BanSource { - Display = "Beestation Acacia", - Name = "bee-acacia", - RoleplayLevel = RoleplayLevel.Medium - } }, - { "bee-sage", new BanSource - { - Display = "Beestation Sage", - Name = "bee-sage", + Display = "Beestation", + Name = "bee-mrp", RoleplayLevel = RoleplayLevel.Medium } }, { "bee-lrp", new BanSource { - Display = "Beestation Golden", + Display = "Beestation LRP", Name = "bee-lrp", RoleplayLevel = RoleplayLevel.Low - } }, - { "bee-linden", new BanSource - { - Display = "Beestation Linden", - Name = "bee-linden", - RoleplayLevel = RoleplayLevel.Medium } } };