more progress on TOTP/2FA

backend/src/main.rs

@@ -34,12 +34,15 @@ async fn users(_ag: Session, mut db: Connection<DbConn>) -> Json<Vec<i32>> {
 }
 
 #[get("/users/<id>", rank = 1)]
-async fn username_for_id(id: usize, _ag: Session, mut db: Connection<DbConn>) -> String {
-    sqlx::query!("SELECT username FROM users WHERE id = $1", id as i32)
-        .fetch_one(&mut **db)
-        .await
-        .map(|row| row.username)
-        .unwrap_or_else(|_| "User not found".to_string())
+async fn display_name(id: usize, _ag: Session, mut db: Connection<DbConn>) -> String {
+    sqlx::query!(
+        "SELECT display_name, username FROM users WHERE id = $1",
+        id as i32
+    )
+    .fetch_one(&mut **db)
+    .await
+    .map(|row| row.display_name.unwrap_or(row.username))
+    .unwrap_or_else(|_| "User not found".to_string())
 }
 
 #[launch]
@@ -80,7 +83,7 @@ fn rocket() -> Rocket<Build> {
                 messages::post_message,
                 messages::event_stream,
                 users,
-                username_for_id,
+                display_name,
                 auth::signup,
                 auth::login,
                 auth::get_totp,