Cleanup /inbox, make it show all messages in your inbox if you just do /inbox.

This commit is contained in:
UnknownShadow200 2016-06-23 18:01:58 +10:00
parent b40dd94d06
commit a890e91d74

View File

@ -1,27 +1,26 @@
/*
Copyright 2011 MCForge
Dual-licensed under the Educational Community License, Version 2.0 and
the GNU General Public License, Version 3 (the "Licenses"); you may
not use this file except in compliance with the Licenses. You may
obtain a copy of the Licenses at
http://www.opensource.org/licenses/ecl2.php
http://www.gnu.org/licenses/gpl-3.0.html
Unless required by applicable law or agreed to in writing,
software distributed under the Licenses are distributed on an "AS IS"
BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
or implied. See the Licenses for the specific language governing
permissions and limitations under the Licenses.
*/
Copyright 2011 MCForge
Dual-licensed under the Educational Community License, Version 2.0 and
the GNU General Public License, Version 3 (the "Licenses"); you may
not use this file except in compliance with the Licenses. You may
obtain a copy of the Licenses at
http://www.opensource.org/licenses/ecl2.php
http://www.gnu.org/licenses/gpl-3.0.html
Unless required by applicable law or agreed to in writing,
software distributed under the Licenses are distributed on an "AS IS"
BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
or implied. See the Licenses for the specific language governing
permissions and limitations under the Licenses.
*/
using System;
using System.Data;
using MCGalaxy.SQL;
namespace MCGalaxy.Commands
{
public sealed class CmdInbox : Command
{
namespace MCGalaxy.Commands {
public sealed class CmdInbox : Command {
public override string name { get { return "inbox"; } }
public override string shortcut { get { return ""; } }
public override string type { get { return CommandTypes.Chat; } }
@ -29,102 +28,84 @@ namespace MCGalaxy.Commands
public override LevelPermission defaultRank { get { return LevelPermission.Guest; } }
public CmdInbox() { }
public override void Use(Player p, string message)
{
try
{
public override void Use(Player p, string message) {
if (Player.IsSuper(p)) { MessageInGameOnly(p); }
string[] parts = message.ToLower().SplitSpaces(2);
//safe against SQL injections because no user input is given here
if (Server.useMySQL)
Database.executeQuery("CREATE TABLE if not exists `Inbox" + p.name + "` (PlayerFrom CHAR(20), TimeSent DATETIME, Contents VARCHAR(255));");
else
Database.executeQuery("CREATE TABLE if not exists `Inbox" + p.name + "` (PlayerFrom TEXT, TimeSent DATETIME, Contents TEXT);");
if (message == "") {
//safe against SQL injections because no user input is given here
if (Server.useMySQL) Database.executeQuery("CREATE TABLE if not exists `Inbox" + p.name + "` (PlayerFrom CHAR(20), TimeSent DATETIME, Contents VARCHAR(255));");
else Database.executeQuery("CREATE TABLE if not exists `Inbox" + p.name + "` (PlayerFrom TEXT, TimeSent DATETIME, Contents TEXT);");
if (message == "")
{
//safe against SQL injections because no user input is given here
DataTable Inbox = Database.fillData("SELECT * FROM `Inbox" + p.name + "` ORDER BY TimeSent");
if (Inbox.Rows.Count == 0) { Player.Message(p, "No messages found."); Inbox.Dispose(); return; }
for (int i = 0; i < Inbox.Rows.Count; ++i)
{
Player.Message(p, i + ": From &5" + Inbox.Rows[i]["PlayerFrom"]+ " %Sat &a" + Inbox.Rows[i]["TimeSent"]);
using (DataTable Inbox = Database.fillData("SELECT * FROM `Inbox" + p.name + "` ORDER BY TimeSent")) {
if (Inbox.Rows.Count == 0) { Player.Message(p, "No messages found."); return; }
int i = 0;
foreach (DataRow row in Inbox.Rows) {
Player.Message(p, "{0}: From &5{1} %Sat &a{2}:", i, row["PlayerFrom"], row["TimeSent"]); i++;
Player.Message(p, row["Contents"].ToString());
}
Inbox.Dispose();
}
else if (message.Split(' ')[0].ToLower() == "del" || message.Split(' ')[0].ToLower() == "delete")
{
int FoundRecord = -1;
if (message.Split(' ')[1].ToLower() != "all")
{
try
{
FoundRecord = int.Parse(message.Split(' ')[1]);
}
catch { Player.Message(p, "Incorrect number given."); return; }
if (FoundRecord < 0) { Player.Message(p, "Cannot delete records below 0"); return; }
}
//safe against SQL injections because no user input is given here
DataTable Inbox = Database.fillData("SELECT * FROM `Inbox" + p.name + "` ORDER BY TimeSent");
if (Inbox.Rows.Count - 1 < FoundRecord || Inbox.Rows.Count == 0)
{
Player.Message(p, "\"" + FoundRecord + "\" does not exist."); Inbox.Dispose(); return;
} else if (parts[0] == "del" || parts[0] == "delete") {
int num = -1;
if (parts.Length == 1) {
Player.Message(p, "You need to provide either \"all\" or a number."); return;
}
if (parts[1] != "all" && !int.TryParse(parts[1], out num)) {
Player.Message(p, "Incorrect number given."); return;
}
if (parts[1] != "all" && num < 0) {
Player.Message(p, "Message number must be greater than or equal to 0."); return;
}
//safe against SQL injections because no user input is given here
using (DataTable Inbox = Database.fillData("SELECT * FROM `Inbox" + p.name + "` ORDER BY TimeSent")) {
if (num != -1 && num >= Inbox.Rows.Count) {
Player.Message(p, "\"" + num + "\" does not exist."); return;
}
ParameterisedQuery query = ParameterisedQuery.Create();
string queryString;
//safe against SQL injections because no user input is given here
if (FoundRecord == -1)
if (num == -1) {
queryString = Server.useMySQL ? "TRUNCATE TABLE `Inbox" + p.name + "`" : "DELETE FROM `Inbox" + p.name + "`";
else {
query.AddParam("@From", Inbox.Rows[FoundRecord]["PlayerFrom"]);
query.AddParam("@Time", Convert.ToDateTime(Inbox.Rows[FoundRecord]["TimeSent"]).ToString("yyyy-MM-dd HH:mm:ss"));
} else {
DataRow row = Inbox.Rows[num];
query.AddParam("@From", row["PlayerFrom"]);
query.AddParam("@Time", Convert.ToDateTime(row["TimeSent"]).ToString("yyyy-MM-dd HH:mm:ss"));
queryString = "DELETE FROM `Inbox" + p.name + "` WHERE PlayerFrom=@FROM AND TimeSent=@Time";
}
Database.executeQuery(query, queryString);
if (FoundRecord == -1)
Player.Message(p, "Deleted all messages.");
else
Player.Message(p, "Deleted message.");
Inbox.Dispose();
if (num == -1) Player.Message(p, "Deleted all messages.");
else Player.Message(p, "Deleted message.");
}
else
{
int FoundRecord;
} else {
int num;
if (!int.TryParse(message, out num)) { Player.Message(p, "Incorrect number given."); return; }
if (num < 0) { Player.Message(p, "Message number must be greater than or equal to 0."); return; }
try
{
FoundRecord = int.Parse(message);
//safe against SQL injections because no user input is given here
using (DataTable Inbox = Database.fillData("SELECT * FROM `Inbox" + p.name + "` ORDER BY TimeSent")) {
if (num >= Inbox.Rows.Count) {
Player.Message(p, "Message number \"" + num + "\" does not exist."); Inbox.Dispose(); return;
}
catch { Player.Message(p, "Incorrect number given."); return; }
if (FoundRecord < 0) { Player.Message(p, "Cannot read records below 0"); return; }
//safe against SQL injections because no user input is given here
DataTable Inbox = Database.fillData("SELECT * FROM `Inbox" + p.name + "` ORDER BY TimeSent");
if (Inbox.Rows.Count - 1 < FoundRecord || Inbox.Rows.Count == 0)
{
Player.Message(p, "\"" + FoundRecord + "\" does not exist."); Inbox.Dispose(); return;
}
Player.Message(p, "Message from &5" + Inbox.Rows[FoundRecord]["PlayerFrom"] + " %Ssent at &a" + Inbox.Rows[FoundRecord]["TimeSent"] + ":");
Player.Message(p, Inbox.Rows[FoundRecord]["Contents"].ToString());
Inbox.Dispose();
DataRow row = Inbox.Rows[num];
Player.Message(p, "Message from &5{0} %Ssent at &a{1}:", row["PlayerFrom"], row["TimeSent"]);
Player.Message(p, row["Contents"].ToString());
}
}
catch
{
Player.Message(p, "Error accessing inbox. You may have no mail, try again.");
}
}
public override void Help(Player p)
{
Player.Message(p, "/inbox - Displays all your messages.");
Player.Message(p, "/inbox [num] - Displays the message at [num]");
Player.Message(p, "/inbox <del> [\"all\"/num] - Deletes the message at Num or All if \"all\" is given.");
public override void Help(Player p) {
Player.Message(p, "%T/inbox");
Player.Message(p, "%HDisplays all your messages.");
Player.Message(p, "%T/inbox [num]");
Player.Message(p, "%HDisplays the message at [num]");
Player.Message(p, "%T/inbox del [num/\"all\"]");
Player.Message(p, "%HDeletes the message at [num], deletes all messages if \"all\".");
}
}
}