From ec27b1bbcce08b89352f4c6cb20f28768000aeeb Mon Sep 17 00:00:00 2001
From: John Smith <xfgryujk@126.com>
Date: Thu, 20 Jun 2019 23:53:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BC=B9=E5=B9=95=E9=80=9F?=
 =?UTF-8?q?=E5=BA=A6=E9=99=90=E5=88=B6=E7=AD=89=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 blivedm                                       |  2 +-
 frontend/src/api/config.js                    |  3 +
 .../src/components/ChatRenderer/index.vue     | 21 ++++--
 frontend/src/views/Home.vue                   | 29 ++++++---
 frontend/src/views/Room.vue                   | 64 ++++++++++++++++---
 views/config.py                               |  6 +-
 6 files changed, 97 insertions(+), 28 deletions(-)

diff --git a/blivedm b/blivedm
index 2f705b8..0d63944 160000
--- a/blivedm
+++ b/blivedm
@@ -1 +1 @@
-Subproject commit 2f705b86ce02e4c8c93ca6d066964747160fd617
+Subproject commit 0d63944da4558981cd55c1fdbfb11b97837780ff
diff --git a/frontend/src/api/config.js b/frontend/src/api/config.js
index 04fc729..83b78d2 100644
--- a/frontend/src/api/config.js
+++ b/frontend/src/api/config.js
@@ -6,6 +6,9 @@ import stylegen from '@/views/StyleGenerator/stylegen'
 export const DEFAULT_CONFIG = {
   minGiftPrice: 6.911, // $1
   mergeSimilarDanmaku: true,
+  showDanmaku: true,
+  showGift: true,
+  maxSpeed: 4,
 
   blockGiftDanmaku: true,
   blockLevel: 0,
diff --git a/frontend/src/components/ChatRenderer/index.vue b/frontend/src/components/ChatRenderer/index.vue
index 2ce09e4..86357ac 100644
--- a/frontend/src/components/ChatRenderer/index.vue
+++ b/frontend/src/components/ChatRenderer/index.vue
@@ -15,7 +15,7 @@
       </yt-live-chat-ticker-paid-message-item-renderer>
     </yt-live-chat-ticker-renderer> -->
     <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">
+      <div id="item-scroller" ref="scroller" class="style-scope yt-live-chat-item-list-renderer animated" @scroll="onScroll">
         <div id="item-offset" class="style-scope yt-live-chat-item-list-renderer" style="height: 1800px;">
           <div id="items" class="style-scope yt-live-chat-item-list-renderer" style="overflow: hidden; transform: translateY(0px);">
             <template v-for="message in messages">
@@ -47,6 +47,7 @@
 import TextMessage from './TextMessage.vue'
 import LegacyPaidMessage from './LegacyPaidMessage.vue'
 import PaidMessage from './PaidMessage.vue'
+import { METHODS } from 'http';
 
 export default {
   name: 'ChatRenderer',
@@ -63,23 +64,35 @@ export default {
     let styleElement = document.createElement('style')
     document.head.appendChild(styleElement)
     return {
-      styleElement
+      styleElement,
+      canAutoScroll: true
     }
   },
   mounted() {
     this.styleElement.innerText = this.css
-    this.$refs.scroller.scrollTo(0, this.$refs.scroller.scrollHeight)
+    this.scrollToBottom()
   },
   beforeDestroy() {
     document.head.removeChild(this.styleElement)
   },
   updated() {
-    this.$refs.scroller.scrollTo(0, this.$refs.scroller.scrollHeight)
+    if (this.canAutoScroll) {
+      this.scrollToBottom()
+    }
   },
   watch: {
     css(val) {
       this.styleElement.innerText = val
     }
+  },
+  methods: {
+    scrollToBottom() {
+      this.$refs.scroller.scrollTop = this.$refs.scroller.scrollHeight
+    },
+    onScroll() {
+      this.canAutoScroll = Math.abs(this.$refs.scroller.scrollHeight - this.$refs.scroller.scrollTop
+                                    - this.$refs.scroller.clientHeight) < 2
+    }
   }
 }
 </script>
diff --git a/frontend/src/views/Home.vue b/frontend/src/views/Home.vue
index 53309eb..f84ceeb 100644
--- a/frontend/src/views/Home.vue
+++ b/frontend/src/views/Home.vue
@@ -10,37 +10,46 @@
         <el-form-item label="房间ID" required prop="roomId">
           <el-input v-model.number="form.roomId" type="number" min="1"></el-input>
         </el-form-item>
-        <el-form-item label="最低显示礼物价格（元）" prop="minGiftPrice">
+        <el-form-item label="显示弹幕">
+          <el-switch v-model="form.showDanmaku"></el-switch>
+        </el-form-item>
+        <el-form-item label="显示礼物和新舰长">
+          <el-switch v-model="form.showGift"></el-switch>
+        </el-form-item>
+        <el-form-item label="合并相似弹幕">
+          <el-switch v-model="form.mergeSimilarDanmaku"></el-switch>
+        </el-form-item>
+        <el-form-item label="最低显示礼物价格（元）">
           <el-input v-model.number="form.minGiftPrice" type="number" min="0"></el-input>
         </el-form-item>
-        <el-form-item label="合并相似弹幕" prop="mergeSimilarDanmaku">
-          <el-switch v-model="form.mergeSimilarDanmaku"></el-switch>
+        <el-form-item label="弹幕最大速度（条/秒，0为无限制）">
+          <el-input v-model.number="form.maxSpeed" type="number" min="0"></el-input>
         </el-form-item>
       </el-tab-pane>
 
       <el-tab-pane label="屏蔽">
-        <el-form-item label="礼物弹幕" prop="blockGiftDanmaku">
+        <el-form-item label="礼物弹幕">
           <el-switch v-model="form.blockGiftDanmaku"></el-switch>
         </el-form-item>
-        <el-form-item label="用户等级低于" prop="blockLevel">
+        <el-form-item label="用户等级低于">
           <el-slider v-model="form.blockLevel" show-input :min="0" :max="60"></el-slider>
         </el-form-item>
-        <el-form-item label="非正式会员" prop="blockNewbie">
+        <el-form-item label="非正式会员">
           <el-switch v-model="form.blockNewbie"></el-switch>
         </el-form-item>
-        <el-form-item label="未绑定手机用户" prop="blockNotMobileVerified">
+        <el-form-item label="未绑定手机用户">
           <el-switch v-model="form.blockNotMobileVerified"></el-switch>
         </el-form-item>
-        <el-form-item label="屏蔽关键词" prop="blockKeywords">
+        <el-form-item label="屏蔽关键词">
           <el-input v-model="form.blockKeywords" type="textarea" :rows="5" placeholder="一行一个"></el-input>
         </el-form-item>
-        <el-form-item label="屏蔽用户" prop="blockUsers">
+        <el-form-item label="屏蔽用户">
           <el-input v-model="form.blockUsers" type="textarea" :rows="5" placeholder="一行一个"></el-input>
         </el-form-item>
       </el-tab-pane>
 
       <el-tab-pane label="样式">
-        <el-form-item label="CSS" prop="css">
+        <el-form-item label="CSS">
           <el-input v-model="form.css" type="textarea" :rows="20"></el-input>
         </el-form-item>
       </el-tab-pane>
diff --git a/frontend/src/views/Room.vue b/frontend/src/views/Room.vue
index d729773..6fe7441 100644
--- a/frontend/src/views/Room.vue
+++ b/frontend/src/views/Room.vue
@@ -20,11 +20,14 @@ export default {
     let cfg = {...config.DEFAULT_CONFIG}
     cfg.blockKeywords = cfg.blockKeywords.split('\n').filter(val => val)
     cfg.blockUsers = cfg.blockUsers.split('\n').filter(val => val)
+    cfg.maxSpeed = 0
     return {
       config: cfg,
       websocket: null,
-      messages: [],
-      nextId: 0
+      messagesBufferTimerId: null,
+      nextId: 0,
+      messagesBuffer: [], // 暂时不显示的消息，可能会丢弃
+      messages: [] // 正在显示的消息
     }
   },
   async created() {
@@ -46,8 +49,22 @@ export default {
     }
   },
   beforeDestroy() {
+    if (this.messagesBufferTimerId) {
+      window.clearInterval(this.messagesBufferTimerId)
+    }
     this.websocket.close()
   },
+  watch: {
+    config(val) {
+      if (this.messagesBufferTimerId) {
+        window.clearInterval(this.messagesBufferTimerId)
+        this.messagesBufferTimerId = null
+      }
+      if (val.maxSpeed > 0) {
+        this.messagesBufferTimerId = window.setInterval(this.handleMessagesBuffer.bind(this), 1000 / val.maxSpeed)
+      }
+    }
+  },
   methods: {
     onWsOpen() {
       this.websocket.send(JSON.stringify({
@@ -63,11 +80,10 @@ export default {
       let time = data.timestamp ? new Date(data.timestamp * 1000) : new Date()
       switch(cmd) {
       case COMMAND_ADD_TEXT:
-        if (!this.filterTextMessage(data) || this.mergeSimilar(data.content)) {
+        if (!this.config.showDanmaku || !this.filterTextMessage(data) || this.mergeSimilar(data.content)) {
           break
         }
         message = {
-          id: this.nextId++,
           type: 0, // TextMessage
           avatarUrl: data.avatarUrl,
           time: `${time.getMinutes()}:${time.getSeconds()}`,
@@ -79,11 +95,13 @@ export default {
         }
         break
       case COMMAND_ADD_GIFT: {
+        if (!this.config.showGift) {
+          break
+        }
         let price = data.totalCoin / 1000
         if (price < this.config.minGiftPrice) // 丢人
           break
         message = {
-          id: this.nextId++,
           type: 2, // PaidMessage
           avatarUrl: data.avatarUrl,
           authorName: data.authorName,
@@ -94,8 +112,10 @@ export default {
         break
       }
       case COMMAND_ADD_MEMBER:
+        if (!this.config.showGift) {
+          break
+        }
         message = {
-          id: this.nextId++,
           type: 1, // LegacyPaidMessage
           avatarUrl: data.avatarUrl,
           time: `${time.getMinutes()}:${time.getSeconds()}`,
@@ -106,10 +126,7 @@ export default {
         break
       }
       if (message) {
-        this.messages.push(message)
-        if (this.messages.length > 50) {
-          this.messages.splice(0, this.messages.length - 50)
-        }
+        this.addMessageBuffer(message)
       }
     },
     filterTextMessage(data) {
@@ -149,6 +166,33 @@ export default {
         }
       }
       return false
+    },
+    addMessageBuffer(message) {
+      if (this.config.maxSpeed > 0 && message.type === 0) {
+        message.addTime = new Date()
+        this.messagesBuffer.push(message)
+      } else {
+        // 无速度限制或者是礼物
+        this.addMessageShow(message)
+      }
+    },
+    addMessageShow(message) {
+      message.id = this.nextId++
+      this.messages.push(message)
+      if (this.messages.length > 50) {
+        this.messages.splice(0, this.messages.length - 50)
+      }
+    },
+    handleMessagesBuffer() {
+      // 3秒内未发出则丢弃
+      let curTime = new Date()
+      while (this.messagesBuffer.length > 0 && curTime - this.messagesBuffer[0].addTime > 3 * 1000) {
+        this.messagesBuffer.shift()
+      }
+      if (this.messagesBuffer.length <= 0) {
+        return
+      }
+      this.addMessageShow(this.messagesBuffer.shift())
     }
   }
 }
diff --git a/views/config.py b/views/config.py
index 989b426..46666a9 100644
--- a/views/config.py
+++ b/views/config.py
@@ -8,9 +8,9 @@ from typing import *
 configs: Dict[str, dict] = {}
 
 ALLOWED_FIELDS = (
-    'minGiftPrice', 'mergeSimilarDanmaku', 'blockGiftDanmaku', 'blockLevel',
-    'blockNewbie', 'blockNotMobileVerified', 'blockKeywords', 'blockUsers',
-    'css'
+    'showDanmaku', 'showGift', 'mergeSimilarDanmaku', 'minGiftPrice', 'maxSpeed',
+    'blockGiftDanmaku', 'blockLevel', 'blockNewbie', 'blockNotMobileVerified',
+    'blockKeywords', 'blockUsers', 'css'
 )