3 files changed, 215 insertions, 115 deletions
diff --git a/internal/packet/messages.go b/internal/packet/messages.go
deleted file mode 100644
index 58d12e9..0000000
--- a/internal/packet/messages.go
+++ /dev/null
@@ -1,67 +0,0 @@
-package packet
-
-import (
-	"github.com/kyren223/eko/internal/data"
-	"github.com/kyren223/eko/pkg/snowflake"
-)
-
-type ErrorMessage struct {
-	Error string `msgpack:"error"`
-}
-
-func (m *ErrorMessage) Type() PacketType {
-	return PacketError
-}
-
-type SendMessage struct {
-	ReceiverID  *snowflake.ID
-	FrequencyID *snowflake.ID
-	Content     string
-}
-
-func (m *SendMessage) Type() PacketType {
-	return PacketSendMessage
-}
-
-type PushedMessages struct {
-	Messages []data.Message
-}
-
-func (m *PushedMessages) Type() PacketType {
-	return PacketPushedMessages
-}
-
-type Messages struct {
-	Messages []data.Message
-}
-
-func (m *Messages) Type() PacketType {
-	return PacketMessages
-}
-
-type GetMessagesRange struct {
-	FrequencyID *snowflake.ID
-	ReceiverID  *snowflake.ID
-	From        *int64
-	To          *int64
-}
-
-func (m *GetMessagesRange) Type() PacketType {
-	return PacketGetMessageRange
-}
-
-type GetUserByID struct {
-	UserID snowflake.ID
-}
-
-func (m *GetUserByID) Type() PacketType {
-	return PacketGetUserById
-}
-
-type Users struct {
-	Users []data.User
-}
-
-func (m *Users) Type() PacketType {
-	return PacketUsers
-}
diff --git a/internal/packet/packet.go b/internal/packet/packet.go
index 58e83b4..8eb1a86 100644
--- a/internal/packet/packet.go
+++ b/internal/packet/packet.go
@@ -51,47 +51,34 @@ type PacketType uint8
 
 const (
 	PacketError PacketType = iota
+
+	PacketCreateNetwork
+	PacketUpdateNetwork
+	PacketTransferNetwork
+	PacketDeleteNetwork
+	PacketSetNetworkUser
+	PacketNetworksInfo
+
+	PacketCreateFrequency
+	PacketUpdateFrequency
+	PacketDeleteFrequency
+	PacketSwapFrequencies
+
 	PacketSendMessage
-	PacketPushedMessages
-	PacketGetMessageRange
-	PacketMessages
-	PacketGetUserById
-	PacketUsers
+	PacketEditMessage
+	PacketDeleteMessage
+	PacketRequestMessages
+	PacketMessagesInfo
+
+	PacketMax
 )
 
