Compare commits
1 Commits
master
...
e8f7aaddb2
| Author | SHA1 | Date | |
|---|---|---|---|
| e8f7aaddb2 |
4
matrixgw_backend/Cargo.lock
generated
4
matrixgw_backend/Cargo.lock
generated
@@ -2823,9 +2823,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ipnet"
|
name = "ipnet"
|
||||||
version = "2.11.0"
|
version = "2.12.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
|
checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"serde",
|
"serde",
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ futures-util = "0.3.32"
|
|||||||
jwt-simple = { version = "0.12.14", default-features = false, features = ["pure-rust"] }
|
jwt-simple = { version = "0.12.14", default-features = false, features = ["pure-rust"] }
|
||||||
thiserror = "2.0.18"
|
thiserror = "2.0.18"
|
||||||
uuid = { version = "1.21.0", features = ["v4", "serde"] }
|
uuid = { version = "1.21.0", features = ["v4", "serde"] }
|
||||||
ipnet = { version = "2.11.0", features = ["serde"] }
|
ipnet = { version = "2.12.0", features = ["serde"] }
|
||||||
rand = "0.10.0"
|
rand = "0.10.0"
|
||||||
hex = "0.4.3"
|
hex = "0.4.3"
|
||||||
mailchecker = "6.0.19"
|
mailchecker = "6.0.19"
|
||||||
|
|||||||
@@ -115,31 +115,17 @@ pub struct RoomIdInPath {
|
|||||||
pub(crate) room_id: OwnedRoomId,
|
pub(crate) room_id: OwnedRoomId,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(serde::Deserialize)]
|
|
||||||
pub struct SingleRoomQuery {
|
|
||||||
#[serde(default)]
|
|
||||||
pub with_latest_event: bool,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Get the list of joined rooms of the user
|
/// Get the list of joined rooms of the user
|
||||||
pub async fn single_room_info(
|
pub async fn single_room_info(
|
||||||
client: MatrixClientExtractor,
|
client: MatrixClientExtractor,
|
||||||
path: web::Path<RoomIdInPath>,
|
path: web::Path<RoomIdInPath>,
|
||||||
query: web::Query<SingleRoomQuery>,
|
|
||||||
) -> HttpResult {
|
) -> HttpResult {
|
||||||
let notifs = client.client.client.notification_settings().await;
|
let notifs = client.client.client.notification_settings().await;
|
||||||
|
|
||||||
let Some(room) = client.client.client.get_room(&path.room_id) else {
|
Ok(match client.client.client.get_room(&path.room_id) {
|
||||||
return Ok(HttpResponse::NotFound().json("Room not found"));
|
None => HttpResponse::NotFound().json("Room not found"),
|
||||||
};
|
Some(r) => HttpResponse::Ok().json(APIRoomInfo::from_room(&r, ¬ifs).await?),
|
||||||
|
})
|
||||||
let mut room_info = APIRoomInfo::from_room(&room, ¬ifs).await?;
|
|
||||||
|
|
||||||
if !query.with_latest_event {
|
|
||||||
room_info.latest_event = None;
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(HttpResponse::Ok().json(room_info))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Get room avatar
|
/// Get room avatar
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
"@mui/material": "^7.3.8",
|
"@mui/material": "^7.3.8",
|
||||||
"@mui/x-data-grid": "^8.27.4",
|
"@mui/x-data-grid": "^8.27.4",
|
||||||
"@mui/x-date-pickers": "^8.27.2",
|
"@mui/x-date-pickers": "^8.27.2",
|
||||||
"date-and-time": "^4.3.1",
|
"date-and-time": "^4.3.0",
|
||||||
"dayjs": "^1.11.19",
|
"dayjs": "^1.11.19",
|
||||||
"emoji-picker-react": "^4.18.0",
|
"emoji-picker-react": "^4.18.0",
|
||||||
"filesize": "^11.0.13",
|
"filesize": "^11.0.13",
|
||||||
@@ -31,11 +31,11 @@
|
|||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@eslint/js": "^10.0.1",
|
"@eslint/js": "^10.0.1",
|
||||||
"@types/node": "^25.3.5",
|
"@types/node": "^25.3.3",
|
||||||
"@types/react": "^19.2.14",
|
"@types/react": "^19.2.14",
|
||||||
"@types/react-dom": "^19.2.3",
|
"@types/react-dom": "^19.2.3",
|
||||||
"@vitejs/plugin-react": "^5.1.4",
|
"@vitejs/plugin-react": "^5.1.4",
|
||||||
"eslint": "^9.39.4",
|
"eslint": "^9.39.3",
|
||||||
"eslint-plugin-react-hooks": "^7.0.1",
|
"eslint-plugin-react-hooks": "^7.0.1",
|
||||||
"eslint-plugin-react-refresh": "^0.5.2",
|
"eslint-plugin-react-refresh": "^0.5.2",
|
||||||
"globals": "^17.4.0",
|
"globals": "^17.4.0",
|
||||||
|
|||||||
Reference in New Issue
Block a user