Rim/IW4M-Admin
Rim/IW4M-Admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 30 Wiki Activity

-removes flag penality when unflagging a player

Browse Source 
-fixed 'just now ago' on webfront
-webfront playerlist level colors are hidden to non admin users
-tempban length can now be specified (<int>m, <int>h, <int>d,  <int>y)
This commit is contained in:
RaidMax 2017-08-23 17:29:48 -05:00
parent 6a94882d20
commit 9227335d25
18 changed files with 221 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Admin/Application.csproj
View File

@ -48,6 +48,7 @@
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
<CodeAnalysisRuleSet>..\..\..\RuleSet1.ruleset</CodeAnalysisRuleSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>x86</PlatformTarget> <PlatformTarget>x86</PlatformTarget>
@ -204,7 +205,7 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="config\messages.cfg"> <Content Include="config\messages.cfg">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="config\rules.cfg"> <Content Include="config\rules.cfg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@ -212,9 +213,9 @@
<None Include="app.config"> <None Include="app.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
<None Include="config\web.cfg"> <Content Include="config\web.cfg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </Content>
<None Include="IW4MAdmin.exe.config" /> <None Include="IW4MAdmin.exe.config" />
<None Include="packages.config" /> <None Include="packages.config" />
<None Include="Properties\app.manifest" /> <None Include="Properties\app.manifest" />

2
Admin/PenaltyList.cs
View File

@ -15,7 +15,7 @@ namespace IW4MAdmin
public void AddPenalty(Penalty P) public void AddPenalty(Penalty P)
{ {
ApplicationManager.GetInstance().GetClientDatabase().AddBan(P); ApplicationManager.GetInstance().GetClientDatabase().AddPenalty(P);
} }
public void RemovePenalty(Penalty P) public void RemovePenalty(Penalty P)

46
Admin/Server.cs
View File

