Skip to content

refactor(whatsrust): extract action wrappers #315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Andiveli merged 3 commits into from
Aug 27, 2026
Merged

refactor(whatsrust): extract action wrappers #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce2a3e5
refactor(whatsrust): extract action wrappers
Andiveli Aug 26, 2026
a301cfe
refactor(whatsrust): complete presence counter extraction
Andiveli Aug 26, 2026
854e418
Merge updated media wrappers parent
Andiveli Aug 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 94 additions & 0 deletions whatsrust/src/actions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
use super::*;

pub(crate) fn reaction_to_ffi(
target_jid: &JID,
destination_jid: &JID,
sender_jid: &JID,
message_id: &MessageId,
reaction: &str,
) -> Result<(CString, CString, CString, CString, CString), MessageActionFailed> {
Ok((
CString::new(target_jid.0.as_ref()).map_err(|_| MessageActionFailed)?,
CString::new(destination_jid.0.as_ref()).map_err(|_| MessageActionFailed)?,
CString::new(sender_jid.0.as_ref()).map_err(|_| MessageActionFailed)?,
CString::new(message_id.as_ref()).map_err(|_| MessageActionFailed)?,
CString::new(reaction).map_err(|_| MessageActionFailed)?,
))
}

pub fn react_to_message(
chat_jid: &JID,
sender_jid: &JID,
message_id: &MessageId,
reaction: &str,
) -> Result<(), MessageActionFailed> {
react_to_message_in_chat(chat_jid, chat_jid, sender_jid, message_id, reaction)
}

pub fn react_to_message_in_chat(
target_jid: &JID,
destination_jid: &JID,
sender_jid: &JID,
message_id: &MessageId,
reaction: &str,
) -> Result<(), MessageActionFailed> {
let (target, destination, sender, id, reaction) =
reaction_to_ffi(target_jid, destination_jid, sender_jid, message_id, reaction)?;
let result = unsafe {
C_ReactToMessage(
target.as_ptr(),
destination.as_ptr(),
sender.as_ptr(),
id.as_ptr(),
reaction.as_ptr(),
)
};
if result == 0 { Ok(()) } else { Err(MessageActionFailed) }
}

pub(crate) fn edit_to_ffi(
chat_jid: &JID,
message_id: &MessageId,
replacement: &str,
) -> Result<(CString, CString, CString), MessageActionFailed> {
if replacement.trim().is_empty() {
return Err(MessageActionFailed);
}
Ok((
CString::new(chat_jid.0.as_ref()).map_err(|_| MessageActionFailed)?,
CString::new(message_id.as_ref()).map_err(|_| MessageActionFailed)?,
CString::new(replacement).map_err(|_| MessageActionFailed)?,
))
}

pub fn edit_message(
chat_jid: &JID,
message_id: &MessageId,
replacement: &str,
) -> Result<(), MessageActionFailed> {
let (chat, id, replacement) = edit_to_ffi(chat_jid, message_id, replacement)?;
let result = unsafe { C_EditMessage(chat.as_ptr(), id.as_ptr(), replacement.as_ptr()) };
if result == 0 { Ok(()) } else { Err(MessageActionFailed) }
}

pub(crate) fn revoke_to_ffi(
chat_jid: &JID,
sender_jid: &JID,
message_id: &MessageId,
) -> Result<(CString, CString, CString), MessageActionFailed> {
Ok((
CString::new(chat_jid.0.as_ref()).map_err(|_| MessageActionFailed)?,
CString::new(sender_jid.0.as_ref()).map_err(|_| MessageActionFailed)?,
CString::new(message_id.as_ref()).map_err(|_| MessageActionFailed)?,
))
}

