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

refactor: Remove small code duplication

Browse Source
This commit is contained in:
Hocuri
2025-08-11 16:39:42 +02:00
parent 2efbbcc669
commit 61e0d14eed
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/chat.rs
View File

@@ -3803,6 +3803,10 @@ pub async fn create_broadcast(context: &Context, chat_name: String) -> Result<Ch
create_broadcast_ex(context, Sync, grpid, chat_name, secret).await create_broadcast_ex(context, Sync, grpid, chat_name, secret).await
} }
const SQL_INSERT_BROADCAST_SECRET: &str =
"INSERT INTO broadcasts_shared_secrets (chat_id, secret) VALUES (?, ?)
ON CONFLICT(chat_id) DO UPDATE SET secret=excluded.secret";
pub(crate) async fn create_broadcast_ex( pub(crate) async fn create_broadcast_ex(
context: &Context, context: &Context,
sync: sync::Sync, sync: sync::Sync,
@@ -3838,12 +3842,7 @@ pub(crate) async fn create_broadcast_ex(
), ),
)?; )?;
let chat_id = t.last_insert_rowid(); let chat_id = t.last_insert_rowid();
// TODO code duplication of `INSERT INTO broadcasts_shared_secrets` t.execute(SQL_INSERT_BROADCAST_SECRET, (chat_id, &secret))?;
t.execute(
"INSERT INTO broadcasts_shared_secrets (chat_id, secret) VALUES (?, ?)
ON CONFLICT(chat_id) DO UPDATE SET secret=excluded.chat_id",
(chat_id, &secret),
)?;
Ok(t.last_insert_rowid().try_into()?) Ok(t.last_insert_rowid().try_into()?)
}; };
context.sql.transaction(trans_fn).await? context.sql.transaction(trans_fn).await?
@@ -3884,14 +3883,9 @@ pub(crate) async fn save_broadcast_shared_secret(
secret: &str, secret: &str,
) -> Result<()> { ) -> Result<()> {
info!(context, "Saving broadcast secret for chat {chat_id}"); info!(context, "Saving broadcast secret for chat {chat_id}");
info!(context, "dbg the new secret for chat {chat_id} is {secret}");
context context
.sql .sql
.execute( .execute(SQL_INSERT_BROADCAST_SECRET, (chat_id, secret))
"INSERT INTO broadcasts_shared_secrets (chat_id, secret) VALUES (?, ?)
ON CONFLICT(chat_id) DO UPDATE SET secret=excluded.secret",
(chat_id, secret),
)
.await?; .await?;
Ok(()) Ok(())