@ -111,6 +111,12 @@ namespace IW4MAdmin
return true; return true;
} }
var activeTB = IsTempBanned(aP);
if (activeTB != null)
{
await this.ExecuteCommandAsync($"clientkick {NewPlayer.ClientID} \"You are temporarily banned. ({(activeTB.Expires - DateTime.Now).TimeSpanText()} left)\"");
}
} }
Players[NewPlayer.ClientID] = NewPlayer; Players[NewPlayer.ClientID] = NewPlayer;
@ -176,6 +182,11 @@ namespace IW4MAdmin
return Manager.GetClientPenalties().FindPenalties(C).Where(b => b.BType == Penalty.Type.Ban).FirstOrDefault(); return Manager.GetClientPenalties().FindPenalties(C).Where(b => b.BType == Penalty.Type.Ban).FirstOrDefault();
} }
public Penalty IsTempBanned(Player C)
{
return Manager.GetClientPenalties().FindPenalties(C).FirstOrDefault(b => b.BType == Penalty.Type.TempBan && b.Expires > DateTime.Now);
}
//Process requested command correlating to an event //Process requested command correlating to an event
// todo: this needs to be removed out of here // todo: this needs to be removed out of here
override public async Task<Command> ValidateCommand(Event E) override public async Task<Command> ValidateCommand(Event E)
@ -354,9 +365,9 @@ namespace IW4MAdmin
playerCountStart = DateTime.Now; playerCountStart = DateTime.Now;
} }
if (LastMessage.TotalSeconds > MessageTime && BroadcastMessages.Count > 0 && ClientNum > 0) if (LastMessage.TotalSeconds > MessageTime && BroadcastMessages.Count > 0 /*&& ClientNum > 0*/)
{ {
Console.WriteLine(Utilities.ProcessMessageToken(Manager.GetMessageTokens(), BroadcastMessages[NextMessage])); await Broadcast(Utilities.ProcessMessageToken(Manager.GetMessageTokens(), BroadcastMessages[NextMessage]));
NextMessage = NextMessage == (BroadcastMessages.Count - 1) ? 0 : NextMessage + 1; NextMessage = NextMessage == (BroadcastMessages.Count - 1) ? 0 : NextMessage + 1;
start = DateTime.Now; start = DateTime.Now;
} }
@ -611,7 +622,7 @@ namespace IW4MAdmin
await Target.Kick("Too many warnings!", Origin); await Target.Kick("Too many warnings!", Origin);
else else
{ {
Penalty newPenalty = new Penalty(Penalty.Type.Warning, Reason.StripColors(), Target.NetworkID, Origin.NetworkID, DateTime.Now, Target.IP); Penalty newPenalty = new Penalty(Penalty.Type.Warning, Reason.StripColors(), Target.NetworkID, Origin.NetworkID, DateTime.Now, Target.IP, DateTime.Now);
Manager.GetClientPenalties().AddPenalty(newPenalty); Manager.GetClientPenalties().AddPenalty(newPenalty);
Target.Warnings++; Target.Warnings++;
String Message = String.Format("^1WARNING ^7[^3{0}^7]: ^3{1}^7, {2}", Target.Warnings, Target.Name, Target.lastOffense); String Message = String.Format("^1WARNING ^7[^3{0}^7]: ^3{1}^7, {2}", Target.Warnings, Target.Name, Target.lastOffense);
@ -624,24 +635,21 @@ namespace IW4MAdmin
if (Target.ClientID > -1) if (Target.ClientID > -1)
{ {
String Message = "^1Player Kicked: ^5" + Reason; String Message = "^1Player Kicked: ^5" + Reason;
Penalty newPenalty = new Penalty(Penalty.Type.Kick, Reason.StripColors().Trim(), Target.NetworkID, Origin.NetworkID, DateTime.Now, Target.IP); Penalty newPenalty = new Penalty(Penalty.Type.Kick, Reason.StripColors().Trim(), Target.NetworkID, Origin.NetworkID, DateTime.Now, Target.IP, DateTime.Now);
Manager.GetClientPenalties().AddPenalty(newPenalty); Manager.GetClientPenalties().AddPenalty(newPenalty);
await this.ExecuteCommandAsync($"clientkick {Target.ClientID} \"{Message}^7\""); await this.ExecuteCommandAsync($"clientkick {Target.ClientID} \"{Message}^7\"");
} }
} }
public override async Task TempBan(String Reason, Player Target, Player Origin) public override async Task TempBan(String Reason, TimeSpan length, Player Target, Player Origin)
{ {
if (Target.ClientID > -1) await this.ExecuteCommandAsync($"tempbanclient {Target.ClientID } \"^1Player Temporarily Banned: ^5{ Reason }\"");
{ Penalty newPenalty = new Penalty(Penalty.Type.TempBan, Reason.StripColors(), Target.NetworkID, Origin.NetworkID, DateTime.Now, Target.IP, DateTime.Now + length);
await this.ExecuteCommandAsync($"tempbanclient {Target.ClientID } \"^1Player Temporarily Banned: ^5{ Reason } (1 hour)\"");
Penalty newPenalty = new Penalty(Penalty.Type.TempBan, Reason.StripColors(), Target.NetworkID, Origin.NetworkID, DateTime.Now, Target.IP);
await Task.Run(() => await Task.Run(() =>
{ {
Manager.GetClientPenalties().AddPenalty(newPenalty); Manager.GetClientPenalties().AddPenalty(newPenalty);
}); });
} }
}
override public async Task Ban(String Message, Player Target, Player Origin) override public async Task Ban(String Message, Player Target, Player Origin)
{ {
@ -670,7 +678,7 @@ namespace IW4MAdmin
if (Origin != null) if (Origin != null)
{ {
Target.SetLevel(Player.Permission.Banned); Target.SetLevel(Player.Permission.Banned);
Penalty newBan = new Penalty(Penalty.Type.Ban, Target.lastOffense, Target.NetworkID, Origin.NetworkID, DateTime.Now, Target.IP); Penalty newBan = new Penalty(Penalty.Type.Ban, Target.lastOffense, Target.NetworkID, Origin.NetworkID, DateTime.Now, Target.IP, DateTime.MaxValue);
await Task.Run(() => await Task.Run(() =>
{ {
@ -701,17 +709,21 @@ namespace IW4MAdmin
// database stuff can be time consuming // database stuff can be time consuming
await Task.Run(() => await Task.Run(() =>
{ {
var FoundPenalaties = Manager.GetClientPenalties().FindPenalties(Target); var FoundPenalties = Manager.GetClientPenalties().FindPenalties(Target);
var PenaltyToRemove = FoundPenalaties.Find(b => b.BType == Penalty.Type.Ban);
if (PenaltyToRemove == null) FoundPenalties.Where(p => p.BType > Penalty.Type.Kick)
return; .All(p =>
{
Manager.GetClientPenalties().RemovePenalty(PenaltyToRemove); Manager.GetClientPenalties().RemovePenalty(p);
return true;
});
Player P = Manager.GetClientDatabase().GetPlayer(Target.NetworkID, -1); Player P = Manager.GetClientDatabase().GetPlayer(Target.NetworkID, -1);
if (P.Level < Player.Permission.Trusted)
{
P.SetLevel(Player.Permission.User); P.SetLevel(Player.Permission.User);
Manager.GetClientDatabase().UpdatePlayer(P); Manager.GetClientDatabase().UpdatePlayer(P);
}
}); });
} }

5
Admin/WebService.cs
View File

@ -209,6 +209,8 @@ namespace IW4MAdmin
chatHistory = S.ChatHistory, chatHistory = S.ChatHistory,
players = new List<PlayerInfo>() players = new List<PlayerInfo>()
}; };
bool authed = ApplicationManager.GetInstance().GetClientDatabase().GetAdmins().FindAll(x => x.IP == querySet["IP"] && x.Level > Player.Permission.Trusted).Count > 0
|| querySet["IP"] == "127.0.0.1";
foreach (Player P in S.GetPlayersAsList()) foreach (Player P in S.GetPlayersAsList())
{ {
@ -216,7 +218,7 @@ namespace IW4MAdmin
{ {
playerID = P.DatabaseID, playerID = P.DatabaseID,
playerName = P.Name, playerName = P.Name,
playerLevel = P.Level.ToString() playerLevel = authed ? P.Level.ToString() : Player.Permission.User.ToString()
}; };
eachServer.players.Add(pInfo); eachServer.players.Add(pInfo);
} }
@ -383,7 +385,6 @@ namespace IW4MAdmin
try try
{ {
//selectedPenalties = Manager.GetInstance().Servers.First().Bans.OrderByDescending(x => x.When).ToList().GetRange(Convert.ToInt32(querySet["from"]), 15);
selectedPenalties = ((ApplicationManager.GetInstance().GetClientPenalties()) as PenaltyList).AsChronoList(Convert.ToInt32(querySet["from"]), 15).OrderByDescending(b => b.When).ToList(); selectedPenalties = ((ApplicationManager.GetInstance().GetClientPenalties()) as PenaltyList).AsChronoList(Convert.ToInt32(querySet["from"]), 15).OrderByDescending(b => b.When).ToList();
} }

BIN
Admin/lib/SharedLibrary.dll
View File

Binary file not shown.

4
Admin/version.txt
View File

@ -10,6 +10,10 @@ CHANGELOG:
-moved aliases to the manager -moved aliases to the manager
-added admins page to view privileged users -added admins page to view privileged users
-fixed refactoring mistake with messages -fixed refactoring mistake with messages
-removes flag penality when unflagging a player
-fixed 'just now ago' on webfront
-webfront playerlist level colors are hidden to non admin users
-tempban length can now be specified (<int>m, <int>h, <int>d, <int>y)
VERSION 1.3 VERSION 1.3

98
Admin/webfront/admins.html
View File

@ -1,40 +1,23 @@
<script> <script>
function printPlayer(player, i) function printPlayer(player, i) {
{ var playerText = '<div class="admin-name"><a href="/players?id=' + player.DatabaseID + '">' + player.Name + "</a></div>";
var p = ""; switch (player.Level) {
p += case 6:
"<div class=\"playerInfo table alternate_" + i % 2 + "\"> \ $('#owner-privilege .clients').append(playerText);
<div class=\"tableCell\"><a href=\"/players?id=" + player['playerID'] + "\">" + player['playerName'] + "</a></div> \ break;
<div class=\"tableCell\">" + formatHidden(player['playerAliases'], player.authed) + "</div> \ case 5:
<div class=\"tableCell\">" + formatHidden(player['playerIPs'], player.authed) + "</div> \ $('#senioradmin-privilege .clients').append(playerText);
<div class=\"tableCell\">" + getColorForLevel(player['playerLevel'], player['playerLevel']) + "</div> \ break;
<div class=\"tableCell\">" + player['playerConnections'] + "</div>"; case 4:
$('#admin-privilege .clients').append(playerText);
if (player.showV2Features) break;
{ case 3:
p += $('#mod-privilege .clients').append(playerText);
"<div class=\"tableCell actionButton\" style='width: 2em;'> \ break;
<a target=\"_blank\" href='http://server.nbsclan.org/screen.php?id=" + player.forumID + "&name=" + player.playerName + "'> \ case 2:
<i class=\"fa fa-camera\" aria-hidden=\"true\"></i> \ $('#trusted-privilege .clients').append(playerText);
</a> \ break;
<a target=\"_blank\" href='https://v2.mcsebi.ru/memberlist.php?mode=viewprofile&u=" + player.forumID + "'> \
<i class=\"fa fa-user tableCell\" aria-hidden=\"true\"></i> \
</a> \
</div> ";
} }
else
{
p+=
"<div class=\"tableCell\" style='width: 2em;'><i class=\"fa fa-ban\" aria-hidden=\"true\"></i></div>"
}
p +=
"<div class=\"tableCell alignRight\">" + checkJustNow(player['lastSeen']) + "</div> \
</div>";
$("#playersTable").append(p);
} }
function getAdmins() { function getAdmins() {
@ -42,30 +25,47 @@ function getAdmins() {
$.each(result, function (i, player) { $.each(result, function (i, player) {
printPlayer(player, i); printPlayer(player, i);
}); });
}).done(function (data) { $(".loader").fadeOut(); }); });
} }
$(document).ready(function () { $(document).ready(function () {
getAdmins(); getAdmins();
}); });
</script> </script>
<div class="playerSearchWrap">
<input type="button" class="searchButton" name="Search" value="Search"/> <div class="privilege" id="owner-privilege">
<input type="text" class="search" placeholder="Player Name..."/> <div class="contentHeader table">
<div class="contentColumn tableCell">Owner</div>
</div>
<div class="clients"></div>
</div> </div>
<div class="privilege" id="senioradmin-privilege">
<div class="contentHeader table"> <div class="contentHeader table">
<div class="contentColumn tableCell">Name</div> <div class="contentColumn tableCell">Senior Administrator</div>
<div class="contentColumn tableCell">Aliases</div>
<div class="contentColumn tableCell">IP</div>
<div class="contentColumn tableCell">Level</div>
<div class="contentColumn tableCell">Connections</div>
<div class="contentColumn tableCell" style="width: 1em;">V2</div>
<div class="contentColumn tableCell alignRight">Last Seen</div>
</div> </div>
<div id="playersTable"> <div class="clients"></div>
</div>
<div class="privilege" id="admin-privilege">
<div class="contentHeader table">
<div class="contentColumn tableCell">Administrator</div>
</div>
<div class="clients"></div>
</div>
<div class="privilege" id="mod-privilege">
<div class="contentHeader table">
<div class="contentColumn tableCell">Moderator</div>
</div>
<div class="clients"></div>
</div>
<div class="privilege" id="trusted-privilege">
<div class="contentHeader table">
<div class="contentColumn tableCell">Trusted</div>
</div>
<div class="clients"></div>
</div> </div>
<hr /> <hr />

5
Admin/webfront/header.html
View File

@ -183,10 +183,7 @@ function formatPlayers(players)
function checkJustNow(timestr) function checkJustNow(timestr)
{ {
if (timestr.includes("just now")) return timestr
return timestr;
else
return timestr + " ago";
} }
function getDate(datestr) function getDate(datestr)

13
Admin/webfront/main.css
View File

@ -126,8 +126,6 @@ div#threadContainer .threadContent a:hover { color: #fff !important; }
div.threadContent ol, div.threadContent ol { margin: 1em; } div.threadContent ol, div.threadContent ol { margin: 1em; }
div.categoryThread .threadActions { color: rgba(255, 69, 69, 0.85); font-size: 18pt; width: 19px; } div.categoryThread .threadActions { color: rgba(255, 69, 69, 0.85); font-size: 18pt; width: 19px; }
div#postReplyContainer { position: fixed; bottom: 0; left: 0; width: 100%; height: 20em; background-color: #181818; } div#postReplyContainer { position: fixed; bottom: 0; left: 0; width: 100%; height: 20em; background-color: #181818; }
div#postReplyClose { position: absolute; right: 0.25em; font-size: 24pt; } div#postReplyClose { position: absolute; right: 0.25em; font-size: 24pt; }
div#postReplyClose:hover { color: #007ACC; cursor: pointer; } div#postReplyClose:hover { color: #007ACC; cursor: pointer; }
@ -192,9 +190,12 @@ div.threadInfo .actionHover { float: right; color: rgba(255, 69, 69, 0.85); marg
.datThing { background-color: #007ACC; font-size: 16pt; border: none; color: #fff; font-size: 15pt; padding: 0.5em 10px; } .datThing { background-color: #007ACC; font-size: 16pt; border: none; color: #fff; font-size: 15pt; padding: 0.5em 10px; }
span.light { opacity: 0.5; } span.light { opacity: 0.5; }
span.userTitle span:hover {color: #007ACC !important; } span.userTitle span:hover {color: #007ACC !important; }
input#bannercolor { margin: 0.35em; width: 265px; border: none; height: 45px; } input#bannercolor { margin: 0.35em; width: 265px; border: none; height: 45px; }
div#footer { position: fixed; bottom: 0.5em; right: 0.5em; opacity: 0.5; } div#footer { position: fixed; bottom: 0.5em; right: 0.5em; opacity: 0.5; }
.privilege-title { font-size: 24pt; }
.privilege-title + hr { margin-bottom: 10px; }
.privilege hr { margin-top: 10px !important; }
.admin-name a { font-size: 14pt; color: #007ACC !important; }
.admin-name a:hover { color: #fff !important; }
.clients { margin: 0.5em; }

2
Admin/webfront/penalties.html
View File

@ -33,7 +33,7 @@ function getPenalties(from)
<div class=\"penaltyType tableCell\">"+ getColorForLevel(penalty['penaltyType'], penalty['penaltyType']) + "</div> \ <div class=\"penaltyType tableCell\">"+ getColorForLevel(penalty['penaltyType'], penalty['penaltyType']) + "</div> \
<div class=\"penaltyReason tableCell\">"+ penalty['penaltyReason'] + "</div> \ <div class=\"penaltyReason tableCell\">"+ penalty['penaltyReason'] + "</div> \
<div class=\"penaltyOrigin tableCell\">"+ getColorForLevel(penalty['adminLevel'], penalty['adminName']) + "</div> \ <div class=\"penaltyOrigin tableCell\">"+ getColorForLevel(penalty['adminLevel'], penalty['adminName']) + "</div> \
<div class=\"penaltyTime tableCell\">"+ penalty['penaltyTime'] + " ago </div> \ <div class=\"penaltyTime tableCell\">"+ penalty['penaltyTime'] + "</div> \
</div>" </div>"
) )
}); });

