fix mistake.

And adding relevant setings.py.example/etc.

apiserver/feed.py

@@ -8,7 +8,7 @@ import time
 from bs4 import BeautifulSoup
 
 import settings
-from feeds import hackernews, reddit, tildes, manual
+from feeds import hackernews, reddit, tildes, substack, manual, sitemap
 
 OUTLINE_API = 'https://api.outline.com/v3/parse_article'
 READ_API = 'http://127.0.0.1:33843'
@@ -16,6 +16,13 @@ READ_API = 'http://127.0.0.1:33843'
 INVALID_DOMAINS = ['youtube.com', 'bloomberg.com', 'wsj.com']
 TWO_DAYS = 60*60*24*2
 
+substacks = {}
+for key, value in settings.SUBSTACK.items():
+    substacks[key] = substack.Publication(value['url'])
+sitemaps = {}
+for key, value in settings.SITEMAP.items():
+    sitemaps[key] = sitemap.Sitemap(value['url'])
+
 def list():
     feed = []
     if settings.NUM_HACKERNEWS:
@@ -27,6 +34,18 @@ def list():
     if settings.NUM_TILDES:
         feed += [(x, 'tildes') for x in tildes.feed()[:settings.NUM_TILDES]]
 
+    if settings.NUM_SUBSTACK:
+        feed += [(x, 'substack') for x in substack.top.feed()[:settings.NUM_SUBSTACK]]
+
+    for key, publication in substacks.items():
+        count = settings.SUBSTACK[key].count
+        feed += [(x, key) for x in publication.feed()[:count]]
+
+    for key, sites in sitemaps.items():
+        count = settings.SITEMAP[key].count
+        feed += [(x, key) for x in sites.feed()[:count]]
+
+
     return feed
 
 def get_article(url):
@@ -84,6 +103,12 @@ def update_story(story, is_manual=False):
         res = reddit.story(story['ref'])
     elif story['source'] == 'tildes':
         res = tildes.story(story['ref'])
+    elif story['source'] == 'substack':
+        res = substack.top.story(story['ref'])
+    elif story['source'] in sitemaps.keys():
+        res = sitemaps[story['source']].story(story['ref'])
+    elif story['source'] in substacks.keys():
+        res = substacks[story['source']].story(story['ref'])
     elif story['source'] == 'manual':
         res = manual.story(story['ref'])
 

apiserver/feeds/sitemap.py

@@ -0,0 +1,110 @@
+import logging
+logging.basicConfig(
+        format='%(asctime)s - %(name)s - %(levelname)s - %(message)s',
+        level=logging.DEBUG)
+
+if __name__ == '__main__':
+    import sys
+    sys.path.insert(0,'.')
+
+import requests
+from datetime import datetime
+from bs4 import BeautifulSoup
+
+from utils import clean
+
+OUTLINE_API = 'https://api.outline.com/v3/parse_article'
+USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:77.0) Gecko/20100101 Firefox/77.0'
+
+def unix(date_str):
+    return int(datetime.strptime(date_str, '%Y-%m-%dT%H:%M:%SZ').timestamp())
+
+def xml(route, ref=None):
+    try:
+        headers = {'User-Agent': USER_AGENT, 'X-Forwarded-For': '66.249.66.1'}
+        r = requests.get(route(ref), headers=headers, timeout=5)
+        if r.status_code != 200:
+            raise Exception('Bad response code ' + str(r.status_code))
+        return r.text
+    except KeyboardInterrupt:
+        raise
+    except BaseException as e:
+        logging.error('Problem hitting URL: {}'.format(str(e)))
+        return False
+
+def get_article_details(url):
+    try:
+        params = {'source_url': url}
+        headers = {'Referer': 'https://outline.com/'}
+        r = requests.get(OUTLINE_API, params=params, headers=headers, timeout=20)
+        if r.status_code == 429:
+            logging.info('Rate limited by outline, sleeping 30s and skipping...')
+            time.sleep(30)
+            return ''
+        if r.status_code != 200:
+            raise Exception('Bad response code ' + str(r.status_code))
+        data = r.json()['data']
+        if 'URL is not supported by Outline' in data['html']:
+            raise Exception('URL not supported by Outline')
+        return (data, "outline")
+    except KeyboardInterrupt:
+        raise
+    except BaseException as e:
+        logging.error('Problem outlining article: {}'.format(str(e)))
+        return (None, None)
+
+
+class Sitemap:
+    def __init__(self, url):
+        self.sitemap_url = url
+
+    def feed(self):
+        markup = xml(lambda x: self.sitemap_url)
+        if not markup: return []
+        soup = BeautifulSoup(markup, features='lxml')
+        articles = soup.find('urlset').findAll('url')
+        articles = list(filter(None, [a if a.find('lastmod') is not None else None for a in articles]))
+        return [x.find('loc').text for x in articles] or []
+
+    def story(self, ref):
+        markup = xml(lambda x: self.sitemap_url)
+        if not markup: return []
+        soup = BeautifulSoup(markup, features='lxml')
+        articles = soup.find('urlset').findAll('url')
+        articles = list(filter(None, [a if a.find('lastmod') is not None else None for a in articles]))
+        articles = list(filter(None, [a if a.find('loc').text == ref else None for a in articles]))
+
+        if len(articles) == 0:
+            return False
+
+        r = articles[0]
+        if not r:
+            return False
+
+        (data, method) = get_article_details(ref)
+        if not data:
+            return False
+        if 'outline' not in method:
+            return False
+        s = {}
+        s['author'] = data['author']
+        s['author_link'] = ''
+        s['date'] = unix(r.find('lastmod').text)
+        s['score'] = 0
+        s['title'] = data['title']
+        s['link'] = data['article_url']
+        s['url'] = data['article_url']
+        s['comments'] = []
+        s['num_comments'] = 0
+        s['text'] = data['html']
+        
+        return s
+
+
+# scratchpad so I can quickly develop the parser
+if __name__ == '__main__':
+    # site = Sitemap("https://www.stuff.co.nz/sitemap.xml")
+    site = Sitemap("https://www.nzherald.co.nz/arcio/news-sitemap/")
+    posts = site.feed()
+    print(posts[:1])
+    print(site.story(posts[0]))

