Merge branch 'dev'

itteco · Dec 18, 2024 · ec145a1 · ec145a1
2 parents 61e9a65 + 9352045
commit ec145a1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 40 deletions.
diff --git a/plugins/domains/c-span.org/c-span.org-options.js b/plugins/domains/c-span.org/c-span.org-options.js
@@ -4,5 +4,6 @@ export default {
 
     getData: function(url, options) {
         options.exposeStatusCode = true;
+        options.followHTTPRedirect=true
     }
 };
diff --git a/plugins/domains/cnn.com.js b/plugins/domains/cnn.com.js
diff --git a/plugins/links/iframely-link.js b/plugins/links/iframely-link.js
@@ -7,21 +7,31 @@ export default {
         if (appname) {
             appname = appname.toLowerCase();
         }
-        
+
         let ignoreIframely = false;
         let links = [];
 
         if (appname && Object.keys(meta).some(key => key.indexOf(appname) === 0)) {
             ignoreIframely = true;
         }
 
-        for (const [key, value] of Object.entries(meta)) {
+        for (const [key, v] of Object.entries(meta)) {
             if (key.indexOf(appname) === 0 || (!ignoreIframely && key.indexOf(CONFIG.R.iframely) === 0)) {
+
+                const value = typeof(v) === 'string' ? {href: v} : v; // If link has no `media` and no `type` attributes, HTMLMetaHandler assigns the value=href;
+
+                let wlr = whitelistRecord;
+                if (whitelistRecord.isDefault
+                    && !Array.isArray(value) && value.href
+                    && (!value.type || value.type === CONFIG.T.text_html)) {
+                    wlr = options.getWhitelistRecord(value.href, {exclusiveRel: 'html-meta'});
+                }
+
                 links = links.concat(
                     utils.parseMetaLinks(
                         key, 
-                        typeof(value) === 'string' ? {href: value} : value, // If link has no `media` and no `type` attributes, HTMLMetaHandler assigns the value=href;
-                        whitelistRecord, 
+                        value,
+                        wlr, 
                         ignoreIframely && appname
                     )
                 );