From 9bf584f435d3d1a67fa0e3f60b5bd83270767b35 Mon Sep 17 00:00:00 2001
From: Mike Lei <mikelei8291@users.noreply.github.com>
Date: Mon, 5 Dec 2022 23:17:39 +0000
Subject: [PATCH 01/18] fix(fold-comments): use smooth scrolling when folding
 comments

---
 registry/lib/components/feeds/fold-comments/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registry/lib/components/feeds/fold-comments/index.ts b/registry/lib/components/feeds/fold-comments/index.ts
index e75971bd5..2b845e510 100644
--- a/registry/lib/components/feeds/fold-comments/index.ts
+++ b/registry/lib/components/feeds/fold-comments/index.ts
@@ -24,7 +24,7 @@ const entry = async () => {
       button.innerHTML = '收起评论'
       button.addEventListener('click', () => {
         clickHandler()
-        card.scrollIntoView()
+        card.scrollIntoView({ behavior: 'smooth' })
       })
       commentBox.insertAdjacentElement('beforeend', button)
     }

From c658cd67e59fe6b7c454a6e69b3e10eb33465d44 Mon Sep 17 00:00:00 2001
From: the1812 <the1812@outlook.com>
Date: Sat, 10 Dec 2022 21:04:31 +0800
Subject: [PATCH 02/18] Add rollback doc

---
 README.md       |  2 ++
 doc/rollback.md | 21 +++++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 doc/rollback.md

diff --git a/README.md b/README.md
index b0234f047..eb8344af8 100644
--- a/README.md
+++ b/README.md
@@ -41,6 +41,8 @@
 | ----------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------- |
 | [安装](https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master-cdn/dist/bilibili-evolved.user.js) | [安装](https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/dist/bilibili-evolved.user.js) | [安装](https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/dist/bilibili-evolved.preview.user.js) |
 
+> 如果处于某种原因只能停在旧版, 可以参考[旧版本回退指南](./doc/rollback.md).
+
 # 设置
 脚本启用后, 在网页左侧中央会有功能面板和设置面板的入口. 功能面板中包含适用于当前页面的一些功能入口, 设置面板中可以管理组件的开启/关闭, 修改组件选项, 以及安装/卸载组件和插件等.
 
