Merge branch 'feature/playlist-2023-05' into custom-builds/current

* feature/playlist-2023-05: (77 commits)
  * Update add to playlist prompt to add sort options
  ! Fix user playlist view incorrectly sorted playlists by latest updated first when filtered
  ! Fix add to play prompt max width
  * Update sorting options labels
  Make constants imported from @fortawesome/free-solid-svg-icons ordered by name again (FreeTubeApp#3958)
  Replace labeler workflow with GH labeler (FreeTubeApp#3966)
  ! Fix unable to visit previous video when playing first video in a playlist
  * Update upcoming video to allow saving in playlist
  * Show filtering input & sorting element when no. of playlist > 1
  Fix HTML styling (e.g., hashtag links) showing up as raw HTML in descriptions (FreeTubeApp#3946)
  Make certain controls non-selectable / non-draggable - Part II (FreeTubeApp#3957)
  Translated using Weblate (German)
  Show video list buttons on hover or focus (FreeTubeApp#3954)
  Bump @babel/eslint-parser from 7.22.10 to 7.22.11 (FreeTubeApp#3962)
  Bump youtubei.js from 6.0.0 to 6.1.0 (FreeTubeApp#3965)
  Bump eslint-plugin-n from 16.0.1 to 16.0.2 (FreeTubeApp#3964)
  Bump eslint from 8.47.0 to 8.48.0 (FreeTubeApp#3963)
  Bump marked from 7.0.4 to 7.0.5 (FreeTubeApp#3961)
  Bump @babel/core from 7.22.10 to 7.22.11 (FreeTubeApp#3959)
  Make certain controls non-selectable / non-draggable (FreeTubeApp#3947)
  ...

.github/issue-labeler.yml

@@ -0,0 +1,65 @@
+'B: visual':
+    - '(visual bug)'
+
+'B: Unofficial Download':
+    - '(AUR|Chocolatey|FreeTubeCordova|PortableApps|winget|Scoop|Snapcraft|MPR|Nix)'
+
+'B: keyboard control':
+    - '(keyboard control not working)' 
+
+'B: text/string':
+    - '(text/string issue)'
+
+'B: content not loading':
+    - '(content not loading)'
+
+'B: accessibility':
+    - '(accessibility issue)'
+
+'B: usability':
+    - '(usability issue)'
+
+'B: crash':
+    - '(causes crash)'
+
+'B: feature stopped working':
+    - '(feature stopped working)'
+
+'B: inconsistent behavior':
+    - '(inconsistent behavior)'
+
+'B: data loss':
+    - '(data loss)'
+
+'B: race condition':
+    - '(race condition)'
+
+'B: API issue':
+    - '(API issue)'
+
+'B: developer mode':
+    - '(only happens in developer mode)'
+
+'E: improvement existing feature':
+    - '(improvement to existing feature)'
+
+'E: new optional setting':
+    - '(new optional setting)'
+
+'E: visual improvement':
+    - '(visual improvement)'
+
+'E: display more information':
+    - '(display more information to user)'
+
+'E: ease of use improvement':
+    - '(ease of use improvement)'
+
+'E: support external software':
+    - '(support for external software)'
+
+'E: new feature':
+    - '(new feature)'
+
+'E: keyboard shortcut':
+    - '(new keyboard shortcut)'

.github/workflows/label-issue.yml

@@ -0,0 +1,18 @@
+name: "Issue Labeler"
+on:
+  issues:
+    types: [opened]
+
+permissions:
+  issues: write
+  contents: read
+
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: github/[email protected]
+      with:
+        configuration-path: .github/issue-labeler.yml
+        enable-versioned-regex: 0
+        repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/label-pr.yml

@@ -14,3 +14,4 @@ jobs:
     - uses: actions/labeler@v4
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"
+        configuration-path: .github/pr-labeler.yml

package.json

@@ -63,7 +63,7 @@
     "autolinker": "^4.0.0",
     "electron-context-menu": "^3.6.1",
     "lodash.debounce": "^4.0.8",
-    "marked": "^7.0.2",
+    "marked": "^7.0.5",
     "path-browserify": "^1.0.1",
     "process": "^0.11.10",
     "video.js": "7.21.5",
@@ -78,11 +78,11 @@
     "vue-router": "^3.6.5",
     "vue-tiny-slider": "^0.1.39",
     "vuex": "^3.6.2",
-    "youtubei.js": "^6.0.0"
+    "youtubei.js": "^6.1.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.22.10",
-    "@babel/eslint-parser": "^7.22.10",
+    "@babel/core": "^7.22.11",
+    "@babel/eslint-parser": "^7.22.11",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/preset-env": "^7.22.10",
     "@double-great/stylelint-a11y": "^2.0.2",
@@ -92,12 +92,12 @@
     "css-minimizer-webpack-plugin": "^5.0.1",
     "electron": "^22.3.18",
     "electron-builder": "^24.6.3",
-    "eslint": "^8.47.0",
+    "eslint": "^8.48.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-config-standard": "^17.1.0",
-    "eslint-plugin-import": "^2.28.0",
+    "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-jsonc": "^2.9.0",
-    "eslint-plugin-n": "^16.0.1",
+    "eslint-plugin-n": "^16.0.2",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-unicorn": "^48.0.1",
@@ -107,16 +107,16 @@
     "html-webpack-plugin": "^5.5.3",
     "js-yaml": "^4.1.0",
     "json-minimizer-webpack-plugin": "^4.0.0",
-    "lefthook": "^1.4.8",
+    "lefthook": "^1.4.9",
     "mini-css-extract-plugin": "^2.7.6",
     "npm-run-all": "^4.1.5",
     "postcss": "^8.4.26",
-    "postcss-scss": "^4.0.6",
+    "postcss-scss": "^4.0.7",
     "prettier": "^2.8.8",
     "rimraf": "^5.0.1",
-    "sass": "^1.65.1",
+    "sass": "^1.66.1",
     "sass-loader": "^13.3.2",
-    "stylelint": "^15.10.2",
+    "stylelint": "^15.10.3",
     "stylelint-config-sass-guidelines": "^10.0.0",
     "stylelint-config-standard": "^34.0.0",
     "stylelint-high-performance-animation": "^1.9.0",

src/constants.js

@@ -65,7 +65,6 @@ const SyncEvents = {
   },
 
   PLAYLISTS: {
-    UPSERT: 'sync-playlists-upsert',
     UPSERT_VIDEO: 'sync-playlists-upsert-video',
     DELETE_VIDEO: 'sync-playlists-delete-video'
   }

src/datastores/handlers/base.js

@@ -113,7 +113,7 @@ class Playlists {
   }
 
   static upsert(playlist) {
-    return db.playlists.updateAsync({ _id: playlist._id }, playlist, { upsert: true })
+    return db.playlists.updateAsync({ _id: playlist._id }, { $set: playlist }, { upsert: true })
   }
 
   static upsertVideoByPlaylistId(_id, videoData) {

src/datastores/handlers/electron.js

@@ -129,7 +129,7 @@ class Playlists {
   static upsert(playlist) {
     return ipcRenderer.invoke(
       IpcChannels.DB_PLAYLISTS,
-      { action: DBActions.PLAYLISTS.UPSERT, data: playlist }
+      { action: DBActions.GENERAL.UPSERT, data: playlist }
     )
   }
 

src/main/index.js

@@ -949,12 +949,12 @@ function runApp() {
         case DBActions.GENERAL.FIND:
           return await baseHandlers.playlists.find()
 
-        case DBActions.PLAYLISTS.UPSERT:
+        case DBActions.GENERAL.UPSERT:
           await baseHandlers.playlists.upsert(data)
           syncOtherWindows(
             IpcChannels.SYNC_PLAYLISTS,
             event,
-            { event: SyncEvents.PLAYLISTS.UPSERT, data }
+            { event: SyncEvents.GENERAL.UPSERT, data }
           )
           return null
 

src/renderer/App.css

@@ -26,6 +26,8 @@
 
 .flexBox {
   display: block;
+  user-select: unset;
+  -webkit-user-select: unset;
 }
 
 #changeLogText {

src/renderer/components/data-settings/data-settings.js

@@ -972,6 +972,8 @@ export default defineComponent({
                 this.addVideo(payload)
               }
             })
+            // Update playlist's `lastUpdatedAt`
+            this.updatePlaylist({ _id: existingPlaylist._id })
           } else {
             this.addPlaylist(playlistObject)
           }
@@ -1166,7 +1168,8 @@ export default defineComponent({
       'updateShowProgressBar',
       'updateHistory',
       'addPlaylist',
-      'addVideo'
+      'addVideo',
+      'updatePlaylist',
     ]),
 
     ...mapMutations([

src/renderer/components/ft-community-poll/ft-community-poll.css

@@ -0,0 +1,57 @@
+.vote-count {
+  padding-bottom: 6px;
+  font-size: smaller;
+}
+
+.empty-circle {
+  background-color: transparent;
+  border-radius: 50%;
+  border-style: solid;
+  border-width: 2px;
+  display: block;
+  float: left;
+  height: 10px;
+  left: 5px;
+  position: relative;
+  top: 8px;
+  width: 10px;
+}
+
+.filled-circle {
+  border-radius: 50%;
+  background-color: black;
+  float: left;
+  height: 6px;
+  left: 2px;
+  top: 2px;
+  position: relative;
+  width: 6px;
+}
+
+.option-text {
+  border-radius: 5px;
+  border-style: solid;
+  border-width: 2px;
+  padding: 5px 25px;
+}
+
+.option {
+  padding-bottom: 10px;
+}
+
+.correct-option {
+  background-color: #78da71;
+}
+
+.incorrect-option {
+  background-color: #dd4e4e;
+}
+
+.reveal-answer  {
+  text-align: center;
+  cursor: pointer;
+}
+
+.reveal-answer:hover > .option-text, .reveal-answer:focus > .option-text {
+  background-color: var(--side-nav-hover-color)
+}