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

28
src/routes/users/unblock_user.rs
View File

@@ -1,9 +1,13 @@
use crate::{notifications::{events::ClientboundNotification, hive}, util::result::Result};
use crate::{
database::entities::RelationshipStatus, database::entities::User, database::get_collection,
database::guards::reference::Ref, database::permissions::get_relationship, util::result::Error,
};
use crate::{
notifications::{events::ClientboundNotification, hive},
util::result::Result,
};
use futures::try_join;
use hive_pubsub::PubSub;
use mongodb::bson::doc;
use rocket_contrib::json::JsonValue;
@@ -42,8 +46,11 @@ pub async fn req(user: User, target: Ref) -> Result<JsonValue> {
ClientboundNotification::UserRelationship {
id: user.id.clone(),
user: target.id.clone(),
status: RelationshipStatus::BlockedOther
}.publish(user.id.clone()).await.ok();
status: RelationshipStatus::BlockedOther,
}
.publish(user.id.clone())
.await
.ok();
Ok(json!({ "status": "BlockedOther" }))
}
@@ -82,20 +89,23 @@ pub async fn req(user: User, target: Ref) -> Result<JsonValue> {
id: user.id.clone(),
user: target.id.clone(),
status: RelationshipStatus::None
}.publish(user.id.clone()),
}
.publish(user.id.clone()),
ClientboundNotification::UserRelationship {
id: target.id.clone(),
user: user.id.clone(),
status: RelationshipStatus::None
}.publish(target.id.clone())
).ok();
}
.publish(target.id.clone())
)
.ok();
let hive = hive::get_hive();
hive.unsubscribe(&user.id, &target.id).ok();
hive.unsubscribe(&target.id, &user.id).ok();
Ok(json!({ "status": "None" }))
},
}
Err(_) => Err(Error::DatabaseError {
operation: "update_one",
with: "user",