diff --git a/src/server/database/Database/Implementation/CharacterDatabase.cpp b/src/server/database/Database/Implementation/CharacterDatabase.cpp index 9675450e79..2fd8f1c8f6 100644 --- a/src/server/database/Database/Implementation/CharacterDatabase.cpp +++ b/src/server/database/Database/Implementation/CharacterDatabase.cpp @@ -250,6 +250,7 @@ void CharacterDatabaseConnection::DoPrepareStatements() PrepareStatement(CHAR_UPD_GUILD_RESET_TODAY_EXPERIENCE, "UPDATE guild SET todayExperience = 0", CONNECTION_ASYNC); PrepareStatement(CHAR_INS_GUILD_NEWS, "INSERT INTO guild_newslog (guildid, LogGuid, EventType, PlayerGuid, Flags, Value, Timestamp) VALUES (?, ?, ?, ?, ?, ?, ?)" " ON DUPLICATE KEY UPDATE LogGuid = VALUES (LogGuid), EventType = VALUES (EventType), PlayerGuid = VALUES (PlayerGuid), Flags = VALUES (Flags), Value = VALUES (Value), Timestamp = VALUES (Timestamp)", CONNECTION_ASYNC); + PrepareStatement(CHAR_DEL_GUILD_NEWS, "DELETE FROM guild_newslog WHERE Timestamp < ?", CONNECTION_ASYNC); PrepareStatement(CHAR_UPD_GUILD_CHALLENGE, "UPDATE guild SET completedDungeonChallenges = ?, completedRaidChallenges = ?, completedRatedBattlegroundChallenges = ? WHERE guildId = ?", CONNECTION_ASYNC); PrepareStatement(CHAR_UPD_GUILD_RESET_CHALLENGE, "UPDATE guild SET completedDungeonChallenges = 0, completedRaidChallenges = 0, completedRatedBattlegroundChallenges = 0 WHERE guildId = ?", CONNECTION_ASYNC); diff --git a/src/server/database/Database/Implementation/CharacterDatabase.h b/src/server/database/Database/Implementation/CharacterDatabase.h index d3157b1c1e..8b348bd062 100644 --- a/src/server/database/Database/Implementation/CharacterDatabase.h +++ b/src/server/database/Database/Implementation/CharacterDatabase.h @@ -215,6 +215,7 @@ enum CharacterDatabaseStatements : uint32 CHAR_UPD_GUILD_EXPERIENCE, CHAR_UPD_GUILD_RESET_TODAY_EXPERIENCE, CHAR_INS_GUILD_NEWS, + CHAR_DEL_GUILD_NEWS, CHAR_UPD_GUILD_CHALLENGE, CHAR_UPD_GUILD_RESET_CHALLENGE, diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index 77dc1e916d..f0ea4c2c5c 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -2368,8 +2368,14 @@ void Guild::SendNewsUpdate(WorldSession* session) WorldPackets::Guild::GuildNews packet; packet.NewsEvents.reserve(m_newsLog->GetSize()); + uint64 weeklyMinTime = uint64(GameTime::GetGameTime() - time_t(7 * DAY)); + for (GuildLog::const_iterator itr = logs->begin(); itr != logs->end(); ++itr) { + // Skip news log entries that are older than a week. A cleanup of db and log data will be executed on daily guild reset time. + if ((*itr)->GetTimestamp() < weeklyMinTime) + continue; + NewsLogEntry* eventLog = static_cast(*itr); eventLog->WritePacket(packet); } @@ -4100,4 +4106,15 @@ void Guild::InitializeGuildChallengeRewards() } } +void Guild::ClearExpiredNews() +{ + // Filter news that are older than a week + uint64 minTime = uint64(GameTime::GetGameTime() - time_t(7 * DAY)); + + if (GuildLog* logs = m_newsLog->GetGuildLog()) + for (GuildLog::const_iterator itr = logs->begin(); itr != logs->end(); ++itr) + if ((*itr)->GetTimestamp() < minTime) + itr = logs->erase(itr); +} + Guild::LogEntry::LogEntry(ObjectGuid::LowType guildId, uint32 guid) : m_guildId(guildId), m_guid(guid), m_timestamp(::GameTime::GetGameTime()) { } diff --git a/src/server/game/Guilds/Guild.h b/src/server/game/Guilds/Guild.h index abe73f030b..9ee2c59bcb 100644 --- a/src/server/game/Guilds/Guild.h +++ b/src/server/game/Guilds/Guild.h @@ -918,6 +918,8 @@ public: void InitializeGuildChallengeRewards(); + void ClearExpiredNews(); + protected: ObjectGuid::LowType m_id; std::string m_name; diff --git a/src/server/game/Guilds/GuildMgr.cpp b/src/server/game/Guilds/GuildMgr.cpp index 3f4becbde7..344fc1ba71 100644 --- a/src/server/game/Guilds/GuildMgr.cpp +++ b/src/server/game/Guilds/GuildMgr.cpp @@ -654,3 +654,15 @@ void GuildMgr::ResetTimes(bool week) if (Guild* guild = itr->second) guild->ResetTimes(week); } + +void GuildMgr::ClearExpiredGuildNews() +{ + // Clean guild news that are older than a week + CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GUILD_NEWS); + stmt->setUInt64(0, uint64(GameTime::GetGameTime() - time_t(7 * DAY))); + CharacterDatabase.Execute(stmt); + + for (std::pair guildPair : GuildStore) + if (Guild* guild = guildPair.second) + guild->ClearExpiredNews(); +} diff --git a/src/server/game/Guilds/GuildMgr.h b/src/server/game/Guilds/GuildMgr.h index 37597ecf54..877399574c 100644 --- a/src/server/game/Guilds/GuildMgr.h +++ b/src/server/game/Guilds/GuildMgr.h @@ -86,6 +86,7 @@ public: std::vector const& GetGuildChallengeData() const { return GuildChallenges; } void ResetTimes(bool week); + void ClearExpiredGuildNews(); protected: typedef std::unordered_map GuildContainer; typedef std::unordered_map> GuildProfessionMap; diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 207490239c..330d5e8bec 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -2397,7 +2397,7 @@ void World::Update(uint32 diff) ResetRandomBG(); if (currentGameTime > m_NextGuildReset) - ResetGuildCap(); + PerformDailyGuildActions(); if (currentGameTime > m_NextCurrencyReset) ResetCurrencyWeekCap(); @@ -3513,7 +3513,7 @@ void World::ResetRandomBG() sWorld->setWorldState(WS_BG_DAILY_RESET_TIME, uint64(m_NextRandomBGReset)); } -void World::ResetGuildCap() +void World::PerformDailyGuildActions() { m_NextGuildReset = time_t(m_NextGuildReset + DAY); sWorld->setWorldState(WS_GUILD_DAILY_RESET_TIME, uint64(m_NextGuildReset)); @@ -3523,6 +3523,8 @@ void World::ResetGuildCap() TC_LOG_INFO("misc", "Guild Daily Cap reset. Week: %u", week == 1); sWorld->setWorldState(WS_GUILD_WEEKLY_RESET_TIME, week); sGuildMgr->ResetTimes(week == 1); + + sGuildMgr->ClearExpiredGuildNews(); } void World::UpdateMaxSessionCounters() diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index 4ffdc82845..d199a71b3b 100644 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -829,7 +829,7 @@ class TC_GAME_API World void InitRandomBGResetTime(); void InitGuildResetTime(); void ResetRandomBG(); - void ResetGuildCap(); + void PerformDailyGuildActions(); void ResetCurrencyWeekCap(); private: World(); diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index f93350644a..5f0ac5178a 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -1025,7 +1025,7 @@ Guild.EventLogRecordsCount = 100 # # Guild.ResetHour -# Description: Hour of the day when the daily cap resets occur. +# Description: Hour of the day when the daily cap resets and guild news cleanups occur. # Range: 0-23 # Default: 6 - (06:00 AM)