diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index 701fbfb89..3ee6b6eaf 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -101,6 +101,7 @@ body: - PortableApps (Unofficial) - Scoop (Unofficial) - Snapcraft (Unofficial) + - WAPT (Unofficial) - winget (Unofficial) - other validations: diff --git a/.github/issue-labeler.yml b/.github/issue-labeler.yml index 8d6a06724..1d08f2788 100644 --- a/.github/issue-labeler.yml +++ b/.github/issue-labeler.yml @@ -2,7 +2,7 @@ - '(visual bug)' 'B: Unofficial Download': - - '(AUR \(Unofficial\)|Chocolatey \(Unofficial\)|\.apk \(Android, FreeTubeCordova Unofficial\)|Homebrew \(Unofficial\)|PortableApps \(Unofficial\)|winget \(Unofficial\)|Scoop \(Unofficial\)|Snapcraft \(Unofficial\)|MPR \(Unofficial\)|Nix \(Unofficial\))' + - '(AUR \(Unofficial\)|Chocolatey \(Unofficial\)|\.apk \(Android, FreeTubeCordova Unofficial\)|Homebrew \(Unofficial\)|PortableApps \(Unofficial\)|WAPT \(Unofficial\)|winget \(Unofficial\)|Scoop \(Unofficial\)|Snapcraft \(Unofficial\)|MPR \(Unofficial\)|Nix \(Unofficial\))' 'B: keyboard control': - '(keyboard control not working)' diff --git a/README.md b/README.md index 8765380c1..0d478b917 100644 --- a/README.md +++ b/README.md @@ -101,6 +101,8 @@ These builds are maintained by the community. While they should be safe, downloa * Snap: [Download](https://snapcraft.io/freetube) and [Source Code](https://git.launchpad.net/freetube) +* WAPT: [Download](https://wapt.tranquil.it/store/tis-freetube) + * Windows Package Manager (winget): [Usage](https://docs.microsoft.com/en-us/windows/package-manager/winget/) ## Contributing diff --git a/package.json b/package.json index 61b67b6df..0053e8fe1 100644 --- a/package.json +++ b/package.json @@ -72,12 +72,12 @@ "videojs-mobile-ui": "^0.8.0", "videojs-overlay": "^3.1.0", "videojs-vtt-thumbnails-freetube": "0.0.15", - "vue": "^2.7.15", + "vue": "^2.7.16", "vue-i18n": "^8.28.2", "vue-observe-visibility": "^1.0.0", "vue-router": "^3.6.5", "vuex": "^3.6.2", - "youtubei.js": "^7.0.0" + "youtubei.js": "^8.0.0" }, "devDependencies": { "@babel/core": "^7.23.6", @@ -89,21 +89,21 @@ "copy-webpack-plugin": "^11.0.0", "css-loader": "^6.8.1", "css-minimizer-webpack-plugin": "^5.0.1", - "electron": "^28.0.0", + "electron": "^28.1.0", "electron-builder": "^24.9.1", "eslint": "^8.56.0", "eslint-config-prettier": "^9.1.0", "eslint-config-standard": "^17.1.0", "eslint-plugin-import": "^2.29.1", - "eslint-plugin-jsonc": "^2.11.1", - "eslint-plugin-n": "^16.4.0", - "eslint-plugin-prettier": "^5.0.1", + "eslint-plugin-jsonc": "^2.11.2", + "eslint-plugin-n": "^16.5.0", + "eslint-plugin-prettier": "^5.1.2", "eslint-plugin-promise": "^6.1.1", - "eslint-plugin-unicorn": "^49.0.0", + "eslint-plugin-unicorn": "^50.0.1", "eslint-plugin-vue": "^9.19.2", "eslint-plugin-vuejs-accessibility": "^2.2.0", "eslint-plugin-yml": "^1.11.0", - "html-webpack-plugin": "^5.5.4", + "html-webpack-plugin": "^5.6.0", "js-yaml": "^4.1.0", "json-minimizer-webpack-plugin": "^4.0.0", "lefthook": "^1.5.5", diff --git a/src/renderer/App.js b/src/renderer/App.js index b68a5627b..2553e57a0 100644 --- a/src/renderer/App.js +++ b/src/renderer/App.js @@ -194,7 +194,7 @@ export default defineComponent({ }) this.$router.onReady(() => { - if (this.$router.currentRoute.path === '/' && this.landingPage !== '/subscriptions') { + if (this.$router.currentRoute.path === '/') { this.$router.replace({ path: this.landingPage }) } }) diff --git a/src/renderer/components/channel-about/channel-about.js b/src/renderer/components/channel-about/channel-about.js index feac9f71e..3eb151e1b 100644 --- a/src/renderer/components/channel-about/channel-about.js +++ b/src/renderer/components/channel-about/channel-about.js @@ -24,6 +24,10 @@ export default defineComponent({ type: Number, default: null }, + videos: { + type: Number, + default: null + }, location: { type: String, default: null @@ -61,5 +65,9 @@ export default defineComponent({ formattedViews: function () { return formatNumber(this.views) }, + + formattedVideos: function () { + return formatNumber(this.videos) + }, } }) diff --git a/src/renderer/components/channel-about/channel-about.vue b/src/renderer/components/channel-about/channel-about.vue index e1100dbd1..5829f8bb5 100644 --- a/src/renderer/components/channel-about/channel-about.vue +++ b/src/renderer/components/channel-about/channel-about.vue @@ -12,7 +12,7 @@ />