jmug/stoatchat
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Added groups + ran rust fmt / clippy.

Browse Source
This commit is contained in:
Paul Makles
2020-04-09 15:41:26 +01:00
parent 82f6e6215f
commit e6ed46af82
11 changed files with 192 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/routes/account.rs
View File

@@ -7,7 +7,7 @@ use bson::{bson, doc, from_bson, Bson::UtcDatetime};
use chrono::prelude::*;
use database::user::User;
use rand::{distributions::Alphanumeric, Rng};
use rocket_contrib::json::{Json, JsonValue};
use rocket_contrib::json::Json;
use serde::{Deserialize, Serialize};
use ulid::Ulid;
use validator::validate_email;
@@ -167,7 +167,7 @@ pub fn resend_email(info: Json<Resend>) -> Response {
doc! { "email_verification.target": info.email.clone() },
None,
)
.expect("Failed user lookup")
.expect("Failed user lookup.")
{
let user: User = from_bson(bson::Bson::Document(u)).expect("Failed to unwrap user.");
let ev = user.email_verification;

102
src/routes/channel.rs
View File

@@ -1,15 +1,21 @@
use super::Response;
use crate::database::{self, message::Message, Permission, PermissionCalculator};
use crate::database::{
self, get_relationship_internal, message::Message, Permission, PermissionCalculator,
Relationship,
};
use crate::guards::auth::UserRef;
use crate::guards::channel::ChannelRef;
use bson::{bson, doc, from_bson, Bson::UtcDatetime};
use bson::{bson, doc, from_bson, Bson, Bson::UtcDatetime};
use chrono::prelude::*;
use hashbrown::HashSet;
use num_enum::TryFromPrimitive;
use rocket_contrib::json::Json;
use serde::{Deserialize, Serialize};
use ulid::Ulid;
const MAXGROUPSIZE: usize = 50;
#[derive(Debug, TryFromPrimitive)]
#[repr(usize)]
pub enum ChannelType {
@@ -32,6 +38,71 @@ macro_rules! with_permissions {
}};
}
#[derive(Serialize, Deserialize)]
pub struct CreateGroup {
name: String,
nonce: String,
users: Vec<String>,
}
/// create a new group
#[post("/create", data = "<info>")]
pub fn create_group(user: UserRef, info: Json<CreateGroup>) -> Response {
let name: String = info.name.chars().take(32).collect();
let nonce: String = info.nonce.chars().take(32).collect();
let mut set = HashSet::new();
set.insert(user.id.clone());
for item in &info.users {
set.insert(item.clone());
}
if set.len() > MAXGROUPSIZE {
return Response::BadRequest(json!({ "error": "Maximum group size is 50." }));
}
let col = database::get_collection("channels");
if let Some(_) = col.find_one(doc! { "nonce": nonce.clone() }, None).unwrap() {
return Response::BadRequest(json!({ "error": "Group already created!" }));
}
let relationships = user.fetch_relationships();
let mut users = vec![];
for item in set {
if let Some(target) = UserRef::from(item) {
if get_relationship_internal(&user.id, &target.id, &relationships)
!= Relationship::Friend
{
return Response::BadRequest(json!({ "error": "Not friends with user(s)." }));
}
users.push(Bson::String(target.id));
} else {
return Response::BadRequest(json!({ "error": "Specified non-existant user(s)." }));
}
}
let id = Ulid::new().to_string();
if col
.insert_one(
doc! {
"_id": id.clone(),
"nonce": nonce,
"type": ChannelType::GROUPDM as u32,
"recipients": users,
"name": name,
},
None,
)
.is_ok()
{
Response::Success(json!({ "id": id }))
} else {
Response::InternalServerError(json!({ "error": "Failed to create guild channel." }))
}
}
/// fetch channel information
#[get("/<target>")]
pub fn channel(user: UserRef, target: ChannelRef) -> Option<Response> {
@@ -71,20 +142,25 @@ pub fn delete(user: UserRef, target: ChannelRef) -> Option<Response> {
let permissions = with_permissions!(user, target);
if !permissions.get_manage_channels() {
return Some(Response::LackingPermission(Permission::MANAGE_CHANNELS));
return Some(Response::LackingPermission(Permission::ManageChannels));
}
let col = database::get_collection("channels");
match target.channel_type {
0 => {
if col.update_one(
doc! { "_id": target.id },
doc! { "$set": { "active": false } },
None,
).is_ok() {
if col
.update_one(
doc! { "_id": target.id },
doc! { "$set": { "active": false } },
None,
)
.is_ok()
{
Some(Response::Result(super::Status::Ok))
} else {
Some(Response::InternalServerError(json!({ "error": "Failed to close channel." })))
Some(Response::InternalServerError(
json!({ "error": "Failed to close channel." }),
))
}
}
1 => {
@@ -109,7 +185,7 @@ pub fn messages(user: UserRef, target: ChannelRef) -> Option<Response> {
let permissions = with_permissions!(user, target);
if !permissions.get_read_messages() {
return Some(Response::LackingPermission(Permission::READ_MESSAGES));
return Some(Response::LackingPermission(Permission::ReadMessages));
}
let col = database::get_collection("messages");
@@ -146,7 +222,7 @@ pub fn send_message(
let permissions = with_permissions!(user, target);
if !permissions.get_send_messages() {
return Some(Response::LackingPermission(Permission::SEND_MESSAGES));
return Some(Response::LackingPermission(Permission::SendMessages));
}
let content: String = message.content.chars().take(2000).collect();
@@ -214,7 +290,7 @@ pub fn get_message(user: UserRef, target: ChannelRef, message: Message) -> Optio
let permissions = with_permissions!(user, target);
if !permissions.get_read_messages() {
return Some(Response::LackingPermission(Permission::READ_MESSAGES));
return Some(Response::LackingPermission(Permission::ReadMessages));
}
let prev =
@@ -317,7 +393,7 @@ pub fn delete_message(user: UserRef, target: ChannelRef, message: Message) -> Op
if !permissions.get_manage_messages() {
if message.author != user.id {
return Some(Response::LackingPermission(Permission::MANAGE_MESSAGES));
return Some(Response::LackingPermission(Permission::ManageMessages));
}
}

7
src/routes/guild.rs
View File

@@ -3,12 +3,11 @@ use crate::database::{
self,
channel::Channel,
guild::{find_member_permissions, Guild},
user::User,
};
use crate::guards::auth::UserRef;
use bson::{bson, doc, from_bson, Bson};
use rocket_contrib::json::{Json, JsonValue};
use rocket_contrib::json::Json;
use serde::{Deserialize, Serialize};
use ulid::Ulid;
@@ -126,7 +125,7 @@ pub fn create_guild(user: UserRef, info: Json<CreateGuild>) -> Response {
let id = Ulid::new().to_string();
let channel_id = Ulid::new().to_string();
if let Err(_) = channels.insert_one(
if channels.insert_one(
doc! {
"_id": channel_id.clone(),
"type": ChannelType::GUILDCHANNEL as u32,
@@ -134,7 +133,7 @@ pub fn create_guild(user: UserRef, info: Json<CreateGuild>) -> Response {
"guild": id.clone(),
},
None,
) {
).is_err() {
return Response::InternalServerError(
json!({ "error": "Failed to create guild channel." }),
);

1
src/routes/mod.rs
View File

@@ -87,6 +87,7 @@ pub fn mount(rocket: Rocket) -> Rocket {
.mount(
"/api/channels",
routes![
channel::create_group,
channel::channel,
channel::delete,
channel::messages,

30
src/routes/user.rs
View File

@@ -64,7 +64,7 @@ pub fn lookup(user: UserRef, query: Json<Query>) -> Response {
if let Ok(doc) = item {
let id = doc.get_str("id").unwrap();
results.push(json!({
"id": id.clone(),
"id": id,
"username": doc.get_str("username").unwrap(),
"relationship": get_relationship_internal(&user.id, &id, &relationships) as u8
}));
@@ -174,11 +174,11 @@ pub fn add_friend(user: UserRef, target: UserRef) -> Response {
let col = database::get_collection("users");
match relationship {
Relationship::FRIEND => Response::BadRequest(json!({ "error": "Already friends." })),
Relationship::OUTGOING => {
Relationship::Friend => Response::BadRequest(json!({ "error": "Already friends." })),
Relationship::Outgoing => {
Response::BadRequest(json!({ "error": "Already sent a friend request." }))
}
Relationship::INCOMING => {
Relationship::Incoming => {
if col
.update_one(
doc! {
@@ -187,7 +187,7 @@ pub fn add_friend(user: UserRef, target: UserRef) -> Response {
},
doc! {
"$set": {
"relations.$.status": Relationship::FRIEND as i32
"relations.$.status": Relationship::Friend as i32
}
},
None,
@@ -202,14 +202,14 @@ pub fn add_friend(user: UserRef, target: UserRef) -> Response {
},
doc! {
"$set": {
"relations.$.status": Relationship::FRIEND as i32
"relations.$.status": Relationship::Friend as i32
}
},
None,
)
.is_ok()
{
Response::Success(json!({ "status": Relationship::FRIEND as u8 }))
Response::Success(json!({ "status": Relationship::Friend as u8 }))
} else {
Response::InternalServerError(
json!({ "error": "Failed to commit! Try re-adding them as a friend." }),
@@ -221,10 +221,10 @@ pub fn add_friend(user: UserRef, target: UserRef) -> Response {
)
}
}
Relationship::BLOCKED => {
Relationship::Blocked => {
Response::BadRequest(json!({ "error": "You have blocked this person." }))
}
Relationship::BLOCKEDOTHER => {
Relationship::BlockedOther => {
Response::Conflict(json!({ "error": "You have been blocked by this person." }))
}
Relationship::NONE => {
@@ -237,7 +237,7 @@ pub fn add_friend(user: UserRef, target: UserRef) -> Response {
"$push": {
"relations": {
"id": target.id.clone(),
"status": Relationship::OUTGOING as i32
"status": Relationship::Outgoing as i32
}
}
},
@@ -254,7 +254,7 @@ pub fn add_friend(user: UserRef, target: UserRef) -> Response {
"$push": {
"relations": {
"id": user.id,
"status": Relationship::INCOMING as i32
"status": Relationship::Incoming as i32
}
}
},
@@ -262,7 +262,7 @@ pub fn add_friend(user: UserRef, target: UserRef) -> Response {
)
.is_ok()
{
Response::Success(json!({ "status": Relationship::OUTGOING as u8 }))
Response::Success(json!({ "status": Relationship::Outgoing as u8 }))
} else {
Response::InternalServerError(
json!({ "error": "Failed to commit! Try re-adding them as a friend." }),
@@ -287,7 +287,7 @@ pub fn remove_friend(user: UserRef, target: UserRef) -> Response {
let col = database::get_collection("users");
match relationship {
Relationship::FRIEND | Relationship::OUTGOING | Relationship::INCOMING => {
Relationship::Friend | Relationship::Outgoing | Relationship::Incoming => {
if col
.update_one(
doc! {
@@ -332,8 +332,8 @@ pub fn remove_friend(user: UserRef, target: UserRef) -> Response {
)
}
}
Relationship::BLOCKED
| Relationship::BLOCKEDOTHER
Relationship::Blocked
| Relationship::BlockedOther
| Relationship::NONE
| Relationship::SELF => Response::BadRequest(json!({ "error": "This has no effect." })),
}