refactor: Adapt Meilisearch integration to v1.29.0 API

Co-authored-by: aider (gemini/gemini-2.5-pro) <aider@aider.chat>

.gitignore

@@ -0,0 +1 @@
+.aider*

apiserver/database.py

@@ -5,7 +5,7 @@ from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import sessionmaker
 from sqlalchemy.exc import IntegrityError
 
-engine = create_engine('sqlite:///data/qotnews.sqlite', connect_args={'timeout': 120})
+engine = create_engine('sqlite:///data/qotnews.sqlite', connect_args={'timeout': 360})
 Session = sessionmaker(bind=engine)
 
 Base = declarative_base()
@@ -68,12 +68,13 @@ def get_reflist(amount):
     q = session.query(Reflist).order_by(Reflist.rid.desc()).limit(amount)
     return [dict(ref=x.ref, sid=x.sid, source=x.source) for x in q.all()]
 
-def get_stories(amount):
+def get_stories(amount, skip=0):
     session = Session()
     q = session.query(Reflist, Story.meta_json).\
             order_by(Reflist.rid.desc()).\
             join(Story).\
             filter(Story.title != None).\
+            offset(skip).\
             limit(amount)
     return [x[1] for x in q]
 
@@ -100,7 +101,22 @@ def del_ref(ref):
     finally:
         session.close()
 
+def count_stories():
+    try:
+        session = Session()
+        return session.query(Story).count()
+    finally:
+        session.close()
+
+def get_story_list():
+    try:
+        session = Session()
+        return session.query(Story.sid).all()
+    finally:
+        session.close()
+
 if __name__ == '__main__':
     init()
 
-    print(get_story_by_ref('hgi3sy'))
+    #print(get_story_by_ref('hgi3sy'))
+    print(len(get_reflist(99999)))

apiserver/feed.py

@@ -9,9 +9,7 @@ from bs4 import BeautifulSoup
 
 import settings
 from feeds import hackernews, reddit, tildes, manual, lobsters
-
+import utils
-OUTLINE_API = 'https://api.outline.com/v3/parse_article'
-READ_API = 'http://127.0.0.1:33843'
 
 INVALID_DOMAINS = ['youtube.com', 'bloomberg.com', 'wsj.com', 'sec.gov']
 TWO_DAYS = 60*60*24*2
@@ -33,29 +31,16 @@ def list():
     return feed
 
 def get_article(url):
-    try:
+    if not settings.READER_URL:
-        params = {'source_url': url}
+        logging.info('Readerserver not configured, aborting.')
-        headers = {'Referer': 'https://outline.com/'}
+        return ''
-        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))
-        html = r.json()['data']['html']
-        if 'URL is not supported by Outline' in html:
-            raise Exception('URL not supported by Outline')
-        return html
-    except KeyboardInterrupt:
-        raise
-    except BaseException as e:
-        logging.error('Problem outlining article: {}'.format(str(e)))
 
-    logging.info('Trying our server instead...')
+    if url.startswith('https://twitter.com'):
+        logging.info('Replacing twitter.com url with nitter.net')
+        url = url.replace('twitter.com', 'nitter.net')
 
     try:
-        r = requests.post(READ_API, data=dict(url=url), timeout=20)
+        r = requests.post(settings.READER_URL, data=dict(url=url), timeout=20)
         if r.status_code != 200:
             raise Exception('Bad response code ' + str(r.status_code))
         return r.text
@@ -66,34 +51,39 @@ def get_article(url):
         return ''
 
 def get_content_type(url):
+    try:
+        headers = {'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:77.0) Gecko/20100101 Firefox/77.0'}
+        return requests.get(url, headers=headers, timeout=5).headers['content-type']
+    except:
+        return ''
+
     try:
         headers = {
             'User-Agent': 'Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)',
             'X-Forwarded-For': '66.249.66.1',
         }
-        return requests.get(url, headers=headers, timeout=5).headers['content-type']
-    except:
-        pass
-
-    try:
-        headers = {'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:77.0) Gecko/20100101 Firefox/77.0'}
         return requests.get(url, headers=headers, timeout=10).headers['content-type']
     except:
-        return ''
+        pass
 
 def update_story(story, is_manual=False):
     res = {}
 
-    if story['source'] == 'hackernews':
+    try:
-        res = hackernews.story(story['ref'])
+        if story['source'] == 'hackernews':
-    elif story['source'] == 'lobsters':
+            res = hackernews.story(story['ref'])
-        res = lobsters.story(story['ref'])
+        elif story['source'] == 'lobsters':
-    elif story['source'] == 'reddit':
+            res = lobsters.story(story['ref'])
-        res = reddit.story(story['ref'])
+        elif story['source'] == 'reddit':
-    elif story['source'] == 'tildes':
+            res = reddit.story(story['ref'])
-        res = tildes.story(story['ref'])
+        elif story['source'] == 'tildes':
-    elif story['source'] == 'manual':
+            res = tildes.story(story['ref'])
-        res = manual.story(story['ref'])
+        elif story['source'] == 'manual':
+            res = manual.story(story['ref'])
+    except BaseException as e:
+        utils.alert_tanner('Problem updating {} story, ref {}: {}'.format(story['source'], story['ref'], str(e)))
+        logging.exception(e)
+        return False
 
     if res:
         story.update(res) # join dicts
@@ -102,7 +92,7 @@ def update_story(story, is_manual=False):
         return False
 
     if story['date'] and not is_manual and story['date'] + TWO_DAYS < time.time():
-        logging.info('Story too old, removing')
+        logging.info('Story too old, removing. Date: {}'.format(story['date']))
         return False
 
     if story.get('url', '') and not story.get('text', ''):
@@ -116,6 +106,12 @@ def update_story(story, is_manual=False):
             logging.info(story['url'])
             return False
 
+        if 'trump' in story['title'].lower() or 'musk' in story['title'].lower() or 'Removed by moderator' in story['title']:
+            logging.info('Trump / Musk / removed story, skipping')
+            logging.info(story['url'])
+            return False
+
+
         logging.info('Getting article ' + story['url'])
         story['text'] = get_article(story['url'])
         if not story['text']: return False
@@ -133,7 +129,7 @@ if __name__ == '__main__':
 
     #print(get_article('https://www.bloomberg.com/news/articles/2019-09-23/xi-s-communists-under-pressure-as-high-prices-hit-china-workers'))
 
-    a = get_article('https://blog.joinmastodon.org/2019/10/mastodon-3.0/')
+    a = get_content_type('https://tefkos.comminfo.rutgers.edu/Courses/e530/Readings/Beal%202008%20full%20text%20searching.pdf')
     print(a)
 
     print('done')

apiserver/feeds/hackernews.py

@@ -12,7 +12,8 @@ import requests
 from utils import clean
 
 API_TOPSTORIES = lambda x: 'https://hacker-news.firebaseio.com/v0/topstories.json'
-API_ITEM = lambda x : 'https://hn.algolia.com/api/v1/items/{}'.format(x)
+ALG_API_ITEM = lambda x : 'https://hn.algolia.com/api/v1/items/{}'.format(x)
+BHN_API_ITEM = lambda x : 'https://api.hnpwa.com/v0/item/{}.json'.format(x)
 
 SITE_LINK = lambda x : 'https://news.ycombinator.com/item?id={}'.format(x)
 SITE_AUTHOR_LINK = lambda x : 'https://news.ycombinator.com/user?id={}'.format(x)
@@ -42,7 +43,7 @@ def api(route, ref=None):
 def feed():
     return [str(x) for x in api(API_TOPSTORIES) or []]
 
-def comment(i):
+def alg_comment(i):
     if 'author' not in i:
         return False
 
@@ -51,21 +52,25 @@ def comment(i):
     c['score'] = i.get('points', 0)
     c['date'] = i.get('created_at_i', 0)
     c['text'] = clean(i.get('text', '') or '')
-    c['comments'] = [comment(j) for j in i['children']]
+    c['comments'] = [alg_comment(j) for j in i['children']]
     c['comments'] = list(filter(bool, c['comments']))
     return c
 
-def comment_count(i):
+def alg_comment_count(i):
     alive = 1 if i['author'] else 0
-    return sum([comment_count(c) for c in i['comments']]) + alive
+    return sum([alg_comment_count(c) for c in i['comments']]) + alive
 
-def story(ref):
+def alg_story(ref):
-    r = api(API_ITEM, ref)
+    r = api(ALG_API_ITEM, ref)
-    if not r: return False
+    if not r:
+        logging.info('Bad Algolia Hackernews API response.')
+        return None
 
     if 'deleted' in r:
+        logging.info('Story was deleted.')
         return False
     elif r.get('type', '') != 'story':
+        logging.info('Type "{}" is not "story".'.format(r.get('type', '')))
         return False
 
     s = {}
@@ -76,17 +81,88 @@ def story(ref):
     s['title'] = r.get('title', '')
     s['link'] = SITE_LINK(ref)
     s['url'] = r.get('url', '')
-    s['comments'] = [comment(i) for i in r['children']]
+    s['comments'] = [alg_comment(i) for i in r['children']]
     s['comments'] = list(filter(bool, s['comments']))
-    s['num_comments'] = comment_count(s) - 1
+    s['num_comments'] = alg_comment_count(s) - 1
 
     if 'text' in r and r['text']:
         s['text'] = clean(r['text'] or '')
 
     return s
 
+def bhn_comment(i):
+    if 'user' not in i:
+        return False
+
+    c = {}
+    c['author'] = i.get('user', '')
+    c['score'] = 0   # Not present?
+    c['date'] = i.get('time', 0)
+    c['text'] = clean(i.get('content', '') or '')
+    c['comments'] = [bhn_comment(j) for j in i['comments']]
+    c['comments'] = list(filter(bool, c['comments']))
+    return c
+
+def bhn_story(ref):
+    r = api(BHN_API_ITEM, ref)
+    if not r:
+        logging.info('Bad BetterHN Hackernews API response.')
+        return None
+
+    if 'deleted' in r:   # TODO: verify
+        logging.info('Story was deleted.')
+        return False
+    elif r.get('dead', False):
+        logging.info('Story was deleted.')
+        return False
+    elif r.get('type', '') != 'link':
+        logging.info('Type "{}" is not "link".'.format(r.get('type', '')))
+        return False
+
+    s = {}
+    s['author'] = r.get('user', '')
+    s['author_link'] = SITE_AUTHOR_LINK(r.get('user', ''))
+    s['score'] = r.get('points', 0)
+    s['date'] = r.get('time', 0)
+    s['title'] = r.get('title', '')
+    s['link'] = SITE_LINK(ref)
+    s['url'] = r.get('url', '')
+    if s['url'].startswith('item'):
+        s['url'] = SITE_LINK(ref)
+    s['comments'] = [bhn_comment(i) for i in r['comments']]
+    s['comments'] = list(filter(bool, s['comments']))
+    s['num_comments'] = r.get('comments_count', 0)
+
+    if 'content' in r and r['content']:
+        s['text'] = clean(r['content'] or '')
+
+    return s
+
+def story(ref):
+    s = alg_story(ref)
+    if s is None:
+        s = bhn_story(ref)
+    if not s:
+        return False
+
+
+    if not s['title']:
+        return False
+
+    if s['score'] < 25 and s['num_comments'] < 10:
+        logging.info('Score ({}) or num comments ({}) below threshold.'.format(s['score'], s['num_comments']))
+        return False
+
+    return s
+
 # scratchpad so I can quickly develop the parser
 if __name__ == '__main__':
     print(feed())
     #print(story(20763961))
     #print(story(20802050))
+
+    #print(story(42899834))   # type "job"
+    #print(story(42900076))   # Ask HN
+    #print(story(42898201))   # Show HN
+    #print(story(42899703))   # normal
+    print(story(42902678))   # bad title?

apiserver/feeds/lobsters.py

@@ -44,12 +44,13 @@ def feed():
     return [x['short_id'] for x in api(API_HOTTEST) or []]
 
 def unix(date_str):
-    return int(datetime.strptime(date_str, '%Y-%m-%dT%H:%M:%S.%f%z').timestamp())
+    date_str = date_str.replace(':', '')
+    return int(datetime.strptime(date_str, '%Y-%m-%dT%H%M%S.%f%z').timestamp())
 
 def make_comment(i):
     c = {}
     try:
-        c['author'] = i['commenting_user']['username']
+        c['author'] = i['commenting_user']
     except KeyError:
         c['author'] = ''
     c['score'] = i.get('score', 0)
@@ -66,13 +67,13 @@ def iter_comments(flat_comments):
     parent_stack = []
     for comment in flat_comments:
         c = make_comment(comment)
-        indent = comment['indent_level']
+        indent = comment['depth']
 
-        if indent == 1:
+        if indent == 0:
             nested_comments.append(c)
             parent_stack = [c]
         else:
-            parent_stack = parent_stack[:indent-1]
+            parent_stack = parent_stack[:indent]
             p = parent_stack[-1]
             p['comments'].append(c)
             parent_stack.append(c)
@@ -80,11 +81,13 @@ def iter_comments(flat_comments):
 
 def story(ref):
     r = api(API_ITEM, ref)
-    if not r: return False
+    if not r:
+        logging.info('Bad Lobsters API response.')
+        return False
 
     s = {}
     try:
-        s['author'] = r['submitter_user']['username']
+        s['author'] = r['submitter_user']
         s['author_link'] = SITE_AUTHOR_LINK(s['author'])
     except KeyError:
         s['author'] = ''
@@ -100,6 +103,10 @@ def story(ref):
     s['comments'] = iter_comments(r['comments'])
     s['num_comments'] = r['comment_count']
 
+    if s['score'] < 15 and s['num_comments'] < 10:
+        logging.info('Score ({}) or num comments ({}) below threshold.'.format(s['score'], s['num_comments']))
+        return False
+
     if 'description' in r and r['description']:
         s['text'] = clean(r['description'] or '')
 
@@ -109,5 +116,5 @@ def story(ref):
 if __name__ == '__main__':
     #print(feed())
     import json
-    print(json.dumps(story('fzvd1v')))
+    print(json.dumps(story('fzvd1v'), indent=4))
-    #print(story(20802050))
+    #print(json.dumps(story('ixyv5u'), indent=4))

apiserver/feeds/manual.py

@@ -27,7 +27,9 @@ def api(route):
 
 def story(ref):
     html = api(ref)
-    if not html: return False
+    if not html:
+        logging.info('Bad http GET response.')
+        return False
 
     soup = BeautifulSoup(html, features='html.parser')
 

apiserver/feeds/reddit.py

@@ -32,11 +32,8 @@ def feed():
         return [x.id for x in reddit.subreddit(subs).hot()]
     except KeyboardInterrupt:
         raise
