From dd536dbe0b7651a76220892aad6cca917c7645a1 Mon Sep 17 00:00:00 2001
From: boxdot <d@zerovolt.org>
Date: Mon, 8 May 2023 10:45:39 +0200
Subject: [PATCH] Update to presage 0.5.2 to include group sending fixes

---
 Cargo.lock         | 12 ++++++------
 Cargo.toml         |  4 ++--
 src/signal/impl.rs |  2 +-
 src/signal/mod.rs  |  2 +-
 src/util.rs        |  3 ++-
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cd78dbb..48ace9d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -458,9 +458,9 @@ checksum = "17cc5e6b5ab06331c33589842070416baa137e8b0eb912b008cfd4a78ada7919"
 
 [[package]]
 name = "chrono"
-version = "0.4.22"
+version = "0.4.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1"
+checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b"
 dependencies = [
  "iana-time-zone",
  "num-integer",
@@ -1787,7 +1787,7 @@ dependencies = [
 [[package]]
 name = "libsignal-service"
 version = "0.1.0"
-source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=f11b2d1#f11b2d1683925ff52b2cfcd86a350405379b0336"
+source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=c2f70ef#c2f70efd88bbebc9b646690a8449c451af619f2c"
 dependencies = [
  "aes",
  "aes-gcm",
@@ -1820,7 +1820,7 @@ dependencies = [
 [[package]]
 name = "libsignal-service-hyper"
 version = "0.1.0"
-source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=f11b2d1#f11b2d1683925ff52b2cfcd86a350405379b0336"
+source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=c2f70ef#c2f70efd88bbebc9b646690a8449c451af619f2c"
 dependencies = [
  "async-trait",
  "async-tungstenite",
@@ -2573,7 +2573,7 @@ checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
 [[package]]
 name = "presage"
 version = "0.6.0-dev"
-source = "git+https://github.com/whisperfish/presage?rev=7823d28#7823d28e89606cc44c9042df30c6203750e925ac"
+source = "git+https://github.com/whisperfish/presage?rev=0.5.2#673d30686c8da8df6f45d2e9cf9d2d5eec2651c9"
 dependencies = [
  "base64 0.12.3",
  "futures",
@@ -2592,7 +2592,7 @@ dependencies = [
 [[package]]
 name = "presage-store-sled"
 version = "0.6.0-dev"
-source = "git+https://github.com/whisperfish/presage?rev=7823d28#7823d28e89606cc44c9042df30c6203750e925ac"
+source = "git+https://github.com/whisperfish/presage?rev=0.5.2#673d30686c8da8df6f45d2e9cf9d2d5eec2651c9"
 dependencies = [
  "async-trait",
  "base64 0.12.3",
diff --git a/Cargo.toml b/Cargo.toml
index e51a3ad..57094cb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -28,8 +28,8 @@ debug = true
 dev = ["prost", "base64"]
 
 [dependencies]
-presage = { git = "https://github.com/whisperfish/presage", rev = "7823d28" }
-presage-store-sled = { git = "https://github.com/whisperfish/presage", rev = "7823d28" }
+presage = { git = "https://github.com/whisperfish/presage", rev = "0.5.2" }
+presage-store-sled = { git = "https://github.com/whisperfish/presage", rev = "0.5.2" }
 
 anyhow = "1.0.66"
 async-trait = "0.1.58"
diff --git a/src/signal/impl.rs b/src/signal/impl.rs
index 55c1fb2..f40a625 100644
--- a/src/signal/impl.rs
+++ b/src/signal/impl.rs
@@ -47,7 +47,7 @@ impl SignalManager for PresageManager {
     }
 
     fn user_id(&self) -> Uuid {
-        self.manager.uuid()
+        self.manager.state().service_ids.aci
     }
 
     async fn resolve_group(
diff --git a/src/signal/mod.rs b/src/signal/mod.rs
index 8fb4e2f..4490ec1 100644
--- a/src/signal/mod.rs
+++ b/src/signal/mod.rs
@@ -40,7 +40,7 @@ pub async fn ensure_linked_device(
 
     if !relink {
         if let Some(config) = config.clone() {
-            if let Ok(manager) = presage::Manager::load_registered(store.clone()) {
+            if let Ok(manager) = presage::Manager::load_registered(store.clone()).await {
                 // done loading manager from store
                 return Ok((Box::new(PresageManager::new(manager)), config));
             }
diff --git a/src/util.rs b/src/util.rs
index 98339e4..ae6233b 100644
--- a/src/util.rs
+++ b/src/util.rs
@@ -94,7 +94,8 @@ impl<T> StatefulList<T> {
 }
 
 pub fn utc_timestamp_msec_to_local(timestamp: u64) -> DateTime<Local> {
-    let dt = NaiveDateTime::from_timestamp(timestamp as i64 / 1000, (timestamp % 1000) as u32);
+    let dt = NaiveDateTime::from_timestamp_opt(timestamp as i64 / 1000, (timestamp % 1000) as u32)
+        .expect("invalid datetime");
     Utc.from_utc_datetime(&dt).with_timezone(&Local)
 }