Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-20 23:16:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

api: Rename Transport to TransportListEntry (#8009)

Browse Source 
Follow-up to https://github.com/chatmail/core/pull/7994/, in order to
prevent clashes with other things that are called `Transport`, and in
order to make the struct name more greppable
This commit is contained in:
Hocuri
2026-03-18 16:17:53 +01:00
committed by GitHub
parent 810dab12dc
commit fba4e63961
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
deltachat-jsonrpc/src/api.rs
View File

@@ -68,7 +68,7 @@ use self::types::{
}, },
}; };
use crate::api::types::chat_list::{get_chat_list_item_by_id, ChatListItemFetchResult}; use crate::api::types::chat_list::{get_chat_list_item_by_id, ChatListItemFetchResult};
use crate::api::types::login_param::Transport; use crate::api::types::login_param::TransportListEntry;
use crate::api::types::qr::{QrObject, SecurejoinSource, SecurejoinUiPath}; use crate::api::types::qr::{QrObject, SecurejoinSource, SecurejoinUiPath};
#[derive(Debug)] #[derive(Debug)]
@@ -571,7 +571,7 @@ impl CommandApi {
/// Returns the list of all email accounts that are used as a transport in the current profile. /// Returns the list of all email accounts that are used as a transport in the current profile.
/// Use [Self::add_or_update_transport()] to add or change a transport /// Use [Self::add_or_update_transport()] to add or change a transport
/// and [Self::delete_transport()] to delete a transport. /// and [Self::delete_transport()] to delete a transport.
async fn list_transports_ex(&self, account_id: u32) -> Result<Vec<Transport>> { async fn list_transports_ex(&self, account_id: u32) -> Result<Vec<TransportListEntry>> {
let ctx = self.get_context(account_id).await?; let ctx = self.get_context(account_id).await?;
let res = ctx let res = ctx
.list_transports() .list_transports()

8
deltachat-jsonrpc/src/api/types/login_param.rs
View File

@@ -6,7 +6,7 @@ use yerpc::TypeDef;
#[derive(Serialize, TypeDef, schemars::JsonSchema)] #[derive(Serialize, TypeDef, schemars::JsonSchema)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct Transport { pub struct TransportListEntry {
/// The login data entered by the user. /// The login data entered by the user.
pub param: EnteredLoginParam, pub param: EnteredLoginParam,
/// Whether this transport is set to 'unpublished'. /// Whether this transport is set to 'unpublished'.
@@ -66,9 +66,9 @@ pub struct EnteredLoginParam {
pub oauth2: Option<bool>, pub oauth2: Option<bool>,
} }
impl From<dc::Transport> for Transport { impl From<dc::TransportListEntry> for TransportListEntry {
fn from(transport: dc::Transport) -> Self { fn from(transport: dc::TransportListEntry) -> Self {
Transport { TransportListEntry {
param: transport.param.into(), param: transport.param.into(),
is_unpublished: transport.is_unpublished, is_unpublished: transport.is_unpublished,
} }

6
src/configure.rs
View File

@@ -29,7 +29,7 @@ use crate::context::Context;
use crate::imap::Imap; use crate::imap::Imap;
use crate::log::warn; use crate::log::warn;
pub use crate::login_param::EnteredLoginParam; pub use crate::login_param::EnteredLoginParam;
use crate::login_param::{EnteredCertificateChecks, Transport}; use crate::login_param::{EnteredCertificateChecks, TransportListEntry};
use crate::message::Message; use crate::message::Message;
use crate::net::proxy::ProxyConfig; use crate::net::proxy::ProxyConfig;
use crate::oauth2::get_oauth2_addr; use crate::oauth2::get_oauth2_addr;
@@ -189,7 +189,7 @@ impl Context {
/// Returns the list of all email accounts that are used as a transport in the current profile. /// Returns the list of all email accounts that are used as a transport in the current profile.
/// Use [Self::add_or_update_transport()] to add or change a transport /// Use [Self::add_or_update_transport()] to add or change a transport
/// and [Self::delete_transport()] to delete a transport. /// and [Self::delete_transport()] to delete a transport.
pub async fn list_transports(&self) -> Result<Vec<Transport>> { pub async fn list_transports(&self) -> Result<Vec<TransportListEntry>> {
let transports = self let transports = self
.sql .sql
.query_map_vec( .query_map_vec(
@@ -199,7 +199,7 @@ impl Context {
let param: String = row.get(0)?; let param: String = row.get(0)?;
let param: EnteredLoginParam = serde_json::from_str(&param)?; let param: EnteredLoginParam = serde_json::from_str(&param)?;
let is_published: bool = row.get(1)?; let is_published: bool = row.get(1)?;
Ok(Transport { Ok(TransportListEntry {
param, param,
is_unpublished: !is_published, is_unpublished: !is_published,
}) })

2
src/login_param.rs
View File

@@ -81,7 +81,7 @@ pub struct EnteredServerLoginParam {
/// A transport, as shown in the "relays" list in the UI. /// A transport, as shown in the "relays" list in the UI.
#[derive(Debug)] #[derive(Debug)]
pub struct Transport { pub struct TransportListEntry {
/// The login data entered by the user. /// The login data entered by the user.
pub param: EnteredLoginParam, pub param: EnteredLoginParam,
/// Whether this transport is set to 'unpublished'. /// Whether this transport is set to 'unpublished'.