-    except PRAWException as e:
+    except BaseException as e:
-        logging.error('Problem hitting reddit API: {}'.format(str(e)))
+        logging.critical('Problem hitting reddit API: {}'.format(str(e)))
-        return []
-    except PrawcoreException as e:
-        logging.error('Problem hitting reddit API: {}'.format(str(e)))
         return []
 
 def comment(i):
@@ -59,7 +56,9 @@ def comment(i):
 def story(ref):
     try:
         r = reddit.submission(ref)
-        if not r: return False
+        if not r:
+            logging.info('Bad Reddit API response.')
+            return False
 
         s = {}
         s['author'] = r.author.name if r.author else '[Deleted]'
@@ -74,6 +73,7 @@ def story(ref):
         s['num_comments'] = r.num_comments
 
         if s['score'] < 25 and s['num_comments'] < 10:
+            logging.info('Score ({}) or num comments ({}) below threshold.'.format(s['score'], s['num_comments']))
             return False
 
         if r.selftext:
@@ -84,10 +84,10 @@ def story(ref):
     except KeyboardInterrupt:
         raise
     except PRAWException as e:
-        logging.error('Problem hitting reddit API: {}'.format(str(e)))
+        logging.critical('Problem hitting reddit API: {}'.format(str(e)))
         return False
     except PrawcoreException as e:
-        logging.error('Problem hitting reddit API: {}'.format(str(e)))
+        logging.critical('Problem hitting reddit API: {}'.format(str(e)))
         return False
 
 # scratchpad so I can quickly develop the parser

apiserver/feeds/tildes.py

@@ -34,7 +34,7 @@ def api(route):
     except KeyboardInterrupt:
         raise
     except BaseException as e:
-        logging.error('Problem hitting tildes website: {}'.format(str(e)))
+        logging.critical('Problem hitting tildes website: {}'.format(str(e)))
         return False
 
 def feed():
@@ -71,11 +71,15 @@ def story(ref):
         html = api(SITE_LINK(group_lookup[ref], ref))
     else:
         html = api(API_ITEM(ref))
-    if not html: return False
+    if not html:
+        logging.info('Bad Tildes API response.')
+        return False
 
     soup = BeautifulSoup(html, features='html.parser')
     a = soup.find('article', class_='topic-full')
-    if a is None: return False
+    if a is None:
+        logging.info('Tildes <article> element not found.')
+        return False
 
     h = a.find('header')
     lu = h.find('a', class_='link-user')
@@ -83,6 +87,7 @@ def story(ref):
     error = a.find('div', class_='text-error')
     if error:
         if 'deleted' in error.string or 'removed' in error.string:
+            logging.info('Article was deleted or removed.')
             return False
 
     s = {}
@@ -102,7 +107,21 @@ def story(ref):
     ch = a.find('header', class_='topic-comments-header')
     s['num_comments'] = int(ch.h2.string.split(' ')[0]) if ch else 0
 
-    if s['score'] < 8 and s['num_comments'] < 6:
+    if s['group'].split('.')[0] not in [
+        '~arts',
+        '~comp',
+        '~creative',
+        '~design',
+        '~engineering',
+        '~finance',
+        '~science',
+        '~tech',
+    ]:
+        logging.info('Group ({}) not in whitelist.'.format(s['group']))
+        return False
+
+    if s['score'] < 15 and s['num_comments'] < 10:
+        logging.info('Score ({}) or num comments ({}) below threshold.'.format(s['score'], s['num_comments']))
         return False
 
     td = a.find('div', class_='topic-full-text')
@@ -113,7 +132,7 @@ def story(ref):
 
 # scratchpad so I can quickly develop the parser
 if __name__ == '__main__':
-    #print(feed())
+    print(feed())
     #normal = story('gxt')
     #print(normal)
     #no_comments = story('gxr')
@@ -122,8 +141,8 @@ if __name__ == '__main__':
     #print(self_post)
     #li_comment = story('gqx')
     #print(li_comment)
-    broken = story('q4y')
+    #broken = story('q4y')
-    print(broken)
+    #print(broken)
 
     # make sure there's no self-reference
     #import copy

apiserver/requirements.txt

@@ -8,6 +8,7 @@ Flask==1.1.2
 Flask-Cors==3.0.8
 gevent==20.6.2
 greenlet==0.4.16
+humanize==4.10.0
 idna==2.10
 itsdangerous==1.1.0
 Jinja2==2.11.2

apiserver/scripts/delete-story.py

@@ -1,6 +1,8 @@
 import database
 import search
 import sys
+import settings
+import logging
 
 import json
 import requests
@@ -21,7 +23,7 @@ def database_del_story(sid):
 
 def search_del_story(sid):
     try:
-        r = requests.delete(search.MEILI_URL + 'indexes/qotnews/documents/'+sid, timeout=2)
+        r = requests.delete(settings.MEILI_URL + 'indexes/qotnews/documents/'+sid, timeout=2)
         if r.status_code != 202:
             raise Exception('Bad response code ' + str(r.status_code))
         return r.json()

apiserver/scripts/fix-stories.py

@@ -0,0 +1,58 @@
+import time
+import json
+import logging
+
+import feed
+import database
+import search
+
+database.init()
+
+def fix_gzip_bug(story_list):
+    FIX_THRESHOLD = 150
+
+    count = 1
+    for sid in story_list:
+        try:
+            sid = sid[0]
+            story = database.get_story(sid)
+            full_json = json.loads(story.full_json)
+            meta_json = json.loads(story.meta_json)
+            text = full_json.get('text', '')
+
+            count = text.count('�')
+            if not count: continue
+
+            ratio = count / len(text) * 1000
+            print('Bad story:', sid, 'Num ?:', count, 'Ratio:', ratio)
+            if ratio < FIX_THRESHOLD: continue
+
+            print('Attempting to fix...')
+
+            valid = feed.update_story(meta_json, is_manual=True)
+            if valid:
+                database.put_story(meta_json)
+                search.put_story(meta_json)
+                print('Success')
+            else:
+                print('Story was not valid')
+
+            time.sleep(3)
+
+        except KeyboardInterrupt:
+            raise
+        except BaseException as e:
+            logging.exception(e)
+            breakpoint()
+
+if __name__ == '__main__':
+    num_stories = database.count_stories()
+
+    print('Fix {} stories?'.format(num_stories))
+    print('Press ENTER to continue, ctrl-c to cancel')
+    input()
+
+    story_list = database.get_story_list()
+
+    fix_gzip_bug(story_list)
+

apiserver/scripts/reindex.py

@@ -0,0 +1,62 @@
+import logging
+logging.basicConfig(
+        format='%(asctime)s - %(name)s - %(levelname)s - %(message)s',
+        level=logging.INFO)
+
+import database
+from sqlalchemy import select
+import search
+import sys
+
+import time
+import json
+import requests
+
+database.init()
+search.init()
+
+BATCH_SIZE = 5000
+
+def put_stories(stories):
+    return search.meili_api(requests.post, 'indexes/qotnews/documents', stories)
+
+def get_update(update_id):
+    return search.meili_api(requests.get, 'tasks/{}'.format(update_id))
+
+if __name__ == '__main__':
+    num_stories = database.count_stories()
+
+    print('Reindex {} stories?'.format(num_stories))
+    print('Press ENTER to continue, ctrl-c to cancel')
+    input()
+
+    story_list = database.get_story_list()
+
+    count = 1
+    while len(story_list):
+        stories = []
+
+        for _ in range(BATCH_SIZE):
+            try:
+                sid = story_list.pop()
+            except IndexError:
+                break
+
+            story = database.get_story(sid)
+            print('Indexing {}/{} id: {} title: {}'.format(count, num_stories, sid[0], story.title))
+            story_obj = json.loads(story.meta_json)
+            stories.append(story_obj)
+            count += 1
+
+        res = put_stories(stories)
+        update_id = res['uid']
+
+        print('Waiting for processing', end='')
+        while get_update(update_id)['status'] != 'succeeded':
+            time.sleep(0.5)
+            print('.', end='', flush=True)
+
+        print()
+
+    print('Done.')
+

apiserver/scripts/tests.py

@@ -0,0 +1,23 @@
+import time
+import requests
+
+def test_search_api():
+    num_tests = 100
+    total_time = 0
+
+    for i in range(num_tests):
+        start = time.time()
+
+        res = requests.get('http://127.0.0.1:33842/api/search?q=iphone')
+        res.raise_for_status()
+
+        duration = time.time() - start
+        total_time += duration
+
+    avg_time = total_time / num_tests
+
+    print('Average search time:', avg_time)
+
+
+if __name__ == '__main__':
+    test_search_api()

apiserver/search.py

@@ -4,86 +4,57 @@ logging.basicConfig(
         level=logging.DEBUG)
 
 import requests
+import settings
 
-MEILI_URL = 'http://127.0.0.1:7700/'
+SEARCH_ENABLED = bool(settings.MEILI_URL)
+
+def meili_api(method, route, json=None, params=None, parse_json=True):
+    try:
+        headers = {'Authorization': 'Bearer ' + settings.MEILI_API_KEY}
+        r = method(settings.MEILI_URL + route, json=json, params=params, timeout=4)
+        if r.status_code > 299:
+            raise Exception('Bad response code ' + str(r.status_code))
+        if parse_json:
+            return r.json()
+        else:
+            r.encoding = 'utf-8'
+            return r.text
+    except KeyboardInterrupt:
+        raise
+    except BaseException as e:
+        logging.error('Problem with MeiliSearch api route: %s: %s', route, str(e))
+        return False
 
 def create_index():
-    try:
+    json = dict(uid='qotnews', primaryKey='id')
-        json = dict(name='qotnews', uid='qotnews')
+    return meili_api(requests.post, 'indexes', json=json)
-        r = requests.post(MEILI_URL + 'indexes', json=json, timeout=2)
-        if r.status_code != 201:
-            raise Exception('Bad response code ' + str(r.status_code))
-        return r.json()
-    except KeyboardInterrupt:
-        raise
-    except BaseException as e:
-        logging.error('Problem creating MeiliSearch index: {}'.format(str(e)))
-        return False
 
-def update_rankings():
+def update_settings():
-    try:
+    json = {
-        json = ['typo', 'words', 'proximity', 'attribute', 'desc(date)', 'wordsPosition', 'exactness']
+        'rankingRules': ['typo', 'words', 'proximity', 'date:desc', 'exactness'],
-        r = requests.post(MEILI_URL + 'indexes/qotnews/settings/ranking-rules', json=json, timeout=2)
+        'searchableAttributes': ['title', 'url', 'author'],
-        if r.status_code != 202:
+        'displayedAttributes': ['id', 'ref', 'source', 'author', 'author_link', 'score', 'date', 'title', 'link', 'url', 'num_comments'],
-            raise Exception('Bad response code ' + str(r.status_code))
+    }
-        return r.json()
+    return meili_api(requests.post, 'indexes/qotnews/settings', json=json)
-    except KeyboardInterrupt:
-        raise
-    except BaseException as e:
-        logging.error('Problem setting MeiliSearch ranking rules: {}'.format(str(e)))
-        return False
-
-def update_attributes():
-    try:
-        json = ['title', 'url', 'author', 'link', 'id']
-        r = requests.post(MEILI_URL + 'indexes/qotnews/settings/searchable-attributes', json=json, timeout=2)
-        if r.status_code != 202:
-            raise Exception('Bad response code ' + str(r.status_code))
-        return r.json()
-        r = requests.delete(MEILI_URL + 'indexes/qotnews/settings/displayed-attributes', timeout=2)
-        if r.status_code != 202:
-            raise Exception('Bad response code ' + str(r.status_code))
-        return r.json()
-    except KeyboardInterrupt:
-        raise
-    except BaseException as e:
-        logging.error('Problem setting MeiliSearch searchable attributes: {}'.format(str(e)))
-        return False
 
 def init():
-    create_index()
+    if not SEARCH_ENABLED:
-    update_rankings()
+        logging.info('Search is not enabled, skipping init.')
-    update_attributes()
+        return
+    print(create_index())
+    update_settings()
 
 def put_story(story):
-    story = story.copy()
+    if not SEARCH_ENABLED: return
-    story.pop('text', None)
+    return meili_api(requests.post, 'indexes/qotnews/documents', [story])
-    story.pop('comments', None)
-    try:
-        r = requests.post(MEILI_URL + 'indexes/qotnews/documents', json=[story], timeout=2)
-        if r.status_code != 202:
-            raise Exception('Bad response code ' + str(r.status_code))
-        return r.json()
-    except KeyboardInterrupt:
-        raise
-    except BaseException as e:
-        logging.error('Problem putting MeiliSearch story: {}'.format(str(e)))
-        return False
 
 def search(q):
-    try:
+    if not SEARCH_ENABLED: return []
-        params = dict(q=q, limit=250)
+    json = dict(q=q, limit=settings.FEED_LENGTH)
-        r = requests.get(MEILI_URL + 'indexes/qotnews/search', params=params, timeout=2)
+    r = meili_api(requests.post, 'indexes/qotnews/search', json=json, parse_json=False)
-        if r.status_code != 200:
+    return r
-            raise Exception('Bad response code ' + str(r.status_code))
-        return r.json()['hits']
-    except KeyboardInterrupt:
-        raise
-    except BaseException as e:
-        logging.error('Problem searching MeiliSearch: {}'.format(str(e)))
-        return False
     
 if __name__ == '__main__':
-    create_index()
+    init()
 
-    print(search('the'))
+    print(search('facebook'))

apiserver/server.py

@@ -1,7 +1,8 @@
-import logging
+import os, logging
+DEBUG = os.environ.get('DEBUG')
 logging.basicConfig(
         format='%(asctime)s - %(name)s - %(levelname)s - %(message)s',
-        level=logging.INFO)
+        level=logging.DEBUG if DEBUG else logging.INFO)
 
 import gevent
 from gevent import monkey
@@ -13,22 +14,46 @@ import json
 import threading
 import traceback
 import time
+import datetime
+import humanize
+import urllib.request
 from urllib.parse import urlparse, parse_qs
 
+import settings
 import database
 import search
 import feed
-from utils import gen_rand_id
+from utils import gen_rand_id, NUM_ID_CHARS
 
 from flask import abort, Flask, request, render_template, stream_with_context, Response
 from werkzeug.exceptions import NotFound
 from flask_cors import CORS
 
+smallweb_set = set()
+def load_smallweb_list():
+    EXCLUDED = [
+        'github.com',
+    ]
+
+    global smallweb_set
+    try:
+        url = 'https://raw.githubusercontent.com/kagisearch/smallweb/refs/heads/main/smallweb.txt'
+        with urllib.request.urlopen(url, timeout=10) as response:
+            urls = response.read().decode('utf-8').splitlines()
+            hosts = {urlparse(u).hostname for u in urls if u and urlparse(u).hostname}
+            smallweb_set = {h.replace('www.', '') for h in hosts if h not in EXCLUDED}
+            logging.info('Loaded {} smallweb domains.'.format(len(smallweb_set)))
+    except Exception as e:
+        logging.error('Failed to load smallweb list: {}'.format(e))
+
+load_smallweb_list()
+
 database.init()
 search.init()
 
