etc: Correct struct names

3 files changed, 28 insertions, 48 deletions

diff --git a/src/server/auto/cmd/mod.rs b/src/server/auto/cmd/mod.rs
index f348cd0..addf7a5 100644
--- a/src/server/auto/cmd/mod.rs
+++ b/src/server/auto/cmd/mod.rs
@@ -1 +1 @@
-pub mod property;
+pub mod room;
diff --git a/src/server/auto/cmd/property.rs b/src/server/auto/cmd/property.rs
deleted file mode 100644
index b75efad..0000000
--- a/src/server/auto/cmd/property.rs
+++ /dev/null
@@ -1,47 +0,0 @@
-pub fn create_property_update_command() -> [u8; 161] { // Vec<u8>
-	// let mut property = Vec::with_capacity(2);
-	// property.push(0x01); // ?
-	// property.push(0x10); // Command type
-	//
-	// // Meaningful Data
-	// property.push(); // Property ID
-	// property.push(); // Flags
-	// property.push(); // Access
-	//
-	// // Insert data length as first byte.
-	// property.insert(0, property.len() as u8 + 1); // ^
-	//
-	// property // Return created array
-
-	[
-		0xA1, 0xFF, 0x10, 0x08, 0x80, 0x01, 0x07, 0x31,
-		0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x1B, 0x80,
-		0x01, 0x0C, 0x77, 0x6F, 0x72, 0x6C, 0x64, 0x73,
-		0x33, 0x64, 0x2E, 0x63, 0x6F, 0x6D, 0x1A, 0x80,
-		0x01, 0x15, 0x6D, 0x61, 0x69, 0x6C, 0x2E, 0x75,
-		0x73, 0x2E, 0x77, 0x6F, 0x72, 0x6C, 0x64, 0x73,
-		0x2E, 0x6E, 0x65, 0x74, 0x3A, 0x32, 0x35, 0x19,
-		0x80, 0x01, 0x28, 0x68, 0x74, 0x74, 0x70, 0x3A,
-		0x2F, 0x2F, 0x77, 0x77, 0x77, 0x2D, 0x64, 0x79,
-		0x6E, 0x61, 0x6D, 0x69, 0x63, 0x2E, 0x75, 0x73,
-		0x2E, 0x77, 0x6F, 0x72, 0x6C, 0x64, 0x73, 0x2E,
-		0x6E, 0x65, 0x74, 0x2F, 0x63, 0x67, 0x69, 0x2D,
-		0x62, 0x69, 0x6E, 0x18, 0x80, 0x01, 0x1F, 0x68,
-		0x74, 0x74, 0x70, 0x3A, 0x2F, 0x2F, 0x77, 0x77,
-		0x77, 0x2D, 0x73, 0x74, 0x61, 0x74, 0x69, 0x63,
-		0x2E, 0x75, 0x73, 0x2E, 0x77, 0x6F, 0x72, 0x6C,
-		0x64, 0x73, 0x2E, 0x6E, 0x65, 0x74, 0x0F, 0x80,
-		0x01, 0x01, 0x33, 0x03, 0x80, 0x01, 0x02, 0x32,
-		0x34, 0x01, 0x80, 0x01, 0x0C, 0x57, 0x4F, 0x52,
-		0x4C, 0x44, 0x53, 0x4D, 0x41, 0x53, 0x54, 0x45,
-		0x52
-	]: [u8; 161]
-}
-
-pub fn create_property_request_command() -> [u8; 22] {
-	[
-		0x16, 0x01, 0x06, 0x04, 0x01, 0x30, 0x0f, 0x01,
-		0x33, 0x08, 0x07, 0x31, 0x30, 0x30, 0x30, 0x30,
-		0x30, 0x30, 0x03, 0x02, 0x32, 0x34
-	]: [u8; 22]
-}
diff --git a/src/server/auto/cmd/room.rs b/src/server/auto/cmd/room.rs
new file mode 100644
index 0000000..ff839f3
--- /dev/null
+++ b/src/server/auto/cmd/room.rs
@@ -0,0 +1,27 @@
+pub fn create_room_id_redirect_command(room_name: &str, room_id: usize) -> Vec<u8> {
+	let mut room_id_redirect = Vec::new();
+	// room_id_redirect.push(room_id_redirect.len() as u8 + 1); // Data length
+	room_id_redirect.push(0x01); // ?
+	room_id_redirect.push(0x1A); // Command type1
+	room_id_redirect.push(room_name.len() as u8); // UTF/ room name length
+	for i in room_name.bytes() { room_id_redirect.push(i); } // Push `room_name`
+	// for i in "<dimension-1>".bytes() { room_id_redirect.push(i); } // Push room number
+
+	// Room number
+	room_id_redirect.push(0x00);
+	room_id_redirect.push(room_id as u8);
+
+	// IP
+	room_id_redirect.push(0x00);
+	room_id_redirect.push(0x00);
+	room_id_redirect.push(0x00);
+	room_id_redirect.push(0x00);
+
+	// Port
+	room_id_redirect.push(0x16);
+	room_id_redirect.push(0x29);
+
+	room_id_redirect.insert(0, room_id_redirect.len() as u8 + 1); // Data length
+
+	room_id_redirect
+}