Start moving migration stuff!

CMakeLists.txt

@@ -148,19 +148,16 @@ foreach (resource_file ${RESOURCE_FILES})
 endforeach()
 message(STATUS "Resource file integrity check complete")
 
-# if navmeshes directory does not exist, create it
-if (NOT EXISTS ${PROJECT_BINARY_DIR}/navmeshes)
-	file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/navmeshes)
-endif()
-
 # Copy navmesh data on first build and extract it
-configure_file(
-	${CMAKE_SOURCE_DIR}/resources/navmeshes.zip ${PROJECT_BINARY_DIR}/navmeshes.zip
-	COPYONLY
-)
+if (NOT EXISTS ${PROJECT_BINARY_DIR}/navmeshes/)
+	configure_file(
+		${CMAKE_SOURCE_DIR}/resources/navmeshes.zip ${PROJECT_BINARY_DIR}/navmeshes.zip
+		COPYONLY
+	)
 
-file(ARCHIVE_EXTRACT INPUT ${PROJECT_BINARY_DIR}/navmeshes.zip DESTINATION ${PROJECT_BINARY_DIR}/navmeshes)
-file(REMOVE ${PROJECT_BINARY_DIR}/navmeshes.zip)
+	file(ARCHIVE_EXTRACT INPUT ${PROJECT_BINARY_DIR}/navmeshes.zip)
+	file(REMOVE ${PROJECT_BINARY_DIR}/navmeshes.zip)
+endif()
 
 # Copy vanity files on first build
 set(VANITY_FILES "CREDITS.md" "INFO.md" "TESTAMENT.md" "NPC.xml")
