From d3878aa55352a921db75aeb26d21591d939f6558 Mon Sep 17 00:00:00 2001
From: gravel <qsj4di+aybgdjbxur7e8@sharklasers.com>
Date: Fri, 27 Jan 2023 15:11:51 +0100
Subject: [PATCH 01/25] Add table sort indicators

---
 output/js/constants.js                | 39 ++++++++++++---------
 output/main.js                        | 29 +++++++++-------
 output/styles2.css                    | 50 +++++++++++++++++++++++++--
 sites/+components/tbl_communities.php |  5 +--
 4 files changed, 91 insertions(+), 32 deletions(-)

diff --git a/output/js/constants.js b/output/js/constants.js
index 3002622..071f42d 100644
--- a/output/js/constants.js
+++ b/output/js/constants.js
@@ -33,7 +33,7 @@ export const ATTRIBUTES = {
 		ACTIVE: 'data-sort',
 		ASCENDING: 'data-sort-asc',
 		COLUMN: 'data-sorted-by',
-		COLUMN_LITERAL: 'sorted-by'
+		// COLUMN_LITERAL: 'sorted-by'
 	}
 };
 
@@ -41,7 +41,14 @@ export function columnAscendingByDefault(column) {
 	return column != COLUMN.USERS;
 }
 
-export function columnIsSortable(column) { return column != COLUMN.QR_CODE; }
+export function columnIsSortable(column) {
+	return ![
+		COLUMN.QR_CODE,
+		COLUMN.PREVIEW,
+		// Join URL contents are not guaranteed to have visible text.
+		COLUMN.JOIN_URL
+	].includes(column);
+}
 
 export function columnNeedsCasefold(column) {
 	return [
@@ -64,22 +71,22 @@ export function columnIsNumeric(column) {
  * @returns {HTMLElement}
  */
 function createElement(tag, ...args) {
-  const element = document.createElement(tag);
-  if (args.length === 0) return element;
-  const propsCandidate = args[0];
-  if (typeof propsCandidate !== "string" && !(propsCandidate instanceof Element)) {
-    // args[0] is not child element or text node
-    // must be props object
-    Object.assign(element, propsCandidate);
-    args.shift();
-  }
-  element.append(...args);
-  return element;
+	const element = document.createElement(tag);
+	if (args.length === 0) return element;
+	const propsCandidate = args[0];
+	if (typeof propsCandidate !== "string" && !(propsCandidate instanceof Element)) {
+		// args[0] is not child element or text node
+		// must be props object
+		Object.assign(element, propsCandidate);
+		args.shift();
+	}
+	element.append(...args);
+	return element;
 }
 
 export const element = new Proxy({}, {
-  get(_, key) {
-    return (...args) => createElement(key, ...args)
-  }
+	get(_, key) {
+		return (...args) => createElement(key, ...args)
+	}
 });
 
diff --git a/output/main.js b/output/main.js
index 0bc0bdb..2aba288 100644
--- a/output/main.js
+++ b/output/main.js
@@ -51,11 +51,11 @@ const filteredCommunities = {
 // This can be achieved with `text-overflow: ellipsis` instead
 // and generated entirely server-side.
 const transformJoinURL = (join_link) => {
-  return element.button({
-    textContent: "Copy",
-    className: "copy_button",
-    onclick: () => copyToClipboard(join_link)
-  });
+	return element.button({
+		textContent: "Copy",
+		className: "copy_button",
+		onclick: () => copyToClipboard(join_link)
+	});
 }
 
 function onLoad(timestamp) {
@@ -101,7 +101,7 @@ function hideBadCommunities() {
  * Removes an element by its ID and returns the number of elements removed.
  */
 function hideElementByID(id) {
-  const element = document.getElementById(id);
+	const element = document.getElementById(id);
 	element?.remove();
 	return element ? 1 : 0;
 }
@@ -245,17 +245,22 @@ function setSortState(table, { ascending, column }) {
 	}
 	table.setAttribute(ATTRIBUTES.SORTING.ASCENDING, ascending);
 	table.setAttribute(ATTRIBUTES.SORTING.COLUMN, column);
-	// This can be used to style column headers in a consistent way, i.e.
-	// #tbl_communities[data-sort-asc=true][sorted-by=name]::after #th_name, ...
-	table.setAttribute(ATTRIBUTES.SORTING.COLUMN_LITERAL, COLUMN_LITERAL[column]);
+	
+	// No way around this for brief CSS.
+	const headers = table.querySelectorAll("th");
+	headers.forEach((th, colno) => {
+		th.removeAttribute(ATTRIBUTES.SORTING.ACTIVE);
+	});
+	headers[column].setAttribute(ATTRIBUTES.SORTING.ACTIVE, true);
 }
 
 // This is best done in JS, as it would require <noscript> styles otherwise.
 function markSortableColumns() {
 	const table = dom.tbl_communities();
-	for (const th of table.querySelectorAll('th')) {
-		if (th.id.includes("qr_code")) continue;
-		th.classList.add('sortable');
+	const header_cells = table.querySelectorAll('th');
+	for (let colno = 0; colno < header_cells.length; colno++) {
+	  if (!columnIsSortable(colno)) continue;
+		header_cells[colno].classList.add('sortable');
 	}
 }
 
diff --git a/output/styles2.css b/output/styles2.css
index 432dfee..c6d1846 100644
--- a/output/styles2.css
+++ b/output/styles2.css
@@ -23,12 +23,57 @@ header {
 	flex-grow: 1;
 }
 
-#tbl_communities { width:100%; }
+#tbl_communities {
+	/* Browser defaults. */
+	--cell-padding-h: 1px;
+	--cell-padding-v: 1px;
+	width:100%;
+}
+
+#tbl_communities th {
+	white-space: nowrap;
+}
+
+#tbl_communities :is(th, td) {
+	padding: var(--cell-padding-v) var(--cell-padding-h);
+}
+
+#tbl_communities th.sortable {
+	position: relative;
+	padding-right: calc( 1.5em + var(--cell-padding-h) );
+}
+
+#tbl_communities th.sortable::after {
+	position: absolute;
+	right: 0.25em;
+	top: 50%;
+	transform: translateY(-50%);
+	/* content: "\25C7"; */ /* White diamond */
+	/* content: "\2195"; */ /* Up-down arrow */
+	/* content: "\25A1"; */ /* White square */
+	/* content: "\25B8"; */ /* Small right pointing triangle */
+	content: "\2B25"; /* Black medium diamond */
+	color: grey;
+}
+
+#tbl_communities[data-sort-asc=true] th[data-sort=true]::after {
+	content: "\25B2"; /* Black up pointing triangle */
+	color: initial;
+}
+
+#tbl_communities[data-sort-asc=false] th[data-sort=true]::after {
+	content: "\25BC"; /* Black up pointing triangle */
+	color: initial;
+}
 
 /* Hide the identifier column before removal. */
 #th_identifier { display: none; }
 .td_identifier { display: none; font-family: monospace; }
 
+.td_language {
+	text-align: center;
+	font-size: 1.25em;
+}
 .td_language:empty::after {
 	content: "\2753";
 }
@@ -70,7 +115,7 @@ header {
 	display: flex;
 	flex-direction: row;
 	align-items: center;
-	justify-content: space-between;
+	justify-content: space-around;
 }
 
 .copy_button     { font-size: inherit }
@@ -209,3 +254,4 @@ footer nav a {
 	to {bottom: 0; opacity: 0;}
 }
 
