INSANEMODE/IW4M-Admin
1
0
Fork 0
mirror of https://github.com/RaidMax/IW4M-Admin.git synced 2025-06-10 15:20:48 -05:00
Code Issues Releases Wiki Activity

make sure flags are excluded from active penalties on player profile

Browse Source 
modify how flags "expire"
This commit is contained in:
RaidMax
2019-06-25 18:01:47 -05:00
parent 72c8a108c5
commit 2d0f05ea6e
6 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
SharedLibraryCore/PartialEntities/EFClient.cs
View File

@ -232,7 +232,7 @@ namespace SharedLibraryCore.Database.Models
/// <param name="flagReason">reason for flagging</param>
/// <param name="sender">client performing the flag</param>
/// <returns>game event for the flag</returns>
public GameEvent Flag(string flagReason, EFClient sender)
public GameEvent Flag(string flagReason, EFClient sender, TimeSpan? flagLength = null)
{
var e = new GameEvent()
{
@ -240,6 +240,7 @@ namespace SharedLibraryCore.Database.Models
Origin = sender,
Data = flagReason,
Message = flagReason,
Extra = flagLength,
Target = this,
Owner = sender.CurrentServer
};
@ -667,21 +668,15 @@ namespace SharedLibraryCore.Database.Models
if (currentFlag != null)
{
CurrentServer.Logger.WriteDebug($"Flagging {this} because their AliasLink is flagged, but they are not");
Flag(currentFlag.Offense, autoKickClient);
Flag(currentFlag.Offense, autoKickClient, currentFlag.Expires - DateTime.UtcNow);
}
}
#endregion
if (Level == Permission.Flagged)
{
var currentAutoFlag = activePenalties
.Where(p => p.Type == EFPenalty.PenaltyType.Flag && p.PunisherId == 1)
.OrderByDescending(p => p.When)
.FirstOrDefault();
// remove their auto flag status after a week
if (currentAutoFlag != null &&
(DateTime.UtcNow - currentAutoFlag.When).TotalDays > 7)
if (!activePenalties.Any(_penalty => _penalty.Type == EFPenalty.PenaltyType.Flag))
{
CurrentServer.Logger.WriteInfo($"Unflagging {this} because the auto flag time has expired");
Unflag(Utilities.CurrentLocalization.LocalizationIndex["SERVER_AUTOFLAG_UNFLAG"], autoKickClient);

6
SharedLibraryCore/Services/PenaltyService.cs
View File

@ -175,11 +175,11 @@ namespace SharedLibraryCore.Services
Expression<Func<EFPenalty, bool>> filter = (p) => (new EFPenalty.PenaltyType[]
{
EFPenalty.PenaltyType.TempBan,
EFPenalty.PenaltyType.Ban
EFPenalty.PenaltyType.Ban,
EFPenalty.PenaltyType.Flag
}.Contains(p.Type) &&
p.Active &&
(p.Expires == null || p.Expires > now)) ||
(p.Type ==EFPenalty.PenaltyType.Flag && p.Active);
(p.Expires == null || p.Expires > now));
using (var context = new DatabaseContext(true))
{