Merge branch 'hakadao:dev' into dev

MengNianxiaoyao · Apr 18, 2024 · 46d36c8 · 46d36c8
2 parents f650507 + 0e97808
commit 46d36c8
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -6,6 +6,7 @@ on:
       # The branch where the project source code resides
       # 项目源代码所在的分支
       - main
+      - dev
     paths-ignore:
       # Changes involving the following path files will not trigger the workflow
       # 涉及以下路径文件的更改不会触发工作流

diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -21,3 +21,4 @@ jobs:
           release-as: 0.16.5
           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}]'
+          default-branch: main
diff --git a/src/components/TopBar/components/FavoritesPop.vue b/src/components/TopBar/components/FavoritesPop.vue
@@ -123,6 +123,10 @@ function changeCategory(categoryItem: FavoriteCategory) {
   activatedFavoriteTitle.value = categoryItem.title
 }
 
+function isMusic(item: FavoriteResource) {
+  return item.link.includes('bilibili://music')
+}
+
 defineExpose({
   refreshFavoriteResources,
 })
@@ -224,7 +228,8 @@ defineExpose({
           <a
             v-for="item in favoriteResources"
             :key="item.id"
-            :href="`//www.bilibili.com/video/${item.bvid}`" :target="isHomePage() ? '_blank' : '_self'" rel="noopener noreferrer"
+            :href="isMusic(item) ? `https://www.bilibili.com/audio/au${item.id}` : `//www.bilibili.com/video/${item.bvid}`"
+            :target="isHomePage() ? '_blank' : '_self'" rel="noopener noreferrer"
             hover:bg="$bew-fill-2"
             rounded="$bew-radius"
             m="first:t-50px last:b-4" p="2"

diff --git a/src/contentScripts/views/Favorites/Favorites.vue b/src/contentScripts/views/Favorites/Favorites.vue
@@ -95,8 +95,8 @@ async function getFavoriteCategories() {
 
 /**
  * Get favorite video resources
- * @param mediaId
- * @param pageNum
+ * @param media_id
+ * @param pn
  * @param keyword
  */
 async function getFavoriteResources(
@@ -168,6 +168,10 @@ function handleUnfavorite(favoriteResource: FavoriteResource) {
       favoriteResources.splice(favoriteResources.indexOf(favoriteResource as FavoriteItem), 1)
   })
 }
+
+function isMusic(item: FavoriteResource) {
+  return item.link.includes('bilibili://music')
+}
 </script>
 
 <template>
@@ -214,7 +218,8 @@ function handleUnfavorite(favoriteResource: FavoriteResource) {
               :view="item.cnt_info.play"
               :danmaku="item.cnt_info.danmaku"
               :published-timestamp="item.pubtime"
-              :bvid="item.bvid"
+              :bvid="isMusic(item) ? undefined : item.bvid"
+              :uri="isMusic(item) ? `https://www.bilibili.com/audio/au${item.id}` : undefined"
               group
             >
               <template #coverTopLeft>