mirror of
https://github.com/Mezeporta/Erupe.git
synced 2026-05-13 17:53:51 +02:00
style: gofmt realignment across channelserver
This commit is contained in:
@@ -33,7 +33,6 @@ func TestParseSmallNotImplemented(t *testing.T) {
|
|||||||
{"MsgMhfStampcardPrize", &MsgMhfStampcardPrize{}},
|
{"MsgMhfStampcardPrize", &MsgMhfStampcardPrize{}},
|
||||||
{"MsgMhfUpdateForceGuildRank", &MsgMhfUpdateForceGuildRank{}},
|
{"MsgMhfUpdateForceGuildRank", &MsgMhfUpdateForceGuildRank{}},
|
||||||
|
|
||||||
|
|
||||||
// SYS packets - NOT IMPLEMENTED
|
// SYS packets - NOT IMPLEMENTED
|
||||||
{"MsgSysAuthData", &MsgSysAuthData{}},
|
{"MsgSysAuthData", &MsgSysAuthData{}},
|
||||||
{"MsgSysAuthQuery", &MsgSysAuthQuery{}},
|
{"MsgSysAuthQuery", &MsgSysAuthQuery{}},
|
||||||
|
|||||||
@@ -43,8 +43,8 @@ type Guild struct {
|
|||||||
EventRP uint32 `db:"event_rp"`
|
EventRP uint32 `db:"event_rp"`
|
||||||
RoomRP uint16 `db:"room_rp"`
|
RoomRP uint16 `db:"room_rp"`
|
||||||
RoomExpiry time.Time `db:"room_expiry"`
|
RoomExpiry time.Time `db:"room_expiry"`
|
||||||
Comment string `db:"comment"`
|
Comment string `db:"comment"`
|
||||||
ReturnType uint8 `db:"return_type"`
|
ReturnType uint8 `db:"return_type"`
|
||||||
PugiName1 string `db:"pugi_name_1"`
|
PugiName1 string `db:"pugi_name_1"`
|
||||||
PugiName2 string `db:"pugi_name_2"`
|
PugiName2 string `db:"pugi_name_2"`
|
||||||
PugiName3 string `db:"pugi_name_3"`
|
PugiName3 string `db:"pugi_name_3"`
|
||||||
|
|||||||
@@ -45,7 +45,6 @@ func handleMsgMhfEnumeratePrice(s *Session, p mhfpacket.MHFPacket) {
|
|||||||
doAckBufSucceed(s, pkt.AckHandle, bf.Data())
|
doAckBufSucceed(s, pkt.AckHandle, bf.Data())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
func handleMsgMhfGetExtraInfo(s *Session, p mhfpacket.MHFPacket) {
|
func handleMsgMhfGetExtraInfo(s *Session, p mhfpacket.MHFPacket) {
|
||||||
pkt := p.(*mhfpacket.MsgMhfGetExtraInfo)
|
pkt := p.(*mhfpacket.MsgMhfGetExtraInfo)
|
||||||
// TODO: response structure unknown; fail ACK prevents softlock without misleading client
|
// TODO: response structure unknown; fail ACK prevents softlock without misleading client
|
||||||
|
|||||||
@@ -734,7 +734,6 @@ func getTuneValueRange(start uint16, value uint16) []tuneValue {
|
|||||||
return tv
|
return tv
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
func handleMsgMhfGetUdBonusQuestInfo(s *Session, p mhfpacket.MHFPacket) {
|
func handleMsgMhfGetUdBonusQuestInfo(s *Session, p mhfpacket.MHFPacket) {
|
||||||
pkt := p.(*mhfpacket.MsgMhfGetUdBonusQuestInfo)
|
pkt := p.(*mhfpacket.MsgMhfGetUdBonusQuestInfo)
|
||||||
|
|
||||||
|
|||||||
@@ -13,12 +13,12 @@ import (
|
|||||||
// @0x14: RoadMode multiDef (24 bytes)
|
// @0x14: RoadMode multiDef (24 bytes)
|
||||||
// @0x2C: RoadMode soloDef (24 bytes)
|
// @0x2C: RoadMode soloDef (24 bytes)
|
||||||
const (
|
const (
|
||||||
rengokuMinSize = 0x44 // header (0x14) + two RoadModes (2×24)
|
rengokuMinSize = 0x44 // header (0x14) + two RoadModes (2×24)
|
||||||
rengokuMultiOffset = 0x14
|
rengokuMultiOffset = 0x14
|
||||||
rengokuSoloOffset = 0x2C
|
rengokuSoloOffset = 0x2C
|
||||||
floorStatsByteSize = 24
|
floorStatsByteSize = 24
|
||||||
spawnTableByteSize = 32
|
spawnTableByteSize = 32
|
||||||
spawnPtrEntrySize = 4 // each spawn-table pointer is a u32
|
spawnPtrEntrySize = 4 // each spawn-table pointer is a u32
|
||||||
)
|
)
|
||||||
|
|
||||||
// rengokuRoadMode holds a parsed RoadMode struct. All pointer fields are file
|
// rengokuRoadMode holds a parsed RoadMode struct. All pointer fields are file
|
||||||
|
|||||||
@@ -148,7 +148,7 @@ func BuildRengokuBinary(cfg RengokuConfig) ([]byte, error) {
|
|||||||
|
|
||||||
// RoadModeFields carries the computed field values for one RoadMode struct.
|
// RoadModeFields carries the computed field values for one RoadMode struct.
|
||||||
type RoadModeFields struct {
|
type RoadModeFields struct {
|
||||||
FloorCount, SpawnCount, TablePtrCnt uint32
|
FloorCount, SpawnCount, TablePtrCnt uint32
|
||||||
FloorPtr, TablePtrsPtr, CountPtrsPtr uint32
|
FloorPtr, TablePtrsPtr, CountPtrsPtr uint32
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -194,8 +194,8 @@ func writeSpawnSection(buf []byte, tables []SpawnTableConfig, ptrsBase, tablesBa
|
|||||||
// within range for both road modes.
|
// within range for both road modes.
|
||||||
func validateRengokuConfig(cfg RengokuConfig) error {
|
func validateRengokuConfig(cfg RengokuConfig) error {
|
||||||
for _, road := range []struct {
|
for _, road := range []struct {
|
||||||
name string
|
name string
|
||||||
r RoadConfig
|
r RoadConfig
|
||||||
}{{"multi_road", cfg.MultiRoad}, {"solo_road", cfg.SoloRoad}} {
|
}{{"multi_road", cfg.MultiRoad}, {"solo_road", cfg.SoloRoad}} {
|
||||||
n := len(road.r.SpawnTables)
|
n := len(road.r.SpawnTables)
|
||||||
for i, f := range road.r.Floors {
|
for i, f := range road.r.Floors {
|
||||||
|
|||||||
@@ -299,36 +299,36 @@ type mockGuildRepo struct {
|
|||||||
members []*GuildMember
|
members []*GuildMember
|
||||||
|
|
||||||
// Configurable errors
|
// Configurable errors
|
||||||
getErr error
|
getErr error
|
||||||
getMembersErr error
|
getMembersErr error
|
||||||
saveErr error
|
saveErr error
|
||||||
saveMemberErr error
|
saveMemberErr error
|
||||||
disbandErr error
|
disbandErr error
|
||||||
acceptErr error
|
acceptErr error
|
||||||
rejectErr error
|
rejectErr error
|
||||||
removeErr error
|
removeErr error
|
||||||
createAppErr error
|
createAppErr error
|
||||||
getMemberErr error
|
getMemberErr error
|
||||||
hasAppResult bool
|
hasAppResult bool
|
||||||
hasAppErr error
|
hasAppErr error
|
||||||
hasInviteResult bool
|
hasInviteResult bool
|
||||||
hasInviteErr error
|
hasInviteErr error
|
||||||
listPostsErr error
|
listPostsErr error
|
||||||
createPostErr error
|
createPostErr error
|
||||||
deletePostErr error
|
deletePostErr error
|
||||||
|
|
||||||
// State tracking
|
// State tracking
|
||||||
disbandedID uint32
|
disbandedID uint32
|
||||||
removedCharID uint32
|
removedCharID uint32
|
||||||
acceptedCharID uint32
|
acceptedCharID uint32
|
||||||
rejectedCharID uint32
|
rejectedCharID uint32
|
||||||
acceptInviteCharID uint32
|
acceptInviteCharID uint32
|
||||||
declineInviteCharID uint32
|
declineInviteCharID uint32
|
||||||
savedGuild *Guild
|
savedGuild *Guild
|
||||||
savedMembers []*GuildMember
|
savedMembers []*GuildMember
|
||||||
createdAppArgs []interface{}
|
createdAppArgs []interface{}
|
||||||
createdPost []interface{}
|
createdPost []interface{}
|
||||||
deletedPostID uint32
|
deletedPostID uint32
|
||||||
|
|
||||||
// Alliance
|
// Alliance
|
||||||
alliance *GuildAlliance
|
alliance *GuildAlliance
|
||||||
@@ -574,8 +574,8 @@ func (m *mockGuildRepo) CountGuildKills(_, _ uint32) (int, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// No-op stubs for remaining GuildRepo interface methods.
|
// No-op stubs for remaining GuildRepo interface methods.
|
||||||
func (m *mockGuildRepo) ListAll() ([]*Guild, error) { return nil, nil }
|
func (m *mockGuildRepo) ListAll() ([]*Guild, error) { return nil, nil }
|
||||||
func (m *mockGuildRepo) Create(_ uint32, _ string) (int32, error) { return 0, nil }
|
func (m *mockGuildRepo) Create(_ uint32, _ string) (int32, error) { return 0, nil }
|
||||||
func (m *mockGuildRepo) CreateInviteWithMail(_, _, _, _, _ uint32, _, _ string) error { return nil }
|
func (m *mockGuildRepo) CreateInviteWithMail(_, _, _, _, _ uint32, _, _ string) error { return nil }
|
||||||
func (m *mockGuildRepo) HasInvite(_, _ uint32) (bool, error) {
|
func (m *mockGuildRepo) HasInvite(_, _ uint32) (bool, error) {
|
||||||
return m.hasInviteResult, m.hasInviteErr
|
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) ListAlliances() ([]*GuildAlliance, error) { return nil, nil }
|
||||||
func (m *mockGuildRepo) ClearTreasureHunt(_ uint32) error { return nil }
|
func (m *mockGuildRepo) ClearTreasureHunt(_ uint32) error { return nil }
|
||||||
func (m *mockGuildRepo) InsertKillLog(_ uint32, _ int, _ uint8, _ time.Time) 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) ListInvites(_ uint32) ([]*GuildInvite, error) { return nil, nil }
|
||||||
func (m *mockGuildRepo) RolloverDailyRP(_ uint32, _ time.Time) error { return nil }
|
func (m *mockGuildRepo) RolloverDailyRP(_ uint32, _ time.Time) error { return nil }
|
||||||
func (m *mockGuildRepo) AddWeeklyBonusUsers(_ uint32, _ uint8) error { return nil }
|
func (m *mockGuildRepo) AddWeeklyBonusUsers(_ uint32, _ uint8) error { return nil }
|
||||||
func (m *mockGuildRepo) FindOrCreateReturnGuild(_ uint8, _ string) (uint32, error) {
|
func (m *mockGuildRepo) FindOrCreateReturnGuild(_ uint8, _ string) (uint32, error) {
|
||||||
return 1, nil
|
return 1, nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -224,7 +224,7 @@ func parseScenarioSubheader(data []byte) (*ScenarioSubheaderJSON, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 8-byte sub-header fields:
|
// 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[1] // @1: pad 0x00 (format detector; not stored)
|
||||||
// data[2:4] // @2: u16 LE total size (recomputed on compile)
|
// data[2:4] // @2: u16 LE total size (recomputed on compile)
|
||||||
entryCount := int(data[4]) // @4: number of string entries
|
entryCount := int(data[4]) // @4: number of string entries
|
||||||
@@ -469,4 +469,3 @@ func scenarioEncodeShiftJIS(s string) ([]byte, error) {
|
|||||||
}
|
}
|
||||||
return append(out, 0x00), nil
|
return append(out, 0x00), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -385,14 +385,14 @@ func TestGuildService_PostScout(t *testing.T) {
|
|||||||
strings := ScoutInviteStrings{Title: "Invite", Body: "Join 「%s」"}
|
strings := ScoutInviteStrings{Title: "Invite", Body: "Join 「%s」"}
|
||||||
|
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
name string
|
name string
|
||||||
membership *GuildMember
|
membership *GuildMember
|
||||||
guild *Guild
|
guild *Guild
|
||||||
hasInvite bool
|
hasInvite bool
|
||||||
hasInviteErr error
|
hasInviteErr error
|
||||||
createAppErr error
|
createAppErr error
|
||||||
getMemberErr error
|
getMemberErr error
|
||||||
wantErr error
|
wantErr error
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
name: "successful scout",
|
name: "successful scout",
|
||||||
|
|||||||
@@ -10,8 +10,8 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
cfg "erupe-ce/config"
|
|
||||||
"erupe-ce/common/decryption"
|
"erupe-ce/common/decryption"
|
||||||
|
cfg "erupe-ce/config"
|
||||||
"erupe-ce/network/clientctx"
|
"erupe-ce/network/clientctx"
|
||||||
"erupe-ce/network/mhfpacket"
|
"erupe-ce/network/mhfpacket"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user