1
This commit is contained in:
@@ -2,7 +2,7 @@ use axum::{
|
||||
body::Body,
|
||||
extract::{Path, State},
|
||||
http::{header, StatusCode},
|
||||
response::{Html, IntoResponse, Response},
|
||||
response::{Html, Response},
|
||||
Json,
|
||||
};
|
||||
use serde::Serialize;
|
||||
@@ -70,7 +70,7 @@ pub async fn download_page(State(state): State<Arc<AppState>>) -> Html<String> {
|
||||
"http://localhost:3000".to_string()
|
||||
};
|
||||
|
||||
let html = format!(r#"<!DOCTYPE html>
|
||||
let html = format!(r##"<!DOCTYPE html>
|
||||
<html lang="zh-CN">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
@@ -187,7 +187,7 @@ pub async fn download_page(State(state): State<Arc<AppState>>) -> Html<String> {
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>"#,
|
||||
</html>"##,
|
||||
server_name = config.server_name,
|
||||
server_url = server_url,
|
||||
version = config.client_version,
|
||||
|
||||
@@ -43,7 +43,7 @@ pub async fn list_friends(
|
||||
match rows {
|
||||
Ok(friends) => {
|
||||
let dtos: Vec<_> = friends.into_iter().map(|(id, username, avatar_seed, status)| {
|
||||
let is_online = state.presence.is_online(id);
|
||||
let is_online = state.presence.is_online(&id);
|
||||
FriendDto { id, username, avatar_seed, is_online, status }
|
||||
}).collect();
|
||||
(StatusCode::OK, Json(serde_json::json!(dtos))).into_response()
|
||||
|
||||
@@ -38,7 +38,7 @@ pub async fn search_users(
|
||||
"id": id,
|
||||
"username": username,
|
||||
"avatar_seed": avatar_seed,
|
||||
"is_online": state.presence.is_online(id),
|
||||
"is_online": state.presence.is_online(&id),
|
||||
})).collect();
|
||||
(StatusCode::OK, Json(serde_json::json!(dtos))).into_response()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user