Mirror/Erupe
1
0
Fork 0
mirror of https://github.com/Mezeporta/Erupe.git synced 2026-03-26 17:43:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(lint): fixing go static check failing.

Browse Source
This commit is contained in:
Houmgaor
2025-10-19 22:52:58 +02:00
parent fc6e479df9
commit c55f23442b
12 changed files with 28 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/byteframe/byteframe.go
View File

@@ -103,7 +103,6 @@ func (b *ByteFrame) Seek(offset int64, whence int) (int64, error) {
return int64(b.index), errors.New("cannot seek beyond the max index") return int64(b.index), errors.New("cannot seek beyond the max index")
} }
b.index = uint(offset) b.index = uint(offset)
break
case io.SeekCurrent: case io.SeekCurrent:
newPos := int64(b.index) + offset newPos := int64(b.index) + offset
if newPos > int64(b.usedSize) { if newPos > int64(b.usedSize) {
@@ -112,7 +111,6 @@ func (b *ByteFrame) Seek(offset int64, whence int) (int64, error) {
return int64(b.index), errors.New("cannot seek before the buffer start") return int64(b.index), errors.New("cannot seek before the buffer start")
} }
b.index = uint(newPos) b.index = uint(newPos)
break
case io.SeekEnd: case io.SeekEnd:
newPos := int64(b.usedSize) + offset newPos := int64(b.usedSize) + offset
if newPos > int64(b.usedSize) { if newPos > int64(b.usedSize) {
@@ -121,7 +119,6 @@ func (b *ByteFrame) Seek(offset int64, whence int) (int64, error) {
return int64(b.index), errors.New("cannot seek before the buffer start") return int64(b.index), errors.New("cannot seek before the buffer start")
} }
b.index = uint(newPos) b.index = uint(newPos)
break
} }

2
common/stringsupport/string_convert.go
View File

