themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

BanManager now fully sql based

Browse source
This commit is contained in:
high 2011-07-01 17:08:42 -04:00
parent 6a960c2db9
commit f1c86a6216
2 changed files with 66 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

89
TShockAPI/BanManager.cs
View file

@ -27,14 +27,8 @@ namespace TShockAPI
{ {
public class BanManager public class BanManager
{ {
private DateTime LastLoad;
private IDbConnection database; private IDbConnection database;
/// <summary>
/// IP - Name - Reason
/// </summary>
private List<Ban> Bans = new List<Ban>();
public BanManager(IDbConnection db) public BanManager(IDbConnection db)
{ {
database = db; database = db;
@ -49,19 +43,25 @@ namespace TShockAPI
public Ban GetBanByIp(string ip) public Ban GetBanByIp(string ip)
{ {
using (var com = database.CreateCommand()) try
{ {
com.CommandText = "SELECT * FROM Bans WHERE IP=@ip"; using (var com = database.CreateCommand())
AddParameter(com, "@ip", ip);
using (var reader = com.ExecuteReader())
{ {
if (reader.Read()) com.CommandText = "SELECT * FROM Bans WHERE IP=@ip";
return new Ban((string)reader["IP"], (string)reader["Name"], (string)reader["Reason"]); AddParameter(com, "@ip", ip);
using (var reader = com.ExecuteReader())
{
if (reader.Read())
return new Ban((string)reader["IP"], (string)reader["Name"], (string)reader["Reason"]);
}
} }
} }
catch (SqliteExecutionException ex)
{
}
return null; return null;
} }
IDbDataParameter AddParameter(IDbCommand command, string name, object data) static IDbDataParameter AddParameter(IDbCommand command, string name, object data)
{ {
var parm = command.CreateParameter(); var parm = command.CreateParameter();
parm.ParameterName = name; parm.ParameterName = name;
@ -73,37 +73,64 @@ namespace TShockAPI
public Ban GetBanByName(string name, bool casesensitive = true) public Ban GetBanByName(string name, bool casesensitive = true)
{ {
using (var com = database.CreateCommand()) try
{ {
var namecol = casesensitive ? "Name" : "UPPER(Name)"; using (var com = database.CreateCommand())
if (!casesensitive)
name = name.ToUpper();
com.CommandText = "SELECT *, COUNT(*) FROM Bans WHERE " + namecol + "=@name LIMIT 5";
AddParameter(com, "@name", name);
using (var reader = com.ExecuteReader())
{ {
if (reader.Read()) var namecol = casesensitive ? "Name" : "UPPER(Name)";
return new Ban((string)reader["IP"], (string)reader["Name"], (string)reader["Reason"]); if (!casesensitive)
name = name.ToUpper();
com.CommandText = "SELECT *, COUNT(*) FROM Bans WHERE " + namecol + "=@name LIMIT 5";
AddParameter(com, "@name", name);
using (var reader = com.ExecuteReader())
{
if (reader.Read())
return new Ban((string)reader["IP"], (string)reader["Name"], (string)reader["Reason"]);
}
} }
} }
catch (SqliteExecutionException ex)
{
}
return null; return null;
} }
public void AddBan(string ip, string name = "", string reason = "") public bool AddBan(string ip, string name = "", string reason = "")
{ {
using (var com = database.CreateCommand()) try
{ {
com.CommandText = "INSERT INTO Bans (IP, Name, Reason) VALUES (@ip, @name, @reason)"; using (var com = database.CreateCommand())
AddParameter(com, "@ip", ip); {
AddParameter(com, "@name", name); com.CommandText = "INSERT INTO Bans (IP, Name, Reason) VALUES (@ip, @name, @reason)";
AddParameter(com, "@reason", reason); AddParameter(com, "@ip", ip);
com.ExecuteNonQuery(); AddParameter(com, "@name", name);
AddParameter(com, "@reason", reason);
com.ExecuteNonQuery();
}
return true;
} }
catch (SqliteExecutionException ex)
{
}
return false;
} }
public void RemoveBan(Ban ban) public bool RemoveBan(string ip)
{ {
try
{
using (var com = database.CreateCommand())
{
com.CommandText = "DELETE FROM Bans WHERE IP=@ip";
AddParameter(com, "@ip", ip);
com.ExecuteNonQuery();
return true;
}
}
catch (SqliteExecutionException ex)
{
}
return false;
} }
} }

12
TShockAPI/Commands.cs
View file

@ -456,8 +456,10 @@ namespace TShockAPI
var ban = TShock.Bans.GetBanByName(plStr); var ban = TShock.Bans.GetBanByName(plStr);
if (ban != null) if (ban != null)
{ {
TShock.Bans.RemoveBan(ban); if (TShock.Bans.RemoveBan(ban.IP))
args.Player.SendMessage(string.Format("Unbanned {0} ({1})!", ban.Name, ban.IP), Color.Red); args.Player.SendMessage(string.Format("Unbanned {0} ({1})!", ban.Name, ban.IP), Color.Red);
else
args.Player.SendMessage(string.Format("Failed to Unbanned {0} ({1})!", ban.Name, ban.IP), Color.Red);
} }
else else
{ {
@ -482,8 +484,10 @@ namespace TShockAPI
var ban = TShock.Bans.GetBanByIp(plStr); var ban = TShock.Bans.GetBanByIp(plStr);
if (ban != null) if (ban != null)
{ {
TShock.Bans.RemoveBan(ban); if (TShock.Bans.RemoveBan(ban.IP))
args.Player.SendMessage(string.Format("Unbanned {0} ({1})!", ban.Name, ban.IP), Color.Red); args.Player.SendMessage(string.Format("Unbanned {0} ({1})!", ban.Name, ban.IP), Color.Red);
else
args.Player.SendMessage(string.Format("Failed to Unbanned {0} ({1})!", ban.Name, ban.IP), Color.Red);
} }
else else
{ {