8
Plugins/Welcome/Plugin.cs
View File

@ -98,6 +98,10 @@ namespace Welcome_Plugin
public async Task OnTickAsync(Server S) public async Task OnTickAsync(Server S)
{ {
return;
// TODO: check if this works
int MaxPing = (await S.GetDvarAsync<int>("sv_maxping")).Value; int MaxPing = (await S.GetDvarAsync<int>("sv_maxping")).Value;
if (MaxPing == 0) if (MaxPing == 0)
@ -144,12 +148,12 @@ namespace Welcome_Plugin
} }
PlayerPings.Add(E.Origin.DatabaseID, 1.0f); //PlayerPings.Add(E.Origin.DatabaseID, 1.0f);
} }
if (E.Type == Event.GType.Disconnect) if (E.Type == Event.GType.Disconnect)
{ {
PlayerPings.Remove(E.Origin.DatabaseID); //PlayerPings.Remove(E.Origin.DatabaseID);
} }
} }
} }

25
SharedLibrary/Commands/NativeCommands.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Text; using System.Text;
using System.Linq; using System.Linq;
using SharedLibrary.Network; using SharedLibrary.Network;
using SharedLibrary.Helpers;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace SharedLibrary.Commands namespace SharedLibrary.Commands
@ -96,10 +97,15 @@ namespace SharedLibrary.Commands
{ {
E.Target.lastOffense = Utilities.RemoveWords(E.Data, 1); E.Target.lastOffense = Utilities.RemoveWords(E.Data, 1);
String Message = E.Target.lastOffense; String Message = E.Target.lastOffense;
var length = Message.ParseTimespan();
if (length.TotalHours != 1)
Message = Utilities.RemoveWords(Message, 1);
if (E.Origin.Level > E.Target.Level) if (E.Origin.Level > E.Target.Level)
{ {
await E.Target.TempBan(Message, E.Origin); await E.Target.TempBan(Message, length, E.Origin);
await E.Origin.Tell($"Successfully temp banned {E.Target.Name}"); await E.Origin.Tell($"Successfully temp banned ^5{E.Target.Name} ^7for ^5{length.TimeSpanText()}");
} }
else else
await E.Origin.Tell("You cannot temp ban " + E.Target.Name); await E.Origin.Tell("You cannot temp ban " + E.Target.Name);
@ -391,7 +397,7 @@ namespace SharedLibrary.Commands
foreach (Player P in db_players) foreach (Player P in db_players)
{ {
String mesg = String.Format("[^3{0}^7] [^3@{1}^7] - [{2}^7] - {3} | last seen {4} ago", P.Name, P.DatabaseID, Utilities.ConvertLevelToColor(P.Level), P.IP, P.GetLastConnection()); String mesg = String.Format("[^3{0}^7] [^3@{1}^7] - [{2}^7] - {3} | last seen {4}", P.Name, P.DatabaseID, Utilities.ConvertLevelToColor(P.Level), P.IP, P.GetLastConnection());
await E.Origin.Tell(mesg); await E.Origin.Tell(mesg);
} }
} }
@ -510,6 +516,7 @@ namespace SharedLibrary.Commands
if (E.Target.Level == Player.Permission.Flagged) if (E.Target.Level == Player.Permission.Flagged)
{ {
E.Target.SetLevel(Player.Permission.User); E.Target.SetLevel(Player.Permission.User);
E.Owner.Manager.GetClientPenalties().RemovePenalty(new Penalty(Penalty.Type.Flag, "", E.Target.NetworkID, "", DateTime.Now, "", DateTime.Now));
await E.Origin.Tell("You have ^5unflagged ^7" + E.Target.Name); await E.Origin.Tell("You have ^5unflagged ^7" + E.Target.Name);
} }
@ -517,7 +524,7 @@ namespace SharedLibrary.Commands
{ {
E.Data = Utilities.RemoveWords(E.Data, 1); E.Data = Utilities.RemoveWords(E.Data, 1);
E.Target.SetLevel(Player.Permission.Flagged); E.Target.SetLevel(Player.Permission.Flagged);
E.Owner.Manager.GetClientPenalties().AddPenalty(new Penalty(Penalty.Type.Flag, E.Data, E.Target.NetworkID, E.Origin.NetworkID, DateTime.Now, E.Target.IP)); E.Owner.Manager.GetClientPenalties().AddPenalty(new Penalty(Penalty.Type.Flag, E.Data, E.Target.NetworkID, E.Origin.NetworkID, DateTime.Now, E.Target.IP, DateTime.Now));
await E.Owner.ExecuteEvent(new Event(Event.GType.Flag, E.Data, E.Origin, E.Target, E.Owner)); await E.Owner.ExecuteEvent(new Event(Event.GType.Flag, E.Data, E.Origin, E.Target, E.Owner));
await E.Origin.Tell("You have ^5flagged ^7" + E.Target.Name); await E.Origin.Tell("You have ^5flagged ^7" + E.Target.Name);
} }
@ -617,7 +624,7 @@ namespace SharedLibrary.Commands
} }
var B = E.Owner.Manager.GetClientPenalties().FindPenalties(E.Target); var B = E.Owner.Manager.GetClientPenalties().FindPenalties(E.Target);
var BannedPenalty = B.Find(b => b.BType == Penalty.Type.Ban); var BannedPenalty = B.Find(b => b.BType > Penalty.Type.Kick && b.Expires > DateTime.Now);
if (BannedPenalty == null) if (BannedPenalty == null)
{ {
@ -627,13 +634,7 @@ namespace SharedLibrary.Commands
Player Banner = E.Owner.Manager.GetClientDatabase().GetPlayer(BannedPenalty.PenaltyOriginID, -1); Player Banner = E.Owner.Manager.GetClientDatabase().GetPlayer(BannedPenalty.PenaltyOriginID, -1);
if (Banner == null) await E.Origin.Tell(String.Format("^1{0} ^7was banned by ^5{1} ^7for: {2} {3}", E.Target.Name, Banner?.Name ?? "IW4MAdmin", BannedPenalty.Reason, BannedPenalty.BType == Penalty.Type.TempBan ? $"({(BannedPenalty.Expires - DateTime.Now).TimeSpanText()} remaining)" : ""));
{
await E.Origin.Tell("Ban was found for the player, but origin of the ban is unavailable.");
return;
}
await E.Origin.Tell(String.Format("^1{0} ^7was banned by ^5{1} ^7for: {2}", E.Target.Name, Banner.Name, BannedPenalty.Reason));
} }
} }

