fix: at都被挤到消息最前面的问题

utils/config.js

@@ -85,7 +85,7 @@ const defaultConfig = {
   viewHost: '',
   chatViewWidth: 1280,
   chatViewBotName: '',
-  version: 'v2.5.0'
+  version: 'v2.5.1'
 }
 const _path = process.cwd()
 let config = {}

utils/dalle.js

@@ -1,7 +1,7 @@
 import { Configuration, OpenAIApi } from 'openai'
-import {Config, defaultOpenAIAPI, defaultOpenAIReverseProxy, officialChatGPTAPI} from './config.js'
+import { Config, defaultOpenAIAPI, defaultOpenAIReverseProxy } from './config.js'
 import fs from 'fs'
-import {isCN, mkdirs} from './common.js'
+import { isCN, mkdirs } from './common.js'
 let proxy
 if (Config.proxy) {
   try {
@@ -47,7 +47,6 @@ export async function createImage (prompt, n = 1, size = '512x512') {
 }
 
 export async function imageVariation (imageUrl, n = 1, size = '512x512') {
-
   let basePath = Config.openAiBaseUrl
   if (Config.openAiBaseUrl && Config.proxy && !Config.openAiForceUseReverse) {
     // 如果配了proxy，而且有反代，但是没开启强制反代

utils/face.js

@@ -489,6 +489,10 @@ export async function convertFaces (msg, handleAt = false, e) {
     if (!foundFace) {
       if (handleAt && msg[i] === '@') {
         foundAt = true
+        if (tmpMsg) {
+          msgs.push(tmpMsg)
+          tmpMsg = ''
+        }
         continue
       }
       if (handleAt && foundAt) {

utils/randomMessage.js

@@ -1,6 +1,5 @@
 import { Config } from './config.js'
 import { ChatGPTAPI } from 'chatgpt'
-import { getMessageById, upsertMessage } from './common.js'
 import fetch from 'node-fetch'
 let proxy
 if (Config.proxy) {

utils/tts.js

@@ -1,7 +1,7 @@
 import { Config } from './config.js'
 import fetch from 'node-fetch'
 import _ from 'lodash'
-import {wrapTextByLanguage} from "./common.js";
+import { wrapTextByLanguage } from './common.js'
 let proxy
 if (Config.proxy) {
   try {

utils/uploadRecord.js

@@ -1,4 +1,4 @@
-import Contactable, { core } from 'oicq'
+// import Contactable, { core } from 'oicq'
 import querystring from 'querystring'
 import fetch from 'node-fetch'
 import fs from 'fs'
@@ -7,6 +7,14 @@ import util from 'util'
 import stream from 'stream'
 import crypto from 'crypto'
 import child_process from 'child_process'
+let module
+try {
+  module = await import('oicq')
+} catch (err) {
+  module = await import('icqq')
+}
+const { core } = module
+const Contactable = module.default
 // import { pcm2slk } from 'node-silk'
 let errors = {}
 let pcm2slk