diff --git a/CentCom.API/CentCom.API.csproj b/CentCom.API/CentCom.API.csproj
index 8435092..4e8b98e 100644
--- a/CentCom.API/CentCom.API.csproj
+++ b/CentCom.API/CentCom.API.csproj
@@ -2,9 +2,9 @@
netcoreapp3.1
- 1.2.3
- 1.2.3.0
- 1.2.3.0
+ 1.2.4
+ 1.2.4.0
+ 1.2.4.0
diff --git a/CentCom.Common/CentCom.Common.csproj b/CentCom.Common/CentCom.Common.csproj
index b06952b..02aeb9b 100644
--- a/CentCom.Common/CentCom.Common.csproj
+++ b/CentCom.Common/CentCom.Common.csproj
@@ -2,9 +2,9 @@
netstandard2.0
- 1.2.3
- 1.2.3.0
- 1.2.3.0
+ 1.2.4
+ 1.2.4.0
+ 1.2.4.0
diff --git a/CentCom.Server/CentCom.Server.csproj b/CentCom.Server/CentCom.Server.csproj
index e249656..c7e5735 100644
--- a/CentCom.Server/CentCom.Server.csproj
+++ b/CentCom.Server/CentCom.Server.csproj
@@ -3,9 +3,9 @@
Exe
netcoreapp3.1
- 1.2.3.0
- 1.2.3.0
- 1.2.3
+ 1.2.4.0
+ 1.2.4.0
+ 1.2.4
diff --git a/CentCom.Server/Services/FulpBanService.cs b/CentCom.Server/Services/FulpBanService.cs
index 4327289..7444674 100644
--- a/CentCom.Server/Services/FulpBanService.cs
+++ b/CentCom.Server/Services/FulpBanService.cs
@@ -43,13 +43,22 @@ public async Task> GetBansAsync(int page = 1)
var content = JsonSerializer.Deserialize>(response.Content);
foreach (var ban in content["value"].GetProperty("bans").EnumerateArray())
{
+ // Need to get both the expiration as well as the unbanned time as they can differ
+ DateTime? expiration = expiration = ban.GetProperty("unbannedTime").GetString() == null ? (DateTime?)null
+ : DateTime.Parse(ban.GetProperty("unbannedTime").GetString()); ;
+ if (!expiration.HasValue)
+ {
+ expiration = ban.GetProperty("banExpireTime").GetString() == null ? (DateTime?)null
+ : DateTime.Parse(ban.GetProperty("banExpireTime").GetString());
+ }
+
// Get ban
var toAdd = new Ban()
{
BannedOn = DateTime.Parse(ban.GetProperty("banApplyTime").GetString()),
BannedBy = ban.GetProperty("adminCkey").GetString(),
BanType = ban.GetProperty("role")[0].GetString().ToLower() == "server" ? BanType.Server : BanType.Job,
- Expires = ban.GetProperty("banExpireTime").GetString() == null ? (DateTime?)null : DateTime.Parse(ban.GetProperty("banExpireTime").GetString()),
+ Expires = expiration,
CKey = ban.GetProperty("bannedCkey").GetString(),
Reason = ban.GetProperty("reason").GetString(),
SourceNavigation = _banSource