From 803996adac845bda583bd8550335669041359c25 Mon Sep 17 00:00:00 2001 From: Houmgaor Date: Mon, 6 Apr 2026 19:33:32 +0200 Subject: [PATCH] style: gofmt realignment across channelserver --- network/mhfpacket/msg_parse_small_test.go | 1 - server/channelserver/guild_model.go | 4 +- server/channelserver/handlers_items.go | 1 - server/channelserver/handlers_quest.go | 1 - server/channelserver/rengoku_binary.go | 12 ++-- server/channelserver/rengoku_build.go | 6 +- server/channelserver/repo_mocks_test.go | 60 +++++++++---------- server/channelserver/scenario_json.go | 3 +- server/channelserver/svc_guild_test.go | 16 ++--- .../channelserver/sys_channel_server_test.go | 2 +- 10 files changed, 51 insertions(+), 55 deletions(-) diff --git a/network/mhfpacket/msg_parse_small_test.go b/network/mhfpacket/msg_parse_small_test.go index 1db2e9bc4..986fc8a1e 100644 --- a/network/mhfpacket/msg_parse_small_test.go +++ b/network/mhfpacket/msg_parse_small_test.go @@ -33,7 +33,6 @@ func TestParseSmallNotImplemented(t *testing.T) { {"MsgMhfStampcardPrize", &MsgMhfStampcardPrize{}}, {"MsgMhfUpdateForceGuildRank", &MsgMhfUpdateForceGuildRank{}}, - // SYS packets - NOT IMPLEMENTED {"MsgSysAuthData", &MsgSysAuthData{}}, {"MsgSysAuthQuery", &MsgSysAuthQuery{}}, diff --git a/server/channelserver/guild_model.go b/server/channelserver/guild_model.go index f86966d21..ba93d01c0 100644 --- a/server/channelserver/guild_model.go +++ b/server/channelserver/guild_model.go @@ -43,8 +43,8 @@ type Guild struct { EventRP uint32 `db:"event_rp"` RoomRP uint16 `db:"room_rp"` RoomExpiry time.Time `db:"room_expiry"` - Comment string `db:"comment"` - ReturnType uint8 `db:"return_type"` + Comment string `db:"comment"` + ReturnType uint8 `db:"return_type"` PugiName1 string `db:"pugi_name_1"` PugiName2 string `db:"pugi_name_2"` PugiName3 string `db:"pugi_name_3"` diff --git a/server/channelserver/handlers_items.go b/server/channelserver/handlers_items.go index ce2c10f52..359e5bd74 100644 --- a/server/channelserver/handlers_items.go +++ b/server/channelserver/handlers_items.go @@ -45,7 +45,6 @@ func handleMsgMhfEnumeratePrice(s *Session, p mhfpacket.MHFPacket) { doAckBufSucceed(s, pkt.AckHandle, bf.Data()) } - func handleMsgMhfGetExtraInfo(s *Session, p mhfpacket.MHFPacket) { pkt := p.(*mhfpacket.MsgMhfGetExtraInfo) // TODO: response structure unknown; fail ACK prevents softlock without misleading client diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index cf5fd713f..6a6428ecc 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -734,7 +734,6 @@ func getTuneValueRange(start uint16, value uint16) []tuneValue { return tv } - func handleMsgMhfGetUdBonusQuestInfo(s *Session, p mhfpacket.MHFPacket) { pkt := p.(*mhfpacket.MsgMhfGetUdBonusQuestInfo) diff --git a/server/channelserver/rengoku_binary.go b/server/channelserver/rengoku_binary.go index a8559c6b8..b06d52d4d 100644 --- a/server/channelserver/rengoku_binary.go +++ b/server/channelserver/rengoku_binary.go @@ -13,12 +13,12 @@ import ( // @0x14: RoadMode multiDef (24 bytes) // @0x2C: RoadMode soloDef (24 bytes) const ( - rengokuMinSize = 0x44 // header (0x14) + two RoadModes (2×24) - rengokuMultiOffset = 0x14 - rengokuSoloOffset = 0x2C - floorStatsByteSize = 24 - spawnTableByteSize = 32 - spawnPtrEntrySize = 4 // each spawn-table pointer is a u32 + rengokuMinSize = 0x44 // header (0x14) + two RoadModes (2×24) + rengokuMultiOffset = 0x14 + rengokuSoloOffset = 0x2C + floorStatsByteSize = 24 + spawnTableByteSize = 32 + spawnPtrEntrySize = 4 // each spawn-table pointer is a u32 ) // rengokuRoadMode holds a parsed RoadMode struct. All pointer fields are file diff --git a/server/channelserver/rengoku_build.go b/server/channelserver/rengoku_build.go index c48efde0f..7489ec30c 100644 --- a/server/channelserver/rengoku_build.go +++ b/server/channelserver/rengoku_build.go @@ -148,7 +148,7 @@ func BuildRengokuBinary(cfg RengokuConfig) ([]byte, error) { // RoadModeFields carries the computed field values for one RoadMode struct. type RoadModeFields struct { - FloorCount, SpawnCount, TablePtrCnt uint32 + FloorCount, SpawnCount, TablePtrCnt uint32 FloorPtr, TablePtrsPtr, CountPtrsPtr uint32 } @@ -194,8 +194,8 @@ func writeSpawnSection(buf []byte, tables []SpawnTableConfig, ptrsBase, tablesBa // within range for both road modes. func validateRengokuConfig(cfg RengokuConfig) error { for _, road := range []struct { - name string - r RoadConfig + name string + r RoadConfig }{{"multi_road", cfg.MultiRoad}, {"solo_road", cfg.SoloRoad}} { n := len(road.r.SpawnTables) for i, f := range road.r.Floors { diff --git a/server/channelserver/repo_mocks_test.go b/server/channelserver/repo_mocks_test.go index c05ac359e..f7085890a 100644 --- a/server/channelserver/repo_mocks_test.go +++ b/server/channelserver/repo_mocks_test.go @@ -299,36 +299,36 @@ type mockGuildRepo struct { members []*GuildMember // Configurable errors - getErr error - getMembersErr error - saveErr error - saveMemberErr error - disbandErr error - acceptErr error - rejectErr error - removeErr error - createAppErr error - getMemberErr error - hasAppResult bool - hasAppErr error + getErr error + getMembersErr error + saveErr error + saveMemberErr error + disbandErr error + acceptErr error + rejectErr error + removeErr error + createAppErr error + getMemberErr error + hasAppResult bool + hasAppErr error hasInviteResult bool hasInviteErr error - listPostsErr error - createPostErr error - deletePostErr error + listPostsErr error + createPostErr error + deletePostErr error // State tracking - disbandedID uint32 - removedCharID uint32 - acceptedCharID uint32 - rejectedCharID uint32 - acceptInviteCharID uint32 + disbandedID uint32 + removedCharID uint32 + acceptedCharID uint32 + rejectedCharID uint32 + acceptInviteCharID uint32 declineInviteCharID uint32 - savedGuild *Guild - savedMembers []*GuildMember - createdAppArgs []interface{} - createdPost []interface{} - deletedPostID uint32 + savedGuild *Guild + savedMembers []*GuildMember + createdAppArgs []interface{} + createdPost []interface{} + deletedPostID uint32 // Alliance alliance *GuildAlliance @@ -574,8 +574,8 @@ func (m *mockGuildRepo) CountGuildKills(_, _ uint32) (int, error) { } // No-op stubs for remaining GuildRepo interface methods. -func (m *mockGuildRepo) ListAll() ([]*Guild, error) { return nil, nil } -func (m *mockGuildRepo) Create(_ uint32, _ string) (int32, error) { return 0, nil } +func (m *mockGuildRepo) ListAll() ([]*Guild, error) { return nil, nil } +func (m *mockGuildRepo) Create(_ uint32, _ string) (int32, error) { return 0, nil } func (m *mockGuildRepo) CreateInviteWithMail(_, _, _, _, _ uint32, _, _ string) error { return nil } func (m *mockGuildRepo) HasInvite(_, _ uint32) (bool, error) { return m.hasInviteResult, m.hasInviteErr @@ -611,9 +611,9 @@ func (m *mockGuildRepo) CountNewPosts(_ uint32, _ time.Time) (int, error) func (m *mockGuildRepo) ListAlliances() ([]*GuildAlliance, error) { return nil, nil } func (m *mockGuildRepo) ClearTreasureHunt(_ uint32) error { return nil } func (m *mockGuildRepo) InsertKillLog(_ uint32, _ int, _ uint8, _ time.Time) error { return nil } -func (m *mockGuildRepo) ListInvites(_ uint32) ([]*GuildInvite, error) { return nil, nil } -func (m *mockGuildRepo) RolloverDailyRP(_ uint32, _ time.Time) error { return nil } -func (m *mockGuildRepo) AddWeeklyBonusUsers(_ uint32, _ uint8) error { return nil } +func (m *mockGuildRepo) ListInvites(_ uint32) ([]*GuildInvite, error) { return nil, nil } +func (m *mockGuildRepo) RolloverDailyRP(_ uint32, _ time.Time) error { return nil } +func (m *mockGuildRepo) AddWeeklyBonusUsers(_ uint32, _ uint8) error { return nil } func (m *mockGuildRepo) FindOrCreateReturnGuild(_ uint8, _ string) (uint32, error) { return 1, nil } diff --git a/server/channelserver/scenario_json.go b/server/channelserver/scenario_json.go index b3116fafe..50d24ee65 100644 --- a/server/channelserver/scenario_json.go +++ b/server/channelserver/scenario_json.go @@ -224,7 +224,7 @@ func parseScenarioSubheader(data []byte) (*ScenarioSubheaderJSON, error) { } // 8-byte sub-header fields: - chunkType := data[0] // @0: chunk type (0x01 = compound container) + chunkType := data[0] // @0: chunk type (0x01 = compound container) // data[1] // @1: pad 0x00 (format detector; not stored) // data[2:4] // @2: u16 LE total size (recomputed on compile) entryCount := int(data[4]) // @4: number of string entries @@ -469,4 +469,3 @@ func scenarioEncodeShiftJIS(s string) ([]byte, error) { } return append(out, 0x00), nil } - diff --git a/server/channelserver/svc_guild_test.go b/server/channelserver/svc_guild_test.go index f84f5aa87..656f62fce 100644 --- a/server/channelserver/svc_guild_test.go +++ b/server/channelserver/svc_guild_test.go @@ -385,14 +385,14 @@ func TestGuildService_PostScout(t *testing.T) { strings := ScoutInviteStrings{Title: "Invite", Body: "Join 「%s」"} tests := []struct { - name string - membership *GuildMember - guild *Guild - hasInvite bool - hasInviteErr error - createAppErr error - getMemberErr error - wantErr error + name string + membership *GuildMember + guild *Guild + hasInvite bool + hasInviteErr error + createAppErr error + getMemberErr error + wantErr error }{ { name: "successful scout", diff --git a/server/channelserver/sys_channel_server_test.go b/server/channelserver/sys_channel_server_test.go index 3ec29d98b..401b54928 100644 --- a/server/channelserver/sys_channel_server_test.go +++ b/server/channelserver/sys_channel_server_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - cfg "erupe-ce/config" "erupe-ce/common/decryption" + cfg "erupe-ce/config" "erupe-ce/network/clientctx" "erupe-ce/network/mhfpacket"