refactor(sdk-swift): Use UserId instead of JID in AccountBookmarksClient and Contact

nesium · nesium · commit 9940c59ac783 · 2025-10-26T22:31:15.000Z
diff --git a/bindings/prose-sdk-ffi/src/account_bookmarks_client.rs b/bindings/prose-sdk-ffi/src/account_bookmarks_client.rs
@@ -3,7 +3,7 @@
 // Copyright: 2023, Marc Bauer <mb@nesium.com>
 // License: Mozilla Public License v2.0 (MPL v2.0)
 
-use crate::{types::ClientResult, AccountBookmark, PathBuf, JID};
+use crate::{types::ClientResult, AccountBookmark, PathBuf, UserId};
 
 #[derive(uniffi::Object)]
 pub struct AccountBookmarksClient {
@@ -28,19 +28,19 @@ impl AccountBookmarksClient {
             .collect())
     }
 
-    pub fn add_bookmark(&self, jid: &JID, select_bookmark: bool) -> ClientResult<()> {
+    pub fn add_bookmark(&self, user_id: UserId, select_bookmark: bool) -> ClientResult<()> {
         self.client
-            .add_bookmark(&jid.clone().into(), select_bookmark)?;
+            .add_bookmark(&(user_id.into()), select_bookmark)?;
         Ok(())
     }
 
-    pub fn remove_bookmark(&self, jid: &JID) -> ClientResult<()> {
-        self.client.remove_bookmark(&jid.clone().into())?;
+    pub fn remove_bookmark(&self, user_id: UserId) -> ClientResult<()> {
+        self.client.remove_bookmark(&(user_id.into()))?;
         Ok(())
     }
 
-    pub fn select_bookmark(&self, jid: &JID) -> ClientResult<()> {
-        self.client.select_bookmark(&jid.clone().into())?;
+    pub fn select_bookmark(&self, user_id: UserId) -> ClientResult<()> {
+        self.client.select_bookmark(&(user_id.into()))?;
         Ok(())
     }
 
diff --git a/bindings/prose-sdk-ffi/src/types/account_bookmark.rs b/bindings/prose-sdk-ffi/src/types/account_bookmark.rs
@@ -3,19 +3,19 @@
 // Copyright: 2023, Marc Bauer <mb@nesium.com>
 // License: Mozilla Public License v2.0 (MPL v2.0)
 
-use crate::types::JID;
+use crate::UserId;
 use prose_core_client::AccountBookmark as ProseAccountBookmark;
 
 #[derive(uniffi::Record)]
 pub struct AccountBookmark {
-    pub jid: JID,
+    pub user_id: UserId,
     pub is_selected: bool,
 }
 
 impl From<ProseAccountBookmark> for AccountBookmark {
     fn from(value: ProseAccountBookmark) -> Self {
         AccountBookmark {
-            jid: value.jid.into(),
+            user_id: value.user_id.into(),
             is_selected: value.is_selected,
         }
     }
@@ -24,7 +24,7 @@ impl From<ProseAccountBookmark> for AccountBookmark {
 impl From<AccountBookmark> for ProseAccountBookmark {
     fn from(value: AccountBookmark) -> Self {
         ProseAccountBookmark {
-            jid: value.jid.into(),
+            user_id: value.user_id.into(),
             is_selected: value.is_selected,
         }
     }
diff --git a/bindings/prose-sdk-ffi/src/types/contact.rs b/bindings/prose-sdk-ffi/src/types/contact.rs
@@ -3,19 +3,19 @@
 // Copyright: 2023, Marc Bauer <mb@nesium.com>
 // License: Mozilla Public License v2.0 (MPL v2.0)
 
-use crate::types::JID;
+use crate::UserId;
 use prose_core_client::dtos::{
     Availability as CoreAvailability, Contact as CoreContact, Group as CoreGroup,
     UserStatus as CoreUserStatus,
 };
 
-#[derive(uniffi::Enum, Debug, PartialEq, Clone)]
+#[derive(uniffi::Enum)]
 pub enum Group {
     Team,
     Other,
 }
 
-#[derive(uniffi::Enum, Debug, PartialEq, Clone)]
+#[derive(uniffi::Enum)]
 pub enum Availability {
     Available,
     Unavailable,
@@ -24,15 +24,15 @@ pub enum Availability {
     Invisible,
 }
 
-#[derive(uniffi::Record, Debug, PartialEq, Clone)]
+#[derive(uniffi::Record)]
 pub struct UserStatus {
     pub emoji: String,
     pub status: Option<String>,
 }
 
-#[derive(uniffi::Record, Debug, PartialEq, Clone)]
+#[derive(uniffi::Record)]
 pub struct Contact {
-    pub jid: JID,
+    pub id: UserId,
     pub name: String,
     pub availability: Availability,
     pub status: Option<UserStatus>,
@@ -42,7 +42,7 @@ pub struct Contact {
 impl From<CoreContact> for Contact {
     fn from(value: CoreContact) -> Self {
         Contact {
-            jid: value.id.into_inner().into(),
+            id: value.id.into(),
             name: value.name,
             availability: value.availability.into(),
             status: value.status.map(Into::into),
diff --git a/bindings/prose-sdk-ffi/src/types/jid.rs b/bindings/prose-sdk-ffi/src/types/jid.rs
diff --git a/bindings/prose-sdk-ffi/src/types/mod.rs b/bindings/prose-sdk-ffi/src/types/mod.rs
@@ -9,8 +9,7 @@ pub use attachment::Attachment;
 pub use avatar::Avatar;
 pub use client_event::ClientEvent;
 pub use contact::{Availability, Contact, Group, UserStatus};
-pub use errors::{ClientError, ClientResult, ConnectionError, JidParseError};
-pub use jid::{parse_jid, JID};
+pub use errors::{ClientError, ClientResult, ConnectionError};
 pub use message::{Message, Reaction};
 pub use message_result_set::MessageResultSet;
 pub use participant_info::{ParticipantBasicInfo, ParticipantInfo};
@@ -32,7 +31,6 @@ mod avatar;
 mod client_event;
 mod contact;
 mod errors;
-mod jid;
 mod message;
 mod message_result_set;
 mod participant_info;
diff --git a/bindings/prose-sdk-ffi/src/uniffi_api.rs b/bindings/prose-sdk-ffi/src/uniffi_api.rs
@@ -3,7 +3,7 @@
 // Copyright: 2023, Marc Bauer <mb@nesium.com>
 // License: Mozilla Public License v2.0 (MPL v2.0)
 
-pub use crate::types::{AccountBookmark, ClientError, ClientEvent, Contact, Group, Message, JID};
+pub use crate::types::{AccountBookmark, ClientError, ClientEvent, Contact, Group, Message};
 pub use crate::{account_bookmarks_client::AccountBookmarksClient, client::*, logger::*};
 use jid::BareJid as CoreBareJid;
 use mime::Mime as CoreMime;
@@ -247,7 +247,7 @@ impl From<CorePathBuf> for PathBuf {
 pub mod uniffi_types {
     pub use crate::{
         client::Client,
-        types::{parse_jid, AccountBookmark, Message, Reaction, UserProfile, JID},
+        types::{AccountBookmark, Message, Reaction, UserProfile},
         AvatarId, ClientError, Contact, DateTimeFixed, Emoji, MessageId, MucId, ParticipantId,
         PathBuf, PresenceSubRequestId, RoomId, ServerId, UnicodeScalarIndex, Url, UserId,
     };
diff --git a/crates/prose-core-client/src/util/account_bookmarks_client.rs b/crates/prose-core-client/src/util/account_bookmarks_client.rs
@@ -7,21 +7,24 @@ use std::fs::File;
 use std::io::{BufReader, BufWriter, Write};
 use std::path::{Path, PathBuf};
 
+use crate::domain::shared::models::UserId;
 use anyhow::Result;
-use jid::BareJid;
 use serde::{Deserialize, Serialize};
 use tempfile::NamedTempFile;
 
 #[derive(Debug, Serialize, Deserialize, PartialEq, Clone)]
 pub struct AccountBookmark {
-    pub jid: BareJid,
+    pub user_id: UserId,
     #[serde(rename = "selected")]
     pub is_selected: bool,
 }
 
 impl AccountBookmark {
-    pub fn new(jid: BareJid, is_selected: bool) -> Self {
-        AccountBookmark { jid, is_selected }
+    pub fn new(user_id: UserId, is_selected: bool) -> Self {
+        AccountBookmark {
+            user_id,
+            is_selected,
+        }
     }
 }
 
@@ -52,27 +55,30 @@ impl AccountBookmarksClient {
         Ok(contents.accounts)
     }
 
-    pub fn add_bookmark(&self, jid: &BareJid, select_bookmark: bool) -> Result<()> {
+    pub fn add_bookmark(&self, user_id: &UserId, select_bookmark: bool) -> Result<()> {
         let mut bookmarks = self.load_bookmarks()?;
 
-        if !bookmarks.iter().any(|bookmark| &bookmark.jid == jid) {
+        if !bookmarks
+            .iter()
+            .any(|bookmark| &bookmark.user_id == user_id)
+        {
             bookmarks.push(AccountBookmark {
-                jid: jid.clone(),
+                user_id: user_id.clone(),
                 is_selected: false,
             });
         }
 
         if select_bookmark || bookmarks.len() == 1 {
             for bookmark in bookmarks.iter_mut() {
-                bookmark.is_selected = &bookmark.jid == jid;
+                bookmark.is_selected = &bookmark.user_id == user_id;
             }
         }
         self.save_bookmarks(bookmarks)
     }
 
-    pub fn remove_bookmark(&self, jid: &BareJid) -> Result<()> {
+    pub fn remove_bookmark(&self, user_id: &UserId) -> Result<()> {
         let mut bookmarks = self.load_bookmarks()?;
-        bookmarks.retain(|bookmark| &bookmark.jid != jid);
+        bookmarks.retain(|bookmark| &bookmark.user_id != user_id);
         if !bookmarks.iter().any(|bookmark| bookmark.is_selected) {
             if let Some(bookmark) = bookmarks.get_mut(0) {
                 bookmark.is_selected = true;
@@ -81,10 +87,10 @@ impl AccountBookmarksClient {
         self.save_bookmarks(bookmarks)
     }
 
-    pub fn select_bookmark(&self, jid: &BareJid) -> Result<()> {
+    pub fn select_bookmark(&self, user_id: &UserId) -> Result<()> {
         let mut bookmarks = self.load_bookmarks()?;
         for bookmark in bookmarks.iter_mut() {
-            bookmark.is_selected = &bookmark.jid == jid;
+            bookmark.is_selected = &bookmark.user_id == user_id;
         }
         self.save_bookmarks(bookmarks)?;
         Ok(())
@@ -127,9 +133,9 @@ mod tests {
 
         println!("{:?}", path);
 
-        let a = BareJid::from_str("a@prose.org").unwrap();
-        let b = BareJid::from_str("b@prose.org").unwrap();
-        let c = BareJid::from_str("c@prose.org").unwrap();
+        let a = UserId::from_str("a@prose.org")?;
+        let b = UserId::from_str("b@prose.org")?;
+        let c = UserId::from_str("c@prose.org")?;
 
         let client = AccountBookmarksClient::new(path.clone());
         client.add_bookmark(&a, false)?;

Original file line number	Diff line number	Diff line change
`@@ -3,19 +3,19 @@`
`3`	`3`	`// Copyright: 2023, Marc Bauer <[email protected]>`
`4`	`4`	`// License: Mozilla Public License v2.0 (MPL v2.0)`
`5`	`5`
`6`		`-use crate::types::JID;`
	`6`	`+use crate::UserId;`
`7`	`7`	`use prose_core_client::AccountBookmark as ProseAccountBookmark;`
`8`	`8`
`9`	`9`	`#[derive(uniffi::Record)]`
`10`	`10`	`pub struct AccountBookmark {`
`11`		`- pub jid: JID,`
	`11`	`+ pub user_id: UserId,`
`12`	`12`	`pub is_selected: bool,`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`impl From<ProseAccountBookmark> for AccountBookmark {`
`16`	`16`	`fn from(value: ProseAccountBookmark) -> Self {`
`17`	`17`	`AccountBookmark {`
`18`		`- jid: value.jid.into(),`
	`18`	`+ user_id: value.user_id.into(),`
`19`	`19`	`is_selected: value.is_selected,`
`20`	`20`	`}`
`21`	`21`	`}`
`@@ -24,7 +24,7 @@ impl From<ProseAccountBookmark> for AccountBookmark {`
`24`	`24`	`impl From<AccountBookmark> for ProseAccountBookmark {`
`25`	`25`	`fn from(value: AccountBookmark) -> Self {`
`26`	`26`	`ProseAccountBookmark {`
`27`		`- jid: value.jid.into(),`
	`27`	`+ user_id: value.user_id.into(),`
`28`	`28`	`is_selected: value.is_selected,`
`29`	`29`	`}`
`30`	`30`	`}`