From 1cf6d88460d1d918752a6a7985314df610e66034 Mon Sep 17 00:00:00 2001
From: John Smith <xfgryujk@126.com>
Date: Fri, 29 Nov 2019 23:48:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=84=E7=A7=8D=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/ChatRenderer/index.vue     | 39 ++++++++++++++++---
 frontend/src/views/Room.vue                   | 11 +++++-
 update.py                                     | 17 ++++----
 3 files changed, 54 insertions(+), 13 deletions(-)

diff --git a/frontend/src/components/ChatRenderer/index.vue b/frontend/src/components/ChatRenderer/index.vue
index d031858..35bc655 100644
--- a/frontend/src/components/ChatRenderer/index.vue
+++ b/frontend/src/components/ChatRenderer/index.vue
@@ -4,7 +4,9 @@
     <yt-live-chat-item-list-renderer class="style-scope yt-live-chat-renderer" allow-scroll>
       <div id="item-scroller" ref="scroller" class="style-scope yt-live-chat-item-list-renderer animated" @scroll="onScroll">
         <div ref="itemOffset" id="item-offset" class="style-scope yt-live-chat-item-list-renderer" style="height: 0px;">
-          <div ref="items" id="items" class="style-scope yt-live-chat-item-list-renderer" style="overflow: hidden; transform: translateY(0px);">
+          <div ref="items" id="items" class="style-scope yt-live-chat-item-list-renderer" style="overflow: hidden"
+            :style="{transform: `translateY(${Math.floor(scrollPixelsRemaining)}px)`}"
+          >
             <template v-for="message in messages">
               <text-message :key="message.id" v-if="message.type === MESSAGE_TYPE_TEXT"
                 class="style-scope yt-live-chat-item-list-renderer"
@@ -102,6 +104,7 @@ export default {
       window.clearTimeout(this.emitSmoothedMessageTimerId)
       this.emitSmoothedMessageTimerId = null
     }
+    this.clearMessages()
   },
   watch: {
     css(val) {
@@ -138,6 +141,22 @@ export default {
       }
       return false
     },
+    mergeSimilarGift(authorName, price) {
+      let remainNum = 5
+      for (let arr of [this.messagesBuffer, this.messages]) {
+        for (let i = arr.length - 1; i >= 0 && --remainNum > 0; i--) {
+          let message = arr[i]
+          if (message.type === constants.MESSAGE_TYPE_SUPER_CHAT
+              && message.content === ''
+              && message.authorName === authorName
+          ) {
+            message.price += price
+            return true
+          }
+        }
+      }
+      return false
+    },
     delMessage(id) {
       this.delMessages([id])
     },
@@ -152,6 +171,19 @@ export default {
     clearMessages() {
       this.messages = []
       this.paidMessages = []
+      this.smoothedMessageQueue = []
+      this.messagesBuffer = []
+      this.isSmoothed = true
+      this.lastSmoothChatMessageAddMs = null
+      this.chatRateMs = 1000
+      this.lastSmoothScrollUpdate = null
+      this.scrollTimeRemainingMs = this.scrollPixelsRemaining = 0
+      this.smoothScrollRafHandle = null
+      this.preinsertHeight = 0
+      this.maybeResizeScrollContainer()
+      if (!this.atBottom) {
+        this.scrollToBottom()
+      }
     },
 
     enqueueMessages(messages) {
@@ -315,7 +347,6 @@ export default {
       // 计算剩余像素
       this.scrollPixelsRemaining += this.$refs.items.clientHeight - this.preinsertHeight
       this.scrollToBottom()
-      this.$refs.items.style.transform = `translateY(${Math.floor(this.scrollPixelsRemaining)}px)`
 
       // 计算是否平滑滚动、剩余时间
       if (!this.lastSmoothChatMessageAddMs) {
@@ -354,7 +385,6 @@ export default {
         || this.scrollTimeRemainingMs <= 0 // 时间已结束
       ) {
         this.resetSmoothScroll()
-        this.$refs.items.style.transform = 'translateY(0px)'
         return
       }
 
@@ -369,7 +399,6 @@ export default {
       }
       this.lastSmoothScrollUpdate = time
       this.smoothScrollRafHandle = window.requestAnimationFrame(this.smoothScroll)
-      this.$refs.items.style.transform = `translateY(${Math.floor(this.scrollPixelsRemaining)}px)`
     },
     resetSmoothScroll() {
       this.scrollTimeRemainingMs = this.scrollPixelsRemaining = 0
@@ -390,7 +419,7 @@ export default {
       }
     },
     scrollToBottom() {
-      this.$refs.scroller.scrollTop = this.$refs.scroller.scrollHeight
+      this.$refs.scroller.scrollTop = Math.pow(2, 24)
       this.atBottom = true
     },
     onScroll() {
diff --git a/frontend/src/views/Room.vue b/frontend/src/views/Room.vue
index 386703c..9743c4e 100644
--- a/frontend/src/views/Room.vue
+++ b/frontend/src/views/Room.vue
@@ -123,6 +123,9 @@ export default {
         if (price < this.config.minGiftPrice) { // 丢人
           break
         }
+        if (this.mergeSimilarGift(data.authorName, price)) {
+          break
+        }
         message = {
           id: `gift_${this.nextId++}`,
           type: constants.MESSAGE_TYPE_SUPER_CHAT,
@@ -162,7 +165,7 @@ export default {
           authorName: data.authorName,
           price: data.price,
           time: time,
-          content: data.content
+          content: data.content.trim()
         }
         break
       case COMMAND_DEL_SUPER_CHAT:
@@ -208,6 +211,12 @@ export default {
         return false
       }
       return this.$refs.renderer.mergeSimilar(content)
+    },
+    mergeSimilarGift(authorName, price) {
+      if (!this.config.mergeSimilarDanmaku) {
+        return false
+      }
+      return this.$refs.renderer.mergeSimilarGift(authorName, price)
     }
   }
 }
diff --git a/update.py b/update.py
index 99a0848..6bcb63e 100644
--- a/update.py
+++ b/update.py
@@ -6,10 +6,13 @@ VERSION = 'v1.2.3'
 
 
 async def check_update():
-    async with aiohttp.ClientSession() as session:
-        async with session.get('https://api.github.com/repos/xfgryujk/blivechat/releases/latest') as r:
-            data = await r.json()
-            if data['name'] != VERSION:
-                print('New version available:', data['name'])
-                print(data['body'])
-                print('Download:', data['html_url'])
+    try:
+        async with aiohttp.ClientSession() as session:
+            async with session.get('https://api.github.com/repos/xfgryujk/blivechat/releases/latest') as r:
+                data = await r.json()
+                if data['name'] != VERSION:
+                    print('New version available:', data['name'])
+                    print(data['body'])
+                    print('Download:', data['html_url'])
+    except aiohttp.ClientConnectionError:
+        print('Failed to check update: connection failed')