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

Re-implement user relationships.

Browse Source
This commit is contained in:
Paul Makles
2020-12-29 16:32:22 +00:00
parent 84d09db9b3
commit c704f13d72
14 changed files with 436 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/routes/onboard/complete.rs
View File

@@ -7,10 +7,15 @@ use rocket_contrib::json::Json;
use rauth::auth::Session;
use validator::Validate;
use mongodb::bson::doc;
use regex::Regex;
lazy_static! {
static ref RE_USERNAME: Regex = Regex::new(r"^[a-zA-Z0-9-_]+$").unwrap();
}
#[derive(Validate, Serialize, Deserialize)]
pub struct Data {
#[validate(length(min = 2, max = 32))]
#[validate(length(min = 2, max = 32), regex = "RE_USERNAME")]
username: String
}

84
src/routes/users/add_friend.rs Normal file
View File

@@ -0,0 +1,84 @@
use crate::{database::{entities::{User, RelationshipStatus}, get_collection, guards::reference::Ref, permissions::get_relationship}, util::result::Error};
use rocket_contrib::json::JsonValue;
use crate::util::result::Result;
use mongodb::bson::doc;
use futures::try_join;
#[put("/<target>/friend")]
pub async fn req(user: User, target: Ref) -> Result<JsonValue> {
let col = get_collection("users");
match get_relationship(&user, &target) {
RelationshipStatus::User => return Err(Error::NoEffect),
RelationshipStatus::Friend => return Err(Error::AlreadyFriends),
RelationshipStatus::Outgoing => return Err(Error::AlreadySentRequest),
RelationshipStatus::Blocked => return Err(Error::Blocked),
RelationshipStatus::BlockedOther => return Err(Error::BlockedByOther),
RelationshipStatus::Incoming => {
match try_join!(
col.update_one(
doc! {
"_id": &user.id,
"relations._id": &target.id
},
doc! {
"$set": {
"relations.$.status": "Friend"
}
},
None
),
col.update_one(
doc! {
"_id": &target.id,
"relations._id": &user.id
},
doc! {
"$set": {
"relations.$.status": "Friend"
}
},
None
)
) {
Ok(_) => Ok(json!({ "status": "Friend" })),
Err(_) => Err(Error::DatabaseError { operation: "update_one", with: "user" })
}
}
RelationshipStatus::None => {
match try_join!(
col.update_one(
doc! {
"_id": &user.id
},
doc! {
"$push": {
"relations": {
"_id": &target.id,
"status": "Outgoing"
}
}
},
None
),
col.update_one(
doc! {
"_id": &target.id
},
doc! {
"$push": {
"relations": {
"_id": &user.id,
"status": "Incoming"
}
}
},
None
)
) {
Ok(_) => Ok(json!({ "status": "Outgoing" })),
Err(_) => Err(Error::DatabaseError { operation: "update_one", with: "user" })
}
}
}
}

101
src/routes/users/block_user.rs Normal file
View File

@@ -0,0 +1,101 @@
use crate::{database::entities::RelationshipStatus, database::guards::reference::Ref, database::entities::User, database::permissions::get_relationship, util::result::Error, database::get_collection};
use rocket_contrib::json::JsonValue;
use crate::util::result::Result;
use mongodb::bson::doc;
use futures::try_join;
#[put("/<target>/block")]
pub async fn req(user: User, target: Ref) -> Result<JsonValue> {
let col = get_collection("users");
match get_relationship(&user, &target) {
RelationshipStatus::User |
RelationshipStatus::Blocked => Err(Error::NoEffect),
RelationshipStatus::BlockedOther => {
col.update_one(
doc! {
"_id": &user.id,
"relations._id": &target.id
},
doc! {
"$set": {
"relations.$.status": "Blocked"
}
},
None
)
.await
.map_err(|_| Error::DatabaseError { operation: "update_one", with: "user" })?;
Ok(json!({ "status": "Blocked" }))
},
RelationshipStatus::None => {
match try_join!(
col.update_one(
doc! {
"_id": &user.id
},
doc! {
"$push": {
"relations": {
"_id": &target.id,
"status": "Blocked"
}
}
},
None
),
col.update_one(
doc! {
"_id": &target.id
},
doc! {
"$push": {
"relations": {
"_id": &user.id,
"status": "BlockedOther"
}
}
},
None
)
) {
Ok(_) => Ok(json!({ "status": "Blocked" })),
Err(_) => Err(Error::DatabaseError { operation: "update_one", with: "user" })
}
},
RelationshipStatus::Friend |
RelationshipStatus::Incoming |
RelationshipStatus::Outgoing => {
match try_join!(
col.update_one(
doc! {
"_id": &user.id,
"relations._id": &target.id
},
doc! {
"$set": {
"relations.$.status": "Blocked"
}
},
None
),
col.update_one(
doc! {
"_id": &target.id,
"relations._id": &user.id
},
doc! {
"$set": {
"relations.$.status": "BlockedOther"
}
},
None
)
) {
Ok(_) => Ok(json!({ "status": "Blocked" })),
Err(_) => Err(Error::DatabaseError { operation: "update_one", with: "user" })
}
}
}
}