-FEED_LENGTH = 75
 news_index = 0
+ref_list = []
+current_item = {}
 
 def new_id():
     nid = gen_rand_id()
@@ -36,33 +61,107 @@ def new_id():
         nid = gen_rand_id()
     return nid
 
-build_folder = '../webclient/build'
+
+def fromnow(ts):
+    return humanize.naturaltime(datetime.datetime.fromtimestamp(ts))
+
+
+build_folder = './build'
+
 flask_app = Flask(__name__, template_folder=build_folder, static_folder=build_folder, static_url_path='')
+flask_app.jinja_env.filters['fromnow'] = fromnow
 cors = CORS(flask_app)
 
 @flask_app.route('/api')
 def api():
-    stories = database.get_stories(FEED_LENGTH)
+    skip = request.args.get('skip', 0)
+    limit = request.args.get('limit', settings.FEED_LENGTH)
+    is_smallweb_filter = request.args.get('smallweb') == 'true' and smallweb_set
+    sources_filter = request.args.getlist('source')
+
+    if not is_smallweb_filter and not sources_filter:
+        stories = database.get_stories(limit, skip)
+    else:
+        limit = int(limit)
+        skip = int(skip)
+        filtered_stories = []
+        current_skip = skip
+
+        while len(filtered_stories) < limit:
+            stories_batch = database.get_stories(limit, current_skip)
+            if not stories_batch:
+                break
+
+            for story_str in stories_batch:
+                story = json.loads(story_str)
+
+                if is_smallweb_filter:
+                    story_url = story.get('url') or story.get('link') or ''
+                    if not story_url:
+                        continue
+                    hostname = urlparse(story_url).hostname
+                    if not hostname or hostname.replace('www.', '') not in smallweb_set:
+                        continue
+                
+                if sources_filter:
+                    if story.get('source') not in sources_filter:
+                        continue
+
+                filtered_stories.append(story_str)
+                if len(filtered_stories) == limit:
+                    break
+            
+            if len(filtered_stories) == limit:
+                break
+            
+            current_skip += limit
+        stories = filtered_stories
+
     # hacky nested json
     res = Response('{"stories":[' + ','.join(stories) + ']}')
     res.headers['content-type'] = 'application/json'
     return res
 
+@flask_app.route('/api/stats', strict_slashes=False)
+def apistats():
+    stats = {
+        'news_index': news_index,
+        'ref_list': ref_list,
+        'len_ref_list': len(ref_list),
+        'current_item': current_item,
+        'total_stories': database.count_stories(),
+        'id_space': 26**NUM_ID_CHARS,
+    }
+
+    return stats
+
+
 @flask_app.route('/api/search', strict_slashes=False)
 def apisearch():
     q = request.args.get('q', '')
     if len(q) >= 3:
         results = search.search(q)
     else:
-        results = []
+        results = '[]'
-    return dict(results=results)
+    res = Response(results)
+    res.headers['content-type'] = 'application/json'
+    return res
+
 
 @flask_app.route('/api/submit', methods=['POST'], strict_slashes=False)
 def submit():
     try:
         url = request.form['url']
+        for prefix in ['http://', 'https://']:
+            if url.lower().startswith(prefix):
+                break
+        else:  # for
+            url = 'http://' + url
+
         nid = new_id()
 
+        logging.info('Manual submission: ' + url)
+
         parse = urlparse(url)
         if 'news.ycombinator.com' in parse.hostname:
             source = 'hackernews'
@@ -83,6 +182,11 @@ def submit():
             ref = url
 
         existing = database.get_story_by_ref(ref)
+
+        if existing and DEBUG:
+            ref = ref + '#' + str(time.time())
+            existing = False
+
         if existing:
             return {'nid': existing.sid}
         else:
@@ -91,14 +195,20 @@ def submit():
             if valid:
                 database.put_story(story)
                 search.put_story(story)
+
+                if DEBUG:
+                    logging.info('Adding manual ref: {}, id: {}, source: {}'.format(ref, nid, source))
+                    database.put_ref(ref, nid, source)
+
                 return {'nid': nid}
             else:
                 raise Exception('Invalid article')
 
-    except BaseException as e:
+    except Exception as e:
-        logging.error('Problem with article submission: {} - {}'.format(e.__class__.__name__, str(e)))
+        msg = 'Problem with article submission: {} - {}'.format(e.__class__.__name__, str(e))
+        logging.error(msg)
         print(traceback.format_exc())
-        abort(400)
+        return {'error': msg.split('\n')[0]}, 400
 
 
 @flask_app.route('/api/<sid>')
@@ -115,10 +225,19 @@ def story(sid):
 @flask_app.route('/')
 @flask_app.route('/search')
 def index():
+    stories_json = database.get_stories(settings.FEED_LENGTH, 0)
+    stories = [json.loads(s) for s in stories_json]
+    for s in stories:
+        url = urlparse(s.get('url') or s.get('link') or '').hostname or ''
+        s['hostname'] = url.replace('www.', '')
+
     return render_template('index.html',
-            title='Feed',
+        title='QotNews',
-            url='news.t0.vc',
+        url='news.t0.vc',
-            description='Hacker News, Reddit, Lobsters, and Tildes articles rendered in reader mode')
+        description='Hacker News, Reddit, Lobsters, and Tildes articles rendered in reader mode',
+        robots='index',
+        stories=stories,
+    )
 
 @flask_app.route('/<sid>', strict_slashes=False)
 @flask_app.route('/<sid>/c', strict_slashes=False)
@@ -128,9 +247,9 @@ def static_story(sid):
     except NotFound:
         pass
 
-    story = database.get_story(sid)
+    story_obj = database.get_story(sid)
-    if not story: return abort(404)
+    if not story_obj: return abort(404)
-    story = json.loads(story.full_json)
+    story = json.loads(story_obj.full_json)
 
     score = story['score']
     num_comments = story['num_comments']
@@ -139,18 +258,22 @@ def static_story(sid):
             score, 's' if score != 1 else '',
             num_comments, 's' if num_comments != 1 else '',
             source)
-    url = urlparse(story['url']).hostname or urlparse(story['link']).hostname or ''
+    url = urlparse(story.get('url') or story.get('link') or '').hostname or ''
     url = url.replace('www.', '')
 
     return render_template('index.html',
-            title=story['title'],
+        title=story['title'] + ' | QotNews',
-            url=url,
+        url=url,
-            description=description)
+        description=description,
+        robots='noindex',
+        story=story,
+        show_comments=request.path.endswith('/c'),
+    )
 
 http_server = WSGIServer(('', 33842), flask_app)
 
 def feed_thread():
-    global news_index
+    global news_index, ref_list, current_item
 
     try:
         while True:
@@ -161,50 +284,51 @@ def feed_thread():
                         continue
                     try:
                         nid = new_id()
+                        logging.info('Adding ref: {}, id: {}, source: {}'.format(ref, nid, source))
                         database.put_ref(ref, nid, source)
-                        logging.info('Added ref ' + ref)
                     except database.IntegrityError:
+                        logging.info('Already have ID / ref, skipping.')
                         continue
 
-            ref_list = database.get_reflist(FEED_LENGTH)
+            ref_list = database.get_reflist(settings.FEED_LENGTH)
 
             # update current stories
             if news_index < len(ref_list):
-                item = ref_list[news_index]
+                current_item = ref_list[news_index]
 
                 try:
-                    story_json = database.get_story(item['sid']).full_json
+                    story_json = database.get_story(current_item['sid']).full_json
                     story = json.loads(story_json)
                 except AttributeError:
-                    story = dict(id=item['sid'], ref=item['ref'], source=item['source'])
+                    story = dict(id=current_item['sid'], ref=current_item['ref'], source=current_item['source'])
 
-                logging.info('Updating story: ' + str(story['ref']) + ', index: ' + str(news_index))
+                logging.info('Updating {} story: {}, index: {}'.format(story['source'], story['ref'], news_index))
 
                 valid = feed.update_story(story)
                 if valid:
                     database.put_story(story)
                     search.put_story(story)
                 else:
-                    database.del_ref(item['ref'])
+                    database.del_ref(current_item['ref'])
-                    logging.info('Removed ref {}'.format(item['ref']))
+                    logging.info('Removed ref {}'.format(current_item['ref']))
             else:
                 logging.info('Skipping index: ' + str(news_index))
 
             gevent.sleep(6)
 
             news_index += 1
-            if news_index == FEED_LENGTH: news_index = 0
+            if news_index == settings.FEED_LENGTH: news_index = 0
 
     except KeyboardInterrupt:
         logging.info('Ending feed thread...')
     except ValueError as e:
-        logging.error('feed_thread error: {} {}'.format(e.__class__.__name__, e))
+        logging.critical('feed_thread error: {} {}'.format(e.__class__.__name__, e))
         http_server.stop()
 
-print('Starting Feed thread...')
+logging.info('Starting Feed thread...')
 gevent.spawn(feed_thread)
 
-print('Starting HTTP thread...')
+logging.info('Starting HTTP thread...')
 try:
     http_server.serve_forever()
 except KeyboardInterrupt:

apiserver/settings.py.example

@@ -4,11 +4,21 @@
 # Feed Lengths
 # Number of top items from each site to pull
 # set to 0 to disable that site
+FEED_LENGTH = 75
 NUM_HACKERNEWS = 15
 NUM_LOBSTERS = 10
-NUM_REDDIT = 10
+NUM_REDDIT = 15
 NUM_TILDES = 5
 
+# Meilisearch server URL
+# Leave blank if not using search
+#MEILI_URL = 'http://127.0.0.1:7700/'
+MEILI_URL = ''
+
+# Readerserver URL
+# Leave blank if not using, but that defeats the whole point
+READER_URL = 'http://127.0.0.1:33843/'
+
 # Reddit account info
 # leave blank if not using Reddit
 REDDIT_CLIENT_ID = ''
