Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-02 12:56:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

api(rust): Add api endpoint get_status_update (#4468)

Browse Source 
* start

* derive default

* make some webxdc file public

* shorten code

* Add from<u32> for chatid

* reduce changes to a bare minimum

* fix nested errors

* @hocuris fixes

* fix @link2xt changes

---------

Co-authored-by: septias <xxsebastian.kleahnxx@gmail.com>
This commit is contained in:
Sebastian Klähn
2023-06-15 15:35:57 +02:00
committed by GitHub
parent c3f352aff1
commit 768f8175e6
1 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/webxdc.rs
View File

@@ -3,7 +3,7 @@
use std::convert::TryFrom; use std::convert::TryFrom;
use std::path::Path; use std::path::Path;
use anyhow::{anyhow, bail, ensure, format_err, Result}; use anyhow::{anyhow, bail, ensure, format_err, Context as _, Result};
use deltachat_derive::FromSql; use deltachat_derive::FromSql;
use lettre_email::mime; use lettre_email::mime;
@@ -53,20 +53,20 @@ const WEBXDC_SENDING_LIMIT: u64 = 655360;
const WEBXDC_RECEIVING_LIMIT: u64 = 4194304; const WEBXDC_RECEIVING_LIMIT: u64 = 4194304;
/// Raw information read from manifest.toml /// Raw information read from manifest.toml
#[derive(Debug, Deserialize)] #[derive(Debug, Deserialize, Default)]
#[non_exhaustive] #[non_exhaustive]
struct WebxdcManifest { pub struct WebxdcManifest {
/// Webxdc name, used on icons or page titles. /// Webxdc name, used on icons or page titles.
name: Option<String>, pub name: Option<String>,
/// Minimum API version required to run this webxdc. /// Minimum API version required to run this webxdc.
min_api: Option<u32>, pub min_api: Option<u32>,
/// Optional URL of webxdc source code. /// Optional URL of webxdc source code.
source_code_url: Option<String>, pub source_code_url: Option<String>,
/// If the webxdc requests network access. /// If the webxdc requests network access.
request_internet_access: Option<bool>, pub request_internet_access: Option<bool>,
} }
/// Parsed information from WebxdcManifest and fallbacks. /// Parsed information from WebxdcManifest and fallbacks.
@@ -143,7 +143,7 @@ struct StatusUpdates {
} }
/// Update items as sent on the wire and as stored in the database. /// Update items as sent on the wire and as stored in the database.
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize, Default)]
pub struct StatusUpdateItem { pub struct StatusUpdateItem {
/// The playload of the status update. /// The playload of the status update.
pub payload: Value, pub payload: Value,
@@ -391,6 +391,21 @@ impl Context {
Ok(status_update_serial) Ok(status_update_serial)
} }
/// Returns the update_item with `status_update_serial` from the webxdc with message id `msg_id`.
pub async fn get_status_update(
&self,
msg_id: MsgId,
status_update_serial: StatusUpdateSerial,
) -> Result<String> {
self.sql
.query_get_value(
"SELECT update_item FROM msgs_status_updates WHERE id=? AND msg_id=? ",
(status_update_serial.0, msg_id),
)
.await?
.context("get_status_update: no update item found.")
}
/// Sends a status update for an webxdc instance. /// Sends a status update for an webxdc instance.
/// ///
/// If the instance is a draft, /// If the instance is a draft,
@@ -748,25 +763,10 @@ impl Message {
ensure!(self.viewtype == Viewtype::Webxdc, "No webxdc instance."); ensure!(self.viewtype == Viewtype::Webxdc, "No webxdc instance.");
let mut archive = self.get_webxdc_archive(context).await?; let mut archive = self.get_webxdc_archive(context).await?;
let mut manifest = if let Ok(bytes) = get_blob(&mut archive, "manifest.toml").await { let mut manifest = get_blob(&mut archive, "manifest.toml")
if let Ok(manifest) = parse_webxdc_manifest(&bytes) { .await
manifest .map(|bytes| parse_webxdc_manifest(&bytes).unwrap_or_default())
} else { .unwrap_or_default();
WebxdcManifest {
name: None,
min_api: None,
source_code_url: None,
request_internet_access: None,
}
}
} else {
WebxdcManifest {
name: None,
min_api: None,
source_code_url: None,
request_internet_access: None,
}
};
if let Some(ref name) = manifest.name { if let Some(ref name) = manifest.name {
let name = name.trim(); let name = name.trim();