Can get information about rooms
This commit is contained in:
@@ -0,0 +1,58 @@
|
|||||||
|
use crate::controllers::HttpResult;
|
||||||
|
use crate::extractors::matrix_client_extractor::MatrixClientExtractor;
|
||||||
|
use actix_web::{HttpResponse, web};
|
||||||
|
use futures_util::{StreamExt, stream};
|
||||||
|
use matrix_sdk::ruma::{OwnedRoomId, OwnedUserId};
|
||||||
|
use matrix_sdk::{Room, RoomMemberships};
|
||||||
|
|
||||||
|
#[derive(serde::Serialize)]
|
||||||
|
pub struct APIRoomInfo {
|
||||||
|
id: OwnedRoomId,
|
||||||
|
name: Option<String>,
|
||||||
|
members: Vec<OwnedUserId>,
|
||||||
|
has_avatar: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl APIRoomInfo {
|
||||||
|
async fn from_room(r: &Room) -> anyhow::Result<Self> {
|
||||||
|
Ok(Self {
|
||||||
|
id: r.room_id().to_owned(),
|
||||||
|
name: r.name(),
|
||||||
|
members: r
|
||||||
|
.members(RoomMemberships::ACTIVE)
|
||||||
|
.await?
|
||||||
|
.into_iter()
|
||||||
|
.map(|r| r.user_id().to_owned())
|
||||||
|
.collect::<Vec<_>>(),
|
||||||
|
has_avatar: r.avatar_url().is_some(),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Get the list of joined rooms of the user
|
||||||
|
pub async fn joined_rooms(client: MatrixClientExtractor) -> HttpResult {
|
||||||
|
let list = stream::iter(client.client.client.joined_rooms())
|
||||||
|
.then(async |room| APIRoomInfo::from_room(&room).await)
|
||||||
|
.collect::<Vec<_>>()
|
||||||
|
.await
|
||||||
|
.into_iter()
|
||||||
|
.collect::<Result<Vec<_>, _>>()?;
|
||||||
|
|
||||||
|
Ok(HttpResponse::Ok().json(list))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(serde::Deserialize)]
|
||||||
|
pub struct RoomIdInPath {
|
||||||
|
id: OwnedRoomId,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Get the list of joined rooms of the user
|
||||||
|
pub async fn single_room_info(
|
||||||
|
client: MatrixClientExtractor,
|
||||||
|
path: web::Path<RoomIdInPath>,
|
||||||
|
) -> HttpResult {
|
||||||
|
Ok(match client.client.client.get_room(&path.id) {
|
||||||
|
None => HttpResponse::NotFound().json("Room not found"),
|
||||||
|
Some(r) => HttpResponse::Ok().json(APIRoomInfo::from_room(&r).await?),
|
||||||
|
})
|
||||||
|
}
|
||||||
1
matrixgw_backend/src/controllers/matrix/mod.rs
Normal file
1
matrixgw_backend/src/controllers/matrix/mod.rs
Normal file
@@ -0,0 +1 @@
|
|||||||
|
pub mod matrix_room_controller;
|
||||||
@@ -3,6 +3,7 @@ use actix_web::{HttpResponse, ResponseError};
|
|||||||
use std::error::Error;
|
use std::error::Error;
|
||||||
|
|
||||||
pub mod auth_controller;
|
pub mod auth_controller;
|
||||||
|
pub mod matrix;
|
||||||
pub mod matrix_link_controller;
|
pub mod matrix_link_controller;
|
||||||
pub mod matrix_sync_thread_controller;
|
pub mod matrix_sync_thread_controller;
|
||||||
pub mod server_controller;
|
pub mod server_controller;
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ use actix_web::{App, HttpServer, web};
|
|||||||
use matrixgw_backend::app_config::AppConfig;
|
use matrixgw_backend::app_config::AppConfig;
|
||||||
use matrixgw_backend::broadcast_messages::BroadcastMessage;
|
use matrixgw_backend::broadcast_messages::BroadcastMessage;
|
||||||
use matrixgw_backend::constants;
|
use matrixgw_backend::constants;
|
||||||
|
use matrixgw_backend::controllers::matrix::matrix_room_controller;
|
||||||
use matrixgw_backend::controllers::{
|
use matrixgw_backend::controllers::{
|
||||||
auth_controller, matrix_link_controller, matrix_sync_thread_controller, server_controller,
|
auth_controller, matrix_link_controller, matrix_sync_thread_controller, server_controller,
|
||||||
tokens_controller, ws_controller,
|
tokens_controller, ws_controller,
|
||||||
@@ -134,6 +135,15 @@ async fn main() -> std::io::Result<()> {
|
|||||||
web::get().to(matrix_sync_thread_controller::status),
|
web::get().to(matrix_sync_thread_controller::status),
|
||||||
)
|
)
|
||||||
.service(web::resource("/api/ws").route(web::get().to(ws_controller::ws)))
|
.service(web::resource("/api/ws").route(web::get().to(ws_controller::ws)))
|
||||||
|
// Matrix room controller
|
||||||
|
.route(
|
||||||
|
"/api/matrix/room/joined",
|
||||||
|
web::get().to(matrix_room_controller::joined_rooms),
|
||||||
|
)
|
||||||
|
.route(
|
||||||
|
"/api/matrix/room/{id}",
|
||||||
|
web::get().to(matrix_room_controller::single_room_info),
|
||||||
|
)
|
||||||
})
|
})
|
||||||
.workers(4)
|
.workers(4)
|
||||||
.bind(&AppConfig::get().listen_address)?
|
.bind(&AppConfig::get().listen_address)?
|
||||||
|
|||||||
@@ -91,7 +91,7 @@ pub struct FinishMatrixAuth {
|
|||||||
pub struct MatrixClient {
|
pub struct MatrixClient {
|
||||||
manager: ActorRef<MatrixManagerMsg>,
|
manager: ActorRef<MatrixManagerMsg>,
|
||||||
pub email: UserEmail,
|
pub email: UserEmail,
|
||||||
client: Client,
|
pub client: Client,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl MatrixClient {
|
impl MatrixClient {
|
||||||
|
|||||||
Reference in New Issue
Block a user