@@ -25,9 +35,7 @@ SUBREDDITS = [
     'PhilosophyofScience',
     'StateOfTheUnion',
     'TheAgora',
-    'TrueFilm',
     'TrueReddit',
-    'UniversityofReddit',
     'culturalstudies',
     'hardscience',
     'indepthsports',
@@ -37,6 +45,6 @@ SUBREDDITS = [
     'resilientcommunities',
     'worldevents',
     'StallmanWasRight',
-    'DarkFuturology',
     'EverythingScience',
+    'longevity',
 ]

apiserver/utils.py

@@ -8,8 +8,17 @@ import string
 
 from bleach.sanitizer import Cleaner
 
+def alert_tanner(message):
+    try:
+        logging.info('Alerting Tanner: ' + message)
+        params = dict(qotnews=message)
+        requests.get('https://tbot.tannercollin.com/message', params=params, timeout=4)
+    except BaseException as e:
+        logging.error('Problem alerting Tanner: ' + str(e))
+
+NUM_ID_CHARS = 4
 def gen_rand_id():
-    return ''.join(random.choice(string.ascii_uppercase) for _ in range(4))
+    return ''.join(random.choice(string.ascii_uppercase) for _ in range(NUM_ID_CHARS))
 
 def render_md(md):
     if md:

readerserver/main.js

@@ -35,6 +35,7 @@ app.post('/', (req, res) => {
 	const url = req.body.url;
 	const requestOptions = {
 		url: url,
+		gzip: true,
 		//headers: {'User-Agent': 'Googlebot/2.1 (+http://www.google.com/bot.html)'},
 		//headers: {'User-Agent': 'Twitterbot/1.0'},
 		headers: {

searchserver/README.md

@@ -3,7 +3,7 @@
 Download MeiliSearch with:
 
 ```
-wget https://github.com/meilisearch/MeiliSearch/releases/download/v0.11.1/meilisearch-linux-amd64
+wget https://github.com/meilisearch/meilisearch/releases/download/v0.27.0/meilisearch-linux-amd64
 chmod +x meilisearch-linux-amd64
 ```
 

webclient/package.json

@@ -4,12 +4,14 @@
   "private": true,
   "dependencies": {
     "abort-controller": "^3.0.0",
+    "katex": "^0.16.25",
     "localforage": "^1.7.3",
     "moment": "^2.24.0",
     "query-string": "^6.8.3",
     "react": "^16.9.0",
     "react-dom": "^16.9.0",
     "react-helmet": "^5.2.1",
+    "react-latex-next": "^3.0.0",
     "react-router-dom": "^5.0.1",
     "react-router-hash-link": "^1.2.2",
     "react-scripts": "3.1.1"

webclient/public/index.html

@@ -8,6 +8,8 @@
 			content="{{ description }}"
 		/>
 		<meta content="{{ url }}" name="og:site_name">
+		<meta name="robots" content="{{ robots }}">
+
 
 		<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
 		<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
@@ -26,26 +28,137 @@
 			work correctly both with client-side routing and a non-root public URL.
 			Learn how to configure a non-root public URL by running `npm run build`.
 		-->
-		<title>{{ title }} - QotNews</title>
+		<title>{{ title }}</title>
 
+		<script>document.documentElement.className = 'js-enabled';</script>
 		<style>
+			.js-enabled .static-content {
+				display: none;
+			}
 			html {
 				overflow-y: scroll;
 			}
 			body {
-				background: #000;
+				background: #eeeeee;
-			}
-			.nojs {
-				color: white;
 			}
 		</style>
 	</head>
 
 	<body>
-		<div class="nojs">
+		<script>
-			<noscript>You need to enable JavaScript to run this app.</noscript>
+			(function() {
+				try {
+					var theme = localStorage.getItem('theme');
+					if (theme === 'dark') {
+						document.body.style.backgroundColor = '#1a1a1a';
+					} else if (theme === 'black' || theme === 'red') {
+						document.body.style.backgroundColor = '#000';
+					}
+				} catch (e) {}
+			})();
+		</script>
+		<div id="root">
+			<div class="static-content">
+
+				{% if False %}
+				<noscript>
+					<meta http-equiv="refresh" content="0;url=?/no.script">
+				</noscript>
+				{% endif %}
+
+				<div class="container menu">
+					<p>
+						<a href="/">QotNews</a>
+						<br />
+						<span class="slogan">Hacker News, Reddit, Lobsters, and Tildes articles rendered in reader mode.</span>
+					</p>
+				</div>
+				{% if story %}
+					<div class="{% if show_comments %}container{% else %}article-container{% endif %}">
+						<div class="article">
+							<h1>{{ story.title }}</h1>
+
+							{% if show_comments %}
+								<div class="info">
+									<a href="/{{ story.id }}">View article</a>
+								</div>
+							{% else %}
+								<div class="info">
+									Source: <a class="source" href="{{ story.url or story.link }}">{{ url }}</a>
+								</div>
+							{% endif %}
+
+							<div class="info">
+								{{ story.score }} points
+								by <a href="{{ story.author_link }}">{{ story.author }}</a>
+								{{ story.date | fromnow }}
+								on <a href="{{ story.link }}">{{ story.source }}</a> |
+								<a href="/{{ story.id }}/c">
+									{{ story.num_comments }} comment{{ 's' if story.num_comments != 1 }}
+								</a>
+							</div>
+
+							{% if not show_comments and story.text %}
+								<div class="story-text">{{ story.text | safe }}</div>
+							{% elif show_comments %}
+								{% macro render_comment(comment, level) %}
+									<dt></dt>
+									<dd class="comment{% if level > 0 %} lined{% endif %}">
+										<div class="info">
+											<p>
+												{% if comment.author == story.author %}[OP] {% endif %}{{ comment.author or '[Deleted]' }} | <a href="#{{ comment.author }}{{ comment.date }}" id="{{ comment.author }}{{ comment.date }}">{{ comment.date | fromnow }}</a>
+											</p>
+										</div>
+										<div class="text">{{ (comment.text | safe) if comment.text else '<p>[Empty / deleted comment]</p>' }}</div>
+										{% if comment.comments %}
+											<dl>
+												{% for reply in comment.comments %}
+													{{ render_comment(reply, level + 1) }}
+												{% endfor %}
+											</dl>
+										{% endif %}
+									</dd>
+								{% endmacro %}
+								<dl class="comments">
+									{% for comment in story.comments %}{{ render_comment(comment, 0) }}{% endfor %}
+								</dl>
+							{% endif %}
+						</div>
+						<div class='dot toggleDot'>
+							<div class='button'>
+								<a href="/{{ story.id }}{{ '/c' if not show_comments else '' }}">
+									{{ '' if not show_comments else '' }}
+								</a>
+							</div>
+						</div>
+					</div>
+				{% elif stories %}
+					<div class="container">
+						{% for story in stories %}
+							<div class='item'>
+								<div class='title'>
+									<a class='link' href='/{{ story.id }}'>
+										<img class='source-logo' src='/logos/{{ story.source }}.png' alt='{{ story.source }}:' /> {{ story.title }}
+									</a>
+									<span class='source'>
+										(<a class='source' href='{{ story.url or story.link }}'>{{ story.hostname }}</a>)
+									</span>
+								</div>
+								<div class='info'>
+									{{ story.score }} points
+									by <a href="{{ story.author_link }}">{{ story.author }}</a>
+									{{ story.date | fromnow }}
+									on <a href="{{ story.link }}">{{ story.source }}</a> |
+									<a class="{{ 'hot' if story.num_comments > 99 else '' }}" href="/{{ story.id }}/c">
+										{{ story.num_comments }} comment{{ 's' if story.num_comments != 1 }}
+									</a>
+								</div>
+							</div>
+						{% endfor %}
+					</div>
+				{% endif %}
+			</div>
 		</div>
-		<div id="root"></div>
 		<!--
 			This HTML file is a template.
 			If you open it directly in the browser, you will see an empty page.

webclient/src/App.js

@@ -1,10 +1,12 @@
-import React from 'react';
+import React, { useState, useLayoutEffect, useEffect, useRef, useCallback } from 'react';
 import { BrowserRouter as Router, Route, Link, Switch } from 'react-router-dom';
 import localForage from 'localforage';
 import './Style-light.css';
 import './Style-dark.css';
+import './Style-black.css';
+import './Style-red.css';
 import './fonts/Fonts.css';
-import { ForwardDot } from './utils.js';
+import { BackwardDot, ForwardDot } from './utils.js';
 import Feed from './Feed.js';
 import Article from './Article.js';
 import Comments from './Comments.js';
@@ -12,73 +14,162 @@ import Search from './Search.js';
 import Submit from './Submit.js';
 import Results from './Results.js';
 import ScrollToTop from './ScrollToTop.js';
+import Settings from './Settings.js';
 
-class App extends React.Component {
+function App() {
-	constructor(props) {
+	const [theme, setTheme] = useState(localStorage.getItem('theme') || '');
-		super(props);
+	const cache = useRef({});
-
+	const [isFullScreen, setIsFullScreen] = useState(!!document.fullscreenElement);
-		this.state = {
+	const [waitingWorker, setWaitingWorker] = useState(null);
-			theme: localStorage.getItem('theme') || '',
+	const [settingsOpen, setSettingsOpen] = useState(false);
+	const defaultBodyFontSize = 1.0;
+	const [bodyFontSize, setBodyFontSize] = useState(Number(localStorage.getItem('bodyFontSize')) || defaultBodyFontSize);
+	const [bodyFont, setBodyFont] = useState(localStorage.getItem('bodyFont') || 'Sans Serif');
+	const [articleFont, setArticleFont] = useState(localStorage.getItem('articleFont') || 'Apparatus SIL');
+	const [filterSmallweb, setFilterSmallweb] = useState(() => localStorage.getItem('filterSmallweb') === 'true');
+	const [feedSources, setFeedSources] = useState(() => {
+		const saved = localStorage.getItem('feedSources');
+		return saved ? JSON.parse(saved) : {
+			hackernews: true,
+			reddit: true,
+			lobsters: true,
+			tildes: true,
 		};
+	});
 
-		this.cache = {};
+	const updateCache = useCallback((key, value) => {
-	}
+		cache.current[key] = value;
+	}, []);
 
-	updateCache = (key, value) => {
+	useEffect(() => {
-		this.cache[key] = value;
+		const onSWUpdate = e => {
-	}
+			setWaitingWorker(e.detail.waiting);
+		};
+		window.addEventListener('swUpdate', onSWUpdate);
+		return () => window.removeEventListener('swUpdate', onSWUpdate);
+	}, []);
 
-	light() {
+	useEffect(() => {
-		this.setState({ theme: '' });
+		if (Object.keys(cache.current).length === 0) {
-		localStorage.setItem('theme', '');
-	}
-
-	dark() {
-		this.setState({ theme: 'dark' });
-		localStorage.setItem('theme', 'dark');
-	}
-
-	componentDidMount() {
-		if (!this.cache.length) {
 			localForage.iterate((value, key) => {
-				this.updateCache(key, value);
+				updateCache(key, value);
+			}).then(() => {
+				console.log('loaded cache from localforage');
 			});
-			console.log('loaded cache from localforage');
 		}
-	}
+	}, [updateCache]);
 
-	render() {
+	useEffect(() => {
-		const theme = this.state.theme;
+		const onFullScreenChange = () => setIsFullScreen(!!document.fullscreenElement);
-		document.body.style.backgroundColor = theme === 'dark' ? '#000' : '#eeeeee';
+		document.addEventListener('fullscreenchange', onFullScreenChange);
+		return () => document.removeEventListener('fullscreenchange', onFullScreenChange);
+	}, []);
 
-		return (
+	useLayoutEffect(() => {
-			<div className={theme}>
+		if (theme === 'dark') {
-				<Router>
+			document.body.style.backgroundColor = '#1a1a1a';
-					<div className='container menu'>
+		} else if (theme === 'black') {
-						<p>
+			document.body.style.backgroundColor = '#000';
-							<Link to='/'>QotNews - Feed</Link>
+		} else if (theme === 'red') {
-							<span className='theme'>Theme: <a href='#' onClick={() => this.light()}>Light</a> - <a href='#' onClick={() => this.dark()}>Dark</a></span>
+			document.body.style.backgroundColor = '#000';
-							<br />
+		} else {
-							<span className='slogan'>Hacker News, Reddit, Lobsters, and Tildes articles rendered in reader mode.</span>
+			document.body.style.backgroundColor = '#eeeeee';
-						</p>
+		}
-						<Route path='/(|search)' component={Search} />
+	}, [theme]);
-						<Route path='/(|search)' component={Submit} />
-					</div>
 
-					<Route path='/' exact render={(props) => <Feed {...props} updateCache={this.updateCache} />} />
+	useEffect(() => {
-					<Switch>
+		document.documentElement.style.fontSize = `${bodyFontSize}rem`;
-						<Route path='/search' component={Results} />
+	}, [bodyFontSize]);
-						<Route path='/:id' exact render={(props) => <Article {...props} cache={this.cache} />} />
-					</Switch>
-					<Route path='/:id/c' exact render={(props) => <Comments {...props} cache={this.cache} />} />
 
-					<ForwardDot />
+	const fontMap = {
+		'Sans Serif': 'sans-serif',
+		'Serif': 'serif',
+		'Apparatus SIL': "'Apparatus SIL', sans-serif"
+	};
 
-					<ScrollToTop />
+	useEffect(() => {
-				</Router>
+		document.body.style.fontFamily = fontMap[bodyFont];
-			</div>
+	}, [bodyFont]);
-		);
+
-	}
+	useEffect(() => {
+		const styleId = 'article-font-family-style';
+		let style = document.getElementById(styleId);
+		if (!style) {
+			style = document.createElement('style');
+			style.id = styleId;
+			document.head.appendChild(style);
+		}
+		style.innerHTML = `.story-text { font-family: ${fontMap[articleFont]} !important; }`;
+	}, [articleFont]);
+
+
+	return (
+		<div className={theme}>
+			<Settings
+				settingsOpen={settingsOpen}
+				setSettingsOpen={setSettingsOpen}
+				theme={theme}
+				setTheme={setTheme}
+				isFullScreen={isFullScreen}
+				filterSmallweb={filterSmallweb}
+				setFilterSmallweb={setFilterSmallweb}
+				feedSources={feedSources}
+				setFeedSources={setFeedSources}
+				bodyFontSize={bodyFontSize}
+				setBodyFontSize={setBodyFontSize}
+				defaultBodyFontSize={defaultBodyFontSize}
+				bodyFont={bodyFont}
+				setBodyFont={setBodyFont}
+				articleFont={articleFont}
+				setArticleFont={setArticleFont}
+			/>
+
+			{waitingWorker &&
+				<div className='update-banner'>
+					Client version mismatch, please refresh:{' '}
+					<button onClick={() => {
+						waitingWorker.postMessage({ type: 'SKIP_WAITING' });
+						const reload = () => window.location.reload();
+						navigator.serviceWorker.addEventListener('controllerchange', reload, { once: true });
+
+						// Fallback for when the controller has already changed (ie. in another tab)
+						navigator.serviceWorker.getRegistration().then(reg => {
+							if (!reg || !reg.waiting) {
+								reload();
+							}
+						});
+					}}>
+						Refresh
+					</button>
+				</div>
+			}
+			<Router>
+				<div className='container menu'>
+					<p>
+						<Link to='/'>QotNews</Link>
+
+						<button className="settings-button" onClick={() => setSettingsOpen(true)}>Settings</button>
+						<br />
+						<span className='slogan'>Hacker News, Reddit, Lobsters, and Tildes articles rendered in reader mode.</span>
+					</p>
+					<Route path='/(|search)' component={Search} />
+					<Route path='/(|search)' component={Submit} />
+				</div>
+
+				<Route path='/' exact render={(props) => <Feed {...props} updateCache={updateCache} filterSmallweb={filterSmallweb} feedSources={feedSources} />} />
+				<Switch>
+					<Route path='/search' component={Results} />
+					<Route path='/:id' exact render={(props) => <Article {...props} cache={cache.current} />} />
+				</Switch>
+				<Route path='/:id/c' exact render={(props) => <Comments {...props} cache={cache.current} />} />
+
+				<BackwardDot />
+				<ForwardDot />
+
+				<ScrollToTop />
+			</Router>
+		</div>
+	);
 }
 
 export default App;

webclient/src/Article.js

@@ -1,112 +1,237 @@
-import React from 'react';
+import React, { useState, useEffect } from 'react';
+import { useParams } from 'react-router-dom';
 import { Helmet } from 'react-helmet';
 import localForage from 'localforage';
-import { sourceLink, infoLine, ToggleDot } from './utils.js';
+import { sourceLink, similarLink, infoLine, ToggleDot } from './utils.js';
+import Latex from 'react-latex-next';
+import 'katex/dist/katex.min.css';
 
-class Article extends React.Component {
+const VOID_ELEMENTS = ['area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'link', 'meta', 'param', 'source', 'track', 'wbr'];
-	constructor(props) {
+const DANGEROUS_TAGS = ['svg', 'math'];
-		super(props);
 
-		const id = this.props.match ? this.props.match.params.id : 'CLOL';
+const latexDelimiters = [
-		const cache = this.props.cache;
+    { left: '$$', right: '$$', display: true },
+    { left: '\\[', right: '\\]', display: true },
+    { left: '$', right: '$', display: false },
+    { left: '\\(', right: '\\)', display: false }
+];
 
-		if (id in cache) console.log('cache hit');
+function Article({ cache }) {
+	const { id } = useParams();
 
-		this.state = {
+	if (id in cache) console.log('cache hit');
-			story: cache[id] || false,
-			error: false,
-			pConv: [],
-		};
-	}
 
-	componentDidMount() {
+	const [story, setStory] = useState(cache[id] || false);
-		const id = this.props.match ? this.props.match.params.id : 'CLOL';
+	const [error, setError] = useState('');
+	const [pConv, setPConv] = useState([]);
+	const [copyButtonText, setCopyButtonText] = useState('\ue92c');
 
+	useEffect(() => {
 		localForage.getItem(id)
 			.then(
 				(value) => {
 					if (value) {
-						this.setState({ story: value });
+						setStory(value);
 					}
 				}
 			);
 
 		fetch('/api/' + id)
-			.then(res => res.json())
+			.then(res => {
+				if (!res.ok) {
+					throw new Error(`Server responded with ${res.status} ${res.statusText}`);
+				}
+				return res.json();
+			})
 			.then(
 				(result) => {
-					this.setState({ story: result.story });
+					setStory(result.story);
 					localForage.setItem(id, result.story);
 				},
 				(error) => {
-					this.setState({ error: true });
+					const errorMessage = `Failed to fetch new article content (ID: ${id}). Your connection may be down or the server might be experiencing issues. ${error.toString()}.`;
+					setError(errorMessage);
 				}
 			);
-	}
+	}, [id]);
 
-	pConvert = (n) => {
+	const copyLink = () => {
-		this.setState({ pConv: [...this.state.pConv, n]});
+		navigator.clipboard.writeText(`${story.title}:\n${window.location.href}`).then(() => {
-	}
+			setCopyButtonText('\uea10');
+			setTimeout(() => setCopyButtonText('\ue92c'), 2000);
+		}, () => {
+			setCopyButtonText('\uea0f');
+			setTimeout(() => setCopyButtonText('\ue92c'), 2000);
+		});
+	};
 
-	render() {
+	const pConvert = (n) => {
-		const id = this.props.match ? this.props.match.params.id : 'CLOL';
+		setPConv(prevPConv => [...prevPConv, n]);
-		const story = this.state.story;
+	};
-		const error = this.state.error;
-		const pConv = this.state.pConv;
-		let nodes = null;
 
-		if (story.text) {
+	const isCodeBlock = (v) => {
-			let div = document.createElement('div');
+		if (v.localName === 'pre') {
-			div.innerHTML = story.text;
+			return true;
-			nodes = div.childNodes;
 		}
 
-		return (
+		if (v.localName === 'code') {
-			<div className='article-container'>
+			if (v.closest('p')) {
-				{error && <p>Connection error?</p>}
+				return false;
-				{story ?
+			}
-					<div className='article'>
+			const parent = v.parentElement;
-						<Helmet>
+			if (parent) {
-							<title>{story.title} - QotNews</title>
+				const nonWhitespaceChildren = Array.from(parent.childNodes).filter(n => {
-						</Helmet>
+					return n.nodeType !== Node.TEXT_NODE || n.textContent.trim() !== '';
-
+				});
-						<h1>{story.title}</h1>
+				if (nonWhitespaceChildren.length === 1 && nonWhitespaceChildren[0] === v) {
-
+					return true;
-						<div className='info'>
-							Source: {sourceLink(story)}
-						</div>
-
-						{infoLine(story)}
-
-						{nodes ?
-							<div className='story-text'>
-								{Object.entries(nodes).map(([k, v]) =>
-									pConv.includes(k) ?
-										v.innerHTML.split('\n\n').map(x =>
-											<p dangerouslySetInnerHTML={{ __html: x }} />
-										)
-									:
-										(v.nodeName === '#text' ?
-											<p>{v.data}</p>
-										:
-											<>
-												<v.localName dangerouslySetInnerHTML={v.innerHTML ? { __html: v.innerHTML } : null} />
-												{v.localName == 'pre' && <button onClick={() => this.pConvert(k)}>Convert Code to Paragraph</button>}
-											</>
-										)
-								)}
-							</div>
-						:
-							<p>Problem getting article :(</p>
-						}
-					</div>
-				:
-					<p>loading...</p>
 				}
-				<ToggleDot id={id} article={false} />
+			}
-			</div>
+		}
-		);
+		return false;
-	}
+	};
+
+	const renderNodes = (nodes, keyPrefix = '') => {
+		return Array.from(nodes).map((v, k) => {
+			const key = `${keyPrefix}${k}`;
+			if (pConv.includes(key)) {
+				return (
+					<React.Fragment key={key}>
+						{v.textContent.split('\n\n').map((x, i) =>
+							<p key={i}>{x}</p>
+						)}
+					</React.Fragment>
+				);
+			}
+
+			if (v.nodeName === '#text') {
+				const text = v.data;
+				if (text.includes('\\[') || text.includes('\\(') || text.includes('$$') || /\$(?:[^$]*[^\s$])\$/.test(text)) {
+					return <Latex key={key} delimiters={latexDelimiters}>{text}</Latex>;
+				}
+
+				// Only wrap top-level text nodes in <p>
+				if (keyPrefix === '' && v.data.trim() !== '') {
+					return <p key={key}>{v.data}</p>;
+				}
+				return v.data;
+			}
+
+			if (v.nodeType !== Node.ELEMENT_NODE) {
+				return null;
+			}
+
+			if (DANGEROUS_TAGS.includes(v.localName)) {
+				return <span key={key} dangerouslySetInnerHTML={{ __html: v.outerHTML }} />;
+			}
+
+			const Tag = v.localName;
+			if (isCodeBlock(v)) {
+				return (
+					<React.Fragment key={key}>
+						<Tag dangerouslySetInnerHTML={{ __html: v.innerHTML }} />
+						<button onClick={() => pConvert(key)}>Convert Code to Paragraph</button>
+					</React.Fragment>
+				);
+			}
+
+			const textContent = v.textContent.trim();
+			const isMath = (textContent.startsWith('\\(') && textContent.endsWith('\\)')) ||
+				(textContent.startsWith('\\[') && textContent.endsWith('\\]')) ||
+				(textContent.startsWith('$$') && textContent.endsWith('$$')) ||
+				(textContent.startsWith('$') && textContent.endsWith('$') && textContent.indexOf('$') !== textContent.lastIndexOf('$') && !/\s/.test(textContent.charAt(textContent.length - 2)));
+
+			const props = { key: key };
+			if (v.hasAttributes()) {
+				for (const attr of v.attributes) {
+					const name = attr.name === 'class' ? 'className' : attr.name;
+					props[name] = attr.value;
+				}
+			}
+
+			if (isMath) {
+				let mathContent = v.textContent;
+				// align environment requires display math mode
+				if (mathContent.includes('\\begin{align')) {
+					const trimmed = mathContent.trim();
+					if (trimmed.startsWith('\\(')) {
+						// Replace \( and \) with \[ and \] to switch to display mode
+						const firstParen = mathContent.indexOf('\\(');
+						const lastParen = mathContent.lastIndexOf('\\)');
+						mathContent = mathContent.substring(0, firstParen) + '\\[' + mathContent.substring(firstParen + 2, lastParen) + '\\]' + mathContent.substring(lastParen + 2);
+					} else if (trimmed.startsWith('$') && !trimmed.startsWith('$$')) {
+						// Replace $ with $$
+						const firstDollar = mathContent.indexOf('$');
+						const lastDollar = mathContent.lastIndexOf('$');
+						if (firstDollar !== lastDollar) {
+							mathContent = mathContent.substring(0, firstDollar) + '$$' + mathContent.substring(firstDollar + 1, lastDollar) + '$$' + mathContent.substring(lastDollar + 1);
+						}
+					}
+				}
+				return <Tag {...props}><Latex delimiters={latexDelimiters}>{mathContent}</Latex></Tag>;
+			}
+
+			if (VOID_ELEMENTS.includes(Tag)) {
+				return <Tag {...props} />;
+			}
+
+			return (
+				<Tag {...props}>
+					{renderNodes(v.childNodes, `${key}-`)}
+				</Tag>
+			);
+		});
+	};
+
+	const nodes = (s) => {
+		if (s && s.text) {
+			let div = document.createElement('div');
+			div.innerHTML = s.text;
+			return div.childNodes;
+		}
+		return null;
+	};
+
+	const storyNodes = nodes(story);
+
+	return (
+		<div className='article-container'>
+			{error &&
+				<details style={{marginBottom: '1rem'}}>
+					<summary>Connection error? Click to expand.</summary>
+					<p>{error}</p>
+					{story && <p>Loaded article from cache.</p>}
+				</details>
+			}
+			{story ?
+				<div className='article'>
+					<Helmet>
+						<title>{story.title} | QotNews</title>
+						<meta name="robots" content="noindex" />
+					</Helmet>
+
+					<h1>{story.title} <button className='copy-button' onClick={copyLink}>{copyButtonText}</button></h1>
+
+					<div className='info'>
+						Source: {sourceLink(story)} | {similarLink(story)}
+					</div>
+
+					{infoLine(story)}
+
+					{storyNodes ?
+						<div className='story-text'>
+							{renderNodes(storyNodes)}
+						</div>
+					:
+						<p>Problem getting article :(</p>
+					}
+				</div>
+			:
+				<p>Loading...</p>
+			}
+			<ToggleDot id={id} article={false} />
+		</div>
+	);
 }
 
 export default Article;

webclient/src/Comments.js

@@ -1,83 +1,80 @@
-import React from 'react';
+import React, { useState, useEffect } from 'react';
-import { Link } from 'react-router-dom';
+import { Link, useParams } from 'react-router-dom';
 import { HashLink } from 'react-router-hash-link';
 import { Helmet } from 'react-helmet';
 import moment from 'moment';
 import localForage from 'localforage';
 import { infoLine, ToggleDot } from './utils.js';
 
-class Article extends React.Component {
+function countComments(c) {
-	constructor(props) {
+	return c.comments.reduce((sum, x) => sum + countComments(x), 1);
-		super(props);
+}
 
-		const id = this.props.match.params.id;
+function Comments({ cache }) {
-		const cache = this.props.cache;
+	const { id } = useParams();
 
-		if (id in cache) console.log('cache hit');
+	if (id in cache) console.log('cache hit');
 
-		this.state = {
+	const [story, setStory] = useState(cache[id] || false);
-			story: cache[id] || false,
+	const [error, setError] = useState('');
-			error: false,
+	const [collapsed, setCollapsed] = useState([]);
-			collapsed: [],
+	const [expanded, setExpanded] = useState([]);
-			expanded: [],
-		};
-	}
-
-	componentDidMount() {
-		const id = this.props.match.params.id;
 
+	useEffect(() => {
 		localForage.getItem(id)
 			.then(
 				(value) => {
-					this.setState({ story: value });
+					if (value) {
+						setStory(value);
+					}
 				}
 			);
 
 		fetch('/api/' + id)
-			.then(res => res.json())
+			.then(res => {
+				if (!res.ok) {
+					throw new Error(`Server responded with ${res.status} ${res.statusText}`);
+				}
+				return res.json();
+			})
 			.then(
 				(result) => {
-					this.setState({ story: result.story }, () => {
+					setStory(result.story);
-						const hash = window.location.hash.substring(1);
-						if (hash) {
-							document.getElementById(hash).scrollIntoView();
-						}
-					});
 					localForage.setItem(id, result.story);
+					const hash = window.location.hash.substring(1);
+					if (hash) {
+						setTimeout(() => {
+							const element = document.getElementById(hash);
+							if (element) {
+								element.scrollIntoView();
+							}
+						}, 0);
+					}
 				},
 				(error) => {
-					this.setState({ error: true });
+					const errorMessage = `Failed to fetch comments (ID: ${id}). Your connection may be down or the server might be experiencing issues. ${error.toString()}.`;
+					setError(errorMessage);
 				}
 			);
-	}
+	}, [id]);
 
-	collapseComment(cid) {
+	const collapseComment = (cid) => {
-		this.setState(prevState => ({
+		setCollapsed(prev => [...prev, cid]);
-			...prevState,
+		setExpanded(prev => prev.filter(x => x !== cid));
-			collapsed: [...prevState.collapsed, cid],
+	};
-			expanded: prevState.expanded.filter(x => x !== cid),
-		}));
-	}
 
-	expandComment(cid) {
+	const expandComment = (cid) => {
-		this.setState(prevState => ({
+		setCollapsed(prev => prev.filter(x => x !== cid));
-			...prevState,
+		setExpanded(prev => [...prev, cid]);
-			collapsed: prevState.collapsed.filter(x => x !== cid),
+	};
-			expanded: [...prevState.expanded, cid],
-		}));
-	}
 
-	countComments(c) {
+	const displayComment = (story, c, level) => {
-		return c.comments.reduce((sum, x) => sum + this.countComments(x), 1);
-	}
-
-	displayComment(story, c, level) {
 		const cid = c.author+c.date;
 
-		const collapsed = this.state.collapsed.includes(cid);
+		const isCollapsed = collapsed.includes(cid);
-		const expanded = this.state.expanded.includes(cid);
+		const isExpanded = expanded.includes(cid);
 
-		const hidden = collapsed || (level == 4 && !expanded);
+		const hidden = isCollapsed || (level == 4 && !isExpanded);
 		const hasChildren = c.comments.length !== 0;
 
 		return (
@@ -88,55 +85,56 @@ class Article extends React.Component {
 						{' '} | <HashLink to={'#'+cid} id={cid}>{moment.unix(c.date).fromNow()}</HashLink>
 
 						{hidden || hasChildren &&
-							<span className='collapser pointer' onClick={() => this.collapseComment(cid)}>–</span>
+							<button className='collapser pointer' onClick={() => collapseComment(cid)}>–</button>
 						}
 					</p>
 				</div>
 
-				<div className={collapsed ? 'text hidden' : 'text'}  dangerouslySetInnerHTML={{ __html: c.text }} />
+				<div className={isCollapsed ? 'text hidden' : 'text'}  dangerouslySetInnerHTML={{ __html: c.text || '<p>[Empty / deleted comment]</p>'}} />
 
 				{hidden && hasChildren ?
-					<div className='comment lined info pointer' onClick={() => this.expandComment(cid)}>[show {this.countComments(c)-1} more]</div>
+					<button className='comment lined info pointer' onClick={() => expandComment(cid)}>[show {countComments(c)-1} more]</button>
 				:
-					c.comments.map(i => this.displayComment(story, i, level + 1))
+					c.comments.map(i => displayComment(story, i, level + 1))
 				}
 			</div>
 		);
-	}
+	};
 
-	render() {
+	return (
-		const id = this.props.match.params.id;
+		<div className='container'>
-		const story = this.state.story;
+			{error &&
-		const error = this.state.error;
+				<details style={{marginBottom: '1rem'}}>
+					<summary>Connection error? Click to expand.</summary>
+					<p>{error}</p>
+					{story && <p>Loaded comments from cache.</p>}
+				</details>
+			}
+			{story ?
+				<div className='article'>
+					<Helmet>
+						<title>{story.title} | QotNews</title>
+						<meta name="robots" content="noindex" />
+					</Helmet>
 
-		return (
+					<h1>{story.title}</h1>
-			<div className='container'>
-				{error && <p>Connection error?</p>}
-				{story ?
-					<div className='article'>
-						<Helmet>
-							<title>{story.title} - QotNews Comments</title>
-						</Helmet>
 
-						<h1>{story.title}</h1>
+					<div className='info'>
-
+						<Link to={'/' + story.id}>View article</Link>
-						<div className='info'>
-							<Link to={'/' + story.id}>View article</Link>
-						</div>
-
-						{infoLine(story)}
-
-						<div className='comments'>
-							{story.comments.map(c => this.displayComment(story, c, 0))}
-						</div>
 					</div>
-				:
+
-					<p>loading...</p>
+					{infoLine(story)}
-				}
+
-				<ToggleDot id={id} article={true} />
+					<div className='comments'>
-			</div>
+						{story.comments.map(c => displayComment(story, c, 0))}
-		);
+					</div>
-	}
+				</div>
+			:
+				<p>loading...</p>
+			}
+			<ToggleDot id={id} article={true} />
+		</div>
+	);
 }
 
-export default Article;
+export default Comments;

webclient/src/Feed.js

@@ -1,84 +1,177 @@
-import React from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 import { Link } from 'react-router-dom';
 import { Helmet } from 'react-helmet';
 import localForage from 'localforage';
 import { sourceLink, infoLine, logos } from './utils.js';
 
-class Feed extends React.Component {
+function Feed({ updateCache, filterSmallweb, feedSources }) {
-	constructor(props) {
+	const [stories, setStories] = useState(() => JSON.parse(localStorage.getItem('stories')) || false);
-		super(props);
+	const [error, setError] = useState('');
+	const [loadingStatus, setLoadingStatus] = useState(null);
+	const isInitialMount = useRef(true);
 
-		this.state = {
+	useEffect(() => {
-			stories: JSON.parse(localStorage.getItem('stories')) || false,
+		if (isInitialMount.current) {
-			error: false,
+			isInitialMount.current = false;
-		};
+		} else {
-	}
+			setStories(false);
+		}
+	}, [filterSmallweb, feedSources]);
 
-	componentDidMount() {
+	useEffect(() => {
-		fetch('/api')
+		const controller = new AbortController();
-			.then(res => res.json())
+
+		if ('serviceWorker' in navigator) {
+			navigator.serviceWorker.getRegistration().then(reg => {
+				if (reg) {
+					console.log('Checking for client update...');
+					reg.update();
+				}
+			});
+		}
+
+		const params = new URLSearchParams();
+		if (filterSmallweb) {
+			params.append('smallweb', 'true');
+		}
+
+		const allSources = Object.keys(feedSources);
+		const enabledSources = allSources.filter(key => feedSources[key]);
+
+		if (enabledSources.length > 0 && enabledSources.length < allSources.length) {
+			enabledSources.forEach(source => params.append('source', source));
+		}
+		const apiUrl = `/api?${params.toString()}`;
+
+		fetch(apiUrl, { signal: controller.signal })
+			.then(res => {
+				if (!res.ok) {
+					throw new Error(`Server responded with ${res.status} ${res.statusText}`);
+				}
+				return res.json();
+			})
 			.then(
-				(result) => {
+				async (result) => {
-					const updated = !this.state.stories || this.state.stories[0].id !== result.stories[0].id;
+					const newApiStories = result.stories;
-					console.log('updated:', updated);
 
-					this.setState({ stories: result.stories });
+					const updated = !stories || stories.map(s => s.id).join() !== newApiStories.map(s => s.id).join();
-					localStorage.setItem('stories', JSON.stringify(result.stories));
+					console.log('New stories available:', updated);
 
-					if (updated) {
+					if (!updated) return;
-						localForage.clear();
+
-						result.stories.forEach((x, i) => {
+					setLoadingStatus({ current: 0, total: newApiStories.length });
-							fetch('/api/' + x.id)
+
-								.then(res => res.json())
+					let currentStories = Array.isArray(stories) ? [...stories] : [];
-								.then(result => {
+					let preloadedCount = 0;
-									localForage.setItem(x.id, result.story)
+
-										.then(console.log('preloaded', x.id, x.title));
+					for (const [index, newStory] of newApiStories.entries()) {
-									this.props.updateCache(x.id, result.story);
+						if (controller.signal.aborted) {
-								}, error => {}
+							break;
-							);
+						}
-						});
+						try {
+							const storyFetchController = new AbortController();
+							const timeoutId = setTimeout(() => storyFetchController.abort(), 10000); // 10-second timeout
+							const storyRes = await fetch('/api/' + newStory.id, { signal: storyFetchController.signal });
+							clearTimeout(timeoutId);
+
+							if (!storyRes.ok) {
+								throw new Error(`Server responded with ${storyRes.status} ${storyRes.statusText}`);
+							}
+							const storyResult = await storyRes.json();
+							const fullStory = storyResult.story;
+
+							await localForage.setItem(fullStory.id, fullStory);
+							console.log('Preloaded story:', fullStory.id, fullStory.title);
+							updateCache(fullStory.id, fullStory);
+							preloadedCount++;
+							setLoadingStatus({ current: preloadedCount, total: newApiStories.length });
+
+							const existingStoryIndex = currentStories.findIndex(s => s.id === newStory.id);
+							if (existingStoryIndex > -1) {
+								currentStories.splice(existingStoryIndex, 1);
+							}
+							currentStories.splice(index, 0, newStory);
+
+							localStorage.setItem('stories', JSON.stringify(currentStories));
+							setStories(currentStories);
+						} catch (error) {
+							let errorMessage;
+							if (error.name === 'AbortError') {
+								errorMessage = `The request to fetch story '${newStory.title}' (${newStory.id}) timed out after 10 seconds. Your connection may be unstable. (${preloadedCount} / ${newApiStories.length} stories preloaded)`;
+								console.log('Fetch timed out for story:', newStory.id);
+							} else {
+								errorMessage = `An error occurred while fetching story '${newStory.title}' (ID: ${newStory.id}): ${error.toString()}. (${preloadedCount} / ${newApiStories.length} stories preloaded)`;
+								console.log('Fetch failed for story:', newStory.id, error);
+							}
+							setError(errorMessage);
+							break;
+						}
 					}
+
+					const finalStories = currentStories.slice(0, newApiStories.length);
+					const removedStories = currentStories.slice(newApiStories.length);
+					for (const story of removedStories) {
+						console.log('Removed story:', story.id, story.title);
+						localForage.removeItem(story.id);
+					}
+
+					localStorage.setItem('stories', JSON.stringify(finalStories));
+					setStories(finalStories);
+					setLoadingStatus(null);
 				},
 				(error) => {
-					this.setState({ error: true });
+					if (error.name === 'AbortError') {
+						console.log('Feed fetch aborted.');
+						return;
+					}
+					const errorMessage = `Failed to fetch the main story list from the API. Your connection may be down or the server might be experiencing issues. ${error.toString()}.`;
+					setError(errorMessage);
 				}
 			);
-	}
 
-	render() {
+		return () => controller.abort();
-		const stories = this.state.stories;
+	}, [updateCache, filterSmallweb, feedSources]);
-		const error = this.state.error;
 
-		return (
+	return (
-			<div className='container'>
+		<div className='container'>
-				<Helmet>
+			<Helmet>
-					<title>Feed - QotNews</title>
+				<title>QotNews</title>
-				</Helmet>
+				<meta name="robots" content="index" />
-				{error && <p>Connection error?</p>}
+			</Helmet>
-				{stories ?
-					<div>
-						{stories.map(x =>
-							<div className='item' key={x.id}>
-								<div className='title'>
-									<Link className='link' to={'/' + x.id}>
-										<img className='source-logo' src={logos[x.source]} alt='source logo' /> {x.title}
-									</Link>
 
-									<span className='source'>
+			{error &&
-										({sourceLink(x)})
+				<details style={{marginBottom: '1rem'}}>
-									</span>
+					<summary>Connection error? Click to expand.</summary>
-								</div>
+					<p>{error}</p>
+					{stories && <p>Loaded feed from cache.</p>}
+				</details>
+			}
 
-								{infoLine(x)}
+			{stories ?
+				<div>
+					{stories.map(x =>
+						<div className='item' key={x.id}>
+							<div className='title'>
+								<Link className='link' to={'/' + x.id}>
+									<img className='source-logo' src={logos[x.source]} alt='source logo' /> {x.title}
+								</Link>
+
+								<span className='source'>
+									({sourceLink(x)})
+								</span>
 							</div>
-						)}
+
-					</div>
+							{infoLine(x)}
-				:
+						</div>
-					<p>loading...</p>
+					)}
-				}
+				</div>
-			</div>
+			:
-		);
+				<p>Loading...</p>
-	}
+			}
+
+			{loadingStatus && <p>Preloading stories {loadingStatus.current} / {loadingStatus.total}...</p>}
+		</div>
+	);
 }
 
 export default Feed;

webclient/src/Results.js

@@ -1,95 +1,73 @@
-import React from 'react';
+import React, { useState, useEffect } from 'react';
-import { Link } from 'react-router-dom';
+import { Link, useLocation } from 'react-router-dom';
 import { Helmet } from 'react-helmet';
 import { sourceLink, infoLine, logos } from './utils.js';
 import AbortController from 'abort-controller';
 
-class Results extends React.Component {
+function Results() {
-	constructor(props) {
+	const [stories, setStories] = useState(false);
-		super(props);
+	const [error, setError] = useState(false);
+	const location = useLocation();
 
-		this.state = {
+	useEffect(() => {
-			stories: false,
+		const controller = new AbortController();
-			error: false,
+		const signal = controller.signal;
-		};
 
-		this.controller = null;
+		const search = location.search;
-	}
-
-	performSearch = () => {
-		if (this.controller) {
-			this.controller.abort();
-		}
-
-		this.controller = new AbortController();
-		const signal = this.controller.signal;
-
-		const search = this.props.location.search;
 		fetch('/api/search' + search, { method: 'get', signal: signal })
 			.then(res => res.json())
 			.then(
 				(result) => {
-					this.setState({ stories: result.results });
+					setStories(result.hits);
 				},
 				(error) => {
 					if (error.message !== 'The operation was aborted. ') {
-						this.setState({ error: true });
+						setError(true);
 					}
 				}
 			);
-	}
 
-	componentDidMount() {
+		return () => {
-		this.performSearch();
+			controller.abort();
-	}
+		};
+	}, [location.search]);
 
-	componentDidUpdate(prevProps) {
+	return (
-		if (this.props.location.search !== prevProps.location.search) {
+		<div className='container'>
-			this.performSearch();
+			<Helmet>
-		}
+				<title>Search Results | QotNews</title>
-	}
+			</Helmet>
+			{error && <p>Connection error?</p>}
+			{stories ?
+				<>
+					<p>Search results:</p>
+					<div className='comment lined'>
+						{stories.length ?
+							stories.map(x =>
+								<div className='item' key={x.id}>
+									<div className='title'>
+										<Link className='link' to={'/' + x.id}>
+											<img className='source-logo' src={logos[x.source]} alt='source logo' /> {x.title}
+										</Link>
 
-	render() {
+										<span className='source'>
-		const stories = this.state.stories;
+											({sourceLink(x)})
-		const error = this.state.error;
+										</span>
-
-		return (
-			<div className='container'>
-				<Helmet>
-					<title>Feed - QotNews</title>
-				</Helmet>
-				{error && <p>Connection error?</p>}
-				{stories ?
-					<>
-						<p>Search results:</p>
-						<div className='comment lined'>
-							{stories.length ?
-								stories.map(x =>
-									<div className='item' key={x.id}>
-										<div className='title'>
-											<Link className='link' to={'/' + x.id}>
-												<img className='source-logo' src={logos[x.source]} alt='source logo' /> {x.title}
-											</Link>
-
-											<span className='source'>
-												({sourceLink(x)})
-											</span>
-										</div>
-
-										{infoLine(x)}
 									</div>
-								)
+
-							:
+									{infoLine(x)}
-								<p>none</p>
+								</div>
-							}
+							)
-						</div>
+						:
-					</>
+							<p>none</p>
-				:
+						}
-					<p>loading...</p>
+					</div>
-				}
+				</>
-			</div>
+			:
-		);
+				<p>loading...</p>
-	}
+			}
+		</div>
+	);
 }
 
 export default Results;

webclient/src/ScrollToTop.js

@@ -15,6 +15,7 @@ class ScrollToTop extends React.Component {
 		}
 
 		window.scrollTo(0, 0);
+		document.body.scrollTop = 0;
 	}
 
 	render() {

webclient/src/Search.js

@@ -1,51 +1,46 @@
-import React, { Component } from 'react';
+import React, { useState, useRef } from 'react';
-import { withRouter } from 'react-router-dom';
+import { useHistory, useLocation } from 'react-router-dom';
 import queryString from 'query-string';
 
-const getSearch = props => queryString.parse(props.location.search).q;
+const getSearch = location => queryString.parse(location.search).q || '';
 
-class Search extends Component {
+function Search() {
-	constructor(props) {
+	const history = useHistory();
-		super(props);
+	const location = useLocation();
 
-		this.state = {search: getSearch(this.props)};
+	const [search, setSearch] = useState(getSearch(location));
-		this.inputRef = React.createRef();
+	const inputRef = useRef(null);
-	}
 
-	searchArticles = (event) => {
+	const searchArticles = (event) => {
-		const search = event.target.value;
+		const newSearch = event.target.value;
-		this.setState({search: search});
+		setSearch(newSearch);
-		if (search.length >= 3) {
+		if (newSearch.length >= 3) {
-			const searchQuery = queryString.stringify({ 'q': search });
+			const searchQuery = queryString.stringify({ 'q': newSearch });
-			this.props.history.replace('/search?' + searchQuery);
+			history.replace('/search?' + searchQuery);
 		} else {
-			this.props.history.replace('/');
+			history.replace('/');
 		}
 	}
 
-	searchAgain = (event) => {
+	const searchAgain = (event) => {
 		event.preventDefault();
 		const searchString = queryString.stringify({ 'q': event.target[0].value });
-		this.props.history.push('/search?' + searchString);
+		history.push('/search?' + searchString);
-		this.inputRef.current.blur();
+		inputRef.current.blur();
 	}
 
-	render() {
+	return (
-		const search = this.state.search;
+		<span className='search'>
-
+			<form onSubmit={searchAgain}>
-		return (
+				<input
-			<span className='search'>
+					placeholder='Search...'
-				<form onSubmit={this.searchAgain}>
+					value={search}
-					<input
+					onChange={searchArticles}
-						placeholder='Search... (fixed)'
+					ref={inputRef}
-						value={search}
+				/>
-						onChange={this.searchArticles}
+			</form>
-						ref={this.inputRef}
+		</span>
-					/>
+	);
-				</form>
-			</span>
-		);
-	}
 }
 
-export default withRouter(Search);
+export default Search;

webclient/src/Settings.js

@@ -0,0 +1,191 @@
+import React from 'react';
+
+function Settings({
+	settingsOpen,
+	setSettingsOpen,
+	theme,
+	setTheme,
+	isFullScreen,
+	filterSmallweb,
+	setFilterSmallweb,
+	feedSources,
+	setFeedSources,
+	bodyFontSize,
+	setBodyFontSize,
+	defaultBodyFontSize,
+	bodyFont,
+	setBodyFont,
+	articleFont,
+	setArticleFont,
+}) {
+	const light = () => {
+		setTheme('');
+		localStorage.setItem('theme', '');
+	};
+
+	const dark = () => {
+		setTheme('dark');
+		localStorage.setItem('theme', 'dark');
+	};
+
+	const black = () => {
+		setTheme('black');
+		localStorage.setItem('theme', 'black');
+	};
+
+	const red = () => {
+		setTheme('red');
+		localStorage.setItem('theme', 'red');
+	};
+
+	const handleFilterChange = e => {
+		const isChecked = e.target.checked;
+		setFilterSmallweb(isChecked);
+		localStorage.setItem('filterSmallweb', isChecked);
+	};
+
+	const handleFeedSourceChange = (source) => {
+		setFeedSources(prevSources => {
+			const newSources = { ...prevSources, [source]: !prevSources[source] };
+			localStorage.setItem('feedSources', JSON.stringify(newSources));
+			return newSources;
+		});
+	};
+
+	const changeBodyFont = (font) => {
+		setBodyFont(font);
+		localStorage.setItem('bodyFont', font);
+	};
+
+	const changeArticleFont = (font) => {
+		setArticleFont(font);
+		localStorage.setItem('articleFont', font);
+	};
+
+	const changeBodyFontSize = (amount) => {
+		const newSize = bodyFontSize + amount;
+		setBodyFontSize(parseFloat(newSize.toFixed(2)));
+		localStorage.setItem('bodyFontSize', newSize.toFixed(2));
+	};
+
+	const resetBodyFontSize = () => {
+		setBodyFontSize(defaultBodyFontSize);
+		localStorage.removeItem('bodyFontSize');
+	};
+
+	const bodyFontSettingsChanged = bodyFontSize !== defaultBodyFontSize;
+
+	const goFullScreen = () => {
+		if ('wakeLock' in navigator) {
+			navigator.wakeLock.request('screen');
+		}
+		document.body.requestFullscreen({ navigationUI: 'hide' });
+	};
+
+	const exitFullScreen = () => {
+		document.exitFullscreen();
+	};
+
+	const fullScreenAvailable = document.fullscreenEnabled ||
+		document.mozFullscreenEnabled ||
+		document.webkitFullscreenEnabled ||
+		document.msFullscreenEnabled;
+
+	if (!settingsOpen) {
+		return null;
+	}
+
+	return (
+		<>
+			<div className="modal-overlay" onClick={() => setSettingsOpen(false)}></div>
+
+			<div className="modal-content" onClick={e => e.stopPropagation()}>
+				<button className="close-modal-button" onClick={() => setSettingsOpen(false)}>&times;</button>
+				<h3>Settings</h3>
+
+				<div className="setting-group">
+					<h4>Theme</h4>
+					<button className={theme === '' ? 'active' : ''} onClick={() => { light(); setSettingsOpen(false); }}>Light</button>
+					<button className={theme === 'dark' ? 'active' : ''} onClick={() => { dark(); setSettingsOpen(false); }}>Dark</button>
+					<button className={theme === 'black' ? 'active' : ''} onClick={() => { black(); setSettingsOpen(false); }}>Black</button>
+					<button className={theme === 'red' ? 'active' : ''} onClick={() => { red(); setSettingsOpen(false); }}>Red</button>
+					{fullScreenAvailable &&
+						<div style={{ marginTop: '0.5rem' }}>
+							{!isFullScreen ?
+								<button onClick={() => { goFullScreen(); setSettingsOpen(false); }}>Enter Fullscreen</button>
+								:
+								<button onClick={() => { exitFullScreen(); setSettingsOpen(false); }}>Exit Fullscreen</button>
+							}
+						</div>
+					}
+				</div>
+
+				<div className="setting-group">
+					<h4>Feed</h4>
+					<div className="font-option gap">
+						<input className="checkbox" type="checkbox" id="filter-smallweb" checked={filterSmallweb} onChange={handleFilterChange} />
+						<label htmlFor="filter-smallweb">Small websites only</label>
+					</div>
+					<div className="font-option">
+						<input className="checkbox" type="checkbox" id="filter-hackernews" name="feed-source" checked={feedSources.hackernews} onChange={() => handleFeedSourceChange('hackernews')} />
+						<label htmlFor="filter-hackernews">Hacker News</label>
+					</div>
+					<div className="font-option">
+						<input className="checkbox" type="checkbox" id="filter-reddit" name="feed-source" checked={feedSources.reddit} onChange={() => handleFeedSourceChange('reddit')} />
+						<label htmlFor="filter-reddit">Reddit</label>
+					</div>
+					<div className="font-option">
+						<input className="checkbox" type="checkbox" id="filter-lobsters" name="feed-source" checked={feedSources.lobsters} onChange={() => handleFeedSourceChange('lobsters')} />
+						<label htmlFor="filter-lobsters">Lobsters</label>
+					</div>
+					<div className="font-option">
+						<input className="checkbox" type="checkbox" id="filter-tildes" name="feed-source" checked={feedSources.tildes} onChange={() => handleFeedSourceChange('tildes')} />
+						<label htmlFor="filter-tildes">Tildes</label>
+					</div>
+				</div>
+
+				<div className="setting-group">
+					<h4>Font Size</h4>
+					<button onClick={() => changeBodyFontSize(-0.05)}>-</button>
+					<span className="font-size-display">{bodyFontSize.toFixed(2)}</span>
+					<button onClick={() => changeBodyFontSize(0.05)}>+</button>
+					<button onClick={resetBodyFontSize} disabled={!bodyFontSettingsChanged}>Reset</button>
+				</div>
+
+				<div className="setting-group">
+					<h4>Body Font</h4>
+					<div className="font-option">
+						<input className="checkbox" type="radio" id="body-sans-serif" name="body-font" value="Sans Serif" checked={bodyFont === 'Sans Serif'} onChange={() => changeBodyFont('Sans Serif')} />
+						<label htmlFor="body-sans-serif">Sans Serif *</label>
+					</div>
+					<div className="font-option">
+						<input className="checkbox" type="radio" id="body-serif" name="body-font" value="Serif" checked={bodyFont === 'Serif'} onChange={() => changeBodyFont('Serif')} />
+						<label htmlFor="body-serif">Serif</label>
+					</div>
+					<div className="font-option">
+						<input className="checkbox" type="radio" id="body-apparatus" name="body-font" value="Apparatus SIL" checked={bodyFont === 'Apparatus SIL'} onChange={() => changeBodyFont('Apparatus SIL')} />
+						<label htmlFor="body-apparatus">Apparatus SIL</label>
+					</div>
+				</div>
+
+				<div className="setting-group">
+					<h4>Article Font</h4>
+					<div className="font-option">
+						<input className="checkbox" type="radio" id="article-sans-serif" name="article-font" value="Sans Serif" checked={articleFont === 'Sans Serif'} onChange={() => changeArticleFont('Sans Serif')} />
+						<label htmlFor="article-sans-serif">Sans Serif</label>
+					</div>
+					<div className="font-option">
+						<input className="checkbox" type="radio" id="article-serif" name="article-font" value="Serif" checked={articleFont === 'Serif'} onChange={() => changeArticleFont('Serif')} />
+						<label htmlFor="article-serif">Serif</label>
+					</div>
+					<div className="font-option">
+						<input className="checkbox" type="radio" id="article-apparatus" name="article-font" value="Apparatus SIL" checked={articleFont === 'Apparatus SIL'} onChange={() => changeArticleFont('Apparatus SIL')} />
+						<label htmlFor="article-apparatus">Apparatus SIL *</label>
+					</div>
+				</div>
+			</div>
+		</>
+	);
+}
+
+export default Settings;

webclient/src/Style-black.css

@@ -0,0 +1,103 @@
+.black {
+	color: #ddd;
+}
+
+.black a {
+	color: #ddd;
+}
+
+.black input {
+	color: #ddd;
+	border: 1px solid #828282;
+}
+
+.black .menu button,
+.black .story-text button {
+	background-color: #222222;
+	border-color: #bbb;
+	color: #ddd;
+}
+
+.black .item {
+	color: #828282;
+}
+
+.black .item .source-logo {
+	filter: grayscale(1);
+}
+
+.black .item a {
+	color: #828282;
+}
+
+.black .item a.link {
+	color: #ddd;
+}
+.black .item a.link:visited {
+	color: #828282;
+}
+
+.black .item .info a.hot {
+	color: #cccccc;
+}
+
+.black .article a {
+	border-bottom: 1px solid #aaaaaa;
+}
+
+.black .article u {
+	border-bottom: 1px solid #aaaaaa;
+	text-decoration: none;
+}
+
+.black .story-text video,
+.black .story-text img {
+	filter: brightness(50%);
+}
+
+.black .article .info {
+	color: #828282;
+}
+
+.black .article .info a {
+	border-bottom: none;
+	color: #828282;
+}
+
+.black .comment.lined {
+	border-left: 1px solid #444444;
+}
+
+.black .checkbox:checked + label::after {
+	border-color: #eee;
+}
+
+.black .copy-button {
+	color: #828282;
+}
+
+.black .update-banner {
+	background-color: #333;
+	color: #ddd;
+}
+
+.black .update-banner button {
+	background-color: #222222;
+	border-color: #bbb;
+	color: #ddd;
+}
+
+.black .modal-content {
+	background: #222;
+	border-color: #828282;
+	color: #ddd;
+}
+
+.black .modal-content button {
+	background-color: #222222;
+	border-color: #bbb;
+}
+
+.black .modal-content button.active {
+	background-color: #555;
+}

webclient/src/Style-dark.css

@@ -11,12 +11,15 @@
 	border: 1px solid #828282;
 }
 
-.dark .item {
+.dark .menu button,
-	color: #828282;
+.dark .story-text button {
+	background-color: #222222;
+	border-color: #bbb;
+	color: #ddd;
 }
 
-.dark .item .source-logo {
+.dark .item {
-	filter: grayscale(1);
+	color: #828282;
 }
 
 .dark .item a {
@@ -43,6 +46,7 @@
 	text-decoration: none;
 }
 
+.dark .story-text video,
 .dark .story-text img {
 	filter: brightness(50%);
 }
@@ -59,3 +63,37 @@
 .dark .comment.lined {
 	border-left: 1px solid #444444;
 }
+
+.dark .checkbox:checked + label::after {
+	border-color: #eee;
+}
+
+.dark .copy-button {
+	color: #828282;
+}
+
+.dark .update-banner {
+	background-color: #333;
+	color: #ddd;
+}
+
+.dark .update-banner button {
+	background-color: #222222;
+	border-color: #bbb;
+	color: #ddd;
+}
+
+.dark .modal-content {
+	background: #222;
+	border-color: #828282;
+	color: #ddd;
+}
+
+.dark .modal-content button {
+	background-color: #222222;
+	border-color: #bbb;
+}
+
+.dark .modal-content button.active {
+	background-color: #555;
+}

webclient/src/Style-light.css

@@ -1,10 +1,32 @@
 body {
 	text-rendering: optimizeLegibility;
-	font: 1rem/1.3 sans-serif;
+	font-size: 1rem;
+	line-height: 1.3;
 	color: #000000;
-	margin-bottom: 100vh;
 	word-break: break-word;
 	font-kerning: normal;
+	margin: 0;
+}
+
+::backdrop {
+	background-color: rgba(0,0,0,0);
+}
+
+body:fullscreen {
+	overflow-y: scroll !important;
+}
+body:-ms-fullscreen {
+	overflow-y: scroll !important;
+}
+body:-webkit-full-screen {
+	overflow-y: scroll !important;
+}
+body:-moz-full-screen {
+	overflow-y: scroll !important;
+}
+
+#root {
+	margin: 8px 8px 100vh 8px !important;
 }
 
 a {
@@ -22,10 +44,36 @@ input {
 	border-radius: 4px;
 }
 
+.update-banner {
+	background-color: #ddd;
+	padding: 0.75rem;
+	text-align: center;
+}
+
+.update-banner button {
+	margin-left: 1rem;
+	padding: 0.25rem 0.75rem;
+	border: 1px solid #828282;
+	border-radius: 4px;
+	background-color: transparent;
+	cursor: pointer;
+}
+
+.fullscreen {
+	margin: 0.25rem;
+	padding: 0.25rem;
+}
+
 pre {
 	overflow: auto;
 }
 
+.comments pre {
+	overflow: auto;
+	white-space: pre-wrap;
+	overflow-wrap: break-word;
+}
+
 .container {
 	margin: 1rem auto;
 	max-width: 64rem;
@@ -38,6 +86,7 @@ pre {
 
 .slogan {
 	color: #828282;
+	margin-bottom: 0.5rem;
 }
 
 .theme {
@@ -94,6 +143,13 @@ span.source {
 	border-bottom: 1px solid #222222;
 }
 
+.article-title {
+	display: flex;
+	align-items: center;
+	margin-top: 0.67em;
+	margin-bottom: 0.67em;
+}
+
 .article h1 {
 	font-size: 1.6rem;
 }
@@ -144,12 +200,20 @@ span.source {
 }
 
 .story-text {
-	font: 1.2rem/1.5 'Apparatus SIL', sans-serif;
+	font-size: 1.2rem;
+	line-height: 1.5;
 	margin-top: 1em;
 }
 
 .comments {
 	margin-left: -1.25rem;
+	margin-top: 0;
+	margin-bottom: 0;
+	padding: 0;
+}
+
+.comments dl, .comments dd {
+	margin: 0;
 }
 
 .comment {
@@ -162,6 +226,11 @@ span.source {
 
 .comment .text {
 	margin-top: -0.5rem;
+	margin-bottom: 1rem;
+}
+
+.comment .text > * {
+	margin-bottom: 0;
 }
 
 .comment .text.hidden > p {
@@ -181,20 +250,49 @@ span.source {
 	padding-right: 1.5rem;
 }
 
+button.collapser {
+	background: transparent;
+	border: none;
+	margin: 0;
+	padding-top: 0;
+	padding-bottom: 0;
+	font: inherit;
+	color: inherit;
+}
+
+button.comment {
+	background: transparent;
+	border-top: none;
+	border-right: none;
+	border-bottom: none;
+	margin: 0;
+	padding-top: 0;
+	padding-right: 0;
+	padding-bottom: 0;
+	font: inherit;
+	color: inherit;
+	text-align: left;
+	width: 100%;
+}
+
 .comment .pointer {
 	cursor: pointer;
 }
 
-.toggleDot {
+.dot {
+	cursor: pointer;
 	position: fixed;
-	bottom: 1rem;
-	left: 1rem;
 	height: 3rem;
 	width: 3rem;
 	background-color: #828282;
 	border-radius: 50%;
 }
 
+.toggleDot {
+	bottom: 1rem;
+	left: 1rem;
+}
+
 .toggleDot .button {
 	font: 2rem/1 'icomoon';
 	position: relative;
@@ -203,23 +301,204 @@ span.source {
 }
 
 .forwardDot {
-	cursor: pointer;
-	position: fixed;
 	bottom: 1rem;
 	right: 1rem;
-	height: 3rem;
-	width: 3rem;
-	background-color: #828282;
-	border-radius: 50%;
 }
 
 .forwardDot .button {
-	font: 2.5rem/1 'icomoon';
+	font: 2rem/1 'icomoon';
 	position: relative;
-	top: 0.25rem;
+	top: 0.5rem;
-	left: 0.3rem;
+	left: 0.5rem;
+}
+
+.backwardDot {
+	bottom: 1rem;
+	right: 5rem;
+}
+
+.backwardDot .button {
+	font: 2rem/1 'icomoon';
+	position: relative;
+	top: 0.5rem;
+	left: 0.5rem;
 }
 
 .search form {
 	display: inline;
 }
+
+.copy-button {
+	font: 1.5rem/1 'icomoon2';
+	color: #828282;
+	background: transparent;
+	border: none;
+	cursor: pointer;
+	vertical-align: middle;
+}
+
+.checkbox {
+	-webkit-appearance: none;
+	appearance: none;
+	position: absolute;
+	opacity: 0;
+	cursor: pointer;
+	height: 0;
+	width: 0;
+}
+
+.checkbox + label {
+	position: relative;
+	cursor: pointer;
+	padding-left: 1.75rem;
+	user-select: none;
+}
+
+.checkbox + label::before {
+	content: '';
+	position: absolute;
+	left: 0;
+	top: 0.1em;
+	width: 1rem;
+	height: 1rem;
+	border: 1px solid #828282;
+	background-color: transparent;
+	border-radius: 3px;
+}
+
+.checkbox:checked + label::after {
+	content: "";
+	position: absolute;
+	left: 0.35rem;
+	top: 0.2em;
+	width: 0.3rem;
+	height: 0.6rem;
+	border-style: solid;
+	border-color: #000;
+	border-width: 0 2px 2px 0;
+	transform: rotate(45deg);
+}
+
+.tooltip .tooltiptext {
+	visibility: hidden;
+	width: 140px;
+	background-color: #555;
+	color: #fff;
+	text-align: center;
+	border-radius: 6px;
+	padding: 5px 0;
+	position: absolute;
+	z-index: 1;
+	bottom: 110%;
+	left: 50%;
+	margin-left: -70px;
+	opacity: 0;
+	transition: opacity 0.2s;
+	font-size: 0.9rem;
+	line-height: 1.3;
+}
+
+.forwardDot .tooltiptext {
+	left: auto;
+	right: 0;
+	margin-left: 0;
+}
+
+.tooltip.show-tooltip .tooltiptext {
+	visibility: visible;
+	opacity: 1;
+}
+
+.settings-button {
+	float: right;
+	background: none;
+	border: none;
+	padding: 0;
+	cursor: pointer;
+	color: inherit;
+	font: inherit;
+}
+
+.modal-overlay {
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	background-color: rgba(0,0,0,0.5);
+	z-index: 100;
+}
+
+.modal-content {
+	position: absolute;
+	top: 1rem;
+	right: 1rem;
+	background: #eee;
+	color: #000;
+	padding: 1rem;
+	border-radius: 4px;
+	z-index: 101;
+	min-width: 250px;
+	border: 1px solid #828282;
+}
+
+.modal-content h3, .modal-content h4 {
+	margin-top: 0;
+	margin-bottom: 0.5rem;
+}
+
+.modal-content .setting-group {
+	margin-bottom: 1rem;
+}
+
+.modal-content button {
+	margin-right: 0.5rem;
+	padding: 0.25rem 0.75rem;
+	border: 1px solid #828282;
+	border-radius: 4px;
+	background-color: transparent;
+	cursor: pointer;
+	font: inherit;
+	color: inherit;
+}
+
+.modal-content button:last-child {
+	margin-right: 0;
+}
+
+.modal-content button.active {
+	background-color: #ccc;
+}
+
+.modal-content button:disabled {
+	opacity: 0.5;
+	cursor: not-allowed;
+}
+
+.modal-content .font-size-display {
+	display: inline-block;
+	width: 50px;
+	text-align: center;
+	margin: 0 0.25rem;
+}
+
+.modal-content .font-option {
+	margin-bottom: 0.25rem;
+}
+
+.modal-content .gap {
+	margin-bottom: 0.75rem;
+}
+
+.close-modal-button {
+	position: absolute;
+	top: 0.5rem;
+	right: 0.75rem;
+	background: transparent;
+	border: none;
+	font-size: 1.5rem;
+	line-height: 1;
+	padding: 0;
+	cursor: pointer;
+	color: inherit;
+}

webclient/src/Style-red.css

@@ -0,0 +1,121 @@
+.red {
+	color: #b00;
+	scrollbar-color: #b00 #440000;
+}
+
+.red a {
+	color: #b00;
+}
+
+.red input {
+	color: #b00;
+	border: 1px solid #690000;
+}
+
+.red input::placeholder {
+	color: #690000;
+}
+
+.red hr {
+	background-color: #690000;
+}
+
+.red .menu button,
+.red .story-text button {
+	background-color: #220000;
+	border-color: #b00;
+	color: #b00;
+}
+
+.red .item,
+.red .slogan {
+	color: #690000;
+}
+
+.red .item .source-logo {
+	display: none;
+}
+
+.red .item a {
+	color: #690000;
+}
+
+.red .item a.link {
+	color: #b00;
+}
+.red .item a.link:visited {
+	color: #690000;
+}
+
+.red .item .info a.hot {
+	color: #cc0000;
+}
+
+.red .article a {
+	border-bottom: 1px solid #aa0000;
+}
+
+.red .article u {
+	border-bottom: 1px solid #aa0000;
+	text-decoration: none;
+}
+
+.red .story-text video,
+.red .story-text img {
+	filter: grayscale(100%) brightness(20%) sepia(100%) hue-rotate(-50deg) saturate(600%) contrast(0.8);
+}
+
+.red .article .info {
+	color: #690000;
+}
+
+.red .article .info a {
+	border-bottom: none;
+	color: #690000;
+}
+
+.red .comment.lined {
+	border-left: 1px solid #440000;
+}
+
+.red .dot {
+	background-color: #440000;
+}
+
+.red .checkbox + label::before {
+	border: 1px solid #690000;
+}
+
+.red .checkbox:checked + label::after {
+	border-color: #dd0000;
+}
+
+.red .copy-button {
+	color: #690000;
+}
+
+.red .update-banner {
+	background-color: #300;
+	color: #d00;
+}
+
+.red .update-banner button {
+	background-color: #220000;
+	border-color: #b00;
+	color: #d00;
+}
+
+.red .modal-content {
+	background: #100;
+	border-color: #690000;
+	color: #b00;
+}
+
+.red .modal-content button {
+	background-color: #220000;
+	border-color: #b00;
+}
+
+.red .modal-content button.active {
+	background-color: #550000;
+}

webclient/src/Submit.js

@@ -1,54 +1,53 @@
-import React, { Component } from 'react';
+import React, { useState, useRef } from 'react';
-import { withRouter } from 'react-router-dom';
+import { useHistory } from 'react-router-dom';
 
-class Submit extends Component {
+function Submit() {
-	constructor(props) {
+	const [progress, setProgress] = useState(null);
-		super(props);
+	const inputRef = useRef(null);
+	const history = useHistory();
 
-		this.state = {
+	const submitArticle = async (event) => {
-			progress: null,
-		};
-
-		this.inputRef = React.createRef();
-	}
-
-	submitArticle = (event) => {
 		event.preventDefault();
 		const url = event.target[0].value;
-		this.inputRef.current.blur();
+		inputRef.current.blur();
 
-		this.setState({ progress: 'Submitting...' });
+		setProgress('Submitting...');
 
 		let data = new FormData();
 		data.append('url', url);
 
-		fetch('/api/submit', { method: 'POST', body: data })
+		try {
-			.then(res => res.json())
+			const res = await fetch('/api/submit', { method: 'POST', body: data });
-			.then(
+
-				(result) => {
+			if (res.ok) {
-					this.props.history.replace('/' + result.nid);
+				const result = await res.json();
-				},
+				history.replace('/' + result.nid);
-				(error) => {
+			} else {
-					this.setState({ progress: 'Error' });
+				let errorData;
+				try {
+					errorData = await res.json();
+				} catch (jsonError) {
+					// Not a JSON error from our API, so it's a server issue
+					throw new Error(`Server responded with ${res.status} ${res.statusText}`);
 				}
-			);
+				setProgress(errorData.error || 'An unknown error occurred.');
+			}
+		} catch (error) {
+			setProgress(`Error: ${error.toString()}`);
+		}
 	}
 
-	render() {
+	return (
-		const progress = this.state.progress;
+		<span className='search'>
-
+			<form onSubmit={submitArticle}>
-		return (
+				<input
-			<span className='search'>
+					placeholder='Submit URL'
-				<form onSubmit={this.submitArticle}>
+					ref={inputRef}
-					<input
+				/>
-						placeholder='Submit Article'
+			</form>
-						ref={this.inputRef}
+			{progress && <p>{progress}</p>}
-					/>
+		</span>
-				</form>
+	);
-				{progress ? progress : ''}
-			</span>
-		);
-	}
 }
 
-export default withRouter(Submit);
+export default Submit;

webclient/src/fonts/Fonts.css

@@ -26,3 +26,8 @@
     font-family: 'Icomoon';
     src: url('icomoon.ttf') format('truetype');
 }
+
+@font-face {
+    font-family: 'Icomoon2';
+    src: url('icomoon2.ttf') format('truetype');
+}

webclient/src/index.js

@@ -3,9 +3,15 @@ import ReactDOM from 'react-dom';
 import App from './App';
 import * as serviceWorker from './serviceWorker';
 
+// version 4
+
 ReactDOM.render(<App />, document.getElementById('root'));
 
 // If you want your app to work offline and load faster, you can change
 // // unregister() to register() below. Note this comes with some pitfalls.
 // // Learn more about service workers: https://bit.ly/CRA-PWA
-serviceWorker.register();
+serviceWorker.register({
+  onUpdate: registration => {
+    window.dispatchEvent(new CustomEvent('swUpdate', { detail: registration }));
+  }
+});

webclient/src/utils.js

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useState } from 'react';
 import moment from 'moment';
 import { Link } from 'react-router-dom';
 
@@ -9,6 +9,13 @@ export const sourceLink = (story) => {
 	return (<a className='source' href={url}>{host}</a>);
 };
 
+export const similarLink = (story) => {
+	const url = story.url || story.link;
+	const urlObj = new URL(url);
+	const host = urlObj.hostname.replace(/^www\./, '');
+	return (<Link to={'/search?q="'+host+'"'} className='similar'>similar</Link>);
+};
+
 export const infoLine = (story) =>
 	<div className='info'>
 		{story.score} points
@@ -21,41 +28,72 @@ export const infoLine = (story) =>
 	</div>
 ;
 
-export class ToggleDot extends React.Component {
+export const ToggleDot = ({ id, article }) => (
-	render() {
+	<div className='dot toggleDot'>
-		const id = this.props.id;
+		<div className='button'>
-		const article = this.props.article;
+			<Link to={'/' + id + (article ? '' : '/c')}>
-		return (
+				{article ? '' : ''}
-			<div className='toggleDot'>
+			</Link>
-				<div className='button'>
+		</div>
-					<Link to={'/' + id + (article ? '' : '/c')}>
+	</div>
-						{article ? '' : ''}
+);
-					</Link>
-				</div>
-			</div>
-		);
-	}
-}
 
-export class ForwardDot extends React.Component {
+export const BackwardDot = () => {
-	goForward() {
+	const [showTooltip, setShowTooltip] = useState(false);
+
+	const goBackward = () => {
+		localStorage.setItem('scrollLock', 'True');
+		window.history.back();
+	};
+
+	const isMobile = /iPhone|iPad|iPod|Android/i.test(navigator.userAgent);
+	if (!isMobile) return null;
+	if (!document.fullscreenElement) return null;
+
+	return (
+		<div
+			className={'dot backwardDot tooltip' + (showTooltip ? ' show-tooltip' : '')}
+			onClick={goBackward}
+			onMouseEnter={() => setShowTooltip(true)}
+			onMouseLeave={() => setShowTooltip(false)}
+			onTouchStart={() => setShowTooltip(true)}
+			onTouchEnd={() => setShowTooltip(false)}
+		>
+			<div className='button'>
+				
+			</div>
+			<span className="tooltiptext">Browser Back</span>
+		</div>
+	);
+};
+
+export const ForwardDot = () => {
+	const [showTooltip, setShowTooltip] = useState(false);
+
+	const goForward = () => {
 		localStorage.setItem('scrollLock', 'True');
 		window.history.forward();
-	}
+	};
 
-	render() {
+	const isMobile = /iPhone|iPad|iPod|Android/i.test(navigator.userAgent);
-		const isMobile = /iPhone|iPad|iPod|Android/i.test(navigator.userAgent);
+	if (!isMobile) return null;
-		if (!isMobile) return null;
 
-		return (
+	return (
-			<div className='forwardDot' onClick={this.goForward}>
+		<div
-				<div className='button'>
+			className={'dot forwardDot tooltip' + (showTooltip ? ' show-tooltip' : '')}
-					
+			onClick={goForward}
-				</div>
+			onMouseEnter={() => setShowTooltip(true)}
+			onMouseLeave={() => setShowTooltip(false)}
+			onTouchStart={() => setShowTooltip(true)}
+			onTouchEnd={() => setShowTooltip(false)}
+		>
+			<div className='button'>
+				
 			</div>
-		);
+			<span className="tooltiptext">Browser Forward</span>
-	}
+		</div>
-}
+	);
+};
 
 export const logos = {
 	hackernews: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAC4jAAAuIwF4pT92AAAAB3RJTUUH4wgeBhwhciGZUAAAABl0RVh0Q29tbWVudABDcmVhdGVkIHdpdGggR0lNUFeBDhcAAAGCSURBVFjD7Za/S0JRFMc/+oSgLWjLH/2AIKEhC2opIp1amqw/INCo9lbHghCnKDdpN5OoIGhISSLwx2RCEYSjUWhWpO+9hicopCHh8w29Mx3u/XLv95z7Pedcg+y1VQEBbUw0ang5gGBEY9MJ6ARMbaH6HdBnBlmC+5PfsVYX9PTCSx4KyQ4RsI6DxwcYIGSFxF5znHkOtvZBECDoa4tAe0+QDMFDVvFd7ta4pU0QTAo2GeqwBqIHIEkwMAQzaz/3LfNgn1Qw0aAKIswdQzZVy8Jyk+g3lNTfpSEXUakKjgJQrYB5GKY9DRpZALsDxCqEAyqWYT4G6etaFlYaol8HowCZBOSvVO4DR374+gTLCEytgs0JYxPKWtivUh9otOcM3FzC7CI43fBWVKK/vYBCqkudMLIN7yUYHFXe/qMMkZ0utuLyE8ROwWBU6j5+BqXHLs+C+GHdP9/VYBhJ1bpfedXHsU5A5Q9JKxEWa+KT5T8fY5C9NlnXgE7g3xMQNbxf/AZyEGqvyYs/dQAAAABJRU5ErkJggg==',