Merge branch 'itteco:main' into main

mguptahub · web-flow · commit ee10fc9ca4ef · 2025-04-24T13:23:37.000+05:30
diff --git a/config.js b/config.js
@@ -80,6 +80,7 @@
             video_mp4: "video/mp4",
             video_ogg: "video/ogg",
             video_webm: "video/webm",
+            video_iso: "video/iso.segment",
             stream_apple_mpegurl: "application/vnd.apple.mpegurl",
             stream_x_mpegurl: "application/x-mpegURL",
             audio_mp3: "audio/mp3",
diff --git a/lib/plugins/system/meta/HTMLMetaHandler.js b/lib/plugins/system/meta/HTMLMetaHandler.js
@@ -68,7 +68,7 @@ HTMLMetaHandler.prototype.onopentag = function(name, attributes) {
                 value = value.replace(/(\r\n|\n|\r)/gm, ' ');
             }
 
-            if (/^\d+$/.test(value)) { // convert to integer
+            if (/^\d+$/.test(value) && !/(title|description)/i.test(tagName)) { // convert to integer
                 value = parseInt(value, 10);
             } else if (/^\d+\.\d+$/.test(value)) {
                 value = parseFloat(value);
diff --git a/lib/plugins/system/oembed/providers.json b/lib/plugins/system/oembed/providers.json
@@ -445,13 +445,6 @@
         ],
         "endpoint": "https://app.widgetic.com/services/oembed/"
     },
-    {
-        "name": "Adobe Stock",
-        "templates": [
-            "stock.adobe.com/(?:images|stock-photo)/([a-zA-Z0-9-]+\/\\d+)"
-        ],
-        "endpoint": "https://stock.adobe.com/oembed?url=https://stock.adobe.com/stock-photo/{1}"
-    },
     {
         "name": "Reddit",
         "templates": [
@@ -1167,5 +1160,19 @@
             "run.ply.io/run/*"
         ],
         "endpoint": "https://app-server.ply.io/api/oembed"
+    },
+    {
+        "name": "Wakelet",
+        "templates": [
+            "wakelet.com/wake/*"
+        ],
+        "endpoint": "https://wakelet.com/api/oembed"
+    },
+    {
+        "name": "Wolframcloud",
+        "templates": [
+            "wolframcloud.com/obj/*"
+        ],
+        "endpoint": "https://www.wolframcloud.com/oembed"
     }
 ]