apiserver/feeds/substack.py

@@ -0,0 +1,160 @@
+import logging
+logging.basicConfig(
+        format='%(asctime)s - %(name)s - %(levelname)s - %(message)s',
+        level=logging.DEBUG)
+
+if __name__ == '__main__':
+    import sys
+    sys.path.insert(0,'.')
+
+import requests
+from datetime import datetime
+
+from utils import clean
+
+SUBSTACK_API_TOP_POSTS = lambda x: "https://substack.com/api/v1/reader/top-posts"
+
+def author_link(author_id, base_url):
+    return f"{base_url}/people/{author_id}"
+def api_comments(post_id, base_url):
+    return f"{base_url}/api/v1/post/{post_id}/comments?all_comments=true&sort=best_first"
+def api_stories(x, base_url): 
+    return f"{base_url}/api/v1/archive?sort=new&search=&offset=0&limit=100"
+
+def unix(date_str):
+    return int(datetime.strptime(date_str, '%Y-%m-%dT%H:%M:%S.%fZ').timestamp())
+
+def api(route, ref=None):
+    try:
+        r = requests.get(route(ref), timeout=5)
+        if r.status_code != 200:
+            raise Exception('Bad response code ' + str(r.status_code))
+        return r.json()
+    except KeyboardInterrupt:
+        raise
+    except BaseException as e:
+        logging.error('Problem hitting Substack API: {}, trying again'.format(str(e)))
+
+    try:
+        r = requests.get(route(ref), timeout=15)
+        if r.status_code != 200:
+            raise Exception('Bad response code ' + str(r.status_code))
+        return r.json()
+    except KeyboardInterrupt:
+        raise
+    except BaseException as e:
+        logging.error('Problem hitting Substack API: {}'.format(str(e)))
+        return False
+
+def comment(i):
+    if 'body' not in i:
+        return False
+
+    c = {}
+    c['date'] = unix(i.get('date'))
+    c['author'] = i.get('name', '')
+    c['score'] = i.get('reactions').get('❤')
+    c['text'] = clean(i.get('body', '') or '')
+    c['comments'] = [comment(j) for j in i['children']]
+    c['comments'] = list(filter(bool, c['comments']))
+
+    return c
+
+class Publication:
+    def __init__(self, domain):
+        self.BASE_DOMAIN = domain
+
+    def feed(self):
+        stories = api(lambda x: api_stories(x, self.BASE_DOMAIN))
+        stories = list(filter(None, [i if i.get("audience") == "everyone" else None for i in stories]))
+        return [str(i.get("id")) for i in stories or []]
+
+    def story(self, ref):
+        stories = api(lambda x: api_stories(x, self.BASE_DOMAIN))
+        stories = list(filter(None, [i if i.get("audience") == "everyone" else None for i in stories]))
+        stories = list(filter(None, [i if str(i.get('id')) == ref else None for i in stories]))
+
+        if len(stories) == 0:
+            return False
+
+        r = stories[0]
+        if not r:
+            return False
+
+        s = {}
+        s['author'] = ''
+        s['author_link'] = ''
+
+        s['date'] = unix(r.get('post_date'))
+        s['score'] = r.get('reactions').get('❤')
+        s['title'] = r.get('title', '')
+        s['link'] = r.get('canonical_url', '')
+        s['url'] = r.get('canonical_url', '')
+        comments = api(lambda x: api_comments(x, self.BASE_DOMAIN), r.get('id'))
+        s['comments'] = [comment(i) for i in comments.get('comments')]
+        s['comments'] = list(filter(bool, s['comments']))
+        s['num_comments'] = r.get('comment_count', 0)
+
+        authors = list(filter(None, [self._bylines(byline) for byline in r.get('publishedBylines')]))
+        if len(authors):
+            s['author'] = authors[0].get('name')
+            s['author_link'] = authors[0].get('link')
+
+        return s
+
+    def _bylines(self, b):
+        if 'id' not in b:
+            return None
+        a = {}
+        a['name'] = b.get('name')
+        a['link'] = author_link(b.get('id'), self.BASE_DOMAIN)
+        return a
+
+
+class Top:
+    def feed(self):
+        stories = api(SUBSTACK_API_TOP_POSTS)
+        stories = list(filter(None, [i if i.get("audience") == "everyone" else None for i in stories]))
+        return [str(i.get("id")) for i in stories or []]
+
+    def story(self, ref):
+        stories = api(SUBSTACK_API_TOP_POSTS)
+        stories = list(filter(None, [i if i.get("audience") == "everyone" else None for i in stories]))
+        stories = list(filter(None, [i if str(i.get('id')) == ref else None for i in stories]))
+
+        if len(stories) == 0:
+            return False
+
+        r = stories[0]
+        if not r:
+            return False
+
+        s = {}
+        pub = r.get('pub')
+        base_url = pub.get('base_url')
+        s['author'] = pub.get('author_name')
+        s['author_link'] = author_link(pub.get('author_id'), base_url)
+
+        s['date'] = unix(r.get('post_date'))
+        s['score'] = r.get('score')
+        s['title'] = r.get('title', '')
+        s['link'] = r.get('canonical_url', '')
+        s['url'] = r.get('canonical_url', '')
+        comments = api(lambda x: api_comments(x, base_url), r.get('id'))
+        s['comments'] = [comment(i) for i in comments.get('comments')]
+        s['comments'] = list(filter(bool, s['comments']))
+        s['num_comments'] = r.get('comment_count', 0)
+
+        return s
+
+top = Top()        
+
+# scratchpad so I can quickly develop the parser
+if __name__ == '__main__':
+    top_posts = top.feed()
+    print(top.story(top_posts[0]))
+
+    webworm = Publication("https://www.webworm.co/")
+    posts = webworm.feed()
+    print(posts[:1])
+    print(webworm.story(posts[0]))

