From c38977e026bacde43ac09375b589b2184e4f454d Mon Sep 17 00:00:00 2001
From: Paul Makles <paulmakles@gmail.com>
Date: Tue, 19 Jan 2021 11:47:36 +0000
Subject: [PATCH] Run cargo fmt.
---
src/database/entities/channel.rs | 6 ++----
src/notifications/events.rs | 26 ++++++++++++--------------
src/routes/users/add_friend.rs | 2 +-
src/routes/users/block_user.rs | 2 +-
src/routes/users/remove_friend.rs | 3 +--
src/routes/users/unblock_user.rs | 3 +--
6 files changed, 18 insertions(+), 24 deletions(-)
diff --git a/src/database/entities/channel.rs b/src/database/entities/channel.rs
index 7f5c277..04267b5 100644
--- a/src/database/entities/channel.rs
+++ b/src/database/entities/channel.rs
@@ -1,8 +1,6 @@
+use crate::database::*;
+use crate::notifications::events::ClientboundNotification;
use crate::util::result::{Error, Result};
-use crate::{
- database::*,
- notifications::{events::ClientboundNotification, hive},
-};
use mongodb::bson::to_document;
use serde::{Deserialize, Serialize};
diff --git a/src/notifications/events.rs b/src/notifications/events.rs
index 4031d4e..9056ce0 100644
--- a/src/notifications/events.rs
+++ b/src/notifications/events.rs
@@ -1,6 +1,6 @@
-use serde::{Deserialize, Serialize};
-use rauth::auth::Session;
use hive_pubsub::PubSub;
+use rauth::auth::Session;
+use serde::{Deserialize, Serialize};
use snafu::Snafu;
use super::hive::{get_hive, subscribe_if_exists};
@@ -95,19 +95,17 @@ pub fn prehandle_hook(notification: &ClientboundNotification) {
.unsubscribe(&user.to_string(), &id.to_string())
.ok();
}
- ClientboundNotification::UserRelationship { id, user, status } => {
- match status {
- RelationshipStatus::None => {
- get_hive()
- .hive
- .unsubscribe(&id.to_string(), &user.to_string())
- .ok();
- },
- _ => {
- subscribe_if_exists(id.clone(), user.clone()).ok();
- }
+ ClientboundNotification::UserRelationship { id, user, status } => match status {
+ RelationshipStatus::None => {
+ get_hive()
+ .hive
+ .unsubscribe(&id.to_string(), &user.to_string())
+ .ok();
}
- }
+ _ => {
+ subscribe_if_exists(id.clone(), user.clone()).ok();
+ }
+ },
_ => {}
}
}
diff --git a/src/routes/users/add_friend.rs b/src/routes/users/add_friend.rs
index 298dc92..f918fc8 100644
--- a/src/routes/users/add_friend.rs
+++ b/src/routes/users/add_friend.rs
@@ -1,5 +1,5 @@
use crate::database::*;
-use crate::notifications::{events::ClientboundNotification, hive};
+use crate::notifications::events::ClientboundNotification;
use crate::util::result::{Error, Result};
use futures::try_join;
diff --git a/src/routes/users/block_user.rs b/src/routes/users/block_user.rs
index 9c069e5..1fb5183 100644
--- a/src/routes/users/block_user.rs
+++ b/src/routes/users/block_user.rs
@@ -1,5 +1,5 @@
use crate::database::*;
-use crate::notifications::{events::ClientboundNotification, hive};
+use crate::notifications::events::ClientboundNotification;
use crate::util::result::{Error, Result};
use futures::try_join;
diff --git a/src/routes/users/remove_friend.rs b/src/routes/users/remove_friend.rs
index e68f20a..37e831a 100644
--- a/src/routes/users/remove_friend.rs
+++ b/src/routes/users/remove_friend.rs
@@ -1,9 +1,8 @@
use crate::database::*;
-use crate::notifications::{events::ClientboundNotification, hive};
+use crate::notifications::events::ClientboundNotification;
use crate::util::result::{Error, Result};
use futures::try_join;
-use hive_pubsub::PubSub;
use mongodb::bson::doc;
use rocket_contrib::json::JsonValue;
diff --git a/src/routes/users/unblock_user.rs b/src/routes/users/unblock_user.rs
index 0d23852..ec575c4 100644
--- a/src/routes/users/unblock_user.rs
+++ b/src/routes/users/unblock_user.rs
@@ -1,9 +1,8 @@
use crate::database::*;
-use crate::notifications::{events::ClientboundNotification, hive};
+use crate::notifications::events::ClientboundNotification;
use crate::util::result::{Error, Result};
use futures::try_join;
-use hive_pubsub::PubSub;
use mongodb::bson::doc;
use rocket_contrib::json::JsonValue;
--
GitLab