From 59b6ff05695df5aaa73e737b438ad311203b7586 Mon Sep 17 00:00:00 2001 From: Sean Stoves Date: Sat, 8 Aug 2020 22:34:07 -0400 Subject: [PATCH] Updating for new results of MemberDate and RecruitDate --- ChaosBot/Discord/Modules/Admin/RankCheck.cs | 4 ++-- ChaosBot/Lodestone/LodestoneRank.cs | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChaosBot/Discord/Modules/Admin/RankCheck.cs b/ChaosBot/Discord/Modules/Admin/RankCheck.cs index 9b7c3b2..0adff96 100644 --- a/ChaosBot/Discord/Modules/Admin/RankCheck.cs +++ b/ChaosBot/Discord/Modules/Admin/RankCheck.cs @@ -46,7 +46,7 @@ namespace ChaosBot.Discord.Modules.Admin { foreach (var lsID in ranks.FindAll(x => x.IngameRole == ERole.Recruit)) { - if ((lsID.ShouldBeRole != lsID.IngameRole) && (lsID.ShouldBeRole != null)) + if (DateTimeOffset.Now >= lsID.RecruitDate) { if(lsID.DiscordId != null) sb.AppendLine(string.Format("{0}{1}", lsID.DisplayName, (lsID.DiscordId != null ? $", linked to <@{lsID.DiscordId}>)" : ""))); @@ -82,7 +82,7 @@ namespace ChaosBot.Discord.Modules.Admin { foreach (var lsID in ranks.FindAll(x => x.IngameRole == ERole.Initiate)) { - if ((lsID.ShouldBeRole != lsID.IngameRole) && (lsID.ShouldBeRole != null)) + if (DateTimeOffset.Now >= lsID.MemberDate) { if(lsID.DiscordId != null) sb.AppendLine(string.Format("{0}{1}", lsID.DisplayName, (lsID.DiscordId != null ? $", linked to <@{lsID.DiscordId}>)" : ""))); diff --git a/ChaosBot/Lodestone/LodestoneRank.cs b/ChaosBot/Lodestone/LodestoneRank.cs index e98688c..b943984 100644 --- a/ChaosBot/Lodestone/LodestoneRank.cs +++ b/ChaosBot/Lodestone/LodestoneRank.cs @@ -30,6 +30,12 @@ namespace ChaosBot.Lodestone [JsonProperty("firstSeen")] public DateTimeOffset FirstSeen { get; set; } + [JsonProperty("RecruitDate")] + public DateTimeOffset RecruitDate { get; set; } + + [JsonProperty("MemberDate")] + public DateTimeOffset MemberDate { get; set; } + [JsonProperty("displayName")] public string DisplayName { get; set; }