Added !unmute, !tempmute, !listmutes
Quick fix for PowerShell IE use Makes date readable for target player Resolved translation string inconsistencies Minor code cleanups Initial commit from review Cleaned up code & amended a few checks Comment typo Fix infinite unmuting Removed unnecessary checks (Unmuting an already unmuted player will not trigger MuteStateMeta creation (if already doesn't exist)) Resolved !listmutes showing expired mutes Committing before refactor Refactor from review Removed reference to AdditionalProperty Fix check for meta state when unmuting Continued request solves main problem Handle potential failed command execution Missed CommandExecuted onJoin Fix another PS Reference to Invoke-WebRequest Fixes review issues & Cleaned up code Adds support for Intercepting Commands via Plugin (Credit: @RaidMax) Comparing Revert formatting changes Removing MuteList for Penalty Added Mute, TempMute & Unmute Penalty Fixed reference in Mute.csproj & Removed ListMutesCommand.cs
This commit is contained in:
Amos
RaidMax
@ -1,21 +1,175 @@
|
||||
using SharedLibraryCore;
|
||||
using Data.Models;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using SharedLibraryCore;
|
||||
using SharedLibraryCore.Database.Models;
|
||||
using SharedLibraryCore.Interfaces;
|
||||
using static System.Enum;
|
||||
using ILogger = Microsoft.Extensions.Logging.ILogger;
|
||||
|
||||
namespace Mute;
|
||||
|
||||
public class MuteManager
|
||||
{
|
||||
public async Task<bool> Mute(GameEvent gameEvent)
|
||||
private readonly IMetaServiceV2 _metaService;
|
||||
private readonly ITranslationLookup _translationLookup;
|
||||
private readonly ILogger _logger;
|
||||
|
||||
public MuteManager(IMetaServiceV2 metaService, ITranslationLookup translationLookup, ILogger logger)
|
||||
{
|
||||
if (await Plugin.DataManager.ReadPersistentData(gameEvent.Target) == MuteState.Muted)
|
||||
_metaService = metaService;
|
||||
_translationLookup = translationLookup;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
public static bool IsExpiredMute(MuteStateMeta muteStateMeta) =>
|
||||
muteStateMeta.Expiration is not null && muteStateMeta.Expiration < DateTime.UtcNow;
|
||||
|
||||
public async Task<MuteStateMeta> GetCurrentMuteState(EFClient client)
|
||||
{
|
||||
var clientMuteMeta = await ReadPersistentDataV2(client);
|
||||
if (clientMuteMeta is not null) return clientMuteMeta;
|
||||
|
||||
// Return null if the client doesn't have old or new meta.
|
||||
var muteState = await ReadPersistentDataV1(client);
|
||||
clientMuteMeta = new MuteStateMeta
|
||||
{
|
||||
await gameEvent.Owner.ExecuteCommandAsync($"unmute {gameEvent.Target.ClientNumber}");
|
||||
await Plugin.DataManager.WritePersistentData(gameEvent.Target,
|
||||
gameEvent.Target.IsIngame ? MuteState.Unmuted : MuteState.Unmuting);
|
||||
return false;
|
||||
ClientId = client.ClientId,
|
||||
Reason = muteState is null ? string.Empty : _translationLookup["PLUGINS_MUTE_MIGRATED"],
|
||||
Expiration = muteState switch
|
||||
{
|
||||
null => DateTime.UtcNow,
|
||||
MuteState.Muted => null,
|
||||
_ => DateTime.UtcNow
|
||||
},
|
||||
AdminId = Utilities.IW4MAdminClient().ClientId,
|
||||
MuteState = muteState ?? MuteState.Unmuted,
|
||||
CommandExecuted = true
|
||||
};
|
||||
|
||||
// Migrate old mute meta, else, client has no state, so set a generic one, but don't write it to database.
|
||||
if (muteState is not null)
|
||||
{
|
||||
await WritePersistentData(client, clientMuteMeta);
|
||||
}
|
||||
else
|
||||
{
|
||||
client.SetAdditionalProperty(Plugin.MuteKey, clientMuteMeta);
|
||||
}
|
||||
|
||||
await gameEvent.Owner.ExecuteCommandAsync($"muteClient {gameEvent.Target.ClientNumber}");
|
||||
await Plugin.DataManager.WritePersistentData(gameEvent.Target, MuteState.Muted);
|
||||
return clientMuteMeta;
|
||||
}
|
||||
|
||||
public async Task<bool> Mute(Server server, EFClient origin, EFClient target, DateTime? dateTime, string reason)
|
||||
{
|
||||
var clientMuteMeta = await GetCurrentMuteState(target);
|
||||
if (clientMuteMeta.MuteState is MuteState.Muted && clientMuteMeta.CommandExecuted) return false;
|
||||
|
||||
var newPenalty = new EFPenalty
|
||||
{
|
||||
Type = dateTime is null ? EFPenalty.PenaltyType.Mute : EFPenalty.PenaltyType.TempMute,
|
||||
Expires = dateTime,
|
||||
Offender = target,
|
||||
Offense = reason,
|
||||
Punisher = origin,
|
||||
Link = target.AliasLink
|
||||
};
|
||||
_logger.LogDebug("Creating new mute for {Target} with reason {Reason}", target.Name, reason);
|
||||
await newPenalty.TryCreatePenalty(Plugin.Manager.GetPenaltyService(), _logger);
|
||||
|
||||
clientMuteMeta = new MuteStateMeta
|
||||
{
|
||||
ClientId = target.ClientId,
|
||||
Expiration = dateTime,
|
||||
MuteState = MuteState.Muted,
|
||||
Reason = reason,
|
||||
AdminId = origin.ClientId,
|
||||
CommandExecuted = false
|
||||
};
|
||||
await WritePersistentData(target, clientMuteMeta);
|
||||
|
||||
// Handle game command
|
||||
var client = server.GetClientsAsList().FirstOrDefault(client => client.NetworkId == target.NetworkId);
|
||||
await PerformGameCommand(server, client, clientMuteMeta);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public async Task<bool> Unmute(Server server, EFClient origin, EFClient target, string reason)
|
||||
{
|
||||
var clientMuteMeta = await GetCurrentMuteState(target);
|
||||
if (clientMuteMeta.MuteState is MuteState.Unmuted && clientMuteMeta.CommandExecuted) return false;
|
||||
if (!target.IsIngame && clientMuteMeta.MuteState is MuteState.Unmuting) return false;
|
||||
|
||||
var newPenalty = new EFPenalty
|
||||
{
|
||||
Type = EFPenalty.PenaltyType.Unmute,
|
||||
Expires = DateTime.Now,
|
||||
Offender = target,
|
||||
Offense = reason,
|
||||
Punisher = origin,
|
||||
Active = true,
|
||||
Link = target.AliasLink
|
||||
};
|
||||
_logger.LogDebug("Creating new unmute for {Target} with reason {Reason}", target.Name, reason);
|
||||
await newPenalty.TryCreatePenalty(Plugin.Manager.GetPenaltyService(), _logger);
|
||||
|
||||
clientMuteMeta = new MuteStateMeta
|
||||
{
|
||||
ClientId = target.ClientId,
|
||||
Expiration = DateTime.UtcNow,
|
||||
MuteState = target.IsIngame ? MuteState.Unmuted : MuteState.Unmuting,
|
||||
Reason = reason,
|
||||
AdminId = origin.ClientId,
|
||||
CommandExecuted = false
|
||||
};
|
||||
await WritePersistentData(target, clientMuteMeta);
|
||||
|
||||
// Handle game command
|
||||
var client = server.GetClientsAsList().FirstOrDefault(client => client.NetworkId == target.NetworkId);
|
||||
await PerformGameCommand(server, client, clientMuteMeta);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public static async Task PerformGameCommand(Server server, EFClient? client, MuteStateMeta muteStateMeta)
|
||||
{
|
||||
if (client is null || !client.IsIngame) return;
|
||||
|
||||
switch (muteStateMeta.MuteState)
|
||||
{
|
||||
case MuteState.Muted:
|
||||
await server.ExecuteCommandAsync($"muteClient {client.ClientNumber}");
|
||||
muteStateMeta.CommandExecuted = true;
|
||||
break;
|
||||
case MuteState.Unmuted:
|
||||
await server.ExecuteCommandAsync($"unmute {client.ClientNumber}");
|
||||
muteStateMeta.CommandExecuted = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
private async Task<MuteState?> ReadPersistentDataV1(EFClient client) => TryParse<MuteState>(
|
||||
(await _metaService.GetPersistentMeta(Plugin.MuteKey, client.ClientId))?.Value,
|
||||
out var muteState)
|
||||
? muteState
|
||||
: null;
|
||||
|
||||
private async Task<MuteStateMeta?> ReadPersistentDataV2(EFClient client)
|
||||
{
|
||||
// Get meta from client
|
||||
var clientMuteMeta = client.GetAdditionalProperty<MuteStateMeta>(Plugin.MuteKey);
|
||||
if (clientMuteMeta is not null) return clientMuteMeta;
|
||||
|
||||
// Get meta from database and store in client if exists
|
||||
clientMuteMeta = await _metaService.GetPersistentMetaValue<MuteStateMeta>(Plugin.MuteKey, client.ClientId);
|
||||
if (clientMuteMeta is not null) client.SetAdditionalProperty(Plugin.MuteKey, clientMuteMeta);
|
||||
|
||||
return clientMuteMeta;
|
||||
}
|
||||
|
||||
private async Task WritePersistentData(EFClient client, MuteStateMeta clientMuteMeta)
|
||||
{
|
||||
client.SetAdditionalProperty(Plugin.MuteKey, clientMuteMeta);
|
||||
await _metaService.SetPersistentMetaValue(Plugin.MuteKey, clientMuteMeta, client.ClientId);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user