Skip to content

Commit dda2a57

Browse files
committed
refactor: Remove small code duplication
1 parent 49f1b37 commit dda2a57

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

src/chat.rs

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3774,6 +3774,10 @@ pub async fn create_broadcast(context: &Context, chat_name: String) -> Result<Ch
37743774
create_broadcast_ex(context, Sync, grpid, chat_name, secret).await
37753775
}
37763776

3777+
const SQL_INSERT_BROADCAST_SECRET: &str =
3778+
"INSERT INTO broadcasts_shared_secrets (chat_id, secret) VALUES (?, ?)
3779+
ON CONFLICT(chat_id) DO UPDATE SET secret=excluded.secret";
3780+
37773781
pub(crate) async fn create_broadcast_ex(
37783782
context: &Context,
37793783
sync: sync::Sync,
@@ -3809,12 +3813,7 @@ pub(crate) async fn create_broadcast_ex(
38093813
),
38103814
)?;
38113815
let chat_id = t.last_insert_rowid();
3812-
// TODO code duplication of `INSERT INTO broadcasts_shared_secrets`
3813-
t.execute(
3814-
"INSERT INTO broadcasts_shared_secrets (chat_id, secret) VALUES (?, ?)
3815-
ON CONFLICT(chat_id) DO UPDATE SET secret=excluded.chat_id",
3816-
(chat_id, &secret),
3817-
)?;
3816+
t.execute(SQL_INSERT_BROADCAST_SECRET, (chat_id, &secret))?;
38183817
Ok(t.last_insert_rowid().try_into()?)
38193818
};
38203819
context.sql.transaction(trans_fn).await?
@@ -3855,14 +3854,9 @@ pub(crate) async fn save_broadcast_shared_secret(
38553854
secret: &str,
38563855
) -> Result<()> {
38573856
info!(context, "Saving broadcast secret for chat {chat_id}");
3858-
info!(context, "dbg the new secret for chat {chat_id} is {secret}");
38593857
context
38603858
.sql
3861-
.execute(
3862-
"INSERT INTO broadcasts_shared_secrets (chat_id, secret) VALUES (?, ?)
3863-
ON CONFLICT(chat_id) DO UPDATE SET secret=excluded.secret",
3864-
(chat_id, secret),
3865-
)
3859+
.execute(SQL_INSERT_BROADCAST_SECRET, (chat_id, secret))
38663860
.await?;
38673861

38683862
Ok(())

0 commit comments

Comments
 (0)