jmug/stoatchat
1
0
Fork 1
mirror of https://github.com/stoatchat/stoatchat.git synced 2026-07-14 13:36:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Servers: Create and delete invites. Create and fetch servers.

Browse Source
This commit is contained in:
Paul
2021-06-05 22:41:47 +01:00
parent 681b2b8ab6
commit f9fbe54b17
16 changed files with 281 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/database/entities/channel.rs
View File

@@ -186,6 +186,27 @@ impl Channel {
with: "channel",
})?;
// Remove from server object.
if let Channel::TextChannel { server, .. } = &self {
get_collection("servers")
.update_one(
doc !{
"_id": server
},
doc! {
"$pull": {
"channels": id
}
},
None,
)
.await
.map_err(|_| Error::DatabaseError {
operation: "update_one",
with: "servers",
})?;
}
ClientboundNotification::ChannelDelete { id: id.to_string() }.publish(id.to_string());
if let Channel::Group { icon, .. } = self {

8
src/database/entities/invites.rs
View File

@@ -13,6 +13,7 @@ pub enum Invite {
Server {
#[serde(rename = "_id")]
code: String,
server: String,
creator: String,
channel: String,
},
@@ -35,6 +36,13 @@ impl Invite {
}
}
pub fn creator(&self) -> &String {
match &self {
Invite::Server { creator, .. } => creator,
Invite::Group { creator, .. } => creator,
}
}
pub async fn get(code: &str) -> Result<Invite> {
let doc = get_collection("invites")
.find_one(doc! { "_id": code }, None)

125
src/database/entities/server.rs
View File

@@ -1,9 +1,11 @@
use crate::database::*;
use crate::notifications::events::ClientboundNotification;
use crate::util::result::{Error, Result};
use mongodb::bson::Document;
use mongodb::bson::doc;
use mongodb::bson::from_document;
use futures::StreamExt;
use mongodb::bson::to_document;
use mongodb::options::FindOptions;
use rocket_contrib::json::JsonValue;
use serde::{Deserialize, Serialize};
@@ -26,7 +28,8 @@ pub struct Member {
#[derive(Serialize, Deserialize, Debug, Clone)]
pub struct Ban {
pub id: String,
#[serde(rename = "_id")]
pub id: MemberCompositeKey,
pub reason: String,
}
@@ -84,7 +87,123 @@ impl Server {
}
pub async fn delete(&self) -> Result<()> {
unimplemented!()
let messages = get_collection("messages");
// Check if there are any attachments we need to delete.
let message_ids = messages
.find(
doc! {
"server": &self.id,
"attachment": {
"$exists": 1
}
},
FindOptions::builder().projection(doc! { "_id": 1 }).build(),
)
.await
.map_err(|_| Error::DatabaseError {
operation: "fetch_many",
with: "messages",
})?
.filter_map(async move |s| s.ok())
.collect::<Vec<Document>>()
.await
.into_iter()
.filter_map(|x| x.get_str("_id").ok().map(|x| x.to_string()))
.collect::<Vec<String>>();
// If we found any, mark them as deleted.
if message_ids.len() > 0 {
get_collection("attachments")
.update_many(
doc! {
"message_id": {
"$in": message_ids
}
},
doc! {
"$set": {
"deleted": true
}
},
None,
)
.await
.map_err(|_| Error::DatabaseError {
operation: "update_many",
with: "attachments",
})?;
}
// And then delete said messages.
messages
.delete_many(
doc! {
"server": &self.id
},
None,
)
.await
.map_err(|_| Error::DatabaseError {
operation: "delete_many",
with: "messages",
})?;
// Delete all channels, members, bans and invites.
for with in [ "channels", "invites" ] {
get_collection(with)
.delete_many(
doc! {
"server": &self.id
},
None,
)
.await
.map_err(|_| Error::DatabaseError {
operation: "delete_many",
with,
})?;
}
for with in [ "server_members", "server_bans" ] {
get_collection(with)
.delete_many(
doc! {
"_id.server": &self.id
},
None,
)
.await
.map_err(|_| Error::DatabaseError {
operation: "delete_many",
with,
})?;
}
get_collection("servers")
.delete_one(
doc! {
"_id": &self.id
},
None,
)
.await
.map_err(|_| Error::DatabaseError {
operation: "delete_one",
with: "server",
})?;
ClientboundNotification::ServerDelete { id: self.id.clone() }.publish(self.id.clone());
if let Some(attachment) = &self.icon {
attachment.delete().await?;
}
if let Some(attachment) = &self.banner {
attachment.delete().await?;
}
Ok(())
}
pub async fn join_member(&self, id: &str) -> Result<()> {

2
src/database/guards/reference.rs
View File

@@ -38,7 +38,7 @@ impl Ref {
operation: "find_one",
with: &collection,
})?
.ok_or_else(|| Error::UnknownUser)?;
.ok_or_else(|| Error::NotFound)?;
Ok(from_document::<T>(doc).map_err(|_| Error::DatabaseError {
operation: "from_document",

1
src/routes/channels/delete_channel.rs
View File

@@ -11,6 +11,7 @@ pub async fn req(user: User, target: Ref) -> Result<()> {
.with_channel(&target)
.for_channel()
.await?;
if !perm.get_view() {
Err(Error::MissingPermission)?
}

73
src/routes/channels/edit_channel.rs
View File

@@ -45,7 +45,8 @@ pub async fn req(user: User, target: Ref, data: Json<Data>) -> Result<()> {
}
match &target {
Channel::Group { id, icon, .. } => {
Channel::Group { id, icon, .. } |
Channel::TextChannel { id, icon, .. } => {
let mut set = doc! {};
let mut unset = doc! {};
@@ -107,42 +108,44 @@ pub async fn req(user: User, target: Ref, data: Json<Data>) -> Result<()> {
}
.publish(id.clone());
if let Some(name) = data.name {
Message::create(
"00000000000000000000000000".to_string(),
id.clone(),
Content::SystemMessage(SystemMessage::ChannelRenamed {
name,
by: user.id.clone(),
}),
)
.publish(&target)
.await
.ok();
}
if let Channel::Group { .. } = &target {
if let Some(name) = data.name {
Message::create(
"00000000000000000000000000".to_string(),
id.clone(),
Content::SystemMessage(SystemMessage::ChannelRenamed {
name,
by: user.id.clone(),
}),
)
.publish(&target)
.await
.ok();
}
if let Some(_) = data.description {
Message::create(
"00000000000000000000000000".to_string(),
id.clone(),
Content::SystemMessage(SystemMessage::ChannelDescriptionChanged {
by: user.id.clone(),
}),
)
.publish(&target)
.await
.ok();
}
if let Some(_) = data.description {
Message::create(
"00000000000000000000000000".to_string(),
id.clone(),
Content::SystemMessage(SystemMessage::ChannelDescriptionChanged {
by: user.id.clone(),
}),
)
.publish(&target)
.await
.ok();
}
if let Some(_) = data.icon {
Message::create(
"00000000000000000000000000".to_string(),
id.clone(),
Content::SystemMessage(SystemMessage::ChannelIconChanged { by: user.id }),
)
.publish(&target)
.await
.ok();
if let Some(_) = data.icon {
Message::create(
"00000000000000000000000000".to_string(),
id.clone(),
Content::SystemMessage(SystemMessage::ChannelIconChanged { by: user.id }),
)
.publish(&target)
.await
.ok();
}
}
if remove_icon {

1
src/routes/channels/fetch_channel.rs
View File

@@ -11,6 +11,7 @@ pub async fn req(user: User, target: Ref) -> Result<JsonValue> {
.with_channel(&target)
.for_channel()
.await?;
if !perm.get_view() {
Err(Error::MissingPermission)?
}

5
src/routes/channels/invite_channel.rs → src/routes/channels/invite_create.rs
View File

@@ -13,7 +13,7 @@ lazy_static! {
];
}
#[post("/<target>/invite")]
#[post("/<target>/invites")]
pub async fn req(user: User, target: Ref) -> Result<JsonValue> {
let target = target.fetch_channel().await?;
let perm = permissions::PermissionCalculator::new(&user)
@@ -30,10 +30,11 @@ pub async fn req(user: User, target: Ref) -> Result<JsonValue> {
Channel::Group { .. } => {
unimplemented!()
}
Channel::TextChannel { id, .. } => {
Channel::TextChannel { id, server, .. } => {
Invite::Server {
code: code.clone(),
creator: user.id,
server: server.clone(),
channel: id.clone(),
}
.save()

4
src/routes/channels/mod.rs
View File

@@ -7,7 +7,7 @@ mod fetch_members;
mod group_add_member;
mod group_create;
mod group_remove_member;
mod invite_channel;
mod invite_create;
mod join_call;
mod message_delete;
mod message_edit;
@@ -22,7 +22,7 @@ pub fn routes() -> Vec<Route> {
fetch_members::req,
delete_channel::req,
edit_channel::req,
invite_channel::req,
invite_create::req,
message_send::req,
message_query::req,
message_query_stale::req,

28
src/routes/invites/invite_delete.rs Normal file
View File

@@ -0,0 +1,28 @@
use crate::database::*;
use crate::util::result::{Error, Result};
#[delete("/<target>")]
pub async fn req(user: User, target: Ref) -> Result<()> {
let target = target.fetch_invite().await?;
if target.creator() == &user.id {
target.delete().await
} else {
match &target {
Invite::Server { server, .. } => {
let server = Ref::from_unchecked(server.clone()).fetch_server().await?;
let perm = permissions::PermissionCalculator::new(&user)
.with_server(&server)
.for_server()
.await?;
if !perm.get_manage_server() {
return Err(Error::MissingPermission);
}
target.delete().await
},
_ => unreachable!()
}
}
}

1
src/routes/invites/invite_join.rs
View File

@@ -22,6 +22,7 @@ pub async fn req(user: User, target: Ref) -> Result<JsonValue> {
server.join_member(&user.id).await?;
Ok(json!({
"type": "Server",
"channel": channel,
"server": server
}))

3
src/routes/invites/mod.rs
View File

@@ -1,8 +1,9 @@
use rocket::Route;
mod invite_delete;
mod invite_fetch;
mod invite_join;
pub fn routes() -> Vec<Route> {
routes![invite_fetch::req, invite_join::req]
routes![invite_fetch::req, invite_join::req, invite_delete::req]
}

2
src/routes/servers/mod.rs
View File

@@ -2,6 +2,7 @@ use rocket::Route;
mod server_create;
mod server_delete;
mod server_fetch;
mod server_edit;
mod channel_create;
@@ -10,6 +11,7 @@ pub fn routes() -> Vec<Route> {
routes![
server_create::req,
server_delete::req,
server_fetch::req,
server_edit::req,
channel_create::req
]

40
src/routes/servers/server_delete.rs
View File

@@ -1,26 +1,42 @@
use crate::database::*;
use crate::util::result::{Error, Result};
use crate::notifications::events::ClientboundNotification;
use mongodb::bson::doc;
#[delete("/<target>")]
pub async fn req(user: User, target: Ref) -> Result<()> {
let target = target.fetch_server().await?;
/*let perm = permissions::PermissionCalculator::new(&user)
.with_channel(&target)
.for_channel()
let perm = permissions::PermissionCalculator::new(&user)
.with_server(&target)
.for_server()
.await?;
if !perm.get_view() {
Err(Error::MissingPermission)?
}*/
return Err(Error::MissingPermission);
}
// ! FIXME: either delete server if owner
// ! OR leave server if member
if user.id == target.owner {
target.delete().await
} else {
get_collection("server_members")
.delete_one(
doc! {
// also need to delete server invites
// and members
// and bans
},
None
)
.await
.map_err(|_| Error::DatabaseError {
operation: "delete_one",
with: "server_member"
})?;
target.delete().await
ClientboundNotification::ServerMemberLeave {
id: target.id.clone(),
user: user.id
}.publish(target.id);
Ok(())
}
}

20
src/routes/servers/server_fetch.rs Normal file
View File

@@ -0,0 +1,20 @@
use crate::database::*;
use crate::util::result::{Error, Result};
use rocket_contrib::json::JsonValue;
#[get("/<target>")]
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)?
}
Ok(json!(target))
}

4
src/util/result.rs
View File

@@ -38,7 +38,7 @@ pub enum Error {
// ? Server related errors.
UnknownServer,
// ? General errors.
TooManyIds,
FailedValidation {
@@ -54,6 +54,7 @@ pub enum Error {
InvalidCredentials,
DuplicateNonce,
VosoUnavailable,
NotFound,
NoEffect,
}
@@ -96,6 +97,7 @@ impl<'r> Responder<'r, 'static> for Error {
Error::InvalidCredentials => Status::Forbidden,
Error::DuplicateNonce => Status::Conflict,
Error::VosoUnavailable => Status::BadRequest,
Error::NotFound => Status::NotFound,
Error::NoEffect => Status::Ok,
};