Merge branch 'main' into dev

.github/workflows/changelog.yml

@@ -19,6 +19,6 @@ jobs:
           token: ${{ secrets.RELEASE_TOKEN }}
           release-type: node
           package-name: release-please-action
-          release-as: 0.15.0
+          release-as: 0.15.1
           signoff: 'github-actions <41898282+github-actions[bot]@users.noreply.github.com>'
           changelog-types: '[{"type":"types","section":"Types","hidden":false},{"type":"revert","section":"Reverts","hidden":false},{"type":"feat","section":"Features","hidden":false},{"type":"fix","section":"Bug Fixes","hidden":false},{"type":"improvement","section":"Feature Improvements","hidden":false},{"type":"docs","section":"Docs","hidden":false},{"type":"i18n","section":"I18n","hidden":true},{"type":"style","section":"Style Changes","hidden":false},{"type":"ci","section":"CI","hidden":false},{"type":"chore","section":"Miscellaneous","hidden":true},{"type":"contributor","section":"New Contributors","hidden":false},{"type":"notice","section":"Notices","hidden":false}]'

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [0.15.1](https://github.com/hakadao/BewlyBewly/compare/v0.15.0...v0.15.1) (2024-03-11)
+
+
+### Bug Fixes
+
+* resolve issue when using ad-blocking extensions blocks entire page ([#375](https://github.com/hakadao/BewlyBewly/issues/375)) ([30ec6ab](https://github.com/hakadao/BewlyBewly/commit/30ec6abba04e1a1b489d39326f4e6300f9fec599))
+* **TopBar:** moments icon badges show the 0 ([#376](https://github.com/hakadao/BewlyBewly/issues/376)) ([bf7309d](https://github.com/hakadao/BewlyBewly/commit/bf7309d320c855aaab516e26086b76dd5492c5e1))
+
 ## [0.15.0](https://github.com/hakadao/BewlyBewly/compare/v0.14.9...v0.15.0) (2024-03-10)
 
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "bewly-bewly",
   "displayName": "BewlyBewly",
-  "version": "0.15.0",
+  "version": "0.15.1",
   "private": true,
   "packageManager": "pnpm@8.15.3",
   "description": "Just make a few small changes to your Bilibili homepage.",

src/components/TopBar/TopBar.vue

@@ -452,7 +452,7 @@ defineExpose({
                 @mouseenter="showNotificationsPop = true"
                 @mouseleave="showNotificationsPop = false"
               >
-                <template v-if="unReadMessageCount !== 0">
+                <template v-if="unReadMessageCount > 0">
                   <div
                     v-if="settings.topBarIconBadges === 'number'"
                     class="unread-message"
@@ -487,7 +487,7 @@ defineExpose({
                 @mouseenter="showMomentsPop = true"
                 @mouseleave="showMomentsPop = false"
               >
-                <template v-if="unReadMessageCount !== 0">
+                <template v-if="newMomentsCount > 0">
                   <div
                     v-if="settings.topBarIconBadges === 'number'"
                     class="unread-message"

src/contentScripts/views/App.vue

@@ -254,10 +254,12 @@ function handleOsScroll() {
 }
 
 function handleBlockAds() {
+  // Do not use the "ads" keyword. AdGuard, AdBlock, and some ad-blocking extensions will
+  // detect and remove it when the class name contains "ads"
   if (settings.value.blockAds)
-    document.documentElement.classList.add('block-ads')
+    document.documentElement.classList.add('block-useless-contents')
   else
-    document.documentElement.classList.remove('block-ads')
+    document.documentElement.classList.remove('block-useless-contents')
 }
 
 function handleDisableFrostedGlass() {

src/styles/blockAds.scss

@@ -1,4 +1,6 @@
-.block-ads {
+// Do not use the "ads" keyword. AdGuard, AdBlock, and some ad-blocking extensions will
+// detect and remove it when the class name contains "ads"
+.block-useless-contents {
   // 原版首頁最右則推介內容
   .floor-single-card,
   // 首頁不能使用不感興趣的影片都當廣告殺了
@@ -16,7 +18,7 @@
   }
 
   // 首頁推介頂部卡片間距調整
-  .recommended-container_floor-aside .container>*:nth-of-type(n + 8) {
+  .recommended-container_floor-aside .container > *:nth-of-type(n + 8) {
     margin-top: 0px !important;
     margin-bottom: 24px;
   }