apiserver/requirements.txt

@@ -11,6 +11,7 @@ greenlet==0.4.16
 idna==2.10
 itsdangerous==1.1.0
 Jinja2==2.11.2
+lxml==4.6.1
 MarkupSafe==1.1.1
 packaging==20.4
 praw==6.4.0

apiserver/settings.py.example

@@ -7,6 +7,17 @@
 NUM_HACKERNEWS = 15
 NUM_REDDIT = 10
 NUM_TILDES = 5
+NUM_SUBSTACK = 10
+
+# SITEMAP = {
+#     'nzherald': { 'url': "https://www.nzherald.co.nz/arcio/news-sitemap/", 'count': 10},
+#     'stuff': { 'url': "https://www.stuff.co.nz/sitemap.xml", 'count': 10},
+# }
+
+# SUBSTACK = {
+#     'webworm': { 'url': "https://www.webworm.co", 'count': 10},
+#     'the bulletin': { 'url': "https://thespinoff.substack.com", 'count': 10},
+# }
 
 # Reddit account info
 # leave blank if not using Reddit

webclient/src/Feed.js

@@ -22,20 +22,21 @@ class Feed extends React.Component {
 					const updated = !this.state.stories || this.state.stories[0].id !== result.stories[0].id;
 					console.log('updated:', updated);
 
-					this.setState({ stories: result.stories });
+					const { stories } = result;
-					localStorage.setItem('stories', JSON.stringify(result.stories));
+					this.setState({ stories });
+					localStorage.setItem('stories', JSON.stringify(stories));
 
 					if (updated) {
 						localForage.clear();
-						result.stories.forEach((x, i) => {
+						stories.forEach((x, i) => {
 							fetch('/api/' + x.id)
 								.then(res => res.json())
-								.then(result => {
+								.then(({ story }) => {
-									localForage.setItem(x.id, result.story)
+									localForage.setItem(x.id, story)
 										.then(console.log('preloaded', x.id, x.title));
-									this.props.updateCache(x.id, result.story);
+									this.props.updateCache(x.id, story);
-								}, error => {}
+								}, error => { }
-							);
+								);
 						});
 					}
 				},
@@ -49,6 +50,10 @@ class Feed extends React.Component {
 		const stories = this.state.stories;
 		const error = this.state.error;
 
+		if (stories) {
+			stories.sort((a, b) => b.date - a.date);
+		}
+
 		return (
 			<div className='container'>
 				<Helmet>
@@ -73,7 +78,7 @@ class Feed extends React.Component {
 							</div>
 						)}
 					</div>
-				:
+					:
 					<p>loading...</p>
 				}
 			</div>