Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-26 01:46:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: Scaleup contact on securejoin, send more events, use correct create_blocked

Browse Source
This commit is contained in:
Hocuri
2025-09-05 21:46:26 +02:00
parent 01d9acbf6a
commit b5a54aa6cf
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/chat.rs
View File

@@ -5195,6 +5195,8 @@ impl Context {
return contact::set_blocked(self, Nosync, contact_id, false).await;
}
SyncAction::MarkVerified => {
ContactId::scaleup_origin(self, &[contact_id], Origin::SecurejoinJoined)
.await?;
return contact::mark_contact_id_as_verified(
self,
contact_id,

17
src/receive_imf.rs
View File

@@ -1385,6 +1385,7 @@ async fn do_chat_assignment(
create_or_lookup_mailinglist_or_broadcast(
context,
allow_creation,
create_blocked,
mailinglist_header,
from_id,
mime_parser,
@@ -3265,6 +3266,7 @@ fn mailinglist_header_listid(list_id_header: &str) -> Result<String> {
async fn create_or_lookup_mailinglist_or_broadcast(
context: &Context,
allow_creation: bool,
create_blocked: Blocked,
list_id_header: &str,
from_id: ContactId,
mime_parser: &MimeMessage,
@@ -3297,18 +3299,12 @@ async fn create_or_lookup_mailinglist_or_broadcast(
p.to_string()
});
let is_bot = context.get_config_bool(Config::Bot).await?;
let blocked = if is_bot {
Blocked::Not
} else {
Blocked::Request
};
let chat_id = ChatId::create_multiuser_record(
context,
chattype,
&listid,
name,
blocked,
create_blocked,
ProtectionStatus::Unprotected,
param,
mime_parser.timestamp_sent,
@@ -3330,7 +3326,12 @@ async fn create_or_lookup_mailinglist_or_broadcast(
)
.await?;
}
Ok(Some((chat_id, blocked)))
context.emit_event(EventType::ChatModified(chat_id));
chatlist_events::emit_chatlist_changed(context);
chatlist_events::emit_chatlist_item_changed(context, chat_id);
Ok(Some((chat_id, create_blocked)))
} else {
info!(context, "Creating list forbidden by caller.");
Ok(None)