pub fn revoke_message(
chat_jid: &JID,
sender_jid: &JID,
message_id: &MessageId,
) -> Result<(), MessageActionFailed> {
let (chat, sender, id) = revoke_to_ffi(chat_jid, sender_jid, message_id)?;
let result = unsafe { C_RevokeMessage(chat.as_ptr(), sender.as_ptr(), id.as_ptr()) };
if result == 0 { Ok(()) } else { Err(MessageActionFailed) }
}
113 changes: 3 additions & 110 deletions whatsrust/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ mod registrations;
mod lifecycle;
mod presence;
mod media;
mod actions;
mod abi;
mod caches;
mod events;
Expand All @@ -26,6 +27,8 @@ pub use registrations::{
pub use lifecycle::{connect, disconnect, logout, new_client, pair_phone};
pub use presence::{SubscribePresenceResult, drain_raw_presence_diagnostics, subscribe_presence};
pub use media::{download_file, get_community_profile_picture, get_profile_picture};
pub use actions::{edit_message, react_to_message, react_to_message_in_chat, revoke_message};
pub(crate) use actions::{edit_to_ffi, reaction_to_ffi, revoke_to_ffi};
pub(crate) use models::file_kind_discriminant;
pub use models::{
ChatSettings, CommunitiesError, CommunityInfo, Contact, DownloadFailed, Event, FileContent,
Expand Down Expand Up @@ -296,116 +299,6 @@ impl ForwardReport {
}
}

fn reaction_to_ffi(
target_jid: &JID,
destination_jid: &JID,
sender_jid: &JID,
message_id: &MessageId,
reaction: &str,
) -> Result<(CString, CString, CString, CString, CString), MessageActionFailed> {
Ok((
CString::new(target_jid.0.as_ref()).map_err(|_| MessageActionFailed)?,
CString::new(destination_jid.0.as_ref()).map_err(|_| MessageActionFailed)?,
CString::new(sender_jid.0.as_ref()).map_err(|_| MessageActionFailed)?,
CString::new(message_id.as_ref()).map_err(|_| MessageActionFailed)?,
CString::new(reaction).map_err(|_| MessageActionFailed)?,
))
}

pub fn react_to_message(
chat_jid: &JID,
sender_jid: &JID,
message_id: &MessageId,
reaction: &str,
) -> Result<(), MessageActionFailed> {
react_to_message_in_chat(chat_jid, chat_jid, sender_jid, message_id, reaction)
}

pub fn react_to_message_in_chat(
target_jid: &JID,
destination_jid: &JID,
sender_jid: &JID,
message_id: &MessageId,
reaction: &str,
) -> Result<(), MessageActionFailed> {
let (target, destination, sender, id, reaction) = reaction_to_ffi(
target_jid,
destination_jid,
sender_jid,
message_id,
reaction,
)?;
let result = unsafe {
C_ReactToMessage(
target.as_ptr(),
destination.as_ptr(),
sender.as_ptr(),
id.as_ptr(),
reaction.as_ptr(),
)
};
if result == 0 {
Ok(())
} else {
Err(MessageActionFailed)
}
}

fn edit_to_ffi(
chat_jid: &JID,
message_id: &MessageId,
replacement: &str,
) -> Result<(CString, CString, CString), MessageActionFailed> {
if replacement.trim().is_empty() {
return Err(MessageActionFailed);
}
Ok((
CString::new(chat_jid.0.as_ref()).map_err(|_| MessageActionFailed)?,
CString::new(message_id.as_ref()).map_err(|_| MessageActionFailed)?,
CString::new(replacement).map_err(|_| MessageActionFailed)?,
))
}

pub fn edit_message(
chat_jid: &JID,
message_id: &MessageId,
replacement: &str,
) -> Result<(), MessageActionFailed> {
let (chat, id, replacement) = edit_to_ffi(chat_jid, message_id, replacement)?;
let result = unsafe { C_EditMessage(chat.as_ptr(), id.as_ptr(), replacement.as_ptr()) };
if result == 0 {
Ok(())
} else {
Err(MessageActionFailed)
}
}

fn revoke_to_ffi(
chat_jid: &JID,
sender_jid: &JID,
message_id: &MessageId,
) -> Result<(CString, CString, CString), MessageActionFailed> {
Ok((
CString::new(chat_jid.0.as_ref()).map_err(|_| MessageActionFailed)?,
CString::new(sender_jid.0.as_ref()).map_err(|_| MessageActionFailed)?,
CString::new(message_id.as_ref()).map_err(|_| MessageActionFailed)?,
))
}

pub fn revoke_message(
chat_jid: &JID,
sender_jid: &JID,
message_id: &MessageId,
) -> Result<(), MessageActionFailed> {
let (chat, sender, id) = revoke_to_ffi(chat_jid, sender_jid, message_id)?;
let result = unsafe { C_RevokeMessage(chat.as_ptr(), sender.as_ptr(), id.as_ptr()) };
if result == 0 {
Ok(())
} else {
Err(MessageActionFailed)
}
}

#[derive(Clone, Copy, Debug, Eq, PartialEq)]
pub enum MarkAsReadError {
Disconnected,
Expand Down
Loading