LEGO_Universe/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer synced 2024-08-30 18:43:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

FINALLY WORKING JESUS

Browse Source
This commit is contained in:
EmosewaMC 2022-03-28 03:24:49 -07:00
parent 0a453e9dca
commit 54de6c6878
4 changed files with 83 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

150
dGame/dComponents/PropertyEntranceComponent.cpp
View File

@ -82,7 +82,7 @@ void PropertyEntranceComponent::OnPropertyEntranceSync(Entity* entity,
bool playerOwn, bool playerOwn,
bool updateUi, bool updateUi,
int32_t numResults, int32_t numResults,
int32_t reputation, int32_t lReputationTime,
int32_t sortMethod, int32_t sortMethod,
int32_t startIndex, int32_t startIndex,
std::string filterText, std::string filterText,
@ -94,7 +94,7 @@ void PropertyEntranceComponent::OnPropertyEntranceSync(Entity* entity,
playerOwn, playerOwn,
updateUi, updateUi,
numResults, numResults,
reputation, lReputationTime,
sortMethod, sortMethod,
startIndex, startIndex,
filterText.c_str() filterText.c_str()
@ -106,15 +106,46 @@ void PropertyEntranceComponent::OnPropertyEntranceSync(Entity* entity,
std::vector<PropertySelectQueryProperty> entries {}; std::vector<PropertySelectQueryProperty> entries {};
PropertySelectQueryProperty playerEntry {}; PropertySelectQueryProperty playerEntry {};
auto* character = entity->GetCharacter(); auto* character = entity->GetCharacter();
playerEntry.OwnerName = character->GetName();
playerEntry.Description = "No description.";
playerEntry.Name = "Your property!";
playerEntry.IsModeratorApproved = true;
playerEntry.AccessType = 2;
playerEntry.CloneId = character->GetPropertyCloneID();
auto newpropertyLookup = Database::CreatePreppedStmt("SELECT * FROM properties WHERE owner_id = ? AND zone_id = ?");
newpropertyLookup->setInt(1, character->GetID());
newpropertyLookup->setInt(2, launchpadComponent->GetTargetZone());
auto results = newpropertyLookup->executeQuery();
playerEntry.CloneId = character->GetPropertyCloneID();
playerEntry.OwnerName = "";
playerEntry.Name = "";
playerEntry.Description = "";
playerEntry.Reputation = 0;
playerEntry.IsBestFriend = true;
playerEntry.IsFriend = true;
playerEntry.IsModeratorApproved = false;
playerEntry.IsAlt = true;
playerEntry.IsOwned = false;
playerEntry.AccessType = 0;
playerEntry.DatePublished = 0;
if (results->next()) {
const auto propertyId = results->getUInt64(1);
const auto owner = results->getUInt64(2);
const auto cloneId = results->getUInt64(4);
const auto name = results->getString(5).asStdString();
const auto description = results->getString(6).asStdString();
const auto privacyOption = results->getInt(9);
const auto modApproved = results->getBoolean(10);
const auto dateUpdated = results->getInt64(11);
const auto reputation = results->getInt(14);
playerEntry.Name = name;
playerEntry.Description = description;
playerEntry.DatePublished = dateUpdated;
playerEntry.IsModeratorApproved = modApproved;
playerEntry.IsAlt = true;
playerEntry.IsOwned = true;
}
entries.push_back(playerEntry); entries.push_back(playerEntry);
sql::ResultSet* propertyEntry; sql::ResultSet* propertyEntry;
@ -124,32 +155,54 @@ void PropertyEntranceComponent::OnPropertyEntranceSync(Entity* entity,
const auto moderating = entity->GetGMLevel() >= GAME_MASTER_LEVEL_LEAD_MODERATOR; const auto moderating = entity->GetGMLevel() >= GAME_MASTER_LEVEL_LEAD_MODERATOR;
std::string baseQuery = "SELECT p.* FROM properties as p JOIN charinfo as ci ON ci.prop_clone_id = p.clone_id where p.zone_id = ? AND (p.description LIKE ? OR p.name LIKE ? OR ci.name LIKE ?) AND p.mod_approved >= ? AND p.privacy_option >= ? ";
// In case the query is for friends.
std::string friendsList = " AND p.owner_id IN (";
// We change how we sort this query based on what the requested order is. // We change how we sort this query based on what the requested order is.
if (sortMethod == SORT_TYPE_FEATURED || sortMethod == SORT_TYPE_FRIENDS) { if (sortMethod == SORT_TYPE_FEATURED || sortMethod == SORT_TYPE_FRIENDS) {
orderBy = "ci.name"; auto friendsListQuery = Database::CreatePreppedStmt("SELECT * FROM (SELECT CASE WHEN player_id = ? THEN friend_id WHEN friend_id = ? THEN player_id END AS requested_player FROM dlu.friends ) AS fr WHERE requested_player IS NOT NULL ORDER BY requested_player DESC;");
friendsListQuery->setInt64(1, entity->GetObjectID());
friendsListQuery->setInt64(2, entity->GetObjectID());
// friendsListQuery->setInt(3, numResults);
// friendsListQuery->setInt(4, startIndex);
auto friendsListQueryResult = friendsListQuery->executeQuery();
while (friendsListQueryResult->next()) {
auto playerIDToConvert = friendsListQueryResult->getInt64(1);
playerIDToConvert = GeneralUtils::ClearBit(playerIDToConvert, OBJECT_BIT_CHARACTER);
playerIDToConvert = GeneralUtils::ClearBit(playerIDToConvert, OBJECT_BIT_PERSISTENT);
friendsList = friendsList + std::to_string(playerIDToConvert) + ",";
}
// Replace trailing comma with the closing parenthesis.
friendsList.replace(friendsList.size() - 1, 2, ") ");
orderBy = friendsList + "ORDER BY ci.name ASC ";
privacyType = 1; privacyType = 1;
} }
else if (sortMethod == SORT_TYPE_RECENT) { else if (sortMethod == SORT_TYPE_RECENT) {
orderBy = "p.last_updated"; orderBy = "ORDER BY p.last_updated DESC ";
} }
else if (sortMethod == SORT_TYPE_REPUTATION) { else if (sortMethod == SORT_TYPE_REPUTATION) {
orderBy = "p.reputation DESC, p.last_updated"; orderBy = "ORDER BY p.reputation DESC, p.last_updated DESC ";
} }
else { else {
orderBy = "p.last_updated"; orderBy = "ORDER BY p.last_updated DESC ";
} }
auto finishedQuery = baseQuery + orderBy + "LIMIT ? OFFSET ?;";
propertyLookup = Database::CreatePreppedStmt("SELECT p.* FROM properties as p JOIN charinfo as ci ON ci.prop_clone_id = p.clone_id where p.zone_id = ? AND (p.description OR p.name OR ci.name LIKE ?) AND p.mod_approved >= ? AND p.privacy_option = ? ORDER BY ? DESC LIMIT ? OFFSET ?;"); propertyLookup = Database::CreatePreppedStmt(finishedQuery);
const std::string searchString = "%" + filterText + "%"; const std::string searchString = "%" + filterText + "%";
Game::logger->Log("PropertyEntranceComponent", "%s\n", searchString.c_str()); Game::logger->Log("PropertyEntranceComponent", "%s\n", searchString.c_str());
propertyLookup->setUInt(1, launchpadComponent->GetTargetZone()); propertyLookup->setUInt(1, launchpadComponent->GetTargetZone());
propertyLookup->setString(2, searchString.c_str()); propertyLookup->setString(2, searchString.c_str());
propertyLookup->setInt(3, entity->GetGMLevel() >= GAME_MASTER_LEVEL_LEAD_MODERATOR ? 0 : 1); propertyLookup->setString(3, searchString.c_str());
propertyLookup->setInt(4, privacyType); propertyLookup->setString(4, searchString.c_str());
propertyLookup->setString(5, orderBy); propertyLookup->setInt(5, entity->GetGMLevel() >= GAME_MASTER_LEVEL_LEAD_MODERATOR || sortMethod == SORT_TYPE_FRIENDS ? 0 : 1);
propertyLookup->setInt(6, numResults); propertyLookup->setInt(6, privacyType);
propertyLookup->setInt(7, startIndex); propertyLookup->setInt(7, numResults);
propertyLookup->setInt(8, startIndex);
Game::logger->Log("PropertyEntranceComponent", "Querying target zone %i with search string %s and ordering by %s starting at index %i. Entity is %s.\n", launchpadComponent->GetTargetZone(), searchString.c_str(), orderBy.c_str(), startIndex, entity->GetGMLevel() >= GAME_MASTER_LEVEL_LEAD_MODERATOR ? "a moderator" : "not a moderator"); Game::logger->Log("PropertyEntranceComponent", "Querying target zone %i with search string %s and ordering by %s starting at index %i. Entity is %s.\n", launchpadComponent->GetTargetZone(), searchString.c_str(), orderBy.c_str(), startIndex, entity->GetGMLevel() >= GAME_MASTER_LEVEL_LEAD_MODERATOR ? "a moderator" : "not a moderator");
propertyEntry = propertyLookup->executeQuery(); propertyEntry = propertyLookup->executeQuery();
@ -163,7 +216,10 @@ void PropertyEntranceComponent::OnPropertyEntranceSync(Entity* entity,
const auto description = propertyEntry->getString(6).asStdString(); const auto description = propertyEntry->getString(6).asStdString();
const auto privacyOption = propertyEntry->getInt(9); const auto privacyOption = propertyEntry->getInt(9);
const auto modApproved = propertyEntry->getBoolean(10); const auto modApproved = propertyEntry->getBoolean(10);
const auto reputation = propertyEntry->getInt(14); const auto dateUpdated = propertyEntry->getInt(11);
const auto reputation = propertyEntry->getUInt(14);
Game::logger->Log("PropertyEntranceComponent", "Property being loaded is %i with reputation %lu\n", owner, reputation);
PropertySelectQueryProperty entry {}; PropertySelectQueryProperty entry {};
@ -221,14 +277,11 @@ void PropertyEntranceComponent::OnPropertyEntranceSync(Entity* entity,
entry.IsBestFriend = false; entry.IsBestFriend = false;
} }
// Game::logger->Log("FriendsQuery", "Friend OBJID %lu my OBJID %lu\n", ownerObjId, entity->GetObjectID());
auto isAltQuery = Database::CreatePreppedStmt("SELECT id FROM charinfo where account_id in (SELECT account_id from charinfo WHERE id = ?) AND id = ?;"); auto isAltQuery = Database::CreatePreppedStmt("SELECT id FROM charinfo where account_id in (SELECT account_id from charinfo WHERE id = ?) AND id = ?;");
isAltQuery->setInt(1, character->GetID()); isAltQuery->setInt(1, character->GetID());
isAltQuery->setInt(2, owner); isAltQuery->setInt(2, owner);
Game::logger->Log("PropertyEntranceComponent", "main character is %i with alt query being %i\n", character->GetID(), owner);
auto isAltQueryResults = isAltQuery->executeQuery(); auto isAltQueryResults = isAltQuery->executeQuery();
if (isAltQueryResults->next()) { if (isAltQueryResults->next()) {
@ -239,64 +292,19 @@ void PropertyEntranceComponent::OnPropertyEntranceSync(Entity* entity,
delete isAltQuery; delete isAltQuery;
isAltQuery = nullptr; isAltQuery = nullptr;
entry.DatePublished = dateUpdated;
entry.Reputation = reputation; entry.Reputation = reputation;
entry.CloneId = cloneId; entry.CloneId = cloneId;
entry.IsModeratorApproved = modApproved == true; entry.IsModeratorApproved = modApproved == true;
entry.AccessType = privacyOption; entry.AccessType = privacyOption;
entry.PerformanceCost = entity->GetObjectID();
entries.push_back(entry); entries.push_back(entry);
delete nameLookup; delete nameLookup;
} }
delete propertyLookup; delete propertyLookup;
Game::logger->Log("HELLO", "WE GOT TO HERE");
// auto newpropertyLookup = Database::CreatePreppedStmt("SELECT * FROM properties WHERE owner_id = ? AND zone_id = ?");
// newpropertyLookup->setInt(1, character->GetID());
// newpropertyLookup->setInt(2, launchpadComponent->GetTargetZone());
// auto results = propertyLookup->executeQuery();
// PropertySelectQueryProperty entry {};
// entry.CloneId = character->GetPropertyCloneID();
// entry.OwnerName = "";
// entry.Name = "";
// entry.Description = "";
// entry.Reputation = 0;
// entry.IsBestFriend = true;
// entry.IsFriend = true;
// entry.IsModeratorApproved = false;
// entry.IsAlt = true;
// entry.IsOwned = false;
// entry.AccessType = 0;
// // entry.DatePublished = std::chrono::duration_cast<std::chrono::seconds>(std::chrono::system_clock::now().time_since_epoch()).count();
// // entry.DatePublished = 0;
// // entry.PerformanceCost = entity->GetObjectID();
// if (results->next()) {
// const auto propertyId = results->getUInt64(1);
// const auto owner = results->getUInt64(2);
// const auto cloneId = results->getUInt64(4);
// const auto name = results->getString(5).asStdString();
// const auto description = results->getString(6).asStdString();
// const auto privacyOption = results->getInt(9);
// const auto modApproved = results->getBoolean(10);
// const auto reputation = results->getInt(14);
// // entry.CloneId = cloneId;
// // entry.OwnerName = character->GetName();
// // entry.Name = name;
// // entry.Description = description;
// // entry.Reputation = reputation;
// // entry.IsBestFriend = true;
// // entry.IsFriend = true;
// entry.IsModeratorApproved = modApproved;
// entry.IsAlt = true;
// entry.IsOwned = true;
// }
// entries.insert(entries.begin(), entry);
propertyQueries[entity->GetObjectID()] = entries; propertyQueries[entity->GetObjectID()] = entries;
GameMessages::SendPropertySelectQuery( GameMessages::SendPropertySelectQuery(

4
dGame/dComponents/PropertyEntranceComponent.h
View File

@ -38,7 +38,7 @@ public:
* @param playerOwn only query properties owned by the entity * @param playerOwn only query properties owned by the entity
* @param updateUi unused * @param updateUi unused
* @param numResults unused * @param numResults unused
* @param reputation unused * @param lReputationTime unused
* @param sortMethod unused * @param sortMethod unused
* @param startIndex the minimum index to start the query off * @param startIndex the minimum index to start the query off
* @param filterText property names to search for * @param filterText property names to search for
@ -50,7 +50,7 @@ public:
bool playerOwn, bool playerOwn,
bool updateUi, bool updateUi,
int32_t numResults, int32_t numResults,
int32_t reputation, int32_t lReputationTime,
int32_t sortMethod, int32_t sortMethod,
int32_t startIndex, int32_t startIndex,
std::string filterText, std::string filterText,

1
dGame/dGameMessages/PropertySelectQueryProperty.cpp
View File

@ -1,4 +1,5 @@
#include "PropertySelectQueryProperty.h" #include "PropertySelectQueryProperty.h"
#include <iostream>
void PropertySelectQueryProperty::Serialize(RakNet::BitStream& stream) const void PropertySelectQueryProperty::Serialize(RakNet::BitStream& stream) const
{ {

2
dGame/dGameMessages/PropertySelectQueryProperty.h
View File

@ -13,7 +13,7 @@ public:
std::string OwnerName = ""; std::string OwnerName = "";
std::string Name = ""; std::string Name = "";
std::string Description = ""; std::string Description = "";
uint32_t Reputation = 0; uint32_t Reputation = 10;
bool IsBestFriend = false; bool IsBestFriend = false;
bool IsFriend = false; bool IsFriend = false;
bool IsModeratorApproved = false; bool IsModeratorApproved = false;