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

reworked some stats, redid the macro -> Tokens

Browse Source 
added reset stats commands
broadcast for some commands
This commit is contained in:
RaidMax
2017-05-31 00:31:56 -05:00
parent 354cec0951
commit 063449d9c4
17 changed files with 322 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
SharedLibrary/Commands/NativeCommands.cs
View File

@ -7,9 +7,9 @@ using System.Threading.Tasks;
namespace SharedLibrary.Commands
{
class Quit : Command
class CQuit : Command
{
public Quit(String N, String D, String U, Player.Permission P, int args, bool nT) : base(N, D, U, P, args, nT) { }
public CQuit(String N, String D, String U, Player.Permission P, int args, bool nT) : base(N, D, U, P, args, nT) { }
public override async Task ExecuteAsync(Event E)
{
@ -36,9 +36,9 @@ namespace SharedLibrary.Commands
}
}
class Warn : Command
class Cwarn : Command
{
public Warn(String N, String D, String U, Player.Permission P, int args, bool nT) : base(N, D, U, P, args, nT) { }
public Cwarn(String N, String D, String U, Player.Permission P, int args, bool nT) : base(N, D, U, P, args, nT) { }
public override async Task ExecuteAsync(Event E)
{
@ -50,9 +50,9 @@ namespace SharedLibrary.Commands
}
}
class WarnClear : Command
class CWarnClear : Command
{
public WarnClear(String N, String D, String U, Player.Permission P, int args, bool nT) : base(N, D, U, P, args, nT) { }
public CWarnClear(String N, String D, String U, Player.Permission P, int args, bool nT) : base(N, D, U, P, args, nT) { }
public override async Task ExecuteAsync(Event E)
{
@ -63,9 +63,9 @@ namespace SharedLibrary.Commands
}
}
class Kick : Command
class CKick : Command
{
public Kick(String N, String D, String U, Player.Permission P, int args, bool nT) : base(N, D, U, P, args, nT) { }
public CKick(String N, String D, String U, Player.Permission P, int args, bool nT) : base(N, D, U, P, args, nT) { }
public override async Task ExecuteAsync(Event E)
{
@ -77,9 +77,9 @@ namespace SharedLibrary.Commands
}
}
class Say : Command
class CSay : Command
{
public Say(String N, String D, String U, Player.Permission P, int args, bool nT) : base(N, D, U, P, args, nT) { }
public CSay(String N, String D, String U, Player.Permission P, int args, bool nT) : base(N, D, U, P, args, nT) { }
public override async Task ExecuteAsync(Event E)
{
@ -87,16 +87,19 @@ namespace SharedLibrary.Commands
}
}
class TempBan : Command
class CTempBan : Command
{
public TempBan(String N, String D, String U, Player.Permission P, int args, bool nT) : base(N, D, U, P, args, nT) { }
public CTempBan(String N, String D, String U, Player.Permission P, int args, bool nT) : base(N, D, U, P, args, nT) { }
public override async Task ExecuteAsync(Event E)
{
E.Target.lastOffense = SharedLibrary.Utilities.RemoveWords(E.Data, 1);
String Message = E.Target.lastOffense;
if (E.Origin.Level > E.Target.Level)
{
await E.Target.TempBan(Message, E.Origin);
await E.Origin.Tell($"Successfully temp banned {E.Target.Name}");
}
else
await E.Origin.Tell("You cannot temp ban " + E.Target.Name);
}
@ -118,7 +121,7 @@ namespace SharedLibrary.Commands
if (E.Origin.Level > E.Target.Level)
{
await E.Target.Ban(Message, E.Origin);
await E.Origin.Tell(String.Format("Sucessfully banned ^5{0} ^7({1})", E.Target.Name, E.Target.npID));
await E.Origin.Tell(String.Format("Sucessfully banned ^5{0} ^7({1})", E.Target.Name, E.Target.NetworkID));
}
else
await E.Origin.Tell("You cannot ban " + E.Target.Name);
@ -132,7 +135,7 @@ namespace SharedLibrary.Commands
public override async Task ExecuteAsync(Event E)
{
await E.Owner.Unban(E.Target);
await E.Origin.Tell($"Successfully unbanned {E.Target.Name}::{E.Target.npID}");
await E.Origin.Tell($"Successfully unbanned {E.Target.Name}::{E.Target.NetworkID}");
}
}
@ -142,7 +145,7 @@ namespace SharedLibrary.Commands
public override async Task ExecuteAsync(Event E)
{
String You = String.Format("{0} [^3#{1}^7] {2} [^3@{3}^7] [{4}^7] IP: {5}", E.Origin.Name, E.Origin.clientID, E.Origin.npID, E.Origin.databaseID, SharedLibrary.Utilities.levelToColor(E.Origin.Level), E.Origin.IP);
String You = String.Format("{0} [^3#{1}^7] {2} [^3@{3}^7] [{4}^7] IP: {5}", E.Origin.Name, E.Origin.ClientID, E.Origin.NetworkID, E.Origin.DatabaseID, SharedLibrary.Utilities.levelToColor(E.Origin.Level), E.Origin.IP);
await E.Origin.Tell(You);
}
}
@ -163,9 +166,9 @@ namespace SharedLibrary.Commands
continue;
if (P.Masked)
playerList.AppendFormat("[^3{0}^7]{3}[^3{1}^7] {2}", Utilities.levelToColor(Player.Permission.User), P.clientID, P.Name, SharedLibrary.Utilities.getSpaces(Player.Permission.SeniorAdmin.ToString().Length - Player.Permission.User.ToString().Length));
playerList.AppendFormat("[^3{0}^7]{3}[^3{1}^7] {2}", Utilities.levelToColor(Player.Permission.User), P.ClientID, P.Name, SharedLibrary.Utilities.getSpaces(Player.Permission.SeniorAdmin.ToString().Length - Player.Permission.User.ToString().Length));
else
playerList.AppendFormat("[^3{0}^7]{3}[^3{1}^7] {2}", Utilities.levelToColor(P.Level), P.clientID, P.Name, SharedLibrary.Utilities.getSpaces(Player.Permission.SeniorAdmin.ToString().Length - P.Level.ToString().Length));
playerList.AppendFormat("[^3{0}^7]{3}[^3{1}^7] {2}", Utilities.levelToColor(P.Level), P.ClientID, P.Name, SharedLibrary.Utilities.getSpaces(Player.Permission.SeniorAdmin.ToString().Length - P.Level.ToString().Length));
if (count == 2 || E.Owner.getPlayers().Count == 1)
{
@ -217,7 +220,10 @@ namespace SharedLibrary.Commands
helpResponse.Append(" [^3" + C.Name + "^7] ");
if (count >= 4)
{
await E.Origin.Tell(helpResponse.ToString());
if (E.Message[0] == '@')
await E.Owner.Broadcast(helpResponse.ToString());
else
await E.Origin.Tell(helpResponse.ToString());
helpResponse = new StringBuilder();
count = 0;
}
@ -288,7 +294,7 @@ namespace SharedLibrary.Commands
{
foreach (var player in server.getPlayers())
{
if (player != null && player.npID == E.Target.npID)
if (player != null && player.NetworkID == E.Target.NetworkID)
{
player.setLevel(newPerm);
await E.Target.Tell("Congratulations! You have been promoted to ^3" + newPerm);
@ -341,7 +347,12 @@ namespace SharedLibrary.Commands
{
var P = E.Owner.Players[i];
if (P != null && P.Level > Player.Permission.Flagged && !P.Masked)
await E.Origin.Tell(String.Format("[^3{0}^7] {1}", Utilities.levelToColor(P.Level), P.Name));
{
if (E.Message[0] == '@')
await E.Owner.Broadcast(String.Format("[^3{0}^7] {1}", Utilities.levelToColor(P.Level), P.Name));
else
await E.Origin.Tell(String.Format("[^3{0}^7] {1}", Utilities.levelToColor(P.Level), P.Name));
}
}
}
}
@ -386,7 +397,7 @@ namespace SharedLibrary.Commands
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, SharedLibrary.Utilities.levelToColor(P.Level), P.IP, P.getLastConnection());
String mesg = String.Format("[^3{0}^7] [^3@{1}^7] - [{2}^7] - {3} | last seen {4} ago", P.Name, P.DatabaseID, SharedLibrary.Utilities.levelToColor(P.Level), P.IP, P.getLastConnection());
await E.Origin.Tell(mesg);
}
}
@ -431,7 +442,7 @@ namespace SharedLibrary.Commands
if (Current != null)
{
String mesg = String.Format("^1{0} ^7now goes by ^5{1}^7 [^3{2}^7]", lookingFor, Current.Name, Current.databaseID);
String mesg = String.Format("^1{0} ^7now goes by ^5{1}^7 [^3{2}^7]", lookingFor, Current.Name, Current.DatabaseID);
await E.Origin.Tell(mesg);
}
}
@ -445,11 +456,22 @@ namespace SharedLibrary.Commands
public override async Task ExecuteAsync(Event E)
{
if (E.Owner.rules.Count < 1)
await E.Origin.Tell("The server onwer has not set any rules.");
{
if (E.Message.IsBroadcastCommand())
await E.Owner.Broadcast("The server owner has not set any rules.");
else
await E.Origin.Tell("The server owner has not set any rules.");
}
else
{
foreach (String r in E.Owner.rules)
await E.Origin.Tell("- " + r);
{
if (E.Message.IsBroadcastCommand())
await E.Owner.Broadcast("- " + r);
else
await E.Origin.Tell("- " + r);
}
}
}
}
@ -479,9 +501,9 @@ namespace SharedLibrary.Commands
}
}
class Flag : Command
class CFlag : Command
{
public Flag(String N, String D, String U, Player.Permission P, int args, bool nT) : base(N, D, U, P, args, nT) { }
public CFlag(String N, String D, String U, Player.Permission P, int args, bool nT) : base(N, D, U, P, args, nT) { }
public override async Task ExecuteAsync(Event E)
{
@ -499,7 +521,9 @@ namespace SharedLibrary.Commands
else
{
E.Data = Utilities.RemoveWords(E.Data, 1);
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));
await E.Origin.Tell("You have ^5flagged ^7" + E.Target.Name);
}
@ -513,7 +537,7 @@ namespace SharedLibrary.Commands
public override async Task ExecuteAsync(Event E)
{
if (E.Owner.Reports.Find(x => (x.Origin == E.Origin && x.Target.npID == E.Target.npID)) != null)
if (E.Owner.Reports.Find(x => (x.Origin == E.Origin && x.Target.NetworkID == E.Target.NetworkID)) != null)
{
await E.Origin.Tell("You have already reported this player");
return;
@ -606,7 +630,7 @@ namespace SharedLibrary.Commands
return;
}
Player Banner = E.Owner.Manager.GetClientDatabase().GetPlayer(BannedPenalty.bannedByID, -1);
Player Banner = E.Owner.Manager.GetClientDatabase().GetPlayer(BannedPenalty.PenaltyOriginID, -1);
if (Banner == null)
{
@ -624,7 +648,7 @@ namespace SharedLibrary.Commands
public override async Task ExecuteAsync(Event E)
{
E.Target.Alias = E.Owner.Manager.GetAliasesDatabase().GetPlayerAliases(E.Target.databaseID);
E.Target.Alias = E.Owner.Manager.GetAliasesDatabase().GetPlayerAliases(E.Target.DatabaseID);
if (E.Target.Alias == null)
{
@ -675,7 +699,7 @@ namespace SharedLibrary.Commands
public override async Task ExecuteAsync(Event E)
{
await E.Origin.currentServer.ExecuteCommandAsync(E.Data.Trim());
await E.Owner.ExecuteCommandAsync(E.Data.Trim());
await E.Origin.Tell("Successfuly sent RCON command!");
}
}

12
SharedLibrary/Database.cs
View File

@ -440,7 +440,7 @@ namespace SharedLibrary
public List<Penalty> GetClientPenalties(Player P)
{
List<Penalty> ClientPenalties = new List<Penalty>();
String Query = $"SELECT * FROM `BANS` WHERE `npID` = '{P.npID}' OR `IP` = '{P.IP}'";
String Query = $"SELECT * FROM `BANS` WHERE `npID` = '{P.NetworkID}' OR `IP` = '{P.IP}'";
DataTable Result = GetDataTable(Query);
foreach (DataRow Row in Result.Rows)
@ -509,7 +509,7 @@ namespace SharedLibrary
Dictionary<String, object> newPlayer = new Dictionary<String, object>
{
{ "Name", Utilities.removeNastyChars(P.Name) },
{ "npID", P.npID },
{ "npID", P.NetworkID },
{ "Level", (int)P.Level },
{ "LastOffense", "" },
{ "Connections", 1 },
@ -527,7 +527,7 @@ namespace SharedLibrary
Dictionary<String, Object> updatedPlayer = new Dictionary<String, Object>
{
{ "Name", P.Name },
{ "npID", P.npID },
{ "npID", P.NetworkID },
{ "Level", (int)P.Level },
{ "LastOffense", P.lastOffense },
{ "Connections", P.Connections },
@ -536,7 +536,7 @@ namespace SharedLibrary
{ "UID", P.UID },
{ "Masked", Convert.ToInt32(P.Masked) }
};
Update("CLIENTS", updatedPlayer, new KeyValuePair<string, object>("npID", P.npID));
Update("CLIENTS", updatedPlayer, new KeyValuePair<string, object>("npID", P.NetworkID));
}
@ -546,8 +546,8 @@ namespace SharedLibrary
Dictionary<String, object> newBan = new Dictionary<String, object>
{
{ "Reason", Utilities.removeNastyChars(B.Reason) },
{ "npID", B.npID },
{ "bannedByID", B.bannedByID },
{ "npID", B.OffenderID },
{ "bannedByID", B.PenaltyOriginID },
{ "IP", B.IP },
{ "TIME", Utilities.DateTimeSQLite(DateTime.Now) },
{ "TYPE", B.BType }

3
SharedLibrary/Event.cs
View File

@ -125,7 +125,7 @@ namespace SharedLibrary
{
Regex rgx = new Regex("[^a-zA-Z0-9 -! -_]");
string message = rgx.Replace(line[4], "");
return new Event(GType.Say, Utilities.removeNastyChars(message), SV.clientFromEventLine(line, 2), null, SV);
return new Event(GType.Say, Utilities.removeNastyChars(message), SV.clientFromEventLine(line, 2), null, SV) { Message = Utilities.removeNastyChars(message) };
}
if (eventType == ":")
@ -149,6 +149,7 @@ namespace SharedLibrary
public GType Type;
public string Data; // Data is usually the message sent by player
public string Message;
public Player Origin;
public Player Target;
public Server Owner;

1
SharedLibrary/Interfaces/IManager.cs
View File

@ -17,5 +17,6 @@ namespace SharedLibrary.Interfaces
IPenaltyList GetClientPenalties();
ClientsDB GetClientDatabase();
AliasesDB GetAliasesDatabase();
IList<MessageToken> GetMessageTokens();
}
}

24
SharedLibrary/MessageToken.cs Normal file
View File

@ -0,0 +1,24 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SharedLibrary
{
public class MessageToken
{
public string Name { get; private set; }
Func<string> Value;
public MessageToken(string Name, Func<string> Value)
{
this.Name = Name;
this.Value = Value;
}
public override string ToString()
{
return Value().ToString();
}
}
}

10
SharedLibrary/Penalty.cs
View File

@ -10,8 +10,8 @@ namespace SharedLibrary
public Penalty(Type BType, String Reas, String TargID, String From, DateTime time, String ip)
{
Reason = Reas.Replace("!","");
npID = TargID;
bannedByID = From;
OffenderID = TargID;
PenaltyOriginID = From;
When = time;
IP = ip;
this.BType = BType;
@ -24,15 +24,17 @@ namespace SharedLibrary
public enum Type
{
Report,
Warning,
Flag,
Kick,
TempBan,
Ban
}
public String Reason { get; private set; }
public String npID { get; private set; }
public String bannedByID { get; private set; }
public String OffenderID { get; private set; }
public String PenaltyOriginID { get; private set; }
public DateTime When { get; private set; }
public String IP { get; private set; }
public Type BType { get; private set; }

46
SharedLibrary/Player.cs
View File

@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Linq;
using System.Threading.Tasks;
@ -38,7 +37,7 @@ namespace SharedLibrary
public override bool Equals(object obj)
{
return ((Player)obj).npID == this.npID;
return ((Player)obj).NetworkID == NetworkID;
}
public override int GetHashCode()
@ -49,8 +48,8 @@ namespace SharedLibrary
public Player(string n, string id, int num, int l)
{
Name = n;
npID = id;
clientID = num;
NetworkID = id;
ClientID = num;
Level = (Player.Permission)l;
lastOffense = String.Empty;
Connections = 0;
@ -64,8 +63,8 @@ namespace SharedLibrary
public Player(string n, string id, int num, String I)
{
Name = n;
npID = id;
clientID = num;
NetworkID = id;
ClientID = num;
IP = I;
LastConnection = DateTime.Now;
}
@ -73,20 +72,20 @@ namespace SharedLibrary
public Player(String n, String id, Player.Permission P, String I, String UID)
{
Name = n;
npID = id;
NetworkID = id;
Level = P;
IP = I;
clientID = -1;
ClientID = -1;
this.UID = UID;
}
public Player(string n, string id, int num, Player.Permission l, int cind, String lo, int con, String IP2)
{
Name = n;
npID = id;
clientID = num;
NetworkID = id;
ClientID = num;
Level = l;
databaseID = cind;
DatabaseID = cind;
if (lo == null)
lastOffense = String.Empty;
else
@ -101,10 +100,10 @@ namespace SharedLibrary
public Player(string n, string id, int num, Player.Permission l, int cind, String lo, int con, String IP2, DateTime LC, string UID, bool masked)
{
Name = n;
npID = id;
clientID = num;
NetworkID = id;
ClientID = num;
Level = l;
databaseID = cind;
DatabaseID = cind;
if (lo == null)
lastOffense = String.Empty;
else
@ -118,12 +117,9 @@ namespace SharedLibrary
Masked = masked;
}
public bool registerUID(String UID)
public override string ToString()
{
if (UID.Length > 5)
this.UID = UID;
return this.UID == UID;
return $"{Name}::{NetworkID}";
}
public String getLastConnection()
@ -142,7 +138,7 @@ namespace SharedLibrary
IP = I;
}
public void setLevel(Player.Permission Perm)
public void setLevel(Permission Perm)
{
Level = Perm;
}
@ -173,16 +169,14 @@ namespace SharedLibrary
}
public String Name { get; private set; }
public string npID { get; private set; }
public int clientID { get; private set; }
public Player.Permission Level { get; private set; }
public int databaseID { get; private set; }
public string NetworkID { get; private set; }
public int ClientID { get; private set; }
public Permission Level { get; private set; }
public int DatabaseID { get; private set; }
public int Connections { get; set; }
public String IP { get; private set; }
public String UID { get; private set; }
public DateTime LastConnection { get; private set; }
public Server currentServer { get; private set; }
public int Ping;
public Event lastEvent;

32
SharedLibrary/Server.cs
View File

@ -25,9 +25,7 @@ namespace SharedLibrary
Players = new List<Player>(new Player[18]);
events = new Queue<Event>();
Macros = new Dictionary<String, Object>();
Reports = new List<Report>();
statusPlayers = new Dictionary<string, Player>();
playerHistory = new Queue<PlayerHistory>();
chatHistory = new List<Chat>();
lastWebChat = DateTime.Now;
@ -44,10 +42,10 @@ namespace SharedLibrary
if (owner == null)
commands.Add(new Owner("owner", "claim ownership of the server", "owner", Player.Permission.User, 0, false));
commands.Add(new Quit("quit", "quit IW4MAdmin", "q", Player.Permission.Owner, 0, false));
commands.Add(new Kick("kick", "kick a player by name. syntax: !kick <player> <reason>.", "k", Player.Permission.Trusted, 2, true));
commands.Add(new Say("say", "broadcast message to all players. syntax: !say <message>.", "s", Player.Permission.Moderator, 1, false));
commands.Add(new TempBan("tempban", "temporarily ban a player for 1 hour. syntax: !tempban <player> <reason>.", "tb", Player.Permission.Moderator, 2, true));
commands.Add(new CQuit("quit", "quit IW4MAdmin", "q", Player.Permission.Owner, 0, false));
commands.Add(new CKick("kick", "kick a player by name. syntax: !kick <player> <reason>.", "k", Player.Permission.Trusted, 2, true));
commands.Add(new CSay("say", "broadcast message to all players. syntax: !say <message>.", "s", Player.Permission.Moderator, 1, false));
commands.Add(new CTempBan("tempban", "temporarily ban a player for 1 hour. syntax: !tempban <player> <reason>.", "tb", Player.Permission.Moderator, 2, true));
commands.Add(new CBan("ban", "permanently ban a player from the server. syntax: !ban <player> <reason>", "b", Player.Permission.SeniorAdmin, 2, true));
commands.Add(new CWhoAmI("whoami", "give information about yourself. syntax: !whoami.", "who", Player.Permission.User, 0, false));
commands.Add(new CList("list", "list active clients syntax: !list.", "l", Player.Permission.Moderator, 0, false));
@ -57,15 +55,15 @@ namespace SharedLibrary
commands.Add(new CSetLevel("setlevel", "set player to specified administration level. syntax: !setlevel <player> <level>.", "sl", Player.Permission.Owner, 2, true));
commands.Add(new CUsage("usage", "get current application memory usage. syntax: !usage.", "us", Player.Permission.Moderator, 0, false));
commands.Add(new CUptime("uptime", "get current application running time. syntax: !uptime.", "up", Player.Permission.Moderator, 0, false));
commands.Add(new Warn("warn", "warn player for infringing rules syntax: !warn <player> <reason>.", "w", Player.Permission.Trusted, 2, true));
commands.Add(new WarnClear("warnclear", "remove all warning for a player syntax: !warnclear <player>.", "wc", Player.Permission.Trusted, 1, true));
commands.Add(new Cwarn("warn", "warn player for infringing rules syntax: !warn <player> <reason>.", "w", Player.Permission.Trusted, 2, true));
commands.Add(new CWarnClear("warnclear", "remove all warning for a player syntax: !warnclear <player>.", "wc", Player.Permission.Trusted, 1, true));
commands.Add(new CUnban("unban", "unban player by database id. syntax: !unban @<id>.", "ub", Player.Permission.SeniorAdmin, 1, true));
commands.Add(new CListAdmins("admins", "list currently connected admins. syntax: !admins.", "a", Player.Permission.User, 0, false));
commands.Add(new CLoadMap("map", "change to specified map. syntax: !map", "m", Player.Permission.Administrator, 1, false));
commands.Add(new CFindPlayer("find", "find player in database. syntax: !find <player>", "f", Player.Permission.SeniorAdmin, 1, false));
commands.Add(new CListRules("rules", "list server rules. syntax: !rules", "r", Player.Permission.User, 0, false));
commands.Add(new CPrivateMessage("privatemessage", "send message to other player. syntax: !pm <player> <message>", "pm", Player.Permission.User, 2, true));
commands.Add(new Flag("flag", "flag a suspicious player and announce to admins on join . syntax !flag <player>:", "flag", Player.Permission.Moderator, 1, true));
commands.Add(new CFlag("flag", "flag a suspicious player and announce to admins on join . syntax !flag <player> <reason>:", "flag", Player.Permission.Moderator, 2, true));
commands.Add(new CReport("report", "report a player for suspicious behaivor. syntax !report <player> <reason>", "rep", Player.Permission.User, 2, true));
commands.Add(new CListReports("reports", "get most recent reports. syntax !reports", "reports", Player.Permission.Moderator, 0, false));
commands.Add(new CMask("mask", "hide your online presence from online admin list. syntax: !mask", "mask", Player.Permission.Administrator, 0, false));
@ -234,10 +232,11 @@ namespace SharedLibrary
public async Task Tell(String Message, Player Target)
{
#if DEBUG
return;
if (!Target.lastEvent.Remote)
return;
#endif
if (Target.clientID > -1 && Message.Length > 0 && Target.Level != Player.Permission.Console && !Target.lastEvent.Remote)
await this.ExecuteCommandAsync($"tellraw {Target.clientID} {Message}^7");
if (Target.ClientID > -1 && Message.Length > 0 && Target.Level != Player.Permission.Console && !Target.lastEvent.Remote)
await this.ExecuteCommandAsync($"tellraw {Target.ClientID} {Message}^7");
if (Target.Level == Player.Permission.Console)
{
@ -456,24 +455,15 @@ namespace SharedLibrary
protected DateTime lastPoll;
protected int nextMessage;
protected Dictionary<String, Object> Macros;
protected DateTime lastWebChat;
public string Password { get; private set; }
public int Handle { get; private set; }
protected int PID;
protected IFile logFile;
// Will probably move this later
public Dictionary<String, Player> statusPlayers;
public bool isRunning;
// Log stuff
protected String Mod;
// Databases
//public ClientsDB clientDB;
//public AliasesDB aliasDB;
//Remote
public Queue<String> commandResult = new Queue<string>();
}

1
SharedLibrary/SharedLibrary.csproj
View File

@ -76,6 +76,7 @@
<Compile Include="Interfaces\IManager.cs" />
<Compile Include="Interfaces\IPenaltyList.cs" />
<Compile Include="Interfaces\ISerializable.cs" />
<Compile Include="MessageToken.cs" />
<Compile Include="Penalty.cs" />
<Compile Include="Command.cs" />
<Compile Include="Database.cs" />

22
SharedLibrary/Utilities.cs
View File

@ -2,6 +2,7 @@
using System.Threading;
using System.Text;
using System.Text.RegularExpressions;
using System.Linq;
using System.Collections.Generic;
namespace SharedLibrary
@ -120,27 +121,28 @@ namespace SharedLibrary
}
}
public static String LoadMacro(Dictionary<String, Object> Dict, String str)
public static String ProcessMessageToken(IList<MessageToken> tokens, String str)
{
MatchCollection Found = Regex.Matches(str, @"\{\{[A-Z]+\}\}", RegexOptions.IgnoreCase);
foreach (Match M in Found)
MatchCollection RegexMatches = Regex.Matches(str, @"\{\{[A-Z]+\}\}", RegexOptions.IgnoreCase);
foreach (Match M in RegexMatches)
{
String Match = M.Value;
String Identifier = M.Value.Substring(2, M.Length - 4);
Dict.TryGetValue(Identifier, out object foundVal);
String Replacement;
if (foundVal != null)
Replacement = foundVal.ToString();
else
Replacement = "";
var found = tokens.FirstOrDefault(t => t.Name.ToLower() == Identifier.ToLower());
str = str.Replace(Match, Replacement);
if (found != null)
str = str.Replace(Match, found.ToString());
}
return str;
}
public static bool IsBroadcastCommand(this string str)
{
return str[0] == '@';
}
/// <summary>
/// Get the full gametype name
/// </summary>