buzzert/Kordophone
Private
Public Access
1
0
Fork 0
Code Packages Activity

Notify when attachment download succeeds, fix deadlock in attachment store

Browse Source
This commit is contained in:
James Magahern
2025-06-06 20:02:09 -07:00
parent 1d3b2f25ba
commit 4ddc0dca39
11 changed files with 126 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
kordophone/src/api/http_client.rs
View File

@@ -469,10 +469,14 @@ impl<K: AuthenticationStore + Send + Sync> HTTPAPIClient<K> {
.expect("Unable to build request")
};
log::trace!("Obtaining token from auth store");
let token = self.auth_store.get_token().await;
let request = build_request(&token);
let mut response = self.client.request(request).await?;
log::trace!("Token: {:?}", token);
let request = build_request(&token);
log::trace!("Request: {:?}. Sending request...", request);
let mut response = self.client.request(request).await?;
log::debug!("-> Response: {:}", response.status());
match response.status() {
@@ -502,7 +506,9 @@ impl<K: AuthenticationStore + Send + Sync> HTTPAPIClient<K> {
// Other errors: bubble up.
_ => {
let message = format!("Request failed ({:})", response.status());
let status = response.status();
let body_str = hyper::body::to_bytes(response.into_body()).await?;
let message = format!("Request failed ({:}). Response body: {:?}", status, String::from_utf8_lossy(&body_str));
return Err(Error::ClientError(message));
}
}

4
kordophone/src/model/message.rs
View File

@@ -10,11 +10,11 @@ pub type MessageID = <Message as Identifiable>::ID;
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct AttributionInfo {
/// Picture width
#[serde(rename = "pgensh")]
#[serde(rename = "pgensw")]
pub width: Option<u32>,
/// Picture height
#[serde(rename = "pgensw")]
#[serde(rename = "pgensh")]
pub height: Option<u32>,
}