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

Get notifications working properly.

Browse Source
This commit is contained in:
Paul Makles
2020-12-30 15:24:44 +00:00
parent f39bc07bb9
commit 1aaa6f3c41
8 changed files with 205 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
use crate::util::result::Result;
use crate::{notifications::{events::ClientboundNotification, hive}, util::result::Result};
use crate::{
database::{
entities::{RelationshipStatus, User},
@@ -49,7 +49,22 @@ pub async fn req(user: User, target: Ref) -> Result<JsonValue> {
None
)
) {
Ok(_) => Ok(json!({ "status": "Friend" })),
Ok(_) => {
try_join!(
ClientboundNotification::UserRelationship {
id: user.id.clone(),
user: target.id.clone(),
status: RelationshipStatus::Friend
}.publish(user.id.clone()),
ClientboundNotification::UserRelationship {
id: target.id.clone(),
user: user.id.clone(),
status: RelationshipStatus::Friend
}.publish(target.id.clone())
).ok();
Ok(json!({ "status": "Friend" }))
},
Err(_) => Err(Error::DatabaseError {
operation: "update_one",
with: "user",
@@ -87,7 +102,25 @@ pub async fn req(user: User, target: Ref) -> Result<JsonValue> {
None
)
) {
Ok(_) => Ok(json!({ "status": "Outgoing" })),
Ok(_) => {
try_join!(
ClientboundNotification::UserRelationship {
id: user.id.clone(),
user: target.id.clone(),
status: RelationshipStatus::Outgoing
}.publish(user.id.clone()),
ClientboundNotification::UserRelationship {
id: target.id.clone(),
user: user.id.clone(),
status: RelationshipStatus::Incoming
}.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",