HMC/handmade-revolt-backend
6
0
Fork 0
forked from jmug/stoatchat
Code Pull Requests Actions Packages Releases 2 Activity

Add channels field to guild object.

Browse Source
This commit is contained in:
Paul Makles
2020-08-12 11:45:05 +02:00
parent a8eb403280
commit 74b4238f04
9 changed files with 106 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/routes/channel.rs
View File

@@ -138,11 +138,6 @@ pub fn channel(user: User, target: Channel) -> Option<Response> {
"recipients": target.recipients,
}))),
1 => {
/*if let Some(info) = target.fetch_data(doc! {
"name": 1,
"description": 1,
"owner": 1,
}) {*/
Some(Response::Success(json!({
"id": target.id,
"type": target.channel_type,
@@ -152,15 +147,8 @@ pub fn channel(user: User, target: Channel) -> Option<Response> {
"owner": target.owner,
"description": target.description,
})))
/*} else {
None
}*/
}
2 => {
/*if let Some(info) = target.fetch_data(doc! {
"name": 1,
"description": 1,
}) {*/
Some(Response::Success(json!({
"id": target.id,
"type": target.channel_type,
@@ -168,9 +156,6 @@ pub fn channel(user: User, target: Channel) -> Option<Response> {
"name": target.name,
"description": target.description,
})))
/*} else {
None
}*/
}
_ => unreachable!(),
}
@@ -447,7 +432,8 @@ pub fn delete(user: User, target: Channel) -> Option<Response> {
"$pull": {
"invites": {
"channel": &target.id
}
},
"channels": &target.id
}
},
None,

72
src/routes/guild.rs
View File

@@ -2,7 +2,7 @@ use super::channel::ChannelType;
use super::Response;
use crate::database::guild::{fetch_member as get_member, get_invite, Guild, MemberKey};
use crate::database::{
self, channel::fetch_channel, channel::Channel, Permission, PermissionCalculator, user::User
self, channel::{fetch_channel, fetch_channels}, channel::Channel, Permission, PermissionCalculator, user::User
};
use crate::notifications::{
self,
@@ -10,7 +10,7 @@ use crate::notifications::{
};
use crate::util::gen_token;
use mongodb::bson::{doc, from_bson, Bson};
use mongodb::bson::{doc, Bson};
use mongodb::options::{FindOneOptions, FindOptions};
use rocket::request::Form;
use rocket_contrib::json::Json;
@@ -95,26 +95,15 @@ pub fn my_guilds(user: User) -> Response {
pub fn guild(user: User, target: Guild) -> Option<Response> {
with_permissions!(user, target);
let col = database::get_collection("channels");
match col.find(
doc! {
"type": 2,
"guild": &target.id,
},
None,
) {
match fetch_channels(&target.channels) {
Ok(results) => {
let mut channels = vec![];
for item in results {
if let Ok(entry) = item {
if let Ok(channel) = from_bson(Bson::Document(entry)) as Result<Channel, _> {
channels.push(json!({
"id": channel.id,
"name": channel.name,
"description": channel.description,
}));
}
}
channels.push(json!({
"id": item.id,
"name": item.name,
"description": item.description,
}));
}
Some(Response::Success(json!({
@@ -127,7 +116,7 @@ pub fn guild(user: User, target: Guild) -> Option<Response> {
}
Err(_) => Some(Response::InternalServerError(
json!({ "error": "Failed to fetch channels." }),
)),
))
}
}
@@ -305,20 +294,39 @@ pub fn create_channel(user: User, target: Guild, info: Json<CreateChannel>) -> O
)
.is_ok()
{
notifications::send_message_threaded(
None,
target.id.clone(),
Notification::guild_channel_create(ChannelCreate {
id: target.id.clone(),
channel: id.clone(),
name: name.clone(),
description: description.clone(),
}),
);
if database::get_collection("guilds")
.update_one(
doc! {
"_id": &target.id
},
doc! {
"$addToSet": {
"channels": &id
}
},
None
)
.is_ok()
{
notifications::send_message_threaded(
None,
target.id.clone(),
Notification::guild_channel_create(ChannelCreate {
id: target.id.clone(),
channel: id.clone(),
name: name.clone(),
description: description.clone(),
}),
);
Some(Response::Success(json!({ "id": &id })))
Some(Response::Success(json!({ "id": &id })))
} else {
Some(Response::InternalServerError(
json!({ "error": "Couldn't save channel list." }),
))
}
} else {
Some(Response::BadRequest(
Some(Response::InternalServerError(
json!({ "error": "Couldn't create channel." }),
))
}

4
src/routes/root.rs
View File

@@ -6,11 +6,11 @@ use mongodb::bson::doc;
#[get("/")]
pub fn root() -> Response {
Response::Success(json!({
"revolt": "0.2.7",
"revolt": "0.2.8",
"version": {
"major": 0,
"minor": 2,
"patch": 7
"patch": 8
}
}))
}