support SJIS mail (#15)

config.json

@@ -16,6 +16,7 @@
     "FestaEvent": 0,
     "TournamentEvent": 0,
     "MezFesEvent": true,
+    "DisableMailItems": true,
     "SaveDumps": {
       "Enabled": true,
       "OutputDir": "savedata"

config/config.go

@@ -36,6 +36,7 @@ type DevModeOptions struct {
 	FestaEvent          int    // Hunter's Festa event status
 	TournamentEvent     int    // VS Tournament event status
 	MezFesEvent         bool   // MezFes status
+	DisableMailItems    bool   // Hack to prevent english versions of MHF from crashing
 	SaveDumps           SaveDumpOptions
 }
 

network/mhfpacket/msg_mhf_oprt_mail.go

@@ -3,9 +3,9 @@ package mhfpacket
 import (
 	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 type OperateMailOperation uint8
@@ -41,8 +41,7 @@ func (m *MsgMhfOprtMail) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientCon
 	m.Index = bf.ReadUint8()
 	m.Operation = OperateMailOperation(bf.ReadUint8())
 	m.Unk0 = bf.ReadUint8()
-  switch m.Operation {
+	if m.Operation == OPERATE_MAIL_ACQUIRE_ITEM {
-  case OPERATE_MAIL_ACQUIRE_ITEM:
 		m.Amount = bf.ReadUint16()
 		m.ItemID = bf.ReadUint16()
 	}

network/mhfpacket/msg_mhf_send_mail.go

@@ -2,10 +2,11 @@ package mhfpacket
 
 import (
 	"errors"
+	"erupe-ce/common/stringsupport"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfSendMail represents the MSG_MHF_SEND_MAIL
@@ -16,8 +17,8 @@ type MsgMhfSendMail struct {
 	BodyLength    uint16
 	Quantity      uint32
 	ItemID        uint16
-  Subject       []byte
+	Subject       string
-  Body          []byte
+	Body          string
 }
 
 // Opcode returns the ID associated with this packet type.
@@ -33,8 +34,8 @@ func (m *MsgMhfSendMail) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientCon
 	m.BodyLength = bf.ReadUint16()
 	m.Quantity = bf.ReadUint32()
 	m.ItemID = bf.ReadUint16()
-  m.Subject = bf.ReadNullTerminatedBytes()
+	m.Subject = stringsupport.SJISToUTF8(bf.ReadNullTerminatedBytes())
-  m.Body = bf.ReadNullTerminatedBytes()
+	m.Body = stringsupport.SJISToUTF8(bf.ReadNullTerminatedBytes())
 	return nil
 }
 

server/channelserver/handlers_mail.go

@@ -2,6 +2,7 @@ package channelserver
 
 import (
 	"database/sql"
+	"erupe-ce/common/stringsupport"
 	"time"
 
 	"erupe-ce/common/byteframe"
@@ -275,7 +276,7 @@ func handleMsgMhfReadMail(s *Session, p mhfpacket.MHFPacket) {
 
 	bf := byteframe.NewByteFrame()
 
-	body := s.clientContext.StrConv.MustEncode(mail.Body)
+	body := stringsupport.UTF8ToSJIS(mail.Body)
 	bf.WriteNullTerminatedBytes(body)
 
 	doAckBufSucceed(s, pkt.AckHandle, bf.Data())
@@ -307,13 +308,11 @@ func handleMsgMhfListMail(s *Session, p mhfpacket.MHFPacket) {
 		s.mailAccIndex++
 
 		itemAttached := m.AttachedItemID != 0
-		subject := s.clientContext.StrConv.MustEncode(m.Subject)
-		sender := s.clientContext.StrConv.MustEncode(m.SenderName)
 
 		msg.WriteUint32(m.SenderID)
 		msg.WriteUint32(uint32(m.CreatedAt.Unix()))
 
-		msg.WriteUint8(uint8(accIndex))
+		msg.WriteUint8(accIndex)
 		msg.WriteUint8(uint8(i))
 
 		flags := uint8(0x00)
@@ -329,9 +328,16 @@ func handleMsgMhfListMail(s *Session, p mhfpacket.MHFPacket) {
 		// System message, hides ID
 		// flags |= 0x04
 
+		// Workaround until EN mail items are patched
+		if s.server.erupeConfig.DevMode && s.server.erupeConfig.DevModeOptions.DisableMailItems {
+			if itemAttached {
+				flags |= 0x08
+			}
+		} else {
 			if m.AttachedItemReceived {
 				flags |= 0x08
 			}
+		}
 
 		if m.IsGuildInvite {
 			flags |= 0x10
@@ -339,11 +345,10 @@ func handleMsgMhfListMail(s *Session, p mhfpacket.MHFPacket) {
 
 		msg.WriteUint8(flags)
 		msg.WriteBool(itemAttached)
-		msg.WriteUint8(uint8(len(subject) + 1))
+		msg.WriteUint8(16)
-		msg.WriteUint8(uint8(len(sender) + 1))
+		msg.WriteUint8(21)
-		msg.WriteNullTerminatedBytes(subject)
+		msg.WriteBytes(stringsupport.PaddedString(m.Subject, 16, true))
-		msg.WriteNullTerminatedBytes(sender)
+		msg.WriteBytes(stringsupport.PaddedString(m.SenderName, 21, true))
-
 		if itemAttached {
 			msg.WriteUint16(m.AttachedItemAmount)
 			msg.WriteUint16(m.AttachedItemID)
@@ -358,34 +363,22 @@ func handleMsgMhfOprtMail(s *Session, p mhfpacket.MHFPacket) {
 
 	mail, err := GetMailByID(s, s.mailList[pkt.AccIndex])
 	if err != nil {
-		doAckSimpleFail(s, pkt.AckHandle, nil)
 		panic(err)
 	}
-	switch mhfpacket.OperateMailOperation(pkt.Operation) {
+
+	switch pkt.Operation {
 	case mhfpacket.OPERATE_MAIL_DELETE:
 		err = mail.MarkDeleted(s)
-		if err != nil {
-			doAckSimpleFail(s, pkt.AckHandle, nil)
-			panic(err)
-		}
 	case mhfpacket.OPERATE_MAIL_LOCK:
 		err = mail.MarkLocked(s, true)
-		if err != nil {
-			doAckSimpleFail(s, pkt.AckHandle, nil)
-			panic(err)
-		}
 	case mhfpacket.OPERATE_MAIL_UNLOCK:
 		err = mail.MarkLocked(s, false)
-		if err != nil {
-			doAckSimpleFail(s, pkt.AckHandle, nil)
-			panic(err)
-		}
 	case mhfpacket.OPERATE_MAIL_ACQUIRE_ITEM:
 		err = mail.MarkAcquired(s)
-		if err != nil {
-			doAckSimpleFail(s, pkt.AckHandle, nil)
-			panic(err)
 	}
+
+	if err != nil {
+		panic(err)
 	}
 
 	doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))