diff --git a/utils/chat.js b/utils/chat.js
index 8c27bad..e249d0f 100644
--- a/utils/chat.js
+++ b/utils/chat.js
@@ -1,34 +1,34 @@
 export async function getChatHistoryGroup (e, num) {
-  //if (e.adapter === 'shamrock') {
+  // if (e.adapter === 'shamrock') {
   //  return await e.group.getChatHistory(0, num, false)
-  //} else {
-    let latestChats = await e.group.getChatHistory(0, 1)
-    if (latestChats.length > 0) {
-      let latestChat = latestChats[0]
-      if (latestChat) {
-        let seq = latestChat.seq || latestChat.message_id
-        let chats = []
-        while (chats.length < num) {
-          let chatHistory = await e.group.getChatHistory(seq, 20)
-          chats.push(...chatHistory)
-          seq = chatHistory[0].seq || chatHistory[0].message_id
-        }
-        chats = chats.slice(0, num)
-        try {
-          let mm = await e.group.getMemberMap()
-          chats.forEach(chat => {
-            let sender = mm.get(chat.sender.user_id)
-            if (sender) {
-              chat.sender = sender
-            }
-          })
-        } catch (err) {
-          logger.warn(err)
-        }
-        // console.log(chats)
-        return chats
+  // } else {
+  let latestChats = await e.group.getChatHistory(0, 1)
+  if (latestChats.length > 0) {
+    let latestChat = latestChats[0]
+    if (latestChat) {
+      let seq = latestChat.seq || latestChat.message_id
+      let chats = []
+      while (chats.length < num) {
+        let chatHistory = await e.group.getChatHistory(seq, 20)
+        chats.push(...chatHistory)
+        seq = chatHistory[0].seq || chatHistory[0].message_id
       }
+      chats = chats.slice(0, num)
+      try {
+        let mm = await e.group.getMemberMap()
+        chats.forEach(chat => {
+          let sender = mm.get(chat.sender.user_id)
+          if (sender) {
+            chat.sender = sender
+          }
+        })
+      } catch (err) {
+        logger.warn(err)
+      }
+      // console.log(chats)
+      return chats
     }
- // }
+  }
+  // }
   return []
 }
diff --git a/utils/common.js b/utils/common.js
index 5f45572..66ca860 100644
--- a/utils/common.js
+++ b/utils/common.js
@@ -848,6 +848,7 @@ export function getMaxModelTokens (model = 'gpt-3.5-turbo') {
 
 export function getUin (e) {
   if (e?.bot?.uin) return e.bot.uin
+  if (e?.bot?.self_id) return e.bot.self_id
   if (Array.isArray(Bot.uin)) {
     if (Config.trssBotUin && Bot.uin.indexOf(Config.trssBotUin) > -1) { return Config.trssBotUin } else {
       Bot.uin.forEach((u) => {