Skip to content

api!(jsonrpc): remove webxdc info from MessageObject #6920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 18, 2025
Merged

api!(jsonrpc): remove webxdc info from MessageObject #6920

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions deltachat-jsonrpc/src/api/types/message.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ use deltachat::chat::ChatVisibility;
use deltachat::contact::Contact;
use deltachat::context::Context;
use deltachat::download;
use deltachat::log::LogExt as _;
use deltachat::message::Message;
use deltachat::message::MsgId;
use deltachat::message::Viewtype;
Expand All @@ -20,7 +19,6 @@ use typescript_type_def::TypeDef;
use super::color_int_to_hex_string;
use super::contact::ContactObject;
use super::reactions::JSONRPCReactions;
use super::webxdc::WebxdcMessageInfo;

#[derive(Serialize, TypeDef, schemars::JsonSchema)]
#[serde(rename_all = "camelCase", tag = "kind")]
Expand Down Expand Up @@ -92,8 +90,6 @@ pub struct MessageObject {
file_bytes: u64,
file_name: Option<String>,

webxdc_info: Option<WebxdcMessageInfo>,

webxdc_href: Option<String>,

download_state: DownloadState,
Expand Down Expand Up @@ -144,15 +140,6 @@ impl MessageObject {
let file_bytes = message.get_filebytes(context).await?.unwrap_or_default();
let override_sender_name = message.get_override_sender_name();

let webxdc_info = if message.get_viewtype() == Viewtype::Webxdc {
WebxdcMessageInfo::get_for_message(context, msg_id)
.await
.log_err(context)
.ok()
} else {
None
};

let parent_id = message.parent(context).await?.map(|m| m.get_id().to_u32());

let download_state = message.download_state().into();
Expand Down Expand Up @@ -266,7 +253,6 @@ impl MessageObject {
file_mime: message.get_filemime(),
file_bytes,
file_name: message.get_filename(),
webxdc_info,

// On a WebxdcInfoMessage this might include a hash holding
// information about a specific position or state in a webxdc app
Expand Down
Loading