-func (t PacketType) String() string {
-	switch t {
-	case PacketError:
-		return "PacketError"
-	case PacketSendMessage:
-		return "PacketSendMessage"
-	case PacketPushedMessages:
-		return "PacketPushedMessages"
-	case PacketGetMessageRange:
-		return "PacketGetMessageRange"
-	case PacketMessages:
-		return "PacketMessages"
-	case PacketGetUserById:
-		return "PacketGetUserById"
-	case PacketUsers:
-		return "PacketUsers"
-	default:
-		return fmt.Sprintf("PacketInvalidType(%v)", byte(t))
-	}
+func Init() {
+	assert.Assert(PacketMax <= 64, "packet types exceeded allowed limit of 64 types")
 }
 
 func (e PacketType) IsSupported() bool {
-	return e <= PacketUsers
-}
-
-// True for all packets that a server may push passively to the client.
-func (e PacketType) IsPush() bool {
-	switch e {
-	case PacketPushedMessages:
-		return true
-	default:
-		return false
-	}
+	return e < PacketMax
 }
 
 const (
@@ -166,7 +153,7 @@ func (p Packet) Payload() []byte {
 }
 
 func (p Packet) String() string {
-	return fmt.Sprintf("Packet(v%v %v %v [%v bytes...])", p.Version(), p.Encoding().String(), p.Type().String(), p.PayloadLength())
+	return fmt.Sprintf("Packet(v%v t%v %v [%v bytes...])", p.Version(), p.Encoding().String(), p.Type(), p.PayloadLength())
 }
 
 func (p Packet) Into(writer io.Writer) (int, error) {
@@ -196,21 +183,39 @@ func (p Packet) DecodedPayload() (Payload, error) {
 	var payload Payload
 	switch p.Type() {
 	case PacketError:
-		payload = &ErrorMessage{}
-	case PacketPushedMessages:
-		payload = &PushedMessages{}
+		payload = &Error{}
+	case PacketCreateFrequency:
+		payload = &CreateFrequency{}
+	case PacketCreateNetwork:
+		payload = &CreateNetwork{}
+	case PacketDeleteFrequency:
+		payload = &DeleteFrequency{}
+	case PacketDeleteMessage:
+		payload = &DeleteMessage{}
+	case PacketDeleteNetwork:
+		payload = &DeleteNetwork{}
+	case PacketEditMessage:
+		payload = &EditMessage{}
+	case PacketMessagesInfo:
+		payload = &MessagesInfo{}
+	case PacketNetworksInfo:
+		payload = &NetworksInfo{}
+	case PacketRequestMessages:
+		payload = &RequestMessages{}
 	case PacketSendMessage:
 		payload = &SendMessage{}
-	case PacketGetMessageRange:
-		payload = &GetMessagesRange{}
-	case PacketMessages:
-		payload = &Messages{}
-	case PacketGetUserById:
-		payload = &GetUserByID{}
-	case PacketUsers:
-		payload = &Users{}
+	case PacketSetNetworkUser:
+		payload = &SetNetworkUser{}
+	case PacketSwapFrequencies:
+		payload = &SwapFrequencies{}
+	case PacketTransferNetwork:
+		payload = &TransferNetwork{}
+	case PacketUpdateFrequency:
+		payload = &UpdateFrequency{}
+	case PacketUpdateNetwork:
+		payload = &UpdateNetwork{}
 	default:
-		assert.Never("packet type of a packet struct must always be valid")
+		assert.Never("unexpected packet.PacketType", "type", p.Type())
 	}
 	err := p.DecodePayloadInto(payload)
 	return payload, err
diff --git a/internal/packet/types.go b/internal/packet/types.go
new file mode 100644
index 0000000..405513e
--- /dev/null
+++ b/internal/packet/types.go
@@ -0,0 +1,162 @@
+package packet
+
+import (
+	"github.com/kyren223/eko/internal/data"
+	"github.com/kyren223/eko/pkg/snowflake"
+)
+
+type Error struct {
+	Error string
+}
+
+func (m *Error) Type() PacketType {
+	return PacketError
+}
+
+type CreateNetwork struct {
+	Name       string
+	Icon       string
+	BgHexColor string
+	FgHexColor string
+	IsPublic   bool
+}
+
+func (m *CreateNetwork) Type() PacketType {
+	return PacketCreateNetwork
+}
+
+type UpdateNetwork struct {
+	Network snowflake.ID
+	CreateNetwork
+}
+
+func (m *UpdateNetwork) Type() PacketType {
+	return PacketUpdateNetwork
+}
+
+type TransferNetwork struct {
+	Network snowflake.ID
+	User    snowflake.ID
+}
+
+func (m *TransferNetwork) Type() PacketType {
+	return PacketTransferNetwork
+}
+
+type DeleteNetwork struct {
+	Network snowflake.ID
+}
+
+func (m *DeleteNetwork) Type() PacketType {
+	return PacketDeleteNetwork
+}
+
+type SetNetworkUser struct {
+	Network   snowflake.ID
+	User      snowflake.ID
+	Member    *bool
+	Admin     *bool
+	Muted     *bool
+	Banned    *bool
+	BanReason *string
+}
+
+func (m *SetNetworkUser) Type() PacketType {
+	return PacketSetNetworkUser
+}
+
+type NetworksInfo struct {
+	Networks []struct {
+		Network data.Network
+		Frequencies []data.Frequency
+		Members []data.User
+	}
+}
+
+func (m *NetworksInfo) Type() PacketType {
+	return PacketNetworksInfo
+}
+
+type CreateFrequency struct {
+	Network  snowflake.ID
+	Name     string
+	HexColor string
+	Perms    int
+}
+
+func (m *CreateFrequency) Type() PacketType {
+	return PacketCreateFrequency
+}
+
+type UpdateFrequency struct {
+	Frequency snowflake.ID
+	Name      string
+	HexColor  string
+	Perms     byte
+}
+
+func (m *UpdateFrequency) Type() PacketType {
+	return PacketUpdateFrequency
+}
+
+type DeleteFrequency struct {
+	Frequency snowflake.ID
+}
+
+func (m *DeleteFrequency) Type() PacketType {
+	return PacketDeleteFrequency
+}
+
+type SwapFrequencies struct {
+	Network snowflake.ID
+	Pos1    int
+	Pos2    int
+}
+
+func (m *SwapFrequencies) Type() PacketType {
+	return PacketSwapFrequencies
+}
+
+type SendMessage struct {
+	ReceiverID  *snowflake.ID
+	FrequencyID *snowflake.ID
+	Content     string
+}
+
+func (m *SendMessage) Type() PacketType {
+	return PacketSendMessage
+}
+
+type EditMessage struct {
+	Message snowflake.ID
+	Content string
+}
+
+func (m *EditMessage) Type() PacketType {
+	return PacketEditMessage
+}
+
+type DeleteMessage struct {
+	Message snowflake.ID
+}
+
+func (m *DeleteMessage) Type() PacketType {
+	return PacketDeleteMessage
+}
+
+type RequestMessages struct {
+	ReceiverID  *snowflake.ID
+	FrequencyID *snowflake.ID
+}
+
+func (m *RequestMessages) Type() PacketType {
+	return PacketRequestMessages
+}
+
+type MessagesInfo struct {
+	Messages []data.Message
+}
+
+func (m *MessagesInfo) Type() PacketType {
+	return PacketMessagesInfo
+}