Servers: Add route for fetching members.
This commit is contained in:
@@ -42,9 +42,6 @@ pub struct Server {
|
|||||||
pub owner: String,
|
pub owner: String,
|
||||||
|
|
||||||
pub name: String,
|
pub name: String,
|
||||||
// pub default_permissions: u32,
|
|
||||||
// pub invites: Vec<Invite>,
|
|
||||||
// pub bans: Vec<Ban>,
|
|
||||||
pub channels: Vec<String>,
|
pub channels: Vec<String>,
|
||||||
|
|
||||||
#[serde(skip_serializing_if = "Option::is_none")]
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
@@ -90,6 +87,8 @@ impl Server {
|
|||||||
let messages = get_collection("messages");
|
let messages = get_collection("messages");
|
||||||
|
|
||||||
// Check if there are any attachments we need to delete.
|
// Check if there are any attachments we need to delete.
|
||||||
|
// ! FIXME: make this generic and merge with channel delete
|
||||||
|
// ! e.g. delete_channel(filter: doc!)
|
||||||
let message_ids = messages
|
let message_ids = messages
|
||||||
.find(
|
.find(
|
||||||
doc! {
|
doc! {
|
||||||
@@ -206,6 +205,32 @@ impl Server {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub async fn fetch_members(id: &str) -> Result<Vec<String>> {
|
||||||
|
Ok(get_collection("server_members")
|
||||||
|
.find(
|
||||||
|
doc! {
|
||||||
|
"_id.server": id
|
||||||
|
},
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
.map_err(|_| Error::DatabaseError {
|
||||||
|
operation: "find",
|
||||||
|
with: "server_members",
|
||||||
|
})?
|
||||||
|
.filter_map(async move |s| s.ok())
|
||||||
|
.collect::<Vec<Document>>()
|
||||||
|
.await
|
||||||
|
.into_iter()
|
||||||
|
.filter_map(|x| {
|
||||||
|
x.get_document("_id")
|
||||||
|
.ok()
|
||||||
|
.map(|i| i.get_str("user").ok().map(|x| x.to_string()))
|
||||||
|
})
|
||||||
|
.flatten()
|
||||||
|
.collect::<Vec<String>>())
|
||||||
|
}
|
||||||
|
|
||||||
pub async fn join_member(&self, id: &str) -> Result<()> {
|
pub async fn join_member(&self, id: &str) -> Result<()> {
|
||||||
get_collection("server_members")
|
get_collection("server_members")
|
||||||
.insert_one(
|
.insert_one(
|
||||||
|
|||||||
@@ -184,6 +184,7 @@ impl User {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Utility function for fetching multiple users from the perspective of one.
|
/// Utility function for fetching multiple users from the perspective of one.
|
||||||
|
/// Assumes user has a mutual connection with others.
|
||||||
pub async fn fetch_multiple_users(&self, user_ids: Vec<String>) -> Result<Vec<User>> {
|
pub async fn fetch_multiple_users(&self, user_ids: Vec<String>) -> Result<Vec<User>> {
|
||||||
let mut users = vec![];
|
let mut users = vec![];
|
||||||
let mut cursor = get_collection("users")
|
let mut cursor = get_collection("users")
|
||||||
|
|||||||
@@ -166,30 +166,7 @@ pub async fn prehandle_hook(notification: &ClientboundNotification) -> Result<()
|
|||||||
}
|
}
|
||||||
Channel::TextChannel { server, .. } => {
|
Channel::TextChannel { server, .. } => {
|
||||||
// ! FIXME: write a better algorithm?
|
// ! FIXME: write a better algorithm?
|
||||||
let members = get_collection("server_members")
|
let members = Server::fetch_members(server).await?;
|
||||||
.find(
|
|
||||||
doc! {
|
|
||||||
"_id.server": server
|
|
||||||
},
|
|
||||||
None,
|
|
||||||
)
|
|
||||||
.await
|
|
||||||
.map_err(|_| Error::DatabaseError {
|
|
||||||
operation: "find",
|
|
||||||
with: "server_members",
|
|
||||||
})?
|
|
||||||
.filter_map(async move |s| s.ok())
|
|
||||||
.collect::<Vec<Document>>()
|
|
||||||
.await
|
|
||||||
.into_iter()
|
|
||||||
.filter_map(|x| {
|
|
||||||
x.get_document("_id")
|
|
||||||
.ok()
|
|
||||||
.map(|i| i.get_str("user").ok().map(|x| x.to_string()))
|
|
||||||
})
|
|
||||||
.flatten()
|
|
||||||
.collect::<Vec<String>>();
|
|
||||||
|
|
||||||
for member in members {
|
for member in members {
|
||||||
subscribe_if_exists(member.clone(), channel_id.to_string()).ok();
|
subscribe_if_exists(member.clone(), channel_id.to_string()).ok();
|
||||||
}
|
}
|
||||||
|
|||||||
23
src/routes/servers/members_fetch.rs
Normal file
23
src/routes/servers/members_fetch.rs
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
use crate::database::*;
|
||||||
|
use crate::util::result::{Error, Result};
|
||||||
|
|
||||||
|
use rocket_contrib::json::JsonValue;
|
||||||
|
|
||||||
|
// ! FIXME: this is a temporary route while permissions are being worked on.
|
||||||
|
|
||||||
|
#[get("/<target>/members")]
|
||||||
|
pub async fn req(user: User, target: Ref) -> Result<JsonValue> {
|
||||||
|
let target = target.fetch_server().await?;
|
||||||
|
|
||||||
|
let perm = permissions::PermissionCalculator::new(&user)
|
||||||
|
.with_server(&target)
|
||||||
|
.for_server()
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
if !perm.get_view() {
|
||||||
|
Err(Error::MissingPermission)?
|
||||||
|
}
|
||||||
|
|
||||||
|
let members = Server::fetch_members(&target.id).await?;
|
||||||
|
Ok(json!(user.fetch_multiple_users(members).await?))
|
||||||
|
}
|
||||||
@@ -7,12 +7,15 @@ mod server_edit;
|
|||||||
|
|
||||||
mod channel_create;
|
mod channel_create;
|
||||||
|
|
||||||
|
mod members_fetch;
|
||||||
|
|
||||||
pub fn routes() -> Vec<Route> {
|
pub fn routes() -> Vec<Route> {
|
||||||
routes![
|
routes![
|
||||||
server_create::req,
|
server_create::req,
|
||||||
server_delete::req,
|
server_delete::req,
|
||||||
server_fetch::req,
|
server_fetch::req,
|
||||||
server_edit::req,
|
server_edit::req,
|
||||||
channel_create::req
|
channel_create::req,
|
||||||
|
members_fetch::req
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user