Ignore praw.ini

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

apiserver/.gitignore

@@ -111,3 +111,4 @@ data.db.bak
 data/archive/*
 data/backup/*
 qotnews.sqlite
+praw.ini

apiserver/search.py

@@ -10,6 +10,7 @@ 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))
@@ -28,24 +29,20 @@ def create_index():
     json = dict(uid='qotnews', primaryKey='id')
     return meili_api(requests.post, 'indexes', json=json)
 
-def update_rankings():
+def update_settings():
-    json = ['typo', 'words', 'proximity', 'date:desc', 'exactness']
+    json = {
-    return meili_api(requests.post, 'indexes/qotnews/settings/ranking-rules', json=json)
+        'rankingRules': ['typo', 'words', 'proximity', 'date:desc', 'exactness'],
-
+        'searchableAttributes': ['title', 'url', 'author'],
-def update_attributes():
+        'displayedAttributes': ['id', 'ref', 'source', 'author', 'author_link', 'score', 'date', 'title', 'link', 'url', 'num_comments'],
-    json = ['title', 'url', 'author']
+    }
-    r = meili_api(requests.post, 'indexes/qotnews/settings/searchable-attributes', json=json)
+    return meili_api(requests.post, 'indexes/qotnews/settings', json=json)
-    json = ['id', 'ref', 'source', 'author', 'author_link', 'score', 'date', 'title', 'link', 'url', 'num_comments']
-    r = meili_api(requests.post, 'indexes/qotnews/settings/displayed-attributes', json=json)
-    return r
 
 def init():
     if not SEARCH_ENABLED:
         logging.info('Search is not enabled, skipping init.')
         return
     print(create_index())
-    update_rankings()
+    update_settings()
-    update_attributes()
 
 def put_story(story):
     if not SEARCH_ENABLED: return
@@ -53,13 +50,11 @@ def put_story(story):
 
 def search(q):
     if not SEARCH_ENABLED: return []
-    params = dict(q=q, limit=settings.FEED_LENGTH)
+    json = dict(q=q, limit=settings.FEED_LENGTH)
-    r = meili_api(requests.get, 'indexes/qotnews/search', params=params, parse_json=False)
+    r = meili_api(requests.post, 'indexes/qotnews/search', json=json, parse_json=False)
     return r
     
 if __name__ == '__main__':
     init()
 
-    print(update_rankings())
-
     print(search('facebook'))

apiserver/server.py

@@ -16,6 +16,7 @@ import traceback
 import time
 import datetime
 import humanize
+import urllib.request
 from urllib.parse import urlparse, parse_qs
 
 import settings
@@ -28,6 +29,25 @@ from flask import abort, Flask, request, render_template, stream_with_context, R
 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()
 
@@ -56,7 +76,47 @@ cors = CORS(flask_app)
 def api():
     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'

webclient/public/index.html

@@ -30,7 +30,11 @@
 		-->
 		<title>{{ title }}</title>
 
+		<script>document.documentElement.className = 'js-enabled';</script>
 		<style>
+			.js-enabled .static-content {
+				display: none;
+			}
 			html {
 				overflow-y: scroll;
 			}
@@ -41,10 +45,27 @@
 	</head>
 
 	<body>
-		<div class="nojs">
+		<script>
-			<noscript></noscript>
+			(function() {
-		</div>
+				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>
@@ -81,21 +102,26 @@
 								<div class="story-text">{{ story.text | safe }}</div>
 							{% elif show_comments %}
 								{% macro render_comment(comment, level) %}
-								<div class="comment{% if level > 0 %} lined{% endif %}">
+									<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 %}
-								</div>
+											</dl>
+										{% endif %}
+									</dd>
 								{% endmacro %}
-							<div class="comments">
+								<dl class="comments">
 									{% for comment in story.comments %}{{ render_comment(comment, 0) }}{% endfor %}
-							</div>
+								</dl>
 							{% endif %}
 						</div>
 						<div class='dot toggleDot'>
@@ -132,6 +158,7 @@
 					</div>
 				{% endif %}
 			</div>
+		</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,4 +1,4 @@
-import React, { useState, useEffect, useRef, useCallback } 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';
@@ -14,35 +14,40 @@ 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';
 
 function App() {
 	const [theme, setTheme] = useState(localStorage.getItem('theme') || '');
 	const cache = useRef({});
 	const [isFullScreen, setIsFullScreen] = useState(!!document.fullscreenElement);
+	const [waitingWorker, setWaitingWorker] = useState(null);
+	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,
+		};
+	});
 
 	const updateCache = useCallback((key, value) => {
 		cache.current[key] = value;
 	}, []);
 
-	const light = () => {
+	useEffect(() => {
-		setTheme('');
+		const onSWUpdate = e => {
-		localStorage.setItem('theme', '');
+			setWaitingWorker(e.detail.waiting);
-	};
-
-	const dark = () => {
-		setTheme('dark');
-		localStorage.setItem('theme', 'dark');
-	};
-
-	const black = () => {
-		setTheme('black');
-		localStorage.setItem('theme', 'black');
-	};
-
-	const red = () => {
-		setTheme('red');
-		localStorage.setItem('theme', 'red');
 		};
+		window.addEventListener('swUpdate', onSWUpdate);
+		return () => window.removeEventListener('swUpdate', onSWUpdate);
+	}, []);
 
 	useEffect(() => {
 		if (Object.keys(cache.current).length === 0) {
@@ -54,24 +59,13 @@ function App() {
 		}
 	}, [updateCache]);
 
-	const goFullScreen = () => {
-		if ('wakeLock' in navigator) {
-			navigator.wakeLock.request('screen');
-		}
-		document.body.requestFullscreen({ navigationUI: 'hide' });
-	};
-
-	const exitFullScreen = () => {
-		document.exitFullscreen();
-	};
-
 	useEffect(() => {
 		const onFullScreenChange = () => setIsFullScreen(!!document.fullscreenElement);
 		document.addEventListener('fullscreenchange', onFullScreenChange);
 		return () => document.removeEventListener('fullscreenchange', onFullScreenChange);
 	}, []);
 
-	useEffect(() => {
+	useLayoutEffect(() => {
 		if (theme === 'dark') {
 			document.body.style.backgroundColor = '#1a1a1a';
 		} else if (theme === 'black') {
@@ -83,34 +77,86 @@ function App() {
 		}
 	}, [theme]);
 
-	const fullScreenAvailable = document.fullscreenEnabled ||
+	useEffect(() => {
-		document.mozFullscreenEnabled ||
+		document.documentElement.style.fontSize = `${bodyFontSize}rem`;
-		document.webkitFullscreenEnabled ||
+	}, [bodyFontSize]);
-		document.msFullscreenEnabled;
+
+	const fontMap = {
+		'Sans Serif': 'sans-serif',
+		'Serif': 'serif',
+		'Apparatus SIL': "'Apparatus SIL', sans-serif"
+	};
+
+	useEffect(() => {
+		document.body.style.fontFamily = fontMap[bodyFont];
+	}, [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>
 
-						<span className='theme'><a href='#' onClick={() => light()}>Light</a> - <a href='#' onClick={() => dark()}>Dark</a> - <a href='#' onClick={() => black()}>Black</a> - <a href='#' onClick={() => red()}>Red</a></span>
+						<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>
-					{fullScreenAvailable &&
-						<Route path='/(|search)' render={() => !isFullScreen ?
-							<button className='fullscreen' onClick={() => goFullScreen()}>Enter Fullscreen</button>
-						:
-							<button className='fullscreen' onClick={() => exitFullScreen()}>Exit Fullscreen</button>
-						} />
-					}
 					<Route path='/(|search)' component={Search} />
 					<Route path='/(|search)' component={Submit} />
 				</div>
 
-				<Route path='/' exact render={(props) => <Feed {...props} updateCache={updateCache} />} />
+				<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} />} />

webclient/src/Article.js

@@ -2,7 +2,7 @@ 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';
 
@@ -106,7 +106,7 @@ function Article({ cache }) {
 
 			if (v.nodeName === '#text') {
 				const text = v.data;
-				if (text.includes('\\[') || text.includes('\\(') || text.includes('$$')) {
+				if (text.includes('\\[') || text.includes('\\(') || text.includes('$$') || /\$(?:[^$]*[^\s$])\$/.test(text)) {
 					return <Latex key={key} delimiters={latexDelimiters}>{text}</Latex>;
 				}
 
@@ -135,6 +135,12 @@ function Article({ cache }) {
 				);
 			}
 
+			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) {
@@ -143,6 +149,28 @@ function Article({ cache }) {
 				}
 			}
 
+			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} />;
 			}
@@ -185,7 +213,7 @@ function Article({ cache }) {
 					<h1>{story.title} <button className='copy-button' onClick={copyLink}>{copyButtonText}</button></h1>
 
 					<div className='info'>
-						Source: {sourceLink(story)}
+						Source: {sourceLink(story)} | {similarLink(story)}
 					</div>
 
 					{infoLine(story)}

webclient/src/Feed.js

@@ -1,16 +1,49 @@
-import React, { useState, useEffect } 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';
 
-function Feed({ updateCache }) {
+function Feed({ updateCache, filterSmallweb, feedSources }) {
 	const [stories, setStories] = useState(() => JSON.parse(localStorage.getItem('stories')) || false);
 	const [error, setError] = useState('');
 	const [loadingStatus, setLoadingStatus] = useState(null);
+	const isInitialMount = useRef(true);
 
 	useEffect(() => {
-		fetch('/api')
+		if (isInitialMount.current) {
+			isInitialMount.current = false;
+		} else {
+			setStories(false);
+		}
+	}, [filterSmallweb, feedSources]);
+
+	useEffect(() => {
+		const controller = new AbortController();
+
+		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}`);
@@ -21,26 +54,24 @@ function Feed({ updateCache }) {
 				async (result) => {
 					const newApiStories = result.stories;
 
-					const updated = !stories || !stories.length || stories[0].id !== newApiStories[0].id;
+					const updated = !stories || stories.map(s => s.id).join() !== newApiStories.map(s => s.id).join();
 					console.log('New stories available:', updated);
 
 					if (!updated) return;
 
-					if (!stories || !stories.length) {
-						setStories(newApiStories);
-						localStorage.setItem('stories', JSON.stringify(newApiStories));
-					}
-
 					setLoadingStatus({ current: 0, total: newApiStories.length });
 
 					let currentStories = Array.isArray(stories) ? [...stories] : [];
 					let preloadedCount = 0;
 
 					for (const [index, newStory] of newApiStories.entries()) {
+						if (controller.signal.aborted) {
+							break;
+						}
 						try {
-							const controller = new AbortController();
+							const storyFetchController = new AbortController();
-							const timeoutId = setTimeout(() => controller.abort(), 10000); // 10-second timeout
+							const timeoutId = setTimeout(() => storyFetchController.abort(), 10000); // 10-second timeout
-							const storyRes = await fetch('/api/' + newStory.id, { signal: controller.signal });
+							const storyRes = await fetch('/api/' + newStory.id, { signal: storyFetchController.signal });
 							clearTimeout(timeoutId);
 
 							if (!storyRes.ok) {
@@ -89,11 +120,17 @@ function Feed({ updateCache }) {
 					setLoadingStatus(null);
 				},
 				(error) => {
+					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);
 				}
 			);
-	}, [updateCache]);
+
+		return () => controller.abort();
+	}, [updateCache, filterSmallweb, feedSources]);
 
 	return (
 		<div className='container'>
@@ -101,7 +138,7 @@ function Feed({ updateCache }) {
 				<title>QotNews</title>
 				<meta name="robots" content="index" />
 			</Helmet>
-			{loadingStatus && <p>Preloading stories {loadingStatus.current} / {loadingStatus.total}...</p>}
+
 			{error &&
 				<details style={{marginBottom: '1rem'}}>
 					<summary>Connection error? Click to expand.</summary>
@@ -109,6 +146,7 @@ function Feed({ updateCache }) {
 					{stories && <p>Loaded feed from cache.</p>}
 				</details>
 			}
+
 			{stories ?
 				<div>
 					{stories.map(x =>
@@ -130,6 +168,8 @@ function Feed({ updateCache }) {
 			:
 				<p>Loading...</p>
 			}
+
+			{loadingStatus && <p>Preloading stories {loadingStatus.current} / {loadingStatus.total}...</p>}
 		</div>
 	);
 }

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

@@ -11,8 +11,9 @@
 	border: 1px solid #828282;
 }
 
-.black button {
+.black .menu button,
-	background-color: #444444;
+.black .story-text button {
+	background-color: #222222;
 	border-color: #bbb;
 	color: #ddd;
 }
@@ -66,3 +67,37 @@
 .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,8 +11,9 @@
 	border: 1px solid #828282;
 }
 
-.dark button {
+.dark .menu button,
-	background-color: #444444;
+.dark .story-text button {
+	background-color: #222222;
 	border-color: #bbb;
 	color: #ddd;
 }
@@ -62,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,6 +1,7 @@
 body {
 	text-rendering: optimizeLegibility;
-	font: 1rem/1.3 sans-serif;
+	font-size: 1rem;
+	line-height: 1.3;
 	color: #000000;
 	word-break: break-word;
 	font-kerning: normal;
@@ -43,6 +44,21 @@ 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;
@@ -70,6 +86,7 @@ pre {
 
 .slogan {
 	color: #828282;
+	margin-bottom: 0.5rem;
 }
 
 .theme {
@@ -183,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 {
@@ -305,8 +330,175 @@ button.comment {
 
 .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

@@ -20,8 +20,9 @@
 	background-color: #690000;
 }
 
-.red button {
+.red .menu button,
-	background-color: #440000;
+.red .story-text button {
+	background-color: #220000;
 	border-color: #b00;
 	color: #b00;
 }
@@ -80,3 +81,41 @@
 .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/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.unregister();
+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
@@ -32,6 +39,8 @@ export const ToggleDot = ({ id, article }) => (
 );
 
 export const BackwardDot = () => {
+	const [showTooltip, setShowTooltip] = useState(false);
+
 	const goBackward = () => {
 		localStorage.setItem('scrollLock', 'True');
 		window.history.back();
@@ -42,15 +51,25 @@ export const BackwardDot = () => {
 	if (!document.fullscreenElement) return null;
 
 	return (
-		<div className='dot backwardDot' onClick={goBackward}>
+		<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();
@@ -60,10 +79,18 @@ export const ForwardDot = () => {
 	if (!isMobile) return null;
 
 	return (
-		<div className='dot forwardDot' onClick={goForward}>
+		<div
+			className={'dot forwardDot tooltip' + (showTooltip ? ' show-tooltip' : '')}
+			onClick={goForward}
+			onMouseEnter={() => setShowTooltip(true)}
+			onMouseLeave={() => setShowTooltip(false)}
+			onTouchStart={() => setShowTooltip(true)}
+			onTouchEnd={() => setShowTooltip(false)}
+		>
 			<div className='button'>
 				
 			</div>
+			<span className="tooltiptext">Browser Forward</span>
 		</div>
 	);
 };