Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-09 01:38:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add weekly filter

Browse Source
This commit is contained in:
EmosewaMC 2023-06-05 16:04:56 -07:00
parent dab075fc39
commit c99e2a372b
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dGame/LeaderboardManager.cpp
View File

@ -164,7 +164,7 @@ const std::string_view Leaderboard::GetOrdering(Leaderboard::Type leaderboardTyp
} }
} }
void Leaderboard::SetupLeaderboard(uint32_t resultStart, uint32_t resultEnd) { void Leaderboard::SetupLeaderboard(bool weekly, uint32_t resultStart, uint32_t resultEnd) {
resultStart++; resultStart++;
resultEnd++; resultEnd++;
// We need everything except 1 column so i'm selecting * from leaderboard // We need everything except 1 column so i'm selecting * from leaderboard
@ -198,8 +198,7 @@ void Leaderboard::SetupLeaderboard(uint32_t resultStart, uint32_t resultEnd) {
ORDER BY ranking ASC; ORDER BY ranking ASC;
)QUERY"; )QUERY";
// If we are getting the friends leaderboard, add the friends query, otherwise fill it in with nothing. std::string friendsFilter =
std::string friendsQuery =
R"QUERY( R"QUERY(
AND ( AND (
character_id IN ( character_id IN (
@ -218,7 +217,12 @@ void Leaderboard::SetupLeaderboard(uint32_t resultStart, uint32_t resultEnd) {
) )
)QUERY"; )QUERY";
if (this->infoType != InfoType::Friends) friendsQuery.clear(); std::string weeklyFilter = " AND date >= curdate() - INTERVAL DAYOFWEEK(curdate()) - 7 DAY";
std::string filter;
// Setup our filter based on the query type
if (this->infoType == InfoType::Friends) filter += friendsFilter;
if (this->weekly) filter += weeklyFilter;
const auto orderBase = GetOrdering(this->leaderboardType); const auto orderBase = GetOrdering(this->leaderboardType);
// For top query, we want to just rank all scores, but for all others we need the scores around a specific player // For top query, we want to just rank all scores, but for all others we need the scores around a specific player
@ -243,7 +247,7 @@ void Leaderboard::SetupLeaderboard(uint32_t resultStart, uint32_t resultEnd) {
// Create and execute the actual save here. Using a heap allocated buffer to avoid stack overflow // Create and execute the actual save here. Using a heap allocated buffer to avoid stack overflow
constexpr uint16_t STRING_LENGTH = 4096; constexpr uint16_t STRING_LENGTH = 4096;
std::unique_ptr<char[]> lookupBuffer = std::make_unique<char[]>(STRING_LENGTH); std::unique_ptr<char[]> lookupBuffer = std::make_unique<char[]>(STRING_LENGTH);
[[maybe_unused]] int32_t res = snprintf(lookupBuffer.get(), STRING_LENGTH, queryBase.c_str(), orderBase.data(), friendsQuery.c_str(), resultStart, resultEnd); [[maybe_unused]] int32_t res = snprintf(lookupBuffer.get(), STRING_LENGTH, queryBase.c_str(), orderBase.data(), filter.c_str(), resultStart, resultEnd);
DluAssert(res != -1); DluAssert(res != -1);
std::unique_ptr<sql::PreparedStatement> query(Database::CreatePreppedStmt(lookupBuffer.get())); std::unique_ptr<sql::PreparedStatement> query(Database::CreatePreppedStmt(lookupBuffer.get()));
@ -370,7 +374,7 @@ void LeaderboardManager::SaveScore(const LWOOBJID& playerID, const GameID activi
void LeaderboardManager::SendLeaderboard(const GameID gameID, const Leaderboard::InfoType infoType, const bool weekly, const LWOOBJID playerID, const LWOOBJID targetID, const uint32_t resultStart, const uint32_t resultEnd) { void LeaderboardManager::SendLeaderboard(const GameID gameID, const Leaderboard::InfoType infoType, const bool weekly, const LWOOBJID playerID, const LWOOBJID targetID, const uint32_t resultStart, const uint32_t resultEnd) {
Leaderboard leaderboard(gameID, infoType, weekly, playerID, GetLeaderboardType(gameID)); Leaderboard leaderboard(gameID, infoType, weekly, playerID, GetLeaderboardType(gameID));
leaderboard.SetupLeaderboard(resultStart, resultEnd); leaderboard.SetupLeaderboard(weekly, resultStart, resultEnd);
leaderboard.Send(targetID); leaderboard.Send(targetID);
} }

2
dGame/LeaderboardManager.h
View File

@ -97,7 +97,7 @@ public:
* @param resultStart The index to start the leaderboard at. Zero indexed. * @param resultStart The index to start the leaderboard at. Zero indexed.
* @param resultEnd The index to end the leaderboard at. Zero indexed. * @param resultEnd The index to end the leaderboard at. Zero indexed.
*/ */
void SetupLeaderboard(uint32_t resultStart = 0, uint32_t resultEnd = 10); void SetupLeaderboard(bool weekly, uint32_t resultStart = 0, uint32_t resultEnd = 10);
/** /**
* Sends the leaderboard to the client specified by targetID. * Sends the leaderboard to the client specified by targetID.

2
tests/dGameTests/LeaderboardTests.cpp
View File

@ -28,7 +28,7 @@ protected:
void RunTests(uint32_t gameID, Leaderboard::Type type, Leaderboard::InfoType infoType) { void RunTests(uint32_t gameID, Leaderboard::Type type, Leaderboard::InfoType infoType) {
Game::logger->Log("LeaderboardTests", "Testing leaderboard %i for Serialize speed", infoType); Game::logger->Log("LeaderboardTests", "Testing leaderboard %i for Serialize speed", infoType);
Leaderboard leaderboard(gameID, infoType, false, 14231, type); Leaderboard leaderboard(gameID, infoType, false, 14231, type);
leaderboard.SetupLeaderboard(); leaderboard.SetupLeaderboard(true, 0, 10);
leaderboard.Serialize(&bitStream); leaderboard.Serialize(&bitStream);
TestLeaderboard(leaderboard, 1); TestLeaderboard(leaderboard, 1);
TestLeaderboard(leaderboard, 10); TestLeaderboard(leaderboard, 10);