From b09a8fba647ff030b24d9ad12215ba330c13080c Mon Sep 17 00:00:00 2001
From: Kyren223 <Kyren223@proton.me>
Date: Thu, 9 Jan 2025 19:14:05 +0200
Subject: Fixed everything on the server-side

---
 internal/packet/models.go |  1 +
 internal/packet/packet.go | 24 ++++++++++++++++--------
 internal/packet/types.go  | 32 ++++++++++++++++++++------------
 3 files changed, 37 insertions(+), 20 deletions(-)

(limited to 'internal/packet')

diff --git a/internal/packet/models.go b/internal/packet/models.go
index 562e782..f7162d7 100644
--- a/internal/packet/models.go
+++ b/internal/packet/models.go
@@ -5,6 +5,7 @@ const (
 	DefaultFrequencyName  = "main"
 	DefaultFrequencyColor = "#FFFFFF"
 	MaxFrequencyName      = 32
+	MaxUserDataBytes      = 8192
 )
 
 const (
diff --git a/internal/packet/packet.go b/internal/packet/packet.go
index 0067c9a..57260da 100644
--- a/internal/packet/packet.go
+++ b/internal/packet/packet.go
@@ -52,16 +52,15 @@ type PacketType uint8
 const (
 	PacketError PacketType = iota
 
+	PacketSetUserData
+	PacketGetUserData
+
 	PacketCreateNetwork
 	PacketUpdateNetwork
 	PacketTransferNetwork
 	PacketDeleteNetwork
-	PacketSwapUserNetworks
 	PacketNetworksInfo
 
-	PacketSetMember
-	PacketMembersInfo
-
 	PacketCreateFrequency
 	PacketUpdateFrequency
 	PacketDeleteFrequency
@@ -74,6 +73,9 @@ const (
 	PacketRequestMessages
 	PacketMessagesInfo
 
+	PacketSetMember
+	PacketMembersInfo
+
 	PacketMax
 )
 
@@ -189,6 +191,11 @@ func (p Packet) DecodedPayload() (Payload, error) {
 	case PacketError:
 		payload = &Error{}
 
+	case PacketSetUserData:
+		payload = &SetUserData{}
+	case PacketGetUserData:
+		payload = &GetUserData{}
+
 	case PacketCreateNetwork:
 		payload = &CreateNetwork{}
 	case PacketUpdateNetwork:
@@ -197,10 +204,6 @@ func (p Packet) DecodedPayload() (Payload, error) {
 		payload = &TransferNetwork{}
 	case PacketDeleteNetwork:
 		payload = &DeleteNetwork{}
-	case PacketSwapUserNetworks:
-		payload = &SwapUserNetworks{}
-	case PacketSetMember:
-		payload = &SetMember{}
 	case PacketNetworksInfo:
 		payload = &NetworksInfo{}
 
@@ -226,6 +229,11 @@ func (p Packet) DecodedPayload() (Payload, error) {
 	case PacketMessagesInfo:
 		payload = &MessagesInfo{}
 
+	case PacketSetMember:
+		payload = &SetMember{}
+	case PacketMembersInfo:
+		payload = &MembersInfo{}
+
 	default:
 		assert.Never("unexpected packet.PacketType", "type", p.Type())
 	}
diff --git a/internal/packet/types.go b/internal/packet/types.go
index b107243..370de21 100644
--- a/internal/packet/types.go
+++ b/internal/packet/types.go
@@ -52,15 +52,6 @@ func (m *DeleteNetwork) Type() PacketType {
 	return PacketDeleteNetwork
 }
 
-type SwapUserNetworks struct {
-	Pos1 int
-	Pos2 int
-}
-
-func (m *SwapUserNetworks) Type() PacketType {
-	return PacketSwapUserNetworks
-}
-
 type SetMember struct {
 	Member    *bool
 	Admin     *bool
@@ -78,8 +69,8 @@ func (m *SetMember) Type() PacketType {
 type FullNetwork struct {
 	data.Network
 	Frequencies []data.Frequency
-	Members     []data.GetNetworkMembersRow
-	Position    int
+	Members     []data.Member
+	Users       []data.User
 }
 
 type NetworksInfo struct {
@@ -189,10 +180,27 @@ func (m *MessagesInfo) Type() PacketType {
 
 type MembersInfo struct {
 	RemovedMembers []snowflake.ID
-	Members        []data.GetNetworkMembersRow
+	Members        []data.Member
+	Users          []data.User
 	Network        snowflake.ID
 }
 
 func (m *MembersInfo) Type() PacketType {
 	return PacketMessagesInfo
 }
+
+type SetUserData struct{
+	Data string
+}
+
+func (m *SetUserData) Type() PacketType {
+	return PacketSetUserData
+}
+
+type GetUserData struct{
+	Data string
+}
+
+func (m *GetUserData) Type() PacketType {
+	return PacketGetUserData
+}
-- 
cgit v1.3.1