+
diff --git a/sites/+components/tbl_communities.php b/sites/+components/tbl_communities.php
index 9292b15..547f2e5 100644
--- a/sites/+components/tbl_communities.php
+++ b/sites/+components/tbl_communities.php
@@ -3,14 +3,15 @@
 
 	// Once handlers are attached in JS, this check ceases to be useful.
 	function column_sortable($id) {
-		return $id != "qr";
+		// Join URL contents are not guaranteed to have visible text.
+		return $id != "qr" && $id != "preview" && $id != "join_url";
 	}
 	
 	function sort_onclick($colno) {
 		global $TABLE_COLUMNS;
 		$column = $TABLE_COLUMNS[$colno];
 		if (!column_sortable($column['id'])) return "";
-		return " onclick='sortTable($colno)'";
+		return " onclick='sortTable($colno)' title='Click to sort this column'";
 	}
 	
 	$TABLE_COLUMNS = [

From d43e5979067bb91b07cac98581b33d2a1014ef32 Mon Sep 17 00:00:00 2001
From: gravel <qsj4di+aybgdjbxur7e8@sharklasers.com>
Date: Sat, 4 Mar 2023 13:18:23 +0100
Subject: [PATCH 02/25] Add failsafe for locating project root

---
 php/getenv.php | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/php/getenv.php b/php/getenv.php
index baec93d..fd20799 100644
--- a/php/getenv.php
+++ b/php/getenv.php
@@ -1,12 +1,23 @@
 <?php
 	$PROJECT_ROOT = dirname(__FILE__);
 	
-	while (!file_exists("$PROJECT_ROOT/.phpenv")) {
-		if ($PROJECT_ROOT == "/" || $PROJECT_ROOT == "") 
-			throw new RuntimeException("Could not find .phpenv file.");
-		$PROJECT_ROOT = dirname($PROJECT_ROOT);
-	}
-	
+	(function(){
+		global $PROJECT_ROOT;
+
+		$root_previous = "";
+
+		while (!file_exists("$PROJECT_ROOT/.phpenv")) {
+			if (
+				$PROJECT_ROOT == "/" ||
+				$PROJECT_ROOT == "" ||
+				$PROJECT_ROOT == $root_previous
+			) 
+				throw new RuntimeException("Could not find .phpenv file.");
+			$root_previous = $PROJECT_ROOT;
+			$PROJECT_ROOT = dirname($PROJECT_ROOT);
+		}
+	})();
+
 	require_once "$PROJECT_ROOT/.phpenv";
 	
 	// set_include_path(get_include_path() . PATH_SEPARATOR . $PROJECT_ROOT);

From a01202247453dd14a2a8d9e9f9da374aa7bce6d7 Mon Sep 17 00:00:00 2001
From: gravel <qsj4di+aybgdjbxur7e8@sharklasers.com>
Date: Sat, 4 Mar 2023 13:48:47 +0100
Subject: [PATCH 03/25] Add toggle to show room identifier

---
 output/styles2.css | 31 +++++++++++++++++++++++++++----
 sites/index.php    |  8 +++++++-
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/output/styles2.css b/output/styles2.css
index 432dfee..bf4613d 100644
--- a/output/styles2.css
+++ b/output/styles2.css
@@ -2,10 +2,19 @@ html {
 	font-size: clamp(10px, 2vw, 18px);
 }
 
-html.js .noscript {
+html.js .noscript, .hidden {
 	display: none;
 }
 
+.clickable {
+	cursor: pointer;
+}
+
+.anchorstyle {
+	color: rgb(0, 102, 204);
+	text-decoration: underline;
+}
+
 /* Dead style */
 html:not(.js) .js-only {
 	display: none;
@@ -25,9 +34,14 @@ header {
 
 #tbl_communities { width:100%; }
 
-/* Hide the identifier column before removal. */
-#th_identifier { display: none; }
-.td_identifier { display: none; font-family: monospace; }
+#toggle-show-room-ids:not(:checked) 
+~ #tbl_communities :is(#th_identifier, .td_identifier) { 
+	display: none;
+}
+
+.td_identifier {
+	font-family: monospace;
+}
 
 .td_language:empty::after {
 	content: "\2753";
@@ -95,6 +109,15 @@ footer nav a {
 	white-space: nowrap;
 }
 
+label[for=toggle-show-room-ids]::after {
+	content: " (Off)"
+}
+
+#toggle-show-room-ids:checked
+~ footer label[for=toggle-show-room-ids]::after {
+	content: " (On)"
+}
+
 /* <Colors> */
 :root {
 	/*--session-classic-dark-green:      #31f196;*/
diff --git a/sites/index.php b/sites/index.php
index a994ceb..8d51d44 100644
--- a/sites/index.php
+++ b/sites/index.php
@@ -31,6 +31,8 @@
 			<h1 id="headline">Session Communities</h1>
 		<?php include "+components/qr_modals.php" ?>
 
+		<input type="checkbox" id="toggle-show-room-ids" class="hidden">
+
 		<?php include "+components/tbl_communities.php" ?>
 
 		<hr>
@@ -62,6 +64,11 @@
 				However, some interactive features are
 				only available with JS enabled.
 			</p>
+			<p>
+				<label for="toggle-show-room-ids" class="clickable anchorstyle">
+					Toggle room identifier display
+				</label>
+			</p>
 			<nav>
 				<a
 					href="https://lokilocker.com/Mods/Session-Groups/wiki/Session-Closed-Groups"
@@ -89,7 +96,6 @@
 				>Source Code & Contact</a>
 			</nav>
 		</footer>
-
 		<div id="copy-snackbar">
 			Copied URL to clipboard. Paste into Session app to join
 		</div>

From a1156ac04af155842ecf941682cce23898edbfb1 Mon Sep 17 00:00:00 2001
From: gravel <qsj4di+aybgdjbxur7e8@sharklasers.com>
Date: Sat, 4 Mar 2023 15:17:45 +0100
Subject: [PATCH 04/25] Update README.md

---
 README.md | 70 ++++++++++++++++++++++++++-----------------------------
 1 file changed, 33 insertions(+), 37 deletions(-)

diff --git a/README.md b/README.md
index eebc2cf..0cab54f 100644
--- a/README.md
+++ b/README.md
@@ -2,17 +2,17 @@
 
 ## What does this site do?
 
-This script crawls known sources of published Session Communities, 
-queries their servers for available information and 
-displays this information as a static HTML page.  
+This script crawls known sources of published Session Communities,
+queries their servers for available information and
+displays this information as a static HTML page.
 The results of this can be viewed on https://sessioncommunities.online/.
 
 
 ## What is Session?
 
-Session is a private messaging app that protects your meta-data, 
-encrypts your communications, and makes sure your messaging activities 
-leave no digital trail behind.  
+Session is a private messaging app that protects your meta-data,
+encrypts your communications, and makes sure your messaging activities
+leave no digital trail behind.
 https://getsession.org/
 
 
@@ -22,58 +22,54 @@ https://getsession.org/
 
 Currently this script crawls the following sites:
 
-- https://github.com/GNU-Linux-libre/Awesome-Session-Group-List
-- https://lokilocker.com/Mods/Session-Groups/wiki/Session-Open-Groups
-- https://session.directory/
+- <https://github.com/GNU-Linux-libre/Awesome-Session-Group-List>
+- <https://lokilocker.com/Mods/Session-Groups/wiki/Session-Open-Groups>
+- <https://session.directory/>
 
-Additionally, the following open community servers are polled:
+Additionally, a few other servers are hardcoded, see [querying logic](php/fetch-servers.php).
 
-- https://open.getsession.org
-- http://13.233.251.36:8081
+### How does this work?
 
-### Steps
+The [`update-listing.php`](php/update-listing.php) script invokes the following two PHP scripts: [`fetch-servers.php`](php/fetch-servers.php) to query available servers, and [`generate-html.php`](php/generate-html.php>) to generate the static HTML.
+
+The querying logic consists of these steps:
 
 1. Fetching source HTML: `get_html_from_known_sources()`
 1. Extracting Session invites from the HTML:
 `extract_join_links_from_html()` and `get_servers_from_join_links()`
 1. Making sure servers are online: `reduce_servers()`
-1. Querying the servers for all available rooms 
-and normalize active user numbers: `query_servers_for_rooms()`
-1. De-duplicating servers based on public keys: 
+1. Querying the servers for all available rooms
+and normalizing active user numbers: `query_servers_for_rooms()`
+1. De-duplicating servers based on public keys:
 `get_pubkeys_of_servers()` and `reduce_addresses_of_pubkeys()`
 1. Aggregating all server info & adding language data: `generate_info_arrays()`
-1. Generating static HTML content: `generateHTML()`
-
-### Legacy support
 
-Right now we fully support legacy SOGS servers, 
-although this support is likely going to be dropped soon, 
-since those servers can not even be joined anymore with current Session clients.  
-Dropping legacy support will also increase maintainability.
+Static HTML is generated from the [`sites`](sites) directory to the [`output`](output) directory, which additionally contains static assets. All contents of `sites` are invoked to produce a HTML page unless they are prefixed with a `+` sign.
 
 ### Work around bad routing to Chinese servers
 
-Depending on your location, it is possible for you to get really bad routing to 
-SOGS servers behind the GFW. In this case, 
-the initial connection is still successful, but you'll never receive 
-any actual content and the retrieval attempt will simply time out. 
+Depending on your location, it is possible for you to get really bad routing to
+SOGS servers behind the [GFW](https://en.wikipedia.org/wiki/Great_Firewall). In this case,
+the initial connection is still successful, but you'll never receive
+any actual content and the retrieval attempt will simply time out.
 This happens randomly. To make sure this won't affect the results, we simply
-check whether the server is online (the initial connection being successful), 
-and then retry a lot of times with a short timeout 
-until we eventually get the content.  
+check whether the server is online (the initial connection being successful),
+and then retry a lot of times with a short timeout
+until we eventually get the content.
 The details can be seen in `curl_get_contents()`.
 
 ### Official repositories
-- https://github.com/mdPlusPlus/sessioncommunities.online
-- https://lokilocker.com/SomeGuy/sessioncommunities.online
 
-If your favourite Session community is missing a language flag, 
+- GitHub: <https://github.com/mdPlusPlus/sessioncommunities.online>
+- Lokinet Gitea: <https://lokilocker.com/SomeGuy/sessioncommunities.online>
+
+If your favourite Session community is missing a language flag,
 you can issue a pull request here:
-- https://github.com/mdPlusPlus/sessioncommunities.online-languages/
 
+- <https://github.com/mdPlusPlus/sessioncommunities.online-languages/>
 
 ## Contact
 
-If you want to contact me, you can add me on Session via my 
-[ONS](https://docs.oxen.io/using-the-oxen-blockchain/using-oxen-name-system): 
-"someguy" (without the quotes)
+If you want to contact me, you can add me on Session via my
+[ONS](https://docs.oxen.io/using-the-oxen-blockchain/using-oxen-name-system):
+`someguy`.

From 3e1895c32d7947d65d5b67ec0747d7c330fe64d0 Mon Sep 17 00:00:00 2001
From: gravel <qsj4di+aybgdjbxur7e8@sharklasers.com>
Date: Sat, 4 Mar 2023 15:18:00 +0100
Subject: [PATCH 05/25] Add CONTRIBUTING.md

---
 CONTRIBUTING.md | 65 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..1cb5dc1
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,65 @@
+# Contribution guidelines
+
+## Development environment
+
+### Prerequisites
+
+- PHP (version TBD)
+- `make`
+- `entr` to watch for file changes
+- `xdg-open` link handler to invoke browser
+- patience
+
+### Cloning or updating the repository
+
+Ensure the consistency of the `languages` submodule by using the following options:
+
+- `git clone --recurse-submodules <repository-url>`
+- `git pull --recurse-submodules`
+
+### Development
+
+Run at least once: `make fetch` to query servers. This can take around 5 minutes.
+
+Run when developing: `make dev` to watch for changes & serve HTML locally in browser.
+Does not respond to new files.
+
+See [`Makefile`](Makefile) for more details.
+
+### Running your own copy
+
+- point your webserver at the `output` folder
+- install systemd services from the `systemd` folder or an equivalent timer
+- `session_sudoers`: TBD
+
+## Code style guidelines
+
+### General
+
+**Indentation**: Tabs (4-wide)
+
+**Filename seperator**: Hyphen (`-`)
+
+### PHP
+
+**Identifier casing**: `snake_case` and `CONSTANT_CASE`
+
+**Comments and documentation**: TBD
+
+### HTML & CSS
+
+**Identifier casing**: `kebab-case`, occasional `snake_case`
+
+**Comments and documentation**: TBD
+
+### JavaScript
+
+**Identifier casing**: `camelCase` and `CONSTANT_CASE`, occasional `snake_case`
+
+**Comments and documentation**: [JSDoc](https://jsdoc.app/)
+
+## Contact
+
+- Web Development Session Community on [caliban.org](https://sog.caliban.org/)
+- Project lead, querying logic, deployment, community filtering: `someguy` on Session
+- Documentation, code quality, HTML generation, CSS, JS: `gravel` on Session

From 2750764c7cd6d068f27df05e8629de97e87a51f7 Mon Sep 17 00:00:00 2001
From: gravel <qsj4di+aybgdjbxur7e8@sharklasers.com>
Date: Sat, 4 Mar 2023 15:21:01 +0100
Subject: [PATCH 06/25] Hotfix unknown identifier in truncate()

---
 php/utils/server-utils.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php/utils/server-utils.php b/php/utils/server-utils.php
index 72dd56a..5caa392 100644
--- a/php/utils/server-utils.php
+++ b/php/utils/server-utils.php
@@ -21,7 +21,7 @@
 	function truncate($url, $len) {
 		return (strlen($url) > $len + 3)
 			? substr($url, 0, $len).'...'
-			: $string;
+			: $url;
 	}
 	
 	/*

From 6c692fb4ee136b52a86e397d2737902550b38f02 Mon Sep 17 00:00:00 2001
From: mdPlusPlus <mdPlusPlus@users.noreply.github.com>
Date: Sat, 4 Mar 2023 15:46:31 +0100
Subject: [PATCH 07/25] Modify $known_servers

---
 output/main.js        | 1 -
 php/fetch-servers.php | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/output/main.js b/output/main.js
index f6a341a..8865a5a 100644
--- a/output/main.js
+++ b/output/main.js
@@ -25,7 +25,6 @@ const filteredCommunities = {
 	tests: [
 		"2e9345+c7fb",  // TestRoom
 		"762ba9+c7fb",  // TesterRoom
-		"appletonv2+4264", // -
 		"b4d829+c7fb",  // Test
 		"e5853a+c7fb",  // testtest
 		"fishing+8e2e", // Example group from PySOGS documentation
diff --git a/php/fetch-servers.php b/php/fetch-servers.php
index 7e79727..56d2693 100644
--- a/php/fetch-servers.php
+++ b/php/fetch-servers.php
@@ -30,11 +30,11 @@
 		// "http://13.233.251.36:8081", // found via shodan.io, but now offline
 		"http://164.92.176.135", // found via shodan.io
 		"http://176.119.147.102", // found via shodan.io
-		"http://192.227.193.159", // found via shodan.io
+		// "http://192.227.193.159", // found via shodan.io, removed out of decency
 		"http://60a9fc9.online-server.cloud", // found via shodan.io
 		"http://93.95.230.10", // found via shodan.io
 		"http://94.176.239.60", // found via shodan.io
-		"http://bitcoincash.tokyo", // found via shodan.io
+		// "http://bitcoincash.tokyo", // found via shodan.io, removed by request
 		"http://captain.geekgalaxy.com", // found via shodan.io
 		"http://session.hwreload.it", // found via shodan.io
 		"http://sogs.k9net.org", // found via shodan.io

From 36278181baec36fa771fc58621a8e9b09883a246 Mon Sep 17 00:00:00 2001
From: gravel <qsj4di+aybgdjbxur7e8@sharklasers.com>
Date: Sat, 4 Mar 2023 21:49:18 +0100
Subject: [PATCH 08/25] Add basic 'Server' column

---
 output/js/constants.js                | 28 ++++++++++++++++-----------
 output/main.js                        | 16 +++------------
 output/styles2.css                    | 21 ++++++++++++++++++++
 sites/+components/tbl_communities.php | 25 ++++++++++++++++++++++++
 4 files changed, 66 insertions(+), 24 deletions(-)

diff --git a/output/js/constants.js b/output/js/constants.js
index 8fe3d67..6cf876f 100644
--- a/output/js/constants.js
+++ b/output/js/constants.js
@@ -14,7 +14,7 @@ export const dom = {
 export const COLUMN = {
 	IDENTIFIER:   0,  LANGUAGE:     1,  NAME:         2,
 	DESCRIPTION:  3,  USERS:        4,  PREVIEW:      5,
-	QR_CODE:      6,  JOIN_URL:     7
+	QR_CODE:      6,  SERVER_ICON:  7,  JOIN_URL:     8
 };
 
 // Reverse enum.
@@ -43,18 +43,24 @@ export function columnAscendingByDefault(column) {
 
 export function columnIsSortable(column) { return column != COLUMN.QR_CODE; }
 
-export function columnNeedsCasefold(column) {
-	return [
-		COLUMN.IDENTIFIER,
-		COLUMN.NAME,
-		COLUMN.DESCRIPTION
-	].includes(column);
+/**
+ * @type {Record<string, (el: HTMLTableCellElement) => any>}
+ */
+const TRANSFORMATION = {
+	numeric: (el) => parseInt(el.innerText),
+	casefold: (el) => el.innerText.toLowerCase().trim(),
+	tokenData: (el) => el.getAttribute("data-token")
 }
 
-export function columnIsNumeric(column) {
-	return [
-		COLUMN.USERS
-	].includes(column);
+/**
+ * @type {Dictionary<number, (el: HTMLTableCellElement) => any>}
+ */
+export const COLUMN_TRANSFORMATION = {
+	[COLUMN.USERS]: TRANSFORMATION.numeric,
+	[COLUMN.IDENTIFIER]: TRANSFORMATION.casefold,
+	[COLUMN.NAME]: TRANSFORMATION.casefold,
+	[COLUMN.DESCRIPTION]: TRANSFORMATION.casefold,
+	[COLUMN.SERVER_ICON]: TRANSFORMATION.tokenData
 }
 
 /**
diff --git a/output/main.js b/output/main.js
index f6a341a..f41cacb 100644
--- a/output/main.js
+++ b/output/main.js
@@ -16,8 +16,7 @@
 // Import magic numbers and data
 import {
 	dom, COLUMN, COLUMN_LITERAL, COMPARISON, ATTRIBUTES,
-	columnAscendingByDefault, columnIsSortable, columnNeedsCasefold,
-	columnIsNumeric, element
+	columnAscendingByDefault, columnIsSortable, COLUMN_TRANSFORMATION, element
 } from './js/constants.js';
 
 // Hidden communities for transparency.
@@ -193,21 +192,12 @@ function makeRowComparer(column, ascending) {
 	}
 
 	// Callback to obtain sortable content from cell text.
-	let contentToSortable = (text) => text.trim();
-
-	if (columnNeedsCasefold(column)) {
-		// Make certain columns sort regardless of casing.
-		contentToSortable = (text) => text.toLowerCase().trim();
-	}
-	else if (columnIsNumeric(column)) {
-		// Make certain columns sort on parsed numeric value instead of text.
-		contentToSortable = (text) => parseInt(text);
-	}
+	const columnToSortable = COLUMN_TRANSFORMATION[column] ?? ((el) => el.innerText.trim());
 
 	// Construct comparer using derived property to determine sort order.
 	const rowComparer = compareProp(
 		ascending ? compareAscending : compareDescending,
-		row => contentToSortable(row.children[column].innerText)
+		row => columnToSortable(row.children[column])
 	);
 
 	return rowComparer;
diff --git a/output/styles2.css b/output/styles2.css
index 432dfee..f04fcb5 100644
--- a/output/styles2.css
+++ b/output/styles2.css
@@ -45,6 +45,27 @@ header {
 
 .td_users        { text-align: right; }
 .td_preview      { text-align: center; }
+.td_server_icon { text-align: center; }
+
+.td_server_icon-circle {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 2em;
+	height: 2em;
+	border-radius: 2em;
+	font-family: sans-serif;
+	margin: 0 auto;
+	color: white;
+	text-shadow: 0 0 0.5em #000;
+	box-shadow: 0 0 0.05em #777;
+}
+
+.td_server_icon-circle span {
+	position: relative;
+	top: 0.05em;
+}
+
 .td_join_url     {
 	font-family: monospace;
 	white-space: nowrap;
diff --git a/sites/+components/tbl_communities.php b/sites/+components/tbl_communities.php
index dbb5325..09d0f40 100644
--- a/sites/+components/tbl_communities.php
+++ b/sites/+components/tbl_communities.php
@@ -21,6 +21,7 @@
 		['id' => "users", 'name' => "Users"],
 		['id' => "preview", 'name' => "Preview"],
 		['id' => "qr", 'name' => "QR"],
+		['id' => "server_icon", 'name' => "Server"],
 		['id' => "join_url", 'name' => "Join URL"],
 	];
 ?>
@@ -35,6 +36,22 @@
 <?php endforeach; ?>
 	</tr>
 <?php foreach ($rooms as $id => $room): ?>
+	<?php
+		// Get the server public key.
+
+		// FIXME:
+		// ! This is bad practice.
+		// However, the fetching code hides component data
+		// and this is a low risk use case.
+
+		$token = explode("=", $room->join_link)[1];
+		$icon_hue = hexdec($token[2] . $token[2]);
+		$icon_color = "hsl($icon_hue, 80%, 50%)";
+
+		$hostname = explode("//", $room->join_link)[1];
+		$hostname = explode("/", $hostname)[0];
+	?>
+
 	<tr id="<?=$id?>">
 		<td class="td_identifier"><?=$id?></td>
 		<td class="td_language"><?=$room->language?></td>
@@ -60,6 +77,14 @@
 				alt="Pictogram of a QR code"
 			>
 		</td>
+		<td class="td_server_icon" 
+			data-token="<?=$token?>"
+			title="<?=$hostname?> (<?=$token?>)"
+		>
+			<div class="td_server_icon-circle" style="background-color: <?=$icon_color?>">
+				<span><?=strtoupper($token[0] . $token[1])?></span>
+			</div>
+		</td>
 		<td class="td_join_url">
 			<div class="join_url_container" data-url="<?=$room->join_link?>">
 				<a class="join_url show-from-w5" title="<?=$room->join_link?>"

From 6805fe48b8e7aba2460a88b5f54f4a924428a66a Mon Sep 17 00:00:00 2001
From: mdPlusPlus <mdPlusPlus@users.noreply.github.com>
Date: Wed, 8 Mar 2023 15:32:11 +0100
Subject: [PATCH 09/25] Modify $known_servers

---
 php/fetch-servers.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php/fetch-servers.php b/php/fetch-servers.php
index 56d2693..22560d1 100644
--- a/php/fetch-servers.php
+++ b/php/fetch-servers.php
@@ -26,7 +26,7 @@
 	 * Ideally this shouldn't be necessary, but it is for now
 	 */
 	$known_servers = array(
-		"http://116.203.51.179", // (?) KeeJef
+		// "http://116.203.51.179", // removed by request
 		// "http://13.233.251.36:8081", // found via shodan.io, but now offline
 		"http://164.92.176.135", // found via shodan.io
 		"http://176.119.147.102", // found via shodan.io

From 231e0b60258f129f41470f6c46d7bfda7b1e2823 Mon Sep 17 00:00:00 2001
From: mdPlusPlus <mdPlusPlus@users.noreply.github.com>
Date: Wed, 8 Mar 2023 15:50:28 +0100
Subject: [PATCH 10/25] Update language submodule

---
 languages | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages b/languages
index 524ad98..4bb4aa4 160000
--- a/languages
+++ b/languages
@@ -1 +1 @@
-Subproject commit 524ad983610b096ed09e721c20cba011dfbc7992
+Subproject commit 4bb4aa46d06b8f7ead42f8c8f9a33f21ba5e49ef

From bc85cc2071c1a575a93d686f2d30e18e52bb614c Mon Sep 17 00:00:00 2001
From: mdPlusPlus <mdPlusPlus@users.noreply.github.com>
Date: Sat, 11 Mar 2023 20:58:58 +0100
Subject: [PATCH 11/25] Add new server

---
 php/fetch-servers.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/php/fetch-servers.php b/php/fetch-servers.php
index 22560d1..08bdfa2 100644
--- a/php/fetch-servers.php
+++ b/php/fetch-servers.php
@@ -31,6 +31,7 @@
 		"http://164.92.176.135", // found via shodan.io
 		"http://176.119.147.102", // found via shodan.io
 		// "http://192.227.193.159", // found via shodan.io, removed out of decency
+		"http://5.39.117.98", // found via reddit
 		"http://60a9fc9.online-server.cloud", // found via shodan.io
 		"http://93.95.230.10", // found via shodan.io
 		"http://94.176.239.60", // found via shodan.io
@@ -48,6 +49,7 @@
 		"164.92.176.135"              => "e529311ec8fb6fdb950aaa4fb71fc4da3ea59c6c9ba2886708b9538eea6aa213",
 		"176.119.147.102"             => "e093994156ec92e4c13d0387208bfa48ae56dd88b8f60a03980d9ef048af1e3f",
 		"192.227.193.159"             => "426453e0e991235b62bc5f35f36d5a204e64b2d8b44e971609add6a10aac6674",
+		"5.39.117.98"                 => "4bec6d6c7b502a819b47b3af75272c0774ab1214fba33fb5ec29949f864eb028",
 		"60a9fc9.online-server.cloud" => "7908bcd748313355f99e62f9c1f11c395d04019410edb7ee1618dbe26a423c4f",
 		"93.95.230.10"                => "b501f2dc7dc912aa0981b0ba10f2ba739d2f729a7d9b37022aee505aaf72807c",
 		"94.176.239.60"               => "2cbde327e9da216af9a69876bc57e16cc0c540b0aa2dfecdd1c115e67993b040",

From 8cd413f1b499c5c2415161560ba2044e82ff2d4f Mon Sep 17 00:00:00 2001
From: mdPlusPlus <mdPlusPlus@users.noreply.github.com>
Date: Sat, 11 Mar 2023 21:02:44 +0100
Subject: [PATCH 12/25] Update language submodule

---
 languages | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages b/languages
index 4bb4aa4..b544b66 160000
--- a/languages
+++ b/languages
@@ -1 +1 @@
-Subproject commit 4bb4aa46d06b8f7ead42f8c8f9a33f21ba5e49ef
+Subproject commit b544b6680e834d4359294ed075393de61d3dce8d

From 3fdd0b73259ff6be0081f53f18700accb5e002f4 Mon Sep 17 00:00:00 2001
From: gravel <qsj4di+aybgdjbxur7e8@sharklasers.com>
Date: Tue, 14 Mar 2023 11:13:43 +0100
Subject: [PATCH 13/25] SEO improvements

---
 sites/+components/tbl_communities.php |  7 ++++---
 sites/index.php                       | 14 ++++++++++++--
 sites/instructions.php                | 11 ++++++++++-
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/sites/+components/tbl_communities.php b/sites/+components/tbl_communities.php
index cc589d1..42f6bec 100644
--- a/sites/+components/tbl_communities.php
+++ b/sites/+components/tbl_communities.php
@@ -11,7 +11,8 @@
 		global $TABLE_COLUMNS;
 		$column = $TABLE_COLUMNS[$colno];
 		if (!column_sortable($column['id'])) return "";
-		return " onclick='sortTable($colno)' title='Click to sort this column'";
+		$name = $column['name'];
+		return " onclick='sortTable($colno)' title='Click to sort by $name'";
 	}
 	
 	$TABLE_COLUMNS = [
@@ -88,8 +89,8 @@
 		</td>
 		<td class="td_join_url">
 			<div class="join_url_container" data-url="<?=$room->join_link?>">
-				<a class="join_url show-from-w5" title="<?=$room->join_link?>"
-					><?=truncate($room->join_link, 32)?></a>
+				<span class="join_url show-from-w5" title="<?=$room->join_link?>"
+					><?=truncate($room->join_link, 32)?></span>
 				<a class="noscript" href="<?=$room->join_link?>"
 					>Copy link</a>
 			</div>
diff --git a/sites/index.php b/sites/index.php
index 8d51d44..240e572 100644
--- a/sites/index.php
+++ b/sites/index.php
@@ -16,6 +16,11 @@
 		<link rel="stylesheet" href="styles2.css">
 		<script type="module" src="main.js"></script>
 		<title>Self-updating list of active Session communities</title>
+		<meta name="description" content="
+			Directory of Session Open Groups — public chatrooms within Session Messenger.
+			Copy these Communities into the Session app
+			and talk anonymously about Privacy, Security, or Cryptocurrency.
+		">
 	</head>
 	<body onload="onLoad(<?php echo $timestamp ?>)">
 		<header>
@@ -65,8 +70,13 @@
 				only available with JS enabled.
 			</p>
 			<p>
-				<label for="toggle-show-room-ids" class="clickable anchorstyle">
-					Toggle room identifier display
+				<label
+					for="toggle-show-room-ids"
+					class="clickable anchorstyle"
+					tabindex="0"
+					title="Shows a column with community identifiers
+					for developers or language data contributors.">
+						Toggle room identifier display
 				</label>
 			</p>
 			<nav>
diff --git a/sites/instructions.php b/sites/instructions.php
index a89723e..7ff46ba 100644
--- a/sites/instructions.php
+++ b/sites/instructions.php
@@ -1,6 +1,7 @@
 <?php
 	include_once "+getenv.php";
 	$instruction_files = glob("+instructions/*.txt");
+	function filename($file) { return pathinfo($file)['filename']; }
 ?>
 <!DOCTYPE html>
 <html>
@@ -16,6 +17,14 @@
 			}
 		<?php endforeach; ?>
 		</style>
+		<meta name="description" content="
+			Discover how to use the sessioncommunities.online website
+			to help you join Session Open Groups; available in <?php
+			// Print languages instructions are available in.
+			$languages = array_map('filename', array_slice($instruction_files, 0, 10));
+			echo(join(", ", $languages));
+			?>. In short: Use the Copy button or scan the QR code!
+		">
 	</head>
 	<body>
 		<header>
@@ -35,7 +44,7 @@
 				<?=
 					// Name of the language
 					// Can be later parsed from i.e. first line of file
-					pathinfo($file)['filename']
+					filename($file);
 				?>
 			</label>
 			<?php endforeach; ?>

From d36ef6f364bd5881df5fc06f8ed4429b06770056 Mon Sep 17 00:00:00 2001
From: gravel <qsj4di+aybgdjbxur7e8@sharklasers.com>
Date: Tue, 14 Mar 2023 11:38:59 +0100
Subject: [PATCH 14/25] Add CSP directive

---
 sites/+components/page-head.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/sites/+components/page-head.php b/sites/+components/page-head.php
index 730c42f..4b78f97 100644
--- a/sites/+components/page-head.php
+++ b/sites/+components/page-head.php
@@ -1,3 +1,10 @@
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<link rel="icon" type="image/svg+xml" href="favicon.svg" sizes="any">
\ No newline at end of file
+<link rel="icon" type="image/svg+xml" href="favicon.svg" sizes="any">
+<meta 
+    http-equiv="Content-Security-Policy" 
+    content="
+        script-src 'self'; img-src 'self'; connect-src 'self'; font-src 'none';
+        object-src 'none'; media-src 'none'; form-action 'none'; base-uri 'self';
+    "
+>
\ No newline at end of file

From d03bc0e1df1e1541f83eb95db80368806e8fc082 Mon Sep 17 00:00:00 2001
From: gravel <qsj4di+aybgdjbxur7e8@sharklasers.com>
Date: Tue, 14 Mar 2023 12:29:40 +0100
Subject: [PATCH 15/25] Remove inline handlers & escape input

---
 output/js/constants.js                |  1 +
 output/main.js                        | 56 ++++++++++++++++++++-------
 sites/+components/qr_modals.php       |  2 +-
 sites/+components/tbl_communities.php | 36 ++++++++++-------
 sites/index.php                       |  5 ++-
 5 files changed, 71 insertions(+), 29 deletions(-)

diff --git a/output/js/constants.js b/output/js/constants.js
index 23bc0d1..49c040a 100644
--- a/output/js/constants.js
+++ b/output/js/constants.js
@@ -3,6 +3,7 @@
 // change in the foreseeable future.
 
 export const dom = {
+	/** @return {HTMLTableElement | null} */
 	tbl_communities: () => document.getElementById("tbl_communities"),
 	last_checked: () => document.getElementById("last_checked_value"),
 	qr_modal: (communityID) => document.getElementById(`modal_${communityID}`),
diff --git a/output/main.js b/output/main.js
index 0a0eb54..5731499 100644
--- a/output/main.js
+++ b/output/main.js
@@ -60,12 +60,26 @@ const transformJoinURL = (join_link) => {
 	});
 }
 
-function onLoad(timestamp) {
-	setLastChecked(timestamp);
+function getTimestamp() {
+	const timestampRaw =
+		document.querySelector('meta[name=timestamp]')
+		?.getAttribute('content');
+	if (!timestampRaw) return null;
+	const timestamp = parseInt(timestampRaw);
+	if (Number.isNaN(timestamp)) return null;
+	return timestamp;
+}
+
+function onLoad() {
+	const timestamp = getTimestamp();
+	if (timestamp !== null) {
+		setLastChecked(timestamp);
+	}
 	hideBadCommunities();
 	sortTable(COLUMN.NAME);
 	createJoinLinkButtons();
 	markSortableColumns();
+	addQRModalHandlers();
 }
 
 function displayQRModal(communityID) {
@@ -76,6 +90,24 @@ function hideQRModal(communityID) {
 	dom.qr_modal(communityID).style.display = "none";
 }
 
+function addQRModalHandlers() {
+	const rows = dom.tbl_communities()?.rows;
+	if (!rows) throw new Error("Rows not found");
+	for (const row of rows) {
+		const communityID = row.getAttribute('--data-identifier');
+		row.querySelector('.td_qr_code')?.addEventListener(
+			'click',
+			() => displayQRModal(communityID)
+		);
+		const closeButton =
+			dom.qr_modal(communityID)?.querySelector('.qr_code_modal_close');
+		closeButton?.addEventListener(
+			'click',
+			() => hideQRModal(communityID)
+		);
+	}
+}
+
 function createJoinLinkButtons() {
 	const join_URLs = dom.join_urls();
 	Array.from(join_URLs).forEach((td_url) => {
@@ -252,9 +284,13 @@ function markSortableColumns() {
 	const table = dom.tbl_communities();
 	const header_cells = table.querySelectorAll('th');
 	for (let colno = 0; colno < header_cells.length; colno++) {
-	  if (!columnIsSortable(colno)) continue;
+		if (!columnIsSortable(colno)) continue;
 		header_cells[colno].classList.add('sortable');
-	}
+		header_cells[colno].addEventListener(
+			'click',
+			() => sortTable(colno)
+		)
+	};
 }
 
 /**
@@ -278,13 +314,7 @@ function sortTable(column) {
 	setSortState(table, { ascending, column });
 }
 
-// html.js for styling purposes
-window.document.documentElement.classList.add("js");
-
-// Crude way to export from module script due to inline event handlers.
-// Ideally, all handlers would be attached from JS via addEventListener.
-Object.assign(window, {
-	onLoad, sortTable, displayQRModal,
-	hideQRModal, copyToClipboard
-});
+// `html.js` selector for styling purposes
+document.documentElement.classList.add("js");
 
+document.addEventListener('DOMContentLoaded', () => onLoad());
diff --git a/sites/+components/qr_modals.php b/sites/+components/qr_modals.php
index adf6e2d..1a4f31c 100644
--- a/sites/+components/qr_modals.php
+++ b/sites/+components/qr_modals.php
@@ -34,7 +34,7 @@
 <?php foreach ($rooms as $id => $room): ?>
 	<div id="modal_<?=$id?>" class="qr-code-modal">
 		<div class="qr-code-modal-content">
-			<span class="qr-code-modal-close" onclick='hideQRModal("<?=$id?>")'>
+			<span class="qr-code-modal-close">
 				&times;
 			</span>
 			<img
diff --git a/sites/+components/tbl_communities.php b/sites/+components/tbl_communities.php
index cc589d1..3f33948 100644
--- a/sites/+components/tbl_communities.php
+++ b/sites/+components/tbl_communities.php
@@ -11,7 +11,7 @@
 		global $TABLE_COLUMNS;
 		$column = $TABLE_COLUMNS[$colno];
 		if (!column_sortable($column['id'])) return "";
-		return " onclick='sortTable($colno)' title='Click to sort this column'";
+		return " title='Click to sort this column'";
 	}
 	
 	$TABLE_COLUMNS = [
@@ -51,17 +51,28 @@
 
 		$hostname = explode("//", $room->join_link)[1];
 		$hostname = explode("/", $hostname)[0];
+
+		// Escape external input.
+		$id = htmlspecialchars($id);
+		$language = htmlspecialchars($room->language);
+		$name = htmlspecialchars($room->name);
+		$desc = htmlspecialchars($room->description);
+		$users = htmlspecialchars($room->active_users);
+		$preview_link = htmlspecialchars($room->preview_link);
+		$join_link = htmlspecialchars($room->join_link);
+		// TODO: Do not forget to rename this escape when merging!
+		$token = htmlspecialchars($token);
+		$hostname = htmlspecialchars($hostname);
 	?>
 
-	<tr id="<?=$id?>">
+	<tr id="<?=$id?>" --data-identifier="<?=$id?>">
 		<td class="td_identifier"><?=$id?></td>
-		<td class="td_language"><?=$room->language?></td>
-		<td class="td_name"><?=$room->name?></td>
-		<td class="td_description"
-			><?=$room->description?></td>
-		<td class="td_users"><?=$room->active_users?></td>
+		<td class="td_language"><?=$language?></td>
+		<td class="td_name"><?=$name?></td>
+		<td class="td_description"><?=$desc?></td>
+		<td class="td_users"><?=$users?></td>
 		<td class="td_preview">
-			<a href="<?=$room->preview_link?>" target="_blank" rel="noopener noreferrer">
+			<a href="<?=$preview_link?>" target="_blank" rel="noopener noreferrer">
 				<?php if (str_starts_with($room->preview_link, 'http://')): ?>
 					<span class="protocol-indicator protocol-http">HTTP</span>
 				<?php endif; ?>
@@ -74,7 +85,6 @@
 			<img 
 				class="qr-code-icon" 
 				src="qrcode-solid.svg"
-				onclick='displayQRModal("<?=$id?>")'
 				alt="Pictogram of a QR code"
 			>
 		</td>
@@ -87,10 +97,10 @@
 			</div>
 		</td>
 		<td class="td_join_url">
-			<div class="join_url_container" data-url="<?=$room->join_link?>">
-				<a class="join_url show-from-w5" title="<?=$room->join_link?>"
-					><?=truncate($room->join_link, 32)?></a>
-				<a class="noscript" href="<?=$room->join_link?>"
+			<div class="join_url_container" data-url="<?=$join_link?>">
+				<a class="join_url show-from-w5" title="<?=$join_link?>"
+					><?=truncate($join_link, 32)?></a>
+				<a class="noscript" href="<?=$join_link?>"
 					>Copy link</a>
 			</div>
 		</td>
diff --git a/sites/index.php b/sites/index.php
index 8d51d44..1752561 100644
--- a/sites/index.php
+++ b/sites/index.php
@@ -14,10 +14,11 @@
 		<?php include "+components/page-head.php" ?>
 
 		<link rel="stylesheet" href="styles2.css">
-		<script type="module" src="main.js"></script>
+		<script type="module" src="./main.js"></script>
 		<title>Self-updating list of active Session communities</title>
+		<meta name="timestamp" content="<?=$timestamp?>">
 	</head>
-	<body onload="onLoad(<?php echo $timestamp ?>)">
+	<body>
 		<header>
 			<div id="header-start"></div>
 			<div id="header-end">

From 96983c62aeeafbfa33dba8f9e0b905f0689c10dc Mon Sep 17 00:00:00 2001
From: gravel <qsj4di+aybgdjbxur7e8@sharklasers.com>
Date: Tue, 14 Mar 2023 12:43:21 +0100
Subject: [PATCH 16/25] Fix image policy & silence warnings

---
 sites/+components/page-head.php       | 2 +-
 sites/+components/tbl_communities.php | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/sites/+components/page-head.php b/sites/+components/page-head.php
index 4b78f97..b21795c 100644
--- a/sites/+components/page-head.php
+++ b/sites/+components/page-head.php
@@ -4,7 +4,7 @@
 <meta 
     http-equiv="Content-Security-Policy" 
     content="
-        script-src 'self'; img-src 'self'; connect-src 'self'; font-src 'none';
+        script-src 'self'; img-src 'self' data:; connect-src 'self'; font-src 'none';
         object-src 'none'; media-src 'none'; form-action 'none'; base-uri 'self';
     "
 >
\ No newline at end of file
diff --git a/sites/+components/tbl_communities.php b/sites/+components/tbl_communities.php
index 3f33948..15fe638 100644
--- a/sites/+components/tbl_communities.php
+++ b/sites/+components/tbl_communities.php
@@ -53,10 +53,11 @@
 		$hostname = explode("/", $hostname)[0];
 
 		// Escape external input.
+		// Ternaries prevent passing null-equal strings, which produce warnings.
 		$id = htmlspecialchars($id);
-		$language = htmlspecialchars($room->language);
+		$language = $room->language ? htmlspecialchars($room->language) : "";
 		$name = htmlspecialchars($room->name);
-		$desc = htmlspecialchars($room->description);
+		$desc = $room->description ? htmlspecialchars($room->description) : "";
 		$users = htmlspecialchars($room->active_users);
 		$preview_link = htmlspecialchars($room->preview_link);
 		$join_link = htmlspecialchars($room->join_link);

From c3c93c666ca8c23fccf50f18b66d4980511efb03 Mon Sep 17 00:00:00 2001
From: gravel <qsj4di+aybgdjbxur7e8@sharklasers.com>
Date: Tue, 14 Mar 2023 12:48:41 +0100
Subject: [PATCH 17/25] Interactivity fixes

---
 output/main.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/output/main.js b/output/main.js
index 5731499..442348b 100644
--- a/output/main.js
+++ b/output/main.js
@@ -94,14 +94,15 @@ function addQRModalHandlers() {
 	const rows = dom.tbl_communities()?.rows;
 	if (!rows) throw new Error("Rows not found");
 	for (const row of rows) {
+		if (row.querySelector('th')) continue;
 		const communityID = row.getAttribute('--data-identifier');
-		row.querySelector('.td_qr_code')?.addEventListener(
+		row.querySelector('.td_qr_code').addEventListener(
 			'click',
 			() => displayQRModal(communityID)
 		);
 		const closeButton =
-			dom.qr_modal(communityID)?.querySelector('.qr_code_modal_close');
-		closeButton?.addEventListener(
+			dom.qr_modal(communityID).querySelector('.qr-code-modal-close');
+		closeButton.addEventListener(
 			'click',
 			() => hideQRModal(communityID)
 		);

From 3f115c62cffffb7cc100226aab27f36a979012b3 Mon Sep 17 00:00:00 2001
From: gravel <qsj4di+aybgdjbxur7e8@sharklasers.com>
Date: Tue, 14 Mar 2023 13:42:51 +0100
Subject: [PATCH 18/25] Tagging and links

---
 sites/+components/page-head.php       |  3 +-
 sites/+components/tbl_communities.php | 25 +++++++++--------
 sites/index.php                       | 40 ++++++++++++++++++++++++---
 sites/instructions.php                | 25 ++++++++++++-----
 4 files changed, 69 insertions(+), 24 deletions(-)

diff --git a/sites/+components/page-head.php b/sites/+components/page-head.php
index 730c42f..ddf69b3 100644
--- a/sites/+components/page-head.php
+++ b/sites/+components/page-head.php
@@ -1,3 +1,4 @@
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<link rel="icon" type="image/svg+xml" href="favicon.svg" sizes="any">
\ No newline at end of file
+<link rel="icon" type="image/svg+xml" href="favicon.svg" sizes="any">
+<meta name="keywords" content="Session, Community, Anonymous, Chat">
\ No newline at end of file
diff --git a/sites/+components/tbl_communities.php b/sites/+components/tbl_communities.php
index 42f6bec..6963f9f 100644
--- a/sites/+components/tbl_communities.php
+++ b/sites/+components/tbl_communities.php
@@ -6,7 +6,7 @@
 		// Join URL contents are not guaranteed to have visible text.
 		return $id != "qr" && $id != "preview" && $id != "join_url";
 	}
-	
+
 	function sort_onclick($colno) {
 		global $TABLE_COLUMNS;
 		$column = $TABLE_COLUMNS[$colno];
@@ -14,7 +14,7 @@
 		$name = $column['name'];
 		return " onclick='sortTable($colno)' title='Click to sort by $name'";
 	}
-	
+
 	$TABLE_COLUMNS = [
 		['id' => "identifier", 'name' => "Identifier"],
 		['id' => "language", 'name' => "L"],
@@ -54,15 +54,15 @@
 		$hostname = explode("/", $hostname)[0];
 	?>
 
-	<tr id="<?=$id?>">
-		<td class="td_identifier"><?=$id?></td>
+	<tr id="<?=$id?>" itemscope itemtype="https://schema.org/EntryPoint">
+		<td class="td_identifier" itemprop="identifier"><?=$id?></td>
 		<td class="td_language"><?=$room->language?></td>
-		<td class="td_name"><?=$room->name?></td>
-		<td class="td_description"
+		<td class="td_name" itemprop="name"><?=$room->name?></td>
+		<td class="td_description" itemprop="description"
 			><?=$room->description?></td>
 		<td class="td_users"><?=$room->active_users?></td>
-		<td class="td_preview">
-			<a href="<?=$room->preview_link?>" target="_blank" rel="noopener noreferrer">
+		<td class="td_preview" itemprop="url">
+			<a href="<?=$room->preview_link?>" target="_blank" rel="noopener noreferrer nofollow">
 				<?php if (str_starts_with($room->preview_link, 'http://')): ?>
 					<span class="protocol-indicator protocol-http">HTTP</span>
 				<?php endif; ?>
@@ -72,16 +72,17 @@
 			</a>
 		</td>
 		<td class="td_qr_code">
-			<img 
-				class="qr-code-icon" 
+			<img
+				class="qr-code-icon"
 				src="qrcode-solid.svg"
 				onclick='displayQRModal("<?=$id?>")'
 				alt="Pictogram of a QR code"
 			>
 		</td>
-		<td class="td_server_icon" 
+		<td class="td_server_icon"
 			data-token="<?=$token?>"
 			title="<?=$hostname?> (<?=$token?>)"
+			item="image"
 		>
 			<div class="td_server_icon-circle" style="background-color: <?=$icon_color?>">
 				<span><?=strtoupper($token[0] . $token[1])?></span>
@@ -91,7 +92,7 @@
 			<div class="join_url_container" data-url="<?=$room->join_link?>">
 				<span class="join_url show-from-w5" title="<?=$room->join_link?>"
 					><?=truncate($room->join_link, 32)?></span>
-				<a class="noscript" href="<?=$room->join_link?>"
+				<a class="noscript" href="<?=$room->join_link?>" rel="external nofollow"
 					>Copy link</a>
 			</div>
 		</td>
diff --git a/sites/index.php b/sites/index.php
index 240e572..a54074c 100644
--- a/sites/index.php
+++ b/sites/index.php
@@ -13,6 +13,7 @@
 	<head>
 		<?php include "+components/page-head.php" ?>
 
+		<link rel="canonical" href="https://sessioncommunities.online/">
 		<link rel="stylesheet" href="styles2.css">
 		<script type="module" src="main.js"></script>
 		<title>Self-updating list of active Session communities</title>
@@ -21,6 +22,16 @@
 			Copy these Communities into the Session app
 			and talk anonymously about Privacy, Security, or Cryptocurrency.
 		">
+		<meta name="modified" content="<?=date("Y-m-d H:i:s", $timestamp)?>">
+		<meta property="og:title" content="Click here for Session Communities">
+		<meta
+			property="og:description"
+			content="<?=count($rooms_assoc)?> Communities and counting — updated every day!"
+		>
+		<meta property="og:url" content="https://sessioncommunities.online/">
+		<meta property="og:type" content="website">
+		<meta property="og:locale" content="en_US"/>
+
 	</head>
 	<body onload="onLoad(<?php echo $timestamp ?>)">
 		<header>
@@ -29,6 +40,8 @@
 				<a
 					id="link-instructions"
 					target="_blank"
+					rel="help"
+					title="Mutli-language guide to joining communities using the site."
 					href="instructions.html"
 				>Instructions</a>
 			</div>
@@ -55,10 +68,16 @@
 			</p>
 			<p id="disclaimer">
 					This site is not affiliated with
-					<a href="https://optf.ngo">Oxen Privacy Tech Foundation</a>.
+					<a
+						href="https://optf.ngo"
+						target="_blank"
+					>Oxen Privacy Tech Foundation</a>.
 					<br>
 					Communities shown are fetched automatically from
-					various sources.
+					<a
+						href="https://github.com/mdPlusPlus/sessioncommunities.online#which-sources-are-crawled"
+						target="_blank"
+					>various sources</a>.
 					<br>
 					We make an attempt to hide communities containing
 					objectionable or illegal content, but
@@ -93,17 +112,30 @@
 				<a
 					href="https://github.com/oxen-io/session-pysogs"
 					target="_blank"
-					title="Information about running a community server"
+					title="Information about running a community server."
 				>Host Your Own Community</a>
 				<a
 					href="https://getsession.org/terms-of-service"
 					target="_blank"
 				>Session Terms Of Service</a>
+			</nav>
+			<nav>
 				<a
 					href="https://github.com/mdPlusPlus/sessioncommunities.online"
 					target="_blank"
 					title="sessioncommunities.online repository on GitHub."
-				>Source Code & Contact</a>
+				>Source Code</a>
+				<a
+					href="https://lokilocker.com/someguy/sessioncommunities.online"
+					target="_blank"
+					title="sessioncommunities.online repository on Lokinet Gitea."
+				>Source Code (Mirror)</a>
+				<a
+					href="https://github.com/mdPlusPlus/sessioncommunities.online#contact"
+					target="_blank"
+					rel="author"
+					title="Information on how to contact the maintainer of sessioncommunities.online"
+				>Contact</a>
 			</nav>
 		</footer>
 		<div id="copy-snackbar">
diff --git a/sites/instructions.php b/sites/instructions.php
index 7ff46ba..fb4275d 100644
--- a/sites/instructions.php
+++ b/sites/instructions.php
@@ -1,17 +1,18 @@
 <?php
 	include_once "+getenv.php";
 	$instruction_files = glob("+instructions/*.txt");
-	function filename($file) { return pathinfo($file)['filename']; }
+	function file_language($file) { return pathinfo($file)['filename']; }
 ?>
 <!DOCTYPE html>
 <html>
 	<head>
 		<?php include "+components/page-head.php" ?>
 
+		<link rel="canonical" href="https://sessioncommunities.online/instructions.php">
 		<link rel="stylesheet" href="css/instructions.css">
 		<style type="text/css">
 		<?php foreach ($instruction_files as $i => $file): ?>
-			#language-selection-<?=$i?>:checked ~ 
+			#language-selection-<?=$i?>:checked ~
 			#instructions #instructions-<?=$i?> {
 				display: block;
 			}
@@ -21,35 +22,45 @@
 			Discover how to use the sessioncommunities.online website
 			to help you join Session Open Groups; available in <?php
 			// Print languages instructions are available in.
-			$languages = array_map('filename', array_slice($instruction_files, 0, 10));
+			$languages = array_map('file_language', array_slice($instruction_files, 0, 10));
 			echo(join(", ", $languages));
 			?>. In short: Use the Copy button or scan the QR code!
 		">
+		<meta property="og:title" content="How to join Session Communities">
+		<meta property="og:description" content="Learn how to use sessioncommunities.online to join">
+		<meta property="og:url" content="https://sessioncommunities.online/instructions.php">
+		<meta property="og:type" content="article">
 	</head>
 	<body>
 		<header>
 			<h1>Instructions for joining Session Communities</h1>
 		</header>
 		<main>
+			<p>
+				<a href="/" title="Return to the Session Community listing">
+					Go back to Community list
+				</a>
+			</p>
 			Choose your language:
 			<?php foreach ($instruction_files as $i => $file): ?>
 			<br>
-			<input 
+			<input
 				id="language-selection-<?=$i?>"
 				class="language-selection"
 				name="language"
 				type="radio"
+				<?=file_language($file) == 'English' ? 'checked="checked"' : ''?>
 			>
 			<label for="language-selection-<?=$i?>">
 				<?=
 					// Name of the language
 					// Can be later parsed from i.e. first line of file
-					filename($file);
+					file_language($file);
 				?>
 			</label>
 			<?php endforeach; ?>
-			
-			
+
+
 			<article id="instructions">
 			<?php foreach ($instruction_files as $i => $file): ?>
 			<section id="instructions-<?=$i?>" class="instructions"><?php

From 150676715a60ecb2c530ac4d62e9ff37ca9ae46c Mon Sep 17 00:00:00 2001
From: mdPlusPlus <mdPlusPlus@users.noreply.github.com>
Date: Thu, 23 Mar 2023 19:55:00 +0100
Subject: [PATCH 19/25] Hide community

---
 output/main.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/output/main.js b/output/main.js
index 0a0eb54..c535507 100644
--- a/output/main.js
+++ b/output/main.js
@@ -26,6 +26,7 @@ const filteredCommunities = {
 		"762ba9+c7fb",  // TesterRoom
 		"b4d829+c7fb",  // Test
 		"e5853a+c7fb",  // testtest
+		"eu+8183".      // temporary removal by request, not really a test
 		"fishing+8e2e", // Example group from PySOGS documentation
 		"test+118d",    // Testing 1, 2, 3
 		"test+13f6",    // Testing room

From a6efe0f8c86b66310250dd0f4db82aaf4f4dd311 Mon Sep 17 00:00:00 2001
From: mdPlusPlus <mdPlusPlus@users.noreply.github.com>
Date: Thu, 23 Mar 2023 20:08:06 +0100
Subject: [PATCH 20/25] Update language submodule

---
 languages | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages b/languages
index b544b66..f050964 160000
--- a/languages
+++ b/languages
@@ -1 +1 @@
-Subproject commit b544b6680e834d4359294ed075393de61d3dce8d
+Subproject commit f050964aa91dd9eef705f5cf349da6c81c896977

From b59765ddc5382945636985b5c21d00461de639a3 Mon Sep 17 00:00:00 2001
From: mdPlusPlus <mdPlusPlus@users.noreply.github.com>
Date: Thu, 23 Mar 2023 21:23:03 +0100
Subject: [PATCH 21/25] Update language submodule

---
 languages | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages b/languages
index f050964..f2aaed4 160000
--- a/languages
+++ b/languages
@@ -1 +1 @@
-Subproject commit f050964aa91dd9eef705f5cf349da6c81c896977
+Subproject commit f2aaed46ea2ef3a6ff03b6eee6f70c81cc20f069

From 5e01d2beb8e44a48282bef4a0cbbfa6af9f45aa2 Mon Sep 17 00:00:00 2001
From: mdPlusPlus <mdPlusPlus@users.noreply.github.com>
Date: Thu, 23 Mar 2023 21:23:58 +0100
Subject: [PATCH 22/25] Correct typo / invalid syntax

---
 output/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/output/main.js b/output/main.js
index c535507..2419643 100644
--- a/output/main.js
+++ b/output/main.js
@@ -26,7 +26,7 @@ const filteredCommunities = {
 		"762ba9+c7fb",  // TesterRoom
 		"b4d829+c7fb",  // Test
 		"e5853a+c7fb",  // testtest
-		"eu+8183".      // temporary removal by request, not really a test
+		"eu+8183",      // temporary removal by request, not really a test
 		"fishing+8e2e", // Example group from PySOGS documentation
 		"test+118d",    // Testing 1, 2, 3
 		"test+13f6",    // Testing room

From 0a7ad2391041c03783a4c0dc79b83a2f3f6e332c Mon Sep 17 00:00:00 2001
From: mdPlusPlus <mdPlusPlus@users.noreply.github.com>
Date: Sun, 9 Apr 2023 00:24:46 +0200
Subject: [PATCH 23/25] Add Finnish and Russian instructions, thanks anonymous

---
 sites/+instructions/Finnish.txt | 12 ++++++++++++
 sites/+instructions/Russian.txt | 12 ++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 sites/+instructions/Finnish.txt
 create mode 100644 sites/+instructions/Russian.txt

diff --git a/sites/+instructions/Finnish.txt b/sites/+instructions/Finnish.txt
new file mode 100644
index 0000000..9bd7515
--- /dev/null
+++ b/sites/+instructions/Finnish.txt
@@ -0,0 +1,12 @@
+Mobiililaitteella:
+
+- Napsauta Kopioi-nappia kopioidaksesi ryhmän URL-osoitteen.
+- Avaa Session, paina plussan painiketta ja valitse "Liity ryhmään" ("Join Community").
+- Liitä kopioitu URL-osoite "Syötä yhteisön URL-osoite"-kenttään, ja paina"Liity".
+
+
+Mobiililaitteella, kun tämä sivusto on auki tietokoneellasi:
+
+- Paina valitsemasi yhteisön QR-koodipainiketta tietokoneellasi.
+- Avaa Session, paina plussan painiketta ja valitse "Liity ryhmään" ("Join Community").
+- Valitse ylhäältä "Skannaa QR-koodi" ja skannaa puhelimen kameralla ryhmän QR-koodiin.
diff --git a/sites/+instructions/Russian.txt b/sites/+instructions/Russian.txt
new file mode 100644
index 0000000..0e3230d
--- /dev/null
+++ b/sites/+instructions/Russian.txt
@@ -0,0 +1,12 @@
+На мобильном девайсе:
+
+- Нажмите кнопку «Копировать», чтобы скопировать URL-адрес нужной группы.
+- Откройте Session, нажмите на кнопку с плюсом и выберите «Присоединиться к сообществу».
+- Вставьте скопированный URL-адрес в поле «Введите URL-адрес сообщества», и нажмите «Присоединиться».
+
+
+На мобильном девайсе, когда этот сайт открыт на вашем компьютере:
+
+- Нажмите кнопку QR-кода для выбранного сообщества на вашем компьютере.
+- Откройте Session, нажмите на кнопку с плюсом и выберите «Присоединиться к сообществу».
+- Выберите «Сканировать QR-код» наверху и наведите камеру телефона на QR-код. 

From 27e2626dfb165a8ec7ead08fc1dfb1f05b9d8ef0 Mon Sep 17 00:00:00 2001
From: mdPlusPlus <mdPlusPlus@users.noreply.github.com>
Date: Sun, 9 Apr 2023 22:18:02 +0200
Subject: [PATCH 24/25] Clean up entries of filtered communities, remove
 offline ones

---
 output/main.js | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/output/main.js b/output/main.js
index 2419643..a852598 100644
--- a/output/main.js
+++ b/output/main.js
@@ -22,33 +22,18 @@ import {
 // Hidden communities for transparency.
 const filteredCommunities = {
 	tests: [
-		"2e9345+c7fb",  // TestRoom
-		"762ba9+c7fb",  // TesterRoom
-		"b4d829+c7fb",  // Test
-		"e5853a+c7fb",  // testtest
-		"eu+8183",      // temporary removal by request, not really a test
 		"fishing+8e2e", // Example group from PySOGS documentation
 		"test+118d",    // Testing 1, 2, 3
-		"test+13f6",    // Testing room
-		"test+c01b",    // Testing room
+		"test+13f6",    // Testing room2
 		"test+fe93",    // 测试（Test)
 		"xyz+7908",     // XYZ Room
-		"xyz+efca",     // XYZ Room
 	],
 
 	offensive: [
-		"60fa60+c7fb",    // "N-word" Community
-		"ab1a4d+c7fb",    // zUnsensored Group (CSAM)
-		"AlexMed+e093",   //
+		"AlexMed+e093",   // drug trading?
 		"gore+e5e0",      // gore
-		"RU-STEROID+e093" //
+		"RU-STEROID+e093" // drug trading?
 	],
-
-	// These communities should be checked regularly
-	// in case they update their PySOGS version
-	legacy: [
-		"Ukraine+02bd"  // https://reccacon.com/view/room/Ukraine
-	]
 };
 
 // This can be achieved with `text-overflow: ellipsis` instead
@@ -89,7 +74,7 @@ function createJoinLinkButtons() {
 function hideBadCommunities() {
 	let numberOfHiddenCommunities = 0;
 
-	for (const category of ['tests', 'offensive', 'legacy']) {
+	for (const category of ['tests', 'offensive']) {
 		numberOfHiddenCommunities +=
 		  filteredCommunities[category]
 		    .map(hideElementByID)

From c11d52f3cdf3a3c5993b315a720711f4695189a7 Mon Sep 17 00:00:00 2001
From: mdPlusPlus <mdPlusPlus@users.noreply.github.com>
Date: Sun, 9 Apr 2023 22:30:42 +0200
Subject: [PATCH 25/25] Clean up CSS

---
 output/styles2.css | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/output/styles2.css b/output/styles2.css
index 1c5fd23..786e014 100644
--- a/output/styles2.css
+++ b/output/styles2.css
@@ -102,8 +102,8 @@ header {
 
 }
 
-.td_users        { text-align: right; }
-.td_preview      { text-align: center; }
+.td_users       { text-align: right;  }
+.td_preview     { text-align: center; }
 .td_server_icon { text-align: center; }
 
 .td_server_icon-circle {
@@ -186,10 +186,6 @@ label[for=toggle-show-room-ids]::after {
 
 /* <Colors> */
 :root {
-	/*--session-classic-dark-green:      #31f196;*/
-	/*--session-classic-dark-gray-one:   #414141;*/
-	/*--session-classic-dark-gray-two:   #2d2d2d;*/
-	/*--session-classic-dark-gray-three: #1b1b1b;*/
 	--alternate-row-color:             #e8e8e8;
 }
 #tbl_communities th                 { background-color: lightgray; }