Discord/chaosbot
3
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'master'

Browse Source 
Updating for new results of MemberDate and RecruitDate

See merge request discord-bots/chaosbot!5
This commit is contained in:
Sean "Solao Bajiuik" Stoves 2020-08-08 22:35:05 -04:00
commit 9052399ab9
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChaosBot/Discord/Modules/Admin/RankCheck.cs
View File

@ -46,7 +46,7 @@ namespace ChaosBot.Discord.Modules.Admin
{ {
foreach (var lsID in ranks.FindAll(x => x.IngameRole == ERole.Recruit)) 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) if(lsID.DiscordId != null)
sb.AppendLine(string.Format("{0}{1}", lsID.DisplayName, (lsID.DiscordId != null ? $", linked to <@{lsID.DiscordId}>)" : ""))); 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)) 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) if(lsID.DiscordId != null)
sb.AppendLine(string.Format("{0}{1}", lsID.DisplayName, (lsID.DiscordId != null ? $", linked to <@{lsID.DiscordId}>)" : ""))); sb.AppendLine(string.Format("{0}{1}", lsID.DisplayName, (lsID.DiscordId != null ? $", linked to <@{lsID.DiscordId}>)" : "")));

6
ChaosBot/Lodestone/LodestoneRank.cs
View File

@ -30,6 +30,12 @@ namespace ChaosBot.Lodestone
[JsonProperty("firstSeen")] [JsonProperty("firstSeen")]
public DateTimeOffset FirstSeen { get; set; } public DateTimeOffset FirstSeen { get; set; }
[JsonProperty("RecruitDate")]
public DateTimeOffset RecruitDate { get; set; }
[JsonProperty("MemberDate")]
public DateTimeOffset MemberDate { get; set; }
[JsonProperty("displayName")] [JsonProperty("displayName")]
public string DisplayName { get; set; } public string DisplayName { get; set; }