From 8d4e8e6f3586c2ce4b26760854efefa5ef87ced9 Mon Sep 17 00:00:00 2001
From: John Smith <xfgryujk@126.com>
Date: Sat, 1 Feb 2020 18:17:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=BA=9B=E5=89=8D=E7=AB=AF=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/ChatRenderer/TextMessage.vue  | 16 +++++++++-------
 frontend/src/components/ChatRenderer/index.vue   |  8 +++++---
 frontend/src/lang/zh.js                          |  4 ++--
 frontend/src/views/StyleGenerator/index.vue      | 10 +++++-----
 4 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/frontend/src/components/ChatRenderer/TextMessage.vue b/frontend/src/components/ChatRenderer/TextMessage.vue
index b07a095..8b0513b 100644
--- a/frontend/src/components/ChatRenderer/TextMessage.vue
+++ b/frontend/src/components/ChatRenderer/TextMessage.vue
@@ -17,10 +17,12 @@
           ></author-badge>
         </span>
       </yt-live-chat-author-chip>
-      <span id="message" class="style-scope yt-live-chat-text-message-renderer">{{content}}</span>
-      <el-badge :value="repeated" :max="99" v-show="repeated > 1" class="style-scope yt-live-chat-text-message-renderer"
-        :style="{'--repeated-mark-color': repeatedMarkColor}"
-      ></el-badge>
+      <span id="message" class="style-scope yt-live-chat-text-message-renderer">
+        {{content}}
+        <el-badge :value="repeated" :max="99" v-show="repeated > 1" class="style-scope yt-live-chat-text-message-renderer"
+          :style="{'--repeated-mark-color': repeatedMarkColor}"
+        ></el-badge>
+      </span>
     </div>
   </yt-live-chat-text-message-renderer>
 </template>
@@ -77,11 +79,11 @@ export default {
 </script>
 
 <style>
-yt-live-chat-text-message-renderer>#content>.el-badge {
-  margin-left: 10px;
+yt-live-chat-text-message-renderer>#content>#message>.el-badge {
+  margin-left: 5px;
 }
 
-yt-live-chat-text-message-renderer>#content>.el-badge .el-badge__content {
+yt-live-chat-text-message-renderer>#content>#message>.el-badge .el-badge__content {
   font-size: 12px !important;
   line-height: 18px !important;
   text-shadow: none !important;
diff --git a/frontend/src/components/ChatRenderer/index.vue b/frontend/src/components/ChatRenderer/index.vue
index fb82267..12ab702 100644
--- a/frontend/src/components/ChatRenderer/index.vue
+++ b/frontend/src/components/ChatRenderer/index.vue
@@ -119,18 +119,20 @@ export default {
       this.enqueueMessages(messages)
     },
     mergeSimilarText(content) {
+      content = content.trim().toLowerCase()
       let res = false
       this.forEachRecentMessage(5, message => {
         if (message.type !== constants.MESSAGE_TYPE_TEXT) {
           return true
         }
+        let messageContent = message.content.trim().toLowerCase()
         let longer, shorter
-        if (message.content.length > content.length) {
-          longer = message.content
+        if (messageContent.length > content.length) {
+          longer = messageContent
           shorter = content
         } else {
           longer = content
-          shorter = message.content
+          shorter = messageContent
         }
         if (longer.indexOf(shorter) !== -1 // 长的包含短的
             && longer.length - shorter.length < shorter.length // 长度差较小
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index f22afbf..f1eb4bf 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -91,8 +91,8 @@ export default {
     scContentLineLineHeight: 'Super Chat内容行高（0为默认）',
     scContentLineColor: 'Super Chat内容颜色',
     showNewMemberBg: '显示新舰长背景',
-    showScTicker: '显示Super Chat贴纸',
-    showOtherThings: '显示Super Chat贴纸之外的内容',
+    showScTicker: '显示Super Chat固定栏',
+    showOtherThings: '显示Super Chat固定栏之外的内容',
 
     animation: '动画',
     animateIn: '进入动画',
diff --git a/frontend/src/views/StyleGenerator/index.vue b/frontend/src/views/StyleGenerator/index.vue
index 705aa1e..e8e64ce 100644
--- a/frontend/src/views/StyleGenerator/index.vue
+++ b/frontend/src/views/StyleGenerator/index.vue
@@ -266,8 +266,8 @@ const EXAMPLE_MESSAGES = [
   {
     ...legacyPaidMessageTemplate,
     id: nextId++,
-    authorName: '吾乐KANA',
-    content: 'Welcome 吾乐KANA!'
+    authorName: '少年Pi',
+    content: 'Welcome 少年Pi!'
   },
   {
     ...paidMessageTemplate,
@@ -281,14 +281,14 @@ const EXAMPLE_MESSAGES = [
     id: nextId++,
     authorName: 'streamer主播',
     authorType: constants.AUTHRO_TYPE_OWNER,
-    content: '感谢石油佬送的小电视'
+    content: '老板大气，老板身体健康'
   },
   {
     ...paidMessageTemplate,
     id: nextId++,
     authorName: '夏色祭保護協会会長',
-    price: 28,
-    content: 'Sent 礼花x1'
+    price: 30,
+    content: '言いたいことがあるんだよ！'
   }
 ]