10
src/routes/users/fetch_relationship.rs Normal file
View File

@@ -0,0 +1,10 @@
use crate::database::{entities::User, guards::reference::Ref, permissions::get_relationship};
use rocket_contrib::json::JsonValue;
use crate::util::result::Result;
#[get("/<target>/relationship")]
pub async fn req(user: User, target: Ref) -> Result<JsonValue> {
Ok(json!({
"status": get_relationship(&user, &target)
}))
}

14
src/routes/users/fetch_relationships.rs Normal file
View File

@@ -0,0 +1,14 @@
use crate::database::entities::User;
use rocket_contrib::json::JsonValue;
use crate::util::result::Result;
#[get("/relationships")]
pub async fn req(user: User) -> Result<JsonValue> {
Ok(
if let Some(vec) = user.relations {
json!(vec)
} else {
json!([])
}
)
}

17
src/routes/users/mod.rs
View File

@@ -3,11 +3,28 @@ use rocket::Route;
mod fetch_user;
mod fetch_dms;
mod open_dm;
mod fetch_relationships;
mod fetch_relationship;
mod add_friend;
mod remove_friend;
mod block_user;
mod unblock_user;
pub fn routes() -> Vec<Route> {
routes! [
// User Information
fetch_user::req,
// Direct Messaging
fetch_dms::req,
open_dm::req,
// Relationships
fetch_relationships::req,
fetch_relationship::req,
add_friend::req,
remove_friend::req,
block_user::req,
unblock_user::req,
]
}

52
src/routes/users/remove_friend.rs Normal file
View File

@@ -0,0 +1,52 @@
use crate::{database::entities::RelationshipStatus, database::guards::reference::Ref, database::entities::User, database::permissions::get_relationship, util::result::Error, database::get_collection};
use rocket_contrib::json::JsonValue;
use crate::util::result::Result;
use mongodb::bson::doc;
use futures::try_join;
#[delete("/<target>/friend")]
pub async fn req(user: User, target: Ref) -> Result<JsonValue> {
let col = get_collection("users");
match get_relationship(&user, &target) {
RelationshipStatus::Blocked |
RelationshipStatus::BlockedOther |
RelationshipStatus::User |
RelationshipStatus::None => Err(Error::NoEffect),
RelationshipStatus::Friend |
RelationshipStatus::Outgoing |
RelationshipStatus::Incoming => {
match try_join!(
col.update_one(
doc! {
"_id": &user.id
},
doc! {
"$pull": {
"relations": {
"_id": &target.id
}
}
},
None
),
col.update_one(
doc! {
"_id": &target.id
},
doc! {
"$pull": {
"relations": {
"_id": &user.id
}
}
},
None
)
) {
Ok(_) => Ok(json!({ "status": "None" })),
Err(_) => Err(Error::DatabaseError { operation: "update_one", with: "user" })
}
}
}
}

75
src/routes/users/unblock_user.rs Normal file
View File

@@ -0,0 +1,75 @@
use crate::{database::entities::RelationshipStatus, database::guards::reference::Ref, database::entities::User, database::permissions::get_relationship, util::result::Error, database::get_collection};
use rocket_contrib::json::JsonValue;
use crate::util::result::Result;
use mongodb::bson::doc;
use futures::try_join;
#[delete("/<target>/block")]
pub async fn req(user: User, target: Ref) -> Result<JsonValue> {
let col = get_collection("users");
match get_relationship(&user, &target) {
RelationshipStatus::None |
RelationshipStatus::User |
RelationshipStatus::BlockedOther |
RelationshipStatus::Incoming |
RelationshipStatus::Outgoing |
RelationshipStatus::Friend => Err(Error::NoEffect),
RelationshipStatus::Blocked => {
match get_relationship(&target.fetch_user().await?, &user.as_ref()) {
RelationshipStatus::Blocked => {
col.update_one(
doc! {
"_id": &user.id,
"relations._id": &target.id
},
doc! {
"$set": {
"relations.$.status": "BlockedOther"
}
},
None
)
.await
.map_err(|_| Error::DatabaseError { operation: "update_one", with: "user" })?;
Ok(json!({ "status": "BlockedOther" }))
},
RelationshipStatus::BlockedOther => {
match try_join!(
col.update_one(
doc! {
"_id": &user.id
},
doc! {
"$pull": {
"relations": {
"_id": &target.id
}
}
},
None
),
col.update_one(
doc! {
"_id": &target.id
},
doc! {
"$pull": {
"relations": {
"_id": &user.id
}
}
},
None
)
) {
Ok(_) => Ok(json!({ "status": "None" })),
Err(_) => Err(Error::DatabaseError { operation: "update_one", with: "user" })
}
},
_ => Err(Error::InternalError)
}
}
}
}