From 3fa1c902c1049f56b30092cf6de28c4d358cf434 Mon Sep 17 00:00:00 2001 From: Kyren223 Date: Fri, 29 Nov 2024 23:24:06 +0200 Subject: Implemented network positions per user on client and server --- internal/packet/packet.go | 3 +++ internal/packet/packet_test.go | 4 ++-- internal/packet/types.go | 14 ++++++++++++-- 3 files changed, 17 insertions(+), 4 deletions(-) (limited to 'internal/packet') diff --git a/internal/packet/packet.go b/internal/packet/packet.go index 7476056..df31dd0 100644 --- a/internal/packet/packet.go +++ b/internal/packet/packet.go @@ -56,6 +56,7 @@ const ( PacketUpdateNetwork PacketTransferNetwork PacketDeleteNetwork + PacketSwapUserNetworks PacketSetNetworkUser PacketNetworksInfo @@ -194,6 +195,8 @@ func (p Packet) DecodedPayload() (Payload, error) { payload = &DeleteMessage{} case PacketDeleteNetwork: payload = &DeleteNetwork{} + case PacketSwapUserNetworks: + payload = &SwapUserNetworks{} case PacketEditMessage: payload = &EditMessage{} case PacketMessagesInfo: diff --git a/internal/packet/packet_test.go b/internal/packet/packet_test.go index 179527a..874d0bb 100644 --- a/internal/packet/packet_test.go +++ b/internal/packet/packet_test.go @@ -14,7 +14,7 @@ import ( ) func TestPacketEncodingDecoding(t *testing.T) { - testPacketEncodingDecoding(t, &Error{"Hello, World!"}) + testPacketEncodingDecoding(t, &Error{PktType: 0, Error: ""}) node := snowflake.NewNode(1) id := node.Generate() @@ -59,7 +59,7 @@ func TestPacketFramer(t *testing.T) { defer cancel() framer := NewFramer() - pkt := NewPacket(NewJsonEncoder(&Error{"Hello, World!"})) + pkt := NewPacket(NewJsonEncoder(&Error{PktType: 0, Error: ""})) length := len(pkt.data) count := 5 data := make([]byte, length*count) diff --git a/internal/packet/types.go b/internal/packet/types.go index e5dd88a..82b8397 100644 --- a/internal/packet/types.go +++ b/internal/packet/types.go @@ -6,7 +6,8 @@ import ( ) type Error struct { - Error string + Error string + PktType PacketType } func (m *Error) Type() PacketType { @@ -51,6 +52,15 @@ func (m *DeleteNetwork) Type() PacketType { return PacketDeleteNetwork } +type SwapUserNetworks struct { + Pos1 int + Pos2 int +} + +func (m *SwapUserNetworks) Type() PacketType { + return PacketSwapUserNetworks +} + type SetNetworkUser struct { Member *bool Admin *bool @@ -69,7 +79,7 @@ type FullNetwork struct { data.Network Frequencies []data.Frequency Members []data.GetNetworkMembersRow - Position int + Position int } type NetworksInfo struct { -- cgit v1.3.1