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

refactor: simplify create_broadcast_ex()

Browse Source
This commit is contained in:
Hocuri
2025-09-10 18:42:34 +02:00
parent d967bff702
commit dca184f72c
1 changed files with 22 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/chat.rs
View File

@@ -3832,42 +3832,35 @@ pub(crate) async fn create_broadcast_ex(
chat_name: String, chat_name: String,
secret: String, secret: String,
) -> Result<ChatId> { ) -> Result<ChatId> {
// TODO check why create_group() is duplicated in receive_imf.rs, but this fn here is not
// e.g. do we need a create_blocked param?
let chat_name = sanitize_single_line(&chat_name); let chat_name = sanitize_single_line(&chat_name);
if chat_name.is_empty() { if chat_name.is_empty() {
bail!("Invalid broadcast channel name: {chat_name}."); bail!("Invalid broadcast channel name: {chat_name}.");
} }
let timestamp = create_smeared_timestamp(context); let timestamp = create_smeared_timestamp(context);
let chat_id = { let trans_fn = |t: &mut rusqlite::Transaction| -> Result<ChatId> {
let chat_name = &chat_name; let cnt: u32 = t.query_row(
let grpid = &grpid; "SELECT COUNT(*) FROM chats WHERE grpid=?",
let trans_fn = |t: &mut rusqlite::Transaction| -> Result<u32> { (&grpid,),
// TODO it's not needed to lookup an existing broadcast here |row| row.get(0),
let cnt = t.execute("UPDATE chats SET name=? WHERE grpid=?", (chat_name, grpid))?; )?;
ensure!(cnt <= 1, "{cnt} chats exist with grpid {grpid}"); ensure!(cnt == 0, "{cnt} chats exist with grpid {grpid}");
if cnt == 1 {
return Ok(t.query_row( // TODO check if this should use create_multiuser_record()
"SELECT id FROM chats WHERE grpid=? AND type=?", t.execute(
(grpid, Chattype::OutBroadcast), "INSERT INTO chats \
|row| { (type, name, grpid, created_timestamp) \
let id: u32 = row.get(0)?; VALUES(?, ?, ?, ?);",
Ok(id) (Chattype::OutBroadcast, &chat_name, &grpid, timestamp),
}, )?;
)?); let chat_id = ChatId::new(t.last_insert_rowid().try_into()?);
}
t.execute( t.execute(SQL_INSERT_BROADCAST_SECRET, (chat_id, &secret))?;
"INSERT INTO chats \ Ok(chat_id)
(type, name, grpid, created_timestamp) \
VALUES(?, ?, ?, ?);",
(Chattype::OutBroadcast, &chat_name, &grpid, timestamp),
)?;
let chat_id = t.last_insert_rowid();
t.execute(SQL_INSERT_BROADCAST_SECRET, (chat_id, &secret))?;
Ok(chat_id.try_into()?)
};
context.sql.transaction(trans_fn).await?
}; };
let chat_id = ChatId::new(chat_id); let chat_id = context.sql.transaction(trans_fn).await?;
chat_id.maybe_add_encrypted_msg(context, timestamp).await?; chat_id.maybe_add_encrypted_msg(context, timestamp).await?;
context.emit_msgs_changed_without_ids(); context.emit_msgs_changed_without_ids();