17
SharedLibrary/Database.cs
View File

@ -227,7 +227,7 @@ namespace SharedLibrary
{ {
String Create = "CREATE TABLE [CLIENTS] ( [Name] TEXT NULL, [npID] TEXT NULL, [Number] INTEGER PRIMARY KEY AUTOINCREMENT, [Level] INT DEFAULT 0 NULL, [LastOffense] TEXT NULL, [Connections] INT DEFAULT 1 NULL, [IP] TEXT NULL, [LastConnection] TEXT NULL, [UID] TEXT NULL, [Masked] INT DEFAULT 0, [Reserved] INT DEFAULT 0);"; String Create = "CREATE TABLE [CLIENTS] ( [Name] TEXT NULL, [npID] TEXT NULL, [Number] INTEGER PRIMARY KEY AUTOINCREMENT, [Level] INT DEFAULT 0 NULL, [LastOffense] TEXT NULL, [Connections] INT DEFAULT 1 NULL, [IP] TEXT NULL, [LastConnection] TEXT NULL, [UID] TEXT NULL, [Masked] INT DEFAULT 0, [Reserved] INT DEFAULT 0);";
ExecuteNonQuery(Create); ExecuteNonQuery(Create);
Create = "CREATE TABLE [BANS] ( [TYPE] TEXT NULL, [Reason] TEXT NULL, [npID] TEXT NULL, [bannedByID] TEXT NULL, [IP] TEXT NULL, [TIME] TEXT NULL);"; Create = "CREATE TABLE [BANS] ( [TYPE] TEXT NULL, [Reason] TEXT NULL, [npID] TEXT NULL, [bannedByID] TEXT NULL, [IP] TEXT NULL, [TIME] TEXT NULL, [EXPIRES] TEXT);";
ExecuteNonQuery(Create); ExecuteNonQuery(Create);
} }
} }
@ -453,7 +453,7 @@ namespace SharedLibrary
if (Row["TYPE"].ToString().Length != 0) if (Row["TYPE"].ToString().Length != 0)
BanType = (Penalty.Type)Enum.Parse(typeof(Penalty.Type), Row["TYPE"].ToString()); BanType = (Penalty.Type)Enum.Parse(typeof(Penalty.Type), Row["TYPE"].ToString());
ClientPenalties.Add(new Penalty(BanType, Row["Reason"].ToString().Trim(), Row["npID"].ToString(), Row["bannedByID"].ToString(), DateTime.Parse(Row["TIME"].ToString()), Row["IP"].ToString())); ClientPenalties.Add(new Penalty(BanType, Row["Reason"].ToString().Trim(), Row["npID"].ToString(), Row["bannedByID"].ToString(), DateTime.Parse(Row["TIME"].ToString()), Row["IP"].ToString(), DateTime.Parse(Row["EXPIRES"].ToString())));
} }
@ -470,12 +470,8 @@ namespace SharedLibrary
if (Row["TIME"].ToString().Length < 2) //compatibility with my old database if (Row["TIME"].ToString().Length < 2) //compatibility with my old database
Row["TIME"] = DateTime.Now.ToString(); Row["TIME"] = DateTime.Now.ToString();
Penalty.Type BanType = Penalty.Type.Ban; var BanType = (Penalty.Type)Enum.Parse(typeof(Penalty.Type), Row["TYPE"].ToString());
if (Row["TYPE"].ToString().Length != 0) ClientPenalties.Add(new Penalty(BanType, Row["Reason"].ToString().Trim(), Row["npID"].ToString(), Row["bannedByID"].ToString(), DateTime.Parse(Row["TIME"].ToString()), Row["IP"].ToString(), DateTime.Parse(Row["EXPIRES"].ToString())));
BanType = (Penalty.Type)Enum.Parse(typeof(Penalty.Type), Row["TYPE"].ToString());
ClientPenalties.Add(new Penalty(BanType, Row["Reason"].ToString().Trim(), Row["npID"].ToString(), Row["bannedByID"].ToString(), DateTime.Parse(Row["TIME"].ToString()), Row["IP"].ToString()));
} }
return ClientPenalties; return ClientPenalties;
@ -542,7 +538,7 @@ namespace SharedLibrary
//Add specified ban to database //Add specified ban to database
public void AddBan(Penalty B) public void AddPenalty(Penalty B)
{ {
Dictionary<String, object> newBan = new Dictionary<String, object> Dictionary<String, object> newBan = new Dictionary<String, object>
{ {
@ -551,7 +547,8 @@ namespace SharedLibrary
{ "bannedByID", B.PenaltyOriginID }, { "bannedByID", B.PenaltyOriginID },
{ "IP", B.IP }, { "IP", B.IP },
{ "TIME", Utilities.DateTimeSQLite(DateTime.Now) }, { "TIME", Utilities.DateTimeSQLite(DateTime.Now) },
{ "TYPE", B.BType } { "TYPE", B.BType },
{ "EXPIRES", B.Expires }
}; };
Insert("BANS", newBan); Insert("BANS", newBan);
} }

