From de3e7f377cee958f9d87dc9ab68e3d20cf24ade8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=F0=9F=8C=8C?= <Time.Rain.Star.Sky@Gmail.com>
Date: Sat, 16 Mar 2024 19:47:34 +0800
Subject: [PATCH] #I991QA

---
 lib/plugins/loader.js | 4 ++++
 lib/plugins/plugin.js | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/plugins/loader.js b/lib/plugins/loader.js
index 375cd82..04d185d 100644
--- a/lib/plugins/loader.js
+++ b/lib/plugins/loader.js
@@ -376,6 +376,10 @@ class PluginsLoader {
           case 'file':
             e.file = { name: val.name, fid: val.fid }
             break
+          case "xml":
+          case "json":
+            e.msg = (e.msg || "") + (typeof val.data == "string" ? val.data : JSON.stringify(val.data))
+            break
         }
       }
     }
diff --git a/lib/plugins/plugin.js b/lib/plugins/plugin.js
index 6a67c6e..79e978c 100644
--- a/lib/plugins/plugin.js
+++ b/lib/plugins/plugin.js
@@ -75,7 +75,7 @@ export default class plugin {
     if (isGroup) {
       return `${this.name}.${this.e.group_id}`
     } else {
-      return `${this.name}.${this.e.user_id}`
+      return `${this.name}.${this.userId || this.e.user_id}`
     }
   }