FromType::User => FromType::Custom

rmqtt · Aug 11, 2023 · de06a2a · de06a2a
1 parent 4b7f1ed
commit de06a2a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/rmqtt-plugins/rmqtt-web-hook/src/lib.rs b/rmqtt-plugins/rmqtt-web-hook/src/lib.rs
@@ -501,10 +501,8 @@ impl JsonFrom for Id {
 impl JsonFrom for rmqtt::From {
     fn from(&self, json: serde_json::Value) -> serde_json::Value {
         let mut json = self.id.from(json);
-        if !self.is_user() {
-            if let Some(obj) = json.as_object_mut() {
-                obj.insert("from_type".into(), serde_json::Value::String(self.typ().to_string()));
-            }
+        if let Some(obj) = json.as_object_mut() {
+            obj.insert("from_type".into(), serde_json::Value::String(self.typ().to_string()));
         }
         json
     }

diff --git a/rmqtt/src/broker/session.rs b/rmqtt/src/broker/session.rs
@@ -633,7 +633,7 @@ impl SessionState {
 
     #[inline]
     async fn publish(&self, publish: Publish) -> Result<bool> {
-        let from = From::from_user(self.id.clone());
+        let from = From::from_custom(self.id.clone());
 
         //hook, message_publish
         let publish = self.hook.message_publish(from.clone(), &publish).await.unwrap_or(publish);

diff --git a/rmqtt/src/broker/types.rs b/rmqtt/src/broker/types.rs
@@ -914,7 +914,7 @@ impl Publish {
 
 #[derive(Debug, Clone, Copy, Deserialize, Serialize)]
 pub enum FromType {
-    User,
+    Custom,
     Admin,
     System,
     LastWill,
@@ -924,7 +924,7 @@ impl std::fmt::Display for FromType {
     #[inline]
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let typ = match self {
-            FromType::User => "user",
+            FromType::Custom => "custom",
             FromType::Admin => "admin",
             FromType::System => "system",
             FromType::LastWill => "lastwill",
@@ -941,8 +941,8 @@ pub struct From {
 
 impl From {
     #[inline]
-    pub fn from_user(id: Id) -> From {
-        From { typ: FromType::User, id }
+    pub fn from_custom(id: Id) -> From {
+        From { typ: FromType::Custom, id }
     }
 
     #[inline]
@@ -971,8 +971,8 @@ impl From {
     }
 
     #[inline]
-    pub fn is_user(&self) -> bool {
-        matches!(self.typ, FromType::User)
+    pub fn is_custom(&self) -> bool {
+        matches!(self.typ, FromType::Custom)
     }
 }