4
SharedLibrary/Penalty.cs
View File

@ -5,12 +5,13 @@ namespace SharedLibrary
{ {
public class Penalty public class Penalty
{ {
public Penalty(Type BType, String Reas, String TargID, String From, DateTime time, String ip) public Penalty(Type BType, String Reas, String TargID, String From, DateTime time, String ip, DateTime exp)
{ {
Reason = Reas.CleanChars().StripColors(); Reason = Reas.CleanChars().StripColors();
OffenderID = TargID; OffenderID = TargID;
PenaltyOriginID = From; PenaltyOriginID = From;
When = time; When = time;
Expires = exp;
IP = ip; IP = ip;
this.BType = BType; this.BType = BType;
} }
@ -34,6 +35,7 @@ namespace SharedLibrary
public String OffenderID { get; private set; } public String OffenderID { get; private set; }
public String PenaltyOriginID { get; private set; } public String PenaltyOriginID { get; private set; }
public DateTime When { get; private set; } public DateTime When { get; private set; }
public DateTime Expires { get; private set; }
public String IP { get; private set; } public String IP { get; private set; }
public Type BType { get; private set; } public Type BType { get; private set; }
} }

4
SharedLibrary/Player.cs
View File

@ -154,9 +154,9 @@ namespace SharedLibrary
await lastEvent.Owner.Kick(Message, this, Sender); await lastEvent.Owner.Kick(Message, this, Sender);
} }
public async Task TempBan(String Message, Player Sender) public async Task TempBan(String Message, TimeSpan Length, Player Sender)
{ {
await lastEvent.Owner.TempBan(Message, this, Sender); await lastEvent.Owner.TempBan(Message, Length, this, Sender);
} }
public async Task Warn(String Message, Player Sender) public async Task Warn(String Message, Player Sender)

