Skip to content

Commit a8b6da2

Browse files
committed
models/crate_owner_invitation: Convert find_by_token() to async fn
1 parent 16d11a0 commit a8b6da2

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

src/controllers/crate_owner_invitation.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,13 +311,13 @@ pub async fn handle_invite_with_token(
311311
state: AppState,
312312
Path(token): Path<String>,
313313
) -> AppResult<Json<Value>> {
314-
let conn = state.db_write().await?;
314+
let mut conn = state.db_write().await?;
315+
let invitation = CrateOwnerInvitation::find_by_token(&token, &mut conn).await?;
315316
spawn_blocking(move || {
316317
let conn: &mut AsyncConnectionWrapper<_> = &mut conn.into();
317318

318319
let config = &state.config;
319320

320-
let invitation = CrateOwnerInvitation::find_by_token(&token, conn)?;
321321
let crate_id = invitation.crate_id;
322322
invitation.accept(conn, config)?;
323323

src/models/crate_owner_invitation.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,13 @@ impl CrateOwnerInvitation {
101101
.await
102102
}
103103

104-
pub fn find_by_token(token: &str, conn: &mut impl Conn) -> QueryResult<Self> {
105-
use diesel::RunQueryDsl;
104+
pub async fn find_by_token(token: &str, conn: &mut AsyncPgConnection) -> QueryResult<Self> {
105+
use diesel_async::RunQueryDsl;
106106

107107
crate_owner_invitations::table
108108
.filter(crate_owner_invitations::token.eq(token))
109109
.first::<Self>(conn)
110+
.await
110111
}
111112

112113
pub fn accept(self, conn: &mut impl Conn, config: &config::Server) -> AppResult<()> {

0 commit comments

Comments
 (0)