Improve RSS preview

6 files changed, 78 insertions, 73 deletions

diff --git a/content_scripts/bridges/instagram.js b/content_scripts/bridges/instagram.js
index 0ced06a..18988b9 100644
--- a/content_scripts/bridges/instagram.js
+++ b/content_scripts/bridges/instagram.js
@@ -7,4 +7,4 @@ async function get_insta() {
     let feed_url = `${base_url}/?action=display&bridge=Instagram&context=Username&u=${uid}&media_type=all&format=`;
     return get_all_types(feed_url)
 }
-
+register(["instagram"], get_insta)
diff --git a/content_scripts/bridges/twitter.js b/content_scripts/bridges/twitter.js
index e9855cb..1ffa131 100644
--- a/content_scripts/bridges/twitter.js
+++ b/content_scripts/bridges/twitter.js
@@ -4,9 +4,15 @@ function get_twitter() {
     let match = url.match(pattern);
     if (match) {
         let twitter_handle = match[1]
+
         let feed_url = `${base_url}/?action=display&bridge=Twitter&context=By+username&u=${twitter_handle}&format=`
-        return get_all_types(feed_url)
+        let feeds = get_all_types(feed_url)
+
+        let feed_url_norep = `${base_url}/?action=display&bridge=Twitter&context=By+username&u=${twitter_handle}&norep=on&format=`
+        let feeds_norep = get_all_types(feed_url, "no replies")
+
+        return feeds.concat(feeds_norep)
     }
     return []
 }
