From 94748d483db96ecda4966d4cf172ecc7a6491e54 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 1 Oct 2024 11:18:23 -0400
Subject: [PATCH 1/4] validators: allow application/octet-stream video as MP4s

---
 lib/plugins/validators/async/21_checkContentType.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lib/plugins/validators/async/21_checkContentType.js b/lib/plugins/validators/async/21_checkContentType.js
index dfc308cef..4a08a66f8 100644
--- a/lib/plugins/validators/async/21_checkContentType.js
+++ b/lib/plugins/validators/async/21_checkContentType.js
@@ -107,6 +107,16 @@ export default {
                     link.error = 'Adobe Flash Player is no longer supported';
                 }
 
+                if (data.type?.toLowerCase() == 'application/octet-stream' 
+                    && link.rel?.indexOf(CONFIG.R.player) > -1
+                    && link.accept && link.accept instanceof Array 
+                    && link.accept.indexOf('video/*') > -1) {
+                    data.type = CONFIG.T.video_mp4;
+                    if (!link.message) {
+                        link.message = 'Showing application/octet-stream as MP4';
+                    }
+                }                
+
                 /** accept-ranges is misconfigured in many cases (especially via CloudFront). Plus, browsers would try and download first range of MP4 file anyway, even if the header isn't set
                 if (data.type == CONFIG.T.video_mp4 && !/bytes/i.test(data.accept_ranges)) {
                     link.error = 'MP4s should allow partial download via accept ranges';

From ad4591538178f87e0b93c54e269bd5e0777d9632 Mon Sep 17 00:00:00 2001
From: LiFaytheGoblin <linda@education-innovation-lab.de>
Date: Tue, 1 Oct 2024 11:22:27 +0200
Subject: [PATCH 2/4] adds missing comma in config.local.js.SAMPLE

---
 config.local.js.SAMPLE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.local.js.SAMPLE b/config.local.js.SAMPLE
index 4d2d7761f..72bb99a27 100644
--- a/config.local.js.SAMPLE
+++ b/config.local.js.SAMPLE
@@ -256,7 +256,7 @@ export default {
         youtube: {
             // api_key: "INSERT YOUR VALUE",
             // parts: [ "snippet", "player" ], // list of fields you want to use in the request, in most cases you only need those two
-            get_params: "?rel=0&showinfo=1"     // https://developers.google.com/youtube/player_parameters,
+            get_params: "?rel=0&showinfo=1",     // https://developers.google.com/youtube/player_parameters,
             fix_shorts_in_eu: true              // Avoid consent redirect for EU servers
         },
         vimeo: {

From bab08d082858160adffa1a176d03489944c5b176 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 2 Oct 2024 11:09:18 -0400
Subject: [PATCH 3/4] domains: fix private Soundclouds (#560)

by adding required oEmbed iframe `assignQuerystring` method that is used in main Soundcloud plugin
---
 lib/plugins/system/oembed/oembed.js           | 83 +++++++++++--------
 .../soundcloud.com/soundcloud-oembed-error.js | 13 +--
 2 files changed, 54 insertions(+), 42 deletions(-)

diff --git a/lib/plugins/system/oembed/oembed.js b/lib/plugins/system/oembed/oembed.js
index d33470d9c..353183639 100644
--- a/lib/plugins/system/oembed/oembed.js
+++ b/lib/plugins/system/oembed/oembed.js
@@ -31,51 +31,60 @@ function fixOembedIframeAttributes(obj) {
 }
 
 function _getOembedIframe(oembed) {
-    if (!oembed.html) {
-        return null;
-    }
+
     if (typeof oembed._iframe === 'undefined') {
 
-        // Allow encoded entities if they start from $lt;
-        var html = oembed.html5 || oembed.html; 
-        if (/^&lt;$/i.test(html)) {
-            html = entities.decodeHTML(html);
-        }
+        var _iframe = null;
+        
+        if (oembed.html5 || oembed.html) {
+
+            // Allow encoded entities if they start from $lt;
+            var html = oembed.html5 || oembed.html; 
+            if (/^&lt;$/i.test(html)) {
+                html = entities.decodeHTML(html);
+            }
+
+            var $container = cheerio('<div>');
+            try {
+                $container.html(html);
+            } catch (ex) {}
+            var $iframe = $container.find('iframe');
+
+            if ($iframe.length === 2 && /<iframe>$/i.test(html)) { 
+                // Forgive mis-closed iFrame tag
+                $iframe = $iframe.first();
+            }
 
-        var $container = cheerio('<div>');
-        try {
-            $container.html(html);
-        } catch (ex) {}
-        var $iframe = $container.find('iframe');
+            if ($iframe.length === 1) {
+                _iframe = fixOembedIframeAttributes($iframe[0].attribs);
+                _iframe.placeholder = oembed.thumbnail_url;
+            }
 
-        if ($iframe.length === 2 && /<iframe>$/i.test(html)) { 
-            // Forgive mis-closed iFrame tag
-            $iframe = $iframe.first();
+        // When oembed is in fact iframe from domain fallbacks on oEmbedError
+        } else if (oembed.src) {
+            _iframe = oembed;
         }
 
-        if ($iframe.length === 1) {
-            oembed._iframe = fixOembedIframeAttributes($iframe[0].attribs);
-
-            if (oembed._iframe && oembed._iframe.src) {
-                var src = URL.parse(oembed._iframe.src, true);
-                oembed._iframe.host = src.host;
-                oembed._iframe.pathname = src.pathname;
-                oembed._iframe.path = src.path;
-                oembed._iframe.query = src.query;
-                oembed._iframe.placeholder = oembed.thumbnail_url;
-                oembed._iframe.replaceQuerystring = function(params) {
-                    var qs = querystring.stringify({...oembed._iframe.query, ...params});
-                    return oembed._iframe.src.replace(/\?.*$/, '') + (qs ? '?' + qs : '');
-                }
-                oembed._iframe.assignQuerystring = function(params) {
-                    var qs = querystring.stringify(params);
-                    return oembed._iframe.src.replace(/\?.*$/, '') + (qs ? '?' + qs : '');
-                }                
+        if (_iframe && _iframe.src) {
+            var src = URL.parse(_iframe.src, true);
+            _iframe.host = src.host;
+            _iframe.pathname = src.pathname;
+            _iframe.path = src.path;
+            _iframe.query = src.query;
+            _iframe.replaceQuerystring = function(params) {
+                var qs = querystring.stringify({..._iframe.query, ...params});
+                return _iframe.src.replace(/\?.*$/, '') + (qs ? '?' + qs : '');
+            }
+            _iframe.assignQuerystring = function(params) {
+                var qs = querystring.stringify(params);
+                return oembed._iframe.src.replace(/\?.*$/, '') + (qs ? '?' + qs : '');
             }
         } else {
-            oembed._iframe = null;
+            _iframe = null;
         }
-    }
+
+        oembed._iframe = {..._iframe};
+    }    
 
     return oembed._iframe;
 }
@@ -99,6 +108,8 @@ export default {
 
     provides: ['self', 'oembedError'],
 
+    getIframe: _getOembedIframe, // available via export for fallbacks as plugins['oembed'].getIframe(obj)
+
     getData: function(url, oembedLinks, options, cb) {
 
         var href = oembedLinks[0].href;
diff --git a/plugins/domains/soundcloud.com/soundcloud-oembed-error.js b/plugins/domains/soundcloud.com/soundcloud-oembed-error.js
index 2f918580f..1e9e94d62 100644
--- a/plugins/domains/soundcloud.com/soundcloud-oembed-error.js
+++ b/plugins/domains/soundcloud.com/soundcloud-oembed-error.js
@@ -2,17 +2,18 @@ export default {
 
     provides: ['__allow_soundcloud_meta', 'iframe'],
 
-    getData: function(oembedError, twitter, options, cb) {
-        if (oembedError === 403 && !options.getProviderOptions('soundcloud.disable_private', false) && twitter.player) {
+    getData: function(oembedError, twitter, options, plugins, cb) {
+        var disable_private = options.getProviderOptions('soundcloud.disable_private', false)
+        if (oembedError === 403 && !disable_private && twitter.player) {
             return cb(null, {
                 __allow_soundcloud_meta: true,
-                iframe: {
-                    src: twitter.player.value,
+                iframe: plugins['oembed'].getIframe({
+                    src: twitter.player.value?.replace('origin=twitter', 'origin=iframely'),
                     height: twitter.player.height
-                },
+                }),
                 message: "Contact support to disable private Soundcloud audio."
             });
-        } else if (oembedError === 403 && options.getProviderOptions('soundcloud.disable_private', false)) {
+        } else if (oembedError === 403 && disable_private) {
             return cb({
                 responseError: oembedError
             });

From dcaab2f36cd9cabb434cb5e4adbb5b6da092a5e9 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 2 Oct 2024 11:13:26 -0400
Subject: [PATCH 4/4] oembed iframe: return null as it was before refactoring
 when no src in Iframe

---
 lib/plugins/system/oembed/oembed.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugins/system/oembed/oembed.js b/lib/plugins/system/oembed/oembed.js
index 353183639..94f1dcb36 100644
--- a/lib/plugins/system/oembed/oembed.js
+++ b/lib/plugins/system/oembed/oembed.js
@@ -83,7 +83,7 @@ function _getOembedIframe(oembed) {
             _iframe = null;
         }
 
-        oembed._iframe = {..._iframe};
+        oembed._iframe = _iframe ? {..._iframe} : null;
     }    
 
     return oembed._iframe;