Merge branch 'development' into feature/channel-page-update-icon

* development: (78 commits)
  Bump the stylelint group with 2 updates (FreeTubeApp#5411)
  Bump rimraf from 5.0.8 to 6.0.1 (FreeTubeApp#5412)
  Translated using Weblate (Indonesian)
  Bump the babel group across 1 directory with 3 updates (FreeTubeApp#5419)
  Bump sass from 1.77.6 to 1.77.8 (FreeTubeApp#5413)
  Bump webpack from 5.92.1 to 5.93.0 (FreeTubeApp#5414)
  Bump lefthook from 1.7.1 to 1.7.2 (FreeTubeApp#5415)
  Bump electron from 31.1.0 to 31.2.0 (FreeTubeApp#5416)
  Fix about page not reacting to locale changes (FreeTubeApp#5393)
  Delete .github/workflows/report.yml (FreeTubeApp#5395)
  Bump version number to v0.21.1
  Fix Invidious DASH manifest generation (FreeTubeApp#5387)
  ^ Update YouTube.js to 10.1.0 (FreeTubeApp#5384)
  Fix Invidious API error toasts saying undefined (FreeTubeApp#5380)
  Bump lefthook from 1.6.18 to 1.7.1 (FreeTubeApp#5376)
  Bump eslint-plugin-vue from 9.26.0 to 9.27.0 in the eslint group (FreeTubeApp#5371)
  Bump rimraf from 5.0.7 to 5.0.8 (FreeTubeApp#5373)
  Bump npm-run-all2 from 6.2.0 to 6.2.2 (FreeTubeApp#5374)
  Bump marked from 13.0.1 to 13.0.2 (FreeTubeApp#5375)
  Translated using Weblate (Portuguese (Brazil))
  ...

# Conflicts:
#	src/renderer/components/side-nav/side-nav.css

.github/workflows/flatpak.yml

@@ -77,25 +77,25 @@ jobs:
         date +"%Y-%m-%d" >> $GITHUB_ENV
         echo 'EOF' >> $GITHUB_ENV
     - name: Update x64 File Location in yml File
-      uses: mikefarah/yq@4.0.0-beta1
+      uses: mikefarah/yq@v4.44.2
       with:
         # The Command which should be run
-        cmd: yq w -i io.freetubeapp.FreeTube.yml modules[0].sources[0].url 'https://github.com/FreeTubeApp/FreeTube/releases/download/v${{ steps.sub.outputs.result }}-beta/freetube-${{ steps.sub.outputs.result }}-linux-portable-x64.zip'
+        cmd: yq -i '.modules[0].sources[0].url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${{ steps.sub.outputs.result }}-beta/freetube-${{ steps.sub.outputs.result }}-linux-portable-x64.zip"' io.freetubeapp.FreeTube.yml
     - name: Update x64 Hash in yml File
-      uses: mikefarah/yq@4.0.0-beta1
+      uses: mikefarah/yq@v4.44.2
       with:
         # The Command which should be run
-        cmd: yq w -i io.freetubeapp.FreeTube.yml modules[0].sources[0].sha256 ${{ env.HASH_X64 }}
+        cmd: yq -i '.modules[0].sources[0].sha256 = "${{ env.HASH_X64 }}"' io.freetubeapp.FreeTube.yml
     - name: Update ARM File Location in yml File
-      uses: mikefarah/yq@4.0.0-beta1
+      uses: mikefarah/yq@v4.44.2
       with:
         # The Command which should be run
-        cmd: yq w -i io.freetubeapp.FreeTube.yml modules[0].sources[1].url 'https://github.com/FreeTubeApp/FreeTube/releases/download/v${{ steps.sub.outputs.result }}-beta/freetube-${{ steps.sub.outputs.result }}-linux-portable-arm64.zip'
+        cmd: yq -i '.modules[0].sources[1].url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${{ steps.sub.outputs.result }}-beta/freetube-${{ steps.sub.outputs.result }}-linux-portable-arm64.zip"' io.freetubeapp.FreeTube.yml
     - name: Update ARM Hash in yml File
-      uses: mikefarah/yq@4.0.0-beta1
+      uses: mikefarah/yq@v4.44.2
       with:
         # The Command which should be run
-        cmd: yq w -i io.freetubeapp.FreeTube.yml modules[0].sources[1].sha256 ${{ env.HASH_ARM64 }}
+        cmd: yq -i '.modules[0].sources[1].sha256 = "${{ env.HASH_ARM64 }}"' io.freetubeapp.FreeTube.yml
     - name: Add Patch Notes to XML File
       run: xmlstarlet ed -L -i /application/releases/release[1] -t elem -n releaseTMP -v "" -i //releaseTMP -t attr -n version -v "${{ steps.sub.outputs.result }} Beta" -i //releaseTMP -t attr -n date -v "${{ env.CURRENT_DATE }}" -s //releaseTMP -t elem -n url -v "" -s //releaseTMP/url -t text -n "" -v "https://github.com/FreeTubeApp/FreeTube/releases/tag/v${{ steps.sub.outputs.result }}-beta" -r //releaseTMP -v "release" io.freetubeapp.FreeTube.metainfo.xml
     - name: Remove Release Files

README.md

@@ -150,14 +150,10 @@ If you ever have any questions, feel free to ask it on our [Discussions](https:/
 > Don't forget to check out the [rules](https://docs.freetubeapp.io/community/matrix/) before joining.
 
 ## Donate
-If you enjoy using FreeTube, you're welcome to leave a donation using the following methods.  
-
-* [FreeTube on Liberapay](https://liberapay.com/FreeTube)
+If you enjoy using FreeTube, you're welcome to leave a donation using the following method.  
 
 * Bitcoin Address: `1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS`
 
-* Monero Address: `48WyAPdjwc6VokeXACxSZCFeKEXBiYPV6GjfvBsfg4CrUJ95LLCQSfpM9pvNKy5GE5H4hNaw99P8RZyzmaU9kb1pD7kzhCB`
-
 While your donations are much appreciated, only donate if you really want to.  Donations are used for keeping the website up and running and eventual code signing costs. 
 
 > [!TIP]

_scripts/webpack.renderer.config.js

@@ -150,8 +150,9 @@ const config = {
   resolve: {
     alias: {
       vue$: 'vue/dist/vue.runtime.esm.js',
+      'portal-vue$': 'portal-vue/dist/portal-vue.esm.js',
 
-      'DB_HANDLERS_ELECTRON_RENDERER_OR_WEB$': path.resolve(__dirname, '../src/datastores/handlers/electron.js'),
+      DB_HANDLERS_ELECTRON_RENDERER_OR_WEB$: path.resolve(__dirname, '../src/datastores/handlers/electron.js'),
 
       'youtubei.js$': 'youtubei.js/web',
 

_scripts/webpack.web.config.js

@@ -159,8 +159,9 @@ const config = {
   resolve: {
     alias: {
       vue$: 'vue/dist/vue.runtime.esm.js',
+      'portal-vue$': 'portal-vue/dist/portal-vue.esm.js',
 
-      'DB_HANDLERS_ELECTRON_RENDERER_OR_WEB$': path.resolve(__dirname, '../src/datastores/handlers/web.js'),
+      DB_HANDLERS_ELECTRON_RENDERER_OR_WEB$: path.resolve(__dirname, '../src/datastores/handlers/web.js'),
 
       // video.js's mpd-parser uses @xmldom/xmldom so that it can support both node and web browsers
       // As FreeTube only runs in electron and web browsers, we can use the native DOMParser class, instead of the "polyfill"

package.json

@@ -2,7 +2,7 @@
   "name": "freetube",
   "productName": "FreeTube",
   "description": "A private YouTube client",
-  "version": "0.20.0",
+  "version": "0.21.1",
   "license": "AGPL-3.0-or-later",
   "main": "./dist/main.js",
   "private": true,
@@ -61,9 +61,9 @@
     "@seald-io/nedb": "^4.0.4",
     "@silvermine/videojs-quality-selector": "^1.3.1",
     "autolinker": "^4.0.0",
-    "electron-context-menu": "^4.0.0",
+    "electron-context-menu": "^4.0.1",
     "lodash.debounce": "^4.0.8",
-    "marked": "^12.0.2",
+    "marked": "^13.0.2",
     "path-browserify": "^1.0.1",
     "portal-vue": "^2.1.7",
     "process": "^0.11.10",
@@ -79,55 +79,55 @@
     "vue-observe-visibility": "^1.0.0",
     "vue-router": "^3.6.5",
     "vuex": "^3.6.2",
-    "youtubei.js": "^10.0.0"
+    "youtubei.js": "^10.1.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.24.7",
-    "@babel/eslint-parser": "^7.24.7",
+    "@babel/core": "^7.24.9",
+    "@babel/eslint-parser": "^7.24.8",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/preset-env": "^7.24.7",
+    "@babel/preset-env": "^7.24.8",
     "@double-great/stylelint-a11y": "^3.0.2",
     "@intlify/eslint-plugin-vue-i18n": "^3.0.0",
     "babel-loader": "^9.1.3",
     "copy-webpack-plugin": "^12.0.2",
     "css-loader": "^7.1.2",
     "css-minimizer-webpack-plugin": "^7.0.0",
-    "electron": "^31.0.1",
+    "electron": "^31.2.0",
     "electron-builder": "^24.13.3",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-jsonc": "^2.16.0",
-    "eslint-plugin-n": "^17.8.1",
+    "eslint-plugin-n": "^17.9.0",
     "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-promise": "^6.2.0",
-    "eslint-plugin-unicorn": "^53.0.0",
-    "eslint-plugin-vue": "^9.26.0",
-    "eslint-plugin-vuejs-accessibility": "^2.3.0",
+    "eslint-plugin-promise": "^6.4.0",
+    "eslint-plugin-unicorn": "^54.0.0",
+    "eslint-plugin-vue": "^9.27.0",
+    "eslint-plugin-vuejs-accessibility": "^2.3.1",
     "eslint-plugin-yml": "^1.14.0",
     "html-webpack-plugin": "^5.6.0",
     "js-yaml": "^4.1.0",
     "json-minimizer-webpack-plugin": "^5.0.0",
-    "lefthook": "^1.6.15",
+    "lefthook": "^1.7.2",
     "mini-css-extract-plugin": "^2.9.0",
-    "npm-run-all2": "^6.2.0",
-    "postcss": "^8.4.38",
+    "npm-run-all2": "^6.2.2",
+    "postcss": "^8.4.39",
     "postcss-scss": "^4.0.9",
     "prettier": "^2.8.8",
-    "rimraf": "^5.0.7",
-    "sass": "^1.77.4",
+    "rimraf": "^6.0.1",
+    "sass": "^1.77.8",
     "sass-loader": "^14.2.1",
-    "stylelint": "^16.6.1",
-    "stylelint-config-sass-guidelines": "^11.1.0",
-    "stylelint-config-standard": "^36.0.0",
+    "stylelint": "^16.7.0",
+    "stylelint-config-sass-guidelines": "^12.0.0",
+    "stylelint-config-standard": "^36.0.1",
     "stylelint-high-performance-animation": "^1.10.0",
     "stylelint-use-logical-spec": "^5.0.1",
     "tree-kill": "1.2.2",
     "vue-devtools": "^5.1.4",
     "vue-eslint-parser": "^9.4.3",
     "vue-loader": "^15.10.0",
-    "webpack": "^5.91.0",
+    "webpack": "^5.93.0",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^5.0.4",
     "yaml-eslint-parser": "^1.2.3"

src/constants.js

@@ -55,6 +55,11 @@ const DBActions = {
     UPDATE_PLAYLIST: 'db-action-history-update-playlist',
   },
 
+  PROFILES: {
+    ADD_CHANNEL: 'db-action-profiles-add-channel',
+    REMOVE_CHANNEL: 'db-action-profiles-remove-channel'
+  },
+
   PLAYLISTS: {
     UPSERT_VIDEO: 'db-action-playlists-upsert-video-by-playlist-name',
     UPSERT_VIDEOS: 'db-action-playlists-upsert-videos-by-playlist-name',
@@ -77,6 +82,11 @@ const SyncEvents = {
     UPDATE_PLAYLIST: 'sync-history-update-playlist',
   },
 
+  PROFILES: {
+    ADD_CHANNEL: 'sync-profiles-add-channel',
+    REMOVE_CHANNEL: 'sync-profiles-remove-channel'
+  },
+
   PLAYLISTS: {
     UPSERT_VIDEO: 'sync-playlists-upsert-video',
     DELETE_VIDEO: 'sync-playlists-delete-video',
@@ -98,9 +108,6 @@ const SEARCH_CHAR_LIMIT = 100
 // Displayed on the about page and used in the main.js file to only allow bitcoin URLs with this wallet address to be opened
 const ABOUT_BITCOIN_ADDRESS = '1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
 
-// Displayed on the about page and used in the main.js file to only allow monero URLs with this wallet address to be opened
-const ABOUT_MONERO_ADDRESS = '48WyAPdjwc6VokeXACxSZCFeKEXBiYPV6GjfvBsfg4CrUJ95LLCQSfpM9pvNKy5GE5H4hNaw99P8RZyzmaU9kb1pD7kzhCB'
-
 export {
   IpcChannels,
   DBActions,
@@ -110,5 +117,4 @@ export {
   PLAYLIST_HEIGHT_FORCE_LIST_THRESHOLD,
   SEARCH_CHAR_LIMIT,
   ABOUT_BITCOIN_ADDRESS,
-  ABOUT_MONERO_ADDRESS
 }

src/datastores/handlers/base.js

@@ -86,6 +86,36 @@ class Profiles {
     return db.profiles.updateAsync({ _id: profile._id }, profile, { upsert: true })
   }
 
+  static addChannelToProfiles(channel, profileIds) {
+    if (profileIds.length === 1) {
+      return db.profiles.updateAsync(
+        { _id: profileIds[0] },
+        { $push: { subscriptions: channel } }
+      )
+    } else {
+      return db.profiles.updateAsync(
+        { _id: { $in: profileIds } },
+        { $push: { subscriptions: channel } },
+        { multi: true }
+      )
+    }
+  }
+
+  static removeChannelFromProfiles(channelId, profileIds) {
+    if (profileIds.length === 1) {
+      return db.profiles.updateAsync(
+        { _id: profileIds[0] },
+        { $pull: { subscriptions: { id: channelId } } }
+      )
+    } else {
+      return db.profiles.updateAsync(
+        { _id: { $in: profileIds } },
+        { $pull: { subscriptions: { id: channelId } } },
+        { multi: true }
+      )
+    }
+  }
+
   static delete(id) {
     return db.profiles.removeAsync({ _id: id })
   }

src/datastores/handlers/electron.js

@@ -89,6 +89,26 @@ class Profiles {
     )
   }
 
+  static addChannelToProfiles(channel, profileIds) {
+    return ipcRenderer.invoke(
+      IpcChannels.DB_PROFILES,
+      {
+        action: DBActions.PROFILES.ADD_CHANNEL,
+        data: { channel, profileIds }
+      }
+    )
+  }
+
+  static removeChannelFromProfiles(channelId, profileIds) {
+    return ipcRenderer.invoke(
+      IpcChannels.DB_PROFILES,
+      {
+        action: DBActions.PROFILES.REMOVE_CHANNEL,
+        data: { channelId, profileIds }
+      }
+    )
+  }
+
   static delete(id) {
     return ipcRenderer.invoke(
       IpcChannels.DB_PROFILES,

src/datastores/handlers/web.js

@@ -59,6 +59,14 @@ class Profiles {
     return baseHandlers.profiles.upsert(profile)
   }
 
+  static addChannelToProfiles(channel, profileIds) {
+    return baseHandlers.profiles.addChannelToProfiles(channel, profileIds)
+  }
+
+  static removeChannelFromProfiles(channelId, profileIds) {
+    return baseHandlers.profiles.removeChannelFromProfiles(channelId, profileIds)
+  }
+
   static delete(id) {
     return baseHandlers.profiles.delete(id)
   }