diff --git a/lib/plugins/validators/sync/07_resizable.js b/lib/plugins/validators/sync/07_resizable.js
@@ -5,7 +5,7 @@ export default {
 
     prepareLink: function(url, options, link) {
 
-        if ((link.type === CONFIG.T.text_html || link.accept && link.accept.length === 1 && link.accept.indexOf(CONFIG.T.text_html) > -1)
+        if ((link.type === CONFIG.T.text_html || link.accept && link.accept.indexOf(CONFIG.T.text_html) > -1)
             && link.rel.indexOf(CONFIG.R.resizable) > -1 
             && link.media 
             && link.media.height
diff --git a/lib/utils.js b/lib/utils.js
@@ -485,6 +485,29 @@ export function parseLDSource(ld, decode, uri) {
     }
 };
 
+export function findMainLdObjectWithVideo(ld) {
+
+    let json = ld.videoobject || ld.mediaobject;
+
+    /*
+    || (ld.newsarticle && (ld.newsarticle.video || ld.newsarticle.videoobject)) 
+    || (ld.tvepisode && (ld.tvepisode.video || ld.tvepisode.videoobject))
+    || (ld.movie && (ld.movie.video || ld.movie.videoobject))
+    || (ld.tvclip && (ld.tvclip.video || ld.tvclip.videoobject));
+    */
+    if (!json) { // try to find video attached to main object
+        var mainObjWithVideo = ld && Object.values(ld).find((obj) => obj.video || obj.videoobject);
+        if (mainObjWithVideo) {
+            json = mainObjWithVideo.video || mainObjWithVideo.videoobject;
+        }
+    }
+
+    if (json && Array.isArray(json) && json.length === 1) {
+        json = json[0];
+    }
+
+    return json; // if any
+}
 
 /**
  * @public
@@ -798,7 +821,7 @@ export function getContentType(uriForCache, uriOriginal, options, cb) {
                             || error >= 500
                             // Or ClourFront that gobbles up headers when checking CORS.
                             || (res.headers && !res.headers['access-control-allow-origin']
-                                && res.headers['server'] === 'AmazonS3' && !error ))) {
+                                && (res.headers['server'] === 'AmazonS3' || /origin/i.test(res.headers['vary'])) && !error ))) {
                         makeCall(uriOriginal, 'GET');
                         return;
                     }
diff --git a/plugins/domains/geogebra.iframe.js b/plugins/domains/geogebra.iframe.js
diff --git a/plugins/domains/geogebra.org.js b/plugins/domains/geogebra.org.js
@@ -11,21 +11,23 @@ export default {
         "*"
     ],
 
-    getData: function(urlMatch, options, cb) {
+    getLink: function(urlMatch) {
         /** https://wiki.geogebra.org/en/Embedding_in_Webpages */
 
         if (!/^\d+$/.test(urlMatch[1])) {
-            cb (null, {__promoUri: {url: 'https://www.geogebra.org/material/iframe/id/' + urlMatch[1]} });
-        } else {
-            cb(null, null)
+            return {
+                href: 'https://www.geogebra.org/material/iframe/id/' + urlMatch[1],
+                accept: CONFIG.T.text_html,
+                rel: [CONFIG.R.app, CONFIG.R.iframely],
+                'aspect-ratio': 800 / 600
+            }
         }
     },
 
     tests: [
         {noFeeds: true},
         {skipMethods: ['getData']},
-        "http://www.geogebra.org/m/141300",
-        "https://www.geogebra.org/m/wn2U6Hj6#material/ysf5TjUB",
+        "https://www.geogebra.org/m/141300",
         "https://www.geogebra.org/classic/hs52mgmq",
         "https://www.geogebra.org/graphing/pse7krdf"
     ]
diff --git a/plugins/domains/instagram.com/instagram.com.js b/plugins/domains/instagram.com/instagram.com.js
@@ -90,7 +90,7 @@ export default {
             });
         }        
 