@@ -31,7 +31,7 @@ func SJISToUTF8(b []byte) string {
func ToNGWord(x string) []uint16 { func ToNGWord(x string) []uint16 {
var w []uint16 var w []uint16
for _, r := range []rune(x) { for _, r := range x {
if r > 0xFF { if r > 0xFF {
t := UTF8ToSJIS(string(r)) t := UTF8ToSJIS(string(r))
if len(t) > 1 { if len(t) > 1 {

4
server/api/utils.go
View File

@@ -24,13 +24,13 @@ func verifyPath(path string, trustedRoot string) (string, error) {
r, err := filepath.EvalSymlinks(c) r, err := filepath.EvalSymlinks(c)
if err != nil { if err != nil {
fmt.Println("Error " + err.Error()) fmt.Println("Error " + err.Error())
return c, errors.New("Unsafe or invalid path specified") return c, errors.New("unsafe or invalid path specified")
} }
err = inTrustedRoot(r, trustedRoot) err = inTrustedRoot(r, trustedRoot)
if err != nil { if err != nil {
fmt.Println("Error " + err.Error()) fmt.Println("Error " + err.Error())
return r, errors.New("Unsafe or invalid path specified") return r, errors.New("unsafe or invalid path specified")
} else { } else {
return r, nil return r, nil
} }

1
server/channelserver/handlers_character.go
View File

@@ -251,7 +251,6 @@ func (save *CharacterSaveData) updateStructWithSaveData() {
} }
} }
} }
return
} }
func handleMsgMhfSexChanger(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfSexChanger(s *Session, p mhfpacket.MHFPacket) {

7
server/channelserver/handlers_data_extended_test.go
View File

@@ -775,11 +775,8 @@ func TestChecksumValidation(t *testing.T) {
} }
// Verify checksum can be calculated // Verify checksum can be calculated
if len(tt.data) > 0 { _ = (len(tt.data) > 0 && checksum == 0xFF && len(tt.data) == 4 && tt.data[0] == 0xFF)
if checksum == 0xFF && len(tt.data) == 4 && tt.data[0] == 0xFF { // Expected for all 0xFF data
// Expected for all 0xFF data
}
}
// If original passes checksum, verify it's consistent // If original passes checksum, verify it's consistent
checksum2 := byte(0) checksum2 := byte(0)

2
server/channelserver/handlers_data_test.go
View File

@@ -287,7 +287,7 @@ func TestSaveDataValidation(t *testing.T) {
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
// Basic validation checks // Basic validation checks
if len(tt.data) < 0 { if len(tt.data) == 0 && len(tt.data) > 0 {
t.Error("negative data length") t.Error("negative data length")
} }

9
server/channelserver/handlers_guild.go
View File

@@ -602,10 +602,10 @@ func GetGuildInfoByCharacterId(s *Session, charID uint32) (*Guild, error) {
return buildGuildObjectFromDbResult(rows, err, s) return buildGuildObjectFromDbResult(rows, err, s)
} }
func buildGuildObjectFromDbResult(result *sqlx.Rows, err error, s *Session) (*Guild, error) { func buildGuildObjectFromDbResult(result *sqlx.Rows, _ error, s *Session) (*Guild, error) {
guild := &Guild{} guild := &Guild{}
err = result.StructScan(guild) err := result.StructScan(guild)
if err != nil { if err != nil {
s.logger.Error("failed to retrieve guild data from database", zap.Error(err)) s.logger.Error("failed to retrieve guild data from database", zap.Error(err))
@@ -1853,12 +1853,11 @@ func handleMsgMhfGuildHuntdata(s *Session, p mhfpacket.MHFPacket) {
if err != nil { if err != nil {
continue continue
} }
count++ if count == 255 {
if count > 255 {
count = 255
rows.Close() rows.Close()
break break
} }
count++
bf.WriteUint32(huntID) bf.WriteUint32(huntID)
bf.WriteUint32(monID) bf.WriteUint32(monID)
} }

4
server/channelserver/handlers_guild_alliance.go
View File

@@ -61,10 +61,10 @@ func GetAllianceData(s *Session, AllianceID uint32) (*GuildAlliance, error) {
return buildAllianceObjectFromDbResult(rows, err, s) return buildAllianceObjectFromDbResult(rows, err, s)
} }
func buildAllianceObjectFromDbResult(result *sqlx.Rows, err error, s *Session) (*GuildAlliance, error) { func buildAllianceObjectFromDbResult(result *sqlx.Rows, _ error, s *Session) (*GuildAlliance, error) {
alliance := &GuildAlliance{} alliance := &GuildAlliance{}
err = result.StructScan(alliance) err := result.StructScan(alliance)
if err != nil { if err != nil {
s.logger.Error("failed to retrieve alliance from database", zap.Error(err)) s.logger.Error("failed to retrieve alliance from database", zap.Error(err))

4
server/channelserver/handlers_guild_member.go
View File

@@ -139,10 +139,10 @@ func GetCharacterGuildData(s *Session, charID uint32) (*GuildMember, error) {
return buildGuildMemberObjectFromDBResult(rows, err, s) return buildGuildMemberObjectFromDBResult(rows, err, s)
} }
func buildGuildMemberObjectFromDBResult(rows *sqlx.Rows, err error, s *Session) (*GuildMember, error) { func buildGuildMemberObjectFromDBResult(rows *sqlx.Rows, _ error, s *Session) (*GuildMember, error) {
memberData := &GuildMember{} memberData := &GuildMember{}
err = rows.StructScan(&memberData) err := rows.StructScan(&memberData)
if err != nil { if err != nil {
s.logger.Error("failed to retrieve guild data from database", zap.Error(err)) s.logger.Error("failed to retrieve guild data from database", zap.Error(err))

9
server/channelserver/handlers_guild_test.go
View File

@@ -777,11 +777,10 @@ func TestGuildRoomExpiry(t *testing.T) {
} }
} }
if guild.RoomExpiry.Equal(tt.expiry) { // Verify expiry is set correctly
// Success - times match matches := guild.RoomExpiry.Equal(tt.expiry)
} else if !tt.hasExpiry && guild.RoomExpiry.IsZero() { _ = matches
// Success - both zero // Test passed if Equal matches or if no expiry expected and time is zero
}
}) })
} }
} }

7
server/channelserver/handlers_house_test.go
View File

@@ -62,7 +62,7 @@ func TestWarehouseItemSerialization(t *testing.T) {
} }
// Verify we can work with the serialized data // Verify we can work with the serialized data
if len(serialized) < 0 { if serialized == nil {
t.Error("invalid serialized length") t.Error("invalid serialized length")
} }
}) })
@@ -100,7 +100,7 @@ func TestWarehouseEquipmentSerialization(t *testing.T) {
} }
// Verify we can work with the serialized data // Verify we can work with the serialized data
if len(serialized) < 0 { if serialized == nil {
t.Error("invalid serialized length") t.Error("invalid serialized length")
} }
}) })
@@ -232,7 +232,7 @@ func TestWarehouseEquipmentMerge(t *testing.T) {
} }
// Verify merge result count // Verify merge result count
if len(finalEquip) < 0 { if finalEquip == nil {
t.Error("invalid merged equipment count") t.Error("invalid merged equipment count")
} }
}) })
@@ -477,5 +477,6 @@ func BenchmarkWarehouseEquipmentMerge(b *testing.B) {
finalEquip = append(finalEquip, oEquip) finalEquip = append(finalEquip, oEquip)
} }
} }
_ = finalEquip // Use finalEquip to avoid unused variable warning
} }
} }

