Current version of Psi+ is 1.5.2022

It is based on: * psi: b46af0ef * plugins: 7a65467 * psimedia: 478567e * resources: e32ef4b
psi-plus · Jul 3, 2024 · da3cf9c · da3cf9c
1 parent ae47c0c
commit da3cf9c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/src/filesharingmanager.cpp b/src/filesharingmanager.cpp
@@ -219,7 +219,8 @@ void FileSharingManager::fillMessageView(MessageView &mv, const Message &m, PsiA
             // only audio and image supported for now
             if (!ms.isValid() || !ms.file.hasComputedHashes() || !ms.file.size().has_value()
                 || !(ms.file.mediaType().startsWith(QLatin1String("audio"))
-                     || ms.file.mediaType().startsWith(QLatin1String("image")))) {
+                     || ms.file.mediaType().startsWith(QLatin1String("image"))
+                     || ms.file.mediaType().startsWith(QLatin1String("video")))) {
                 continue;
             }
             auto item = new FileSharingItem(ms, m.from(), acc, this);

diff --git a/themes/chatview/util.js b/themes/chatview/util.js
@@ -648,6 +648,15 @@ function initPsiTheme() {
             return range.createContextualFragment(html);
         },
 
+        videoPreview: function(source) {
+            const html = `<div class="video psi-preview">
+                <video width="560" height="315" controls="1">
+                    <source src="${source}"/>
+                </video>
+            </div>`;
+            return chat.util.createHtmlNode(html); 
+        },
+
         replaceYoutube : function(linkEl) {
             var baseLink = "https://www.youtube.com/embed/";
             var link;
@@ -686,8 +695,8 @@ function initPsiTheme() {
 
         replaceVideo : function(linkEl)
         {
-            var audio = chat.util.createHtmlNode('<div class="video psi-preview"><video width="560" height="315" controls="1"><source src="'+ linkEl.href +'"></video></div>');
-            linkEl.parentNode.insertBefore(audio, linkEl.nextSibling);
+            const video = chat.util.videoPreview(linkEl.href);
+            linkEl.parentNode.insertBefore(video, linkEl.nextSibling);
         },
 
         replaceLinkAsync : function(linkEl)
@@ -783,6 +792,12 @@ ${info}
                         share.parentNode.insertBefore(img, share.nextSibling);
                     else
                         share.parentNode.appendChild(img);
+                } else if (type.startsWith("video"))  {
+                    player = chat.util.videoPreview(`/psi/account/${session.account}/sharedfile/${source}`);
+                    if (share.nextSibling)
+                        share.parentNode.insertBefore(player, share.nextSibling);
+                    else
+                        share.parentNode.appendChild(player);
                 }
             }
         },

diff --git a/version b/version
@@ -1 +1 @@
-1.5.2021 (2024-07-03, ec259f68)
+1.5.2022 (2024-07-04, b46af0ef)