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

fix chat-verified

Browse Source
This commit is contained in:
dignifiedquire
2019-12-02 00:11:11 +01:00
parent e985887739
commit 1e7afa9da0
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@@ -1397,7 +1397,7 @@ dependencies = [
[[package]] [[package]]
name = "lettre" name = "lettre"
version = "0.9.2" version = "0.9.2"
source = "git+https://github.com/deltachat/lettre?branch=feat/mail#db7fe5fc06d4abb4c1cd70534310d1e0b1e79d57" source = "git+https://github.com/deltachat/lettre?branch=feat/mail#00ba9db544059ddd60048f0b85d5052e4bf605da"
dependencies = [ dependencies = [
"base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
"bufstream 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "bufstream 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1416,7 +1416,7 @@ dependencies = [
[[package]] [[package]]
name = "lettre_email" name = "lettre_email"
version = "0.9.2" version = "0.9.2"
source = "git+https://github.com/deltachat/lettre?branch=feat/mail#db7fe5fc06d4abb4c1cd70534310d1e0b1e79d57" source = "git+https://github.com/deltachat/lettre?branch=feat/mail#00ba9db544059ddd60048f0b85d5052e4bf605da"
dependencies = [ dependencies = [
"base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
"email 0.0.21 (git+https://github.com/deltachat/rust-email)", "email 0.0.21 (git+https://github.com/deltachat/rust-email)",

2
src/dc_receive_imf.rs
View File

@@ -1272,7 +1272,7 @@ fn create_or_lookup_adhoc_group(
context.call_cb(Event::ChatModified(chat_id)); context.call_cb(Event::ChatModified(chat_id));
cleanup(ret_chat_id, ret_chat_id_blocked, chat_id, chat_id_blocked); cleanup(ret_chat_id, ret_chat_id_blocked, chat_id, chat_id_blocked);
return Ok(()); Ok(())
} }
fn create_group_record( fn create_group_record(

2
src/message.rs
View File

@@ -458,7 +458,7 @@ impl Message {
}; };
let contact = if self.from_id != DC_CONTACT_ID_SELF as libc::c_uint let contact = if self.from_id != DC_CONTACT_ID_SELF as libc::c_uint
&& ((*chat).typ == Chattype::Group || (*chat).typ == Chattype::VerifiedGroup) && (chat.typ == Chattype::Group || chat.typ == Chattype::VerifiedGroup)
{ {
Contact::get_by_id(context, self.from_id).ok() Contact::get_by_id(context, self.from_id).ok()
} else { } else {

11
src/mimefactory.rs
View File

@@ -474,9 +474,12 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
let is_encrypted = should_encrypt && force_plaintext == 0; let is_encrypted = should_encrypt && force_plaintext == 0;
// Add gossip headers // Add gossip headers
info!(self.context, "gossip: {:?}", do_gossip);
if do_gossip { if do_gossip {
info!(self.context, "Gossip headers: {:?}", &peerstates); info!(
self.context,
"gossiping headers for {} peerstates",
peerstates.len()
);
for peerstate in peerstates.iter().filter_map(|(state, _)| state.as_ref()) { for peerstate in peerstates.iter().filter_map(|(state, _)| state.as_ref()) {
if peerstate.peek_key(min_verified).is_some() { if peerstate.peek_key(min_verified).is_some() {
if let Some(header) = peerstate.render_gossip_header(min_verified) { if let Some(header) = peerstate.render_gossip_header(min_verified) {
@@ -604,6 +607,10 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
let mut placeholdertext = None; let mut placeholdertext = None;
let mut meta_part = None; let mut meta_part = None;
if chat.typ == Chattype::VerifiedGroup {
protected_headers.push(Header::new("Chat-Verified".to_string(), "1".to_string()));
}
if chat.typ == Chattype::Group || chat.typ == Chattype::VerifiedGroup { if chat.typ == Chattype::Group || chat.typ == Chattype::VerifiedGroup {
protected_headers.push(Header::new("Chat-Group-ID".into(), chat.grpid.clone())); protected_headers.push(Header::new("Chat-Group-ID".into(), chat.grpid.clone()));