Only wrap code in comments

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

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019 Tanner (tanner.vc)
+Copyright (c) 2019 Tanner Collin
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -20,7 +20,7 @@ $ sudo apt install yarn
 Clone this repo:
 
 ```text
-$ git clone https://git.tanner.vc/tanner/qotnews.git
+$ git clone https://gogs.tannercollin.com/tanner/qotnews.git
 $ cd qotnews
 ```
 

apiserver/feeds/tildes.py

@@ -16,7 +16,7 @@ from utils import clean
 # cache the topic groups to prevent redirects
 group_lookup = {}
 
-USER_AGENT = 'qotnews scraper (github:tanner37)'
+USER_AGENT = 'qotnews scraper (github:tannercollin)'
 
 API_TOPSTORIES = lambda : 'https://tildes.net'
 API_ITEM = lambda x : 'https://tildes.net/shortener/{}'.format(x)

apiserver/reindex.py

@@ -1,67 +0,0 @@
-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
-from bs4 import BeautifulSoup
-
-database.init()
-search.init()
-
-BATCH_SIZE = 1000
-
-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.full_json)
-            story_obj.pop('comments', False)
-            if 'text' in story_obj and story_obj['text']:
-                soup = BeautifulSoup(story_obj['text'], 'html.parser')
-                story_obj['text'] = soup.get_text()
-            stories.append(story_obj)
-            count += 1
-
-        res = put_stories(stories)
-        update_id = res['taskUid']
-
-        print('Waiting for processing', end='')
-        while get_update(update_id)['status'] != 'succeeded':
-            time.sleep(0.5)
-            print('.', end='', flush=True)
-
-        print()
-
-    print('Done.')
-

apiserver/requirements.txt

@@ -8,7 +8,6 @@ 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/reindex.py

@@ -11,7 +11,6 @@ import sys
 import time
 import json
 import requests
-from bs4 import BeautifulSoup
 
 database.init()
 search.init()
@@ -46,9 +45,6 @@ if __name__ == '__main__':
             story = database.get_story(sid)
             print('Indexing {}/{} id: {} title: {}'.format(count, num_stories, sid[0], story.title))
             story_obj = json.loads(story.meta_json)
-            if 'text' in story_obj and story_obj['text']:
-                soup = BeautifulSoup(story_obj['text'], 'html.parser')
-                story_obj['text'] = soup.get_text()
             stories.append(story_obj)
             count += 1
 

apiserver/search.py

@@ -10,8 +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)
-        r = method(settings.MEILI_URL + route, json=json, params=params, headers=headers, timeout=4)
         if r.status_code > 299:
             raise Exception('Bad response code ' + str(r.status_code))
         if parse_json:
@@ -25,40 +24,42 @@ def meili_api(method, route, json=None, params=None, parse_json=True):
         logging.error('Problem with MeiliSearch api route: %s: %s', route, str(e))
         return False
 
-def update_settings():
+def create_index():
-    json = {
+    json = dict(uid='qotnews', primaryKey='id')
-        'rankingRules': ['words', 'typo', 'proximity', 'attribute', 'date:desc', 'exactness'],
+    return meili_api(requests.post, 'indexes', json=json)
-        'searchableAttributes': ['title', 'url', 'author', 'text'],
+
-        'displayedAttributes': ['id', 'ref', 'source', 'author', 'author_link', 'score', 'date', 'title', 'link', 'url', 'num_comments', 'text'],
+def update_rankings():
-        'stopWords': ['a', 'an', 'the', 'and', 'or', 'but', 'if', 'in', 'on', 'at', 'by', 'for', 'with', 'to', 'from', 'of', 'is', 'it', 'that', 'this'],
+    json = ['typo', 'words', 'proximity', 'date:desc', 'exactness']
-    }
+    return meili_api(requests.post, 'indexes/qotnews/settings/ranking-rules', json=json)
-    return meili_api(requests.patch, 'indexes/qotnews/settings', json=json)
+
+def update_attributes():
+    json = ['title', 'url', 'author']
+    r = meili_api(requests.post, 'indexes/qotnews/settings/searchable-attributes', 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
-    update_settings()
+    print(create_index())
+    update_rankings()
+    update_attributes()
 
 def put_story(story):
     if not SEARCH_ENABLED: return
     return meili_api(requests.post, 'indexes/qotnews/documents', [story])
 
-def search(q, in_article=False):
+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)
-
-    if True:
-        json['attributesToSearchOn'] = ['text']
-        json['attributesToCrop'] = ['text']
-        json['attributesToRetrieve'] = ['id', 'ref', 'source', 'author', 'author_link', 'score', 'date', 'title', 'link', 'url', 'num_comments']
-        json['cropLength'] = 80
-
-    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

