Merge branch 'FreeTubeApp:development' into development

This is an automated nightly publish.
MarmadileManteater · Aug 17, 2022 · be23fe0 · be23fe0
2 parents 51a19d4 + 08431a2
commit be23fe0
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 9 deletions.
diff --git a/src/renderer/components/ft-video-player/ft-video-player.js b/src/renderer/components/ft-video-player/ft-video-player.js
@@ -1807,8 +1807,10 @@ export default Vue.extend({
           case 77:
             // M Key
             // Toggle Mute
-            event.preventDefault()
-            this.toggleMute()
+            if (!event.metaKey) {
+              event.preventDefault()
+              this.toggleMute()
+            }
             break
           case 67:
             // C Key

diff --git a/src/renderer/components/watch-video-comments/watch-video-comments.js b/src/renderer/components/watch-video-comments/watch-video-comments.js
@@ -268,7 +268,8 @@ export default Vue.extend({
         if (this.hideCommentLikes) {
           comment.likes = null
         }
-        comment.text = autolinker.link(comment.text.replace(/(<(?!br>)([^>]+)>)/ig, ''))
+        // strip html tags but keep <br>, <b>, </b> <s>, </s>, <i>, </i>
+        comment.text = autolinker.link(comment.text.replace(/(<(?!br|\/?(?:b|s|i)>)([^>]+)>)/ig, ''))
         if (comment.customEmojis.length > 0) {
           comment.customEmojis.forEach(emoji => {
             comment.text = comment.text.replace(emoji.text, `<img width="14" height="14" class="commentCustomEmoji" alt="${emoji.text.substring(2, emoji.text.length - 1)}" src="${emoji.emojiThumbnails[0].url}">`)

diff --git a/src/renderer/components/watch-video-playlist/watch-video-playlist.css b/src/renderer/components/watch-video-playlist/watch-video-playlist.css
@@ -15,6 +15,26 @@
   color: var(--tertiary-text-color);
 }
 
+.playlistProgressBar {
+  margin-left: 10px;
+  /* > In order to let ::-webkit-progress-value take effect, appearance needs to be set to none on the <progress> element. */
+  /* https://developer.mozilla.org/en-US/docs/Web/CSS/::-webkit-progress-value */
+  appearance: none;
+}
+
+.playlistProgressBar::-webkit-progress-value {
+  /* Color for filled part */
+  /* https://developer.mozilla.org/en-US/docs/Web/CSS/::-webkit-progress-value */
+  /* background-color is required to be declared here to prevent color being green */
+  background-color: var(--accent-color);
+}
+
+.playlistProgressBar::-webkit-progress-bar {
+  /* Color for unfilled part */
+  /* https://developer.mozilla.org/en-US/docs/Web/CSS/::-webkit-progress-bar */
+  background-color: var(--secondary-text-color);
+}
+
 .playlistIcon {
   font-size: 20px;
   padding: 10px;

diff --git a/src/renderer/components/watch-video-playlist/watch-video-playlist.vue b/src/renderer/components/watch-video-playlist/watch-video-playlist.vue
@@ -22,6 +22,12 @@
         class="playlistIndex"
       >
         - {{ currentVideoIndex }} / {{ playlistVideoCount }}
+        <progress
+          v-if="!shuffleEnabled && !reversePlaylist"
+          class="playlistProgressBar"
+          :value="currentVideoIndex"
+          :max="playlistVideoCount"
+        />
       </span>
       <p>
         <font-awesome-icon

diff --git a/src/renderer/views/Channel/Channel.js b/src/renderer/views/Channel/Channel.js
@@ -414,7 +414,6 @@ export default Vue.extend({
         this.channelDescription = autolinker.link(response.description)
         this.relatedChannels = response.relatedChannels.map((channel) => {
           channel.authorThumbnails[channel.authorThumbnails.length - 1].url = channel.authorThumbnails[channel.authorThumbnails.length - 1].url.replace('https://yt3.ggpht.com', `${this.currentInvidiousInstance}/ggpht/`)
-          // Mapping authorId to channelId
           channel.channelId = channel.authorId
           return channel
         })
@@ -614,7 +613,7 @@ export default Vue.extend({
           message: this.$t('Channel.Channel has been removed from your subscriptions')
         })
 
-        if (this.activeProfile === MAIN_PROFILE_ID) {
+        if (this.activeProfile._id === MAIN_PROFILE_ID) {
           // Check if a subscription exists in a different profile.
           // Remove from there as well.
           let duplicateSubscriptions = 0
@@ -659,7 +658,7 @@ export default Vue.extend({
           message: this.$t('Channel.Added channel to your subscriptions')
         })
 
-        if (this.activeProfile !== MAIN_PROFILE_ID) {
+        if (this.activeProfile._id !== MAIN_PROFILE_ID) {
           const index = primaryProfile.subscriptions.findIndex((channel) => {
             return channel.id === this.id
           })

diff --git a/src/renderer/views/Playlist/Playlist.css b/src/renderer/views/Playlist/Playlist.css
@@ -5,17 +5,18 @@
 .playlistInfo {
   background-color: var(--card-bg-color);
   box-sizing: border-box;
-  height: calc(100vh - 96px);
+  height: calc(100vh - 132px);
   margin-right: 1em;
   overflow-y: auto;
   padding: 10px;
   position: sticky;
-  top: 78px;
+  top: 96px;
   width: 30%;
 }
 
 .playlistItems {
-  display: grid;
+  display: flex;
+  flex-direction: column;
   grid-gap: 10px;
   margin: 0;
   padding: 10px;