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

Fix import and cargo fmt

Browse Source
This commit is contained in:
Paul Makles
2020-12-30 15:36:04 +00:00
parent 0640f68f9c
commit cac21ce2b6
8 changed files with 109 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/routes/users/add_friend.rs
View File

@@ -1,4 +1,3 @@
use crate::{notifications::{events::ClientboundNotification, hive}, util::result::Result};
use crate::{
database::{
entities::{RelationshipStatus, User},
@@ -8,6 +7,10 @@ use crate::{
},
util::result::Error,
};
use crate::{
notifications::{events::ClientboundNotification, hive},
util::result::Result,
};
use futures::try_join;
use mongodb::bson::doc;
use rocket_contrib::json::JsonValue;
@@ -55,16 +58,19 @@ pub async fn req(user: User, target: Ref) -> Result<JsonValue> {
id: user.id.clone(),
user: target.id.clone(),
status: RelationshipStatus::Friend
}.publish(user.id.clone()),
}
.publish(user.id.clone()),
ClientboundNotification::UserRelationship {
id: target.id.clone(),
user: user.id.clone(),
status: RelationshipStatus::Friend
}.publish(target.id.clone())
).ok();
}
.publish(target.id.clone())
)
.ok();
Ok(json!({ "status": "Friend" }))
},
}
Err(_) => Err(Error::DatabaseError {
operation: "update_one",
with: "user",
@@ -108,19 +114,22 @@ pub async fn req(user: User, target: Ref) -> Result<JsonValue> {
id: user.id.clone(),
user: target.id.clone(),
status: RelationshipStatus::Outgoing
}.publish(user.id.clone()),
}
.publish(user.id.clone()),
ClientboundNotification::UserRelationship {
id: target.id.clone(),
user: user.id.clone(),
status: RelationshipStatus::Incoming
}.publish(target.id.clone())
).ok();
}
.publish(target.id.clone())
)
.ok();
hive::subscribe_if_exists(user.id.clone(), target.id.clone()).ok();
hive::subscribe_if_exists(target.id.clone(), user.id.clone()).ok();
Ok(json!({ "status": "Outgoing" }))
},
}
Err(_) => Err(Error::DatabaseError {
operation: "update_one",
with: "user",