Merge branch 'preview-fixes'

.github-json/data/workflows/build.json

@@ -26,7 +26,7 @@
         },
         {
           "name": "Install dependencies",
-          "uses": "pnpm/action-setup@v2.2.4",
+          "uses": "pnpm/action-setup@v4",
           "with": {
             "version": "8.12.1",
             "run_install": true

.github-json/data/workflows/pull-request-check.json

@@ -8,14 +8,14 @@
       "runs-on": "ubuntu-latest",
       "steps": [
         {
-          "uses": "actions/checkout@v2",
+          "uses": "actions/checkout@v3",
           "with": {
             "ref": "${{ github.event.pull_request.head.sha }}"
           }
         },
         {
           "name": "Install dependencies",
-          "uses": "pnpm/action-setup@v2.2.4",
+          "uses": "pnpm/action-setup@v4",
           "with": {
             "version": "8.12.1",
             "run_install": true

.github/workflows/build.yml

@@ -20,7 +20,7 @@ jobs:
           git config --global core.autocrlf true
           git config --global core.safecrlf false
       - name: Install dependencies
-        uses: pnpm/action-setup@v2.2.4
+        uses: pnpm/action-setup@v4
         with:
           version: 8.12.1
           run_install: true

.github/workflows/pull-request-check.yml

@@ -5,11 +5,11 @@ jobs:
   check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha }}
       - name: Install dependencies
-        uses: pnpm/action-setup@v2.2.4
+        uses: pnpm/action-setup@v4
         with:
           version: 8.12.1
           run_install: true

.vscode/settings.json

@@ -62,6 +62,7 @@
     "linebreak",
     "Liveroom",
     "materialdesignicons",
+    "matroska",
     "medialist",
     "mimetype",
     "minmax",
@@ -133,6 +134,6 @@
     "*.tsx": "${capture}.ts",
     "tsconfig.json": "tsconfig.*.json",
     "package.json": "package-lock.json, yarn.lock, pnpm-lock.yaml, .*",
-    "index.ts": "index.*.ts, index.md, index.*.md",
+    "index.ts": "index.*.ts, index.md, index.*.md"
   }
 }

CHANGELOG.md

@@ -1,7 +1,51 @@
 <!-- spell-checker: disable -->
 # 更新日志
 
-## v2.8.11-preview
+## v2.9.0-preview
+`2024-07-19`
+
+✨新增
+- `简化直播间` 支持屏蔽推荐直播间. (#4787)
+- 新增功能 `删除直播马赛克遮罩` (#4634, PR #4814)
+> 删除观看直播时某些分区的马赛克遮罩.
+
+- `启用视频截图` 截出来的图支持直接复制. (此功能需要 Firefox 127 版本以上) (#4806)
+- `图片批量导出`, `下载视频` 支持更多变量, 详情可在更新组件后查看设置中的说明: (#3852)
+  - 动态 ID, 用户 ID, 动态发布时间, 被转发动态相关数据
+  - 专栏 cv 号, 专栏发布时间
+  - (仅对批量视频下载 (分P / 合集) 有效) up 主名称, up 主 ID, 视频发布时间
+- `自定义顶栏` 的稍后再看和历史面板现在始终显示 "已观看" 状态. (#4346)
+- `自定义顶栏` 的稍后再看, 收藏和历史面板优化了分 P 数和观看进度的展示, 详见[此处](https://github.com/the1812/Bilibili-Evolved/discussions/1866#discussioncomment-10075203). (#1866)
+
+🗑️废弃
+- 删除 `下载视频` 的 Toast 输出方式.
+
+## v2.8.13
+`2024-07-19`
+
+<details>
+<summary>获得 v2.8.12-preview 的所有新功能, 点击展开查看</summary>
+
+✨新增
+- `下载视频 - WASM 混流输出` 支持批量下载. (PR #4726 by [WakelessSloth56](https://github.com/WakelessSloth56))
+- `夜间模式` 增加 `color-scheme` meta 信息, 适配 Chrome 的 [Fluent overlay scrollbars](chrome://flags/#fluent-overlay-scrollbars). (#4717)
+
+</details>
+
+✨新增
+- `删除广告` 支持屏蔽首页的 "广告已被屏蔽" 占位卡片.
+- `自定义顶栏` 增加公益、公开课、社区中心入口. (#1511)
+
+🐛修复
+- 修复 `显示视频投稿时间` 时间显示错误及不显示时间的问题. (#4755, PR #4756 by [呼乎户](https://github.com/wisokey))
+- 修复夜间模式的一些适配问题. (#4376, #4768, #4785, #4802, PR #4763, #4810 by [Pencil](https://github.com/pencilqaq))
+- 修复 `屏蔽黑名单up主` 弹窗高度溢出. (PR #4784 by [snowraincloud](https://github.com/snowraincloud))
+- 修复 `自定义顶栏` 搜索框在 b 站搜索页打字时自动弹出. (#4808)
+
+☕开发者相关
+- 修复 GitHub Workflow 中 pnpm 安装失败.
+
+## v2.8.11-preview / v2.8.12-preview
 `2024-05-14`
 
 包含 [v2.8.11](https://github.com/the1812/Bilibili-Evolved/releases/tag/v2.8.11) 的所有更新内容.
@@ -10,7 +54,7 @@
 - `下载视频 - WASM 混流输出` 支持批量下载. (PR #4726 by [WakelessSloth56](https://github.com/WakelessSloth56))
 - `夜间模式` 增加 `color-scheme` meta 信息, 适配 Chrome 的 [Fluent overlay scrollbars](chrome://flags/#fluent-overlay-scrollbars). (#4717)
 
-## v2.8.11
+## v2.8.11 / v2.8.12
 `2024-05-14`
 
 🐛修复

README.md

@@ -106,7 +106,7 @@
 
 ## 浏览器
 
-支持**最新版** Chrome, Edge (Chromium 内核), Firefox, 不保证脚本能在["套壳类浏览器"](https://www.jianshu.com/p/67d790a8f221)或者较长时间没更新的浏览器中完美运行.
+支持**最新版** Chrome, Firefox, 不保证脚本能在 Safari 和 ["套壳类浏览器"](https://www.jianshu.com/p/67d790a8f221) 中完美运行.
 
 # 开发者
 

doc/donate.md

@@ -29,6 +29,12 @@ https://afdian.net/@the1812?tab=sponsor
 
 | 时间                | 用户名                | 单号后4位 | 金额    |
 | ------------------- | --------------------- | --------- | ------- |
+| 2024.07.16 20:57:01 | *h                    | 4344      | ¥20.00  |
+| 2024.06.10 11:05:25 | *兽                   | 6240      | ¥5.00   |
+| 2024.06.01 14:30:08 | R*0                   | 8974      | ¥50.00  |
+| 2024.06.01 09:26:49 | w*w                   | 3223      | ¥20.00  |
+| 2024.05.18 16:48:31 | *曰                   | 2853      | ¥10.00  |
+| 2024.05.14 14:16:58 | *灵                   | 4515      | ¥6.66   |
 | 2024.05.02 16:06:40 | C*6                   | 9321      | ¥100.00 |
 | 2024.05.02 01:51:05 | 匿名                  | 7540      | ¥5.00   |
 | 2024.04.08 16:02:38 | 匿名                  | 2455      | ¥5.00   |

doc/features/features.json

@@ -27,7 +27,7 @@
     "type": "component",
     "name": "feedsFilter",
     "displayName": "动态过滤器",
-    "description": "按照类型或者关键词过滤动态首页的内容, 也可以移除动态页的一些侧边卡片. 详细设置请前往[动态首页](https://t.bilibili.com/)查看.\r\n",
+    "description": "按照类型或者关键词过滤动态首页的内容, 也可以移除动态页的一些侧边卡片. 详细设置请前往[动态首页](https://t.bilibili.com/)查看.\r\n\r\n> 侧边卡片的 `正在直播` 指原版的板块, 如果你使用了 `直播信息扩充`, 则需要关闭该功能才能生效.\r\n",
     "fullRelativePath": "../../registry/dist/components/feeds/filter.js",
     "fullAbsolutePath": "registry/dist/components/feeds/filter.js"
   },
@@ -1116,7 +1116,7 @@
     "type": "plugin",
     "name": "downloadVideo.outputs.wasm",
     "displayName": "下载视频 - WASM 混流输出",
-    "description": "by [@WakelessSloth56](https://github.com/WakelessSloth56)\n\n使用 WASM 在浏览器中下载并合并音视频",
+    "description": "by [@WakelessSloth56](https://github.com/WakelessSloth56)\n\n使用 WASM 在浏览器中下载并合并音视频, 支持批量下载",
     "fullRelativePath": "../../registry/dist/plugins/video/download/wasm-output.js",
     "fullAbsolutePath": "registry/dist/plugins/video/download/wasm-output.js"
   },

doc/features/features.md

@@ -38,6 +38,8 @@
 
 按照类型或者关键词过滤动态首页的内容, 也可以移除动态页的一些侧边卡片. 详细设置请前往[动态首页](https://t.bilibili.com/)查看.
 
+> 侧边卡片的 `正在直播` 指原版的板块, 如果你使用了 `直播信息扩充`, 则需要关闭该功能才能生效.
+
 ### [强制固定动态侧栏](../../registry/dist/components/feeds/fixed-sidebars.js)
 `fixedFeedsSidebars`
 
@@ -1493,7 +1495,7 @@ by [@diannaojiang](https://github.com/diannaojiang)
 
 by [@WakelessSloth56](https://github.com/WakelessSloth56)
 
-使用 WASM 在浏览器中下载并合并音视频
+使用 WASM 在浏览器中下载并合并音视频, 支持批量下载
 
 ### [快捷键扩展 - 视频倍速](../../registry/dist/plugins/video/player/speed.js)
 `speed.keymap`

registry/lib/components/feeds/filter/FeedsFilterCard.vue

@@ -99,6 +99,9 @@ const sideCards: { [id: number]: SideCardType } = {
     displayName: '发布动态',
   },
 }
+if (getComponentSettings('extendFeedsLive').enabled) {
+  delete sideCards[3]
+}
 let cardsManager: typeof import('@/components/feeds/api').feedsCardsManager
 const sideBlock = 'feeds-filter-side-block-'
 

registry/lib/components/feeds/filter/index.md

@@ -1 +1,3 @@
 按照类型或者关键词过滤动态首页的内容, 也可以移除动态页的一些侧边卡片. 详细设置请前往[动态首页](https://t.bilibili.com/)查看.
+
+> 侧边卡片的 `正在直播` 指原版的板块, 如果你使用了 `直播信息扩充`, 则需要关闭该功能才能生效.

registry/lib/components/style/dark-mode/dark-slice-12.scss

@@ -460,10 +460,6 @@
       @include color("2");
     }
   }
-  .fans-medal-level {
-    @include background-color("2");
-    @include foreground-color();
-  }
 }
 .chat-control-panel .bottom{
   .content {

registry/lib/components/style/dark-mode/dark-slice-16.scss

@@ -173,9 +173,9 @@
   }
 }
 .bili-dyn-list {
-  &__notification {
-    @include theme-background-color();
-    @include foreground-color();
+  &-notification {
+    @include background-color('4');
+    @include theme-color();
   }
 }
 .bili-dyn-item {
@@ -473,6 +473,9 @@
       @include color('e');
     }
   }
+  #page-dynamic & {
+    @include border-color();
+  }
 }
 .bili-dyn-item,
 .bili-opus-view {

registry/lib/components/style/dark-mode/dark-slice-18.scss

@@ -327,9 +327,13 @@
   &.charge-btn-loaded {
     @include background-color();
     @include theme-color();
+    @include theme-border-color();
     &:hover {
       @include theme-background-color('20');
     }
+    .charge-btn-icon {
+      @include to-theme('pink');
+    }
   }
 }
 .magic-adventures .magic-adventures-text {
@@ -722,7 +726,9 @@
   @include set-color('border-top-color', '4');
 }
 #{contains('mediainfo_mediaRight')} {
-  #{contains('mediainfo_media_desc_section')} #{contains('mediainfo_display_area')} #{contains('mediainfo_ellipsis')} {
+  #{contains('mediainfo_media_desc_section')}
+    #{contains('mediainfo_display_area')}
+    #{contains('mediainfo_ellipsis')} {
     background: linear-gradient(90deg, hsla(0, 0%, 100%, 0), #222 20%, #222);
     @include theme-color();
   }
@@ -957,3 +963,39 @@
     }
   }
 }
+
+.message-list-content {
+  .message-content {
+    @include color('f');
+  }
+}
+
+.bili-dyn-card-vote,
+.bili-dyn-upower-lottery__card,
+.bili-dyn-card-link-common__wrap,
+.bili-dyn-card-goods .bili-dyn-card-goods__wrap,
+.bili-dyn-card-reserve .bili-dyn-card-reserve__card {
+  @include background-color('30');
+}
+.bili-dyn-card-goods {
+  &__mark,
+  &__one__detail__price {
+    @include color('a');
+  }
+}
+.reference {
+  .bili-dyn-card-reserve__card,
+  .bili-dyn-card-link-common__wrap,
+  .bili-dyn-card-goods__wrap {
+    @include background-color('30');
+  }
+}
+.article-content {
+  .ql-container {
+    background-color: rgba(0, 0, 0, 0) !important;
+    @include color('cf');
+  }
+  h1,h2,h3,h4,h5,h6{
+    @include color('e');
+  }
+}

registry/lib/components/style/dark-mode/index.ts

@@ -6,27 +6,38 @@ const darkMetaColor = '#111'
 const add = async () => {
   document.body.classList.add('dark')
   localStorage.setItem('pbp_theme_v4', 'b')
-  const meta = dq('meta[name="theme-color"]') as HTMLMetaElement
-  if (!meta) {
+
+  const themeColorMeta = dq('meta[name="theme-color"]') as HTMLMetaElement
+  if (!themeColorMeta) {
     document.head.insertAdjacentHTML(
       'beforeend',
       `<meta name="theme-color" content="${darkMetaColor}">`,
     )
   } else {
-    meta.dataset.light = meta.content
-    meta.content = darkMetaColor
+    themeColorMeta.dataset.light = themeColorMeta.content
+    themeColorMeta.content = darkMetaColor
+  }
+
+  const colorSchemeMeta = dq('meta[name="color-scheme"]') as HTMLMetaElement
+  if (!colorSchemeMeta) {
+    document.head.insertAdjacentHTML('beforeend', `<meta name="color-scheme" content="dark">`)
+  } else {
+    colorSchemeMeta.content = 'dark'
   }
 }
 const remove = async () => {
   document.body.classList.remove('dark')
-  const meta = dq('meta[name="theme-color"]') as HTMLMetaElement
-  if (!meta) {
-    return
-  }
-  if (meta.dataset.light) {
-    meta.content = meta.dataset.light
+
+  const themeColorMeta = dq('meta[name="theme-color"]') as HTMLMetaElement
+  if (themeColorMeta?.dataset.light) {
+    themeColorMeta.content = themeColorMeta.dataset.light
   } else {
-    meta.remove()
+    themeColorMeta?.remove()
+  }
+
+  const colorSchemeMeta = dq('meta[name="color-scheme"]') as HTMLMetaElement
+  if (colorSchemeMeta) {
+    colorSchemeMeta.content = 'light'
   }
 }
 

registry/lib/components/style/dark-mode/old/dark-slice-1.css

@@ -196,7 +196,6 @@ div.con,
 .app-watch,
 #app .submit,
 .appeal-box,
-.fans-medal-item:not(.medal-guard) .fans-medal-level,
 .fans-medal-item .level
 {
     background-color: #222 !important;
@@ -1079,7 +1078,6 @@ li.tag > a,
     color: #00a1d6 !important
 }
 .fans-medal-item .label,
-.fans-medal-item:not(.medal-guard) .fans-medal-label,
 .calendar .day-item,
 .calendar .day-item.cur-day,
 .content-box .watermark-wrap .watermark