2
SharedLibrary/Server.cs
View File

@ -210,7 +210,7 @@ namespace SharedLibrary
/// </summary> /// </summary>
/// <param name="Reason">Reason for banning the player</param> /// <param name="Reason">Reason for banning the player</param>
/// <param name="Target">The player to ban</param> /// <param name="Target">The player to ban</param>
abstract public Task TempBan(String Reason, Player Target, Player Origin); abstract public Task TempBan(String Reason, TimeSpan length, Player Target, Player Origin);
/// <summary> /// <summary>
/// Perm ban a player from the server /// Perm ban a player from the server

1
SharedLibrary/SharedLibrary.csproj
View File

@ -25,6 +25,7 @@
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
<CodeAnalysisRuleSet>..\..\..\RuleSet1.ruleset</CodeAnalysisRuleSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>

57
SharedLibrary/Utilities.cs
View File

@ -229,23 +229,23 @@ namespace SharedLibrary
if (Elapsed.TotalMinutes < 120) if (Elapsed.TotalMinutes < 120)
{ {
if (Elapsed.TotalMinutes < 1.5) if (Elapsed.TotalMinutes < 1.5)
return "1 minute"; return "1 minute ago";
return Math.Round(Elapsed.TotalMinutes, 0) + " minutes"; return Math.Round(Elapsed.TotalMinutes, 0) + " minutes ago";
} }
if (Elapsed.TotalHours <= 24) if (Elapsed.TotalHours <= 24)
{ {
if (Elapsed.TotalHours < 1.5) if (Elapsed.TotalHours < 1.5)
return "1 hour"; return "1 hour ago";
return Math.Round(Elapsed.TotalHours, 0) + " hours"; return Math.Round(Elapsed.TotalHours, 0) + " hours ago";
} }
if (Elapsed.TotalDays <= 365) if (Elapsed.TotalDays <= 365)
{ {
if (Elapsed.TotalDays < 1.5) if (Elapsed.TotalDays < 1.5)
return "1 day"; return "1 day ago";
return Math.Round(Elapsed.TotalDays, 0) + " days"; return Math.Round(Elapsed.TotalDays, 0) + " days ago";
} }
else else
return "a very long time"; return "a very long time ago";
} }
public static Game GetGame(string gameName) public static Game GetGame(string gameName)
@ -263,5 +263,48 @@ namespace SharedLibrary
return Game.UKN; return Game.UKN;
} }
public static TimeSpan ParseTimespan(this string input)
{
var expressionMatch = Regex.Match(input, @"[0-9]+.\b");
if (!expressionMatch.Success) // fallback to default tempban length of 1 hour
return new TimeSpan(1, 0, 0);
char lengthDenote = expressionMatch.Value[expressionMatch.Value.Length - 1];
int length = Int32.Parse(expressionMatch.Value.Substring(0, expressionMatch.Value.Length - 1));
switch (lengthDenote)
{
case 'm':
return new TimeSpan(0, length, 0);
case 'h':
return new TimeSpan(length, 0, 0);
case 'd':
return new TimeSpan(length, 0, 0, 0);
case 'w':
return new TimeSpan(length * 7, 0, 0, 0);
case 'y':
return new TimeSpan(length * 365, 0, 0, 0);
default:
return new TimeSpan(1, 0, 0);
}
}
public static string TimeSpanText(this TimeSpan span)
{
if (span.TotalMinutes < 6)
return $"{span.Minutes} minutes";
else if (span.TotalHours < 24)
return $"{span.Hours} hours";
else if (span.TotalDays < 7)
return $"{span.Days} days";
else if (span.TotalDays > 7 && span.TotalDays < 365)
return $"{Math.Ceiling(span.Days / 7.0)} weeks";
else if (span.TotalDays >= 365)
return $"{Math.Ceiling(span.Days / 365.0)} years";
return "1 hour";
}
} }
} }