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

adapt repl-tool to new mailinglist api

Browse Source
This commit is contained in:
B. Petersen
2021-02-15 16:13:41 +01:00
committed by bjoern
parent f77beaf4fc
commit dab91574f2
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
examples/repl/cmdline.rs
View File

@@ -14,7 +14,7 @@ use deltachat::dc_tools::*;
use deltachat::imex::*; use deltachat::imex::*;
use deltachat::location; use deltachat::location;
use deltachat::lot::LotState; use deltachat::lot::LotState;
use deltachat::message::{self, Message, MessageState, MsgId}; use deltachat::message::{self, ContactRequestDecision, Message, MessageState, MsgId};
use deltachat::peerstate::*; use deltachat::peerstate::*;
use deltachat::qr::*; use deltachat::qr::*;
use deltachat::sql; use deltachat::sql;
@@ -171,8 +171,11 @@ async fn log_msg(context: &Context, prefix: impl AsRef<str>, msg: &Message) {
let contact = Contact::get_by_id(context, msg.get_from_id()) let contact = Contact::get_by_id(context, msg.get_from_id())
.await .await
.expect("invalid contact"); .expect("invalid contact");
let contact_name = if let Some(name) = msg.get_override_sender_name() {
let contact_name = contact.get_name(); format!("~{}", name)
} else {
contact.get_display_name().to_string()
};
let contact_id = contact.get_id(); let contact_id = contact.get_id();
let statestr = match msg.get_state() { let statestr = match msg.get_state() {
@@ -260,7 +263,7 @@ async fn log_contactlist(context: &Context, contacts: &[u32]) {
let line; let line;
let mut line2 = "".to_string(); let mut line2 = "".to_string();
if let Ok(contact) = Contact::get_by_id(context, contact_id).await { if let Ok(contact) = Contact::get_by_id(context, contact_id).await {
let name = contact.get_name(); let name = contact.get_display_name();
let addr = contact.get_addr(); let addr = contact.get_addr();
let verified_state = contact.is_verified(context).await; let verified_state = contact.is_verified(context).await;
let verified_str = if VerifiedStatus::Unverified != verified_state { let verified_str = if VerifiedStatus::Unverified != verified_state {
@@ -609,6 +612,8 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
} else if sel_chat.get_type() == Chattype::Single && !members.is_empty() { } else if sel_chat.get_type() == Chattype::Single && !members.is_empty() {
let contact = Contact::get_by_id(&context, members[0]).await?; let contact = Contact::get_by_id(&context, members[0]).await?;
contact.get_addr().to_string() contact.get_addr().to_string()
} else if sel_chat.get_type() == Chattype::Mailinglist && !members.is_empty() {
"mailinglist".to_string()
} else { } else {
format!("{} member(s)", members.len()) format!("{} member(s)", members.len())
}; };
@@ -657,10 +662,19 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
"createchatbymsg" => { "createchatbymsg" => {
ensure!(!arg1.is_empty(), "Argument <msg-id> missing"); ensure!(!arg1.is_empty(), "Argument <msg-id> missing");
let msg_id = MsgId::new(arg1.parse()?); let msg_id = MsgId::new(arg1.parse()?);
let chat_id = chat::create_by_msg_id(&context, msg_id).await?; match message::decide_on_contact_request(
&context,
msg_id,
ContactRequestDecision::StartChat,
)
.await
{
Some(chat_id) => {
let chat = Chat::load_from_db(&context, chat_id).await?; let chat = Chat::load_from_db(&context, chat_id).await?;
println!("{}#{} created successfully.", chat_prefix(&chat), chat_id);
println!("{}#{} created successfully.", chat_prefix(&chat), chat_id,); }
None => println!("Cannot crate chat."),
}
} }
"creategroup" => { "creategroup" => {
ensure!(!arg1.is_empty(), "Argument <name> missing."); ensure!(!arg1.is_empty(), "Argument <name> missing.");