Notifications: Remove ServerCreate event.
This commit is contained in:
@@ -53,7 +53,7 @@ pub struct Server {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Server {
|
impl Server {
|
||||||
pub async fn publish(self) -> Result<()> {
|
pub async fn create(self) -> Result<()> {
|
||||||
get_collection("servers")
|
get_collection("servers")
|
||||||
.insert_one(
|
.insert_one(
|
||||||
to_document(&self).map_err(|_| Error::DatabaseError {
|
to_document(&self).map_err(|_| Error::DatabaseError {
|
||||||
@@ -68,9 +68,6 @@ impl Server {
|
|||||||
with: "server",
|
with: "server",
|
||||||
})?;
|
})?;
|
||||||
|
|
||||||
let server_id = self.id.clone();
|
|
||||||
ClientboundNotification::ServerCreate(self).publish(server_id);
|
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
use futures::StreamExt;
|
|
||||||
use hive_pubsub::PubSub;
|
use hive_pubsub::PubSub;
|
||||||
use mongodb::bson::{doc, Document};
|
use mongodb::bson::doc;
|
||||||
use rauth::auth::Session;
|
use rauth::auth::Session;
|
||||||
use rocket_contrib::json::JsonValue;
|
use rocket_contrib::json::JsonValue;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
@@ -8,7 +7,7 @@ use serde::{Deserialize, Serialize};
|
|||||||
use super::hive::{get_hive, subscribe_if_exists};
|
use super::hive::{get_hive, subscribe_if_exists};
|
||||||
use crate::{
|
use crate::{
|
||||||
database::*,
|
database::*,
|
||||||
util::result::{Error, Result},
|
util::result::{Result},
|
||||||
};
|
};
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize, Debug, Clone)]
|
#[derive(Serialize, Deserialize, Debug, Clone)]
|
||||||
@@ -105,7 +104,6 @@ pub enum ClientboundNotification {
|
|||||||
user: String,
|
user: String,
|
||||||
},
|
},
|
||||||
|
|
||||||
ServerCreate(Server),
|
|
||||||
ServerUpdate {
|
ServerUpdate {
|
||||||
id: String,
|
id: String,
|
||||||
data: JsonValue,
|
data: JsonValue,
|
||||||
@@ -196,9 +194,6 @@ pub async fn prehandle_hook(notification: &ClientboundNotification) -> Result<()
|
|||||||
subscribe_if_exists(user.clone(), channel).ok();
|
subscribe_if_exists(user.clone(), channel).ok();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ClientboundNotification::ServerCreate(server) => {
|
|
||||||
subscribe_if_exists(server.owner.clone(), server.id.clone()).ok();
|
|
||||||
}
|
|
||||||
ClientboundNotification::UserRelationship { id, user, status } => {
|
ClientboundNotification::UserRelationship { id, user, status } => {
|
||||||
if status != &RelationshipStatus::None {
|
if status != &RelationshipStatus::None {
|
||||||
subscribe_if_exists(id.clone(), user.id.clone()).ok();
|
subscribe_if_exists(id.clone(), user.id.clone()).ok();
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ pub async fn req(user: User, info: Json<Data>) -> Result<JsonValue> {
|
|||||||
.publish()
|
.publish()
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
server.clone().publish().await?;
|
server.clone().create().await?;
|
||||||
server.join_member(&user.id).await?;
|
server.join_member(&user.id).await?;
|
||||||
|
|
||||||
Ok(json!(server))
|
Ok(json!(server))
|
||||||
|
|||||||
Reference in New Issue
Block a user