From 83bebb5e259b22e966355dca7e30be6e1a965bbf Mon Sep 17 00:00:00 2001
From: AwesomeAim <30537683+AwesomeAim@users.noreply.github.com>
Date: Fri, 5 May 2023 10:30:28 -0700
Subject: [PATCH] give a more detailed ban message

---
 core/src/packet/packet_hi.cpp |  9 ++++++++-
 core/src/server.cpp           | 10 ++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/core/src/packet/packet_hi.cpp b/core/src/packet/packet_hi.cpp
index 565ddf8..b946ee1 100644
--- a/core/src/packet/packet_hi.cpp
+++ b/core/src/packet/packet_hi.cpp
@@ -35,7 +35,14 @@ void PacketHI::handlePacket(AreaData *area, AOClient &client) const
     emit client.getServer()->logConnectionAttempt(client.m_remote_ip.toString(), client.m_ipid, client.m_hwid);
     auto ban = client.getServer()->getDatabaseManager()->isHDIDBanned(client.m_hwid);
     if (ban.first) {
-        client.sendPacket("BD", {ban.second + "\nBan ID: " + QString::number(client.getServer()->getDatabaseManager()->getBanID(client.m_hwid))});
+        QString ban_duration;
+        if (!(ban.second.duration == -2)) {
+            ban_duration = QDateTime::fromSecsSinceEpoch(ban.second.time).addSecs(ban.second.duration).toString("MM/dd/yyyy, hh:mm");
+        }
+        else {
+            ban_duration = "The heat death of the universe.";
+        }
+        client.sendPacket("BD", {"Reason: " + ban.second.reason + "\nBan ID: " + QString::number(ban.second.id) + "\nUntil: " + ban_duration});
         client.m_socket->close();
         return;
     }
diff --git a/core/src/server.cpp b/core/src/server.cpp
index b84b282..ef86cda 100644
--- a/core/src/server.cpp
+++ b/core/src/server.cpp
@@ -194,8 +194,14 @@ void Server::clientConnected()
         is_at_multiclient_limit = true;
 
     if (is_banned) {
-        QString reason = ban.second;
-        AOPacket *ban_reason = PacketFactory::createPacket("BD", {reason});
+        QString ban_duration;
+        if (!(ban.second.duration == -2)) {
+            ban_duration = QDateTime::fromSecsSinceEpoch(ban.second.time).addSecs(ban.second.duration).toString("MM/dd/yyyy, hh:mm");
+        }
+        else {
+            ban_duration = "The heat death of the universe.";
+        }
+        AOPacket *ban_reason = PacketFactory::createPacket("BD", {"Reason: " + ban.second.reason + "\nBan ID: " + QString::number(ban.second.id) + "\nUntil: " + ban_duration});
         socket->write(ban_reason->toUtf8());
     }
     if (is_banned || is_at_multiclient_limit) {