diff --git a/doc/rollback.md b/doc/rollback.md
new file mode 100644
index 000000000..6f15fabb8
--- /dev/null
+++ b/doc/rollback.md
@@ -0,0 +1,21 @@
+# 旧版本回退指南
+
+> ⚠警告: 使用旧版本产生的不兼容 / 功能失效等问题需要自行承担, 本仓库只受理最新版脚本的反馈.
+
+在 [Release](https://github.com/the1812/Bilibili-Evolved/releases) 中找到要回退的版本, 并记住发布的时间.
+
+前往 https://github.com/the1812/Bilibili-Evolved/commits/master/dist/bilibili-evolved.user.js, 找到相同日期中的第一个 `CI Build`, 并点击查看详情.
+
+![image](https://user-images.githubusercontent.com/26504152/206855808-27c0d501-0c98-4f9c-be30-53ad0db715ab.png)
+
+在详情页中右键 `Raw`, 选择 `Save link as...` (链接另存为), 会下载脚本的内容.
+
+![image](https://user-images.githubusercontent.com/26504152/206855884-4a704c4c-4020-47fc-aa04-0f855d73b19b.png)
+
+将脚本内容粘贴覆盖到油猴中, 并删掉这两行检查更新用的配置.
+
+![image](https://user-images.githubusercontent.com/26504152/206856196-fbde3ef9-eddf-4b3f-a12f-12547f2f0494.png)
+
+保存后, 进入 b 站, 从脚本设置中关闭 `自动更新器`.
+
+![image](https://user-images.githubusercontent.com/26504152/206856445-ce5ebeb1-7d58-4602-8c3b-c506efdd5f32.png)

From 9dc2ad58f47d804578f343cad813204c5dfc6b6b Mon Sep 17 00:00:00 2001
From: the1812 <the1812@outlook.com>
Date: Sat, 10 Dec 2022 22:10:56 +0800
Subject: [PATCH 03/18] Refactor navbar history filters (fix #3676, #2729)

---
 .../style/custom-navbar/CustomNavbarItem.vue  |  4 +-
 .../favorites/NavbarFavorites.vue             |  2 +-
 .../custom-navbar/history/NavbarHistory.vue   | 81 ++++++++++++-------
 .../style/custom-navbar/history/history.ts    |  2 +-
 .../style/custom-navbar/history/types.ts      | 34 ++++++--
 .../custom-navbar/settings/NavbarSettings.vue |  2 +-
 .../subscriptions/SubscriptionsList.vue       |  2 +-
 .../custom-navbar/user-info/UserInfoPopup.vue |  6 +-
 .../watchlater/NavbarWatchlater.vue           |  2 +-
 src/ui/CheckBox.vue                           |  2 +-
 10 files changed, 90 insertions(+), 47 deletions(-)

diff --git a/registry/lib/components/style/custom-navbar/CustomNavbarItem.vue b/registry/lib/components/style/custom-navbar/CustomNavbarItem.vue
index d61166464..6bb5f51c0 100644
--- a/registry/lib/components/style/custom-navbar/CustomNavbarItem.vue
+++ b/registry/lib/components/style/custom-navbar/CustomNavbarItem.vue
@@ -155,6 +155,8 @@ export default Vue.extend({
 </script>
 
 <style lang="scss">
+@import 'common';
+
 .custom-navbar-item {
   color: inherit;
   position: relative;
@@ -216,7 +218,7 @@ export default Vue.extend({
   }
 
   &.active .main-content {
-    font-weight: bold;
+    @include semi-bold();
     font-size: 11pt;
   }
 
diff --git a/registry/lib/components/style/custom-navbar/favorites/NavbarFavorites.vue b/registry/lib/components/style/custom-navbar/favorites/NavbarFavorites.vue
index a1a1cb448..b2603f72d 100644
--- a/registry/lib/components/style/custom-navbar/favorites/NavbarFavorites.vue
+++ b/registry/lib/components/style/custom-navbar/favorites/NavbarFavorites.vue
@@ -409,7 +409,7 @@ export default Vue.extend({
         .title {
           grid-area: title;
           font-size: 13px;
-          font-weight: bold;
+          @include semi-bold();
           @include max-line(2);
           -webkit-box-align: start;
           margin: 0;
diff --git a/registry/lib/components/style/custom-navbar/history/NavbarHistory.vue b/registry/lib/components/style/custom-navbar/history/NavbarHistory.vue
index 0a70d3b94..43aa0813b 100644
--- a/registry/lib/components/style/custom-navbar/history/NavbarHistory.vue
+++ b/registry/lib/components/style/custom-navbar/history/NavbarHistory.vue
@@ -25,15 +25,15 @@
         <div class="row-title">过滤:</div>
         <div class="type-filters">
           <div v-for="t of types" :key="t.name" class="type-filter">
-            <VButton
-              round
+            <RadioButton
               :title="(t.checked ? '不显示' : '显示') + t.displayName"
               :class="{ checked: t.checked }"
-              @click="toggleTypeFilter(t)"
+              :checked="t.checked"
+              :disabled="loading"
+              @change="toggleTypeFilter(t)"
             >
-              <VIcon :icon="t.icon" :size="18"></VIcon>
               {{ t.displayName }}
-            </VButton>
+            </RadioButton>
           </div>
         </div>
       </div>
@@ -108,14 +108,24 @@
 import { bilibiliApi, getJsonWithCredentials, postTextWithCredentials } from '@/core/ajax'
 import { formData, getCsrf } from '@/core/utils'
 import { descendingSort } from '@/core/utils/sort'
-import { VButton, VIcon, TextBox, VLoading, VEmpty, ScrollTrigger, DpiImage } from '@/ui'
+import {
+  VButton,
+  VIcon,
+  RadioButton,
+  TextBox,
+  VLoading,
+  VEmpty,
+  ScrollTrigger,
+  DpiImage,
+} from '@/ui'
 import { popperMixin } from '../mixins'
-import { types, TypeFilter, HistoryItem, getHistoryItems, group } from './types'
+import { types, TypeFilter, HistoryItem, getHistoryItems, group, HistoryType } from './types'
 
 export default Vue.extend({
   components: {
     VButton,
     VIcon,
+    RadioButton,
     TextBox,
     VLoading,
     VEmpty,
@@ -137,17 +147,12 @@ export default Vue.extend({
   },
   computed: {
     canNextPage() {
-      return (
-        this.search === '' &&
-        !this.loading &&
-        this.hasMorePage &&
-        this.types.every((t: TypeFilter) => t.checked)
-      )
+      return this.search === '' && !this.loading && this.hasMorePage
     },
   },
   watch: {
     search: lodash.debounce(function search() {
-      this.updateGroups()
+      this.reloadHistoryItems()
     }, 200),
   },
   async created() {
@@ -159,11 +164,22 @@ export default Vue.extend({
   },
   methods: {
     toggleTypeFilter(typeFilter: TypeFilter) {
-      typeFilter.checked = !typeFilter.checked
-      this.updateGroups()
+      types.forEach(t => (t.checked = t.name === typeFilter.name))
+      this.reloadHistoryItems()
+    },
+    async reloadHistoryItems() {
+      this.viewTime = 0
+      this.hasMorePage = true
+      this.loading = true
+      try {
+        await this.nextPage()
+      } finally {
+        this.loading = false
+      }
     },
     filterFunc(item: HistoryItem) {
-      if (types.some(t => t.name === item.type && !t.checked)) {
+      const isAllType = types.find(it => it.name === HistoryType.All).checked
+      if (!isAllType && types.some(t => t.name === item.type && !t.checked)) {
         return false
       }
       if (
@@ -178,7 +194,10 @@ export default Vue.extend({
       this.groups = group(this.cards.filter(this.filterFunc))
     },
     async nextPage() {
-      const items = await getHistoryItems(this.viewTime)
+      const items = await getHistoryItems(
+        this.viewTime,
+        types.find(t => t.checked),
+      )
       const cards: HistoryItem[] = lodash.uniqBy(
         this.cards.concat(items).sort(descendingSort((item: HistoryItem) => item.viewAt)),
         item => item.id,
@@ -188,7 +207,10 @@ export default Vue.extend({
       if (cards.length > 0) {
         this.viewTime = lodash.last(cards).viewAt
       }
-      this.hasMorePage = cards.length !== 0
+      this.hasMorePage = items.length !== 0
+      if (this.hasMorePage && this.groups.length === 0) {
+        await this.nextPage()
+      }
     },
     async updateHistoryPauseState() {
       const result = await bilibiliApi(
@@ -223,7 +245,7 @@ export default Vue.extend({
 @import '../popup';
 
 .custom-navbar-history-list {
-  width: 350px;
+  width: 400px;
   @include navbar-popup-height();
   font-size: 12px;
   padding: 0;
@@ -251,23 +273,22 @@ export default Vue.extend({
     margin: 16px 12px 4px 12px;
     .header-row {
       @include h-stretch(8px);
-      justify-content: space-between;
       .row-title {
         @include h-center();
       }
     }
     .type-filters {
-      @include h-center(8px);
+      @include h-center(6px);
       .type-filter {
         .be-button {
           padding: 4px 8px 4px 6px;
-          color: #8888;
-          .be-icon {
-            margin-right: 6px;
-          }
-          &.checked {
-            color: inherit;
-          }
+          // color: #8888;
+          // .be-icon {
+          //   margin-right: 6px;
+          // }
+          // &.checked {
+          //   color: inherit;
+          // }
         }
       }
     }
@@ -402,8 +423,8 @@ export default Vue.extend({
               }
             }
             .title {
+              @include semi-bold();
               grid-area: title;
-              font-weight: bold;
               white-space: nowrap;
               overflow: hidden;
               text-overflow: ellipsis;
diff --git a/registry/lib/components/style/custom-navbar/history/history.ts b/registry/lib/components/style/custom-navbar/history/history.ts
index e843f1be9..e91f7f330 100644
--- a/registry/lib/components/style/custom-navbar/history/history.ts
+++ b/registry/lib/components/style/custom-navbar/history/history.ts
@@ -11,7 +11,7 @@ export const history: CustomNavbarItemInit = {
   active: document.URL.replace(/\?.*$/, '') === href,
   loginRequired: true,
 
-  boundingWidth: 350,
+  boundingWidth: 400,
   noPopupPadding: true,
   popupContent: () => import('./NavbarHistory.vue').then(m => m.default),
 }
diff --git a/registry/lib/components/style/custom-navbar/history/types.ts b/registry/lib/components/style/custom-navbar/history/types.ts
index 383db4e4f..b6f9ad7f1 100644
--- a/registry/lib/components/style/custom-navbar/history/types.ts
+++ b/registry/lib/components/style/custom-navbar/history/types.ts
@@ -4,6 +4,7 @@ import { formatDuration } from '@/core/utils/formatters'
 
 /** 历史项目类型, 值为 API 中的 `history.business` */
 export enum HistoryType {
+  All = 'all',
   Video = 'archive',
   Live = 'live',
   Article = 'article',
@@ -48,32 +49,44 @@ export interface TypeFilter {
   displayName: string
   icon: string
   checked: boolean
+  apiType: string
 }
 /** 所有的历史记录类型 */
 export const types = [
+  {
+    name: HistoryType.All,
+    displayName: '全部',
+    icon: '',
+    checked: true,
+    apiType: '',
+  },
   {
     name: HistoryType.Video,
     displayName: '视频',
     icon: 'mdi-play-circle-outline',
-    checked: true,
+    checked: false,
+    apiType: 'archive',
   },
   {
     name: HistoryType.Bangumi,
     displayName: '番剧',
     icon: 'mdi-television-classic',
-    checked: true,
+    checked: false,
+    apiType: 'archive',
   },
   {
     name: HistoryType.Live,
     displayName: '直播',
     icon: 'mdi-video-wireless-outline',
-    checked: true,
+    checked: false,
+    apiType: 'live',
   },
   {
     name: HistoryType.Article,
     displayName: '专栏',
     icon: 'mdi-newspaper-variant-outline',
-    checked: true,
+    checked: false,
+    apiType: 'article',
   },
 ] as TypeFilter[]
 
@@ -188,12 +201,17 @@ const parseHistoryItem = (item: any): HistoryItem => {
  * 获取指定观看时间之前的一页历史记录, 不指定则返回最新的历史记录
  * @param viewTime 观看时间
  */
-export const getHistoryItems = async (viewTime?: number) => {
-  let api = 'https://api.bilibili.com/x/web-interface/history/cursor'
+export const getHistoryItems = async (viewTime?: number, type?: TypeFilter) => {
+  const api = 'https://api.bilibili.com/x/web-interface/history/cursor'
+  const params = new URLSearchParams()
   if (viewTime) {
-    api += `?view_at=${Math.round(viewTime / 1000)}`
+    params.set('view_at', Math.round(viewTime / 1000).toString())
   }
-  const { list } = await bilibiliApi(getJsonWithCredentials(api), '获取历史记录失败')
+  params.set('type', type?.apiType ?? '')
+  const { list } = await bilibiliApi(
+    getJsonWithCredentials(`${api}?${params.toString()}`),
+    '获取历史记录失败',
+  )
   if (!Array.isArray(list)) {
     return []
   }
diff --git a/registry/lib/components/style/custom-navbar/settings/NavbarSettings.vue b/registry/lib/components/style/custom-navbar/settings/NavbarSettings.vue
index e2c3327ee..3a8ed3ea0 100644
--- a/registry/lib/components/style/custom-navbar/settings/NavbarSettings.vue
+++ b/registry/lib/components/style/custom-navbar/settings/NavbarSettings.vue
@@ -186,7 +186,7 @@ export default Vue.extend({
     .title {
       margin-left: 6px;
       font-size: 18px;
-      font-weight: bold;
+      @include semi-bold();
     }
     .grow {
       flex: 1;
diff --git a/registry/lib/components/style/custom-navbar/subscriptions/SubscriptionsList.vue b/registry/lib/components/style/custom-navbar/subscriptions/SubscriptionsList.vue
index 4896ad6b1..a24478bbd 100644
--- a/registry/lib/components/style/custom-navbar/subscriptions/SubscriptionsList.vue
+++ b/registry/lib/components/style/custom-navbar/subscriptions/SubscriptionsList.vue
@@ -233,7 +233,7 @@ export default Vue.extend({
       }
       .title {
         font-size: 14px;
-        font-weight: bold;
+        @include semi-bold();
         padding-top: 4px;
         color: inherit;
         white-space: nowrap;
diff --git a/registry/lib/components/style/custom-navbar/user-info/UserInfoPopup.vue b/registry/lib/components/style/custom-navbar/user-info/UserInfoPopup.vue
index b1a033b17..fbec1668f 100644
--- a/registry/lib/components/style/custom-navbar/user-info/UserInfoPopup.vue
+++ b/registry/lib/components/style/custom-navbar/user-info/UserInfoPopup.vue
@@ -325,6 +325,8 @@ export default Vue.extend({
 </script>
 
 <style lang="scss">
+@import 'common';
+
 .user-info-panel {
   border-radius: 8px;
   overflow: hidden;
@@ -441,7 +443,7 @@ export default Vue.extend({
   .welcome,
   .name {
     font-size: 16px;
-    font-weight: bold;
+    @include semi-bold();
     margin: 46px 0 16px 0;
     text-align: center;
     color: inherit;
@@ -495,7 +497,7 @@ export default Vue.extend({
         color: var(--theme-color) !important;
       }
       .stats-number {
-        font-weight: bold;
+        @include semi-bold();
         margin-bottom: 4px;
         font-size: 14px;
         transition: none;
diff --git a/registry/lib/components/style/custom-navbar/watchlater/NavbarWatchlater.vue b/registry/lib/components/style/custom-navbar/watchlater/NavbarWatchlater.vue
index 7eac77eb8..f5b808174 100644
--- a/registry/lib/components/style/custom-navbar/watchlater/NavbarWatchlater.vue
+++ b/registry/lib/components/style/custom-navbar/watchlater/NavbarWatchlater.vue
@@ -326,7 +326,7 @@ export default Vue.extend({
       .title {
         grid-area: title;
         font-size: 13px;
-        font-weight: bold;
+        @include semi-bold();
         margin: 0;
         margin-top: 8px;
         padding: 0 10px;
diff --git a/src/ui/CheckBox.vue b/src/ui/CheckBox.vue
index bcf3a28b3..e449bf150 100644
--- a/src/ui/CheckBox.vue
+++ b/src/ui/CheckBox.vue
@@ -91,7 +91,7 @@ export default Vue.extend({
   &.left-icon {
     .icon-container {
       order: -1;
-      margin: 2px 8px 2px 0;
+      margin: 2px 6px 2px 0;
     }
   }
 }

From 93f1b8009457c588d32baff1c8e981b1475d939d Mon Sep 17 00:00:00 2001
From: the1812 <the1812@outlook.com>
Date: Mon, 12 Dec 2022 23:43:25 +0800
Subject: [PATCH 04/18] Block ads in search page (fix #3863)

---
 .../utils/remove-promotions/index.ts          |  7 ++++++
 .../remove-promotions/remove-promotions.scss  | 24 +++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/registry/lib/components/utils/remove-promotions/index.ts b/registry/lib/components/utils/remove-promotions/index.ts
index d910260f4..3854cc28b 100644
--- a/registry/lib/components/utils/remove-promotions/index.ts
+++ b/registry/lib/components/utils/remove-promotions/index.ts
@@ -67,6 +67,13 @@ const entry: ComponentEntry = async ({ settings, metadata }) => {
     },
     true,
   )
+  addComponentListener(
+    `${metadata.name}.showPlaceholder`,
+    (value: boolean) => {
+      document.body.classList.toggle('promotion-show-placeholder', value)
+    },
+    true,
+  )
 }
 export const component = defineComponentMetadata({
   name: 'removePromotions',
diff --git a/registry/lib/components/utils/remove-promotions/remove-promotions.scss b/registry/lib/components/utils/remove-promotions/remove-promotions.scss
index 81996d44c..b0be7f671 100644
--- a/registry/lib/components/utils/remove-promotions/remove-promotions.scss
+++ b/registry/lib/components/utils/remove-promotions/remove-promotions.scss
@@ -1,3 +1,5 @@
+@import 'common';
+
 #slide_ad,
 .v-wrap .vcd,
 .ad-report,
@@ -76,3 +78,25 @@ body.dark .blocked-ads.new {
   pointer-events: none !important;
   opacity: 0 !important;
 }
+.bili-video-card__wrap {
+  a[href*="cm.bilibili.com"] {
+    > * {
+      visibility: hidden !important;
+    }
+    & ~ .bili-video-card__info {
+      display: none !important;
+    }
+    body.promotion-show-placeholder &::before {
+      content: "🚫已屏蔽广告";
+      border-radius: 6px;
+      @include h-center();
+      justify-content: center;
+      position: absolute;
+      z-index: 2;
+      font-size: 16px;
+      width: 100%;
+      height: 100%;
+      background-color: #8882;
+    }
+  }
+}

From 97e9bc0c3e0c02d2e83f7f6ddcb35042c504829c Mon Sep 17 00:00:00 2001
From: the1812 <the1812@outlook.com>
Date: Thu, 15 Dec 2022 00:13:37 +0800
Subject: [PATCH 05/18] Change license to custom

---
 LICENCE    | 21 ---------------------
 LICENCE.md |  1 +
 README.md  | 16 ++++++++++++++--
 3 files changed, 15 insertions(+), 23 deletions(-)
 delete mode 100644 LICENCE
 create mode 100644 LICENCE.md

diff --git a/LICENCE b/LICENCE
deleted file mode 100644
index 17e413b4d..000000000
--- a/LICENCE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2021 Grant Howard
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/LICENCE.md b/LICENCE.md
new file mode 100644
index 000000000..1767c9616
--- /dev/null
+++ b/LICENCE.md
@@ -0,0 +1 @@
+见 [开源许可](./README.md#开源许可).
diff --git a/README.md b/README.md
index eb8344af8..12a192892 100644
--- a/README.md
+++ b/README.md
@@ -29,8 +29,10 @@
 **注意事项**
 - **⚠ 使用正式版 (GitHub 源) 和预览版须翻墙.**
 - 默认不带任何具体功能, 需要在按[设置](#设置)中的说明添加感兴趣的功能.
-- 可能不能使用弹幕点赞和举报
-- 全景视频不能用鼠标拖拽视角(只能用键盘操作)
+- 这个是一个综合性的脚本, 如果只是想下载视频建议去 [GreasyFork](https://greasyfork.org/zh-CN/scripts/by-site/bilibili.com) 找个更专业的.
+- 可能不能使用弹幕点赞和举报.
+- 全景视频不能用鼠标拖拽视角(只能用键盘操作).
+- 默认屏蔽双击全屏, 如有需要可以安装 `双击全屏` 组件来恢复.
 - 对性能有较大影响.
 - 默认不对未登录的状态做适配.
 - 新版本一旦正式发布, 就不再对旧版本做任何技术支持.
@@ -117,6 +119,16 @@
 
 但是, 任何组件/插件都对用户数据有着完全的访问能力, 对于其他来源(非本仓库提供)的组件/插件, 请自行甄别其安全性.
 
+# 开源许可
+源代码基于 [MIT 许可](https://zh.wikipedia.org/zh-cn/MIT%E8%A8%B1%E5%8F%AF%E8%AD%89) 公开.
+
+但存在一些限制:
+- 如果需要在其他地方发布此脚本<sup>1</sup>, 则必须满足以下条件之一:
+  - 保留此 README 文档, 且安装入口只存在于此文档的 ["安装"](#安装) 章节中, 不得额外提供跳过 README 文档阅读即可安装的方式.
+  - 自行处理相关联的技术支持, 不得直接导向本仓库. 也就是必须 Fork 并修改所有指向本仓库的反馈渠道, 包括 Issues 和 Discussions. 本仓库不对来自其他来源安装的脚本提供技术支持.
+
+> <sup>1</sup> 指发布脚本的完整内容, 例如直接将安装链接 (以 `.user.js` 结尾) 发布, 或者在 GreasyFork 等脚本托管站点导入. 如果只是指向本仓库的页面链接 (例如 `https://github.com/the1812/Bilibili-Evolved`) 是没关系的.
+
 # 第三方开源组件
 👍感谢这些组件帮助我们极大地提升了开发效率.
 

From 3d2a712ef59c667cd27f266727ebe43c859c8b66 Mon Sep 17 00:00:00 2001
From: wisokey <57711857+wisokey@users.noreply.github.com>
Date: Fri, 16 Dec 2022 23:59:51 +0800
Subject: [PATCH 06/18] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E6=8A=95=E7=A8=BF=E6=97=B6=E9=97=B4=E9=80=82=E9=85=8D=E6=96=B0?=
 =?UTF-8?q?=E7=89=88=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../video/player/show-upload-time/index.ts    | 32 ++++++++++++++++---
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/registry/lib/components/video/player/show-upload-time/index.ts b/registry/lib/components/video/player/show-upload-time/index.ts
index 23a7ad390..4a94e218b 100644
--- a/registry/lib/components/video/player/show-upload-time/index.ts
+++ b/registry/lib/components/video/player/show-upload-time/index.ts
@@ -4,6 +4,7 @@ import { playerReady } from '@/core/utils'
 import { videoUrls } from '@/core/utils/urls'
 import { getVueData } from '@/components/feeds/api'
 import { VideoInfo } from '@/components/video/video-info'
+import { useScopedConsole } from '@/core/utils/log'
 
 interface RecommendList extends Vue {
   isOpen: boolean
@@ -15,35 +16,41 @@ interface RecommendList extends Vue {
       name: string
     }
   }[]
-  $children: VideoPageCard[]
+  $children: (RecommendList & VideoPageCard)[]
 }
 
 interface VideoPageCard extends Vue {
   name: string
   title: string
+  // 组件添加元素，非b站自有元素
   mark: boolean
   item: {
     aid: string
     ctime: number
     owner: {
+      // 组件添加元素，非b站自有元素
       mark: boolean
       name: string
     }
   }
 }
 
+const displayName = '显示视频投稿时间'
+const console = useScopedConsole(displayName)
 export const component = defineComponentMetadata({
   author: { name: 'wisokey', link: 'https://github.com/wisokey' },
   name: 'showUploadTime',
-  displayName: '显示视频投稿时间',
+  displayName,
   description: '为视频播放页面的推荐列表中的视频添加显示视频投稿时间.',
   tags: [componentsTags.video],
   urlInclude: videoUrls,
   entry: async () => {
     const showUploadTime = (relist: VideoPageCard[]) => {
       relist.forEach(async video => {
+        // 确认存放推荐视频列表的List中的元素是否被更新
         if (!video.item.owner.mark) {
           video.item.owner.mark = true
+          // 确认推荐视频卡片是否被更新
           if (!video.mark) {
             video.mark = true
             let createTime: Date
@@ -58,22 +65,39 @@ export const component = defineComponentMetadata({
               createTime.getMonth() + 1
             }-${createTime.getDate()}`
           }
+          // 保存生成后的name
           video.item.owner.name = video.name
         }
       })
     }
 
+    const getRecoList = () => {
+      const reco_list = dq('#reco_list')
+      let recoList: RecommendList = getVueData(reco_list)
+      if (recoList.isOpen === undefined) {
+        recoList = recoList.$children[0]
+        if (recoList.isOpen === undefined) {
+          console.log('结构获取失败')
+          console.log(document.URL)
+          console.log(recoList)
+        }
+      }
+      return recoList
+    }
+
     urlChange(async () => {
       await playerReady()
-      const relist: VideoPageCard[] = getVueData(dq('#reco_list')).$children.filter(
+      const recoList: RecommendList = getRecoList()
+      const relist: VideoPageCard[] = recoList.$children.filter(
         video => video.$el.className.indexOf('special') === -1,
       )
       showUploadTime(relist)
     })
 
     await playerReady()
+    // 监视推荐列表是否打开，如果打开则更新
     childList(dq('#reco_list .rec-list'), async () => {
-      const recoList: RecommendList = getVueData(dq('#reco_list'))
+      const recoList: RecommendList = getRecoList()
       if (recoList.isOpen) {
         const relist: VideoPageCard[] = recoList.$children.filter(
           video => video.$el.className.indexOf('special') === -1,

From 739ef5ef9e4059ef3aeeca8358a50cc655b15120 Mon Sep 17 00:00:00 2001
From: the1812 <the1812@outlook.com>
Date: Thu, 29 Dec 2022 22:04:03 +0800
Subject: [PATCH 07/18] Fix language code (fix #3873)

---
 .../video/subtitle/download/utils.ts          | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/registry/lib/components/video/subtitle/download/utils.ts b/registry/lib/components/video/subtitle/download/utils.ts
index 3e5046f5f..e765c1a82 100644
--- a/registry/lib/components/video/subtitle/download/utils.ts
+++ b/registry/lib/components/video/subtitle/download/utils.ts
@@ -9,7 +9,10 @@ export const getSubtitleConfig = async (): Promise<[SubtitleConverterConfig, str
     '../subtitle-converter'
   )
   const { playerAgent } = await import('@/components/video/player-agent')
-  const playerSettingsText = localStorage.getItem('bilibili_player_settings')
+  const isBpxPlayer = dq('.bpx-player-video-wrap')
+  const playerSettingsText = isBpxPlayer
+    ? localStorage.getItem('bpx_player_profile')
+    : localStorage.getItem('bilibili_player_settings')
   if (!playerSettingsText) {
     return [SubtitleConverter.defaultConfig, '']
   }
@@ -24,8 +27,11 @@ export const getSubtitleConfig = async (): Promise<[SubtitleConverterConfig, str
     1.6: SubtitleSize.VeryLarge,
   }
   const size = fontSizeMapping[subtitleSettings.fontsize]
-  const color = subtitleSettings.color.toString(16)
-  const opacity = subtitleSettings.backgroundopacity
+  const color =
+    typeof subtitleSettings.color === 'number'
+      ? subtitleSettings.color.toString(16)
+      : parseInt(subtitleSettings.color).toString(16)
+  const opacity = subtitleSettings.backgroundopacity ?? subtitleSettings.opacity
 
   const positions = {
     bc: SubtitleLocation.BottomCenter,
@@ -34,6 +40,12 @@ export const getSubtitleConfig = async (): Promise<[SubtitleConverterConfig, str
     tc: SubtitleLocation.TopCenter,
     tl: SubtitleLocation.TopLeft,
     tr: SubtitleLocation.TopRight,
+    'bottom-center': SubtitleLocation.BottomCenter,
+    'bottom-left': SubtitleLocation.BottomLeft,
+    'bottom-right': SubtitleLocation.BottomRight,
+    'top-center': SubtitleLocation.TopCenter,
+    'top-left': SubtitleLocation.TopLeft,
+    'top-right': SubtitleLocation.TopRight,
   }
   const subtitleLocation = positions[subtitleSettings.position]
 
@@ -76,7 +88,7 @@ export const getBlobByType = async (
     return null
   }
   const [config, language] = await getSubtitleConfig()
-  const subtitle = subtitles.find(s => s.language === language) || subtitles[0]
+  const subtitle = subtitles.find(s => s.languageCode === language) || subtitles[0]
   const json = await getJson(subtitle.url)
   const rawData = json.body
   switch (type) {

From e4ff5b2ed3583e81468f904e6c98df76bd0a90fb Mon Sep 17 00:00:00 2001
From: the1812 <the1812@outlook.com>
Date: Thu, 29 Dec 2022 22:08:23 +0800
Subject: [PATCH 08/18] Fix pbp color for old player (fix #3830)

---
 registry/lib/components/style/dark-mode/dark-slice-17.scss | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/registry/lib/components/style/dark-mode/dark-slice-17.scss b/registry/lib/components/style/dark-mode/dark-slice-17.scss
index f3d9d5ade..760c76685 100644
--- a/registry/lib/components/style/dark-mode/dark-slice-17.scss
+++ b/registry/lib/components/style/dark-mode/dark-slice-17.scss
@@ -891,3 +891,6 @@
 .right-area .tip-wrap .icon path[fill="#00AEEC"] {
   @include theme-fill();
 }
+.bpx-player-pbp-videoshot rect[clip-path] {
+  @include theme-fill();
+}

From 79dbded04e1b3882fb9c45a564a78d2b8e2d83d0 Mon Sep 17 00:00:00 2001
From: the1812 <the1812@outlook.com>
Date: Thu, 29 Dec 2022 22:16:03 +0800
Subject: [PATCH 09/18] Fix episode title style (fix #3841)

---
 .../components/video/full-episode-title/full-episode-title.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registry/lib/components/video/full-episode-title/full-episode-title.scss b/registry/lib/components/video/full-episode-title/full-episode-title.scss
index 8455de53d..8f3b7d82d 100644
--- a/registry/lib/components/video/full-episode-title/full-episode-title.scss
+++ b/registry/lib/components/video/full-episode-title/full-episode-title.scss
@@ -1,5 +1,5 @@
 body {
-  &.full-episode-title {
+  &.full-episode-title:not(.disable-full-episode-list) {
     .base-video-sections-v1 {
       .video-episode-card {
         height: auto !important;

From e2084715f43eef6a9372356f0d511d598978dd1f Mon Sep 17 00:00:00 2001
From: the1812 <the1812@outlook.com>
Date: Thu, 29 Dec 2022 22:19:29 +0800
Subject: [PATCH 10/18] Update clean params (#3896)

---
 registry/lib/components/utils/url-params-clean/index.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/registry/lib/components/utils/url-params-clean/index.ts b/registry/lib/components/utils/url-params-clean/index.ts
index dfdc11d6d..9fac4dd99 100644
--- a/registry/lib/components/utils/url-params-clean/index.ts
+++ b/registry/lib/components/utils/url-params-clean/index.ts
@@ -48,6 +48,7 @@ const entry = async () => {
     '-Arouter',
     'vd_source',
     'is_story_h5',
+    'buvid',
   ]
   const [blockParams] = registerAndGetData('urlParamsClean.params', builtInBlockParams)
   const builtInSiteSpecifiedParams = [
@@ -63,6 +64,14 @@ const entry = async () => {
       match: /\/\/www\.bilibili\.com\/bangumi\//,
       param: 'theme',
     },
+    {
+      match: /\/\/www\.bilibili\.com\/video\//,
+      param: 'mid',
+    },
+    {
+      match: /\/\/www\.bilibili\.com\/video\//,
+      param: 'up_id',
+    },
   ]
   const [siteSpecifiedParams] = registerAndGetData(
     'urlParamsClean.siteSpecifiedParams',

From 469bb6dd0438526165068a010ba8a0832b08830e Mon Sep 17 00:00:00 2001
From: the1812 <the1812@outlook.com>
Date: Thu, 29 Dec 2022 22:34:33 +0800
Subject: [PATCH 11/18] Update special danmaku styles (fix #3886)

---
 .../components/style/special-danmaku/index.ts | 11 ++++-
 .../special-danmaku/special-danmaku.scss      | 43 +++++++++++--------
 2 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/registry/lib/components/style/special-danmaku/index.ts b/registry/lib/components/style/special-danmaku/index.ts
index ad105ccd5..142bd9385 100644
--- a/registry/lib/components/style/special-danmaku/index.ts
+++ b/registry/lib/components/style/special-danmaku/index.ts
@@ -4,7 +4,6 @@ import {
   OptionsOfMetadata,
 } from '@/components/define'
 import { ComponentEntry } from '@/components/types'
-import { toggleStyle } from '@/components/styled-component'
 import { playerUrls } from '@/core/utils/urls'
 import { addComponentListener } from '@/core/settings'
 
@@ -33,10 +32,18 @@ const entry: ComponentEntry<Options> = ({ metadata, settings }) => {
   })
 }
 
+const name = 'disableSpecialDanmaku'
 export const component = defineComponentMetadata({
+  name,
+  entry,
   displayName: '禁用特殊弹幕样式',
   tags: [componentsTags.style],
-  ...toggleStyle('disableSpecialDanmaku', () => import('./special-danmaku.scss'), entry),
+  instantStyles: [
+    {
+      name,
+      style: () => import('./special-danmaku.scss'),
+    },
+  ],
   urlInclude: playerUrls,
   description: {
     'zh-CN': '移除高赞弹幕或 UP 主弹幕的特殊样式, 弹幕内容不会移除.',
diff --git a/registry/lib/components/style/special-danmaku/special-danmaku.scss b/registry/lib/components/style/special-danmaku/special-danmaku.scss
index 610503e7d..aff243359 100644
--- a/registry/lib/components/style/special-danmaku/special-danmaku.scss
+++ b/registry/lib/components/style/special-danmaku/special-danmaku.scss
@@ -1,21 +1,30 @@
-body.disable-highlight-danmaku-style .b-danmaku-high {
-  display: block !important;
-  padding: 0 !important;
-  line-height: 1.125 !important;
-  .b-danmaku-high-icon {
-    display: none !important;
-  }
-  .b-danmaku-high-text {
-    margin: 0 !important;
-    text-shadow: inherit;
+body.disable-highlight-danmaku-style {
+  .bili-dm.bili-high,
+  .b-danmaku-high {
+    display: block !important;
+    padding: 0 !important;
+    line-height: 1.125 !important;
+    .bili-high-icon,
+    .b-danmaku-high-icon {
+      display: none !important;
+    }
+    .bili-high-text,
+    .b-danmaku-high-text {
+      margin: 0 !important;
+      text-shadow: inherit;
+    }
   }
 }
-body.disable-up-danmaku-style .b-danmaku-up {
-  padding: 0 !important;
-  line-height: 1.125 !important;
-  background-color: transparent !important;
-  border-radius: 0 !important;
-  .b-danmaku-up-tip {
-    display: none !important;
+body.disable-up-danmaku-style {
+  .bili-dm.bili-up,
+  .b-danmaku-up {
+    padding: 0 !important;
+    line-height: 1.125 !important;
+    background-color: transparent !important;
+    border-radius: 0 !important;
+    .bili-up-tip,
+    .b-danmaku-up-tip {
+      display: none !important;
+    }
   }
 }

From 780d67b4a4251921da53203ddd48a9dfe7277736 Mon Sep 17 00:00:00 2001
From: the1812 <the1812@outlook.com>
Date: Thu, 29 Dec 2022 23:21:16 +0800
Subject: [PATCH 12/18] Update video popup class (fix #3853)

---
 .../lib/components/video/player/remove-popup/index.md  |  1 +
 .../lib/components/video/player/remove-popup/index.ts  |  3 ---
 .../video/player/remove-popup/remove-popup.scss        | 10 ++++++++++
 3 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 registry/lib/components/video/player/remove-popup/index.md

diff --git a/registry/lib/components/video/player/remove-popup/index.md b/registry/lib/components/video/player/remove-popup/index.md
new file mode 100644
index 000000000..23fc7f5c2
--- /dev/null
+++ b/registry/lib/components/video/player/remove-popup/index.md
@@ -0,0 +1 @@
+删除视频播放器中出现的各种弹窗, 类别可在选项中分别选择.
diff --git a/registry/lib/components/video/player/remove-popup/index.ts b/registry/lib/components/video/player/remove-popup/index.ts
index f115c58bd..0d2cc6ae9 100644
--- a/registry/lib/components/video/player/remove-popup/index.ts
+++ b/registry/lib/components/video/player/remove-popup/index.ts
@@ -29,9 +29,6 @@ export const component = defineComponentMetadata({
   ],
   displayName: '删除视频弹窗',
   tags: [componentsTags.video, componentsTags.style],
-  description: {
-    'zh-CN': '删除视频播放器中出现的各种弹窗, 类别可在选项中分别选择.',
-  },
   urlInclude: playerUrls,
   options: {
     votes: {
diff --git a/registry/lib/components/video/player/remove-popup/remove-popup.scss b/registry/lib/components/video/player/remove-popup/remove-popup.scss
index 0f20f72ed..4ecda65df 100644
--- a/registry/lib/components/video/player/remove-popup/remove-popup.scss
+++ b/registry/lib/components/video/player/remove-popup/remove-popup.scss
@@ -1,6 +1,8 @@
 body {
   &.remove-player-popup {
+    // https://www.bilibili.com/video/BV1V54y1b7yW/
     &-combo-likes {
+      .bili-guide,
       .bilibili-player-video-popup-three,
       .bilibili-player-video-popup-three-animate,
       .bilibili-player-video-popup-follow,
@@ -12,14 +14,18 @@ body {
         display: none !important;
       }
     }
+    // https://www.bilibili.com/video/BV11h411k72c/
     &-related-videos {
+      .bili-link,
       .bilibili-player-video-link,
       .bilibili-player-link,
       .bpx-player-link {
         display: none !important;
       }
     }
+    // https://www.bilibili.com/video/BV12Y4y1L7SR/
     &-votes {
+      .bili-vote,
       .bilibili-player-video-popup-vote,
       .bpx-player-popup-dm-close,
       .bpx-player-popup-dm-shrink,
@@ -27,7 +33,9 @@ body {
         display: none !important;
       }
     }
+    // https://www.bilibili.com/video/BV1V54y1b7yW/
     &-rates {
+      .bili-score,
       .bilibili-player-score,
       .bpx-player-popup-dm-close,
       .bpx-player-score-summary-wrap,
@@ -35,7 +43,9 @@ body {
         display: none !important;
       }
     }
+    // https://www.bilibili.com/video/BV1fe4y1b7NE/
     &-reservations {
+      .bili-reserve,
       .bpx-player-reserve {
         display: none !important;
       }

From 77082dfe262797b04fc5c9203f35440ea8c991df Mon Sep 17 00:00:00 2001
From: the1812 <the1812@outlook.com>
Date: Fri, 30 Dec 2022 09:45:01 +0800
Subject: [PATCH 13/18] Allow section folding (#3764)

---
 .../components/video/full-episode-title/full-episode-title.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registry/lib/components/video/full-episode-title/full-episode-title.scss b/registry/lib/components/video/full-episode-title/full-episode-title.scss
index 8f3b7d82d..b1ffc6ff1 100644
--- a/registry/lib/components/video/full-episode-title/full-episode-title.scss
+++ b/registry/lib/components/video/full-episode-title/full-episode-title.scss
@@ -43,7 +43,7 @@ body {
     .video-sections-content-list {
       max-height: unset !important;
       height: auto !important;
-      .video-section-list {
+      .video-section-list:not([style*="height: 0px"]) {
         height: auto !important;
       }
     }

From 191f227750c63eac20c847316743100f51bd4984 Mon Sep 17 00:00:00 2001
From: the1812 <the1812@outlook.com>
Date: Sun, 1 Jan 2023 16:11:17 +0800
Subject: [PATCH 14/18] Update docs

---
 .github/ISSUE_TEMPLATE/bug_report.yml |  6 +++---
 doc/issue-rules.md                    | 12 +++++-------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 2228eeab1..f2d33ab7d 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -50,7 +50,7 @@ body:
     attributes:
       label: 播放器版本
       description: |
-        在 b 站播放器上右键可以看到播放器版本号, 大于 3 的别反馈视频相关功能了, 去 [#3187](https://github.com/the1812/Bilibili-Evolved/issues/3187) 里有. 如果是 2, 还要确认下是不是新版播放页, 需要返回旧版才能使用脚本功能. (辨认方法可参考 [#3384](https://github.com/the1812/Bilibili-Evolved/discussions/3384))
+        在 b 站播放器上右键可以看到播放器版本号
       placeholder: 请输入
     validations:
       required: true
@@ -71,8 +71,8 @@ body:
     attributes:
       label: 错误信息
       description: |
-        脚本直接报告的错误信息, 或者浏览器开发者工具 (F12 或 Ctrl+Shift+I 召唤) 里 Console / 控制台 一栏的输出, 在过滤里填入 `bilibili evolved`, 剩下的信息就可以粘贴过来, 太长的话可以截图放下面. <br><img width="400" src="https://user-images.githubusercontent.com/26504152/173189611-f1e9e46a-a31d-4d21-a95a-5771e16372dd.png">
-      render: shell
+        脚本直接报告的错误信息, 或者浏览器开发者工具 (F12 或 Ctrl+Shift+I 召唤) 里 Console / 控制台 一栏的输出, 太长的话可以截图放下面. <br><img width="400" src="https://user-images.githubusercontent.com/26504152/173189611-f1e9e46a-a31d-4d21-a95a-5771e16372dd.png">
+      render: Shell
       placeholder: 请输入
     validations:
       required: true
diff --git a/doc/issue-rules.md b/doc/issue-rules.md
index c19fce75c..c6d698931 100644
--- a/doc/issue-rules.md
+++ b/doc/issue-rules.md
@@ -5,7 +5,7 @@ Issues 用于记录 Bug 等发生异常问题的情况, 如果您希望讨论新
 > 请注意 Issues 和 Discussions (讨论区) 是两个独立板块, 搜索结果是相互独立的, Issues 搜索不到的内容可能能在 Discussions 里搜到.
 >
 > 讨论区于 2020-12-10 启用, 在此之前的新功能建议 / 提问 / 答疑的讨论仍然可以在 Issues 这边搜索到.
-> 
+>
 > 讨论区使用指南见 https://github.com/the1812/Bilibili-Evolved/discussions/1297
 
 发之前记得看下置顶 (Pinned) 的 issue (如果有的话), 当遇到一些我认为会影响绝大部分用户的情况时, 我就会把这个 issue 置顶.
@@ -18,8 +18,6 @@ Issues 用于记录 Bug 等发生异常问题的情况, 如果您希望讨论新
 
 Bug 反馈不仅仅是描述您遇到了什么样的 bug, 更重要的是总结一套步骤, 按照这个步骤来就能稳定遇到 bug. (对应模板中的`问题描述`) 其次是一些环境信息, 模板中也已经给出, 通常包括`脚本版本`, `浏览器版本`, `错误信息`等. 有时候我可能还会需要您导出脚本设置.
 
-> 提示: 最好先在预览离线版(Preview Offline)中测试一下, 有些问题可能已经修复了但还未正式发布.
-
 我们对此的处理方式如下:
 1. 对于给出了所有必要信息的 bug 反馈, 我们会尽量尝试重现并修复这个 bug, 优先级高于功能请求.
 2. 信息不全或者无法重现的, 我们有空的话会追问更多信息, 争取转变为上一条的情况; 没空的话可能就没有回复了, 但会留个心眼, 如果我们之后遇到了会再找过来解决的, 当然您主动提供更多信息自然更好.
@@ -37,10 +35,10 @@ Bug 反馈不一定会做出回复, 特别是内容写得非常清晰时, 我就
 附部分标签含义解释:
 > 讨论区的功能对应的标签这里不再列出.
 
-- `bug`: 确认为Bug, 将会处理
-- `maybe-bug`: 可能是Bug, 待测试验证
-- `adaptation`: b站的变化导致脚本未跟进适配
-- `bad-issue`: 不符合以上规范的issue
+- `bug`: 确认为 Bug, 将会处理
+- `maybe-bug`: 可能是 Bug, 待测试验证
+- `adaptation`: b 站的变化导致脚本未跟进适配
+- `bad-issue`: 不符合以上规范的 issue
 - `compatibility`: 兼容性问题
 - `duplicate`: 重复
 - `help-wanted`: 没啥解决思路

From c316983f416fec41c544f9f5b64b0572c86b10d9 Mon Sep 17 00:00:00 2001
From: the1812 <the1812@outlook.com>
Date: Sun, 1 Jan 2023 17:08:06 +0800
Subject: [PATCH 15/18] Update changelog

---
 CHANGELOG.md | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ad618ca5..9c3ae73c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,47 @@
 # 更新日志
 
+## v2.6.0-preview
+`2023-01-01`
+
+包含 v2.6.0 的所有更新内容.
+
+✨新增
+- 新增功能 `批量导入合集`. (PR #3884 by [swhoro](https://github.com/swhoro))
+> 在合集页面制作一个批量导入按钮，可以新增所有合集内视频至同名收藏夹
+
+- `扩展倍速` 添加 `隐藏移除图标` 和 `隐藏新增图标` 选项. (PR #3864 by [Tinhone](https://github.com/Tinhone))
+- 新增插件 `快捷键扩展 - 开关 CC 字幕`, 默认为 <kbd>Shift</kbd> + <kbd>C</kbd>. (#3407)
+
+🐛修复
+- 修复新版播放页下 `简化评论区` 的样式. (#3872)
+- `StreamSaver` 下载补充三方 cookie 说明. (#3824)
+
+☕开发者相关
+- 完成 define API + SwitchOptions API 的改造 (受影响组件为 `简化首页` 和 `简化直播间`), 感谢 [timongh](https://github.com/timongh) 的长期贡献.
+- 重新拆分了一下 PlayerAgent 的文件.
+
+## v2.6.0
+`2023-01-01`
+
+✨新增
+- `快速收起评论区` 添加了平滑滚动效果. (PR #3857 by [Mike Lei](https://github.com/mikelei8291))
+- `删除广告` 新增对搜索页广告的的屏蔽. (#3863)
+- `显示视频投稿时间` 适配新版播放页. (#3860, PR #3880 by [wisokey](https://github.com/wisokey))
+- `网址参数清理` 新增 `buvid`, `mid`, `up_id` 的清理. (#3896)
+- `选集区域优化` 支持折叠合集下的分组. (#3764)
+
+🐛修复
+- 重新调整了 `自定义顶栏` 的历史弹窗过滤器, 改为只能选择 `全部` 或者单一类型 (#2729), 解决专栏加载不出来的问题 (#3676).
+- 修复 `下载字幕` 在 3.x 播放器检测不到语言选项的问题. (#3873)
+- 修复旧版播放页中高能进度条未跟随主题颜色. (#3830)
+- 修复 `选集区域优化` 临时收起时, 多行标题出现布局问题. (#3841)
+- 修复 `禁用特殊弹幕样式` 失效. (#3886)
+- 修复 `删除视频弹窗` 失效. (#3853)
+- 修复 `自定义顶栏` 开启后原版顶栏高度异常. (#3833) (应该还需要再优化下, 现在还会有点小空隙, 不过没之前那么离谱了)
+- `隐藏视频标题层` 补充 `视频` 标签. (#3839)
+
 ## v2.5.2-preview
+`2022-11-19`
 
 包含 v2.5.2 的所有更新内容.
 

From 8909e8ea9976dc5d3dadac1a12a107c5b7bd758a Mon Sep 17 00:00:00 2001
From: the1812 <the1812@outlook.com>
Date: Sun, 1 Jan 2023 17:08:11 +0800
Subject: [PATCH 16/18] Update version and year

---
 CONTRIBUTING.md             | 2 +-
 src/client/common.meta.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index bba1f2257..b82cf8644 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -30,7 +30,7 @@ pnpm install
 // @description  Bilibili Evolved (本地)
 // @version      300.0
 // @author       Grant Howard, Coulomb-G
-// @copyright    2022, Grant Howard (https://github.com/the1812) & Coulomb-G (https://github.com/Coulomb-G)
+// @copyright    2023, Grant Howard (https://github.com/the1812) & Coulomb-G (https://github.com/Coulomb-G)
 // @license      MIT
 // @match        *://*.bilibili.com/*
 // @exclude      *://*.bilibili.com/*/mobile.html
diff --git a/src/client/common.meta.json b/src/client/common.meta.json
index 9af3463f5..27922d027 100644
--- a/src/client/common.meta.json
+++ b/src/client/common.meta.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.5.2",
+  "version": "2.6.0",
   "author": "Grant Howard, Coulomb-G",
   "copyright": "[year], Grant Howard (https://github.com/the1812) & Coulomb-G (https://github.com/Coulomb-G)",
   "license": "MIT",

From adfb2c0132c93cbbee3d2e622793f09fde84b6a2 Mon Sep 17 00:00:00 2001
From: the1812 <the1812@outlook.com>
Date: Sun, 1 Jan 2023 17:23:03 +0800
Subject: [PATCH 17/18] Update donate table

---
 doc/donate.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/doc/donate.md b/doc/donate.md
index 6444cf7bd..253d8cad8 100644
--- a/doc/donate.md
+++ b/doc/donate.md
@@ -28,6 +28,15 @@ https://afdian.net/@the1812?tab=sponsor
 
 | 时间                | 用户名           | 单号后4位 | 金额    |
 | ------------------- | ---------------- | --------- | ------- |
+| 2022.12.31 16:59:32 | *梦              | 6802      | ¥5.00   |
+| 2022.12.26 22:36:34 | b*8              | 3849      | ¥2.50   |
+| 2022.12.16 12:27:57 | *訪              | 6143      | ¥3.79   |
+| 2022.12.16 11:10:46 | U*               | 8902      | ¥1.00   |
+| 2022.12.13 21:43:21 | Y*l              | 3706      | ¥5.00   |
+| 2022.12.12 22:44:19 | 匿名             | 8546      | ¥10.00  |
+| 2022.12.05 15:52:54 | 匿名             | 9553      | ¥5.00   |
+| 2022.11.27 15:27:00 | gary8177         | 0627      | ¥10.00  |
+| 2022.11.26 12:47:00 | 匿名             | 3570      | ¥10.00  |
 | 2022.11.18 18:53:22 | 匿名             | 4381      | ¥3.00   |
 | 2022.11.15 17:47:37 | *歌              | 4853      | ¥1.00   |
 | 2022.11.08 09:13:48 | 匿名             | 7879      | ¥5.00   |

From 2b14fea1d9dc861abd5add6f739e820b5aafe8be Mon Sep 17 00:00:00 2001
From: the1812 <the1812@outlook.com>
Date: Sun, 1 Jan 2023 17:26:40 +0800
Subject: [PATCH 18/18] Update docs

---
 doc/features/features.json  | 2 +-
 doc/features/pack/pack.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/features/features.json b/doc/features/features.json
index bc3d20cb9..224331352 100644
--- a/doc/features/features.json
+++ b/doc/features/features.json
@@ -667,7 +667,7 @@
     "type": "component",
     "name": "removePlayerPopup",
     "displayName": "删除视频弹窗",
-    "description": "删除视频播放器中出现的各种弹窗, 类别可在选项中分别选择.",
+    "description": "删除视频播放器中出现的各种弹窗, 类别可在选项中分别选择.\r\n",
     "fullRelativePath": "../../registry/dist/components/video/player/remove-popup.js",
     "fullAbsolutePath": "registry/dist/components/video/player/remove-popup.js"
   },
diff --git a/doc/features/pack/pack.json b/doc/features/pack/pack.json
index 14a4b8cae..67d002dcc 100644
--- a/doc/features/pack/pack.json
+++ b/doc/features/pack/pack.json
@@ -37,7 +37,7 @@
         "type": "component",
         "name": "removePlayerPopup",
         "displayName": "删除视频弹窗",
-        "description": "删除视频播放器中出现的各种弹窗, 类别可在选项中分别选择.",
+        "description": "删除视频播放器中出现的各种弹窗, 类别可在选项中分别选择.\r\n",
         "fullRelativePath": "../../registry/dist/components/video/player/remove-popup.js",
         "fullAbsolutePath": "registry/dist/components/video/player/remove-popup.js"
       },