-        if (ipOG.video) {
+        if (ipOG.video && ipOG.video.width && ipOG.video.height) {
             links.push({
                 href: ipOG.video.url,
                 accept: CONFIG.T.text_html,
@@ -132,9 +132,9 @@ export default {
                 type: CONFIG.T.text_html,
                 rel: [CONFIG.R.app, CONFIG.R.ssl, CONFIG.R.inline],
                 // sizing is from Instagram placeholder to avoid double height changes
-                'max-width': 660,                
-                'aspect-ratio': 200/63,
-                'padding-bottom': 200,
+                'max-width': 660,
+                'aspect-ratio': 100 / (2 *(19 + 12.5)), // was: oembed.thumbnail_width / oembed.thumbnail_height, but sizes for placeholder are hardcoded anyway, no need to link them to the image sizes
+                'padding-bottom': 284,
                 options: {
                     showcaption: {
                         label: 'Show author\'s text caption',
@@ -143,12 +143,6 @@ export default {
                 }
             };
 
-            if (oembed.thumbnail_width && oembed.thumbnail_height) {
-                // sizes for placeholder are hardcoded anyway, no need to link them to the image sizes
-                app['aspect-ratio'] = 100 / (2 *(19 + 12.5)); // was: oembed.thumbnail_width / oembed.thumbnail_height;
-                app['padding-bottom'] = 284;//  was: 206;
-            }
-
             links.push(app);
         }
 
@@ -185,7 +179,7 @@ export default {
         "https://www.instagram.com/reel/CtHaSoDLrWJ/",
         "https://www.instagram.com/nssmagazine/reel/CrVt-Wvs74O/",
         {
-            skipMixins: ["oembed-title", "fb-error"],
+            skipMixins: ["oembed-title", "fb-error", "oembed-author"],
             skipMethods: ['getData']
         }
     ]
diff --git a/plugins/domains/sverigesradio.se.js b/plugins/domains/sverigesradio.se.js
@@ -11,30 +11,7 @@ export default {
 
     provides: 'sveriges',
 
-    mixins: [
-        // oEmbed returns "non-starting" player too - https://sverigesradio.se/avsnitt/1966906
-        "twitter-title",
-        "twitter-description",
-        "twitter-site",
-        "twitter-image",
-        "ld-newsarticle-logo",
-        "ld-author",
-        "ld-date",
-        "canonical",
-        "keywords",
-        "media-detector",
-        "theme-color",
-        "favicon",
-    ],
-
-    /* Not needed
-    getMeta: function(sverigies) {
-        return {
-            title: sveriges.title,
-            description: sveriges.description
-        }
-    },
-    */
+    mixins: ["*"],
 
     getLink: function(sveriges) {
 
@@ -93,14 +70,16 @@ export default {
     },
 
     tests: [{skipMixins: ['keywords']},
-        "https://sverigesradio.se/artikel/5848335",
+        "https://sverigesradio.se/artikel/5448335",
         "https://sverigesradio.se/artikel/6573606",
+        "https://sverigesradio.se/play/artikel/8936167",
         "https://sverigesradio.se/artikel/professorn-om-rymdbilden-det-ar-hisnande",
-        // "https://sverigesradio.se/avsnitt/1966906",
+        "https://www.sverigesradio.se/artikel/personal-doms-for-stold-av-smycken-varda-200-000-kronor-fran-aldreboende",
         "https://sverigesradio.se/embed/publication/6652202",
         "https://sverigesradio.se/embed/publication/8087725",
-        // Not embeddable: "https://sverigesradio.se/embed/episode/1966906",
+        "https://sverigesradio.se/avsnitt/2568806",
         "https://sverigesradio.se/avsnitt/nikola-tesla-elektricitetspionjaren-som-glomdes-bort"
         // Not embeddable: https://sverigesradio.se/artikel/4351444
+        // Not embeddable: "https://sverigesradio.se/embed/episode/1966906",
     ]
 };
diff --git a/plugins/links/embedURL/embedURL.js b/plugins/links/embedURL/embedURL.js
@@ -12,23 +12,19 @@ export default {
 
         if ($script.length === 1) {
             try {
-                var ld = utils.parseLDSource($script.html(), decode, url);
-
+                const ld = utils.parseLDSource($script.html(), decode, url);
                 if (ld && __allowEmbedURL !== 'skip_ld') {
                     return {
                         ld: ld
                     }
-                } else if (ld && (ld.videoobject || ld.mediaobject)) {
-                    const videoObject = ld.videoobject || ld.mediaobject,
-                        href = videoObject.embedURL || videoObject.embedUrl || videoObject.embedurl || videoObject.contentURL || videoobject.contentUrl || videoobject.contenturl;
-
-                    if (href) {
+                } else if (ld) {
+                    const json = utils.findMainLdObjectWithVideo(ld);
+                    if (json) {
                         return {
-                            schemaVideoObject: ld.videoobject || ld.mediaobject
+                            schemaVideoObject: json
                         }
                     } // else check microformats, ex.: cbssports
                 }
-
             } catch (ex) {
                 // broken json, c'est la vie
                 // let's try microformats instead
diff --git a/plugins/links/embedURL/ld-video.js b/plugins/links/embedURL/ld-video.js
@@ -8,28 +8,11 @@ export default {
         'video_src'
     ],
 
-    getData: function(ld, whitelistRecord, url) {
-
-        var json = ld.videoobject || ld.mediaobject;
-
-        /*
-        || (ld.newsarticle && (ld.newsarticle.video || ld.newsarticle.videoobject)) 
-        || (ld.tvepisode && (ld.tvepisode.video || ld.tvepisode.videoobject))
-        || (ld.movie && (ld.movie.video || ld.movie.videoobject))
-        || (ld.tvclip && (ld.tvclip.video || ld.tvclip.videoobject));
-        */
-        if (!json) { // try to find video attached to main object
-            var mainObjWithVideo = ld && Object.values(ld).find((obj) => obj.video || obj.videoobject);
-            if (mainObjWithVideo) {
-                json = mainObjWithVideo.video || mainObjWithVideo.videoobject;
-            }
-        }
+    getData: function(ld, whitelistRecord, utils, url) {
 
-        if (json) {
+        var json = utils.findMainLdObjectWithVideo(ld);
 
-            if (Array.isArray(json) && json.length === 1) {
-                json = json[0];
-            }
+        if (json) {
 
             var video_src = json.embedurl || json.embedUrl || json.embedURL || json.contenturl || json.contentUrl || json.contentURL;
 
@@ -73,13 +56,7 @@ export default {
     }
 
     /*
-    http://video.eurosport.com/football/who-will-nelson-the-hornbill-pick-to-win-in-france-v-romania_vid809882/video.shtml
-    http://video.eurosport.fr/football/coupe-de-france/2015-2016/video-granville-bourg-en-bresse-les-temps-forts_vid471598/video.shtml
-    http://video.eurosport.de/tennis/australian-open/2017/australian-open-2017-boris-becker-spricht-klartext-3-grunde-fur-das-aus-von-zverev-gegen-federer_vid954898/video.shtml
-    http://video.eurosport.co.uk/cycling/tour-de-france/2016/science-of-cycling-the-echelon-how-to-deal-with-a-crosswind_vid817450/video.shtml
-    http://www.hgtv.com/videos/small-home-in-tucson-arizona-0210527
-    http://www.travelchannel.com/videos/exorcism-of-roland-doe-0203807
-    https://www.parismatch.com/People/Delon-Belmondo-duel-au-sommet-pour-Paris-Match-1630358?jwsource=cl
+    https://www.autonews.fr/actualite/nouvelle-alpine-a110s-notre-video-exclusive-sur-circuit-86133
 
     Movie:
     https://www.fandango.com/movie-trailer/x-men-days-of-future-past/159281?autoplay=true&mpxId=2458744940
diff --git a/plugins/links/oembed-rich.js b/plugins/links/oembed-rich.js
@@ -107,7 +107,9 @@ export default {
             widget.rel.push('nowheel');
         }
 
-        if (widget.href && whitelistRecord.isAllowed('oembed.rich', "accept") && widget.type === CONFIG.T.text_html) {
+        if (widget.href && widget.type === CONFIG.T.text_html 
+            && (whitelistRecord.isAllowed('oembed.rich', "accept")
+                || /^http:\/\/([^\/]+)\//i.test(widget.href))) {
             widget.accept = widget.type;
             delete widget.type;
         }
diff --git a/plugins/links/twitter-player.js b/plugins/links/twitter-player.js
@@ -23,7 +23,14 @@ export default {
             }
 
             if (whitelistRecord.isAllowed('twitter.player', 'iframely')) {
-                player.rel.push(CONFIG.R.iframely); // Allows player = canonical
+                // Allow player = canonical
+                player.rel.push(CONFIG.R.iframely);
+
+                // Also skip type validation.
+                // Ex.: https://www.billoreilly.com/video?chartID=330&pid=37561
+                //      https://video.tv.adobe.com/v/3424206
+                player.type = CONFIG.T.text_html;
+                delete player.accept;
             }
 
             return player;

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ HTMLMetaHandler.prototype.onopentag = function(name, attributes) {`
`68`	`68`	`value = value.replace(/(\r\n\|\n\|\r)/gm, ' ');`
`69`	`69`	`}`
`70`	`70`
`71`		`- if (/^\d+$/.test(value)) { // convert to integer`
	`71`	`+ if (/^\d+$/.test(value) && !/(title\|description)/i.test(tagName)) { // convert to integer`
`72`	`72`	`value = parseInt(value, 10);`
`73`	`73`	`} else if (/^\d+\.\d+$/.test(value)) {`
`74`	`74`	`value = parseFloat(value);`