Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-08 01:16:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

peerstate: use named columns for SELECT statements

Browse Source 
This ensures wrong column is not accidentally used.
This commit is contained in:
link2xt
2022-11-04 18:28:22 +00:00
parent 0bb231ad00
commit 053c9372cb
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/peerstate.rs
View File

@@ -196,35 +196,36 @@ impl Peerstate {
// gossip_key_fingerprint, verified_key, verified_key_fingerprint // gossip_key_fingerprint, verified_key, verified_key_fingerprint
let res = Peerstate { let res = Peerstate {
addr: row.get(0)?, addr: row.get("addr")?,
last_seen: row.get(1)?, last_seen: row.get("last_seen")?,
last_seen_autocrypt: row.get(2)?, last_seen_autocrypt: row.get("last_seen_autocrypt")?,
prefer_encrypt: EncryptPreference::from_i32(row.get(3)?).unwrap_or_default(), prefer_encrypt: EncryptPreference::from_i32(row.get("prefer_encrypted")?)
.unwrap_or_default(),
public_key: row public_key: row
.get(4) .get("public_key")
.ok() .ok()
.and_then(|blob: Vec<u8>| SignedPublicKey::from_slice(&blob).ok()), .and_then(|blob: Vec<u8>| SignedPublicKey::from_slice(&blob).ok()),
public_key_fingerprint: row public_key_fingerprint: row
.get::<_, Option<String>>(7)? .get::<_, Option<String>>("public_key_fingerprint")?
.map(|s| s.parse::<Fingerprint>()) .map(|s| s.parse::<Fingerprint>())
.transpose() .transpose()
.unwrap_or_default(), .unwrap_or_default(),
gossip_key: row gossip_key: row
.get(6) .get("gossip_key")
.ok() .ok()
.and_then(|blob: Vec<u8>| SignedPublicKey::from_slice(&blob).ok()), .and_then(|blob: Vec<u8>| SignedPublicKey::from_slice(&blob).ok()),
gossip_key_fingerprint: row gossip_key_fingerprint: row
.get::<_, Option<String>>(8)? .get::<_, Option<String>>("gossip_key_fingerprint")?
.map(|s| s.parse::<Fingerprint>()) .map(|s| s.parse::<Fingerprint>())
.transpose() .transpose()
.unwrap_or_default(), .unwrap_or_default(),
gossip_timestamp: row.get(5)?, gossip_timestamp: row.get("gossip_timestamp")?,
verified_key: row verified_key: row
.get(9) .get("verified_key")
.ok() .ok()
.and_then(|blob: Vec<u8>| SignedPublicKey::from_slice(&blob).ok()), .and_then(|blob: Vec<u8>| SignedPublicKey::from_slice(&blob).ok()),
verified_key_fingerprint: row verified_key_fingerprint: row
.get::<_, Option<String>>(10)? .get::<_, Option<String>>("verified_key_fingerprint")?
.map(|s| s.parse::<Fingerprint>()) .map(|s| s.parse::<Fingerprint>())
.transpose() .transpose()
.unwrap_or_default(), .unwrap_or_default(),