style: Fixed inconsistent spacing and cleaned up SQL query strings

This commit is contained in:
Matthew
2023-11-16 02:38:58 -05:00
committed by GitHub
parent 45e912a8d9
commit a27d15bff1

View File

@@ -197,14 +197,9 @@ func handleMsgMhfEnumerateQuest(s *Session, p mhfpacket.MHFPacket) {
bf.WriteUint16(0) bf.WriteUint16(0)
currentTime := time.Now() currentTime := time.Now()
var tableName = "event_quests"
/* This is an example of how I have to test and avoid issues, might be a thing later?
if _config.ErupeConfig.RealClientMode <= _config.F5 {
tableName = "event_quests_older"
}
*/
// Check the event_quests table to load the quests with rotation system // Check the event_quests table to load the quests with rotation system
rows, err := s.server.db.Query("SELECT id, COALESCE(max_players, 4) AS max_players, quest_type, quest_id, COALESCE(mark, 0) AS mark, start_time, active_duration, inactive_duration FROM " + tableName + "") rows, err := s.server.db.Query("SELECT id, COALESCE(max_players, 4) AS max_players, quest_type, quest_id, COALESCE(mark, 0) AS mark, start_time, active_duration, inactive_duration FROM event_quests")
if err != nil { if err != nil {
return return
} }
@@ -224,14 +219,14 @@ func handleMsgMhfEnumerateQuest(s *Session, p mhfpacket.MHFPacket) {
rotationTime := startTime.Add(time.Duration(activeDuration+inactiveDuration) * 24 * time.Hour) rotationTime := startTime.Add(time.Duration(activeDuration+inactiveDuration) * 24 * time.Hour)
if currentTime.After(rotationTime) { if currentTime.After(rotationTime) {
// The rotation time has passed, update the start time and reset the rotation // The rotation time has passed, update the start time and reset the rotation
_, err := s.server.db.Exec("UPDATE "+tableName+" SET start_time = $1 WHERE quest_id = $2", rotationTime, questId) _, err := s.server.db.Exec("UPDATE event_quests SET start_time = $1 WHERE quest_id = $2", rotationTime, questId)
if err != nil { if err != nil {
return return
} }
} }
// Check if the quest is currently active // Check if the quest is currently active
if currentTime.After(startTime) && currentTime.Sub(startTime) <= time.Duration(activeDuration)*24*time.Hour { if currentTime.After(startTime) && currentTime.Sub(startTime) <= time.Duration(activeDuration) * 24 * time.Hour {
data, err := makeEventQuest(s, rows) data, err := makeEventQuest(s, rows)
if err != nil { if err != nil {
continue continue