@@ -14,9 +14,6 @@ import json
 import threading
 import traceback
 import time
-import datetime
-import humanize
-import urllib.request
 from urllib.parse import urlparse, parse_qs
 
 import settings
@@ -29,25 +26,6 @@ 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()
 
@@ -61,54 +39,15 @@ def new_id():
         nid = gen_rand_id()
     return nid
 
-
-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():
     skip = request.args.get('skip', 0)
     limit = request.args.get('limit', settings.FEED_LENGTH)
-
+    stories = database.get_stories(limit, skip)
-    if request.args.get('smallweb') == 'true' and smallweb_set:
-        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)
-                story_url = story.get('url') or story.get('link') or ''
-                if not story_url:
-                    continue
-                hostname = urlparse(story_url).hostname
-                if hostname:
-                    hostname = hostname.replace('www.', '')
-                    if hostname in smallweb_set:
-                        filtered_stories.append(story_str)
-                        if len(filtered_stories) == limit:
-                            break
-            
-            if len(filtered_stories) == limit:
-                break
-            
-            current_skip += limit
-        stories = filtered_stories
-    else:
-        stories = database.get_stories(limit, skip)
-
     # hacky nested json
     res = Response('{"stories":[' + ','.join(stories) + ']}')
     res.headers['content-type'] = 'application/json'
@@ -131,9 +70,8 @@ def apistats():
 @flask_app.route('/api/search', strict_slashes=False)
 def apisearch():
     q = request.args.get('q', '')
-    in_article = request.args.get('article', False)
     if len(q) >= 3:
-        results = search.search(q, in_article)
+        results = search.search(q)
     else:
         results = '[]'
     res = Response(results)
@@ -218,18 +156,11 @@ 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='QotNews',
         url='news.t0.vc',
         description='Hacker News, Reddit, Lobsters, and Tildes articles rendered in reader mode',
         robots='index',
-        stories=stories,
     )
 
 @flask_app.route('/<sid>', strict_slashes=False)
@@ -240,9 +171,9 @@ def static_story(sid):
     except NotFound:
         pass
 
-    story_obj = database.get_story(sid)
+    story = database.get_story(sid)
-    if not story_obj: return abort(404)
+    if not story: return abort(404)
-    story = json.loads(story_obj.full_json)
+    story = json.loads(story.full_json)
 
     score = story['score']
     num_comments = story['num_comments']
@@ -251,7 +182,7 @@ def static_story(sid):
             score, 's' if score != 1 else '',
             num_comments, 's' if num_comments != 1 else '',
             source)
-    url = urlparse(story.get('url') or story.get('link') or '').hostname or ''
+    url = urlparse(story['url']).hostname or urlparse(story['link']).hostname or ''
     url = url.replace('www.', '')
 
     return render_template('index.html',
@@ -259,11 +190,9 @@ def static_story(sid):
         url=url,
         description=description,
         robots='noindex',
-        story=story,
-        show_comments=request.path.endswith('/c'),
     )
 
-http_server = WSGIServer(('0.0.0.0', 33842), flask_app)
+http_server = WSGIServer(('', 33842), flask_app)
 
 def feed_thread():
     global news_index, ref_list, current_item

apiserver/utils.py

@@ -12,7 +12,7 @@ def alert_tanner(message):
     try:
         logging.info('Alerting Tanner: ' + message)
         params = dict(qotnews=message)
-        requests.get('https://tbot.tanner.vc/message', params=params, timeout=4)
+        requests.get('https://tbot.tannercollin.com/message', params=params, timeout=4)
     except BaseException as e:
         logging.error('Problem alerting Tanner: ' + str(e))
 

searchserver/.gitignore

@@ -4,4 +4,3 @@
 
 meilisearch-linux-amd64
 data.ms/
-data.ms.old/

webclient/package.json

@@ -4,14 +4,12 @@
   "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

