fix: add libsignal-service/presage linking fix

Cargo.toml

@@ -28,8 +28,8 @@ debug = true
 dev = ["prost", "base64"]
 
 [dependencies]
-presage = { git = "https://github.com/whisperfish/presage", rev = "f93f2de" }
-presage-store-sled = { git = "https://github.com/whisperfish/presage", rev = "f93f2de" }
+presage = { git = "https://github.com/whisperfish/presage", rev = "e2392c42a0392397b9db782607fdd7ab2ea91b5f" }
+presage-store-sled = { git = "https://github.com/whisperfish/presage", rev = "e2392c42a0392397b9db782607fdd7ab2ea91b5f" }
 
 # dev feature dependencies
 prost = { version = "0.12.0", optional = true }
@@ -56,7 +56,7 @@ mime_guess = "2.0.4"
 notify-rust = "4.5.10"
 once_cell = "1.18.0"
 opener = "0.7.0"
-phonenumber = "0.3.1"
+phonenumber = "0.3.6"
 postcard = { version = "1.0.4", features = ["alloc"] }
 qr2term = { git = "https://github.com/boxdot/qr2term-rs", rev = "ed8ae7f" }
 ratatui = "0.26.0"
@@ -92,7 +92,7 @@ quickcheck_macros = "1.0.0"
 name = "app"
 harness = false
 
-[patch."https://github.com/whisperfish/presage.git"]
+# [patch."https://github.com/whisperfish/presage.git"]
 # presage = { path = "../presage/presage" }
 # presage-store-sled = { path = "../presage/presage-store-sled" }
 #
@@ -103,4 +103,4 @@ harness = false
 [patch.crates-io]
 # signal-protocol uses a fork of this library via the patch mechanism of cargo.
 # Since it is not transitive, we have to add the patch here explicitly.
-"curve25519-dalek" = { git = 'https://github.com/signalapp/curve25519-dalek', tag = 'signal-curve25519-4.1.1' }
+"curve25519-dalek" = { git = 'https://github.com/signalapp/curve25519-dalek', tag = 'signal-curve25519-4.1.3' }

src/dev.rs

@@ -3,7 +3,7 @@ use std::io::BufWriter;
 
 use base64::prelude::*;
 use presage::libsignal_service::content::{Content, Metadata};
-use presage::libsignal_service::ServiceAddress;
+use presage::libsignal_service::{ServiceAddress, ServiceIdType};
 use presage::proto;
 use prost::Message;
 use serde::{Deserialize, Serialize};
@@ -19,6 +19,7 @@ pub struct ContentBase64 {
 #[derive(Serialize, Deserialize)]
 #[serde(remote = "Metadata")]
 struct MetadataDef {
+    #[serde(with = "ServiceAddressDef")]
     sender: ServiceAddress,
     sender_device: u32,
     timestamp: u64,
@@ -27,6 +28,21 @@ struct MetadataDef {
     server_guid: Option<Uuid>,
 }
 
+#[derive(Serialize, Deserialize)]
+#[serde(remote = "ServiceAddress")]
+struct ServiceAddressDef {
+    pub uuid: Uuid,
+    #[serde(with = "ServiceIdTypeDef")]
+    pub identity: ServiceIdType,
+}
+
+#[derive(Serialize, Deserialize)]
+#[serde(remote = "ServiceIdType")]
+pub enum ServiceIdTypeDef {
+    AccountIdentity,
+    PhoneNumberIdentity,
+}
+
 impl From<Metadata> for MetadataDef {
     fn from(metadata: Metadata) -> Self {
         Self {

src/main.rs

@@ -50,7 +50,7 @@ async fn main() -> anyhow::Result<()> {
     let _guard = if args.verbosity > 0 {
         let file_appender = tracing_appender::rolling::never("./", "gurk.log");
         let (non_blocking, guard) = tracing_appender::non_blocking(file_appender);
-        tracing_subscriber::fmt()
+        tracing_subscriber::fmt::fmt()
             .with_max_level(match args.verbosity {
                 0 => LevelFilter::OFF,
                 1 => LevelFilter::INFO,

src/signal/attachment.rs

@@ -100,6 +100,7 @@ fn derive_name(pointer: &AttachmentPointer, digest: &[u8], mime: &Mime) -> Strin
 #[cfg(test)]
 mod tests {
     use hex_literal::hex;
+    use uuid::Uuid;
 
     use super::*;
 
@@ -110,6 +111,7 @@ mod tests {
         upload_timestamp: u64,
     ) -> AttachmentPointer {
         AttachmentPointer {
+            uuid: Some(Uuid::nil().into_bytes().to_vec()),
             content_type: Some(content_type.into()),
             digest: Some(digest.into()),
             file_name: file_name.map(|s| s.to_owned()),

src/signal/impl.rs

@@ -8,6 +8,7 @@ use presage::libsignal_service::content::{Content, ContentBody};
 use presage::libsignal_service::models::Contact;
 use presage::libsignal_service::prelude::{Group, ProfileKey};
 use presage::libsignal_service::sender::AttachmentSpec;
+use presage::libsignal_service::ServiceAddress;
 use presage::manager::{ReceivingMode, Registered};
 use presage::proto::data_message::{Quote, Reaction};
 use presage::proto::{AttachmentPointer, DataMessage, GroupContextV2, ReceiptMessage};
@@ -98,7 +99,10 @@ impl SignalManager for PresageManager {
         let mut manager = self.manager.clone();
         tokio::task::spawn_local(async move {
             let body = ContentBody::ReceiptMessage(data_message);
-            if let Err(error) = manager.send_message(sender_uuid, body, now_timestamp).await {
+            if let Err(error) = manager
+                .send_message(ServiceAddress::new_aci(sender_uuid), body, now_timestamp)
+                .await
+            {
                 error!(%error, %sender_uuid, "failed to send receipt");
             }
         });
@@ -162,7 +166,10 @@ impl SignalManager for PresageManager {
                         return;
                     }
                     let body = ContentBody::DataMessage(data_message);
-                    if let Err(error) = manager.send_message(uuid, body, timestamp).await {
+                    if let Err(error) = manager
+                        .send_message(ServiceAddress::new_aci(uuid), body, timestamp)
+                        .await
+                    {
                         error!(dest =% uuid, %error, "failed to send message");
                         let _ = response_tx.send(Err(error.into()));
                         return;
@@ -241,7 +248,10 @@ impl SignalManager for PresageManager {
                 let mut manager = self.manager.clone();
                 let body = ContentBody::DataMessage(data_message);
                 tokio::task::spawn_local(async move {
-                    if let Err(e) = manager.send_message(uuid, body, timestamp).await {
+                    if let Err(e) = manager
+                        .send_message(ServiceAddress::new_aci(uuid), body, timestamp)
+                        .await
+                    {
                         // TODO: Proper error handling
                         error!("failed to send reaction {} to {}: {}", &emoji, uuid, e);
                     }