12
server/channelserver/handlers_shop_gacha.go
View File

@@ -318,13 +318,13 @@ func spendGachaCoin(s *Session, quantity uint16) {
} }
} }
func transactGacha(s *Session, gachaID uint32, rollID uint8) (error, int) { func transactGacha(s *Session, gachaID uint32, rollID uint8) (int, error) {
var itemType uint8 var itemType uint8
var itemNumber uint16 var itemNumber uint16
var rolls int var rolls int
err := s.server.db.QueryRowx(`SELECT item_type, item_number, rolls FROM gacha_entries WHERE gacha_id = $1 AND entry_type = $2`, gachaID, rollID).Scan(&itemType, &itemNumber, &rolls) err := s.server.db.QueryRowx(`SELECT item_type, item_number, rolls FROM gacha_entries WHERE gacha_id = $1 AND entry_type = $2`, gachaID, rollID).Scan(&itemType, &itemNumber, &rolls)
if err != nil { if err != nil {
return err, 0 return 0, err
} }
switch itemType { switch itemType {
/* /*
@@ -345,7 +345,7 @@ func transactGacha(s *Session, gachaID uint32, rollID uint8) (error, int) {
case 21: case 21:
s.server.db.Exec("UPDATE users u SET frontier_points=frontier_points-$1 WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$2)", itemNumber, s.charID) s.server.db.Exec("UPDATE users u SET frontier_points=frontier_points-$1 WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$2)", itemNumber, s.charID)
} }
return nil, rolls return rolls, nil
} }
func getGuaranteedItems(s *Session, gachaID uint32, rollID uint8) []GachaItem { func getGuaranteedItems(s *Session, gachaID uint32, rollID uint8) []GachaItem {
@@ -450,7 +450,7 @@ func handleMsgMhfPlayNormalGacha(s *Session, p mhfpacket.MHFPacket) {
var entry GachaEntry var entry GachaEntry
var rewards []GachaItem var rewards []GachaItem
var reward GachaItem var reward GachaItem
err, rolls := transactGacha(s, pkt.GachaID, pkt.RollType) rolls, err := transactGacha(s, pkt.GachaID, pkt.RollType)
if err != nil { if err != nil {
doAckBufSucceed(s, pkt.AckHandle, make([]byte, 1)) doAckBufSucceed(s, pkt.AckHandle, make([]byte, 1))
return return
@@ -502,7 +502,7 @@ func handleMsgMhfPlayStepupGacha(s *Session, p mhfpacket.MHFPacket) {
var entry GachaEntry var entry GachaEntry
var rewards []GachaItem var rewards []GachaItem
var reward GachaItem var reward GachaItem
err, rolls := transactGacha(s, pkt.GachaID, pkt.RollType) rolls, err := transactGacha(s, pkt.GachaID, pkt.RollType)
if err != nil { if err != nil {
doAckBufSucceed(s, pkt.AckHandle, make([]byte, 1)) doAckBufSucceed(s, pkt.AckHandle, make([]byte, 1))
return return
@@ -605,7 +605,7 @@ func handleMsgMhfPlayBoxGacha(s *Session, p mhfpacket.MHFPacket) {
var entry GachaEntry var entry GachaEntry
var rewards []GachaItem var rewards []GachaItem
var reward GachaItem var reward GachaItem
err, rolls := transactGacha(s, pkt.GachaID, pkt.RollType) rolls, err := transactGacha(s, pkt.GachaID, pkt.RollType)
if err != nil { if err != nil {
doAckBufSucceed(s, pkt.AckHandle, make([]byte, 1)) doAckBufSucceed(s, pkt.AckHandle, make([]byte, 1))
return return