Mirror/Erupe
1
0
Fork 0
mirror of https://github.com/Mezeporta/Erupe.git synced 2025-12-16 17:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

revert broadcast package refactor in prep for session interface refactor

Browse Source
This commit is contained in:
stratic-dev
2024-10-15 04:11:58 +01:00
parent f6efbb39a6
commit 0fa7f37743
39 changed files with 475 additions and 523 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
server/channelserver/handlers_mail.go
View File

@@ -2,7 +2,6 @@ package channelserver
import (
"database/sql"
"erupe-ce/utils/broadcast"
"erupe-ce/utils/db"
"erupe-ce/utils/stringsupport"
"fmt"
@@ -231,13 +230,13 @@ func handleMsgMhfReadMail(s *Session, p mhfpacket.MHFPacket) {
}
mailId := s.mailList[pkt.AccIndex]
if mailId == 0 {
broadcast.DoAckBufSucceed(s, pkt.AckHandle, []byte{0})
s.DoAckBufSucceed(pkt.AckHandle, []byte{0})
return
}
mail, err := GetMailByID(s, mailId)
if err != nil {
broadcast.DoAckBufSucceed(s, pkt.AckHandle, []byte{0})
s.DoAckBufSucceed(pkt.AckHandle, []byte{0})
return
}
@@ -245,7 +244,7 @@ func handleMsgMhfReadMail(s *Session, p mhfpacket.MHFPacket) {
bf := byteframe.NewByteFrame()
body := stringsupport.UTF8ToSJIS(mail.Body)
bf.WriteNullTerminatedBytes(body)
broadcast.DoAckBufSucceed(s, pkt.AckHandle, bf.Data())
s.DoAckBufSucceed(pkt.AckHandle, bf.Data())
}
func handleMsgMhfListMail(s *Session, p mhfpacket.MHFPacket) {
@@ -253,7 +252,7 @@ func handleMsgMhfListMail(s *Session, p mhfpacket.MHFPacket) {
mail, err := GetMailListForCharacter(s, s.CharID)
if err != nil {
broadcast.DoAckBufSucceed(s, pkt.AckHandle, []byte{0})
s.DoAckBufSucceed(pkt.AckHandle, []byte{0})
return
}
@@ -314,7 +313,7 @@ func handleMsgMhfListMail(s *Session, p mhfpacket.MHFPacket) {
}
}
broadcast.DoAckBufSucceed(s, pkt.AckHandle, msg.Data())
s.DoAckBufSucceed(pkt.AckHandle, msg.Data())
}
func handleMsgMhfOprtMail(s *Session, p mhfpacket.MHFPacket) {
@@ -325,7 +324,7 @@ func handleMsgMhfOprtMail(s *Session, p mhfpacket.MHFPacket) {
}
mail, err := GetMailByID(s, s.mailList[pkt.AccIndex])
if err != nil {
broadcast.DoAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
s.DoAckSimpleSucceed(pkt.AckHandle, make([]byte, 4))
return
}
@@ -339,7 +338,7 @@ func handleMsgMhfOprtMail(s *Session, p mhfpacket.MHFPacket) {
case mhfpacket.OperateMailAcquireItem:
database.Exec(`UPDATE mail SET attached_item_received = TRUE WHERE id = $1`, mail.ID)
}
broadcast.DoAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
s.DoAckSimpleSucceed(pkt.AckHandle, make([]byte, 4))
}
func handleMsgMhfSendMail(s *Session, p mhfpacket.MHFPacket) {
@@ -357,20 +356,20 @@ func handleMsgMhfSendMail(s *Session, p mhfpacket.MHFPacket) {
g, err := GetGuildInfoByCharacterId(s, s.CharID)
if err != nil {
s.Logger.Error("Failed to get guild info for mail")
broadcast.DoAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
s.DoAckSimpleSucceed(pkt.AckHandle, make([]byte, 4))
return
}
gm, err := GetGuildMembers(s, g.ID, false)
if err != nil {
s.Logger.Error("Failed to get guild members for mail")
broadcast.DoAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
s.DoAckSimpleSucceed(pkt.AckHandle, make([]byte, 4))
return
}
for i := 0; i < len(gm); i++ {
_, err := database.Exec(query, s.CharID, gm[i].CharID, pkt.Subject, pkt.Body, 0, 0, false)
if err != nil {
s.Logger.Error("Failed to send mail")
broadcast.DoAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
s.DoAckSimpleSucceed(pkt.AckHandle, make([]byte, 4))
return
}
}
@@ -380,5 +379,5 @@ func handleMsgMhfSendMail(s *Session, p mhfpacket.MHFPacket) {
s.Logger.Error("Failed to send mail")
}
}
broadcast.DoAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
s.DoAckSimpleSucceed(pkt.AckHandle, make([]byte, 4))
}