From ac90c2dd09aae0103aa91b57ddcab35536cd69f8 Mon Sep 17 00:00:00 2001
From: wish <wish@sek.ai>
Date: Sat, 13 Aug 2022 17:23:33 +1000
Subject: [PATCH] correct minutes->seconds

---
 patch-schema/netcafe.sql              |  2 +-
 server/channelserver/handlers_cafe.go | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/patch-schema/netcafe.sql b/patch-schema/netcafe.sql
index cfd85e5f8..e56633c46 100644
--- a/patch-schema/netcafe.sql
+++ b/patch-schema/netcafe.sql
@@ -6,7 +6,7 @@ ALTER TABLE IF EXISTS public.characters
 CREATE TABLE IF NOT EXISTS public.cafebonus
 (
     id integer NOT NULL PRIMARY KEY,
-    minutes_req integer NOT NULL,
+    seconds_req integer NOT NULL,
     item_type integer NOT NULL,
     item_id integer NOT NULL,
     quantity integer NOT NULL
diff --git a/server/channelserver/handlers_cafe.go b/server/channelserver/handlers_cafe.go
index 76529ce4f..8e7deaf5e 100644
--- a/server/channelserver/handlers_cafe.go
+++ b/server/channelserver/handlers_cafe.go
@@ -85,7 +85,7 @@ func handleMsgMhfGetCafeDuration(s *Session, p mhfpacket.MHFPacket) {
 
 type CafeBonus struct {
 	ID       uint32 `db:"id"`
-	Minutes  uint32 `db:"minutes_req"`
+	Seconds  uint32 `db:"time_req"`
 	ItemType uint32 `db:"item_type"`
 	ItemID   uint32 `db:"item_id"`
 	Quantity uint32 `db:"quantity"`
@@ -98,7 +98,7 @@ func handleMsgMhfGetCafeDurationBonusInfo(s *Session, p mhfpacket.MHFPacket) {
 
 	var count uint32
 	rows, err := s.server.db.Queryx(`
-	SELECT cb.id, minutes_req, item_type, item_id, quantity,
+	SELECT cb.id, seconds_req, item_type, item_id, quantity,
 	(
 		SELECT count(*)
 		FROM cafe_accepted ca
@@ -116,7 +116,7 @@ func handleMsgMhfGetCafeDurationBonusInfo(s *Session, p mhfpacket.MHFPacket) {
 			if err != nil {
 				s.logger.Error("Error scanning cafebonus", zap.Error(err))
 			}
-			bf.WriteUint32(cafeBonus.Minutes)
+			bf.WriteUint32(cafeBonus.Seconds)
 			bf.WriteUint32(0) // Unk
 			bf.WriteUint32(cafeBonus.ItemID)
 			bf.WriteUint32(cafeBonus.Quantity)
@@ -136,7 +136,7 @@ func handleMsgMhfReceiveCafeDurationBonus(s *Session, p mhfpacket.MHFPacket) {
 	bf := byteframe.NewByteFrame()
 
 	row := s.server.db.QueryRowx(`
-	SELECT c.id, minutes_req, item_type, item_id, quantity
+	SELECT c.id, seconds_req, item_type, item_id, quantity
 	FROM cafebonus c
 	WHERE (
 		SELECT count(*)
@@ -146,7 +146,7 @@ func handleMsgMhfReceiveCafeDurationBonus(s *Session, p mhfpacket.MHFPacket) {
 		SELECT ch.cafe_time + $2
 		FROM characters ch
 		WHERE ch.id = $1 
-	) >= minutes_req LIMIT 1;`, s.charID, Time_Current_Adjusted().Unix()-s.sessionStart)
+	) >= seconds_req LIMIT 1;`, s.charID, Time_Current_Adjusted().Unix()-s.sessionStart)
 	cafeBonus := &CafeBonus{}
 	err := row.StructScan(cafeBonus)
 	if err != nil {