@@ -35,105 +35,29 @@
 				overflow-y: scroll;
 			}
 			body {
-				background: #eeeeee;
+				background: #000;
+			}
+			.nojs {
+				color: white;
+				max-width: 32rem;
 			}
 		</style>
 	</head>
 
 	<body>
-		<div id="root">
+		<div class="nojs">
-			<div class="container menu">
+			<noscript>
-				<p>
+				You need to enable JavaScript to run this app because it's written in React.
-					<a href="/">QotNews</a>
+				I was planning on writing a server-side version, but I've become distracted
-					<br />
+				by other projects -- sorry!
-					<span class="slogan">Hacker News, Reddit, Lobsters, and Tildes articles rendered in reader mode.</span>
+				<br/>
-				</p>
+				I originally wrote this for myself, and of course I whitelist JavaScript on
-			</div>
+				all my own domains.
-			{% if story %}
+				<br/><br/>
-				<div class="{% if show_comments %}container{% else %}article-container{% endif %}">
+				Alternatively, try activex.news.t0.vc for an ActiveX™ version.
-					<div class="article">
+			</noscript>
-						<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 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/Article.js

@@ -3,17 +3,8 @@ import { useParams } from 'react-router-dom';
 import { Helmet } from 'react-helmet';
 import localForage from 'localforage';
 import { sourceLink, infoLine, ToggleDot } from './utils.js';