-
+register(["twitter"], get_twitter)
diff --git a/content_scripts/bridges/youtube.js b/content_scripts/bridges/youtube.js
index 202873b..e6b584c 100644
--- a/content_scripts/bridges/youtube.js
+++ b/content_scripts/bridges/youtube.js
@@ -31,7 +31,7 @@ async function get_youtube() {
 
         let patternListInVideo = /youtube.com\/watch\?v=\w+\&list=(\w+)/
         let matchListInVideo = url.match(patternListInVideo)
-        if(matchListInVideo){
+        if(matchListInVideo && matchListInVideo[1]){
             let playlistId = matchListInVideo[1]
             let playlist_feed_url = `${base_url}/?action=display&bridge=Youtube&context=By+playlist+Id&p=${playlistId}&duration_min=&duration_max=&format=`
             let native_url = get_native_playlist_feed(playlistId)
@@ -41,17 +41,17 @@ async function get_youtube() {
 
         return feeds
     }
-    if (matchUser) {
+    if (matchUser && matchUser[1]) {
         let user = matchUser[1];
         let feed_url = `${base_url}/?action=display&bridge=Youtube&context=By+username&u=${user}&duration_min=&duration_max=&format=`
         return get_all_types(feed_url)
     }
-    if (matchChannel) {
+    if (matchChannel && matchChannel[1]) {
         let channelId = matchChannel[1]
         let feed_url = `${base_url}/?action=display&bridge=Youtube&context=By+channel+id&c=${channelId}&duration_min=&duration_max=&format=`
         return get_all_types(feed_url)
     }
-    if (matchPlaylist) {
+    if (matchPlaylist && matchPlaylist[1]) {
         let playlistId = matchPlaylist[1]
         let native_url = get_native_playlist_feed(playlistId)
         let feed_url = `${base_url}/?action=display&bridge=Youtube&context=By+playlist+Id&p=${playlistId}&duration_min=&duration_max=&format=`
@@ -61,3 +61,4 @@ async function get_youtube() {
     return []
 }
 
+register(["youtube"], get_youtube)
diff --git a/content_scripts/cs.js b/content_scripts/cs.js
index e57176b..6b66d92 100644
--- a/content_scripts/cs.js
+++ b/content_scripts/cs.js
@@ -1,86 +1,29 @@
 var base_url = undefined
-let formats = ["Atom", "Mrss", "Html"]
-let types = {
-    'application/rss+xml': "rss",
-    'application/atom+xml': "atom",
-    'application/rdf+xml': "rdf",
-    'application/rss': "rss",
-    'application/atom': "atom",
-    'application/rdf': "rdf",
-    'text/rss+xml': "rss",
-    'text/atom+xml': "atom",
-    'text/rdf+xml': "rdf",
-    'text/rss': "rss",
-    'text/atom': "atom",
-    'text/rdf': "rdf"
-}
-
-
-function find_links_in_page() {
-    let links = document.querySelectorAll('link[type]');
-    let feeds = [];
-    for (let i = 0; i < links.length; i++) {
-        if (links[i].hasAttribute('type') && links[i].getAttribute('type') in types) {
-            let title = links[i].getAttribute('title')
-            let href = links[i].getAttribute('href')
-            let feed_url = new URL(href, window.location.href).href
-            let type = types[links[i].getAttribute('type')]
-            let feed = {
-                type: `native: ${title || type}`,
-                url: feed_url,
-            };
-            feeds.push(feed);
-        }
-    }
-    return feeds
-}
-
-function get_all_types(feed_url, note) {
-    let feeds = [];
-    formats.forEach(el => {
-        if(note){
-            feeds.push({
-                type: `rss-bridge (${note}): ${el}`,
-                url: feed_url + el
-            });
-        } else {
-            feeds.push({
-                type: `rss-bridge: ${el}`,
-                url: feed_url + el
-            });
-        }
-    })
-    return feeds;
-}
-
-let objs = []
 
+// Get the list of all feeds, combining bridged and native feeds
 async function get_feed_urls() {
     let settings = await browser.storage.sync.get("rb");
     base_url = settings.rb;
     let all_feed_urls = []
-    let host = window.location.host;
-    for (const obj of objs) {
-        for (const obj_host of obj.hosts) {
-            if (host.includes(obj_host)) {
-                result = await obj.callback()
+    for (const bridge of bridges) {
+        for (const host of bridge.hosts) {
+            if (window.location.host.includes(host)) {
+                result = await bridge.callback()
                 all_feed_urls = all_feed_urls.concat(result)
                 break
             }
         }
     }
-    all_feed_urls = all_feed_urls.concat(find_links_in_page())
+    all_feed_urls = all_feed_urls.concat(find_feeds_in_page())
     return all_feed_urls
 }
 
+// Function to register a new bridge
+let bridges = []
 function register(hosts, callback) {
-    objs.push({hosts, callback})
+    bridges.push({hosts, callback})
 }
 
-register(["instagram"], get_insta)
-register(["twitter"], get_twitter)
-register(["youtube"], get_youtube)
-
 browser.runtime.onMessage.addListener(function (msg, sender) {
     return Promise.resolve(get_feed_urls());
 })
diff --git a/content_scripts/rss_bridge.js b/content_scripts/rss_bridge.js
new file mode 100644
index 0000000..ac591bd
--- /dev/null
+++ b/content_scripts/rss_bridge.js
@@ -0,0 +1,20 @@
+let formats = ["Atom", "Mrss"]
+function get_all_types(feed_url, note) {
+    let feeds = [];
+    formats.forEach(el => {
+        if(note){
+            feeds.push({
+                type: el,
+                name: `rss-bridge (${note}): ${el}`,
+                url: feed_url + el
+            });
+        } else {
+            feeds.push({
+                type: el,
+                name: `rss-bridge: ${el}`,
+                url: feed_url + el
+            });
+        }
+    })
+    return feeds;
+}
diff --git a/content_scripts/scraper.js b/content_scripts/scraper.js
new file mode 100644
index 0000000..51043c3
--- /dev/null
+++ b/content_scripts/scraper.js
@@ -0,0 +1,35 @@
+let types = {
+    'application/rss+xml': "rss",
+    'application/atom+xml': "atom",
+    'application/rdf+xml': "rdf",
+    'application/rss': "rss",
+    'application/atom': "atom",
+    'application/rdf': "rdf",
+    'text/rss+xml': "rss",
+    'text/atom+xml': "atom",
+    'text/rdf+xml': "rdf",
+    'text/rss': "rss",
+    'text/atom': "atom",
+    'text/rdf': "rdf"
+}
+
+// Scrape feed links from DOM
+function find_feeds_in_page() {
+    let links = document.querySelectorAll('link[type]');
+    let feeds = [];
+    for (let i = 0; i < links.length; i++) {
+        if (links[i].hasAttribute('type') && links[i].getAttribute('type') in types) {
+            let title = links[i].getAttribute('title')
+            let href = links[i].getAttribute('href')
+            let feed_url = new URL(href, window.location.href).href
+            let type = types[links[i].getAttribute('type')]
+            let feed = {
+                name: `native: ${title || type}`,
+                type: type,
+                url: feed_url,
+            };
+            feeds.push(feed);
+        }
+    }
+    return feeds
+}