@@ -214,12 +211,7 @@ set(INCLUDED_DIRECTORIES
 	"dNavigation/dTerrain"
 	"dZoneManager"
 	"dDatabase"
-	"dDatabase/CDClientDatabase"
-	"dDatabase/CDClientDatabase/CDClientTables"
-	"dDatabase/GameDatabase"
-	"dDatabase/GameDatabase/ITables"
-	"dDatabase/GameDatabase/MySQL"
-	"dDatabase/GameDatabase/MySQL/Tables"
+	"dDatabase/Tables"
 	"dNet"
 	"dScripts"
 	"dScripts/02_server"
@@ -334,9 +326,8 @@ add_subdirectory(thirdparty)
 file(
 	GLOB HEADERS_DDATABASE
 	LIST_DIRECTORIES false
-	${PROJECT_SOURCE_DIR}/dDatabase/CDClientDatabase/*.h
-	${PROJECT_SOURCE_DIR}/dDatabase/CDClientDatabase/CDClientTables/*.h
-	${PROJECT_SOURCE_DIR}/dDatabase/GameDatabase/ITables/*.h
+	${PROJECT_SOURCE_DIR}/dDatabase/*.h
+	${PROJECT_SOURCE_DIR}/dDatabase/Tables/*.h
 	${PROJECT_SOURCE_DIR}/thirdparty/SQLite/*.h
 )
 

README.md

@@ -224,44 +224,6 @@ sudo setcap 'cap_net_bind_service=+ep' AuthServer
 ```
 and then go to `build/masterconfig.ini` and change `use_sudo_auth` to 0.
 
-### Linux Service
-If you are running this on a linux based system, it will use your terminal to run the program interactively, preventing you using it for other tasks and requiring it to be open to run the server.  
-_Note: You could use screen or tmux instead for virtual terminals_  
-To run the server non-interactively, we can use a systemctl service by copying the following file:  
-```shell
-cp ./systemd.example /etc/systemd/system/darkflame.service
-```  
-
-Make sure to edit the file in `/etc/systemd/system/darkflame.service` and change the:  
-- `User` and `Group` to the user that runs the darkflame server.  
-- `ExecPath` to the full file path of the server executable.  
-
-To register, enable and start the service use the following commands:
-
-- Reload the systemd manager configuration to make it aware of the new service file:
-```shell
-systemctl daemon-reload
-```
-- Start the service:
-```shell
-systemctl start darkflame.service
-```
-- Enable OR disable the service to start on boot using:
-```shell
-systemctl enable darkflame.service
-systemctl disable darkflame.service
-```
-- Verify that the service is running without errors:
-```shell
-systemctl status darkflame.service
-```
-- You can also restart, stop, or check the logs of the service using journalctl
-```shell
-systemctl restart darkflame.service
-systemctl stop darkflame.service
-journalctl -xeu darkflame.service
-```
-
 ### First admin user
 Run `MasterServer -a` to get prompted to create an admin account. This method is only intended for the system administrator as a means to get started, do NOT use this method to create accounts for other users!
 
@@ -323,7 +285,6 @@ Below are known good SHA256 checksums of the client:
 * `0d862f71eedcadc4494c4358261669721b40b2131101cbd6ef476c5a6ec6775b` (unpacked client, includes extra locales, rar compressed)
 
 If the returned hash matches one of the lines above then you can continue with setting up the server. If you are using a fully downloaded and complete client from live, then it will work, but the hash above may not match. Otherwise you must obtain a full install of LEGO® Universe 1.10.64.
-You must also make absolutely sure your LEGO Universe client is not in a Windows OneDrive. DLU is not and will not support a client being stored in a OneDrive, so ensure you have moved the client outside of that location.
 
 ### Darkflame Universe Client
 Darkflame Universe clients identify themselves using a higher version number than the regular live clients out there.

dAuthServer/AuthServer.cpp

@@ -7,7 +7,7 @@
 //DLU Includes:
 #include "dCommonVars.h"
 #include "dServer.h"
-#include "Logger.h"
+#include "dLogger.h"
 #include "Database.h"
 #include "dConfig.h"
 #include "Diagnostics.h"
@@ -25,14 +25,14 @@
 
 #include "Game.h"
 namespace Game {
-	Logger* logger = nullptr;
+	dLogger* logger = nullptr;
 	dServer* server = nullptr;
 	dConfig* config = nullptr;
 	bool shouldShutdown = false;
 	std::mt19937 randomEngine;
 }
 
-Logger* SetupLogger();
+dLogger* SetupLogger();
 void HandlePacket(Packet* packet);
 
 int main(int argc, char** argv) {
@@ -51,29 +51,14 @@ int main(int argc, char** argv) {
 	Game::logger->SetLogToConsole(Game::config->GetValue("log_to_console") != "0");
 	Game::logger->SetLogDebugStatements(Game::config->GetValue("log_debug_statements") == "1");
 
-	LOG("Starting Auth server...");
-	LOG("Version: %i.%i", PROJECT_VERSION_MAJOR, PROJECT_VERSION_MINOR);
-	LOG("Compiled on: %s", __TIMESTAMP__);
+	Game::logger->Log("AuthServer", "Starting Auth server...");
+	Game::logger->Log("AuthServer", "Version: %i.%i", PROJECT_VERSION_MAJOR, PROJECT_VERSION_MINOR);
+	Game::logger->Log("AuthServer", "Compiled on: %s", __TIMESTAMP__);
 
-	try {
-		Database::Connect();
-	} catch (sql::SQLException& ex) {
-		LOG("Got an error while connecting to the database: %s", ex.what());
-		Database::Destroy("AuthServer");
-		delete Game::server;
-		delete Game::logger;
-		return EXIT_FAILURE;
-	}
+	Database::Connect(Game::config);
 
-	//Find out the master's IP:
-	std::string masterIP;
-	uint32_t masterPort = 1500;
-
-	auto masterInfo = Database::Get()->GetMasterInfo();
-	if (masterInfo) {
-		masterIP = masterInfo->ip;
-		masterPort = masterInfo->port;
-	}
+	// Get Master server IP and port
+	SocketDescriptor masterSock = Database::Connection->GetMasterServerIP();
 
 	Game::randomEngine = std::mt19937(time(0));
 
@@ -83,7 +68,7 @@ int main(int argc, char** argv) {
 	if (Game::config->GetValue("max_clients") != "") maxClients = std::stoi(Game::config->GetValue("max_clients"));
 	if (Game::config->GetValue("port") != "") ourPort = std::atoi(Game::config->GetValue("port").c_str());
 
-	Game::server = new dServer(Game::config->GetValue("external_ip"), ourPort, 0, maxClients, false, true, Game::logger, masterIP, masterPort, ServerType::Auth, Game::config, &Game::shouldShutdown);
+	Game::server = new dServer(Game::config->GetValue("external_ip"), ourPort, 0, maxClients, false, true, Game::logger, masterSock.hostAddress, masterSock.port, ServerType::Auth, Game::config, &Game::shouldShutdown);
 
 	//Run it until server gets a kill message from Master:
 	auto t = std::chrono::high_resolution_clock::now();
@@ -122,14 +107,7 @@ int main(int argc, char** argv) {
 
 		//Every 10 min we ping our sql server to keep it alive hopefully:
 		if (framesSinceLastSQLPing >= sqlPingTime) {
-			//Find out the master's IP for absolutely no reason:
-			std::string masterIP;
-			uint32_t masterPort;
-			auto masterInfo = Database::Get()->GetMasterInfo();
-			if (masterInfo) {
-				masterIP = masterInfo->ip;
-				masterPort = masterInfo->port;
-			}
+			Database::Connection->GetMasterServerIP();
 
 			framesSinceLastSQLPing = 0;
 		} else framesSinceLastSQLPing++;
@@ -138,9 +116,7 @@ int main(int argc, char** argv) {
 		t += std::chrono::milliseconds(authFrameDelta); //Auth can run at a lower "fps"
 		std::this_thread::sleep_until(t);
 	}
-
-	//Delete our objects here:
-	Database::Destroy("AuthServer");
+	
 	delete Game::server;
 	delete Game::logger;
 	delete Game::config;
@@ -148,7 +124,7 @@ int main(int argc, char** argv) {
 	return EXIT_SUCCESS;
 }
 
-Logger* SetupLogger() {
+dLogger* SetupLogger() {
 	std::string logPath = (BinaryPathFinder::GetBinaryDir() / ("logs/AuthServer_" + std::to_string(time(nullptr)) + ".log")).string();
 	bool logToConsole = false;
 	bool logDebugStatements = false;
@@ -157,7 +133,7 @@ Logger* SetupLogger() {
 	logDebugStatements = true;
 #endif
 
-	return new Logger(logPath, logToConsole, logDebugStatements);
+	return new dLogger(logPath, logToConsole, logDebugStatements);
 }
 
 void HandlePacket(Packet* packet) {

dChatFilter/dChatFilter.cpp

@@ -8,7 +8,7 @@
 #include <regex>
 
 #include "dCommonVars.h"
-#include "Logger.h"
+#include "dLogger.h"
 #include "dConfig.h"
 #include "Database.h"
 #include "Game.h"
@@ -31,10 +31,11 @@ dChatFilter::dChatFilter(const std::string& filepath, bool dontGenerateDCF) {
 		ReadWordlistDCF("blacklist.dcf", false);
 	}
 
-	//Read player names that are ok as well:
-	auto approvedNames = Database::Get()->GetApprovedCharacterNames();
-	for (auto& name : approvedNames) {
-		std::transform(name.begin(), name.end(), name.begin(), ::tolower); //Transform to lowercase
+	// Read player names that are ok as well:
+	auto names = Database::Connection->GetAllCharacterNames();
+
+	for (auto& name : names) {
+		std::transform(name.begin(), name.end(), name.begin(), ::tolower);
 		m_ApprovedWords.push_back(CalculateHash(name));
 	}
 }
@@ -140,7 +141,7 @@ std::vector<std::pair<uint8_t, uint8_t>> dChatFilter::IsSentenceOkay(const std::
 			listOfBadSegments.emplace_back(position, originalSegment.length());
 		}
 
-		position += originalSegment.length() + 1;
+		position += segment.length() + 1;
 	}
 
 	return listOfBadSegments;

dChatServer/ChatPacketHandler.cpp

@@ -7,7 +7,7 @@
 #include "Game.h"
 #include "dServer.h"
 #include "GeneralUtils.h"
-#include "Logger.h"
+#include "dLogger.h"
 #include "eAddFriendResponseCode.h"
 #include "eAddFriendResponseType.h"
 #include "RakString.h"
@@ -30,17 +30,32 @@ void ChatPacketHandler::HandleFriendlistRequest(Packet* packet) {
 	auto player = playerContainer.GetPlayerData(playerID);
 	if (!player) return;
 
-	auto friendsList = Database::Get()->GetFriendsList(playerID);
-	for (const auto& friendData : friendsList) {
+	//Get our friends list from the Db.  Using a derived table since the friend of a player can be in either column.
+	std::unique_ptr<sql::PreparedStatement> stmt(Database::CreatePreppedStmt(
+		"SELECT fr.requested_player, best_friend, ci.name FROM "
+		"(SELECT CASE "
+		"WHEN player_id = ? THEN friend_id "
+		"WHEN friend_id = ? THEN player_id "
+		"END AS requested_player, best_friend FROM friends) AS fr "
+		"JOIN charinfo AS ci ON ci.id = fr.requested_player "
+		"WHERE fr.requested_player IS NOT NULL AND fr.requested_player != ?;"));
+	stmt->setUInt(1, static_cast<uint32_t>(playerID));
+	stmt->setUInt(2, static_cast<uint32_t>(playerID));
+	stmt->setUInt(3, static_cast<uint32_t>(playerID));
+
+	std::vector<FriendData> friends;
+
+	std::unique_ptr<sql::ResultSet> res(stmt->executeQuery());
+	while (res->next()) {
 		FriendData fd;
 		fd.isFTP = false; // not a thing in DLU
-		fd.friendID = friendData.friendID;
+		fd.friendID = res->getUInt(1);
 		GeneralUtils::SetBit(fd.friendID, eObjectBits::PERSISTENT);
 		GeneralUtils::SetBit(fd.friendID, eObjectBits::CHARACTER);
 
-		fd.isBestFriend = friendData.isBestFriend; //0 = friends, 1 = left_requested, 2 = right_requested, 3 = both_accepted - are now bffs
+		fd.isBestFriend = res->getInt(2) == 3; //0 = friends, 1 = left_requested, 2 = right_requested, 3 = both_accepted - are now bffs
 		if (fd.isBestFriend) player->countOfBestFriends += 1;
-		fd.friendName = friendData.friendName;
+		fd.friendName = res->getString(3);
 
 		//Now check if they're online:
 		auto fr = playerContainer.GetPlayerData(fd.friendID);
@@ -56,7 +71,7 @@ void ChatPacketHandler::HandleFriendlistRequest(Packet* packet) {
 			fd.zoneID = LWOZONEID();
 		}
 
-		player->friends.push_back(fd);
+		friends.push_back(fd);
 	}
 
 	//Now, we need to send the friendlist to the server they came from:
@@ -68,17 +83,22 @@ void ChatPacketHandler::HandleFriendlistRequest(Packet* packet) {
 	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::GET_FRIENDS_LIST_RESPONSE);
 	bitStream.Write<uint8_t>(0);
 	bitStream.Write<uint16_t>(1); //Length of packet -- just writing one as it doesn't matter, client skips it.
-	bitStream.Write((uint16_t)player->friends.size());
+	bitStream.Write((uint16_t)friends.size());
 
-	for (auto& data : player->friends) {
+	for (auto& data : friends) {
 		data.Serialize(bitStream);
 	}
 
+	player->friends = friends;
+
 	SystemAddress sysAddr = player->sysAddr;
 	SEND_PACKET;
 }
 
 void ChatPacketHandler::HandleFriendRequest(Packet* packet) {
+	auto maxNumberOfBestFriendsAsString = Game::config->GetValue("max_number_of_best_friends");
+	// If this config option doesn't exist, default to 5 which is what live used.
+	auto maxNumberOfBestFriends = maxNumberOfBestFriendsAsString != "" ? std::stoi(maxNumberOfBestFriendsAsString) : 5U;
 	CINSTREAM_SKIP_HEADER;
 	LWOOBJID requestorPlayerID;
 	inStream.Read(requestorPlayerID);
@@ -98,11 +118,6 @@ void ChatPacketHandler::HandleFriendRequest(Packet* packet) {
 	inStream.Read(isBestFriendRequest);
 
 	auto requestor = playerContainer.GetPlayerData(requestorPlayerID);
-	if (!requestor) {
-		LOG("No requestor player %llu sent to %s found.", requestorPlayerID, playerName.c_str());
-		return;
-	}
-
 	if (requestor->playerName == playerName) {
 		SendFriendResponse(requestor, requestor, eAddFriendResponseType::MYTHRAN);
 		return;
@@ -135,26 +150,35 @@ void ChatPacketHandler::HandleFriendRequest(Packet* packet) {
 	// If at this point we dont have a target, then they arent online and we cant send the request.
 	// Send the response code that corresponds to what the error is.
 	if (!requestee) {
+		std::unique_ptr<sql::PreparedStatement> nameQuery(Database::CreatePreppedStmt("SELECT name from charinfo where name = ?;"));
+		nameQuery->setString(1, playerName);
+		std::unique_ptr<sql::ResultSet> result(nameQuery->executeQuery());
+
 		requestee.reset(new PlayerData());
 		requestee->playerName = playerName;
-		auto responseType = Database::Get()->GetCharacterInfo(playerName)
-			? eAddFriendResponseType::NOTONLINE
-			: eAddFriendResponseType::INVALIDCHARACTER;
 
-		SendFriendResponse(requestor, requestee.get(), responseType);
+		SendFriendResponse(requestor, requestee.get(), result->next() ? eAddFriendResponseType::NOTONLINE : eAddFriendResponseType::INVALIDCHARACTER);
 		return;
 	}
 
 	if (isBestFriendRequest) {
+		std::unique_ptr<sql::PreparedStatement> friendUpdate(Database::CreatePreppedStmt("SELECT * FROM friends WHERE (player_id = ? AND friend_id = ?) OR (player_id = ? AND friend_id = ?) LIMIT 1;"));
+		friendUpdate->setUInt(1, static_cast<uint32_t>(requestorPlayerID));
+		friendUpdate->setUInt(2, static_cast<uint32_t>(requestee->playerID));
+		friendUpdate->setUInt(3, static_cast<uint32_t>(requestee->playerID));
+		friendUpdate->setUInt(4, static_cast<uint32_t>(requestorPlayerID));
+		std::unique_ptr<sql::ResultSet> result(friendUpdate->executeQuery());
 
+		LWOOBJID queryPlayerID = LWOOBJID_EMPTY;
+		LWOOBJID queryFriendID = LWOOBJID_EMPTY;
 		uint8_t oldBestFriendStatus{};
 		uint8_t bestFriendStatus{};
-		auto bestFriendInfo = Database::Get()->GetBestFriendStatus(requestorPlayerID, requestee->playerID);
-		if (bestFriendInfo) {
+
+		if (result->next()) {
 			// Get the IDs
-			LWOOBJID queryPlayerID = bestFriendInfo->playerCharacterId;
-			LWOOBJID queryFriendID = bestFriendInfo->friendCharacterId;
-			oldBestFriendStatus = bestFriendInfo->bestFriendStatus;
+			queryPlayerID = result->getInt(1);
+			queryFriendID = result->getInt(2);
+			oldBestFriendStatus = result->getInt(3);
 			bestFriendStatus = oldBestFriendStatus;
 
 			// Set the bits
@@ -175,17 +199,22 @@ void ChatPacketHandler::HandleFriendRequest(Packet* packet) {
 
 		// Only do updates if there was a change in the bff status.
 		if (oldBestFriendStatus != bestFriendStatus) {
-			auto maxBestFriends = playerContainer.GetMaxNumberOfBestFriends();
-			if (requestee->countOfBestFriends >= maxBestFriends || requestor->countOfBestFriends >= maxBestFriends) {
-				if (requestee->countOfBestFriends >= maxBestFriends) {
+			if (requestee->countOfBestFriends >= maxNumberOfBestFriends || requestor->countOfBestFriends >= maxNumberOfBestFriends) {
+				if (requestee->countOfBestFriends >= maxNumberOfBestFriends) {
 					SendFriendResponse(requestor, requestee.get(), eAddFriendResponseType::THEIRFRIENDLISTFULL, false);
 				}
-				if (requestor->countOfBestFriends >= maxBestFriends) {
+				if (requestor->countOfBestFriends >= maxNumberOfBestFriends) {
 					SendFriendResponse(requestor, requestee.get(), eAddFriendResponseType::YOURFRIENDSLISTFULL, false);
 				}
 			} else {
 				// Then update the database with this new info.
-				Database::Get()->SetBestFriendStatus(requestorPlayerID, requestee->playerID, bestFriendStatus);
+				std::unique_ptr<sql::PreparedStatement> updateQuery(Database::CreatePreppedStmt("UPDATE friends SET best_friend = ? WHERE (player_id = ? AND friend_id = ?) OR (player_id = ? AND friend_id = ?) LIMIT 1;"));
+				updateQuery->setUInt(1, bestFriendStatus);
+				updateQuery->setUInt(2, static_cast<uint32_t>(requestorPlayerID));
+				updateQuery->setUInt(3, static_cast<uint32_t>(requestee->playerID));
+				updateQuery->setUInt(4, static_cast<uint32_t>(requestee->playerID));
+				updateQuery->setUInt(5, static_cast<uint32_t>(requestorPlayerID));
+				updateQuery->executeUpdate();
 				// Sent the best friend update here if the value is 3
 				if (bestFriendStatus == 3U) {
 					requestee->countOfBestFriends += 1;
@@ -208,15 +237,8 @@ void ChatPacketHandler::HandleFriendRequest(Packet* packet) {
 			if (requestor->sysAddr != UNASSIGNED_SYSTEM_ADDRESS) SendFriendResponse(requestor, requestee.get(), eAddFriendResponseType::WAITINGAPPROVAL, true, true);
 		}
 	} else {
-		auto maxFriends = playerContainer.GetMaxNumberOfFriends();
-		if (requestee->friends.size() >= maxFriends) {
-			SendFriendResponse(requestor, requestee.get(), eAddFriendResponseType::THEIRFRIENDLISTFULL, false);
-		} else if (requestor->friends.size() >= maxFriends) {
-			SendFriendResponse(requestor, requestee.get(), eAddFriendResponseType::YOURFRIENDSLISTFULL, false);
-		} else {
-			// Do not send this if we are requesting to be a best friend.
-			SendFriendRequest(requestee.get(), requestor);
-		}
+		// Do not send this if we are requesting to be a best friend.
+		SendFriendRequest(requestee.get(), requestor);
 	}
 
 	// If the player is actually a player and not a ghost one defined above, release it from being deleted.
@@ -287,7 +309,11 @@ void ChatPacketHandler::HandleFriendResponse(Packet* packet) {
 		requesteeData.isOnline = true;
 		requestor->friends.push_back(requesteeData);
 
-		Database::Get()->AddFriend(requestor->playerID, requestee->playerID);
+		std::unique_ptr<sql::PreparedStatement> statement(Database::CreatePreppedStmt("INSERT IGNORE INTO `friends` (`player_id`, `friend_id`, `best_friend`) VALUES (?,?,?);"));
+		statement->setUInt(1, static_cast<uint32_t>(requestor->playerID));
+		statement->setUInt(2, static_cast<uint32_t>(requestee->playerID));
+		statement->setInt(3, 0);
+		statement->execute();
 	}
 
 	if (serverResponseCode != eAddFriendResponseType::DECLINED) SendFriendResponse(requestor, requestee, serverResponseCode, isAlreadyBestFriends);
@@ -302,17 +328,25 @@ void ChatPacketHandler::HandleRemoveFriend(Packet* packet) {
 
 	//we'll have to query the db here to find the user, since you can delete them while they're offline.
 	//First, we need to find their ID:
+	std::unique_ptr<sql::PreparedStatement> stmt(Database::CreatePreppedStmt("SELECT id FROM charinfo WHERE name=? LIMIT 1;"));
+	stmt->setString(1, friendName.c_str());
+
 	LWOOBJID friendID = 0;
-	auto friendIdResult = Database::Get()->GetCharacterInfo(friendName);
-	if (friendIdResult) {
-		friendID = friendIdResult->id;
+	std::unique_ptr<sql::ResultSet> res(stmt->executeQuery());
+	while (res->next()) {
+		friendID = res->getUInt(1);
 	}
 
 	// Convert friendID to LWOOBJID
 	GeneralUtils::SetBit(friendID, eObjectBits::PERSISTENT);
 	GeneralUtils::SetBit(friendID, eObjectBits::CHARACTER);
 
-	Database::Get()->RemoveFriend(playerID, friendID);
+	std::unique_ptr<sql::PreparedStatement> deletestmt(Database::CreatePreppedStmt("DELETE FROM friends WHERE (player_id = ? AND friend_id = ?) OR (player_id = ? AND friend_id = ?) LIMIT 1;"));
+	deletestmt->setUInt(1, static_cast<uint32_t>(playerID));
+	deletestmt->setUInt(2, static_cast<uint32_t>(friendID));
+	deletestmt->setUInt(3, static_cast<uint32_t>(friendID));
+	deletestmt->setUInt(4, static_cast<uint32_t>(playerID));
+	deletestmt->execute();
 
 	//Now, we need to send an update to notify the sender (and possibly, receiver) that their friendship has been ended:
 	auto goonA = playerContainer.GetPlayerData(playerID);
@@ -363,7 +397,7 @@ void ChatPacketHandler::HandleChatMessage(Packet* packet) {
 
 	std::string message = PacketUtils::ReadString(0x66, packet, true, 512);
 
-	LOG("Got a message from (%s) [%d]: %s", senderName.c_str(), channel, message.c_str());
+	Game::logger->Log("ChatPacketHandler", "Got a message from (%s) [%d]: %s", senderName.c_str(), channel, message.c_str());
 
 	if (channel != 8) return;
 
@@ -493,13 +527,13 @@ void ChatPacketHandler::HandleTeamInvite(Packet* packet) {
 	if (team->memberIDs.size() > 3) {
 		// no more teams greater than 4
 
-		LOG("Someone tried to invite a 5th player to a team");
+		Game::logger->Log("ChatPacketHandler", "Someone tried to invite a 5th player to a team");
 		return;
 	}
 
 	SendTeamInvite(other, player);
 
-	LOG("Got team invite: %llu -> %s", playerID, invitedPlayer.c_str());
+	Game::logger->Log("ChatPacketHandler", "Got team invite: %llu -> %s", playerID, invitedPlayer.c_str());
 }
 
 void ChatPacketHandler::HandleTeamInviteResponse(Packet* packet) {
@@ -513,7 +547,7 @@ void ChatPacketHandler::HandleTeamInviteResponse(Packet* packet) {
 	LWOOBJID leaderID = LWOOBJID_EMPTY;
 	inStream.Read(leaderID);
 
-	LOG("Accepted invite: %llu -> %llu (%d)", playerID, leaderID, declined);
+	Game::logger->Log("ChatPacketHandler", "Accepted invite: %llu -> %llu (%d)", playerID, leaderID, declined);
 
 	if (declined) {
 		return;
@@ -522,13 +556,13 @@ void ChatPacketHandler::HandleTeamInviteResponse(Packet* packet) {
 	auto* team = playerContainer.GetTeam(leaderID);
 
 	if (team == nullptr) {
-		LOG("Failed to find team for leader (%llu)", leaderID);
+		Game::logger->Log("ChatPacketHandler", "Failed to find team for leader (%llu)", leaderID);
 
 		team = playerContainer.GetTeam(playerID);
 	}
 
 	if (team == nullptr) {
-		LOG("Failed to find team for player (%llu)", playerID);
+		Game::logger->Log("ChatPacketHandler", "Failed to find team for player (%llu)", playerID);
 		return;
 	}
 
@@ -544,7 +578,7 @@ void ChatPacketHandler::HandleTeamLeave(Packet* packet) {
 
 	auto* team = playerContainer.GetTeam(playerID);
 
-	LOG("(%llu) leaving team", playerID);
+	Game::logger->Log("ChatPacketHandler", "(%llu) leaving team", playerID);
 
 	if (team != nullptr) {
 		playerContainer.RemoveMember(team, playerID, false, false, true);
@@ -558,7 +592,7 @@ void ChatPacketHandler::HandleTeamKick(Packet* packet) {
 
 	std::string kickedPlayer = PacketUtils::ReadString(0x14, packet, true);
 
-	LOG("(%llu) kicking (%s) from team", playerID, kickedPlayer.c_str());
+	Game::logger->Log("ChatPacketHandler", "(%llu) kicking (%s) from team", playerID, kickedPlayer.c_str());
 
 	auto* kicked = playerContainer.GetPlayerData(kickedPlayer);
 
@@ -588,7 +622,7 @@ void ChatPacketHandler::HandleTeamPromote(Packet* packet) {
 
 	std::string promotedPlayer = PacketUtils::ReadString(0x14, packet, true);
 
-	LOG("(%llu) promoting (%s) to team leader", playerID, promotedPlayer.c_str());
+	Game::logger->Log("ChatPacketHandler", "(%llu) promoting (%s) to team leader", playerID, promotedPlayer.c_str());
 
 	auto* promoted = playerContainer.GetPlayerData(promotedPlayer);
 

dChatServer/ChatServer.cpp

@@ -6,7 +6,7 @@
 //DLU Includes:
 #include "dCommonVars.h"
 #include "dServer.h"
-#include "Logger.h"
+#include "dLogger.h"
 #include "Database.h"
 #include "dConfig.h"
 #include "dChatFilter.h"
@@ -27,7 +27,7 @@
 #include <MessageIdentifiers.h>
 
 namespace Game {
-	Logger* logger = nullptr;
+	dLogger* logger = nullptr;
 	dServer* server = nullptr;
 	dConfig* config = nullptr;
 	dChatFilter* chatFilter = nullptr;
@@ -37,7 +37,7 @@ namespace Game {
 }
 
 
-Logger* SetupLogger();
+dLogger* SetupLogger();
 void HandlePacket(Packet* packet);
 
 PlayerContainer playerContainer;
@@ -58,9 +58,9 @@ int main(int argc, char** argv) {
 	Game::logger->SetLogToConsole(Game::config->GetValue("log_to_console") != "0");
 	Game::logger->SetLogDebugStatements(Game::config->GetValue("log_debug_statements") == "1");
 
-	LOG("Starting Chat server...");
-	LOG("Version: %i.%i", PROJECT_VERSION_MAJOR, PROJECT_VERSION_MINOR);
-	LOG("Compiled on: %s", __TIMESTAMP__);
+	Game::logger->Log("ChatServer", "Starting Chat server...");
+	Game::logger->Log("ChatServer", "Version: %i.%i", PROJECT_VERSION_MAJOR, PROJECT_VERSION_MINOR);
+	Game::logger->Log("ChatServer", "Compiled on: %s", __TIMESTAMP__);
 
 	try {
 		std::string clientPathStr = Game::config->GetValue("client_location");
@@ -72,44 +72,28 @@ int main(int argc, char** argv) {
 
 		Game::assetManager = new AssetManager(clientPath);
 	} catch (std::runtime_error& ex) {
-		LOG("Got an error while setting up assets: %s", ex.what());
+		Game::logger->Log("ChatServer", "Got an error while setting up assets: %s", ex.what());
 
 		return EXIT_FAILURE;
 	}
 
-	//Connect to the MySQL Database
-	try {
-		Database::Connect();
-	} catch (sql::SQLException& ex) {
-		LOG("Got an error while connecting to the database: %s", ex.what());
-		Database::Destroy("ChatServer");
-		delete Game::server;
-		delete Game::logger;
-		return EXIT_FAILURE;
-	}
+	Database::Connect(Game::config);
+
+	// Get Master server IP and port
+	SocketDescriptor masterSock = Database::Connection->GetMasterServerIP();
 
-	//Find out the master's IP:
-	std::string masterIP;
-	uint32_t masterPort = 1000;
-	auto masterInfo = Database::Get()->GetMasterInfo();
-	if (masterInfo) {
-		masterIP = masterInfo->ip;
-		masterPort = masterInfo->port;
-	}
 	//It's safe to pass 'localhost' here, as the IP is only used as the external IP.
 	uint32_t maxClients = 50;
 	uint32_t ourPort = 1501;
 	if (Game::config->GetValue("max_clients") != "") maxClients = std::stoi(Game::config->GetValue("max_clients"));
 	if (Game::config->GetValue("port") != "") ourPort = std::atoi(Game::config->GetValue("port").c_str());
 
-	Game::server = new dServer(Game::config->GetValue("external_ip"), ourPort, 0, maxClients, false, true, Game::logger, masterIP, masterPort, ServerType::Chat, Game::config, &Game::shouldShutdown);
+	Game::server = new dServer(Game::config->GetValue("external_ip"), ourPort, 0, maxClients, false, true, Game::logger, masterSock.hostAddress, masterSock.port, ServerType::Chat, Game::config, &Game::shouldShutdown);
 
 	Game::chatFilter = new dChatFilter(Game::assetManager->GetResPath().string() + "/chatplus_en_us", bool(std::stoi(Game::config->GetValue("dont_generate_dcf"))));
 	
 	Game::randomEngine = std::mt19937(time(0));
 
-	playerContainer.Initialize();
-
 	//Run it until server gets a kill message from Master:
 	auto t = std::chrono::high_resolution_clock::now();
 	Packet* packet = nullptr;
@@ -147,15 +131,7 @@ int main(int argc, char** argv) {
 
 		//Every 10 min we ping our sql server to keep it alive hopefully:
 		if (framesSinceLastSQLPing >= sqlPingTime) {
-			//Find out the master's IP for absolutely no reason:
-			std::string masterIP;
-			uint32_t masterPort;
-
-			auto masterInfo = Database::Get()->GetMasterInfo();
-			if (masterInfo) {
-				masterIP = masterInfo->ip;
-				masterPort = masterInfo->port;
-			}
+			Database::Connection->GetMasterServerIP();
 
 			framesSinceLastSQLPing = 0;
 		} else framesSinceLastSQLPing++;
@@ -165,8 +141,8 @@ int main(int argc, char** argv) {
 		std::this_thread::sleep_until(t);
 	}
 
-	//Delete our objects here:
-	Database::Destroy("ChatServer");
+	// Delete our objects here:
+	Database::Destroy();
 	delete Game::server;
 	delete Game::logger;
 	delete Game::config;
@@ -174,7 +150,7 @@ int main(int argc, char** argv) {
 	return EXIT_SUCCESS;
 }
 
-Logger* SetupLogger() {
+dLogger* SetupLogger() {
 	std::string logPath = (BinaryPathFinder::GetBinaryDir() / ("logs/ChatServer_" + std::to_string(time(nullptr)) + ".log")).string();
 	bool logToConsole = false;
 	bool logDebugStatements = false;
@@ -183,16 +159,16 @@ Logger* SetupLogger() {
 	logDebugStatements = true;
 #endif
 
-	return new Logger(logPath, logToConsole, logDebugStatements);
+	return new dLogger(logPath, logToConsole, logDebugStatements);
 }
 
 void HandlePacket(Packet* packet) {
 	if (packet->data[0] == ID_DISCONNECTION_NOTIFICATION || packet->data[0] == ID_CONNECTION_LOST) {
-		LOG("A server has disconnected, erasing their connected players from the list.");
+		Game::logger->Log("ChatServer", "A server has disconnected, erasing their connected players from the list.");
 	}
 
 	if (packet->data[0] == ID_NEW_INCOMING_CONNECTION) {
-		LOG("A server is connecting, awaiting user list.");
+		Game::logger->Log("ChatServer", "A server is connecting, awaiting user list.");
 	}
 
 	if (packet->length < 4) return; // Nothing left to process.  Need 4 bytes to continue.
@@ -223,7 +199,7 @@ void HandlePacket(Packet* packet) {
 		}
 
 		default:
-			LOG("Unknown CHAT_INTERNAL id: %i", int(packet->data[3]));
+			Game::logger->Log("ChatServer", "Unknown CHAT_INTERNAL id: %i", int(packet->data[3]));
 		}
 	}
 
@@ -234,7 +210,7 @@ void HandlePacket(Packet* packet) {
 			break;
 
 		case eChatMessageType::GET_IGNORE_LIST:
-			LOG("Asked for ignore list, but is unimplemented right now.");
+			Game::logger->Log("ChatServer", "Asked for ignore list, but is unimplemented right now.");
 			break;
 
 		case eChatMessageType::TEAM_GET_STATUS:
@@ -292,19 +268,19 @@ void HandlePacket(Packet* packet) {
 			break;
 
 		default:
-			LOG("Unknown CHAT id: %i", int(packet->data[3]));
+			Game::logger->Log("ChatServer", "Unknown CHAT id: %i", int(packet->data[3]));
 		}
 	}
 
 	if (static_cast<eConnectionType>(packet->data[1]) == eConnectionType::WORLD) {
 		switch (static_cast<eWorldMessageType>(packet->data[3])) {
 		case eWorldMessageType::ROUTE_PACKET: {
-			LOG("Routing packet from world");
+			Game::logger->Log("ChatServer", "Routing packet from world");
 			break;
 		}
 
 		default:
-			LOG("Unknown World id: %i", int(packet->data[3]));
+			Game::logger->Log("ChatServer", "Unknown World id: %i", int(packet->data[3]));
 		}
 	}
 }

dChatServer/PlayerContainer.cpp

@@ -3,7 +3,7 @@
 #include <iostream>
 #include <algorithm>
 #include "Game.h"
-#include "Logger.h"
+#include "dLogger.h"
 #include "ChatPacketHandler.h"
 #include "GeneralUtils.h"
 #include "BitStreamUtils.h"
@@ -11,19 +11,12 @@
 #include "eConnectionType.h"
 #include "eChatInternalMessageType.h"
 #include "ChatPackets.h"
-#include "dConfig.h"
 
-void PlayerContainer::Initialize() {
-	GeneralUtils::TryParse<uint32_t>(Game::config->GetValue("max_number_of_best_friends"), m_MaxNumberOfBestFriends);
-	GeneralUtils::TryParse<uint32_t>(Game::config->GetValue("max_number_of_friends"), m_MaxNumberOfFriends);
+PlayerContainer::PlayerContainer() {
 }
 
 PlayerContainer::~PlayerContainer() {
-	m_Players.clear();
-}
-
-TeamData::TeamData() {
-	lootFlag = Game::config->GetValue("default_team_loot") == "0" ? 0 : 1;
+	mPlayers.clear();
 }
 
 void PlayerContainer::InsertPlayer(Packet* packet) {
@@ -43,12 +36,12 @@ void PlayerContainer::InsertPlayer(Packet* packet) {
 	inStream.Read(data->muteExpire);
 	data->sysAddr = packet->systemAddress;
 
-	m_Names[data->playerID] = GeneralUtils::UTF8ToUTF16(data->playerName);
+	mNames[data->playerID] = GeneralUtils::UTF8ToUTF16(data->playerName);
 
-	m_Players.insert(std::make_pair(data->playerID, data));
-	LOG("Added user: %s (%llu), zone: %i", data->playerName.c_str(), data->playerID, data->zoneID.GetMapID());
+	mPlayers.insert(std::make_pair(data->playerID, data));
+	Game::logger->Log("PlayerContainer", "Added user: %s (%llu), zone: %i", data->playerName.c_str(), data->playerID, data->zoneID.GetMapID());
 
-	Database::Get()->UpdateActivityLog(data->playerID, eActivityType::PlayerLoggedIn, data->zoneID.GetMapID());
+	Database::Connection->InsertIntoActivityLog(data->playerID, 0, time(nullptr), data->zoneID.GetMapID());
 }
 
 void PlayerContainer::RemovePlayer(Packet* packet) {
@@ -82,10 +75,10 @@ void PlayerContainer::RemovePlayer(Packet* packet) {
 		}
 	}
 
-	LOG("Removed user: %llu", playerID);
-	m_Players.erase(playerID);
+	Game::logger->Log("PlayerContainer", "Removed user: %llu", playerID);
+	mPlayers.erase(playerID);
 
-	Database::Get()->UpdateActivityLog(playerID, eActivityType::PlayerLoggedOut, player->zoneID.GetMapID());
+	Database::Connection->InsertIntoActivityLog(playerID, 1, time(nullptr), player->zoneID.GetMapID());
 }
 
 void PlayerContainer::MuteUpdate(Packet* packet) {
@@ -98,7 +91,7 @@ void PlayerContainer::MuteUpdate(Packet* packet) {
 	auto* player = this->GetPlayerData(playerID);
 
 	if (player == nullptr) {
-		LOG("Failed to find user: %llu", playerID);
+		Game::logger->Log("PlayerContainer", "Failed to find user: %llu", playerID);
 
 		return;
 	}
@@ -179,7 +172,7 @@ TeamData* PlayerContainer::CreateLocalTeam(std::vector<LWOOBJID> members) {
 TeamData* PlayerContainer::CreateTeam(LWOOBJID leader, bool local) {
 	auto* team = new TeamData();
 
-	team->teamID = ++m_TeamIDCounter;
+	team->teamID = ++mTeamIDCounter;
 	team->leaderID = leader;
 	team->local = local;
 
@@ -202,7 +195,7 @@ TeamData* PlayerContainer::GetTeam(LWOOBJID playerID) {
 
 void PlayerContainer::AddMember(TeamData* team, LWOOBJID playerID) {
 	if (team->memberIDs.size() >= 4){
-		LOG("Tried to add player to team that already had 4 players");
+		Game::logger->Log("PlayerContainer", "Tried to add player to team that already had 4 players");
 		auto* player = GetPlayerData(playerID);
 		if (!player) return;
 		ChatPackets::SendSystemMessage(player->sysAddr, u"The teams is full! You have not been added to a team!");
@@ -364,15 +357,15 @@ void PlayerContainer::UpdateTeamsOnWorld(TeamData* team, bool deleteTeam) {
 }
 
 std::u16string PlayerContainer::GetName(LWOOBJID playerID) {
-	const auto& pair = m_Names.find(playerID);
+	const auto& pair = mNames.find(playerID);
 
-	if (pair == m_Names.end()) return u"";
+	if (pair == mNames.end()) return u"";
 
 	return pair->second;
 }
 
 LWOOBJID PlayerContainer::GetId(const std::u16string& playerName) {
-	for (const auto& pair : m_Names) {
+	for (const auto& pair : mNames) {
 		if (pair.second == playerName) {
 			return pair.first;
 		}

dChatServer/PlayerContainer.h

@@ -18,7 +18,6 @@ struct PlayerData {
 };
 
 struct TeamData {
-	TeamData();
 	LWOOBJID teamID = LWOOBJID_EMPTY; // Internal use
 	LWOOBJID leaderID = LWOOBJID_EMPTY;
 	std::vector<LWOOBJID> memberIDs{};
@@ -29,9 +28,9 @@ struct TeamData {
 
 class PlayerContainer {
 public:
+	PlayerContainer();
 	~PlayerContainer();
 
-	void Initialize();
 	void InsertPlayer(Packet* packet);
 	void RemovePlayer(Packet* packet);
 	void MuteUpdate(Packet* packet);
@@ -39,13 +38,13 @@ public:
 	void BroadcastMuteUpdate(LWOOBJID player, time_t time);
 
 	PlayerData* GetPlayerData(const LWOOBJID& playerID) {
-		auto it = m_Players.find(playerID);
-		if (it != m_Players.end()) return it->second;
+		auto it = mPlayers.find(playerID);
+		if (it != mPlayers.end()) return it->second;
 		return nullptr;
 	}
 
 	PlayerData* GetPlayerData(const std::string& playerName) {
-		for (auto player : m_Players) {
+		for (auto player : mPlayers) {
 			if (player.second) {
 				std::string pn = player.second->playerName.c_str();
 				if (pn == playerName) return player.second;
@@ -67,17 +66,13 @@ public:
 	std::u16string GetName(LWOOBJID playerID);
 	LWOOBJID GetId(const std::u16string& playerName);
 	bool GetIsMuted(PlayerData* data);
-	uint32_t GetMaxNumberOfBestFriends() { return m_MaxNumberOfBestFriends; }
-	uint32_t GetMaxNumberOfFriends() { return m_MaxNumberOfFriends; }
 
-	std::map<LWOOBJID, PlayerData*>& GetAllPlayerData() { return m_Players; }
+	std::map<LWOOBJID, PlayerData*>& GetAllPlayerData() { return mPlayers; }
 
 private:
-	LWOOBJID m_TeamIDCounter = 0;
-	std::map<LWOOBJID, PlayerData*> m_Players;
+	LWOOBJID mTeamIDCounter = 0;
+	std::map<LWOOBJID, PlayerData*> mPlayers;
 	std::vector<TeamData*> mTeams;
-	std::unordered_map<LWOOBJID, std::u16string> m_Names;
-	uint32_t m_MaxNumberOfBestFriends = 5;
-	uint32_t m_MaxNumberOfFriends = 50;
+	std::unordered_map<LWOOBJID, std::u16string> mNames;
 };
 

dCommon/Amf3.h

@@ -2,7 +2,7 @@
 #define __AMF3__H__
 
 #include "dCommonVars.h"
-#include "Logger.h"
+#include "dLogger.h"
 #include "Game.h"
 
 #include <unordered_map>

dCommon/AmfSerialize.cpp

@@ -1,7 +1,7 @@
 #include "AmfSerialize.h"
 
 #include "Game.h"
-#include "Logger.h"
+#include "dLogger.h"
 
 // Writes an AMFValue pointer to a RakNet::BitStream
 template<>
@@ -29,7 +29,7 @@ void RakNet::BitStream::Write<AMFBaseValue&>(AMFBaseValue& value) {
 		break;
 	}
 	default: {
-		LOG("Encountered unwritable AMFType %i!", type);
+		Game::logger->Log("AmfSerialize", "Encountered unwritable AMFType %i!", type);
 	}
 	case eAmf::Undefined:
 	case eAmf::Null:

dCommon/BrickByBrickFix.cpp

@@ -1,154 +0,0 @@
-#include "BrickByBrickFix.h"
-
-#include <memory>
-#include <iostream>
-#include <sstream>
-
-#include "tinyxml2.h"
-
-#include "Database.h"
-#include "Game.h"
-#include "ZCompression.h"
-#include "Logger.h"
-
-//! Forward declarations
-
-void WriteSd0Magic(char* input, uint32_t chunkSize);
-bool CheckSd0Magic(std::istream& streamToCheck);
-
-/**
- * @brief Truncates all models with broken data from the database.
- *
- * @return The number of models deleted
- */
-uint32_t BrickByBrickFix::TruncateBrokenBrickByBrickXml() {
-	uint32_t modelsTruncated{};
-	auto modelsToTruncate = Database::Get()->GetAllUgcModels();
-	bool previousCommitValue = Database::Get()->GetAutoCommit();
-	Database::Get()->SetAutoCommit(false);
-	for (auto& model : modelsToTruncate) {
-		std::string completeUncompressedModel{};
-		uint32_t chunkCount{};
-		// Check that header is sd0 by checking for the sd0 magic.
-		if (CheckSd0Magic(model.lxfmlData)) {
-			while (true) {
-				uint32_t chunkSize{};
-				model.lxfmlData.read(reinterpret_cast<char*>(&chunkSize), sizeof(uint32_t)); // Extract chunk size from istream
-
-				// Check if good here since if at the end of an sd0 file, this will have eof flagged.
-				if (!model.lxfmlData.good()) break;
-
-				std::unique_ptr<uint8_t[]> compressedChunk(new uint8_t[chunkSize]);
-				for (uint32_t i = 0; i < chunkSize; i++) {
-					compressedChunk[i] = model.lxfmlData.get();
-				}
-
-				// Ignore the valgrind warning about uninitialized values.  These are discarded later when we know the actual uncompressed size.
-				std::unique_ptr<uint8_t[]> uncompressedChunk(new uint8_t[ZCompression::MAX_SD0_CHUNK_SIZE]);
-				int32_t err{};
-				int32_t actualUncompressedSize = ZCompression::Decompress(
-					compressedChunk.get(), chunkSize, uncompressedChunk.get(), ZCompression::MAX_SD0_CHUNK_SIZE, err);
-
-				if (actualUncompressedSize != -1) {
-					uint32_t previousSize = completeUncompressedModel.size();
-					completeUncompressedModel.append((char*)uncompressedChunk.get());
-					completeUncompressedModel.resize(previousSize + actualUncompressedSize);
-				} else {
-					LOG("Failed to inflate chunk %i for model %llu.  Error: %i", chunkCount, model.id, err);
-					break;
-				}
-				chunkCount++;
-			}
-			std::unique_ptr<tinyxml2::XMLDocument> document = std::make_unique<tinyxml2::XMLDocument>();
-			if (!document) {
-				LOG("Failed to initialize tinyxml document.  Aborting.");
-				return 0;
-			}
-
-			if (!(document->Parse(completeUncompressedModel.c_str(), completeUncompressedModel.size()) == tinyxml2::XML_SUCCESS)) {
-				if (completeUncompressedModel.find(
-					"</LXFML>",
-					completeUncompressedModel.length() >= 15 ? completeUncompressedModel.length() - 15 : 0) == std::string::npos
-					) {
-					LOG("Brick-by-brick model %llu will be deleted!", model.id);
-					Database::Get()->DeleteUgcModelData(model.id);
-					modelsTruncated++;
-				}
-			}
-		} else {
-			LOG("Brick-by-brick model %llu will be deleted!", model.id);
-			Database::Get()->DeleteUgcModelData(model.id);
-			modelsTruncated++;
-		}
-	}
-
-	Database::Get()->Commit();
-	Database::Get()->SetAutoCommit(previousCommitValue);
-	return modelsTruncated;
-}
-
-/**
- * @brief Updates all current models in the database to have the Segmented Data 0 (SD0) format.
- * Any models that do not start with zlib and best compression magic will not be updated.
- *
- * @return The number of models updated to SD0
- */
-uint32_t BrickByBrickFix::UpdateBrickByBrickModelsToSd0() {
-	uint32_t updatedModels = 0;
-	auto modelsToUpdate = Database::Get()->GetAllUgcModels();
-	auto previousAutoCommitState = Database::Get()->GetAutoCommit();
-	Database::Get()->SetAutoCommit(false);
-	for (auto& model : modelsToUpdate) {
-		// Check if the stored blob starts with zlib magic (0x78 0xDA - best compression of zlib)
-		// If it does, convert it to sd0.
-		if (model.lxfmlData.get() == 0x78 && model.lxfmlData.get() == 0xDA) {
-			// Get and save size of zlib compressed chunk.
-			model.lxfmlData.seekg(0, std::ios::end);
-			uint32_t oldLxfmlSize = static_cast<uint32_t>(model.lxfmlData.tellg());
-			model.lxfmlData.seekg(0);
-
-			// Allocate 9 extra bytes.  5 for sd0 magic, 4 for the only zlib compressed size.
-			uint32_t oldLxfmlSizeWithHeader = oldLxfmlSize + 9;
-			std::unique_ptr<char[]> sd0ConvertedModel(new char[oldLxfmlSizeWithHeader]);
-
-			WriteSd0Magic(sd0ConvertedModel.get(), oldLxfmlSize);
-			for (uint32_t i = 9; i < oldLxfmlSizeWithHeader; i++) {
-				sd0ConvertedModel.get()[i] = model.lxfmlData.get();
-			}
-
-			std::string outputString(sd0ConvertedModel.get(), oldLxfmlSizeWithHeader);
-			std::istringstream outputStringStream(outputString);
-
-			try {
-				Database::Get()->UpdateUgcModelData(model.id, outputStringStream);
-				LOG("Updated model %i to sd0", model.id);
-				updatedModels++;
-			} catch (sql::SQLException exception) {
-				LOG("Failed to update model %i.  This model should be inspected manually to see why."
-					"The database error is %s", model.id, exception.what());
-			}
-		}
-	}
-	Database::Get()->Commit();
-	Database::Get()->SetAutoCommit(previousAutoCommitState);
-	return updatedModels;
-}
-
-/**
- * @brief Writes sd0 magic at the front of a char*
- *
- * @param input the char* to write at the front of
- * @param chunkSize The size of the first chunk to write the size of
- */
-void WriteSd0Magic(char* input, uint32_t chunkSize) {
-	input[0] = 's';
-	input[1] = 'd';
-	input[2] = '0';
-	input[3] = 0x01;
-	input[4] = 0xFF;
-	*reinterpret_cast<uint32_t*>(input + 5) = chunkSize; // Write the integer to the character array
-}
-
-bool CheckSd0Magic(std::istream& streamToCheck) {
-	return streamToCheck.get() == 's' && streamToCheck.get() == 'd' && streamToCheck.get() == '0' && streamToCheck.get() == 0x01 && streamToCheck.get() == 0xFF;
-}

dCommon/BrickByBrickFix.h

@@ -1,20 +0,0 @@
-#pragma once
-
-#include <cstdint>
-
-namespace BrickByBrickFix {
-	/**
-	 * @brief Deletes all broken BrickByBrick models that have invalid XML
-	 *
-	 * @return The number of BrickByBrick models that were truncated
-	 */
-	uint32_t TruncateBrokenBrickByBrickXml();
-
-	/**
-	 * @brief Updates all BrickByBrick models in the database to be
-	 * in the sd0 format as opposed to a zlib compressed format.
-	 *
-	 * @return The number of BrickByBrick models that were updated
-	 */
-	uint32_t UpdateBrickByBrickModelsToSd0();
-};

dCommon/CMakeLists.txt

@@ -4,7 +4,7 @@ set(DCOMMON_SOURCES
 		"BinaryIO.cpp"
 		"dConfig.cpp"
 		"Diagnostics.cpp"
-		"Logger.cpp"
+		"dLogger.cpp"
 		"GeneralUtils.cpp"
 		"LDFFormat.cpp"
 		"MD5.cpp"
@@ -14,7 +14,6 @@ set(DCOMMON_SOURCES
 		"SHA512.cpp"
 		"Demangler.cpp"
 		"ZCompression.cpp"
-		"BrickByBrickFix.cpp"
 		"BinaryPathFinder.cpp"
 		"FdbToSqlite.cpp"
 )

dCommon/Diagnostics.cpp

@@ -1,6 +1,6 @@
 #include "Diagnostics.h"
 #include "Game.h"
-#include "Logger.h"
+#include "dLogger.h"
 
 // If we're on Win32, we'll include our minidump writer
 #ifdef _WIN32
@@ -9,7 +9,7 @@
 #include <Dbghelp.h>
 
 #include "Game.h"
-#include "Logger.h"
+#include "dLogger.h"
 
 void make_minidump(EXCEPTION_POINTERS* e) {
 	auto hDbgHelp = LoadLibraryA("dbghelp");
@@ -28,7 +28,7 @@ void make_minidump(EXCEPTION_POINTERS* e) {
 			"_%4d%02d%02d_%02d%02d%02d.dmp",
 			t.wYear, t.wMonth, t.wDay, t.wHour, t.wMinute, t.wSecond);
 	}
-	LOG("Creating crash dump %s", name);
+	Game::logger->Log("Diagnostics", "Creating crash dump %s", name);
 	auto hFile = CreateFileA(name, GENERIC_WRITE, FILE_SHARE_READ, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
 	if (hFile == INVALID_HANDLE_VALUE)
 		return;
@@ -83,7 +83,7 @@ struct bt_ctx {
 
 static inline void Bt(struct backtrace_state* state) {
 	std::string fileName = Diagnostics::GetOutDirectory() + "crash_" + Diagnostics::GetProcessName() + "_" + std::to_string(getpid()) + ".log";
-	LOG("backtrace is enabled, crash dump located at %s", fileName.c_str());
+	Game::logger->Log("Diagnostics", "backtrace is enabled, crash dump located at %s", fileName.c_str());
 	FILE* file = fopen(fileName.c_str(), "w+");
 	if (file != nullptr) {
 		backtrace_print(state, 2, file);
@@ -118,7 +118,7 @@ void CatchUnhandled(int sig) {
 #ifndef __include_backtrace__
 
 	std::string fileName = Diagnostics::GetOutDirectory() + "crash_" + Diagnostics::GetProcessName() + "_" + std::to_string(getpid()) + ".log";
-	LOG("Encountered signal %i, creating crash dump %s", sig, fileName.c_str());
+	Game::logger->Log("Diagnostics", "Encountered signal %i, creating crash dump %s", sig, fileName.c_str());
 	if (Diagnostics::GetProduceMemoryDump()) {
 		GenerateDump();
 	}
@@ -134,10 +134,6 @@ void CatchUnhandled(int sig) {
 	// Loop through the returned addresses, and get the symbols to be demangled
 	char** strings = backtrace_symbols(array, size);
 
-	FILE* file = fopen(fileName.c_str(), "w+");
-	if (file != NULL) {
-		fprintf(file, "Error: signal %d:\n", sig);
-	}
 	// Print the stack trace
 	for (size_t i = 0; i < size; i++) {
 		// Take a string like './WorldServer(_ZN19SlashCommandHandler17HandleChatCommandERKSbIDsSt11char_traitsIDsESaIDsEEP6EntityRK13SystemAddress+0x6187) [0x55869c44ecf7]'
@@ -158,15 +154,20 @@ void CatchUnhandled(int sig) {
 			}
 		}
 
-		LOG("[%02zu] %s", i, functionName.c_str());
-		if (file != NULL) {
-			fprintf(file, "[%02zu] %s\n", i, functionName.c_str());
-		}
+		Game::logger->Log("Diagnostics", "[%02zu] %s", i, functionName.c_str());
 	}
 #  else // defined(__GNUG__)
 	backtrace_symbols_fd(array, size, STDOUT_FILENO);
 #  endif // defined(__GNUG__)
 
+	FILE* file = fopen(fileName.c_str(), "w+");
+	if (file != NULL) {
+		// print out all the frames to stderr
+		fprintf(file, "Error: signal %d:\n", sig);
+		backtrace_symbols_fd(array, size, fileno(file));
+		fclose(file);
+	}
+
 #else // __include_backtrace__
 
 	struct backtrace_state* state = backtrace_create_state(

dCommon/FdbToSqlite.cpp

@@ -9,7 +9,7 @@
 #include "CDClientDatabase.h"
 #include "GeneralUtils.h"
 #include "Game.h"
-#include "Logger.h"
+#include "dLogger.h"
 #include "AssetManager.h"
 
 #include "eSqliteDataType.h"
@@ -44,7 +44,7 @@ bool FdbToSqlite::Convert::ConvertDatabase(AssetMemoryBuffer& buffer) {
 
 		CDClientDatabase::ExecuteQuery("COMMIT;");
 	} catch (CppSQLite3Exception& e) {
-		LOG("Encountered error %s converting FDB to SQLite", e.errorMessage());
+		Game::logger->Log("FdbToSqlite", "Encountered error %s converting FDB to SQLite", e.errorMessage());
 		return false;
 	}
 

dCommon/Game.h

@@ -3,7 +3,7 @@
 #include <random>
 
 class dServer;
-class Logger;
+class dLogger;
 class InstanceManager;
 class dChatFilter;
 class dConfig;
@@ -14,7 +14,7 @@ class EntityManager;
 class dZoneManager;
 
 namespace Game {
-	extern Logger* logger;
+	extern dLogger* logger;
 	extern dServer* server;
 	extern InstanceManager* im;
 	extern dChatFilter* chatFilter;

dCommon/GeneralUtils.h

@@ -13,7 +13,7 @@
 #include "NiPoint3.h"
 
 #include "Game.h"
-#include "Logger.h"
+#include "dLogger.h"
 
 enum eInventoryType : uint32_t;
 enum class eObjectBits : size_t;
@@ -151,11 +151,6 @@ namespace GeneralUtils {
 		return std::stod(value);
 	}
 
-	template <>
-	inline uint16_t Parse(const char* value) {
-		return std::stoul(value);
-	}
-
 	template <>
 	inline uint32_t Parse(const char* value) {
 		return std::stoul(value);

dCommon/LDFFormat.cpp

@@ -4,7 +4,7 @@
 #include "GeneralUtils.h"
 
 #include "Game.h"
-#include "Logger.h"
+#include "dLogger.h"
 
 // C++
 #include <string_view>
@@ -48,7 +48,7 @@ LDFBaseData* LDFBaseData::DataFromString(const std::string_view& format) {
 	try {
 		type = static_cast<eLDFType>(strtol(ldfTypeAndValue.first.data(), &storage, 10));
 	} catch (std::exception) {
-		LOG("Attempted to process invalid ldf type (%s) from string (%s)", ldfTypeAndValue.first.data(), format.data());
+		Game::logger->Log("LDFFormat", "Attempted to process invalid ldf type (%s) from string (%s)", ldfTypeAndValue.first.data(), format.data());
 		return nullptr;
 	}
 
@@ -63,7 +63,7 @@ LDFBaseData* LDFBaseData::DataFromString(const std::string_view& format) {
 	case LDF_TYPE_S32: {
 		int32_t data;
 		if (!GeneralUtils::TryParse(ldfTypeAndValue.second.data(), data)) {
-			LOG("Warning: Attempted to process invalid int32 value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
+			Game::logger->Log("LDFFormat", "Warning: Attempted to process invalid int32 value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
 			return nullptr;
 		}
 		returnValue = new LDFData<int32_t>(key, data);
@@ -74,7 +74,7 @@ LDFBaseData* LDFBaseData::DataFromString(const std::string_view& format) {
 	case LDF_TYPE_FLOAT: {
 		float data;
 		if (!GeneralUtils::TryParse(ldfTypeAndValue.second.data(), data)) {
-			LOG("Warning: Attempted to process invalid float value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
+			Game::logger->Log("LDFFormat", "Warning: Attempted to process invalid float value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
 			return nullptr;
 		}
 		returnValue = new LDFData<float>(key, data);
@@ -84,7 +84,7 @@ LDFBaseData* LDFBaseData::DataFromString(const std::string_view& format) {
 	case LDF_TYPE_DOUBLE: {
 		double data;
 		if (!GeneralUtils::TryParse(ldfTypeAndValue.second.data(), data)) {
-			LOG("Warning: Attempted to process invalid double value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
+			Game::logger->Log("LDFFormat", "Warning: Attempted to process invalid double value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
 			return nullptr;
 		}
 		returnValue = new LDFData<double>(key, data);
@@ -101,7 +101,7 @@ LDFBaseData* LDFBaseData::DataFromString(const std::string_view& format) {
 			data = 0;
 		} else {
 			if (!GeneralUtils::TryParse(ldfTypeAndValue.second.data(), data)) {
-				LOG("Warning: Attempted to process invalid uint32 value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
+				Game::logger->Log("LDFFormat", "Warning: Attempted to process invalid uint32 value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
 				return nullptr;
 			}
 		}
@@ -119,7 +119,7 @@ LDFBaseData* LDFBaseData::DataFromString(const std::string_view& format) {
 			data = false;
 		} else {
 			if (!GeneralUtils::TryParse(ldfTypeAndValue.second.data(), data)) {
-				LOG("Warning: Attempted to process invalid bool value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
+				Game::logger->Log("LDFFormat", "Warning: Attempted to process invalid bool value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
 				return nullptr;
 			}
 		}
@@ -131,7 +131,7 @@ LDFBaseData* LDFBaseData::DataFromString(const std::string_view& format) {
 	case LDF_TYPE_U64: {
 		uint64_t data;
 		if (!GeneralUtils::TryParse(ldfTypeAndValue.second.data(), data)) {
-			LOG("Warning: Attempted to process invalid uint64 value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
+			Game::logger->Log("LDFFormat", "Warning: Attempted to process invalid uint64 value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
 			return nullptr;
 		}
 		returnValue = new LDFData<uint64_t>(key, data);
@@ -141,7 +141,7 @@ LDFBaseData* LDFBaseData::DataFromString(const std::string_view& format) {
 	case LDF_TYPE_OBJID: {
 		LWOOBJID data;
 		if (!GeneralUtils::TryParse(ldfTypeAndValue.second.data(), data)) {
-			LOG("Warning: Attempted to process invalid LWOOBJID value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
+			Game::logger->Log("LDFFormat", "Warning: Attempted to process invalid LWOOBJID value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
 			return nullptr;
 		}
 		returnValue = new LDFData<LWOOBJID>(key, data);
@@ -155,12 +155,12 @@ LDFBaseData* LDFBaseData::DataFromString(const std::string_view& format) {
 	}
 
 	case LDF_TYPE_UNKNOWN: {
-		LOG("Warning: Attempted to process invalid unknown value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
+		Game::logger->Log("LDFFormat", "Warning: Attempted to process invalid unknown value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
 		break;
 	}
 
 	default: {
-		LOG("Warning: Attempted to process invalid LDF type (%d) from string (%s)", type, format.data());
+		Game::logger->Log("LDFFormat", "Warning: Attempted to process invalid LDF type (%d) from string (%s)", type, format.data());
 		break;
 	}
 	}

dCommon/Logger.cpp

@@ -1,96 +0,0 @@
-#include "Logger.h"
-
-#include <algorithm>
-#include <ctime>
-#include <filesystem>
-#include <stdarg.h>
-
-Writer::~Writer() {
-	// Dont try to close stdcout...
-	if (!m_Outfile || m_IsConsoleWriter) return;
-
-	fclose(m_Outfile);
-	m_Outfile = NULL;
-}
-
-void Writer::Log(const char* time, const char* message) {
-	if (!m_Outfile) return;
-
-	fputs(time, m_Outfile);
-	fputs(message, m_Outfile);
-}
-
-void Writer::Flush() {
-	if (!m_Outfile) return;
-	fflush(m_Outfile);
-}
-
-FileWriter::FileWriter(const char* outpath) {
-	m_Outfile = fopen(outpath, "wt");
-	if (!m_Outfile) printf("Couldn't open %s for writing!\n", outpath);
-	m_Outpath = outpath;
-	m_IsConsoleWriter = false;
-}
-
-ConsoleWriter::ConsoleWriter(bool enabled) {
-	m_Enabled = enabled;
-	m_Outfile = stdout;
-	m_IsConsoleWriter = true;
-}
-
-Logger::Logger(const std::string& outpath, bool logToConsole, bool logDebugStatements) {
-	m_logDebugStatements = logDebugStatements;
-	std::filesystem::path outpathPath(outpath);
-	if (!std::filesystem::exists(outpathPath.parent_path())) std::filesystem::create_directories(outpathPath.parent_path());
-	m_Writers.push_back(std::make_unique<FileWriter>(outpath));
-	m_Writers.push_back(std::make_unique<ConsoleWriter>(logToConsole));
-}
-
-void Logger::vLog(const char* format, va_list args) {
-	time_t t = time(NULL);
-	struct tm* time = localtime(&t);
-	char timeStr[70];
-	strftime(timeStr, sizeof(timeStr), "[%d-%m-%y %H:%M:%S ", time);
-	char message[2048];
-	vsnprintf(message, 2048, format, args);
-	for (const auto& writer : m_Writers) {
-		writer->Log(timeStr, message);
-	}
-}
-
-void Logger::Log(const char* className, const char* format, ...) {
-	va_list args;
-	std::string log = std::string(className) + "] " + std::string(format) + "\n";
-	va_start(args, format);
-	vLog(log.c_str(), args);
-	va_end(args);
-}
-
-void Logger::LogDebug(const char* className, const char* format, ...) {
-	if (!m_logDebugStatements) return;
-	va_list args;
-	std::string log = std::string(className) + "] " + std::string(format) + "\n";
-	va_start(args, format);
-	vLog(log.c_str(), args);
-	va_end(args);
-}
-
-void Logger::Flush() {
-	for (const auto& writer : m_Writers) {
-		writer->Flush();
-	}
-}
-
-void Logger::SetLogToConsole(bool logToConsole) {
-	for (const auto& writer : m_Writers) {
-		if (writer->IsConsoleWriter()) writer->SetEnabled(logToConsole);
-	}
-}
-
-bool Logger::GetLogToConsole() const {
-	bool toReturn = false;
-	for (const auto& writer : m_Writers) {
-		if (writer->IsConsoleWriter()) toReturn |= writer->GetEnabled();
-	}
-	return toReturn;
-}

dCommon/Logger.h

@@ -1,89 +0,0 @@
-#pragma once
-
-#include <memory>
-#include <string>
-#include <vector>
-
-#define STRINGIFY_IMPL(x) #x
-
-#define STRINGIFY(x) STRINGIFY_IMPL(x)
-
-#define GET_FILE_NAME(x, y) GetFileNameFromAbsolutePath(__FILE__ x y)
-
-#define FILENAME_AND_LINE GET_FILE_NAME(":", STRINGIFY(__LINE__))
-
-// Calculate the filename at compile time from the path.
-// We just do this by scanning the path for the last '/' or '\' character and returning the string after it.
-constexpr const char* GetFileNameFromAbsolutePath(const char* path) {
-    const char* file = path;
-    while (*path) {
-		char nextChar = *path++;
-        if (nextChar == '/' || nextChar == '\\') {
-            file = path;
-        }
-    }
-    return file;
-}
-
-// These have to have a constexpr variable to store the filename_and_line result in a local variable otherwise
-// they will not be valid constexpr and will be evaluated at runtime instead of compile time!
-// The full string is still stored in the binary, however the offset of the filename in the absolute paths
-// is used in the instruction instead of the start of the absolute path.
-#define LOG(message, ...) do { auto str = FILENAME_AND_LINE; Game::logger->Log(str, message, ##__VA_ARGS__); } while(0)
-#define LOG_DEBUG(message, ...) do { auto str = FILENAME_AND_LINE; Game::logger->LogDebug(str, message, ##__VA_ARGS__); } while(0)
-
-// Writer class for writing data to files.
-class Writer {
-public:
-	Writer(bool enabled = true) : m_Enabled(enabled) {};
-	virtual ~Writer();
-
-	virtual void Log(const char* time, const char* message);
-	virtual void Flush();
-
-	void SetEnabled(bool disabled) { m_Enabled = disabled; }
-	bool GetEnabled() const { return m_Enabled; }
-
-	bool IsConsoleWriter() { return m_IsConsoleWriter; }
-public:
-	bool m_Enabled = true;
-	bool m_IsConsoleWriter = false;
-	FILE* m_Outfile;
-};
-
-// FileWriter class for writing data to a file on a disk.
-class FileWriter : public Writer {
-public:
-	FileWriter(const char* outpath);
-	FileWriter(const std::string& outpath) : FileWriter(outpath.c_str()) {};
-private:
-	std::string m_Outpath;
-};
-
-// ConsoleWriter class for writing data to the console.
-class ConsoleWriter : public Writer {
-public:
-	ConsoleWriter(bool enabled);
-};
-
-class Logger {
-public:
-	Logger() = delete;
-	Logger(const std::string& outpath, bool logToConsole, bool logDebugStatements);
-
-	void Log(const char* filenameAndLine, const char* format, ...);
-	void LogDebug(const char* filenameAndLine, const char* format, ...);
-
-	void Flush();
-
-	bool GetLogToConsole() const;
-	void SetLogToConsole(bool logToConsole);
-
-	void SetLogDebugStatements(bool logDebugStatements) { m_logDebugStatements = logDebugStatements; }
-
-private:
-	void vLog(const char* format, va_list args);
-
-	bool m_logDebugStatements;
-	std::vector<std::unique_ptr<Writer>> m_Writers;
-};

dCommon/dClient/AssetManager.cpp

@@ -2,7 +2,7 @@
 
 #include "AssetManager.h"
 #include "Game.h"
-#include "Logger.h"
+#include "dLogger.h"
 
 #include <zlib.h>
 

dCommon/dClient/Pack.h

@@ -3,7 +3,6 @@
 #include <vector>
 #include <string>
 #include <filesystem>
-#include <fstream>
 
 #pragma pack(push, 1)
 struct PackRecord {

dCommon/dClient/PackIndex.cpp

@@ -1,7 +1,7 @@
 #include "PackIndex.h"
 #include "BinaryIO.h"
 #include "Game.h"
-#include "Logger.h"
+#include "dLogger.h"
 
 PackIndex::PackIndex(const std::filesystem::path& filePath) {
 	m_FileStream = std::ifstream(filePath / "versions" / "primary.pki", std::ios::in | std::ios::binary);
@@ -34,7 +34,7 @@ PackIndex::PackIndex(const std::filesystem::path& filePath) {
 		m_PackFileIndices.push_back(packFileIndex);
 	}
 
-	LOG("Loaded pack catalog with %i pack files and %i files", m_PackPaths.size(), m_PackFileIndices.size());
+	Game::logger->Log("PackIndex", "Loaded pack catalog with %i pack files and %i files", m_PackPaths.size(), m_PackFileIndices.size());
 
 	for (auto& item : m_PackPaths) {
 		std::replace(item.begin(), item.end(), '\\', '/');

dCommon/dConfig.cpp

@@ -38,11 +38,13 @@ const std::string& dConfig::GetValue(std::string key) {
 }
 
 void dConfig::ProcessLine(const std::string& line) {
-	auto splitLoc = line.find('=');
-	auto key = line.substr(0, splitLoc);
-	auto value = line.substr(splitLoc + 1);
+	auto splitLine = GeneralUtils::SplitString(line, '=');
+
+	if (splitLine.size() != 2) return;
 
 	//Make sure that on Linux, we remove special characters:
+	auto& key = splitLine.at(0);
+	auto& value = splitLine.at(1);
 	if (!value.empty() && value.at(value.size() - 1) == '\r') value.erase(value.size() - 1);
 
 	if (this->m_ConfigValues.find(key) != this->m_ConfigValues.end()) return;

dCommon/dEnums/ePermissionMap.h

@@ -27,6 +27,20 @@ enum class ePermissionMap : uint64_t {
 	 * The character has restricted chat access, bit 6.
 	 */
 	RestrictedChatAccess = 0x1 << 6,
+
+	//
+	// Combined permissions
+	//
+
+	/**
+	 * The character is marked as 'old', restricted from trade and mail.
+	 */
+	Old = RestrictedTradeAccess | RestrictedMailAccess,
+
+	/**
+	* The character is soft banned, restricted from trade, mail, and chat.
+	*/
+	SoftBanned = RestrictedTradeAccess | RestrictedMailAccess | RestrictedChatAccess,
 };
 
 #endif  //!__EPERMISSIONMAP__H__

dCommon/dEnums/eWorldMessageType.h

@@ -36,8 +36,7 @@ enum class eWorldMessageType : uint32_t {
 	HANDLE_FUNNESS,
 	FAKE_PRG_CSR_MESSAGE,
 	REQUEST_FREE_TRIAL_REFRESH,
-	GM_SET_FREE_TRIAL_STATUS,
-	UI_HELP_TOP_5 = 91
+	GM_SET_FREE_TRIAL_STATUS
 };
 
 #endif  //!__EWORLDMESSAGETYPE__H__

dCommon/dLogger.cpp

@@ -0,0 +1,110 @@
+#include "dLogger.h"
+
+dLogger::dLogger(const std::string& outpath, bool logToConsole, bool logDebugStatements) {
+	m_logToConsole = logToConsole;
+	m_logDebugStatements = logDebugStatements;
+	m_outpath = outpath;
+
+#ifdef _WIN32
+	mFile = std::ofstream(m_outpath);
+	if (!mFile) { printf("Couldn't open %s for writing!\n", outpath.c_str()); }
+#else
+	fp = fopen(outpath.c_str(), "wt");
+	if (fp == NULL) { printf("Couldn't open %s for writing!\n", outpath.c_str()); }
+#endif
+}
+
+dLogger::~dLogger() {
+#ifdef _WIN32
+	mFile.close();
+#else
+	if (fp != nullptr) {
+		fclose(fp);
+		fp = nullptr;
+	}
+#endif
+}
+
+void dLogger::vLog(const char* format, va_list args) {
+#ifdef _WIN32
+	time_t t = time(NULL);
+	struct tm time;
+	localtime_s(&time, &t);
+	char timeStr[70];
+	strftime(timeStr, sizeof(timeStr), "%d-%m-%y %H:%M:%S", &time);
+	char message[2048];
+	vsnprintf(message, 2048, format, args);
+
+	if (m_logToConsole) std::cout << "[" << timeStr << "] " << message;
+	mFile << "[" << timeStr << "] " << message;
+#else
+	time_t t = time(NULL);
+	struct tm* time = localtime(&t);
+	char timeStr[70];
+	strftime(timeStr, sizeof(timeStr), "%d-%m-%y %H:%M:%S", time);
+	char message[2048];
+	vsnprintf(message, 2048, format, args);
+
+	if (m_logToConsole) {
+		fputs("[", stdout);
+		fputs(timeStr, stdout);
+		fputs("] ", stdout);
+		fputs(message, stdout);
+	}
+
+	if (fp != nullptr) {
+		fputs("[", fp);
+		fputs(timeStr, fp);
+		fputs("] ", fp);
+		fputs(message, fp);
+	} else {
+		printf("Logger not initialized!\n");
+	}
+#endif
+}
+
+void dLogger::LogBasic(const char* format, ...) {
+	va_list args;
+	va_start(args, format);
+	vLog(format, args);
+	va_end(args);
+}
+
+void dLogger::LogBasic(const std::string& message) {
+	LogBasic(message.c_str());
+}
+
+void dLogger::Log(const char* className, const char* format, ...) {
+	va_list args;
+	std::string log = "[" + std::string(className) + "] " + std::string(format) + "\n";
+	va_start(args, format);
+	vLog(log.c_str(), args);
+	va_end(args);
+}
+
+void dLogger::Log(const std::string& className, const std::string& message) {
+	Log(className.c_str(), message.c_str());
+}
+
+void dLogger::LogDebug(const char* className, const char* format, ...) {
+	if (!m_logDebugStatements) return;
+	va_list args;
+	std::string log = "[" + std::string(className) + "] " + std::string(format) + "\n";
+	va_start(args, format);
+	vLog(log.c_str(), args);
+	va_end(args);
+}
+
+void dLogger::LogDebug(const std::string& className, const std::string& message) {
+	LogDebug(className.c_str(), message.c_str());
+}
+
+void dLogger::Flush() {
+#ifdef _WIN32
+	mFile.flush();
+#else
+	if (fp != nullptr) {
+		std::fflush(fp);
+	}
+#endif
+}

dCommon/dLogger.h

@@ -0,0 +1,38 @@
+#pragma once
+#include <ctime>
+#include <cstdarg>
+#include <string>
+#include <fstream>
+#include <iostream>
+
+class dLogger {
+public:
+	dLogger(const std::string& outpath, bool logToConsole, bool logDebugStatements);
+	~dLogger();
+
+	void SetLogToConsole(bool logToConsole) { m_logToConsole = logToConsole; }
+	void SetLogDebugStatements(bool logDebugStatements) { m_logDebugStatements = logDebugStatements; }
+	void vLog(const char* format, va_list args);
+
+	void LogBasic(const std::string& message);
+	void LogBasic(const char* format, ...);
+	void Log(const char* className, const char* format, ...);
+	void Log(const std::string& className, const std::string& message);
+	void LogDebug(const std::string& className, const std::string& message);
+	void LogDebug(const char* className, const char* format, ...);
+
+	void Flush();
+
+	const bool GetIsLoggingToConsole() const { return m_logToConsole; }
+
+private:
+	bool m_logDebugStatements;
+	bool m_logToConsole;
+	std::string m_outpath;
+	std::ofstream mFile;
+
+#ifndef _WIN32
+	//Glorious linux can run with SPEED:
+	FILE* fp = nullptr;
+#endif
+};

dDatabase/CDClientDatabase/CMakeLists.txt

@@ -1,12 +0,0 @@
-set(DDATABASE_CDCLIENTDATABASE_SOURCES
-	"CDClientDatabase.cpp"
-	"CDClientManager.cpp"
-)
-
-add_subdirectory(CDClientTables)
-
-foreach(file ${DDATABASE_CDCLIENTDATABASE_CDCLIENTTABLES_SOURCES})
-	set(DDATABASE_CDCLIENTDATABASE_SOURCES ${DDATABASE_CDCLIENTDATABASE_SOURCES} "CDClientTables/${file}")
-endforeach()
-
-set(DDATABASE_CDCLIENTDATABASE_SOURCES ${DDATABASE_CDCLIENTDATABASE_SOURCES} PARENT_SCOPE)

dDatabase/CMakeLists.txt

@@ -1,15 +1,23 @@
-set(DDATABASE_SOURCES)
+set(DDATABASE_SOURCES "CDClientDatabase.cpp"
+		"CDClientManager.cpp"
+		"Database.cpp")
 
-add_subdirectory(CDClientDatabase)
+add_subdirectory(Tables)
 
-foreach(file ${DDATABASE_CDCLIENTDATABASE_SOURCES})
-	set(DDATABASE_SOURCES ${DDATABASE_SOURCES} "CDClientDatabase/${file}")
+foreach(file ${DDATABASE_TABLES_SOURCES})
+	set(DDATABASE_SOURCES ${DDATABASE_SOURCES} "Tables/${file}")
 endforeach()
 
-add_subdirectory(GameDatabase)
+add_subdirectory(Databases)
 
-foreach(file ${DDATABASE_GAMEDATABASE_SOURCES})
-	set(DDATABASE_SOURCES ${DDATABASE_SOURCES} "GameDatabase/${file}")
+foreach (file ${DDATABASE_DATABASES_SOURCES})
+	set(DDATABASE_SOURCES ${DDATABASE_SOURCES} "Databases/${file}")
+endforeach()
+
+add_subdirectory(Databases/Migrations)
+
+foreach (file ${DDATABASE_DATABASES_MIGRATIONS_SOURCES})
+	set(DDATABASE_SOURCES ${DDATABASE_SOURCES} "Databases/Migrations/${file}")
 endforeach()
 
 add_library(dDatabase STATIC ${DDATABASE_SOURCES})

dDatabase/Database.cpp

@@ -0,0 +1,26 @@
+#include "Database.h"
+
+#include "dConfig.h"
+
+#include "Databases/MySQL.h"
+
+void Database::Connect(dConfig* config) {
+	bool useSqlite = true;
+	if (config->GetValue("mysql_host") != "" && config->GetValue("mysql_database") != "" && config->GetValue("mysql_username") != "" && config->GetValue("mysql_password") != "") {
+		useSqlite = false;
+	}
+
+	if (useSqlite) {
+
+	} else {
+		Database::Connection = new MySQLDatabase(config->GetValue("mysql_host"), config->GetValue("mysql_database"), config->GetValue("mysql_username"), config->GetValue("mysql_password"));
+		Database::ConnectionType = eConnectionTypes::MYSQL;
+	}
+
+	Database::Connection->Connect();
+}
+
+void Database::Destroy() {
+	Database::Connection->Destroy();
+	delete Database::Connection;
+}

dDatabase/Database.h

@@ -0,0 +1,16 @@
+#pragma once
+
+#include <string>
+
+#include "Databases/DatabaseBase.h"
+
+class dConfig;
+
+class Database {
+public:
+	static DatabaseBase* Connection;
+	static eConnectionTypes ConnectionType;
+
+	static void Connect(dConfig* config);
+	static void Destroy();
+};

dDatabase/Databases/CMakeLists.txt

@@ -0,0 +1 @@
+set(DDATABASE_DATABASES_SOURCES "MySQL.cpp")

dDatabase/Databases/DatabaseBase.h

@@ -0,0 +1,100 @@
+#pragma once
+
+#include <string>
+#include <vector>
+
+#include "RakNetTypes.h"
+
+#include "Structures.h"
+
+enum eConnectionTypes {
+	NONE,
+	MYSQL,
+	SQLITE
+};
+
+class DatabaseBase {
+public:
+	virtual void Connect() = 0;
+	virtual void Destroy() = 0;
+
+	// Server Get
+	virtual SocketDescriptor GetMasterServerIP() = 0;
+
+	// Server Set
+	virtual void CreateServer(const std::string& name, const std::string& ip, uint16_t port, uint32_t state, uint32_t version) = 0;
+	virtual void SetServerIpAndPortByName(const std::string& name, const std::string& ip, uint16_t port) = 0;
+	
+	// Misc
+	virtual void InsertIntoActivityLog(uint32_t playerId, uint32_t activityId, uint32_t timestamp, uint32_t zoneId) = 0;
+	virtual void InsertIntoCommandLog(uint32_t playerId, const std::string& command) = 0;
+
+	// Character Get
+	virtual CharacterInfo GetCharacterInfoByID(uint32_t id) = 0;
+	virtual CharacterInfo GetCharacterInfoByName(const std::string& name) = 0;
+	virtual std::string GetCharacterXMLByID(uint32_t id) = 0;
+	virtual std::vector<std::string> GetAllCharacterNames() = 0;
+	virtual std::vector<CharacterInfo> GetAllCharactersByAccountID(uint32_t accountId) = 0;
+	virtual bool IsCharacterNameAvailable(const std::string& name) = 0;
+
+	// Charater Write
+	virtual void CreateCharacterXML(uint32_t id, const std::string& xml) = 0;
+	virtual void UpdateCharacterXML(uint32_t id, const std::string& xml) = 0;
+	virtual void CreateCharacter(uint32_t id, uint32_t account_id, const std::string& name, const std::string& pending_name, bool needs_rename, uint64_t last_login) = 0;
+	virtual void ApproveCharacterName(uint32_t id, const std::string& newName) = 0;
+	virtual void SetPendingCharacterName(uint32_t id, const std::string& pendingName) = 0;
+	virtual void UpdateCharacterLastLogin(uint32_t id, uint64_t time) = 0;
+
+	// Character Delete
+	virtual void DeleteCharacter(uint32_t id) = 0;
+
+	// Friends Get
+	virtual bool AreBestFriends(uint32_t charId1, uint32_t charId2) = 0;
+
+	// Account Get
+	virtual AccountInfo GetAccountByName(const std::string& name) = 0;
+	virtual AccountInfo GetAccountByID(uint32_t id) = 0;
+	virtual uint32_t GetLatestCharacterOfAccount(uint32_t id) = 0;
+
+	// Account Set
+	virtual void BanAccount(uint32_t id) = 0;
+	virtual void MuteAccount(uint32_t id, uint64_t muteExpireDate) = 0;
+
+	// Pet Write
+	virtual void CreatePetName(uint64_t id, const std::string& name, bool approved) = 0;
+
+	// Pet Delete
+	virtual void DeletePetName(uint64_t id) = 0;
+
+	// Pet Get
+	virtual PetName GetPetName(uint64_t id) = 0;
+
+	// Keys Get
+	virtual bool IsKeyActive(uint32_t id) = 0;
+
+	// Object ID tracker Get
+	virtual uint32_t GetObjectIDTracker() = 0;
+
+	// Object ID tracker Set
+	virtual void SetObjectIDTracker(uint32_t id) = 0;
+
+	// Mail Get
+	virtual MailInfo GetMailByID(uint64_t id) = 0;
+	virtual std::vector<MailInfo> GetAllRecentMailOfUser(uint32_t id) = 0;
+	virtual uint32_t GetUnreadMailCountForUser(uint32_t id) = 0;
+
+	// Mail Write
+	virtual void WriteMail(uint32_t senderId, const std::string& senderName, uint32_t receiverId, const std::string& receiverName, uint64_t sendTime, const std::string& subject, const std::string& body, uint32_t attachmentId = 0, uint32_t attachmentLot = 0, uint64_t attachmentSubkey = 0, uint32_t attachmentCount = 0, bool wasRead = false) = 0;
+	virtual void SetMailAsRead(uint64_t id) = 0;
+	virtual void RemoveAttachmentFromMail(uint64_t id) = 0;
+
+	// Mail Delete
+	virtual void DeleteMail(uint64_t id) = 0;
+
+	// Property Get
+	virtual uint64_t GetPropertyFromTemplateAndClone(uint32_t templateId, uint32_t cloneId) = 0;
+	virtual std::vector<uint32_t> GetBBBModlesForProperty(uint32_t propertyId) = 0;
+	virtual std::istream GetLXFMLFromID(uint32_t id) = 0;
+private:
+
+};

dDatabase/Databases/Migrations/CMakeLists.txt

@@ -0,0 +1 @@
+set(DDATABASE_DATABASES_MIGRATIONS_SOURCES "MigrationManager.cpp" "MySQLMigration.cpp")

dDatabase/Databases/Migrations/MigrationManager.cpp

@@ -0,0 +1,90 @@
+#include "MigrationManager.h"
+
+#include <fstream>
+#include <string>
+
+#include "dLogger.h"
+#include "GeneralUtils.h"
+#include "CDClientDatabase.h"
+#include "BinaryPathFinder.h"
+
+Migration Migration::LoadMigration(const std::string& type, const std::string& dbType, const std::string& name) {
+	Migration migration{};
+	std::ifstream file(BinaryPathFinder::GetBinaryDir() / "migrations/" / type / dbType / name);
+
+	if (file.is_open()) {
+		std::string line;
+		std::string total = "";
+
+		while (std::getline(file, line)) {
+			total += line;
+		}
+
+		file.close();
+
+		migration.name = ;
+		migration.data = total;
+	}
+
+	return migration;
+}
+
+void MigrationManager::RunSQLiteMigrations() {
+	auto cdstmt = CDClientDatabase::CreatePreppedStmt("CREATE TABLE IF NOT EXISTS migration_history (name TEXT NOT NULL, date TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP);");
+	cdstmt.execQuery().finalize();
+	cdstmt.finalize();
+
+	for (const auto& entry : GeneralUtils::GetSqlFileNamesFromFolder((BinaryPathFinder::GetBinaryDir() / "migrations/cdserver/").string())) {
+		auto migration = Migration::LoadMigration("cdserver", "", entry);
+
+		if (migration.data.empty()) continue;
+
+		// Check if there is an entry in the migration history table on the cdclient database.
+		cdstmt = CDClientDatabase::CreatePreppedStmt("SELECT name FROM migration_history WHERE name = ?;");
+		cdstmt.bind((int32_t)1, migration.name.c_str());
+		auto cdres = cdstmt.execQuery();
+		bool doExit = !cdres.eof();
+		cdres.finalize();
+		cdstmt.finalize();
+
+		if (doExit) continue;
+
+		// Check first if there is entry in the migration history table on the main database.
+		stmt = Database::CreatePreppedStmt("SELECT name FROM migration_history WHERE name = ?;");
+		stmt->setString(1, migration.name.c_str());
+		auto* res = stmt->executeQuery();
+		doExit = res->next();
+		delete res;
+		delete stmt;
+		if (doExit) {
+			// Insert into cdclient database if there is an entry in the main database but not the cdclient database.
+			cdstmt = CDClientDatabase::CreatePreppedStmt("INSERT INTO migration_history (name) VALUES (?);");
+			cdstmt.bind((int32_t)1, migration.name.c_str());
+			cdstmt.execQuery().finalize();
+			cdstmt.finalize();
+			continue;
+		}
+
+		// Doing these 1 migration at a time since one takes a long time and some may think it is crashing.
+		// This will at the least guarentee that the full migration needs to be run in order to be counted as "migrated".
+		Game::logger->Log("MigrationRunner", "Executing migration: %s.  This may take a while.  Do not shut down server.", migration.name.c_str());
+		CDClientDatabase::ExecuteQuery("BEGIN TRANSACTION;");
+		for (const auto& dml : GeneralUtils::SplitString(migration.data, ';')) {
+			if (dml.empty()) continue;
+			try {
+				CDClientDatabase::ExecuteDML(dml.c_str());
+			} catch (CppSQLite3Exception& e) {
+				Game::logger->Log("MigrationRunner", "Encountered error running DML command: (%i) : %s", e.errorCode(), e.errorMessage());
+			}
+		}
+
+		// Insert into cdclient database.
+		cdstmt = CDClientDatabase::CreatePreppedStmt("INSERT INTO migration_history (name) VALUES (?);");
+		cdstmt.bind((int32_t)1, migration.name.c_str());
+		cdstmt.execQuery().finalize();
+		cdstmt.finalize();
+		CDClientDatabase::ExecuteQuery("COMMIT;");
+	}
+
+	Game::logger->Log("MigrationRunner", "CDServer database is up to date.");
+}

dDatabase/Databases/Migrations/MigrationManager.h

@@ -0,0 +1,17 @@
+#pragma once
+
+class DatabaseBase;
+
+struct Migration {
+	std::string data;
+	std::string name;
+
+	static Migration LoadMigration(const std::string& type, const std::string& dbType, const std::string& name);
+};
+
+class MigrationManager {
+public:
+	void RunMigrations(DatabaseBase* db);
+	void RunSQLiteMigrations();
+private:
+};

dDatabase/Databases/Migrations/MySQLMigration.cpp

@@ -0,0 +1,241 @@
+#include "MySQLMigration.h"
+
+#include <istream>
+
+#include "CDClientDatabase.h"
+#include "Game.h"
+#include "GeneralUtils.h"
+#include "dLogger.h"
+#include "BinaryPathFinder.h"
+#include "ZCompression.h"
+#include "tinyxml2.h"
+
+#include "../MySQL.h"
+
+void MigrationRunner::RunMigrations(DatabaseBase* db) {
+	auto database = dynamic_cast<MySQLDatabase*>(db);
+
+	auto* stmt = database->CreatePreppedStmt("CREATE TABLE IF NOT EXISTS migration_history (name TEXT NOT NULL, date TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP());");
+	stmt->execute();
+	delete stmt;
+
+	sql::SQLString finalSQL = "";
+	bool runSd0Migrations = false;
+	for (const auto& entry : GeneralUtils::GetSqlFileNamesFromFolder((BinaryPathFinder::GetBinaryDir() / "./migrations/dlu/mysql").string())) {
+		auto migration = Migration::LoadMigration("dlu", "mysql", entry);
+
+		if (migration.data.empty()) {
+			continue;
+		}
+
+		stmt = database->CreatePreppedStmt("SELECT name FROM migration_history WHERE name = ?;");
+		stmt->setString(1, migration.name.c_str());
+		auto* res = stmt->executeQuery();
+		bool doExit = res->next();
+		delete res;
+		delete stmt;
+		if (doExit) continue;
+
+		Game::logger->Log("MigrationRunner", "Running migration: %s", migration.name.c_str());
+		if (migration.name == "dlu/5_brick_model_sd0.sql") {
+			runSd0Migrations = true;
+		} else {
+			finalSQL.append(migration.data.c_str());
+		}
+
+		stmt = database->CreatePreppedStmt("INSERT INTO migration_history (name) VALUES (?);");
+		stmt->setString(1, migration.name.c_str());
+		stmt->execute();
+		delete stmt;
+	}
+
+	if (finalSQL.empty() && !runSd0Migrations) {
+		Game::logger->Log("MigrationRunner", "Server database is up to date.");
+		return;
+	}
+
+	if (!finalSQL.empty()) {
+		auto migration = GeneralUtils::SplitString(static_cast<std::string>(finalSQL), ';');
+		std::unique_ptr<sql::Statement> simpleStatement(Database::CreateStmt());
+		for (auto& query : migration) {
+			try {
+				if (query.empty()) continue;
+				simpleStatement->execute(query.c_str());
+			} catch (sql::SQLException& e) {
+				Game::logger->Log("MigrationRunner", "Encountered error running migration: %s", e.what());
+			}
+		}
+	}
+
+	// Do this last on the off chance none of the other migrations have been run yet.
+	if (runSd0Migrations) {
+		uint32_t numberOfUpdatedModels = UpdateBrickByBrickModelsToSd0();
+		Game::logger->Log("MasterServer", "%i models were updated from zlib to sd0.", numberOfUpdatedModels);
+		
+		uint32_t numberOfTruncatedModels = TruncateBrokenBrickByBrickXml();
+		Game::logger->Log("MasterServer", "%i models were truncated from the database.", numberOfTruncatedModels);
+	}
+}
+
+
+uint32_t TruncateBrokenBrickByBrickXml(MySQLDatabase* database) {
+	uint32_t modelsTruncated{};
+	auto modelsToTruncate = GetModelsFromDatabase(database);
+	
+	bool previousCommitValue = database->GetAutoCommit();
+	database->SetAutoCommit(false);
+	
+	while (modelsToTruncate->next()) {
+		std::unique_ptr<sql::PreparedStatement> ugcModelToDelete(database->CreatePreppedStmt("DELETE FROM ugc WHERE ugc.id = ?;"));
+		std::unique_ptr<sql::PreparedStatement> pcModelToDelete(database->CreatePreppedStmt("DELETE FROM properties_contents WHERE ugc_id = ?;"));
+		std::string completeUncompressedModel{};
+		uint32_t chunkCount{};
+		uint64_t modelId = modelsToTruncate->getInt(1);
+		std::unique_ptr<sql::Blob> modelAsSd0(modelsToTruncate->getBlob(2));
+		// Check that header is sd0 by checking for the sd0 magic.
+		if (CheckSd0Magic(modelAsSd0.get())) {
+			while (true) {
+				uint32_t chunkSize{};
+				modelAsSd0->read(reinterpret_cast<char*>(&chunkSize), sizeof(uint32_t)); // Extract chunk size from istream
+
+				// Check if good here since if at the end of an sd0 file, this will have eof flagged.
+				if (!modelAsSd0->good()) break;
+
+				std::unique_ptr<uint8_t[]> compressedChunk(new uint8_t[chunkSize]);
+				for (uint32_t i = 0; i < chunkSize; i++) {
+					compressedChunk[i] = modelAsSd0->get();
+				}
+
+				// Ignore the valgrind warning about uninitialized values.  These are discarded later when we know the actual uncompressed size.
+				std::unique_ptr<uint8_t[]> uncompressedChunk(new uint8_t[ZCompression::MAX_SD0_CHUNK_SIZE]);
+				int32_t err{};
+				int32_t actualUncompressedSize = ZCompression::Decompress(
+					compressedChunk.get(), chunkSize, uncompressedChunk.get(), ZCompression::MAX_SD0_CHUNK_SIZE, err);
+
+				if (actualUncompressedSize != -1) {
+					uint32_t previousSize = completeUncompressedModel.size();
+					completeUncompressedModel.append((char*)uncompressedChunk.get());
+					completeUncompressedModel.resize(previousSize + actualUncompressedSize);
+				} else {
+					Game::logger->Log("BrickByBrickFix", "Failed to inflate chunk %i for model %llu.  Error: %i", chunkCount, modelId, err);
+					break;
+				}
+				chunkCount++;
+			}
+			std::unique_ptr<tinyxml2::XMLDocument> document = std::make_unique<tinyxml2::XMLDocument>();
+			if (!document) {
+				Game::logger->Log("BrickByBrickFix", "Failed to initialize tinyxml document.  Aborting.");
+				return 0;
+			}
+
+			if (!(document->Parse(completeUncompressedModel.c_str(), completeUncompressedModel.size()) == tinyxml2::XML_SUCCESS)) {
+				if (completeUncompressedModel.find(
+					"</LXFML>",
+					completeUncompressedModel.length() >= 15 ? completeUncompressedModel.length() - 15 : 0) == std::string::npos
+					) {
+					Game::logger->Log("BrickByBrickFix",
+						"Brick-by-brick model %llu will be deleted!", modelId);
+					ugcModelToDelete->setInt64(1, modelsToTruncate->getInt64(1));
+					pcModelToDelete->setInt64(1, modelsToTruncate->getInt64(1));
+					ugcModelToDelete->execute();
+					pcModelToDelete->execute();
+					modelsTruncated++;
+				}
+			}
+		} else {
+			Game::logger->Log("BrickByBrickFix",
+				"Brick-by-brick model %llu will be deleted!", modelId);
+			ugcModelToDelete->setInt64(1, modelsToTruncate->getInt64(1));
+			pcModelToDelete->setInt64(1, modelsToTruncate->getInt64(1));
+			ugcModelToDelete->execute();
+			pcModelToDelete->execute();
+			modelsTruncated++;
+		}
+	}
+
+	database->Commit();
+	database->SetAutoCommit(previousCommitValue);
+	return modelsTruncated;
+}
+
+/**
+ * @brief Updates all current models in the database to have the Segmented Data 0 (SD0) format.
+ * Any models that do not start with zlib and best compression magic will not be updated.
+ *
+ * @return The number of models updated to SD0
+ */
+uint32_t UpdateBrickByBrickModelsToSd0(MySQLDatabase* database) {
+	uint32_t updatedModels = 0;
+	auto modelsToUpdate = GetModelsFromDatabase();
+	
+	auto previousAutoCommitState = database->GetAutoCommit();
+	database->SetAutoCommit(false);
+	
+	std::unique_ptr<sql::PreparedStatement> insertionStatement(database->CreatePreppedStmt("UPDATE ugc SET lxfml = ? WHERE id = ?;"));
+	while (modelsToUpdate->next()) {
+		int64_t modelId = modelsToUpdate->getInt64(1);
+		std::unique_ptr<sql::Blob> oldLxfml(modelsToUpdate->getBlob(2));
+		// Check if the stored blob starts with zlib magic (0x78 0xDA - best compression of zlib)
+		// If it does, convert it to sd0.
+		if (oldLxfml->get() == 0x78 && oldLxfml->get() == 0xDA) {
+
+			// Get and save size of zlib compressed chunk.
+			oldLxfml->seekg(0, std::ios::end);
+			uint32_t oldLxfmlSize = static_cast<uint32_t>(oldLxfml->tellg());
+			oldLxfml->seekg(0);
+
+			// Allocate 9 extra bytes.  5 for sd0 magic, 4 for the only zlib compressed size.
+			uint32_t oldLxfmlSizeWithHeader = oldLxfmlSize + 9;
+			std::unique_ptr<char[]> sd0ConvertedModel(new char[oldLxfmlSizeWithHeader]);
+
+			WriteSd0Magic(sd0ConvertedModel.get(), oldLxfmlSize);
+			for (uint32_t i = 9; i < oldLxfmlSizeWithHeader; i++) {
+				sd0ConvertedModel.get()[i] = oldLxfml->get();
+			}
+
+			std::string outputString(sd0ConvertedModel.get(), oldLxfmlSizeWithHeader);
+			std::istringstream outputStringStream(outputString);
+
+			insertionStatement->setBlob(1, static_cast<std::istream*>(&outputStringStream));
+			insertionStatement->setInt64(2, modelId);
+			try {
+				insertionStatement->executeUpdate();
+				Game::logger->Log("BrickByBrickFix", "Updated model %i to sd0", modelId);
+				updatedModels++;
+			} catch (sql::SQLException exception) {
+				Game::logger->Log(
+					"BrickByBrickFix",
+					"Failed to update model %i.  This model should be inspected manually to see why."
+					"The database error is %s", modelId, exception.what());
+			}
+		}
+	}
+	
+	database->Commit();
+	database->SetAutoCommit(previousAutoCommitState);
+	return updatedModels;
+}
+
+std::unique_ptr<sql::ResultSet> GetModelsFromDatabase(MySQLDatabase* database) {
+	std::unique_ptr<sql::PreparedStatement> modelsRawDataQuery(database->CreatePreppedStmt("SELECT id, lxfml FROM ugc;"));
+	return std::unique_ptr<sql::ResultSet>(modelsRawDataQuery->executeQuery());
+}
+
+/**
+ * @brief Writes sd0 magic at the front of a char*
+ *
+ * @param input the char* to write at the front of
+ * @param chunkSize The size of the first chunk to write the size of
+ */
+void WriteSd0Magic(char* input, uint32_t chunkSize) {
+	input[0] = 's';
+	input[1] = 'd';
+	input[2] = '0';
+	input[3] = 0x01;
+	input[4] = 0xFF;
+	*reinterpret_cast<uint32_t*>(input + 5) = chunkSize; // Write the integer to the character array
+}
+
+bool CheckSd0Magic(sql::Blob* streamToCheck) {
+	return streamToCheck->get() == 's' && streamToCheck->get() == 'd' && streamToCheck->get() == '0' && streamToCheck->get() == 0x01 && streamToCheck->get() == 0xFF;
+}

dDatabase/Databases/Migrations/MySQLMigration.h

@@ -0,0 +1,13 @@
+#pragma once
+
+#include <string>
+
+#include "MigrationManager.h"
+
+class MySQLMigrationManager : public MigrationManager {
+public:
+	void RunMigrations(DatabaseBase* db) override;
+	void RunSQLiteMigrations() override;
+private:
+
+};

dDatabase/Databases/MySQL.cpp

@@ -0,0 +1,651 @@
+#include "MySQL.h"
+
+#pragma warning (disable:4251)
+
+#include "Game.h"
+#include "dConfig.h"
+#include "dLogger.h"
+
+MySQLDatabase::MySQLDatabase(const std::string& host, const std::string& database, const std::string& username, const std::string& password) {
+	this->m_Host = host;
+	this->m_Database = database;
+	this->m_Username = username;
+	this->m_Password = password;
+
+	m_Driver = sql::mariadb::get_driver_instance();
+
+	sql::Properties properties;
+	
+	// The mariadb connector is *supposed* to handle unix:// and pipe:// prefixes to hostName, but there are bugs where
+	// 1) it tries to parse a database from the connection string (like in tcp://localhost:3001/darkflame) based on the
+	//    presence of a /
+	// 2) even avoiding that, the connector still assumes you're connecting with a tcp socket
+	// So, what we do in the presence of a unix socket or pipe is to set the hostname to the protocol and localhost,
+	// which avoids parsing errors while still ensuring the correct connection type is used, and then setting the appropriate
+	// property manually (which the URL parsing fails to do)
+	const std::string UNIX_PROTO = "unix://";
+	const std::string PIPE_PROTO = "pipe://";
+	if (this->m_Host.find(UNIX_PROTO) == 0) {
+		properties["hostName"] = "unix://localhost";
+		properties["localSocket"] = this->m_Host.substr(UNIX_PROTO.length()).c_str();
+	} else if (this->m_Host.find(PIPE_PROTO) == 0) {
+		properties["hostName"] = "pipe://localhost";
+		properties["pipe"] = this->m_Host.substr(PIPE_PROTO.length()).c_str();
+	} else {
+		properties["hostName"] = this->m_Host.c_str();
+	}
+	properties["user"] = this->m_Username.c_str();
+	properties["password"] = this->m_Password.c_str();
+	properties["autoReconnect"] = "true";
+
+	this->m_Properties = properties;
+	this->m_Database = database;
+}
+
+MySQLDatabase::~MySQLDatabase() {
+	this->Destroy();
+}
+
+void MySQLDatabase::Connect() {
+	if (this->m_Properties.find("localSocket") != this->m_Properties.end() || this->m_Properties.find("pipe") != this->m_Properties.end()) {
+		this->m_Connection = m_Driver->connect(this->m_Properties);
+	} else {
+		this->m_Connection = m_Driver->connect(
+			this->m_Properties["hostName"].c_str(),
+			this->m_Properties["user"].c_str(),
+			this->m_Properties["password"].c_str()
+		);
+	}
+	this->m_Connection->setSchema(this->m_Database.c_str());
+}
+
+void MySQLDatabase::Destroy() {
+	if (this->m_Connection != nullptr) {
+		this->m_Connection->close();
+		delete this->m_Connection;
+		this->m_Connection = nullptr;
+	}
+}
+
+sql::Statement* MySQLDatabase::CreateStmt() {
+	sql::Statement* toReturn = this->m_Connection->createStatement();
+	return toReturn;
+}
+
+sql::PreparedStatement* MySQLDatabase::CreatePreppedStmt(const std::string& query) {
+	const char* test = query.c_str();
+	size_t size = query.length();
+	sql::SQLString str(test, size);
+
+	if (!this->m_Connection) {
+		Connect();
+		Game::logger->Log("Database", "Trying to reconnect to MySQL");
+	}
+
+	if (!this->m_Connection->isValid() || this->m_Connection->isClosed()) {
+		delete this->m_Connection;
+
+		this->m_Connection = nullptr;
+
+		Connect();
+		Game::logger->Log("Database", "Trying to reconnect to MySQL from invalid or closed connection");
+	}
+
+	auto* stmt = this->m_Connection->prepareStatement(str);
+
+	return stmt;
+}
+
+std::unique_ptr<sql::PreparedStatement> MySQLDatabase::CreatePreppedStmtUnique(const std::string& query) {
+	std::unique_ptr<sql::PreparedStatement> stmt(CreatePreppedStmt(query));
+	return stmt;
+}
+
+std::unique_ptr<sql::ResultSet> MySQLDatabase::GetResultsOfStatement(sql::Statement* stmt) {
+	auto* res = stmt->executeQuery();
+	std::unique_ptr<sql::ResultSet> result(res);
+	return result;
+}
+
+
+void MySQLDatabase::Commit() {
+	this->m_Connection->commit();
+}
+
+bool MySQLDatabase::GetAutoCommit() {
+	// TODO This should not just access a pointer.  A future PR should update this
+	// to check for null and throw an error if the connection is not valid.
+	return m_Connection->getAutoCommit();
+}
+
+void MySQLDatabase::SetAutoCommit(bool value) {
+	// TODO This should not just access a pointer.  A future PR should update this
+	// to check for null and throw an error if the connection is not valid.
+	m_Connection->setAutoCommit(value);
+}
+
+SocketDescriptor MySQLDatabase::GetMasterServerIP() {
+	auto stmt = CreatePreppedStmtUnique("SELECT ip, port FROM servers WHERE name = 'master';");
+	auto res = GetResultsOfStatement(stmt.get());
+
+	while (res->next()) {
+		return SocketDescriptor(res->getInt("port"), res->getString("ip"));
+	}
+
+	return SocketDescriptor(0, "");
+}
+
+void MySQLDatabase::CreateServer(const std::string& name, const std::string& ip, uint16_t port, uint32_t state, uint32_t version) {
+	auto stmt = CreatePreppedStmtUnique("INSERT INTO servers (name, ip, port, state, version) VALUES (?, ?, ?, ?, ?);");
+	stmt->setString(1, name);
+	stmt->setString(2, ip);
+	stmt->setInt(3, port);
+	stmt->setInt(4, state);
+	stmt->setInt(5, version);
+
+	stmt->execute();
+}
+
+void MySQLDatabase::SetServerIpAndPortByName(const std::string& name, const std::string& ip, uint16_t port) {
+	auto stmt = CreatePreppedStmtUnique("UPDATE servers SET ip = ?, port = ? WHERE name = ?;");
+	stmt->setString(1, ip);
+	stmt->setInt(2, port);
+	stmt->setString(3, name);
+
+	stmt->execute();
+}
+
+std::vector<std::string> MySQLDatabase::GetAllCharacterNames() {
+	auto stmt = CreatePreppedStmtUnique("SELECT name FROM charinfo;");
+	auto res = GetResultsOfStatement(stmt.get());
+
+	std::vector<std::string> names;
+
+	while (res->next()) {
+		names.push_back(res->getString("name").c_str());
+	}
+
+	return names;
+}
+
+bool MySQLDatabase::IsCharacterNameAvailable(const std::string& name) {
+	auto stmt = CreatePreppedStmtUnique("SELECT name FROM charinfo WHERE name = ? OR pending_name = ?;");
+	stmt->setString(1, name);
+	stmt->setString(2, name);
+
+	auto res = GetResultsOfStatement(stmt.get());
+
+	return !res->next();
+}
+
+void MySQLDatabase::InsertIntoActivityLog(uint32_t playerId, uint32_t activityId, uint32_t timestamp, uint32_t zoneId) {
+	auto stmt = CreatePreppedStmtUnique("INSERT INTO activity_log (character_id, activity, time, map_id) VALUES (?, ?, ?, ?);");
+
+	stmt->setUInt(1, playerId);
+	stmt->setUInt(2, activityId);
+	stmt->setUInt(3, timestamp);
+	stmt->setUInt(4, zoneId);
+	
+	stmt->executeUpdate();
+}
+
+void MySQLDatabase::InsertIntoCommandLog(uint32_t playerId, const std::string& command) {
+	auto stmt = CreatePreppedStmtUnique("INSERT INTO command_log (character_id, command) VALUES (?, ?);");
+
+	stmt->setUInt(1, playerId);
+	stmt->setString(2, command);
+
+	stmt->executeUpdate();
+}
+
+CharacterInfo MySQLDatabase::GetCharacterInfoByID(uint32_t id) {
+	auto stmt = CreatePreppedStmtUnique("SELECT account_id, name, pending_name, needs_rename, prop_clone_id, permission_map FROM charinfo WHERE id = ? LIMIT 1;");
+	stmt->setUInt(1, id);
+
+	auto res = GetResultsOfStatement(stmt.get());
+
+	while (res->next()) {
+		CharacterInfo info{};
+		info.AccountID = res->getUInt("account_id");
+		info.ID = id;
+		info.Name = res->getString("name");
+		info.PendingName = res->getString("pending_name");
+		info.NameRejected = res->getBoolean("needs_rename");
+		info.PropertyCloneID = res->getUInt("prop_clone_id");
+		info.PermissionMap = (ePermissionMap)res->getUInt("permission_map");
+
+		return info;
+	}
+
+	return CharacterInfo{};
+}
+
+CharacterInfo MySQLDatabase::GetCharacterInfoByName(const std::string& name) {
+	auto stmt = CreatePreppedStmtUnique("SELECT id FROM charinfo WHERE name = ?");
+	stmt->setString(1, name);
+
+	auto res = GetResultsOfStatement(stmt.get());
+
+	while (res->next()) {
+		return GetCharacterInfoByID(res->getUInt("id"));
+	}
+
+	return CharacterInfo{};
+}
+
+uint32_t MySQLDatabase::GetLatestCharacterOfAccount(uint32_t id) {
+	auto stmt = CreatePreppedStmtUnique("SELECT id FROM charinfo WHERE account_id = ? ORDER BY last_login DESC LIMIT 1;");
+	stmt->setUInt(1, id);
+
+	auto res = GetResultsOfStatement(stmt.get());
+
+	while (res->next()) {
+		return res->getUInt("id");
+	}
+
+	return 0;
+}
+
+std::string MySQLDatabase::GetCharacterXMLByID(uint32_t id) {
+	auto stmt = CreatePreppedStmtUnique("SELECT xml_data FROM charxml WHERE id = ? LIMIT 1;");
+	stmt->setUInt(1, id);
+
+	auto res = GetResultsOfStatement(stmt.get());
+
+	while (res->next()) {
+		return res->getString("xml_data").c_str();
+	}
+
+	return "";
+}
+
+void MySQLDatabase::CreateCharacterXML(uint32_t id, const std::string& xml) {
+	auto stmt = CreatePreppedStmtUnique("INSERT INTO charxml (id, xml_data) VALUES (?, ?);");
+	stmt->setUInt(1, id);
+	stmt->setString(2, xml);
+
+	stmt->executeUpdate();
+}
+
+void MySQLDatabase::UpdateCharacterXML(uint32_t id, const std::string& xml) {
+	auto stmt = CreatePreppedStmtUnique("UPDATE charxml SET xml_data = ? WHERE id = ?;");
+	stmt->setString(1, xml);
+	stmt->setUInt(2, id);
+
+	stmt->executeUpdate();
+}
+
+void MySQLDatabase::CreateCharacter(uint32_t id, uint32_t account_id, const std::string& name, const std::string& pending_name, bool needs_rename, uint64_t last_login) {
+	auto stmt = CreatePreppedStmtUnique("INSERT INTO charinfo (id, account_id, name, pending_name, needs_rename, last_login) VALUES (?, ?, ?, ?, ?, ?);");
+	stmt->setUInt(1, id);
+	stmt->setUInt(2, account_id);
+	stmt->setString(3, name);
+	stmt->setString(4, pending_name);
+	stmt->setBoolean(5, needs_rename);
+	stmt->setUInt64(6, last_login);
+
+	stmt->execute();
+}
+
+void MySQLDatabase::ApproveCharacterName(uint32_t id, const std::string& newName) {
+	auto stmt = CreatePreppedStmtUnique("UPDATE charinfo SET name = ?, pending_name = '', needs_rename = 0, last_login = ? WHERE id = ? LIMIT 1");
+	stmt->setString(1, newName);
+	stmt->setUInt64(2, time(NULL));
+	stmt->setUInt(3, id);
+	stmt->execute();
+}
+
+void MySQLDatabase::SetPendingCharacterName(uint32_t id, const std::string& pendingName) {
+	auto stmt = CreatePreppedStmtUnique("UPDATE charinfo SET pending_name=?, needs_rename=0, last_login=? WHERE id=? LIMIT 1;");
+	stmt->setString(1, pendingName);
+	stmt->setUInt64(2, time(NULL));
+	stmt->setUInt(3, id);
+	stmt->execute();
+}
+
+void MySQLDatabase::UpdateCharacterLastLogin(uint32_t id, uint64_t time) {
+	auto stmt = CreatePreppedStmtUnique("UPDATE charinfo SET last_login = ? WHERE id = ? LIMIT 1;");
+	stmt->setUInt64(1, time);
+	stmt->setUInt(2, id);
+	stmt->execute();
+}
+
+void MySQLDatabase::DeleteCharacter(uint32_t id) {
+	auto stmt = CreatePreppedStmtUnique("DELETE FROM charxml WHERE id = ?;");
+	stmt->setUInt(1, id);
+	stmt->execute();
+
+	stmt = CreatePreppedStmtUnique("DELETE FROM command_log WHERE character_id = ?;");
+	stmt->setUInt(1, id);
+	stmt->execute();
+
+	stmt = CreatePreppedStmtUnique("DELETE FROM friends WHERE player_id = ? OR friend_id = ?;");
+	stmt->setUInt(1, id);
+	stmt->setUInt(2, id);
+	stmt->execute();
+
+	stmt = CreatePreppedStmtUnique("DELETE FROM leaderboard WHERE character_id = ?;");
+	stmt->setUInt(1, id);
+	stmt->execute();
+
+	stmt = CreatePreppedStmtUnique("DELETE FROM properties_contents WHERE property_id IN (SELECT id FROM properties WHERE owner_id = ?)");
+	stmt->setUInt(1, id);
+	stmt->execute();
+
+	stmt = CreatePreppedStmtUnique("DELETE FROM properties WHERE owner_id = ?;");
+	stmt->setUInt(1, id);
+	stmt->execute();
+
+	stmt = CreatePreppedStmtUnique("DELETE FROM ugc WHERE character_id = ?;");
+	stmt->setUInt(1, id);
+	stmt->execute();
+
+	stmt = CreatePreppedStmtUnique("DELETE FROM activity_log WHERE character_id = ?;");
+	stmt->setUInt(1, id);
+	stmt->execute();
+
+	stmt = CreatePreppedStmtUnique("DELETE FROM mail WHERE receiver_id = ?;");
+	stmt->setUInt(1, id);
+	stmt->execute();
+
+	stmt = CreatePreppedStmtUnique("DELETE FROM charinfo WHERE id = ?;");
+	stmt->setUInt(1, id);
+	stmt->execute();
+}
+
+AccountInfo MySQLDatabase::GetAccountByName(const std::string& name) {
+	auto stmt = CreatePreppedStmtUnique("SELECT id FROM accounts WHERE name = ? LIMIT 1;");
+	stmt->setString(1, name);
+	auto res = GetResultsOfStatement(stmt.get());
+
+	while (res->next()) {
+		return GetAccountByID(res->getUInt("id"));
+	}
+
+	return AccountInfo{};
+}
+
+bool MySQLDatabase::AreBestFriends(uint32_t goon1, uint32_t goon2) {
+	auto stmt = CreatePreppedStmtUnique("SELECT * FROM friends WHERE (player_id = ? AND friend_id = ?) OR (player_id = ? AND friend_id = ?) LIMIT 1;");
+	stmt->setUInt(1, goon1);
+	stmt->setUInt(2, goon2);
+	stmt->setUInt(3, goon2);
+	stmt->setUInt(4, goon1);
+
+	auto res = GetResultsOfStatement(stmt.get());
+
+	while (res->next()) {
+		return res->getInt("best_friend") == 3;
+	}
+
+	return false;
+}
+
+AccountInfo MySQLDatabase::GetAccountByID(uint32_t id) {
+	auto stmt = CreatePreppedStmtUnique("SELECT name, password, gm_level, locked, banned, play_key_id, created_at, mute_expire FROM accounts WHERE id = ? LIMIT 1;");
+	stmt->setUInt(1, id);
+
+	auto res = GetResultsOfStatement(stmt.get());
+
+	while (res->next()) {
+		AccountInfo info{};
+		info.ID = id;
+		info.Name = res->getString("name");
+		info.Password = res->getString("password");
+		info.MaxGMLevel = res->getUInt("gm_level");
+		info.Locked = res->getBoolean("locked");
+		info.Banned = res->getBoolean("banned");
+		info.PlayKeyID = res->getUInt("play_key_id");
+		info.CreatedAt = res->getUInt64("created_at");
+		info.MuteExpire = res->getUInt64("mute_expire");
+		
+		return info;
+	}
+
+	return AccountInfo{};
+}
+
+void MySQLDatabase::BanAccount(uint32_t id) {
+	auto stmt = CreatePreppedStmtUnique("UPDATE accounts SET banned = 1 WHERE id = ?;");
+	stmt->setUInt(1, id);
+	stmt->execute();
+}
+
+void MySQLDatabase::MuteAccount(uint32_t id, uint64_t muteExpireDate) {
+	auto stmt = CreatePreppedStmtUnique("UPDATE accounts SET mute_expire = ? WHERE id = ?;");
+	stmt->setUInt64(1, muteExpireDate);
+	stmt->setUInt(2, id);
+	stmt->execute();
+}
+
+std::vector<CharacterInfo> MySQLDatabase::GetAllCharactersByAccountID(uint32_t accountId) {
+	auto stmt = CreatePreppedStmtUnique("SELECT id FROM charinfo WHERE account_id = ? LIMIT 4;");
+	stmt->setUInt(1, accountId);
+
+	auto res = GetResultsOfStatement(stmt.get());
+
+	std::vector<CharacterInfo> characters;
+
+	while (res->next()) {
+		characters.push_back(GetCharacterInfoByID(res->getUInt("id")));
+	}
+
+	return characters;
+}
+
+void MySQLDatabase::CreatePetName(uint64_t id, const std::string& name, bool approved) {
+	auto stmt = CreatePreppedStmtUnique("INSERT INTO pet_names (id, name, approved) VALUES (?, ?, ?);");
+	stmt->setUInt64(1, id);
+	stmt->setString(2, name);
+	stmt->setBoolean(3, approved);
+	stmt->execute();
+}
+
+void MySQLDatabase::DeletePetName(uint64_t id) {
+	auto stmt = CreatePreppedStmtUnique("DELETE FROM pet_names WHERE id = ?;");
+	stmt->setUInt64(1, id);
+	stmt->execute();
+}
+
+PetName MySQLDatabase::GetPetName(uint64_t id) {
+	auto stmt = CreatePreppedStmtUnique("SELECT name, approved FROM pet_names WHERE id = ? LIMIT 1;");
+	stmt->setUInt64(1, id);
+
+	auto res = GetResultsOfStatement(stmt.get());
+
+	while (res->next()) {
+		PetName name{};
+		name.ID = id;
+		name.Name = res->getString("name");
+		name.Approved = res->getBoolean("approved");
+
+		return name;
+	}
+
+	return PetName{};
+}
+
+bool MySQLDatabase::IsKeyActive(uint32_t id) {
+	auto stmt = CreatePreppedStmtUnique("SELECT * FROM play_keys WHERE id = ? AND active = 1 LIMIT 1;");
+	stmt->setUInt(1, id);
+
+	auto res = GetResultsOfStatement(stmt.get());
+
+	while (res->next()) {
+		return true;
+	}
+
+	return false;
+}
+
+uint32_t MySQLDatabase::GetObjectIDTracker() {
+	auto stmt = CreatePreppedStmtUnique("SELECT last_object_id FROM object_id_tracker;");
+	auto res = GetResultsOfStatement(stmt.get());
+
+	while (res->next()) {
+		uint32_t id = res->getUInt("last_object_id");
+
+		return id;
+	}
+
+	auto stmt = CreatePreppedStmtUnique("INSERT INTO object_id_tracker (last_object_id) VALUES (1);");
+	stmt->execute();
+
+	return 1;
+}
+
+void MySQLDatabase::SetObjectIDTracker(uint32_t id) {
+	auto stmt = CreatePreppedStmtUnique("UPDATE object_id_tracker SET last_object_id = ?;");
+	stmt->setUInt(1, id);
+	stmt->execute();
+}
+
+MailInfo MySQLDatabase::GetMailByID(uint64_t id) {
+	auto stmt = CreatePreppedStmtUnique("SELECT * FROM mail WHERE id = ?;");
+	stmt->setUInt64(1, id);
+
+	auto res = GetResultsOfStatement(stmt.get());
+
+	if (res->next()) {
+		MailInfo mail{};
+		mail.ID = id;
+		mail.SenderID = res->getUInt("sender_id");
+		mail.SenderName = res->getString("sender_name");
+		mail.ReceiverID = res->getUInt("receiver_id");
+		mail.ReceiverName = res->getString("receiver_name");
+		mail.TimeSent = res->getUInt64("time_sent");
+		mail.Subject = res->getString("subject");
+		mail.Body = res->getString("body");
+		mail.AttachmentID = res->getUInt("attachment_id");
+		mail.AttachmentLOT = res->getUInt("attachment_lot");
+		mail.AttachmentSubkey = res->getUInt64("attachment_subkey");
+		mail.AttachmentCount = res->getUInt("attachment_count");
+		mail.WasRead = res->getBoolean("was_read");
+
+		return mail;
+	}
+
+	return MailInfo{};
+}
+
+std::vector<MailInfo> MySQLDatabase::GetAllRecentMailOfUser(uint32_t id) {
+	auto stmt = CreatePreppedStmtUnique("SELECT * FROM mail WHERE receiver_id = ? LIMIT 20;");
+	stmt->setUInt(1, id);
+
+	auto res = GetResultsOfStatement(stmt.get());
+
+	std::vector<MailInfo> mail;
+
+	while (res->next()) {
+		MailInfo mailInfo{};
+		mailInfo.ID = res->getUInt64("id");
+		mailInfo.SenderID = res->getUInt("sender_id");
+		mailInfo.SenderName = res->getString("sender_name");
+		mailInfo.ReceiverID = res->getUInt("receiver_id");
+		mailInfo.ReceiverName = res->getString("receiver_name");
+		mailInfo.TimeSent = res->getUInt64("time_sent");
+		mailInfo.Subject = res->getString("subject");
+		mailInfo.Body = res->getString("body");
+		mailInfo.AttachmentID = res->getUInt("attachment_id");
+		mailInfo.AttachmentLOT = res->getUInt("attachment_lot");
+		mailInfo.AttachmentSubkey = res->getUInt64("attachment_subkey");
+		mailInfo.AttachmentCount = res->getUInt("attachment_count");
+		mailInfo.WasRead = res->getBoolean("was_read");
+
+		mail.push_back(mailInfo);
+	}
+
+	return mail;
+}
+
+uint32_t MySQLDatabase::GetUnreadMailCountForUser(uint32_t id) {
+	auto stmt = CreatePreppedStmtUnique("SELECT COUNT(*) FROM mail WHERE receiver_id = ? AND was_read = 0;");
+	stmt->setUInt(1, id);
+
+	auto res = GetResultsOfStatement(stmt.get());
+
+	while (res->next()) {
+		return res->getUInt(1);
+	}
+
+	return 0;
+}
+
+void MySQLDatabase::WriteMail(uint32_t senderId, const std::string& senderName, uint32_t receiverId, const std::string& receiverName, uint64_t sendTime, const std::string& subject, const std::string& body, uint32_t attachmentId, uint32_t attachmentLot, uint64_t attachmentSubkey, uint32_t attachmentCount, bool wasRead) { 
+	auto stmt = CreatePreppedStmtUnique("INSERT INTO mail (sender_id, sender_name, receiver_id, receiver_name, time_sent, subject, body, attachment_id, attachment_lot, attachment_subkey, attachment_count, was_read) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);");
+	stmt->setUInt(1, senderId);
+	stmt->setString(2, senderName);
+	stmt->setUInt(3, receiverId);
+	stmt->setString(4, receiverName);
+	stmt->setUInt64(5, sendTime);
+	stmt->setString(6, subject);
+	stmt->setString(7, body);
+	stmt->setUInt(8, attachmentId);
+	stmt->setUInt(9, attachmentLot);
+	stmt->setUInt64(10, attachmentSubkey);
+	stmt->setUInt(11, attachmentCount);
+	stmt->setBoolean(12, wasRead);
+
+	stmt->execute();
+}
+
+void MySQLDatabase::DeleteMail(uint64_t id) {
+	auto stmt = CreatePreppedStmtUnique("DELETE FROM mail WHERE id = ?;");
+	stmt->setUInt64(1, id);
+	stmt->execute();
+}
+
+void MySQLDatabase::SetMailAsRead(uint64_t id) {
+	auto stmt = CreatePreppedStmtUnique("UPDATE mail SET was_read = 1 WHERE id = ?;");
+	stmt->setUInt64(1, id);
+	stmt->execute();
+}
+
+void MySQLDatabase::RemoveAttachmentFromMail(uint64_t id) {
+	auto stmt = CreatePreppedStmtUnique("UPDATE mail SET attachment_lot = 0 WHERE id = ?;");
+	stmt->setUInt64(1, id);
+	stmt->execute();
+}
+
+uint64_t MySQLDatabase::GetPropertyFromTemplateAndClone(uint32_t templateId, uint32_t cloneId) {
+	auto stmt = CreatePreppedStmtUnique("SELECT id FROM properties WHERE template_id = ? AND clone_id = ? LIMIT 1;");
+	stmt->setUInt(1, templateId);
+	stmt->setUInt(2, cloneId);
+
+	auto res = GetResultsOfStatement(stmt.get());
+
+	while (res->next()) {
+		return res->getUInt64("id");
+	}
+
+	return 0;
+}
+
+std::vector<uint32_t> MySQLDatabase::GetBBBModlesForProperty(uint32_t propertyId) {
+	auto stmt = CreatePreppedStmtUnique("SELECT ugc_id FROM properties_contents WHERE lot = 14 AND property_id = ?;");
+	stmt->setUInt(1, propertyId);
+
+	auto res = GetResultsOfStatement(stmt.get());
+
+	std::vector<uint32_t> models;
+
+	while (res->next()) {
+		models.push_back(res->getUInt("ugc_id"));
+	}
+
+	return models;
+}
+
+std::istream* MySQLDatabase::GetLXFMLFromID(uint32_t id) {
+	auto stmt = CreatePreppedStmtUnique("SELECT lxfml FROM ugc WHERE id = ? LIMIT 1;");
+	stmt->setUInt(1, id);
+
+	auto res = GetResultsOfStatement(stmt.get());
+
+	while (res->next()) {
+		std::istream* blob = res->getBlob("lxfml");
+		return blob;
+	}
+
+	return new std::istream();
+}

dDatabase/Databases/MySQL.h

@@ -0,0 +1,99 @@
+#pragma once
+
+#include "DatabaseBase.h"
+
+#include <string>
+#include <conncpp.hpp>
+
+class MySqlException : public std::runtime_error {
+public:
+	MySqlException() : std::runtime_error("MySQL error!") {}
+	MySqlException(const std::string& msg) : std::runtime_error(msg.c_str()) {}
+};
+
+class MySQLDatabase : public DatabaseBase {
+public:
+	MySQLDatabase(const std::string& host, const std::string& database, const std::string& username, const std::string& password);
+	~MySQLDatabase();
+
+	void Connect() override;
+	void Destroy() override;
+
+	sql::Statement* CreateStmt();
+	sql::PreparedStatement* CreatePreppedStmt(const std::string& query);
+	
+	std::unique_ptr<sql::PreparedStatement> CreatePreppedStmtUnique(const std::string& query);
+	std::unique_ptr<sql::ResultSet> GetResultsOfStatement(sql::Statement* stmt);
+
+	void Commit();
+	bool GetAutoCommit();
+	void SetAutoCommit(bool value);
+
+	SocketDescriptor GetMasterServerIP() override;
+
+	void CreateServer(const std::string& name, const std::string& ip, uint16_t port, uint32_t state, uint32_t version) override;
+	void SetServerIpAndPortByName(const std::string& name, const std::string& ip, uint16_t port) override;
+
+	void InsertIntoActivityLog(uint32_t playerId, uint32_t activityId, uint32_t timestamp, uint32_t zoneId) override;
+	void InsertIntoCommandLog(uint32_t playerId, const std::string& command) override;
+
+	CharacterInfo GetCharacterInfoByID(uint32_t id) override;
+	CharacterInfo GetCharacterInfoByName(const std::string& name) override;
+	std::string GetCharacterXMLByID(uint32_t id) override;
+	std::vector<std::string> GetAllCharacterNames() override;
+	std::vector<CharacterInfo> GetAllCharactersByAccountID(uint32_t accountId) override;
+	bool IsCharacterNameAvailable(const std::string& name) override;
+
+	void CreateCharacterXML(uint32_t id, const std::string& xml) override;
+	void UpdateCharacterXML(uint32_t id, const std::string& xml) override;
+	void CreateCharacter(uint32_t id, uint32_t account_id, const std::string& name, const std::string& pending_name, bool needs_rename, uint64_t last_login) override;
+	void ApproveCharacterName(uint32_t id, const std::string& newName) override;
+	void SetPendingCharacterName(uint32_t id, const std::string& pendingName) override;
+	void UpdateCharacterLastLogin(uint32_t id, uint64_t time) override;
+
+	void DeleteCharacter(uint32_t id) override;
+
+	bool AreBestFriends(uint32_t charId1, uint32_t charId2) override;
+
+	AccountInfo GetAccountByName(const std::string& name) override;
+	AccountInfo GetAccountByID(uint32_t id) override;
+	uint32_t GetLatestCharacterOfAccount(uint32_t id) override;
+
+	void BanAccount(uint32_t id) override;
+	void MuteAccount(uint32_t id, uint64_t muteExpireDate) override;
+
+	void CreatePetName(uint64_t id, const std::string& name, bool approved) override;
+	
+	void DeletePetName(uint64_t id) override;
+
+	PetName GetPetName(uint64_t id) override;
+
+	bool IsKeyActive(uint32_t id) override;
+
+	uint32_t GetObjectIDTracker() override;
+
+	void SetObjectIDTracker(uint32_t id) override;
+
+	MailInfo GetMailByID(uint64_t id) override;
+	std::vector<MailInfo> GetAllRecentMailOfUser(uint32_t id) override;
+	uint32_t GetUnreadMailCountForUser(uint32_t id) override;
+
+	void WriteMail(uint32_t senderId, const std::string& senderName, uint32_t receiverId, const std::string& receiverName, uint64_t sendTime, const std::string& subject, const std::string& body, uint32_t attachmentId = 0, uint32_t attachmentLot = 0, uint64_t attachmentSubkey = 0, uint32_t attachmentCount = 0, bool wasRead = false) override;
+	void SetMailAsRead(uint64_t id) override;
+	void RemoveAttachmentFromMail(uint64_t id) override;
+
+	void DeleteMail(uint64_t id) override;
+
+	uint64_t GetPropertyFromTemplateAndClone(uint32_t templateId, uint32_t cloneId) override;
+	std::vector<uint32_t> GetBBBModlesForProperty(uint32_t propertyId) override;
+	std::istream GetLXFMLFromID(uint32_t id) override;
+private:
+	std::string m_Host;
+	std::string m_Database;
+	std::string m_Username;
+	std::string m_Password;
+
+	sql::Connection* m_Connection;
+	sql::Driver* m_Driver;
+	sql::Properties m_Properties;
+};

dDatabase/Databases/Structures.h

@@ -0,0 +1,49 @@
+#pragma once
+
+#include <string>
+
+#include "ePermissionMap.h"
+
+struct CharacterInfo {
+	uint32_t AccountID;
+	uint32_t ID;
+	std::string Name;
+	std::string PendingName;
+	bool NameRejected;
+	uint32_t PropertyCloneID;
+	ePermissionMap PermissionMap;
+};
+
+struct AccountInfo {
+	uint32_t ID;
+	std::string Name;
+	std::string Password;
+	uint32_t MaxGMLevel;
+	bool Locked;
+	bool Banned;
+	uint32_t PlayKeyID;
+	uint64_t CreatedAt;
+	uint64_t MuteExpire;
+};
+
+struct PetName {
+	uint64_t ID;
+	std::string Name;
+	bool Approved;
+};
+
+struct MailInfo {
+	uint64_t ID;
+	uint32_t SenderID;
+	std::string SenderName; 
+	uint32_t ReceiverID;
+	std::string ReceiverName;
+	uint64_t TimeSent;
+	std::string Subject;
+	std::string Body;
+	uint32_t AttachmentID;
+	uint32_t AttachmentLOT;
+	uint64_t AttachmentSubkey;
+	uint32_t AttachmentCount;
+	bool WasRead;
+};

dDatabase/GameDatabase/CMakeLists.txt

@@ -1,12 +0,0 @@
-set(DDATABASE_GAMEDATABASE_SOURCES
-	"Database.cpp"
-	"MigrationRunner.cpp"
-)
-
-add_subdirectory(MySQL)
-
-foreach(file ${DDATABSE_DATABSES_MYSQL_SOURCES})
-	set(DDATABASE_GAMEDATABASE_SOURCES ${DDATABASE_GAMEDATABASE_SOURCES} "MySQL/${file}")
-endforeach()
-
-set(DDATABASE_GAMEDATABASE_SOURCES ${DDATABASE_GAMEDATABASE_SOURCES} PARENT_SCOPE)

dDatabase/GameDatabase/Database.cpp

@@ -1,40 +0,0 @@
-#include "Database.h"
-#include "Game.h"
-#include "dConfig.h"
-#include "Logger.h"
-#include "MySQLDatabase.h"
-#include "DluAssert.h"
-
-#pragma warning (disable:4251) //Disables SQL warnings
-
-namespace {
-	GameDatabase* database = nullptr;
-}
-
-void Database::Connect() {
-	if (database) {
-		LOG("Tried to connect to database when it's already connected!");
-		return;
-	}
-
-	database = new MySQLDatabase();
-	database->Connect();
-}
-
-GameDatabase* Database::Get() {
-	if (!database) {
-		LOG("Tried to get database when it's not connected!");
-		Connect();
-	}
-	return database;
-}
-
-void Database::Destroy(std::string source) {
-	if (database) {
-		database->Destroy(source);
-		delete database;
-		database = nullptr;
-	} else {
-		LOG("Trying to destroy database when it's not connected!");
-	}
-}

dDatabase/GameDatabase/Database.h

@@ -1,12 +0,0 @@
-#pragma once
-
-#include <string>
-#include <conncpp.hpp>
-
-#include "GameDatabase.h"
-
-namespace Database {
-	void Connect();
-	GameDatabase* Get();
-	void Destroy(std::string source = "");
-};

dDatabase/GameDatabase/GameDatabase.h

@@ -1,55 +0,0 @@
-#ifndef __GAMEDATABASE__H__
-#define __GAMEDATABASE__H__
-
-#include <optional>
-
-#include "ILeaderboard.h"
-#include "IPlayerCheatDetections.h"
-#include "ICommandLog.h"
-#include "IMail.h"
-#include "IObjectIdTracker.h"
-#include "IPlayKeys.h"
-#include "IServers.h"
-#include "IBugReports.h"
-#include "IPropertyContents.h"
-#include "IProperty.h"
-#include "IPetNames.h"
-#include "ICharXml.h"
-#include "IMigrationHistory.h"
-#include "IUgc.h"
-#include "IFriends.h"
-#include "ICharInfo.h"
-#include "IAccounts.h"
-#include "IActivityLog.h"
-
-namespace sql {
-	class Statement;
-	class PreparedStatement;
-};
-
-#ifdef _DEBUG
-#  define DLU_SQL_TRY_CATCH_RETHROW(x) do { try { x; } catch (sql::SQLException& ex) { LOG("SQL Error: %s", ex.what()); throw; } } while(0)
-#else
-#  define DLU_SQL_TRY_CATCH_RETHROW(x) x
-#endif // _DEBUG
-
-class GameDatabase :
-	public IPlayKeys, public ILeaderboard, public IObjectIdTracker, public IServers,
-	public IMail, public ICommandLog, public IPlayerCheatDetections, public IBugReports,
-	public IPropertyContents, public IProperty, public IPetNames, public ICharXml,
-	public IMigrationHistory, public IUgc, public IFriends, public ICharInfo,
-	public IAccounts, public IActivityLog {
-public:
-	virtual ~GameDatabase() = default;
-	// TODO: These should be made private.
-	virtual void Connect() = 0;
-	virtual void Destroy(std::string source = "") = 0;
-	virtual void ExecuteCustomQuery(const std::string_view query) = 0;
-	virtual sql::PreparedStatement* CreatePreppedStmt(const std::string& query) = 0;
-	virtual void Commit() = 0;
-	virtual bool GetAutoCommit() = 0;
-	virtual void SetAutoCommit(bool value) = 0;
-	virtual void DeleteCharacter(const uint32_t characterId) = 0;
-};
-
-#endif  //!__GAMEDATABASE__H__

dDatabase/GameDatabase/ITables/IAccounts.h

@@ -1,37 +0,0 @@
-#ifndef __IACCOUNTS__H__
-#define __IACCOUNTS__H__
-
-#include <cstdint>
-#include <optional>
-#include <string_view>
-
-enum class eGameMasterLevel : uint8_t;
-
-class IAccounts {
-public:
-	struct Info {
-		std::string bcryptPassword;
-		uint32_t id{};
-		uint32_t playKeyId{};
-		bool banned{};
-		bool locked{};
-		eGameMasterLevel maxGmLevel{};
-	};
-
-	// Get the account info for the given username.
-	virtual std::optional<IAccounts::Info> GetAccountInfo(const std::string_view username) = 0;
-
-	// Update the account's unmute time.
-	virtual void UpdateAccountUnmuteTime(const uint32_t accountId, const uint64_t timeToUnmute) = 0;
-
-	// Update the account's ban status.
-	virtual void UpdateAccountBan(const uint32_t accountId, const bool banned) = 0;
-
-	// Update the account's password.
-	virtual void UpdateAccountPassword(const uint32_t accountId, const std::string_view bcryptpassword) = 0;
-
-	// Add a new account to the database.
-	virtual void InsertNewAccount(const std::string_view username, const std::string_view bcryptpassword) = 0;
-};
-
-#endif  //!__IACCOUNTS__H__

dDatabase/GameDatabase/ITables/IActivityLog.h

@@ -1,19 +0,0 @@
-#ifndef __IACTIVITYLOG__H__
-#define __IACTIVITYLOG__H__
-
-#include <cstdint>
-
-#include "dCommonVars.h"
-
-enum class eActivityType : uint32_t {
-	PlayerLoggedIn,
-	PlayerLoggedOut,
-};
-
-class IActivityLog {
-public:
-	// Update the activity log for the given account.
-	virtual void UpdateActivityLog(const uint32_t characterId, const eActivityType activityType, const LWOMAPID mapId) = 0;
-};
-
-#endif  //!__IACTIVITYLOG__H__

dDatabase/GameDatabase/ITables/IBugReports.h

@@ -1,20 +0,0 @@
-#ifndef __IBUGREPORTS__H__
-#define __IBUGREPORTS__H__
-
-#include <cstdint>
-#include <string_view>
-
-class IBugReports {
-public:
-	struct Info {
-		std::string body;
-		std::string clientVersion;
-		std::string otherPlayer;
-		std::string selection;
-		uint32_t characterId{};
-	};
-
-	// Add a new bug report to the database.
-	virtual void InsertNewBugReport(const Info& info) = 0;
-};
-#endif  //!__IBUGREPORTS__H__

dDatabase/GameDatabase/ITables/ICharInfo.h

@@ -1,49 +0,0 @@
-#ifndef __ICHARINFO__H__
-#define __ICHARINFO__H__
-
-#include <cstdint>
-#include <optional>
-#include <string>
-#include <string_view>
-#include <vector>
-
-#include "ePermissionMap.h"
-
-class ICharInfo {
-public:
-	struct Info {
-		std::string name;
-		std::string pendingName;
-		uint32_t id{};
-		uint32_t accountId{};
-		bool needsRename{};
-		LWOCLONEID cloneId{};
-		ePermissionMap permissionMap{};
-	};
-
-	// Get the approved names of all characters.
-	virtual std::vector<std::string> GetApprovedCharacterNames() = 0;
-
-	// Get the character info for the given character id.
-	virtual std::optional<ICharInfo::Info> GetCharacterInfo(const uint32_t charId) = 0;
-
-	// Get the character info for the given character name.
-	virtual std::optional<ICharInfo::Info> GetCharacterInfo(const std::string_view name) = 0;
-	
-	// Get the character ids for the given account.
-	virtual std::vector<uint32_t> GetAccountCharacterIds(const uint32_t accountId) = 0;
-
-	// Insert a new character into the database.
-	virtual void InsertNewCharacter(const ICharInfo::Info info) = 0;
-
-	// Set the name of the given character.
-	virtual void SetCharacterName(const uint32_t characterId, const std::string_view name) = 0;
-
-	// Set the pending name of the given character.
-	virtual void SetPendingCharacterName(const uint32_t characterId, const std::string_view name) = 0;
-
-	// Updates the given character ids last login to be right now.
-	virtual void UpdateLastLoggedInCharacter(const uint32_t characterId) = 0;
-};
-
-#endif  //!__ICHARINFO__H__

dDatabase/GameDatabase/ITables/ICharXml.h

@@ -1,20 +0,0 @@
-#ifndef __ICHARXML__H__
-#define __ICHARXML__H__
-
-#include <cstdint>
-#include <string>
-#include <string_view>
-
-class ICharXml {
-public:
-	// Get the character xml for the given character id.
-	virtual std::string GetCharacterXml(const uint32_t charId) = 0;
-
-	// Update the character xml for the given character id.
-	virtual void UpdateCharacterXml(const uint32_t charId, const std::string_view lxfml) = 0;
-
-	// Insert the character xml for the given character id.
-	virtual void InsertCharacterXml(const uint32_t characterId, const std::string_view lxfml) = 0;
-};
-
-#endif  //!__ICHARXML__H__

dDatabase/GameDatabase/ITables/ICommandLog.h

@@ -1,14 +0,0 @@
-#ifndef __ICOMMANDLOG__H__
-#define __ICOMMANDLOG__H__
-
-#include <cstdint>
-#include <string_view>
-
-class ICommandLog {
-public:	
-
-	// Insert a new slash command log entry.
-	virtual void InsertSlashCommandUsage(const uint32_t characterId, const std::string_view command) = 0;
-};
-
-#endif  //!__ICOMMANDLOG__H__

dDatabase/GameDatabase/ITables/IFriends.h

@@ -1,32 +0,0 @@
-#ifndef __IFRIENDS__H__
-#define __IFRIENDS__H__
-
-#include <cstdint>
-#include <optional>
-#include <vector>
-
-class IFriends {
-public:
-	struct BestFriendStatus {
-		uint32_t playerCharacterId{};
-		uint32_t friendCharacterId{};
-		uint32_t bestFriendStatus{};
-	};
-
-	// Get the friends list for the given character id.
-	virtual std::vector<FriendData> GetFriendsList(const uint32_t charId) = 0;
-
-	// Get the best friend status for the given player and friend character ids.
-	virtual std::optional<IFriends::BestFriendStatus> GetBestFriendStatus(const uint32_t playerCharacterId, const uint32_t friendCharacterId) = 0;
-
-	// Set the best friend status for the given player and friend character ids.
-	virtual void SetBestFriendStatus(const uint32_t playerCharacterId, const uint32_t friendCharacterId, const uint32_t bestFriendStatus) = 0;
-
-	// Add a friend to the given character id.
-	virtual void AddFriend(const uint32_t playerCharacterId, const uint32_t friendCharacterId) = 0;
-
-	// Remove a friend from the given character id.
-	virtual void RemoveFriend(const uint32_t playerCharacterId, const uint32_t friendCharacterId) = 0;
-};
-
-#endif  //!__IFRIENDS__H__

dDatabase/GameDatabase/ITables/ILeaderboard.h

@@ -1,14 +0,0 @@
-#ifndef __ILEADERBOARD__H__
-#define __ILEADERBOARD__H__
-
-#include <cstdint>
-#include <optional>
-
-class ILeaderboard {
-public:
-
-	// Get the donation total for the given activity id.
-	virtual std::optional<uint32_t> GetDonationTotal(const uint32_t activityId) = 0;
-};
-
-#endif  //!__ILEADERBOARD__H__

dDatabase/GameDatabase/ITables/IMail.h

@@ -1,54 +0,0 @@
-#ifndef __IMAIL__H__
-#define __IMAIL__H__
-
-#include <cstdint>
-#include <optional>
-#include <string_view>
-
-#include "dCommonVars.h"
-#include "NiQuaternion.h"
-#include "NiPoint3.h"
-
-class IMail {
-public:
-	struct MailInfo {
-		std::string senderUsername;
-		std::string recipient;
-		std::string subject;
-		std::string body;
-		uint64_t id{};
-		uint32_t senderId{};
-		uint32_t receiverId{};
-		uint64_t timeSent{};
-		bool wasRead{};
-		struct {
-			LWOOBJID itemID{};
-			int32_t itemCount{};
-			LOT itemLOT{};
-			LWOOBJID itemSubkey{};
-		};
-	};
-
-	// Insert a new mail into the database.
-	virtual void InsertNewMail(const MailInfo& mail) = 0;
-
-	// Get the mail for the given character id.
-	virtual std::vector<MailInfo> GetMailForPlayer(const uint32_t characterId, const uint32_t numberOfMail) = 0;
-
-	// Get the mail for the given mail id.
-	virtual std::optional<MailInfo> GetMail(const uint64_t mailId) = 0;
-
-	// Get the number of unread mail for the given character id.
-	virtual uint32_t GetUnreadMailCount(const uint32_t characterId) = 0;
-
-	// Mark the given mail as read.
-	virtual void MarkMailRead(const uint64_t mailId) = 0;
-
-	// Claim the item from the given mail.
-	virtual void ClaimMailItem(const uint64_t mailId) = 0;
-
-	// Delete the given mail.
-	virtual void DeleteMail(const uint64_t mailId) = 0;
-};
-
-#endif  //!__IMAIL__H__

dDatabase/GameDatabase/ITables/IMigrationHistory.h

@@ -1,17 +0,0 @@
-#ifndef __IMIGRATIONHISTORY__H__
-#define __IMIGRATIONHISTORY__H__
-
-#include <string_view>
-
-class IMigrationHistory {
-public:
-	// Create the migration history table.
-	virtual void CreateMigrationHistoryTable() = 0;
-
-	// Check if the given migration has been run.
-	virtual bool IsMigrationRun(const std::string_view str) = 0;
-
-	// Insert the given migration into the migration history table.
-	virtual void InsertMigration(const std::string_view str) = 0;
-};
-#endif  //!__IMIGRATIONHISTORY__H__

dDatabase/GameDatabase/ITables/IObjectIdTracker.h

@@ -1,19 +0,0 @@
-#ifndef __IOBJECTIDTRACKER__H__
-#define __IOBJECTIDTRACKER__H__
-
-#include <cstdint>
-#include <optional>
-
-class IObjectIdTracker {
-public:
-	// Get the current persistent id.
-	virtual std::optional<uint32_t> GetCurrentPersistentId() = 0;
-
-	// Insert the default persistent id.
-	virtual void InsertDefaultPersistentId() = 0;
-
-	// Update the persistent id.
-	virtual void UpdatePersistentId(const uint32_t newId) = 0;
-};
-
-#endif  //!__IOBJECTIDTRACKER__H__

dDatabase/GameDatabase/ITables/IPetNames.h

@@ -1,21 +0,0 @@
-#ifndef __IPETNAMES__H__
-#define __IPETNAMES__H__
-
-#include <cstdint>
-#include <optional>
-
-class IPetNames {
-public:
-	struct Info {
-		std::string petName;
-		int32_t approvalStatus{};
-	};
-
-	// Set the pet name moderation status for the given pet id.
-	virtual void SetPetNameModerationStatus(const LWOOBJID& petId, const IPetNames::Info& info) = 0;
-
-	// Get pet info for the given pet id.
-	virtual std::optional<IPetNames::Info> GetPetNameInfo(const LWOOBJID& petId) = 0;
-};
-
-#endif  //!__IPETNAMES__H__

dDatabase/GameDatabase/ITables/IPlayKeys.h

@@ -1,15 +0,0 @@
-#ifndef __IPLAYKEYS__H__
-#define __IPLAYKEYS__H__
-
-#include <cstdint>
-#include <optional>
-
-class IPlayKeys {
-public:
-	// Get the playkey id for the given playkey.
-	// Optional of bool may seem pointless, however the optional indicates if the playkey exists
-	// and the bool indicates if the playkey is active.
-	virtual std::optional<bool> IsPlaykeyActive(const int32_t playkeyId) = 0;
-};
-
-#endif  //!__IPLAYKEYS__H__

dDatabase/GameDatabase/ITables/IPlayerCheatDetections.h

@@ -1,20 +0,0 @@
-#ifndef __IPLAYERCHEATDETECTIONS__H__
-#define __IPLAYERCHEATDETECTIONS__H__
-
-#include <cstdint>
-#include <optional>
-
-class IPlayerCheatDetections {
-public:
-	struct Info {
-		std::optional<uint32_t> userId = std::nullopt;
-		std::string username;
-		std::string systemAddress;
-		std::string extraMessage;
-	};
-
-	// Insert a new cheat detection.
-	virtual void InsertCheatDetection(const IPlayerCheatDetections::Info& info) = 0;
-};
-
-#endif  //!__IPLAYERCHEATDETECTIONS__H__

dDatabase/GameDatabase/ITables/IProperty.h

@@ -1,38 +0,0 @@
-#ifndef __IPROPERTY__H__
-#define __IPROPERTY__H__
-
-#include <cstdint>
-#include <optional>
-
-class IProperty {
-public:
-	struct Info {
-		std::string name;
-		std::string description;
-		std::string rejectionReason;
-		LWOOBJID id{};
-		uint32_t ownerId{};
-		LWOCLONEID cloneId{};
-		int32_t privacyOption{};
-		uint32_t modApproved{};
-		uint32_t lastUpdatedTime{};
-		uint32_t claimedTime{};
-		uint32_t reputation{};
-	};
-
-	// Get the property info for the given property id.
-	virtual std::optional<IProperty::Info> GetPropertyInfo(const LWOMAPID mapId, const LWOCLONEID cloneId) = 0;
-
-	// Update the property moderation info for the given property id.
-	virtual void UpdatePropertyModerationInfo(const IProperty::Info& info) = 0;
-	
-	// Update the property details for the given property id.
-	virtual void UpdatePropertyDetails(const IProperty::Info& info) = 0;
-
-	// Update the property performance cost for the given property id.
-	virtual void UpdatePerformanceCost(const LWOZONEID& zoneId, const float performanceCost) = 0;
-	
-	// Insert a new property into the database.
-	virtual void InsertNewProperty(const IProperty::Info& info, const uint32_t templateId, const LWOZONEID& zoneId) = 0;
-};
-#endif  //!__IPROPERTY__H__

dDatabase/GameDatabase/ITables/IPropertyContents.h

@@ -1,40 +0,0 @@
-#ifndef __IPROPERTIESCONTENTS__H__
-#define __IPROPERTIESCONTENTS__H__
-
-#include <cstdint>
-#include <string_view>
-
-class IPropertyContents {
-public:	
-	struct Model {
-		inline bool operator==(const LWOOBJID& other) const noexcept {
-			return id == other;
-		}
-
-		NiPoint3 position;
-		NiQuaternion rotation;
-		LWOOBJID id{};
-		LOT lot{};
-		uint32_t ugcId{};
-	};
-
-	// Inserts a new UGC model into the database.
-	virtual void InsertNewUgcModel(
-		std::istringstream& sd0Data,
-		const uint32_t blueprintId,
-		const uint32_t accountId,
-		const uint32_t characterId) = 0;
-
-	// Get the property models for the given property id.
-	virtual std::vector<IPropertyContents::Model> GetPropertyModels(const LWOOBJID& propertyId) = 0;
-
-	// Insert a new property model into the database.
-	virtual void InsertNewPropertyModel(const LWOOBJID& propertyId, const IPropertyContents::Model& model, const std::string_view name) = 0;
-
-	// Update the model position and rotation for the given property id.
-	virtual void UpdateModelPositionRotation(const LWOOBJID& propertyId, const NiPoint3& position, const NiQuaternion& rotation) = 0;
-
-	// Remove the model for the given property id.
-	virtual void RemoveModel(const LWOOBJID& modelId) = 0;
-};
-#endif  //!__IPROPERTIESCONTENTS__H__

dDatabase/GameDatabase/ITables/IServers.h

@@ -1,21 +0,0 @@
-#ifndef __ISERVERS__H__
-#define __ISERVERS__H__
-
-#include <cstdint>
-#include <optional>
-
-class IServers {
-public:
-	struct MasterInfo {
-		std::string ip;
-		uint32_t port{};
-	};
-
-	// Set the master server ip and port.
-	virtual void SetMasterIp(const std::string_view ip, const uint32_t port) = 0;
-
-	// Get the master server info.
-	virtual std::optional<MasterInfo> GetMasterInfo() = 0;
-};
-
-#endif  //!__ISERVERS__H__

dDatabase/GameDatabase/ITables/IUgc.h

@@ -1,32 +0,0 @@
-#ifndef __IUGC__H__
-#define __IUGC__H__
-
-#include <cstdint>
-#include <sstream>
-#include <optional>
-#include <string>
-#include <string_view>
-
-class IUgc {
-public:
-	struct Model {
-		std::stringstream lxfmlData;
-		LWOOBJID id{};
-	};
-
-	// Gets all UGC models for the given property id.
-	virtual std::vector<IUgc::Model> GetUgcModels(const LWOOBJID& propertyId) = 0;
-
-	// Gets all Ugcs models.
-	virtual std::vector<IUgc::Model> GetAllUgcModels() = 0;
-	
-	// Removes ugc models that are not referenced by any property.
-	virtual void RemoveUnreferencedUgcModels() = 0;
-
-	// Deletes the ugc model for the given model id.
-	virtual void DeleteUgcModelData(const LWOOBJID& modelId) = 0;
-
-	// Inserts a new UGC model into the database.
-	virtual void UpdateUgcModelData(const LWOOBJID& modelId, std::istringstream& lxfml) = 0;
-};
-#endif  //!__IUGC__H__

dDatabase/GameDatabase/MigrationRunner.cpp

@@ -1,133 +0,0 @@
-#include "MigrationRunner.h"
-
-#include "BrickByBrickFix.h"
-#include "CDClientDatabase.h"
-#include "Database.h"
-#include "Game.h"
-#include "GeneralUtils.h"
-#include "Logger.h"
-#include "BinaryPathFinder.h"
-
-#include <fstream>
-
-Migration LoadMigration(std::string path) {
-	Migration migration{};
-	std::ifstream file(BinaryPathFinder::GetBinaryDir() / "migrations/" / path);
-
-	if (file.is_open()) {
-		std::string line;
-		std::string total = "";
-
-		while (std::getline(file, line)) {
-			total += line;
-		}
-
-		file.close();
-
-		migration.name = path;
-		migration.data = total;
-	}
-
-	return migration;
-}
-
-void MigrationRunner::RunMigrations() {
-	Database::Get()->CreateMigrationHistoryTable();
-
-	sql::SQLString finalSQL = "";
-	bool runSd0Migrations = false;
-	for (const auto& entry : GeneralUtils::GetSqlFileNamesFromFolder((BinaryPathFinder::GetBinaryDir() / "./migrations/dlu/").string())) {
-		auto migration = LoadMigration("dlu/" + entry);
-
-		if (migration.data.empty()) {
-			continue;
-		}
-
-		if (Database::Get()->IsMigrationRun(migration.name)) continue;
-
-		LOG("Running migration: %s", migration.name.c_str());
-		if (migration.name == "dlu/5_brick_model_sd0.sql") {
-			runSd0Migrations = true;
-		} else {
-			finalSQL.append(migration.data.c_str());
-		}
-
-		Database::Get()->InsertMigration(migration.name);
-	}
-
-	if (finalSQL.empty() && !runSd0Migrations) {
-		LOG("Server database is up to date.");
-		return;
-	}
-
-	if (!finalSQL.empty()) {
-		auto migration = GeneralUtils::SplitString(static_cast<std::string>(finalSQL), ';');
-		for (auto& query : migration) {
-			try {
-				if (query.empty()) continue;
-				Database::Get()->ExecuteCustomQuery(query.c_str());
-			} catch (sql::SQLException& e) {
-				LOG("Encountered error running migration: %s", e.what());
-			}
-		}
-	}
-
-	// Do this last on the off chance none of the other migrations have been run yet.
-	if (runSd0Migrations) {
-		uint32_t numberOfUpdatedModels = BrickByBrickFix::UpdateBrickByBrickModelsToSd0();
-		LOG("%i models were updated from zlib to sd0.", numberOfUpdatedModels);
-		uint32_t numberOfTruncatedModels = BrickByBrickFix::TruncateBrokenBrickByBrickXml();
-		LOG("%i models were truncated from the database.", numberOfTruncatedModels);
-	}
-}
-
-void MigrationRunner::RunSQLiteMigrations() {
-	auto cdstmt = CDClientDatabase::CreatePreppedStmt("CREATE TABLE IF NOT EXISTS migration_history (name TEXT NOT NULL, date TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP);");
-	cdstmt.execQuery().finalize();
-	cdstmt.finalize();
-
-	Database::Get()->CreateMigrationHistoryTable();
-
-	for (const auto& entry : GeneralUtils::GetSqlFileNamesFromFolder((BinaryPathFinder::GetBinaryDir() / "migrations/cdserver/").string())) {
-		auto migration = LoadMigration("cdserver/" + entry);
-
-		if (migration.data.empty()) continue;
-
-		// Check if there is an entry in the migration history table on the cdclient database.
-		cdstmt = CDClientDatabase::CreatePreppedStmt("SELECT name FROM migration_history WHERE name = ?;");
-		cdstmt.bind((int32_t) 1, migration.name.c_str());
-		auto cdres = cdstmt.execQuery();
-
-		if (!cdres.eof()) continue;
-
-		// Check first if there is entry in the migration history table on the main database.
-		if (Database::Get()->IsMigrationRun(migration.name)) {
-			// Insert into cdclient database if there is an entry in the main database but not the cdclient database.
-			cdstmt = CDClientDatabase::CreatePreppedStmt("INSERT INTO migration_history (name) VALUES (?);");
-			cdstmt.bind(static_cast<int32_t>(1), migration.name.c_str());
-			cdstmt.execQuery();
-			continue;
-		}
-
-		// Doing these 1 migration at a time since one takes a long time and some may think it is crashing.
-		// This will at the least guarentee that the full migration needs to be run in order to be counted as "migrated".
-		LOG("Executing migration: %s.  This may take a while.  Do not shut down server.", migration.name.c_str());
-		CDClientDatabase::ExecuteQuery("BEGIN TRANSACTION;");
-		for (const auto& dml : GeneralUtils::SplitString(migration.data, ';')) {
-			if (dml.empty()) continue;
-			try {
-				CDClientDatabase::ExecuteDML(dml.c_str());
-			} catch (CppSQLite3Exception& e) {
-				LOG("Encountered error running DML command: (%i) : %s", e.errorCode(), e.errorMessage());
-			}
-		}
-
-		// Insert into cdclient database.
-		cdstmt = CDClientDatabase::CreatePreppedStmt("INSERT INTO migration_history (name) VALUES (?);");
-		cdstmt.bind((int32_t) 1, migration.name.c_str());
-		cdstmt.execQuery();
-		CDClientDatabase::ExecuteQuery("COMMIT;");
-	}
-
-	LOG("CDServer database is up to date.");
-}

dDatabase/GameDatabase/MigrationRunner.h

@@ -1,13 +0,0 @@
-#pragma once
-
-#include <string>
-
-struct Migration {
-	std::string data;
-	std::string name;
-};
-
-namespace MigrationRunner {
-	void RunMigrations();
-	void RunSQLiteMigrations();
-};

dDatabase/GameDatabase/MySQL/CMakeLists.txt

@@ -1,11 +0,0 @@
-SET(DDATABSE_DATABSES_MYSQL_SOURCES
-	"MySQLDatabase.cpp"
-)
-
-add_subdirectory(Tables)
-
-foreach(file ${DDATABASES_DATABASES_MYSQL_TABLES_SOURCES})
-	set(DDATABSE_DATABSES_MYSQL_SOURCES ${DDATABSE_DATABSES_MYSQL_SOURCES} "Tables/${file}")
-endforeach()
-
-set(DDATABSE_DATABSES_MYSQL_SOURCES ${DDATABSE_DATABSES_MYSQL_SOURCES} PARENT_SCOPE)

dDatabase/GameDatabase/MySQL/MySQLDatabase.cpp

@@ -1,113 +0,0 @@
-#include "MySQLDatabase.h"
-
-#include "Database.h"
-#include "Game.h"
-#include "dConfig.h"
-#include "Logger.h"
-
-namespace {
-	std::string databaseName;
-	sql::Properties properties;
-	sql::Driver* driver = nullptr;
-	sql::Connection* con = nullptr;
-};
-
-void MySQLDatabase::Connect() {
-	driver = sql::mariadb::get_driver_instance();
-
-	// The mariadb connector is *supposed* to handle unix:// and pipe:// prefixes to hostName, but there are bugs where
-	// 1) it tries to parse a database from the connection string (like in tcp://localhost:3001/darkflame) based on the
-	//    presence of a /
-	// 2) even avoiding that, the connector still assumes you're connecting with a tcp socket
-	// So, what we do in the presence of a unix socket or pipe is to set the hostname to the protocol and localhost,
-	// which avoids parsing errors while still ensuring the correct connection type is used, and then setting the appropriate
-	// property manually (which the URL parsing fails to do)
-	const std::string UNIX_PROTO = "unix://";
-	const std::string PIPE_PROTO = "pipe://";
-	std::string mysql_host = Game::config->GetValue("mysql_host");
-	if (mysql_host.find(UNIX_PROTO) == 0) {
-		properties["hostName"] = "unix://localhost";
-		properties["localSocket"] = mysql_host.substr(UNIX_PROTO.length()).c_str();
-	} else if (mysql_host.find(PIPE_PROTO) == 0) {
-		properties["hostName"] = "pipe://localhost";
-		properties["pipe"] = mysql_host.substr(PIPE_PROTO.length()).c_str();
-	} else {
-		properties["hostName"] = mysql_host.c_str();
-	}
-	properties["user"] = Game::config->GetValue("mysql_username").c_str();
-	properties["password"] = Game::config->GetValue("mysql_password").c_str();
-	properties["autoReconnect"] = "true";
-
-	databaseName = Game::config->GetValue("mysql_database").c_str();
-
-	// `connect(const Properties& props)` segfaults in windows debug, but
-	// `connect(const SQLString& host, const SQLString& user, const SQLString& pwd)` doesn't handle pipes/unix sockets correctly
-	if (properties.find("localSocket") != properties.end() || properties.find("pipe") != properties.end()) {
-		con = driver->connect(properties);
-	} else {
-		con = driver->connect(properties["hostName"].c_str(), properties["user"].c_str(), properties["password"].c_str());
-	}
-	con->setSchema(databaseName.c_str());
-}
-
-void MySQLDatabase::Destroy(std::string source) {
-	if (!con) return;
-
-	if (source.empty()) LOG("Destroying MySQL connection!");
-	else LOG("Destroying MySQL connection from %s!", source.c_str());
-
-	con->close();
-	delete con;
-	con = nullptr;
-}
-
-void MySQLDatabase::ExecuteCustomQuery(const std::string_view query) {
-	std::unique_ptr<sql::Statement>(con->createStatement())->execute(query.data());
-}
-
-sql::PreparedStatement* MySQLDatabase::CreatePreppedStmt(const std::string& query) {
-	if (!con) {
-		Connect();
-		LOG("Trying to reconnect to MySQL");
-	}
-
-	if (!con->isValid() || con->isClosed()) {
-		delete con;
-
-		con = nullptr;
-
-		Connect();
-		LOG("Trying to reconnect to MySQL from invalid or closed connection");
-	}
-
-	return con->prepareStatement(sql::SQLString(query.c_str(), query.length()));
-}
-
-void MySQLDatabase::Commit() {
-	con->commit();
-}
-
-bool MySQLDatabase::GetAutoCommit() {
-	// TODO This should not just access a pointer.  A future PR should update this
-	// to check for null and throw an error if the connection is not valid.
-	return con->getAutoCommit();
-}
-
-void MySQLDatabase::SetAutoCommit(bool value) {
-	// TODO This should not just access a pointer.  A future PR should update this
-	// to check for null and throw an error if the connection is not valid.
-	con->setAutoCommit(value);
-}
-
-void MySQLDatabase::DeleteCharacter(const uint32_t characterId) {
-	ExecuteDelete("DELETE FROM charxml WHERE id=? LIMIT 1;", characterId);
-	ExecuteDelete("DELETE FROM command_log WHERE character_id=?;", characterId);
-	ExecuteDelete("DELETE FROM friends WHERE player_id=? OR friend_id=?;", characterId, characterId);
-	ExecuteDelete("DELETE FROM leaderboard WHERE character_id=?;", characterId);
-	ExecuteDelete("DELETE FROM properties_contents WHERE property_id IN (SELECT id FROM properties WHERE owner_id=?);", characterId);
-	ExecuteDelete("DELETE FROM properties WHERE owner_id=?;", characterId);
-	ExecuteDelete("DELETE FROM ugc WHERE character_id=?;", characterId);
-	ExecuteDelete("DELETE FROM activity_log WHERE character_id=?;", characterId);
-	ExecuteDelete("DELETE FROM mail WHERE receiver_id=?;", characterId);
-	ExecuteDelete("DELETE FROM charinfo WHERE id=? LIMIT 1;", characterId);
-}

dDatabase/GameDatabase/MySQL/MySQLDatabase.h

@@ -1,245 +0,0 @@
-#ifndef __MYSQLDATABASE__H__
-#define __MYSQLDATABASE__H__
-
-#include <conncpp.hpp>
-#include <memory>
-
-#include "GameDatabase.h"
-
-typedef std::unique_ptr<sql::PreparedStatement>& UniquePreppedStmtRef;
-
-// Purposefully no definition for this to provide linker errors in the case someone tries to
-// bind a parameter to a type that isn't defined.
-template<typename ParamType>
-inline void SetParam(UniquePreppedStmtRef stmt, const int index, const ParamType param);
-
-// This is a function to set each parameter in a prepared statement.
-// This is accomplished with a combination of parameter packing and Fold Expressions.
-// The constexpr if statement is used to prevent the compiler from trying to call SetParam with 0 arguments.
-template<typename... Args>
-void SetParams(UniquePreppedStmtRef stmt, Args&&... args) {
-	if constexpr (sizeof...(args) != 0) {
-		int i = 1;
-		(SetParam(stmt, i++, args), ...);
-	}
-}
-
-class MySQLDatabase : public GameDatabase {
-public:
-	void Connect() override;
-	void Destroy(std::string source = "") override;
-
-	sql::PreparedStatement* CreatePreppedStmt(const std::string& query) override;
-	void Commit() override;
-	bool GetAutoCommit() override;
-	void SetAutoCommit(bool value) override;
-	void ExecuteCustomQuery(const std::string_view query) override;
-
-	// Overloaded queries
-	std::optional<IServers::MasterInfo> GetMasterInfo() override;
-
-	std::vector<std::string> GetApprovedCharacterNames() override;
-
-	std::vector<FriendData> GetFriendsList(uint32_t charID) override;
-
-	std::optional<IFriends::BestFriendStatus> GetBestFriendStatus(const uint32_t playerCharacterId, const uint32_t friendCharacterId) override;
-	void SetBestFriendStatus(const uint32_t playerAccountId, const uint32_t friendAccountId, const uint32_t bestFriendStatus) override;
-	void AddFriend(const uint32_t playerAccountId, const uint32_t friendAccountId) override;
-	void RemoveFriend(const uint32_t playerAccountId, const uint32_t friendAccountId) override;
-	void UpdateActivityLog(const uint32_t characterId, const eActivityType activityType, const LWOMAPID mapId) override;
-	void DeleteUgcModelData(const LWOOBJID& modelId) override;
-	void UpdateUgcModelData(const LWOOBJID& modelId, std::istringstream& lxfml) override;
-	std::vector<IUgc::Model> GetAllUgcModels() override;
-	void CreateMigrationHistoryTable() override;
-	bool IsMigrationRun(const std::string_view str) override;
-	void InsertMigration(const std::string_view str) override;
-	std::optional<ICharInfo::Info> GetCharacterInfo(const uint32_t charId) override;
-	std::optional<ICharInfo::Info> GetCharacterInfo(const std::string_view charId) override;
-	std::string GetCharacterXml(const uint32_t accountId) override;
-	void UpdateCharacterXml(const uint32_t characterId, const std::string_view lxfml) override;
-	std::optional<IAccounts::Info> GetAccountInfo(const std::string_view username) override;
-	void InsertNewCharacter(const ICharInfo::Info info) override;
-	void InsertCharacterXml(const uint32_t accountId, const std::string_view lxfml) override;
-	std::vector<uint32_t> GetAccountCharacterIds(uint32_t accountId) override;
-	void DeleteCharacter(const uint32_t characterId) override;
-	void SetCharacterName(const uint32_t characterId, const std::string_view name) override;
-	void SetPendingCharacterName(const uint32_t characterId, const std::string_view name) override;
-	void UpdateLastLoggedInCharacter(const uint32_t characterId) override;
-	void SetPetNameModerationStatus(const LWOOBJID& petId, const IPetNames::Info& info) override;
-	std::optional<IPetNames::Info> GetPetNameInfo(const LWOOBJID& petId) override;
-	std::optional<IProperty::Info> GetPropertyInfo(const LWOMAPID mapId, const LWOCLONEID cloneId) override;
-	void UpdatePropertyModerationInfo(const IProperty::Info& info) override;
-	void UpdatePropertyDetails(const IProperty::Info& info) override;
-	void InsertNewProperty(const IProperty::Info& info, const uint32_t templateId, const LWOZONEID& zoneId) override;
-	std::vector<IPropertyContents::Model> GetPropertyModels(const LWOOBJID& propertyId) override;
-	void RemoveUnreferencedUgcModels() override;
-	void InsertNewPropertyModel(const LWOOBJID& propertyId, const IPropertyContents::Model& model, const std::string_view name) override;
-	void UpdateModelPositionRotation(const LWOOBJID& propertyId, const NiPoint3& position, const NiQuaternion& rotation) override;
-	void RemoveModel(const LWOOBJID& modelId) override;
-	void UpdatePerformanceCost(const LWOZONEID& zoneId, const float performanceCost) override;
-	void InsertNewBugReport(const IBugReports::Info& info) override;
-	void InsertCheatDetection(const IPlayerCheatDetections::Info& info) override;
-	void InsertNewMail(const IMail::MailInfo& mail) override;
-	void InsertNewUgcModel(
-		std::istringstream& sd0Data,
-		const uint32_t blueprintId,
-		const uint32_t accountId,
-		const uint32_t characterId) override;
-	std::vector<IMail::MailInfo> GetMailForPlayer(const uint32_t characterId, const uint32_t numberOfMail) override;
-	std::optional<IMail::MailInfo> GetMail(const uint64_t mailId) override;
-	uint32_t GetUnreadMailCount(const uint32_t characterId) override;
-	void MarkMailRead(const uint64_t mailId) override;
-	void DeleteMail(const uint64_t mailId) override;
-	void ClaimMailItem(const uint64_t mailId) override;
-	void InsertSlashCommandUsage(const uint32_t characterId, const std::string_view command) override;
-	void UpdateAccountUnmuteTime(const uint32_t accountId, const uint64_t timeToUnmute) override;
-	void UpdateAccountBan(const uint32_t accountId, const bool banned) override;
-	void UpdateAccountPassword(const uint32_t accountId, const std::string_view bcryptpassword) override;
-	void InsertNewAccount(const std::string_view username, const std::string_view bcryptpassword) override;
-	void SetMasterIp(const std::string_view ip, const uint32_t port) override;
-	std::optional<uint32_t> GetCurrentPersistentId() override;
-	void InsertDefaultPersistentId() override;
-	void UpdatePersistentId(const uint32_t id) override;
-	std::optional<uint32_t> GetDonationTotal(const uint32_t activityId) override;
-	std::optional<bool> IsPlaykeyActive(const int32_t playkeyId) override;
-	std::vector<IUgc::Model> GetUgcModels(const LWOOBJID& propertyId) override;
-private:
-
-	// Generic query functions that can be used for any query.
-	// Return type may be different depending on the query, so it is up to the caller to check the return type.
-	// The first argument is the query string, and the rest are the parameters to bind to the query.
-	// The return type is a unique_ptr to the result set, which is deleted automatically when it goes out of scope
-	template<typename... Args>
-	inline std::unique_ptr<sql::ResultSet> ExecuteSelect(const std::string& query, Args&&... args) {
-		std::unique_ptr<sql::PreparedStatement> preppedStmt(CreatePreppedStmt(query));
-		SetParams(preppedStmt, std::forward<Args>(args)...);
-		DLU_SQL_TRY_CATCH_RETHROW(return std::unique_ptr<sql::ResultSet>(preppedStmt->executeQuery()));
-	}
-
-	template<typename... Args>
-	inline void ExecuteDelete(const std::string& query, Args&&... args) {
-		std::unique_ptr<sql::PreparedStatement> preppedStmt(CreatePreppedStmt(query));
-		SetParams(preppedStmt, std::forward<Args>(args)...);
-		DLU_SQL_TRY_CATCH_RETHROW(preppedStmt->execute());
-	}
-
-	template<typename... Args>
-	inline int32_t ExecuteUpdate(const std::string& query, Args&&... args) {
-		std::unique_ptr<sql::PreparedStatement> preppedStmt(CreatePreppedStmt(query));
-		SetParams(preppedStmt, std::forward<Args>(args)...);
-		DLU_SQL_TRY_CATCH_RETHROW(return preppedStmt->executeUpdate());
-	}
-
-	template<typename... Args>
-	inline bool ExecuteInsert(const std::string& query, Args&&... args) {
-		std::unique_ptr<sql::PreparedStatement> preppedStmt(CreatePreppedStmt(query));
-		SetParams(preppedStmt, std::forward<Args>(args)...);
-		DLU_SQL_TRY_CATCH_RETHROW(return preppedStmt->execute());
-	}
-};
-
-// Below are each of the definitions of SetParam for each supported type.
-
-template<>
-inline void SetParam(UniquePreppedStmtRef stmt, const int index, const std::string_view param) {
-	// LOG("%s", param.data());
-	stmt->setString(index, param.data());
-}
-
-template<>
-inline void SetParam(UniquePreppedStmtRef stmt, const int index, const char* param) {
-	// LOG("%s", param);
-	stmt->setString(index, param);
-}
-
-template<>
-inline void SetParam(UniquePreppedStmtRef stmt, const int index, const std::string param) {
-	// LOG("%s", param.c_str());
-	stmt->setString(index, param.c_str());
-}
-
-template<>
-inline void SetParam(UniquePreppedStmtRef stmt, const int index, const int8_t param) {
-	// LOG("%u", param);
-	stmt->setByte(index, param);
-}
-
-template<>
-inline void SetParam(UniquePreppedStmtRef stmt, const int index, const uint8_t param) {
-	// LOG("%d", param);
-	stmt->setByte(index, param);
-}
-
-template<>
-inline void SetParam(UniquePreppedStmtRef stmt, const int index, const int16_t param) {
-	// LOG("%u", param);
-	stmt->setShort(index, param);
-}
-
-template<>
-inline void SetParam(UniquePreppedStmtRef stmt, const int index, const uint16_t param) {
-	// LOG("%d", param);
-	stmt->setShort(index, param);
-}
-
-template<>
-inline void SetParam(UniquePreppedStmtRef stmt, const int index, const uint32_t param) {
-	// LOG("%u", param);
-	stmt->setUInt(index, param);
-}
-
-template<>
-inline void SetParam(UniquePreppedStmtRef stmt, const int index, const int32_t param) {
-	// LOG("%d", param);
-	stmt->setInt(index, param);
-}
-
-template<>
-inline void SetParam(UniquePreppedStmtRef stmt, const int index, const int64_t param) {
-	// LOG("%llu", param);
-	stmt->setInt64(index, param);
-}
-
-template<>
-inline void SetParam(UniquePreppedStmtRef stmt, const int index, const uint64_t param) {
-	// LOG("%llu", param);
-	stmt->setUInt64(index, param);
-}
-
-template<>
-inline void SetParam(UniquePreppedStmtRef stmt, const int index, const float param) {
-	// LOG("%f", param);
-	stmt->setFloat(index, param);
-}
-
-template<>
-inline void SetParam(UniquePreppedStmtRef stmt, const int index, const double param) {
-	// LOG("%f", param);
-	stmt->setDouble(index, param);
-}
-
-template<>
-inline void SetParam(UniquePreppedStmtRef stmt, const int index, const bool param) {
-	// LOG("%d", param);
-	stmt->setBoolean(index, param);
-}
-
-template<>
-inline void SetParam(UniquePreppedStmtRef stmt, const int index, const std::istream* param) {
-	// LOG("Blob");
-	// This is the one time you will ever see me use const_cast.
-	stmt->setBlob(index, const_cast<std::istream*>(param));
-}
-
-template<>
-inline void SetParam(UniquePreppedStmtRef stmt, const int index, const std::optional<uint32_t> param) {
-	if (param) {
-		// LOG("%d", param.value());
-		stmt->setInt(index, param.value());
-	} else {
-		// LOG("Null");
-		stmt->setNull(index, sql::DataType::SQLNULL);
-	}
-}
-
-#endif  //!__MYSQLDATABASE__H__

dDatabase/GameDatabase/MySQL/Tables/Accounts.cpp

@@ -1,37 +0,0 @@
-#include "MySQLDatabase.h"
-
-#include "eGameMasterLevel.h"
-
-std::optional<IAccounts::Info> MySQLDatabase::GetAccountInfo(const std::string_view username) {
-	auto result = ExecuteSelect("SELECT id, password, banned, locked, play_key_id, gm_level FROM accounts WHERE name = ? LIMIT 1;", username);
-
-	if (!result->next()) {
-		return std::nullopt;
-	}
-
-	IAccounts::Info toReturn;
-	toReturn.id = result->getUInt("id");
-	toReturn.maxGmLevel = static_cast<eGameMasterLevel>(result->getInt("gm_level"));
-	toReturn.bcryptPassword = result->getString("password").c_str();
-	toReturn.banned = result->getBoolean("banned");
-	toReturn.locked = result->getBoolean("locked");
-	toReturn.playKeyId = result->getUInt("play_key_id");
-
-	return toReturn;
-}
-
-void MySQLDatabase::UpdateAccountUnmuteTime(const uint32_t accountId, const uint64_t timeToUnmute) {
-	ExecuteUpdate("UPDATE accounts SET mute_expire = ? WHERE id = ?;", timeToUnmute, accountId);
-}
-
-void MySQLDatabase::UpdateAccountBan(const uint32_t accountId, const bool banned) {
-	ExecuteUpdate("UPDATE accounts SET banned = ? WHERE id = ?;", banned, accountId);
-}
-
-void MySQLDatabase::UpdateAccountPassword(const uint32_t accountId, const std::string_view bcryptpassword) {
-	ExecuteUpdate("UPDATE accounts SET password = ? WHERE id = ?;", bcryptpassword, accountId);
-}
-
-void MySQLDatabase::InsertNewAccount(const std::string_view username, const std::string_view bcryptpassword) {
-	ExecuteInsert("INSERT INTO accounts (name, password, gm_level) VALUES (?, ?, ?);", username, bcryptpassword, static_cast<int32_t>(eGameMasterLevel::OPERATOR));
-}

dDatabase/GameDatabase/MySQL/Tables/ActivityLog.cpp

@@ -1,6 +0,0 @@
-#include "MySQLDatabase.h"
-
-void MySQLDatabase::UpdateActivityLog(const uint32_t characterId, const eActivityType activityType, const LWOMAPID mapId) {
-	ExecuteInsert("INSERT INTO activity_log (character_id, activity, time, map_id) VALUES (?, ?, ?, ?);",
-		characterId, static_cast<uint32_t>(activityType), static_cast<uint32_t>(time(NULL)), mapId);
-}

dDatabase/GameDatabase/MySQL/Tables/BugReports.cpp

@@ -1,6 +0,0 @@
-#include "MySQLDatabase.h"
-
-void MySQLDatabase::InsertNewBugReport(const IBugReports::Info& info) {
-	ExecuteInsert("INSERT INTO `bug_reports`(body, client_version, other_player_id, selection, reporter_id) VALUES (?, ?, ?, ?, ?)",
-		info.body, info.clientVersion, info.otherPlayer, info.selection, info.characterId);
-}

dDatabase/GameDatabase/MySQL/Tables/CMakeLists.txt

@@ -1,22 +0,0 @@
-set(DDATABASES_DATABASES_MYSQL_TABLES_SOURCES
-	"Accounts.cpp"
-	"ActivityLog.cpp"
-	"BugReports.cpp"
-	"CharInfo.cpp"
-	"CharXml.cpp"
-	"CommandLog.cpp"
-	"Friends.cpp"
-	"Leaderboard.cpp"
-	"Mail.cpp"
-	"MigrationHistory.cpp"
-	"ObjectIdTracker.cpp"
-	"PetNames.cpp"
-	"PlayerCheatDetections.cpp"
-	"PlayKeys.cpp"
-	"Property.cpp"
-	"PropertyContents.cpp"
-	"Servers.cpp"
-	"Ugc.cpp"
-	PARENT_SCOPE
-)
-

dDatabase/GameDatabase/MySQL/Tables/CharInfo.cpp

@@ -1,78 +0,0 @@
-#include "MySQLDatabase.h"
-
-std::vector<std::string> MySQLDatabase::GetApprovedCharacterNames() {
-	auto result = ExecuteSelect("SELECT name FROM charinfo;");
-
-	std::vector<std::string> toReturn;
-
-	while (result->next()) {
-		toReturn.push_back(result->getString("name").c_str());
-	}
-
-	return toReturn;
-}
-
-std::optional<ICharInfo::Info> CharInfoFromQueryResult(std::unique_ptr<sql::ResultSet> stmt) {
-	if (!stmt->next()) {
-		return std::nullopt;
-	}
-
-	ICharInfo::Info toReturn;
-
-	toReturn.id = stmt->getUInt("id");
-	toReturn.name = stmt->getString("name").c_str();
-	toReturn.pendingName = stmt->getString("pending_name").c_str();
-	toReturn.needsRename = stmt->getBoolean("needs_rename");
-	toReturn.cloneId = stmt->getUInt64("prop_clone_id");
-	toReturn.accountId = stmt->getUInt("account_id");
-	toReturn.permissionMap = static_cast<ePermissionMap>(stmt->getUInt("permission_map"));
-
-	return toReturn;
-}
-
-std::optional<ICharInfo::Info> MySQLDatabase::GetCharacterInfo(const uint32_t charId) {
-	return CharInfoFromQueryResult(
-		ExecuteSelect("SELECT name, pending_name, needs_rename, prop_clone_id, permission_map, id, account_id FROM charinfo WHERE id = ? LIMIT 1;", charId)
-	);
-}
-
-std::optional<ICharInfo::Info> MySQLDatabase::GetCharacterInfo(const std::string_view name) {
-	return CharInfoFromQueryResult(
-		ExecuteSelect("SELECT name, pending_name, needs_rename, prop_clone_id, permission_map, id, account_id FROM charinfo WHERE name = ? LIMIT 1;", name)
-	);
-}
-
-std::vector<uint32_t> MySQLDatabase::GetAccountCharacterIds(const uint32_t accountId) {
-	auto result = ExecuteSelect("SELECT id FROM charinfo WHERE account_id = ? ORDER BY last_login DESC LIMIT 4;", accountId);
-
-	std::vector<uint32_t> toReturn;
-	toReturn.reserve(result->rowsCount());
-	while (result->next()) {
-		toReturn.push_back(result->getUInt("id"));
-	}
-
-	return toReturn;
-}
-
-void MySQLDatabase::InsertNewCharacter(const ICharInfo::Info info) {
-	ExecuteInsert(
-		"INSERT INTO `charinfo`(`id`, `account_id`, `name`, `pending_name`, `needs_rename`, `last_login`) VALUES (?,?,?,?,?,?)",
-		info.id,
-		info.accountId,
-		info.name,
-		info.pendingName,
-		false,
-		static_cast<uint32_t>(time(NULL)));
-}
-
-void MySQLDatabase::SetCharacterName(const uint32_t characterId, const std::string_view name) {
-	ExecuteUpdate("UPDATE charinfo SET name = ?, pending_name = '', needs_rename = 0, last_login = ? WHERE id = ? LIMIT 1;", name, static_cast<uint32_t>(time(NULL)), characterId);
-}
-
-void MySQLDatabase::SetPendingCharacterName(const uint32_t characterId, const std::string_view name) {
-	ExecuteUpdate("UPDATE charinfo SET pending_name = ?, needs_rename = 0, last_login = ? WHERE id = ? LIMIT 1", name, static_cast<uint32_t>(time(NULL)), characterId);
-}
-
-void MySQLDatabase::UpdateLastLoggedInCharacter(const uint32_t characterId) {
-	ExecuteUpdate("UPDATE charinfo SET last_login = ? WHERE id = ? LIMIT 1", static_cast<uint32_t>(time(NULL)), characterId);
-}

dDatabase/GameDatabase/MySQL/Tables/CharXml.cpp

@@ -1,19 +0,0 @@
-#include "MySQLDatabase.h"
-
-std::string MySQLDatabase::GetCharacterXml(const uint32_t charId) {
-	auto result = ExecuteSelect("SELECT xml_data FROM charxml WHERE id = ? LIMIT 1;", charId);
-
-	if (!result->next()) {
-		return "";
-	}
-
-	return result->getString("xml_data").c_str();
-}
-
-void MySQLDatabase::UpdateCharacterXml(const uint32_t charId, const std::string_view lxfml) {
-	ExecuteUpdate("UPDATE charxml SET xml_data = ? WHERE id = ?;", lxfml, charId);
-}
-
-void MySQLDatabase::InsertCharacterXml(const uint32_t characterId, const std::string_view lxfml) {
-	ExecuteInsert("INSERT INTO `charxml` (`id`, `xml_data`) VALUES (?,?)", characterId, lxfml);
-}

dDatabase/GameDatabase/MySQL/Tables/CommandLog.cpp

@@ -1,5 +0,0 @@
-#include "MySQLDatabase.h"
-
-void MySQLDatabase::InsertSlashCommandUsage(const uint32_t characterId, const std::string_view command) {
-	ExecuteInsert("INSERT INTO command_log (character_id, command) VALUES (?, ?);", characterId, command);
-}

dDatabase/GameDatabase/MySQL/Tables/Friends.cpp

@@ -1,73 +0,0 @@
-#include "MySQLDatabase.h"
-
-std::vector<FriendData> MySQLDatabase::GetFriendsList(const uint32_t charId) {
-	auto friendsList = ExecuteSelect(
-		R"QUERY(
-			SELECT fr.requested_player AS player, best_friend AS bff, ci.name AS name FROM 
-			(
-				SELECT CASE 
-				WHEN player_id = ? THEN friend_id 
-				WHEN friend_id = ? THEN player_id 
-				END AS requested_player, best_friend FROM friends
-			) AS fr 
-			JOIN charinfo AS ci ON ci.id = fr.requested_player 
-			WHERE fr.requested_player IS NOT NULL AND fr.requested_player != ?;
-		)QUERY", charId, charId, charId);
-
-	std::vector<FriendData> toReturn;
-	toReturn.reserve(friendsList->rowsCount());
-
-	while (friendsList->next()) {
-		FriendData fd;
-		fd.friendID = friendsList->getUInt("player");
-		fd.isBestFriend = friendsList->getInt("bff") == 3; // 0 = friends, 1 = left_requested, 2 = right_requested, 3 = both_accepted - are now bffs
-		fd.friendName = friendsList->getString("name").c_str();
-
-		toReturn.push_back(fd);
-	}
-
-	return toReturn;
-}
-
-std::optional<IFriends::BestFriendStatus> MySQLDatabase::GetBestFriendStatus(const uint32_t playerCharacterId, const uint32_t friendCharacterId) {
-	auto result = ExecuteSelect("SELECT * FROM friends WHERE (player_id = ? AND friend_id = ?) OR (player_id = ? AND friend_id = ?) LIMIT 1;",
-		playerCharacterId,
-		friendCharacterId,
-		friendCharacterId,
-		playerCharacterId
-	);
-
-	if (!result->next()) {
-		return std::nullopt;
-	}
-
-	IFriends::BestFriendStatus toReturn;
-	toReturn.playerCharacterId = result->getUInt("player_id");
-	toReturn.friendCharacterId = result->getUInt("friend_id");
-	toReturn.bestFriendStatus = result->getUInt("best_friend");
-
-	return toReturn;
-}
-
-void MySQLDatabase::SetBestFriendStatus(const uint32_t playerCharacterId, const uint32_t friendCharacterId, const uint32_t bestFriendStatus) {
-	ExecuteUpdate("UPDATE friends SET best_friend = ? WHERE (player_id = ? AND friend_id = ?) OR (player_id = ? AND friend_id = ?) LIMIT 1;",
-		bestFriendStatus,
-		playerCharacterId,
-		friendCharacterId,
-		friendCharacterId,
-		playerCharacterId
-	);
-}
-
-void MySQLDatabase::AddFriend(const uint32_t playerCharacterId, const uint32_t friendCharacterId) {
-	ExecuteInsert("INSERT IGNORE INTO friends (player_id, friend_id, best_friend) VALUES (?, ?, 0);", playerCharacterId, friendCharacterId);
-}
-
-void MySQLDatabase::RemoveFriend(const uint32_t playerCharacterId, const uint32_t friendCharacterId) {
-	ExecuteDelete("DELETE FROM friends WHERE (player_id = ? AND friend_id = ?) OR (player_id = ? AND friend_id = ?) LIMIT 1;",
-		playerCharacterId,
-		friendCharacterId,
-		friendCharacterId,
-		playerCharacterId
-	);
-}

dDatabase/GameDatabase/MySQL/Tables/Leaderboard.cpp

@@ -1,11 +0,0 @@
-#include "MySQLDatabase.h"
-
-std::optional<uint32_t> MySQLDatabase::GetDonationTotal(const uint32_t activityId) {
-	auto donation_total = ExecuteSelect("SELECT SUM(primaryScore) as donation_total FROM leaderboard WHERE game_id = ?;", activityId);
-
-	if (!donation_total->next()) {
-		return std::nullopt;
-	}
-
-	return donation_total->getUInt("donation_total");
-}

dDatabase/GameDatabase/MySQL/Tables/Mail.cpp

@@ -1,83 +0,0 @@
-#include "MySQLDatabase.h"
-
-void MySQLDatabase::InsertNewMail(const IMail::MailInfo& mail) {
-	ExecuteInsert(
-		"INSERT INTO `mail` "
-		"(`sender_id`, `sender_name`, `receiver_id`, `receiver_name`, `time_sent`, `subject`, `body`, `attachment_id`, `attachment_lot`, `attachment_subkey`, `attachment_count`, `was_read`)"
-		" VALUES (?,?,?,?,?,?,?,?,?,?,?,0)",
-		mail.senderId,
-		mail.senderUsername,
-		mail.receiverId,
-		mail.recipient,
-		static_cast<uint32_t>(time(NULL)),
-		mail.subject,
-		mail.body,
-		mail.itemID,
-		mail.itemLOT,
-		0,
-		mail.itemCount);
-}
-
-std::vector<IMail::MailInfo> MySQLDatabase::GetMailForPlayer(const uint32_t characterId, const uint32_t numberOfMail) {
-	auto res = ExecuteSelect(
-		"SELECT id, subject, body, sender_name, attachment_id, attachment_lot, attachment_subkey, attachment_count, was_read, time_sent"
-		" FROM mail WHERE receiver_id=? limit ?;",
-		characterId, numberOfMail);
-
-	std::vector<IMail::MailInfo> toReturn;
-	toReturn.reserve(res->rowsCount());
-
-	while (res->next()) {
-		IMail::MailInfo mail;
-		mail.id = res->getUInt64("id");
-		mail.subject = res->getString("subject").c_str();
-		mail.body = res->getString("body").c_str();
-		mail.senderUsername = res->getString("sender_name").c_str();
-		mail.itemID = res->getUInt("attachment_id");
-		mail.itemLOT = res->getInt("attachment_lot");
-		mail.itemSubkey = res->getInt("attachment_subkey");
-		mail.itemCount = res->getInt("attachment_count");
-		mail.timeSent = res->getUInt64("time_sent");
-		mail.wasRead = res->getBoolean("was_read");
-
-		toReturn.push_back(std::move(mail));
-	}
-
-	return toReturn;
-}
-
-std::optional<IMail::MailInfo> MySQLDatabase::GetMail(const uint64_t mailId) {
-	auto res = ExecuteSelect("SELECT attachment_lot, attachment_count FROM mail WHERE id=? LIMIT 1;", mailId);
-
-	if (!res->next()) {
-		return std::nullopt;
-	}
-
-	IMail::MailInfo toReturn;
-	toReturn.itemLOT = res->getInt("attachment_lot");
-	toReturn.itemCount = res->getInt("attachment_count");
-
-	return toReturn;
-}
-
-uint32_t MySQLDatabase::GetUnreadMailCount(const uint32_t characterId) {
-	auto res = ExecuteSelect("SELECT COUNT(*) AS number_unread FROM mail WHERE receiver_id=? AND was_read=0;", characterId);
-
-	if (!res->next()) {
-		return 0;
-	}
-
-	return res->getInt("number_unread");
-}
-
-void MySQLDatabase::MarkMailRead(const uint64_t mailId) {
-	ExecuteUpdate("UPDATE mail SET was_read=1 WHERE id=? LIMIT 1;", mailId);
-}
-
-void MySQLDatabase::ClaimMailItem(const uint64_t mailId) {
-	ExecuteUpdate("UPDATE mail SET attachment_lot=0 WHERE id=? LIMIT 1;", mailId);
-}
-
-void MySQLDatabase::DeleteMail(const uint64_t mailId) {
-	ExecuteDelete("DELETE FROM mail WHERE id=? LIMIT 1;", mailId);
-}

dDatabase/GameDatabase/MySQL/Tables/MigrationHistory.cpp

@@ -1,13 +0,0 @@
-#include "MySQLDatabase.h"
-
-void MySQLDatabase::CreateMigrationHistoryTable() {
-	ExecuteInsert("CREATE TABLE IF NOT EXISTS migration_history (name TEXT NOT NULL, date TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP());");
-}
-
-bool MySQLDatabase::IsMigrationRun(const std::string_view str) {
-	return ExecuteSelect("SELECT name FROM migration_history WHERE name = ?;", str)->next();
-}
-
-void MySQLDatabase::InsertMigration(const std::string_view str) {
-	ExecuteInsert("INSERT INTO migration_history (name) VALUES (?);", str);
-}

dDatabase/GameDatabase/MySQL/Tables/ObjectIdTracker.cpp

@@ -1,17 +0,0 @@
-#include "MySQLDatabase.h"
-
-std::optional<uint32_t> MySQLDatabase::GetCurrentPersistentId() {
-	auto result = ExecuteSelect("SELECT last_object_id FROM object_id_tracker");
-	if (!result->next()) {
-		return std::nullopt;
-	}
-	return result->getUInt("last_object_id");
-}
-
-void MySQLDatabase::InsertDefaultPersistentId() {
-	ExecuteInsert("INSERT INTO object_id_tracker VALUES (1);");
-}
-
-void MySQLDatabase::UpdatePersistentId(const uint32_t newId) {
-	ExecuteUpdate("UPDATE object_id_tracker SET last_object_id = ?;", newId);
-}

dDatabase/GameDatabase/MySQL/Tables/PetNames.cpp

@@ -1,26 +0,0 @@
-#include "MySQLDatabase.h"
-
-void MySQLDatabase::SetPetNameModerationStatus(const LWOOBJID& petId, const IPetNames::Info& info) {
-	ExecuteInsert(
-		"INSERT INTO `pet_names` (`id`, `pet_name`, `approved`) VALUES (?, ?, ?) "
-		"ON DUPLICATE KEY UPDATE pet_name = ?, approved = ?;",
-		petId,
-		info.petName,
-		info.approvalStatus,
-		info.petName,
-		info.approvalStatus);
-}
-
-std::optional<IPetNames::Info> MySQLDatabase::GetPetNameInfo(const LWOOBJID& petId) {
-	auto result = ExecuteSelect("SELECT pet_name, approved FROM pet_names WHERE id = ? LIMIT 1;", petId);
-
-	if (!result->next()) {
-		return std::nullopt;
-	}
-
-	IPetNames::Info toReturn;
-	toReturn.petName = result->getString("pet_name").c_str();
-	toReturn.approvalStatus = result->getInt("approved");
-
-	return toReturn;
-}

dDatabase/GameDatabase/MySQL/Tables/PlayKeys.cpp

@@ -1,11 +0,0 @@
-#include "MySQLDatabase.h"
-
-std::optional<bool> MySQLDatabase::IsPlaykeyActive(const int32_t playkeyId) {
-	auto keyCheckRes = ExecuteSelect("SELECT active FROM `play_keys` WHERE id=?", playkeyId);
-
-	if (!keyCheckRes->next()) {
-		return std::nullopt;
-	}
-
-	return keyCheckRes->getBoolean("active");
-}

dDatabase/GameDatabase/MySQL/Tables/PlayerCheatDetections.cpp

@@ -1,7 +0,0 @@
-#include "MySQLDatabase.h"
-
-void MySQLDatabase::InsertCheatDetection(const IPlayerCheatDetections::Info& info) {
-	ExecuteInsert(
-		"INSERT INTO player_cheat_detections (account_id, name, violation_msg, violation_system_address) VALUES (?, ?, ?, ?)",
-		info.userId, info.username, info.extraMessage, info.systemAddress);
-}

dDatabase/GameDatabase/MySQL/Tables/Property.cpp

@@ -1,57 +0,0 @@
-#include "MySQLDatabase.h"
-
-std::optional<IProperty::Info> MySQLDatabase::GetPropertyInfo(const LWOMAPID mapId, const LWOCLONEID cloneId) {
-	auto propertyEntry = ExecuteSelect(
-		"SELECT id, owner_id, clone_id, name, description, privacy_option, rejection_reason, last_updated, time_claimed, reputation, mod_approved "
-		"FROM properties WHERE zone_id = ? AND clone_id = ?;", mapId, cloneId);
-
-	if (!propertyEntry->next()) {
-		return std::nullopt;
-	}
-
-	IProperty::Info toReturn;
-	toReturn.id = propertyEntry->getUInt64("id");
-	toReturn.ownerId = propertyEntry->getUInt64("owner_id");
-	toReturn.cloneId = propertyEntry->getUInt64("clone_id");
-	toReturn.name = propertyEntry->getString("name").c_str();
-	toReturn.description = propertyEntry->getString("description").c_str();
-	toReturn.privacyOption = propertyEntry->getInt("privacy_option");
-	toReturn.rejectionReason = propertyEntry->getString("rejection_reason").c_str();
-	toReturn.lastUpdatedTime = propertyEntry->getUInt("last_updated");
-	toReturn.claimedTime = propertyEntry->getUInt("time_claimed");
-	toReturn.reputation = propertyEntry->getUInt("reputation");
-	toReturn.modApproved = propertyEntry->getUInt("mod_approved");
-
-	return toReturn;
-}
-
-void MySQLDatabase::UpdatePropertyModerationInfo(const IProperty::Info& info) {
-	ExecuteUpdate("UPDATE properties SET privacy_option = ?, rejection_reason = ?, mod_approved = ? WHERE id = ? LIMIT 1;",
-		info.privacyOption,
-		info.rejectionReason,
-		info.modApproved,
-		info.id);
-}
-
-void MySQLDatabase::UpdatePropertyDetails(const IProperty::Info& info) {
-	ExecuteUpdate("UPDATE properties SET name = ?, description = ? WHERE id = ? LIMIT 1;", info.name, info.description, info.id);
-}
-
-void MySQLDatabase::UpdatePerformanceCost(const LWOZONEID& zoneId, const float performanceCost) {
-	ExecuteUpdate("UPDATE properties SET performance_cost = ? WHERE zone_id = ? AND clone_id = ? LIMIT 1;", performanceCost, zoneId.GetMapID(), zoneId.GetCloneID());
-}
-
-void MySQLDatabase::InsertNewProperty(const IProperty::Info& info, const uint32_t templateId, const LWOZONEID& zoneId) {
-	auto insertion = ExecuteInsert(
-		"INSERT INTO properties"
-		"(id, owner_id, template_id, clone_id, name, description, zone_id, rent_amount, rent_due, privacy_option, last_updated, time_claimed, rejection_reason, reputation, performance_cost)"
-		"VALUES (?, ?, ?, ?, ?, ?, ?, 0, 0, 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), '', 0, 0.0)",
-		info.id,
-		info.ownerId,
-		templateId,
-		zoneId.GetCloneID(),
-		info.name,
-		info.description,
-		zoneId.GetMapID()
-	);
-}

dDatabase/GameDatabase/MySQL/Tables/PropertyContents.cpp

@@ -1,54 +0,0 @@
-#include "MySQLDatabase.h"
-
-std::vector<IPropertyContents::Model> MySQLDatabase::GetPropertyModels(const LWOOBJID& propertyId) {
-	auto result = ExecuteSelect("SELECT id, lot, x, y, z, rx, ry, rz, rw, ugc_id FROM properties_contents WHERE property_id = ?;", propertyId);
-
-	std::vector<IPropertyContents::Model> toReturn;
-	toReturn.reserve(result->rowsCount());
-	while (result->next()) {
-		IPropertyContents::Model model;
-		model.id = result->getUInt64("id");
-		model.lot = static_cast<LOT>(result->getUInt("lot"));
-		model.position.x = result->getFloat("x");
-		model.position.y = result->getFloat("y");
-		model.position.z = result->getFloat("z");
-		model.rotation.w = result->getFloat("rw");
-		model.rotation.x = result->getFloat("rx");
-		model.rotation.y = result->getFloat("ry");
-		model.rotation.z = result->getFloat("rz");
-		model.ugcId = result->getUInt64("ugc_id");
-		toReturn.push_back(std::move(model));
-	}
-	return toReturn;
-}
-
-void MySQLDatabase::InsertNewPropertyModel(const LWOOBJID& propertyId, const IPropertyContents::Model& model, const std::string_view name) {
-	try {
-		ExecuteInsert(
-			"INSERT INTO properties_contents"
-			"(id, property_id, ugc_id, lot, x, y, z, rx, ry, rz, rw, model_name, model_description, behavior_1, behavior_2, behavior_3, behavior_4, behavior_5)"
-			"VALUES (?,  ?,           ?,      ?,   ?, ?, ?, ?,  ?,  ?,  ?,  ?,    ?,           ?,          ?,          ?,          ?,          ?)",
-			//       1,  2,           3,      4,   5, 6, 7, 8,  9,  10, 11, 12,   13,          14,         15,         16,         17          18
-			model.id, propertyId, model.ugcId == 0 ? std::nullopt : std::optional(model.ugcId), static_cast<uint32_t>(model.lot),
-			model.position.x, model.position.y, model.position.z, model.rotation.x, model.rotation.y, model.rotation.z, model.rotation.w,
-			name, "", // Model description.  TODO implement this.
-			0, // behavior 1.  TODO implement this.
-			0, // behavior 2.  TODO implement this.
-			0, // behavior 3.  TODO implement this.
-			0, // behavior 4.  TODO implement this.
-			0 // behavior 5.  TODO implement this.
-		);
-	} catch (sql::SQLException& e) {
-		LOG("Error inserting new property model: %s", e.what());
-	}
-}
-
-void MySQLDatabase::UpdateModelPositionRotation(const LWOOBJID& propertyId, const NiPoint3& position, const NiQuaternion& rotation) {
-	ExecuteUpdate(
-		"UPDATE properties_contents SET x = ?, y = ?, z = ?, rx = ?, ry = ?, rz = ?, rw = ? WHERE id = ?;",
-		position.x, position.y, position.z, rotation.x, rotation.y, rotation.z, rotation.w, propertyId);
-}
-
-void MySQLDatabase::RemoveModel(const LWOOBJID& modelId) {
-	ExecuteDelete("DELETE FROM properties_contents WHERE id = ?;", modelId);
-}

dDatabase/GameDatabase/MySQL/Tables/Servers.cpp

@@ -1,23 +0,0 @@
-#include "MySQLDatabase.h"
-
-void MySQLDatabase::SetMasterIp(const std::string_view ip, const uint32_t port) {
-	// We only want our 1 entry anyways, so we can just delete all and reinsert the one we want
-	// since it would be two queries anyways.
-	ExecuteDelete("TRUNCATE TABLE servers;");
-	ExecuteInsert("INSERT INTO `servers` (`name`, `ip`, `port`, `state`, `version`) VALUES ('master', ?, ?, 0, 171022)", ip, port);
-}
-
-std::optional<IServers::MasterInfo> MySQLDatabase::GetMasterInfo() {
-	auto result = ExecuteSelect("SELECT ip, port FROM servers WHERE name='master' LIMIT 1;");
-
-	if (!result->next()) {
-		return std::nullopt;
-	}
-
-	MasterInfo toReturn;
-
-	toReturn.ip = result->getString("ip").c_str();
-	toReturn.port = result->getInt("port");
-
-	return toReturn;
-}

dDatabase/GameDatabase/MySQL/Tables/Ugc.cpp

@@ -1,71 +0,0 @@
-#include "MySQLDatabase.h"
-
-std::vector<IUgc::Model> MySQLDatabase::GetUgcModels(const LWOOBJID& propertyId) {
-	auto result = ExecuteSelect(
-		"SELECT lxfml, u.id FROM ugc AS u JOIN properties_contents AS pc ON u.id = pc.ugc_id WHERE lot = 14 AND property_id = ? AND pc.ugc_id IS NOT NULL;",
-		propertyId);
-
-	std::vector<IUgc::Model> toReturn;
-
-	while (result->next()) {
-		IUgc::Model model;
-
-		// blob is owned by the query, so we need to do a deep copy :/
-		std::unique_ptr<std::istream> blob(result->getBlob("lxfml"));
-		model.lxfmlData << blob->rdbuf();
-		model.id = result->getUInt64("id");
-		toReturn.push_back(std::move(model));
-	}
-
-	return toReturn;
-}
-
-std::vector<IUgc::Model> MySQLDatabase::GetAllUgcModels() {
-	auto result = ExecuteSelect("SELECT id, lxfml FROM ugc;");
-
-	std::vector<IUgc::Model> models;
-	models.reserve(result->rowsCount());
-	while (result->next()) {
-		IUgc::Model model;
-		model.id = result->getInt64("id");
-
-		// blob is owned by the query, so we need to do a deep copy :/
-		std::unique_ptr<std::istream> blob(result->getBlob("lxfml"));
-		model.lxfmlData << blob->rdbuf();
-		models.push_back(std::move(model));
-	}
-
-	return models;
-}
-
-void MySQLDatabase::RemoveUnreferencedUgcModels() {
-	ExecuteDelete("DELETE FROM ugc WHERE id NOT IN (SELECT ugc_id FROM properties_contents WHERE ugc_id IS NOT NULL);");
-}
-
-void MySQLDatabase::InsertNewUgcModel(
-	std::istringstream& sd0Data, // cant be const sad
-	const uint32_t blueprintId,
-	const uint32_t accountId,
-	const uint32_t characterId) {
-	const std::istream stream(sd0Data.rdbuf());
-	ExecuteInsert(
-		"INSERT INTO `ugc`(`id`, `account_id`, `character_id`, `is_optimized`, `lxfml`, `bake_ao`, `filename`) VALUES (?,?,?,?,?,?,?)",
-		blueprintId,
-		accountId,
-		characterId,
-		0,
-		&stream,
-		false,
-		"weedeater.lxfml"
-	);
-}
-
-void MySQLDatabase::DeleteUgcModelData(const LWOOBJID& modelId) {
-	ExecuteDelete("DELETE FROM ugc WHERE id = ?;", modelId);
-	ExecuteDelete("DELETE FROM properties_contents WHERE ugc_id = ?;", modelId);
-}
-
-void MySQLDatabase::UpdateUgcModelData(const LWOOBJID& modelId, std::istringstream& lxfml) {
-	const std::istream stream(lxfml.rdbuf());
-	ExecuteUpdate("UPDATE ugc SET lxfml = ? WHERE id = ?;", &stream, modelId);
-}