-import Latex from 'react-latex-next';
-import 'katex/dist/katex.min.css';
 
 const VOID_ELEMENTS = ['area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'link', 'meta', 'param', 'source', 'track', 'wbr'];
-const DANGEROUS_TAGS = ['svg', 'math'];
-
-const latexDelimiters = [
-    { left: '$$', right: '$$', display: true },
-    { left: '\\[', right: '\\]', display: true },
-    { left: '\\(', right: '\\)', display: false }
-];
 
 function Article({ cache }) {
 	const { id } = useParams();
@@ -104,11 +95,6 @@ function Article({ cache }) {
 			}
 
 			if (v.nodeName === '#text') {
-				const text = v.data;
-				if (text.includes('\\[') || text.includes('\\(') || text.includes('$$')) {
-					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>;
@@ -120,10 +106,6 @@ function Article({ cache }) {
 				return null;
 			}
 
-			if (DANGEROUS_TAGS.includes(v.localName)) {
-				return <span key={key} dangerouslySetInnerHTML={{ __html: v.outerHTML }} />;
-			}
-
 			const Tag = v.localName;
 			if (isCodeBlock(v)) {
 				return (
@@ -134,11 +116,6 @@ function Article({ cache }) {
 				);
 			}
 
-			const textContent = v.textContent.trim();
-			const isMath = (textContent.startsWith('\\(') && textContent.endsWith('\\)')) ||
-				(textContent.startsWith('\\[') && textContent.endsWith('\\]')) ||
-				(textContent.startsWith('$$') && textContent.endsWith('$$'));
-
 			const props = { key: key };
 			if (v.hasAttributes()) {
 				for (const attr of v.attributes) {
@@ -147,21 +124,6 @@ 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);
-					}
-				}
-				return <Tag {...props}><Latex delimiters={latexDelimiters}>{mathContent}</Latex></Tag>;
-			}
-
 			if (VOID_ELEMENTS.includes(Tag)) {
 				return <Tag {...props} />;
 			}

webclient/src/Feed.js

@@ -8,19 +8,9 @@ function Feed({ updateCache }) {
 	const [stories, setStories] = useState(() => JSON.parse(localStorage.getItem('stories')) || false);
 	const [error, setError] = useState('');
 	const [loadingStatus, setLoadingStatus] = useState(null);
-	const [filterSmallweb, setFilterSmallweb] = useState(() => localStorage.getItem('filterSmallweb') === 'true');
-
-	const handleFilterChange = e => {
-		const isChecked = e.target.checked;
-		setStories(false);
-		setFilterSmallweb(isChecked);
-		localStorage.setItem('filterSmallweb', isChecked);
-	};
 
 	useEffect(() => {
-		const controller = new AbortController();
+		fetch('/api')
-
-		fetch(filterSmallweb ? '/api?smallweb=true' : '/api', { signal: controller.signal })
 			.then(res => {
 				if (!res.ok) {
 					throw new Error(`Server responded with ${res.status} ${res.statusText}`);
@@ -36,19 +26,21 @@ function Feed({ updateCache }) {
 
 					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 storyFetchController = new AbortController();
+							const controller = new AbortController();
-							const timeoutId = setTimeout(() => storyFetchController.abort(), 10000); // 10-second timeout
+							const timeoutId = setTimeout(() => controller.abort(), 10000); // 10-second timeout
-							const storyRes = await fetch('/api/' + newStory.id, { signal: storyFetchController.signal });
+							const storyRes = await fetch('/api/' + newStory.id, { signal: controller.signal });
 							clearTimeout(timeoutId);
 
 							if (!storyRes.ok) {
@@ -97,17 +89,11 @@ 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]);
 
 	return (
 		<div className='container'>
@@ -115,12 +101,7 @@ function Feed({ updateCache }) {
 				<title>QotNews</title>
 				<meta name="robots" content="index" />
 			</Helmet>
-
+			{loadingStatus && <p>Preloading stories {loadingStatus.current} / {loadingStatus.total}...</p>}
-			<div style={{marginBottom: '1rem'}}>
-				<input type="checkbox" id="filter-smallweb" className="checkbox" checked={filterSmallweb} onChange={handleFilterChange} />
-				<label htmlFor="filter-smallweb">Only Smallweb</label>
-			</div>
-
 			{error &&
 				<details style={{marginBottom: '1rem'}}>
 					<summary>Connection error? Click to expand.</summary>
@@ -128,7 +109,6 @@ function Feed({ updateCache }) {
 					{stories && <p>Loaded feed from cache.</p>}
 				</details>
 			}
-
 			{stories ?
 				<div>
 					{stories.map(x =>
@@ -150,8 +130,6 @@ function Feed({ updateCache }) {
 			:
 				<p>Loading...</p>
 			}
-
-			{loadingStatus && <p>Preloading stories {loadingStatus.current} / {loadingStatus.total}...</p>}
 		</div>
 	);
 }

webclient/src/Results.js

@@ -1,7 +1,6 @@
 import React, { useState, useEffect } from 'react';
-import { Link, useLocation, useHistory } from 'react-router-dom';
+import { Link, useLocation } from 'react-router-dom';
 import { Helmet } from 'react-helmet';
-import queryString from 'query-string';
 import { sourceLink, infoLine, logos } from './utils.js';
 import AbortController from 'abort-controller';
 
@@ -9,19 +8,6 @@ function Results() {
 	const [stories, setStories] = useState(false);
 	const [error, setError] = useState(false);
 	const location = useLocation();
-	const history = useHistory();
-
-	const handleFilterChange = e => {
-		const isChecked = e.target.checked;
-
-		const currentQuery = queryString.parse(location.search);
-		if (isChecked) {
-			currentQuery.article = 'true';
-		} else {
-			delete currentQuery.article;
-		}
-		history.push('/search?' + queryString.stringify(currentQuery));
-	};
 
 	useEffect(() => {
 		const controller = new AbortController();
@@ -46,19 +32,11 @@ function Results() {
 		};
 	}, [location.search]);
 
-	const searchInArticle = queryString.parse(location.search).article === 'true';
-
 	return (
 		<div className='container'>
 			<Helmet>
 				<title>Search Results | QotNews</title>
 			</Helmet>
-
-			<div style={{marginBottom: '1rem'}}>
-				<input type="checkbox" id="search-in-article" className="checkbox" checked={searchInArticle} onChange={handleFilterChange} />
-				<label htmlFor="search-in-article">Search in article</label>
-			</div>
-
 			{error && <p>Connection error?</p>}
 			{stories ?
 				<>
@@ -78,10 +56,6 @@ function Results() {
 									</div>
 
 									{infoLine(x)}
-
-									{!!x?._formatted &&
-										<p>{x._formatted.text.replace(/\n/g, ' ')}</p>
-									}
 								</div>
 							)
 						:

webclient/src/Search.js

@@ -15,9 +15,7 @@ function Search() {
 		const newSearch = event.target.value;
 		setSearch(newSearch);
 		if (newSearch.length >= 3) {
-			const currentQuery = queryString.parse(location.search);
+			const searchQuery = queryString.stringify({ 'q': newSearch });
-			currentQuery.q = newSearch;
-			const searchQuery = queryString.stringify(currentQuery);
 			history.replace('/search?' + searchQuery);
 		} else {
 			history.replace('/');
@@ -26,9 +24,7 @@ function Search() {
 
 	const searchAgain = (event) => {
 		event.preventDefault();
-		const currentQuery = queryString.parse(location.search);
+		const searchString = queryString.stringify({ 'q': event.target[0].value });
-		currentQuery.q = event.target[0].value;
-		const searchString = queryString.stringify(currentQuery);
 		history.push('/search?' + searchString);
 		inputRef.current.blur();
 	}

webclient/src/Style-black.css

@@ -11,8 +11,7 @@
 	border: 1px solid #828282;
 }
 
-.black .menu button,
+.black button {
-.black .story-text button {
 	background-color: #444444;
 	border-color: #bbb;
 	color: #ddd;
@@ -67,11 +66,3 @@
 .black .comment.lined {
 	border-left: 1px solid #444444;
 }
-
-.black .checkbox:checked + label::after {
-	border-color: #ddd;
-}
-
-.black .copy-button {
-	color: #828282;
-}

webclient/src/Style-dark.css

@@ -11,8 +11,7 @@
 	border: 1px solid #828282;
 }
 
-.dark .menu button,
+.dark button {
-.dark .story-text button {
 	background-color: #444444;
 	border-color: #bbb;
 	color: #ddd;
@@ -63,11 +62,3 @@
 .dark .comment.lined {
 	border-left: 1px solid #444444;
 }
-
-.dark .checkbox:checked + label::after {
-	border-color: #ddd;
-}
-
-.dark .copy-button {
-	color: #828282;
-}

webclient/src/Style-light.css

@@ -189,13 +189,6 @@ span.source {
 
 .comments {
 	margin-left: -1.25rem;
-	margin-top: 0;
-	margin-bottom: 0;
-	padding: 0;
-}
-
-.comments dl, .comments dd {
-	margin: 0;
 }
 
 .comment {
@@ -312,50 +305,8 @@ 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: solid #000;
-	border-width: 0 2px 2px 0;
-	transform: rotate(45deg);
-}

webclient/src/Style-red.css

@@ -20,8 +20,7 @@
 	background-color: #690000;
 }
 
-.red .menu button,
+.red button {
-.red .story-text button {
 	background-color: #440000;
 	border-color: #b00;
 	color: #b00;
@@ -81,15 +80,3 @@
 .red .dot {
 	background-color: #440000;
 }
-
-.red .checkbox + label::before {
-	border: 1px solid #690000;
-}
-
-.red .checkbox:checked + label::after {
-	border-color: #aa0000;
-}
-
-.red .copy-button {
-	color: #690000;
-}

webclient/yarn.lock

@@ -3169,11 +3169,6 @@ commander@^2.11.0, commander@^2.20.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
-commander@^8.3.0:
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
-  integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
-
 commander@~2.19.0:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
@@ -6861,13 +6856,6 @@ jsx-ast-utils@^2.1.0, jsx-ast-utils@^2.2.1:
     array-includes "^3.1.1"
     object.assign "^4.1.0"
 
-katex@^0.16.0, katex@^0.16.25:
-  version "0.16.25"
-  resolved "https://registry.yarnpkg.com/katex/-/katex-0.16.25.tgz#61699984277e3bdb3e89e0e446b83cd0a57d87db"
-  integrity sha512-woHRUZ/iF23GBP1dkDQMh1QBad9dmr8/PAwNA54VrSOVYgI12MAcE14TqnDdQOdzyEonGzMepYnqBMYdsoAr8Q==
-  dependencies:
-    commander "^8.3.0"
-
 killable@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
@@ -9131,13 +9119,6 @@ react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.4:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
-react-latex-next@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/react-latex-next/-/react-latex-next-3.0.0.tgz#3e347a13b1e701439b5fa52f75201bc86166854e"
-  integrity sha512-x70f1b1G7TronVigsRgKHKYYVUNfZk/3bciFyYX1lYLQH2y3/TXku3+5Vap8MDbJhtopePSYBsYWS6jhzIdz+g==
-  dependencies:
-    katex "^0.16.0"
-
 react-router-dom@^5.0.1:
   version "5.3.4"
   resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.3.4.tgz#2ed62ffd88cae6db134445f4a0c0ae8b91d2e5e6"