From 545d1e63449ca1fe5cebf5fdc4079f31b199fd9f Mon Sep 17 00:00:00 2001
From: Jamie Pine <ijamespine@me.com>
Date: Sun, 19 Oct 2025 12:35:41 -0700
Subject: [PATCH] feat: add and update device_slug field handling in
 LibraryMessage

---
 core/src/ops/network/sync_setup/action.rs             | 3 ++-
 core/src/service/network/protocol/library_messages.rs | 1 +
 core/src/service/network/protocol/messaging.rs        | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/src/ops/network/sync_setup/action.rs b/core/src/ops/network/sync_setup/action.rs
index 0a1977d55..0fdb3f75d 100644
--- a/core/src/ops/network/sync_setup/action.rs
+++ b/core/src/ops/network/sync_setup/action.rs
@@ -181,7 +181,7 @@ impl LibrarySyncSetupAction {
 				id: sea_orm::ActiveValue::NotSet,
 				uuid: Set(self.input.remote_device_id),
 				name: Set(remote_device_info.device_name.clone()),
-				slug: Set(crate::domain::device::Device::generate_slug(&remote_device_info.device_name)),
+				slug: Set(remote_device_info.device_slug.clone()),
 				os: Set(device_os.to_string()),
 				os_version: Set(Some(remote_device_info.os_version.clone())),
 				hardware_model: Set(None), // Not available in DeviceInfo
@@ -230,6 +230,7 @@ impl LibrarySyncSetupAction {
 			library_id: self.input.remote_library_id,
 			device_id: self.input.local_device_id,
 			device_name: local_device_config.name.clone(),
+			device_slug: local_device_config.slug.clone(),
 			os_name: local_device_config.os.to_string(),
 			os_version: None, // Not available in DeviceConfig
 			hardware_model: local_device_config.hardware_model.clone(),
diff --git a/core/src/service/network/protocol/library_messages.rs b/core/src/service/network/protocol/library_messages.rs
index 25ebc558a..a3ded4d0a 100644
--- a/core/src/service/network/protocol/library_messages.rs
+++ b/core/src/service/network/protocol/library_messages.rs
@@ -23,6 +23,7 @@ pub enum LibraryMessage {
 		library_id: Option<Uuid>, // None means register in all libraries
 		device_id: Uuid,
 		device_name: String,
+		device_slug: String,
 		os_name: String,
 		os_version: Option<String>,
 		hardware_model: Option<String>,
diff --git a/core/src/service/network/protocol/messaging.rs b/core/src/service/network/protocol/messaging.rs
index 3f7636c05..7a02d477f 100644
--- a/core/src/service/network/protocol/messaging.rs
+++ b/core/src/service/network/protocol/messaging.rs
@@ -210,6 +210,7 @@ impl MessagingProtocolHandler {
 				library_id,
 				device_id,
 				device_name,
+				device_slug,
 				os_name,
 				os_version,
 				hardware_model,
@@ -262,7 +263,7 @@ impl MessagingProtocolHandler {
 								id: sea_orm::ActiveValue::NotSet,
 								uuid: Set(device_id),
 								name: Set(device_name.clone()),
-								slug: Set(crate::domain::device::Device::generate_slug(&device_name)),
+								slug: Set(device_slug.clone()),
 								os: Set(os_name.clone()),
 								os_version: Set(os_version.clone()),
 								hardware_model: Set(hardware_model.clone()),