koishi-plugin-chat-patch 5.5.0 → 5.5.1

package/client/web/dist/index.html

@@ -11,7 +11,7 @@
         <link rel="stylesheet" href="./bcui/css/style.css">
         <link rel="stylesheet" href="./bcui/css/color-light.css">
         <link rel="stylesheet" href="./css/append-light.css">
-      <script type="module" crossorigin src="./assets/index-BA37EQGa.js"></script>
+      <script type="module" crossorigin src="./assets/index-CSGfOsfr.js"></script>
       <link rel="stylesheet" crossorigin href="./assets/index-B71pPwae.css">
     </head>
 

package/client/web/src/function/msg.ts

@@ -43,7 +43,7 @@ import {
     sendStatEvent,
 } from '../function/utils/appUtil'
 
-const SATORI_MARKUP_PATTERN = /<(?:img|image|audio|video|file|mface|face|quote|at|forward|json|xml|markdown|keyboard|p|br|i18n|a|text|sharp)(?:\s|\/|>)/i
+const SATORI_MARKUP_PATTERN = /(?:<|&(?:amp;)?lt;)(?:img|image|audio|video|file|mface|face|faceType|quote|at|forward|json|xml|markdown|keyboard|p|br|i18n|a|text|sharp)(?:\s|\/|>|&(?:amp;)?gt;)/i
 
 function splitSatoriMarkupText(message: any[]): any[] {
     return message.flatMap((segment) => {

package/client/web/src/function/satori-model.ts

@@ -229,16 +229,23 @@ function normalizeAtText(name: string, id: string): string {
 }
 
 function containsElementMarkup(source: string): boolean {
-  return /<(img|image|audio|video|file|mface|face|quote|at|forward|json|xml|markdown|keyboard|p|br|i18n|a|text|sharp)(?:\s|\/|>)/i.test(source)
+  return /(?:<|&(?:amp;)?lt;)(?:img|image|audio|video|file|mface|face|faceType|quote|at|forward|json|xml|markdown|keyboard|p|br|i18n|a|text|sharp)(?:\s|\/|>|&(?:amp;)?gt;)/i.test(source)
 }
 
 // QQ 官方机器人会把部分大表情/图片消息的私有标记塞进 content，渲染前需要去掉
 function cleanQqFaceMarkup(source: string): string {
   return source
     .replace(/<faceType\b[^>]*>/gi, '')
-    .replace(/&lt;faceType\b[^>]*&gt;/gi, '')
+    .replace(/&(?:amp;)?lt;faceType\b[^>]*&(?:amp;)?gt;/gi, '')
 }
 
+const QQ_EXPRESSION_PLACEHOLDER = 'data:image/svg+xml;charset=utf-8,' + encodeURIComponent(
+  '<svg xmlns="http://www.w3.org/2000/svg" width="120" height="120" viewBox="0 0 120 120">'
+  + '<rect width="120" height="120" rx="12" fill="#f3f4f6"/>'
+  + '<text x="60" y="62" text-anchor="middle" dominant-baseline="middle" font-size="18" fill="#333">表情消息</text>'
+  + '</svg>',
+)
+
 function splitMarkupTextSegments(
   segments: Array<Record<string, unknown>>,
 ): Array<Record<string, unknown>> {
@@ -255,7 +262,18 @@ function splitMarkupTextSegments(
 }
 
 export function parseSatoriMarkup(source: string): Array<Record<string, unknown>> {
+  const hadQqFaceMarkup = /(?:&(?:amp;)?lt;|<)faceType\b/i.test(source)
   source = cleanQqFaceMarkup(source)
+  if (hadQqFaceMarkup && !source.trim()) {
+    return [{
+      type: 'image',
+      file: QQ_EXPRESSION_PLACEHOLDER,
+      url: QQ_EXPRESSION_PLACEHOLDER,
+      summary: '表情消息',
+      width: 120,
+      height: 120,
+    }]
+  }
   const result: Array<Record<string, unknown>> = []
   let index = 0
   while (index < source.length) {

package/client/web/src/pages/Messages.vue

@@ -394,12 +394,11 @@
     function userClick(data: UserFriendElem & UserGroupElem) {
         const id = data.group_id || data.user_id
         if (id === undefined || id === null || String(id) === '' || String(id) === '0') return
-        // 从群收纳盒进入群时先收起收纳盒，避免头部切换导致返回标记闪烁
-        if (showGroupAssist.value) {
-            showGroupAssist.value = false
-        }
+        const fromGroupAssist = showGroupAssist.value
         if (!trRead.value && id != props.chat.show.id) {
-            if (uiStore.openSideBar) {
+            if (fromGroupAssist) {
+                uiStore.openSideBar = false
+            } else if (uiStore.openSideBar) {
                 openLeftBar()
             }
             const back = {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chat-patch",
   "description": "[<ruby>chat-patch<rp>（</rp><rt>点我预览效果</rt><rp>）</rp></ruby>](https://i0.hdslb.com/bfs/openplatform/71074dfc9e5256fc3333d8bd8478bec1af874046.png) 视奸小插件((bushi( (低性能警告)。手机端适配。灵感来自 chat 插件。",
-  "version": "5.5.0",
+  "version": "5.5.1",
   "scripts": {
     "build:web": "npm --prefix client/web run build",
     "prepack": "npm run build:web",