Feed Detection Improved with all known content types and base_url app…

…end if needed Release 1.0.12
DEKHTIARJonathan · Sep 27, 2017 · a3e2b25 · a3e2b25
1 parent bec4093
commit a3e2b25
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 6 deletions.
diff --git a/app/background.js b/app/background.js
@@ -88,11 +88,40 @@ function checkRSSFeeds() {
             chrome.tabs.executeScript(
                 tabs[0].id,
                 {
-                    code: 'var rss_tag = document.querySelector("[type=\'application/rss+xml\']"); \
-                          if (rss_tag == null){rss_tag = document.querySelector("[type=\'application/atom+xml\']");} \
-                          if (rss_tag == null) {\
-                             if (["application/xhtml+xml","application/xml"].indexOf(document.contentType) > -1){document.documentURI;} else{null;} \
-                          } else { rss_tag.getAttribute("href");}'
+                    code: `
+                        var RSS_CONTENT_TYPES = [
+                            "application/xhtml+xml",
+                            "application/xml",
+                            "application/atom+xml",
+                            "application/rss+xml",
+                            "application/rdf+xml",
+                            "text/xml"
+                        ]
+
+                        var rss_tag = null;
+
+                        for (x in RSS_CONTENT_TYPES){
+                            rss_tag = document.querySelector("[type=\'"+RSS_CONTENT_TYPES [x]+"\']");
+                            if (rss_tag != null){
+                                feed_url = rss_tag.getAttribute("href");
+                                break;
+                            }
+                        }
+
+                        if (rss_tag == null) {
+                            if (RSS_CONTENT_TYPES.indexOf(document.contentType) > -1){
+                                feed_url = document.documentURI;
+                            } else {
+                                null;
+                            }
+                        }
+
+                        if (feed_url[0] == "/" &&  feed_url.substring(0, 2) != "//"){
+                            feed_url = window.location.origin + feed_url;
+                        }
+
+                        feed_url
+                        `
                 },
                 function(rss_href){
                     if(chrome.runtime.lastError == undefined){

diff --git a/manifest.json b/manifest.json
@@ -4,7 +4,7 @@
     "short_name": "Feedcrunch",
     "author": "Jonathan DEKHTIAR",
     "manifest_version": 2,
-    "version": "1.0.11",
+    "version": "1.0.12",
 
     "description": "Feedcrunch.IO - Chrome Extension",
     "icons": {