Skip to content

Commit

Permalink
Update to presage 0.5.2 to include group sending fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
boxdot committed May 30, 2023
1 parent f834e02 commit dd536db
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 11 deletions.
12 changes: 6 additions & 6 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/signal/impl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion src/signal/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand Down
3 changes: 2 additions & 1 deletion src/util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down

0 comments on commit dd536db

Please sign in to comment.