From 0640f68f9cbfc680ceb1186643e920d6ff7dcd42 Mon Sep 17 00:00:00 2001
From: Paul Makles <paulmakles@gmail.com>
Date: Wed, 30 Dec 2020 15:34:32 +0000
Subject: [PATCH] Add notifications to remaining routes.
---
src/routes/users/block_user.rs | 45 ++++++++++++++++++++++++++++---
src/routes/users/remove_friend.rs | 24 +++++++++++++++--
src/routes/users/unblock_user.rs | 29 ++++++++++++++++++--
3 files changed, 91 insertions(+), 7 deletions(-)
diff --git a/src/routes/users/block_user.rs b/src/routes/users/block_user.rs
index e7f1266..4f86bf9 100644
--- a/src/routes/users/block_user.rs
+++ b/src/routes/users/block_user.rs
@@ -1,4 +1,4 @@
-use crate::util::result::Result;
+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,
@@ -32,6 +32,12 @@ pub async fn req(user: User, target: Ref) -> Result<JsonValue> {
with: "user",
})?;
+ ClientboundNotification::UserRelationship {
+ id: user.id.clone(),
+ user: target.id.clone(),
+ status: RelationshipStatus::Blocked
+ }.publish(user.id.clone()).await.ok();
+
Ok(json!({ "status": "Blocked" }))
}
RelationshipStatus::None => {
@@ -65,7 +71,25 @@ pub async fn req(user: User, target: Ref) -> Result<JsonValue> {
None
)
) {
- Ok(_) => Ok(json!({ "status": "Blocked" })),
+ Ok(_) => {
+ try_join!(
+ ClientboundNotification::UserRelationship {
+ id: user.id.clone(),
+ user: target.id.clone(),
+ status: RelationshipStatus::Blocked
+ }.publish(user.id.clone()),
+ ClientboundNotification::UserRelationship {
+ id: target.id.clone(),
+ user: user.id.clone(),
+ status: RelationshipStatus::BlockedOther
+ }.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": "Blocked" }))
+ },
Err(_) => Err(Error::DatabaseError {
operation: "update_one",
with: "user",
@@ -101,7 +125,22 @@ pub async fn req(user: User, target: Ref) -> Result<JsonValue> {
None
)
) {
- Ok(_) => Ok(json!({ "status": "Blocked" })),
+ Ok(_) => {
+ try_join!(
+ ClientboundNotification::UserRelationship {
+ id: user.id.clone(),
+ user: target.id.clone(),
+ status: RelationshipStatus::Blocked
+ }.publish(user.id.clone()),
+ ClientboundNotification::UserRelationship {
+ id: target.id.clone(),
+ user: user.id.clone(),
+ status: RelationshipStatus::BlockedOther
+ }.publish(target.id.clone())
+ ).ok();
+
+ Ok(json!({ "status": "Blocked" }))
+ },
Err(_) => Err(Error::DatabaseError {
operation: "update_one",
with: "user",
diff --git a/src/routes/users/remove_friend.rs b/src/routes/users/remove_friend.rs
index 468a6be..97f6f20 100644
--- a/src/routes/users/remove_friend.rs
+++ b/src/routes/users/remove_friend.rs
@@ -1,4 +1,4 @@
-use crate::util::result::Result;
+use crate::{notifications::{hive, events::ClientboundNotification}, 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,
@@ -6,6 +6,7 @@ use crate::{
use futures::try_join;
use mongodb::bson::doc;
use rocket_contrib::json::JsonValue;
+use hive_pubsub::PubSub;
#[delete("/<target>/friend")]
pub async fn req(user: User, target: Ref) -> Result<JsonValue> {
@@ -47,7 +48,26 @@ pub async fn req(user: User, target: Ref) -> Result<JsonValue> {
None
)
) {
- Ok(_) => Ok(json!({ "status": "None" })),
+ Ok(_) => {
+ try_join!(
+ ClientboundNotification::UserRelationship {
+ id: user.id.clone(),
+ user: target.id.clone(),
+ status: RelationshipStatus::None
+ }.publish(user.id.clone()),
+ ClientboundNotification::UserRelationship {
+ id: target.id.clone(),
+ user: user.id.clone(),
+ status: RelationshipStatus::None
+ }.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",
diff --git a/src/routes/users/unblock_user.rs b/src/routes/users/unblock_user.rs
index 585170f..68ebec2 100644
--- a/src/routes/users/unblock_user.rs
+++ b/src/routes/users/unblock_user.rs
@@ -1,4 +1,4 @@
-use crate::util::result::Result;
+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,
@@ -39,6 +39,12 @@ pub async fn req(user: User, target: Ref) -> Result<JsonValue> {
with: "user",
})?;
+ ClientboundNotification::UserRelationship {
+ id: user.id.clone(),
+ user: target.id.clone(),
+ status: RelationshipStatus::BlockedOther
+ }.publish(user.id.clone()).await.ok();
+
Ok(json!({ "status": "BlockedOther" }))
}
RelationshipStatus::BlockedOther => {
@@ -70,7 +76,26 @@ pub async fn req(user: User, target: Ref) -> Result<JsonValue> {
None
)
) {
- Ok(_) => Ok(json!({ "status": "None" })),
+ Ok(_) => {
+ try_join!(
+ ClientboundNotification::UserRelationship {
+ id: user.id.clone(),
+ user: target.id.clone(),
+ status: RelationshipStatus::None
+ }.publish(user.id.clone()),
+ ClientboundNotification::UserRelationship {
+ id: target.id.clone(),
+ user: user.id.clone(),
+ status: RelationshipStatus::None
+ }.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",
--
GitLab