ssb: prettier.

This reverts commit 7f4e2617ee.

GNUmakefile

@@ -16,8 +16,8 @@ MAKEFLAGS += --no-builtin-rules
 ## LD := Linker.
 ## ANDROID_SDK := Path to the Android SDK.
 
-VERSION_CODE := 30
-VERSION_NUMBER := 0.0.25
+VERSION_CODE := 31
+VERSION_NUMBER := 0.0.26-wip
 VERSION_NAME := This program kills fascists.
 
 SQLITE_URL := https://www.sqlite.org/2024/sqlite-amalgamation-3470100.zip

apps/ssb.json

@@ -1,5 +1,5 @@
 {
 	"type": "tildefriends-app",
 	"emoji": "🐌",
-	"previous": "&ksxKqT3Bkp0Z2zV2dQU4ttVZ1k16zdWoJVv6R7m5yAQ=.sha256"
+	"previous": "&onuy7/nH00Er+ujPI0ghlCOpRdDkuwL9nY2/WocLxTg=.sha256"
 }

apps/ssb/commonmark-hashtag.js

@@ -7,7 +7,7 @@ function textNode(text) {
 function linkNode(text, link) {
 	const linkNode = new commonmark.Node('link', undefined);
 	if (link.startsWith('#')) {
-		linkNode.destination = `#q=${encodeURIComponent(link)}`;
+		linkNode.destination = `#${encodeURIComponent('#' + link)}`;
 	} else {
 		linkNode.destination = link;
 	}

apps/ssb/script.js

@@ -8,7 +8,6 @@ import * as tf_compose from './tf-compose.js';
 import * as tf_news from './tf-news.js';
 import * as tf_profile from './tf-profile.js';
 import * as tf_reactions_modal from './tf-reactions-modal.js';
-import * as tf_tab_mentions from './tf-tab-mentions.js';
 import * as tf_tab_news from './tf-tab-news.js';
 import * as tf_tab_news_feed from './tf-tab-news-feed.js';
 import * as tf_tab_search from './tf-tab-search.js';

apps/ssb/tf-app.js

@@ -16,7 +16,9 @@ class TfElement extends LitElement {
 			following: {type: Array},
 			users: {type: Object},
 			ids: {type: Array},
-			tags: {type: Array},
+			channels: {type: Array},
+			channels_unread: {type: Object},
+			channels_latest: {type: Object},
 		};
 	}
 
@@ -33,7 +35,9 @@ class TfElement extends LitElement {
 		this.following = [];
 		this.users = {};
 		this.loaded = false;
-		this.tags = [];
+		this.channels = [];
+		this.channels_unread = {};
+		this.channels_latest = {};
 		tfrpc.rpc.getBroadcasts().then((b) => {
 			self.broadcasts = b || [];
 		});
@@ -64,6 +68,33 @@ class TfElement extends LitElement {
 		let ids = (await tfrpc.rpc.getIdentities()) || [];
 		this.whoami = whoami ?? (ids.length ? ids[0] : undefined);
 		this.ids = ids;
+		await this.load_channels();
+	}
+
+	async load_channels() {
+		let channels = await tfrpc.rpc.query(
+			`
+			SELECT
+				content ->> 'channel' AS channel,
+				content ->> 'subscribed' AS subscribed
+			FROM
+				messages
+			WHERE
+				author = ? AND
+				content ->> 'type' = 'channel'
+			ORDER BY sequence
+		`,
+			[this.whoami]
+		);
+		let channel_map = {};
+		for (let row of channels) {
+			if (row.subscribed) {
+				channel_map[row.channel] = true;
+			} else {
+				delete channel_map[row.channel];
+			}
+		}
+		this.channels = Object.keys(channel_map).sort();
 	}
 
 	set_hash(hash) {
@@ -72,8 +103,6 @@ class TfElement extends LitElement {
 			this.tab = 'search';
 		} else if (this.hash === '#connections') {
 			this.tab = 'connections';
-		} else if (this.hash === '#mentions') {
-			this.tab = 'mentions';
 		} else if (this.hash.startsWith('#sql=')) {
 			this.tab = 'query';
 		} else {
@@ -167,6 +196,14 @@ class TfElement extends LitElement {
 			`,
 			[JSON.stringify(this.following), id]
 		);
+		for (let message of messages) {
+			if (message.author == this.whoami) {
+				let content = JSON.parse(message.content);
+				if (content?.type == 'channel') {
+					this.load_channels();
+				}
+			}
+		}
 		if (messages && messages.length) {
 			this.unread = [...this.unread, ...messages];
 			this.unread = this.unread.slice(this.unread.length - 1024);
@@ -195,33 +232,9 @@ class TfElement extends LitElement {
 		}
 	}
 
-	async load_recent_tags() {
-		let start = new Date();
-		this.tags = await tfrpc.rpc.query(
-			`
-			WITH
-				recent AS (SELECT id, json(content) AS content FROM messages
-					WHERE messages.timestamp > ? AND json_extract(content, '$.type') = 'post'
-					ORDER BY timestamp DESC LIMIT 1024),
-				recent_channels AS (SELECT recent.id, '#' || json_extract(content, '$.channel') AS tag
-					FROM recent
-					WHERE json_extract(content, '$.channel') IS NOT NULL),
-				recent_mentions AS (SELECT recent.id, json_extract(mention.value, '$.link') AS tag
-					FROM recent, json_each(recent.content, '$.mentions') AS mention
-					WHERE json_valid(mention.value) AND tag LIKE '#%'),
-				combined AS (SELECT id, tag FROM recent_channels UNION ALL SELECT id, tag FROM recent_mentions),
-				by_message AS (SELECT DISTINCT id, tag FROM combined)
-			SELECT tag, COUNT(*) AS count FROM by_message GROUP BY tag ORDER BY count DESC LIMIT 10
-		`,
-			[new Date() - 7 * 24 * 60 * 60 * 1000]
-		);
-		console.log('tags took', (new Date() - start) / 1000.0, 'seconds');
-	}
-
 	async load() {
 		let whoami = this.whoami;
-		let tags = this.load_recent_tags();
-		let following = await tfrpc.rpc.following([whoami], 3);
+		let following = await tfrpc.rpc.following([whoami], 2);
 		let users = {};
 		let by_count = [];
 		for (let [id, v] of Object.entries(following)) {
@@ -233,7 +246,31 @@ class TfElement extends LitElement {
 			};
 			by_count.push({count: v.of, id: id});
 		}
-		console.log(by_count.sort((x, y) => y.count - x.count).slice(0, 20));
+		let channels = tfrpc.rpc.query(
+			`
+			SELECT channels.value AS channel, MAX(messages.rowid) AS rowid FROM messages
+			JOIN json_each(?1) AS channels ON messages.content ->> 'channel' = channels.value
+			JOIN json_each(?2) AS following ON messages.author = following.value
+			WHERE messages.content ->> 'type' = 'post' AND messages.content ->> 'root' IS NULL
+			GROUP by channel
+			UNION
+			SELECT '' AS channel, MAX(messages.rowid) AS rowid FROM messages
+			JOIN json_each(?2) AS following ON messages.author = following.value
+			WHERE messages.content ->> 'type' = 'post'
+			UNION
+			SELECT '@' AS channel, MAX(messages.rowid) AS rowid FROM messages_fts(?3)
+			JOIN messages ON messages.rowid = messages_fts.rowid
+			JOIN json_each(?2) AS following ON messages.author = following.value
+		`,
+			[
+				JSON.stringify(this.channels),
+				JSON.stringify(Object.keys(following)),
+				'"' + this.whoami.replace('"', '""') + '"',
+			]
+		);
+		this.channels_unread = JSON.parse(
+			(await tfrpc.rpc.databaseGet('unread')) ?? '{}'
+		);
 		let start_time = new Date();
 		users = await this.fetch_about(Object.keys(following).sort(), users);
 		console.log(
@@ -243,14 +280,25 @@ class TfElement extends LitElement {
 			Object.keys(users).length,
 			'users'
 		);
+		start_time = new Date();
+		channels = await channels;
+		console.log('channels took', (new Date() - start_time) / 1000.0);
+		this.channels_latest = Object.fromEntries(
+			channels.map((x) => [x.channel, x.rowid])
+		);
 		this.following = Object.keys(following);
 		this.users = users;
-		await tags;
 		console.log(`load finished ${whoami} => ${this.whoami}`);
 		this.whoami = whoami;
 		this.loaded = whoami;
 	}
 
+	channel_set_unread(event) {
+		this.channels_unread[event.detail.channel ?? ''] = event.detail.unread;
+		this.channels_unread = Object.assign({}, this.channels_unread);
+		tfrpc.rpc.databaseSet('unread', JSON.stringify(this.channels_unread));
+	}
+
 	render_tab() {
 		let following = this.following;
 		let users = this.users;
@@ -265,6 +313,10 @@ class TfElement extends LitElement {
 					.unread=${this.unread}
 					@refresh=${() => (this.unread = [])}
 					?loading=${this.loading}
+					.channels=${this.channels}
+					.channels_latest=${this.channels_latest}
+					.channels_unread=${this.channels_unread}
+					@channelsetunread=${this.channel_set_unread}
 				></tf-tab-news>
 			`;
 		} else if (this.tab === 'connections') {
@@ -275,14 +327,6 @@ class TfElement extends LitElement {
 					.broadcasts=${this.broadcasts}
 				></tf-tab-connections>
 			`;
-		} else if (this.tab === 'mentions') {
-			return html`
-				<tf-tab-mentions
-					.following=${this.following}
-					whoami=${this.whoami}
-					.users="${this.users}}"
-				></tf-tab-mentions>
-			`;
 		} else if (this.tab === 'search') {
 			return html`
 				<tf-tab-search
@@ -314,8 +358,6 @@ class TfElement extends LitElement {
 			await tfrpc.rpc.setHash('#');
 		} else if (tab === 'connections') {
 			await tfrpc.rpc.setHash('#connections');
-		} else if (tab === 'mentions') {
-			await tfrpc.rpc.setHash('#mentions');
 		} else if (tab === 'query') {
 			await tfrpc.rpc.setHash('#sql=');
 		}
@@ -338,13 +380,15 @@ class TfElement extends LitElement {
 		const k_tabs = {
 			'📰': 'news',
 			'📡': 'connections',
-			'@': 'mentions',
 			'🔍': 'search',
 			'👩‍💻': 'query',
 		};
 
 		let tabs = html`
-			<div class="w3-bar w3-theme-l1">
+			<div
+				class="w3-bar w3-theme-l1"
+				style="position: sticky; top: 0; z-index: 10"
+			>
 				<button
 					class="w3-bar-item w3-button w3-circle w3-ripple"
 					@click=${this.refresh}
@@ -384,13 +428,7 @@ class TfElement extends LitElement {
 				style="width: 100vw; min-height: 100vh; height: 100%"
 				class="w3-theme-dark"
 			>
-				${tabs}
-				<div style="padding: 8px">
-					${this.tags.map(
-						(x) => html`<tf-tag tag=${x.tag} count=${x.count}></tf-tag>`
-					)}
-					${contents}
-				</div>
+				${tabs} ${contents}
 			</div>
 		`;
 	}

apps/ssb/tf-compose.js

@@ -14,6 +14,7 @@ class TfComposeElement extends LitElement {
 			apps: {type: Object},
 			drafts: {type: Object},
 			author: {type: String},
+			channel: {type: String},
 		};
 	}
 
@@ -196,6 +197,7 @@ class TfComposeElement extends LitElement {
 		let message = {
 			type: 'post',
 			text: edit.innerText,
+			channel: this.channel,
 		};
 		if (this.root || this.branch) {
 			message.root = this.root;
@@ -535,6 +537,9 @@ class TfComposeElement extends LitElement {
 				class="w3-card-4 w3-theme-d4 w3-padding-small"
 				style="box-sizing: border-box"
 			>
+				${this.channel !== undefined
+					? html`<p>To #${this.channel}:</p>`
+					: undefined}
 				${this.render_encrypt()}
 				<div class="w3-container w3-padding-small">
 					<div class="w3-half">

apps/ssb/tf-message.js

@@ -14,6 +14,8 @@ class TfMessageElement extends LitElement {
 			format: {type: String},
 			blog_data: {type: String},
 			expanded: {type: Object},
+			channel: {type: String},
+			channel_unread: {type: Number},
 		};
 	}
 
@@ -28,6 +30,7 @@ class TfMessageElement extends LitElement {
 		this.drafts = {};
 		this.format = 'message';
 		this.expanded = {};
+		this.channel_unread = -1;
 	}
 
 	show_reply() {
@@ -228,7 +231,7 @@ class TfMessageElement extends LitElement {
 				>${mention.name}</a
 			>`;
 		} else if (mention.link?.startsWith('#')) {
-			return html` <a href=${'#q=' + encodeURIComponent(mention.link)}
+			return html` <a href=${'#' + encodeURIComponent('#' + mention.link)}
 				>${mention.link}</a
 			>`;
 		} else if (
@@ -312,12 +315,27 @@ ${JSON.stringify(mention, null, 2)}</pre
 								.users=${this.users}
 								.drafts=${this.drafts}
 								.expanded=${this.expanded}
+								channel=${this.channel}
+								channel_unread=${this.channel_unread}
 							></tf-message>`
 					)}`;
 			}
 		}
 	}
 
+	mark_unread() {
+		this.dispatchEvent(
+			new CustomEvent('channelsetunread', {
+				bubbles: true,
+				composed: true,
+				detail: {
+					channel: this.channel,
+					unread: this.message.rowid,
+				},
+			})
+		);
+	}
+
 	render_channels() {
 		let content = this.message?.content;
 		if (this?.messsage?.decrypted?.type == 'post') {
@@ -344,7 +362,9 @@ ${JSON.stringify(mention, null, 2)}</pre
 		}
 		let class_background = this.message?.decrypted
 			? 'w3-pale-red'
-			: 'w3-theme-d4';
+			: this.message?.rowid >= this.channel_unread
+				? 'w3-theme-d2'
+				: 'w3-theme-d4';
 		let self = this;
 		let raw_button;
 		switch (this.format) {
@@ -423,6 +443,8 @@ ${JSON.stringify(mention, null, 2)}</pre
 								.users=${self.users}
 								.drafts=${self.drafts}
 								.expanded=${self.expanded}
+								channel=${this.channel}
+								channel_unread=${this.channel_unread}
 							></tf-message>
 						`
 					)}
@@ -442,6 +464,8 @@ ${JSON.stringify(mention, null, 2)}</pre
 							.users=${this.users}
 							.drafts=${this.drafts}
 							.expanded=${this.expanded}
+							channel=${this.channel}
+							channel_unread=${this.channel_unread}
 						></tf-message>`
 				)}
 			</div>`;
@@ -463,6 +487,8 @@ ${JSON.stringify(mention, null, 2)}</pre
 							.users=${this.users}
 							.drafts=${this.drafts}
 							.expanded=${this.expanded}
+							channel=${this.channel}
+							channel_unread=${this.channel_unread}
 						></tf-message>
 					`
 				)}
@@ -618,6 +644,16 @@ ${JSON.stringify(content, null, 2)}</pre
 							<button class="w3-button w3-theme-d1" @click=${this.react}>
 								React
 							</button>
+							${!content.root && this.message.rowid < this.channel_unread
+								? html`
+										<button
+											class="w3-button w3-theme-d1"
+											@click=${this.mark_unread}
+										>
+											Mark Unread
+										</button>
+									`
+								: undefined}
 						</p>
 						${this.render_children()}
 					</div>
@@ -787,7 +823,7 @@ ${JSON.stringify(content, null, 2)}</pre
 				return small_frame(html`
 					<div>
 						${content.subscribed ? 'subscribed to' : 'unsubscribed from'}
-						<a href=${'#q=' + encodeURIComponent('#' + content.channel)}
+						<a href=${'#' + encodeURIComponent('#' + content.channel)}
 							>#${content.channel}</a
 						>
 					</div>

apps/ssb/tf-news.js

@@ -11,6 +11,8 @@ class TfNewsElement extends LitElement {
 			following: {type: Array},
 			drafts: {type: Object},
 			expanded: {type: Object},
+			channel: {type: String},
+			channel_unread: {type: Number},
 		};
 	}
 
@@ -25,6 +27,7 @@ class TfNewsElement extends LitElement {
 		this.following = [];
 		this.drafts = {};
 		this.expanded = {};
+		this.channel_unread = -1;
 	}
 
 	process_messages(messages) {
@@ -178,18 +181,38 @@ class TfNewsElement extends LitElement {
 		let final_messages = this.group_following(
 			this.finalize_messages(messages_by_id)
 		);
+		let unread_rowid = -1;
+		for (let message of final_messages) {
+			if (message.rowid < this.channel_unread) {
+				unread_rowid = message.rowid;
+				break;
+			}
+		}
 		return html`
-			<div style="display: flex; flex-direction: column">
+			<div>
 				${final_messages.map(
 					(x) =>
-						html`<tf-message
-							.message=${x}
-							whoami=${this.whoami}
-							.users=${this.users}
-							.drafts=${this.drafts}
-							.expanded=${this.expanded}
-							collapsed="true"
-						></tf-message>`
+						html` ${x.rowid == unread_rowid && x != final_messages[0]
+								? html`<div style="display: flex; flex-direction: row">
+										<div
+											style="border-bottom: 1px solid #f00; flex: 1; align-self: center; height: 1px"
+										></div>
+										<div style="color: #f00; padding: 8px">unread</div>
+										<div
+											style="border-bottom: 1px solid #f00; flex: 1; align-self: center; height: 1px"
+										></div>
+									</div>`
+								: undefined}
+							<tf-message
+								.message=${x}
+								whoami=${this.whoami}
+								.users=${this.users}
+								.drafts=${this.drafts}
+								.expanded=${this.expanded}
+								collapsed="true"
+								channel=${this.channel}
+								channel_unread=${this.channel_unread}
+							></tf-message>`
 				)}
 			</div>
 		`;

apps/ssb/tf-styles.js

@@ -286,29 +286,29 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0}
 `;
 
 // prettier-ignore
-const w3_2016_riverside = css`
-.w3-theme-l5 {color:#000 !important; background-color:#f4f6f9 !important}
-.w3-theme-l4 {color:#000 !important; background-color:#d9e1ec !important}
-.w3-theme-l3 {color:#000 !important; background-color:#b4c3d8 !important}
-.w3-theme-l2 {color:#fff !important; background-color:#8ea6c5 !important}
-.w3-theme-l1 {color:#fff !important; background-color:#6888b1 !important}
-.w3-theme-d1 {color:#fff !important; background-color:#456185 !important}
-.w3-theme-d2 {color:#fff !important; background-color:#3d5676 !important}
-.w3-theme-d3 {color:#fff !important; background-color:#354b68 !important}
-.w3-theme-d4 {color:#fff !important; background-color:#2e4059 !important}
-.w3-theme-d5 {color:#fff !important; background-color:#26364a !important}
+const w3_2016_snorkel_blue = css`
+.w3-theme-l5 {color:#000 !important; background-color:#e9f5ff !important}
+.w3-theme-l4 {color:#000 !important; background-color:#b5dffd !important}
+.w3-theme-l3 {color:#000 !important; background-color:#6bc0fc !important}
+.w3-theme-l2 {color:#fff !important; background-color:#21a0fa !important}
+.w3-theme-l1 {color:#fff !important; background-color:#0479cc !important}
+.w3-theme-d1 {color:#fff !important; background-color:#024575 !important}
+.w3-theme-d2 {color:#fff !important; background-color:#023e68 !important}
+.w3-theme-d3 {color:#fff !important; background-color:#02365b !important}
+.w3-theme-d4 {color:#fff !important; background-color:#022e4e !important}
+.w3-theme-d5 {color:#fff !important; background-color:#012641 !important}
 
-.w3-theme-light {color:#000 !important; background-color:#f4f6f9 !important}
-.w3-theme-dark {color:#fff !important; background-color:#26364a !important}
-.w3-theme-action {color:#fff !important; background-color:#26364a !important}
+.w3-theme-light {color:#000 !important; background-color:#e9f5ff !important}
+.w3-theme-dark {color:#fff !important; background-color:#012641 !important}
+.w3-theme-action {color:#fff !important; background-color:#012641 !important}
 
-.w3-theme {color:#fff !important; background-color:#4c6a92 !important}
-.w3-text-theme {color:#4c6a92 !important}
-.w3-border-theme {border-color:#4c6a92 !important}
+.w3-theme {color:#fff !important; background-color:#034f84 !important}
+.w3-text-theme {color:#034f84 !important}
+.w3-border-theme {border-color:#034f84 !important}
 
-.w3-hover-theme:hover {color:#fff !important; background-color:#4c6a92 !important}
-.w3-hover-text-theme:hover {color:#4c6a92 !important}
-.w3-hover-border-theme:hover {border-color:#4c6a92 !important}
+.w3-hover-theme:hover {color:#fff !important; background-color:#034f84 !important}
+.w3-hover-text-theme:hover {color:#034f84 !important}
+.w3-hover-border-theme:hover {border-color:#034f84 !important}
 `;
 
-export let styles = [tf, w3, w3_2016_riverside];
+export let styles = [tf, w3, w3_2016_snorkel_blue];

apps/ssb/tf-tab-mentions.js

@@ -1,78 +0,0 @@
-import {LitElement, html, unsafeHTML} from './lit-all.min.js';
-import * as tfrpc from '/static/tfrpc.js';
-import {styles} from './tf-styles.js';
-
-class TfTabMentionsElement extends LitElement {
-	static get properties() {
-		return {
-			whoami: {type: String},
-			users: {type: Object},
-			following: {type: Array},
-			expanded: {type: Object},
-			messages: {type: Array},
-		};
-	}
-
-	static styles = styles;
-
-	constructor() {
-		super();
-		let self = this;
-		this.whoami = null;
-		this.users = {};
-		this.following = [];
-		this.expanded = {};
-		this.messages = [];
-	}
-
-	async load() {
-		console.log('Loading...', this.whoami);
-		let results = await tfrpc.rpc.query(
-			`
-				SELECT messages.id, messages.previous, messages.author, messages.sequence, messages.timestamp, messages.hash, json(messages.content) AS content, messages.signature
-				FROM messages_fts(?)
-				JOIN messages ON messages.rowid = messages_fts.rowid
-				JOIN json_each(?) AS following ON messages.author = following.value
-				WHERE messages.author != ?
-				ORDER BY timestamp DESC limit 20
-			`,
-			[
-				'"' + this.whoami.replace('"', '""') + '"',
-				JSON.stringify(this.following),
-				this.whoami,
-			]
-		);
-		console.log('Done.');
-		this.messages = results;
-	}
-
-	on_expand(event) {
-		if (event.detail.expanded) {
-			let expand = {};
-			expand[event.detail.id] = true;
-			this.expanded = Object.assign({}, this.expanded, expand);
-		} else {
-			delete this.expanded[event.detail.id];
-			this.expanded = Object.assign({}, this.expanded);
-		}
-	}
-
-	render() {
-		let self = this;
-		if (!this.loading) {
-			this.loading = true;
-			this.load();
-		}
-		return html`
-			<tf-news
-				id="news"
-				whoami=${this.whoami}
-				.messages=${this.messages}
-				.users=${this.users}
-				.expanded=${this.expanded}
-				@tf-expand=${this.on_expand}
-			></tf-news>
-		`;
-	}
-}
-customElements.define('tf-tab-mentions', TfTabMentionsElement);

apps/ssb/tf-tab-news-feed.js

@@ -12,6 +12,9 @@ class TfTabNewsFeedElement extends LitElement {
 			messages: {type: Array},
 			drafts: {type: Object},
 			expanded: {type: Object},
+			channels_unread: {type: Object},
+			loading: {type: Number},
+			time_range: {type: Array},
 		};
 	}
 
@@ -26,19 +29,49 @@ class TfTabNewsFeedElement extends LitElement {
 		this.following = [];
 		this.drafts = {};
 		this.expanded = {};
-		this.start_time = new Date().valueOf() - 24 * 60 * 60 * 1000;
+		this.channels_unread = {};
+		this.start_time = new Date().valueOf();
+		this.time_range = [0, 0];
+		this.loading = 0;
 	}
 
-	async fetch_messages() {
-		if (this.hash.startsWith('#@')) {
+	channel() {
+		return this.hash.startsWith('##')
+			? this.hash.substring(2)
+			: this.hash.substring(1);
+	}
+
+	async fetch_messages(start_time, end_time) {
+		if (this.hash == '#@') {
 			let r = await tfrpc.rpc.query(
 				`
-					WITH mine AS (SELECT id, previous, author, sequence, timestamp, hash, json(content) AS content, signature
+					SELECT messages.rowid, messages.id, messages.previous, messages.author, messages.sequence, messages.timestamp, messages.hash, json(messages.content) AS content, messages.signature
+					FROM messages_fts(?1)
+					JOIN messages ON messages.rowid = messages_fts.rowid
+					JOIN json_each(?2) AS following ON messages.author = following.value
+					WHERE
+						messages.author != ?1 AND
+						messages.timestamp > ?3 AND
+						messages.timestamp < ?4
+					ORDER BY timestamp DESC limit 20
+				`,
+				[
+					'"' + this.whoami.replace('"', '""') + '"',
+					JSON.stringify(this.following),
+					start_time,
+					end_time,
+				]
+			);
+			return r;
+		} else if (this.hash.startsWith('#@')) {
+			let r = await tfrpc.rpc.query(
+				`
+					WITH mine AS (SELECT rowid, id, previous, author, sequence, timestamp, hash, json(content) AS content, signature
 						FROM messages
 						WHERE messages.author = ?
 						ORDER BY sequence DESC
 						LIMIT 20)
-					SELECT messages.id, messages.previous, messages.author, messages.sequence, messages.timestamp, messages.hash, json(messages.content) AS content, messages.signature
+					SELECT messages.rowid, messages.id, messages.previous, messages.author, messages.sequence, messages.timestamp, messages.hash, json(messages.content) AS content, messages.signature
 						FROM mine
 						JOIN messages_refs ON mine.id = messages_refs.ref
 						JOIN messages ON messages_refs.message = messages.id
@@ -62,6 +95,53 @@ class TfTabNewsFeedElement extends LitElement {
 				`,
 				[this.hash.substring(1)]
 			);
+		} else if (this.hash.startsWith('##')) {
+			let promises = [];
+			const k_following_limit = 256;
+			for (let i = 0; i < this.following.length; i += k_following_limit) {
+				promises.push(
+					tfrpc.rpc.query(
+						`
+						WITH news AS (SELECT messages.rowid, messages.id, messages.previous, messages.author, messages.sequence, messages.timestamp, messages.hash, json(messages.content) AS content, messages.signature
+							FROM messages
+							JOIN json_each(?) AS following ON messages.author = following.value
+							WHERE
+								messages.timestamp > ? AND
+								messages.timestamp < ? AND
+								messages.content ->> 'channel' = ?
+							ORDER BY messages.timestamp DESC)
+						SELECT messages.rowid, messages.id, messages.previous, messages.author, messages.sequence, messages.timestamp, messages.hash, json(messages.content) AS content, messages.signature
+							FROM news
+							JOIN messages_refs ON news.id = messages_refs.ref
+							JOIN messages ON messages_refs.message = messages.id
+						UNION
+						SELECT messages.rowid, messages.id, messages.previous, messages.author, messages.sequence, messages.timestamp, messages.hash, json(messages.content) AS content, messages.signature
+							FROM news
+							JOIN messages_refs ON news.id = messages_refs.message
+							JOIN messages ON messages_refs.ref = messages.id
+						UNION
+						SELECT messages.rowid, messages.id, messages.previous, messages.author, messages.sequence, messages.timestamp, messages.hash, json(messages.content) AS content, messages.signature
+							FROM messages_fts(?5)
+							JOIN messages ON messages.rowid = messages_fts.rowid
+							JOIN json_each(?1) AS following ON messages.author = following.value
+							JOIN json_tree(messages.content, '$.mentions') AS mention ON mention.value = '#' || ?4
+							WHERE
+								messages.timestamp > ?2 AND
+								messages.timestamp < ?3
+						UNION
+						SELECT news.* FROM news
+					`,
+						[
+							JSON.stringify(this.following.slice(i, i + k_following_limit)),
+							start_time,
+							end_time,
+							this.hash.substring(2),
+							'"#' + this.hash.substring(2).replace('"', '""') + '"',
+						]
+					)
+				);
+			}
+			return [].concat(...(await Promise.all(promises)));
 		} else {
 			let promises = [];
 			const k_following_limit = 256;
@@ -69,17 +149,17 @@ class TfTabNewsFeedElement extends LitElement {
 				promises.push(
 					tfrpc.rpc.query(
 						`
-						WITH news AS (SELECT messages.id, messages.previous, messages.author, messages.sequence, messages.timestamp, messages.hash, json(messages.content) AS content, messages.signature
+						WITH news AS (SELECT messages.rowid, messages.id, messages.previous, messages.author, messages.sequence, messages.timestamp, messages.hash, json(messages.content) AS content, messages.signature
 						FROM messages
 						JOIN json_each(?) AS following ON messages.author = following.value
 						WHERE messages.timestamp > ? AND messages.timestamp < ?
 						ORDER BY messages.timestamp DESC)
-						SELECT messages.id, messages.previous, messages.author, messages.sequence, messages.timestamp, messages.hash, json(messages.content) AS content, messages.signature
+						SELECT messages.rowid, messages.id, messages.previous, messages.author, messages.sequence, messages.timestamp, messages.hash, json(messages.content) AS content, messages.signature
 							FROM news
 							JOIN messages_refs ON news.id = messages_refs.ref
 							JOIN messages ON messages_refs.message = messages.id
 						UNION
-						SELECT messages.id, messages.previous, messages.author, messages.sequence, messages.timestamp, messages.hash, json(messages.content) AS content, messages.signature
+						SELECT messages.rowid, messages.id, messages.previous, messages.author, messages.sequence, messages.timestamp, messages.hash, json(messages.content) AS content, messages.signature
 							FROM news
 							JOIN messages_refs ON news.id = messages_refs.message
 							JOIN messages ON messages_refs.ref = messages.id
@@ -88,12 +168,8 @@ class TfTabNewsFeedElement extends LitElement {
 					`,
 						[
 							JSON.stringify(this.following.slice(i, i + k_following_limit)),
-							this.start_time,
-							/*
-							 ** Don't show messages more than a day into the future to prevent
-							 ** messages with far-future timestamps from staying at the top forever.
-							 */
-							new Date().valueOf() + 24 * 60 * 60 * 1000,
+							start_time,
+							end_time,
 						]
 					)
 				);
@@ -103,35 +179,27 @@ class TfTabNewsFeedElement extends LitElement {
 	}
 
 	async load_more() {
-		let last_start_time = this.start_time;
-		this.start_time = last_start_time - 24 * 60 * 60 * 1000;
-		let more = await tfrpc.rpc.query(
-			`
-				WITH news AS (SELECT messages.id, messages.previous, messages.author, messages.sequence, messages.timestamp, messages.hash, json(messages.content) AS content, messages.signature
-				FROM messages
-				JOIN json_each(?) AS following ON messages.author = following.value
-				WHERE messages.timestamp > ?
-				AND messages.timestamp <= ?
-				ORDER BY messages.timestamp DESC)
-				SELECT messages.id, messages.previous, messages.author, messages.sequence, messages.timestamp, messages.hash, json(messages.content) AS content, messages.signature
-					FROM news
-					JOIN messages_refs ON news.id = messages_refs.ref
-					JOIN messages ON messages_refs.message = messages.id
-				UNION
-				SELECT messages.id, messages.previous, messages.author, messages.sequence, messages.timestamp, messages.hash, json(messages.content) AS content, messages.signature
-					FROM news
-					JOIN messages_refs ON news.id = messages_refs.message
-					JOIN messages ON messages_refs.ref = messages.id
-				UNION
-				SELECT news.* FROM news
-			`,
-			[JSON.stringify(this.following), this.start_time, last_start_time]
-		);
-		this.messages = await this.decrypt([...more, ...this.messages]);
+		this.loading++;
+		this.loading_canceled = false;
+		try {
+			let more = [];
+			while (!more.length && !this.loading_canceled) {
+				let last_start_time = this.start_time;
+				this.start_time = last_start_time - 7 * 24 * 60 * 60 * 1000;
+				more = await this.fetch_messages(this.start_time, last_start_time);
+				this.time_range = [this.start_time, this.time_range[1]];
+			}
+			this.messages = await this.decrypt([...more, ...this.messages]);
+		} finally {
+			this.loading--;
+		}
+	}
+
+	cancel_load() {
+		this.loading_canceled = true;
 	}
 
 	async decrypt(messages) {
-		console.log('decrypt');
 		let result = [];
 		for (let message of messages) {
 			let content;
@@ -156,8 +224,73 @@ class TfTabNewsFeedElement extends LitElement {
 		return result;
 	}
 
-	async add_messages(messages) {
-		this.messages = await this.decrypt([...messages, ...this.messages]);
+	async load_latest() {
+		this.loading++;
+		let now = new Date().valueOf();
+		let end_time = now + 24 * 60 * 60 * 1000;
+		let messages = [];
+		try {
+			messages = await this.fetch_messages(this.time_range[1], end_time);
+			messages = await this.decrypt(messages);
+			this.time_range = [this.time_range[0], end_time];
+		} finally {
+			this.loading--;
+		}
+		this.messages = [...this.messages, ...messages];
+		console.log('done loading latest messages.');
+	}
+
+	async load_messages() {
+		let self = this;
+		this.loading++;
+		let messages = [];
+		try {
+			this.messages = [];
+			this._messages_hash = this.hash;
+			this._messages_following = this.following;
+			let now = new Date().valueOf();
+			let start_time = now - 24 * 60 * 60 * 1000;
+			this.start_time = start_time;
+			this.time_range = [this.start_time, now + 24 * 60 * 60 * 1000];
+			messages = await this.fetch_messages(
+				this.time_range[0],
+				this.time_range[1]
+			);
+			messages = await this.decrypt(messages);
+			if (!messages.length) {
+				let more = [];
+				while (!more.length && start_time >= 0) {
+					let last_start_time = start_time;
+					start_time = last_start_time - 7 * 24 * 60 * 60 * 1000;
+					more = await this.fetch_messages(start_time, last_start_time);
+				}
+				this.time_range = [start_time, this.time_range[1]];
+				messages = await this.decrypt([...more, ...this.messages]);
+			}
+		} finally {
+			this.loading--;
+		}
+		this.messages = messages;
+		console.log(`loading messages done for ${self.whoami}`);
+	}
+
+	mark_all_read() {
+		let newest = this.messages.reduce(
+			(accumulator, current) => Math.max(accumulator, current.rowid),
+			-1
+		);
+		if (newest >= 0) {
+			this.dispatchEvent(
+				new CustomEvent('channelsetunread', {
+					bubbles: true,
+					composed: true,
+					detail: {
+						channel: this.channel(),
+						unread: newest + 1,
+					},
+				})
+			);
+		}
 	}
 
 	render() {
@@ -169,31 +302,39 @@ class TfTabNewsFeedElement extends LitElement {
 			console.log(
 				`loading messages for ${this.whoami} (following ${this.following.length})`
 			);
-			let self = this;
-			this.messages = [];
-			this._messages_hash = this.hash;
-			this._messages_following = this.following;
-			this.fetch_messages()
-				.then(this.decrypt.bind(this))
-				.then(function (messages) {
-					self.messages = messages;
-					console.log(`loading mesages done for ${self.whoami}`);
-				})
-				.catch(function (error) {
-					alert(JSON.stringify(error, null, 2));
-				});
+			this.load_messages();
 		}
 		let more;
 		if (!this.hash.startsWith('#@') && !this.hash.startsWith('#%')) {
 			more = html`
 				<p>
-					<button class="w3-button w3-theme-d1" @click=${this.load_more}>
+					<button class="w3-button w3-theme-d1" @click=${this.mark_all_read}>
+						Mark All Read
+					</button>
+					<button
+						?disabled=${this.loading}
+						class="w3-button w3-theme-d1"
+						@click=${this.load_more}
+					>
 						Load More
 					</button>
+					<button
+						class=${'w3-button w3-theme-d1' + (this.loading ? '' : ' w3-hide')}
+						@click=${this.cancel_load}
+					>
+						Cancel
+					</button>
+					<span
+						>Showing ${new Date(this.time_range[0]).toLocaleDateString()} -
+						${new Date(this.time_range[1]).toLocaleDateString()}.</span
+					>
 				</p>
 			`;
 		}
 		return html`
+			<button class="w3-button w3-theme-d1" @click=${this.mark_all_read}>
+				Mark All Read
+			</button>
 			<tf-news
 				id="news"
 				whoami=${this.whoami}
@@ -202,6 +343,8 @@ class TfTabNewsFeedElement extends LitElement {
 				.following=${this.following}
 				.drafts=${this.drafts}
 				.expanded=${this.expanded}
+				channel=${this.channel()}
+				channel_unread=${this.channels_unread?.[this.channel()]}
 			></tf-news>
 			${more}
 		`;

apps/ssb/tf-tab-news.js

@@ -13,6 +13,9 @@ class TfTabNewsElement extends LitElement {
 			drafts: {type: Object},
 			expanded: {type: Object},
 			loading: {type: Boolean},
+			channels: {type: Array},
+			channels_unread: {type: Object},
+			channels_latest: {type: Object},
 		};
 	}
 
@@ -29,6 +32,9 @@ class TfTabNewsElement extends LitElement {
 		this.cache = {};
 		this.drafts = {};
 		this.expanded = {};
+		this.channels_unread = {};
+		this.channels_latest = {};
+		this.channels = [];
 		tfrpc.rpc.localStorageGet('drafts').then(function (d) {
 			self.drafts = JSON.parse(d || '{}');
 		});
@@ -48,10 +54,7 @@ class TfTabNewsElement extends LitElement {
 		let unread = this.unread;
 		let news = this.shadowRoot?.getElementById('news');
 		if (news) {
-			console.log('injecting messages', news.messages);
-			news.add_messages(
-				Object.values(Object.fromEntries(this.unread.map((x) => [x.id, x])))
-			);
+			news.load_latest();
 			this.dispatchEvent(new CustomEvent('refresh'));
 		}
 	}
@@ -106,15 +109,57 @@ class TfTabNewsElement extends LitElement {
 		}
 	}
 
+	unread_status(channel) {
+		if (
+			this.channels_latest[channel] &&
+			(this.channels_unread[channel] === undefined ||
+				this.channels_unread[channel] < this.channels_latest[channel])
+		) {
+			return '🔵';
+		}
+	}
+
+	show_sidebar() {
+		this.renderRoot.getElementById('sidebar').style.display = 'block';
+		this.renderRoot.getElementById('sidebar_overlay').style.display = 'block';
+	}
+
+	hide_sidebar() {
+		this.renderRoot.getElementById('sidebar').style.display = 'none';
+		this.renderRoot.getElementById('sidebar_overlay').style.display = 'none';
+	}
+
+	async channel_toggle_subscribed() {
+		let channel = this.hash.substring(2);
+		let subscribed = this.channels.indexOf(channel) != -1;
+		subscribed = !subscribed;
+
+		await tfrpc.rpc.appendMessage(this.whoami, {
+			type: 'channel',
+			channel: channel,
+			subscribed: subscribed,
+		});
+		if (subscribed) {
+			this.channels = [].concat([channel], this.channels).sort();
+		} else {
+			this.channels = this.channels.filter((x) => x != channel);
+		}
+	}
+
+	channel() {
+		return this.hash.startsWith('##') ? this.hash.substring(2) : undefined;
+	}
+
 	render() {
-		let profile = this.hash.startsWith('#@')
-			? html`<tf-profile
-					class="tf-profile"
-					id=${this.hash.substring(1)}
-					whoami=${this.whoami}
-					.users=${this.users}
-				></tf-profile>`
-			: undefined;
+		let profile =
+			this.hash.startsWith('#@') && this.hash != '#@'
+				? html`<tf-profile
+						class="tf-profile"
+						id=${this.hash.substring(1)}
+						whoami=${this.whoami}
+						.users=${this.users}
+					></tf-profile>`
+				: undefined;
 		let edit_profile;
 		if (
 			!this.loading &&
@@ -129,39 +174,111 @@ class TfTabNewsElement extends LitElement {
 			</div>`;
 		}
 		return html`
-			<p class="w3-bar">
-				<button
-					class="w3-bar-item w3-button w3-theme-d1"
-					@click=${this.show_more}
+			<div
+				class="w3-sidebar w3-bar-block w3-theme-d1 w3-collapse w3-animate-left"
+				style="width: 2in; left: 0; z-index: 5"
+				id="sidebar"
+			>
+				<div
+					class="w3-right w3-button w3-hide-large"
+					@click=${this.hide_sidebar}
 				>
-					${this.new_messages_text()}
-				</button>
-			</p>
-			<div class="w3-bar">
-				Welcome, <tf-user id=${this.whoami} .users=${this.users}></tf-user>!
-				${edit_profile}
+					&times;
+				</div>
+				${this.hash.startsWith('##') &&
+				this.channels.indexOf(this.hash.substring(2)) == -1
+					? html`
+							<div class="w3-bar-item w3-theme-d2">Viewing</div>
+							<a
+								href="#"
+								class="w3-bar-item w3-button"
+								style="font-weight: bold"
+								>${this.hash.substring(2)}</a
+							>
+						`
+					: undefined}
+				<div class="w3-bar-item w3-theme-d2">Channels</div>
+				<a
+					href="#"
+					class="w3-bar-item w3-button"
+					style=${this.hash == '#' ? 'font-weight: bold' : undefined}
+					>general ${this.unread_status('')}</a
+				>
+				<a
+					href="#@"
+					class="w3-bar-item w3-button"
+					style=${this.hash == '#@' ? 'font-weight: bold' : undefined}
+					>@mentions ${this.unread_status('@')}</a
+				>
+				${this.channels.map(
+					(x) => html`
+						<a
+							href=${'#' + encodeURIComponent('#' + x)}
+							class="w3-bar-item w3-button"
+							style=${this.hash == '##' + x ? 'font-weight: bold' : undefined}
+							>#${x} ${this.unread_status(x)}</a
+						>
+					`
+				)}
 			</div>
-			<div>
-				<tf-compose
-					id="tf-compose"
+			<div
+				class="w3-overlay"
+				id="sidebar_overlay"
+				@click=${this.hide_sidebar}
+			></div>
+			<div style="margin-left: 2in; padding: 8px" id="main" class="w3-main">
+				<div
+					id="show_sidebar"
+					class="w3-left w3-button w3-hide-large"
+					@click=${this.show_sidebar}
+				>
+					&#9776;
+				</div>
+				<p>
+					<button class="w3-button w3-theme-d1" @click=${this.show_more}>
+						${this.new_messages_text()}
+					</button>
+					${this.hash.startsWith('##')
+						? html`
+								<button
+									class="w3-button w3-theme-d1"
+									@click=${this.channel_toggle_subscribed}
+								>
+									${this.channels.indexOf(this.hash.substring(2)) != -1
+										? 'Unsubscribe from #'
+										: 'Subscribe to #'}${this.hash.substring(2)}
+								</button>
+							`
+						: undefined}
+				</p>
+				<div class="w3-bar">
+					Welcome, <tf-user id=${this.whoami} .users=${this.users}></tf-user>!
+					${edit_profile}
+				</div>
+				<div>
+					<tf-compose
+						id="tf-compose"
+						whoami=${this.whoami}
+						.users=${this.users}
+						.drafts=${this.drafts}
+						@tf-draft=${this.draft}
+						.channel=${this.channel()}
+					></tf-compose>
+				</div>
+				${profile}
+				<tf-tab-news-feed
+					id="news"
 					whoami=${this.whoami}
 					.users=${this.users}
+					.following=${this.following}
+					hash=${this.hash}
 					.drafts=${this.drafts}
+					.expanded=${this.expanded}
 					@tf-draft=${this.draft}
-				></tf-compose>
+					@tf-expand=${this.on_expand}
+					.channels_unread=${this.channels_unread}
+				></tf-tab-news-feed>
 			</div>
-			${profile}
-			<tf-tab-news-feed
-				id="news"
-				whoami=${this.whoami}
-				.users=${this.users}
-				.following=${this.following}
-				hash=${this.hash}
-				.drafts=${this.drafts}
-				.expanded=${this.expanded}
-				@tf-draft=${this.draft}
-				@tf-expand=${this.on_expand}
-			></tf-tab-news-feed>
 		`;
 	}
 }

apps/ssb/tf-tag.js

@@ -18,7 +18,7 @@ class TfTagElement extends LitElement {
 	render() {
 		let number = this.count ? html` (${this.count})` : undefined;
 		return html`<a
-			href="#q=${this.tag}"
+			href=${'#' + encodeURIComponent(this.tag)}
 			style="display: inline-block; margin: 3px; border: 1px solid black; background-color: #444; padding: 4px; border-radius: 3px"
 			>${this.tag}${number}</a
 		>`;

apps/wiki.json

@@ -1,5 +1,5 @@
 {
 	"type": "tildefriends-app",
 	"emoji": "📝",
-	"previous": "&4F4D8+QlJVaxXywChQrNTdSV4Y3TvJ0xxqdq/i9HUWA=.sha256"
+	"previous": "&4UHlsfQJvSh7L3D86uFtr7KUKCMRVBBTFxRIMqIc5as=.sha256"
 }

core/core.js

@@ -419,6 +419,7 @@ async function getProcessBlob(blobId, key, options) {
 					return settings?.[key];
 				};
 				imports.core.globalSettingsSet = async function (key, value) {
+					await imports.core.permissionTest('set_global_setting');
 					print('Setting', key, value);
 					let settings = await loadSettings();
 					settings[key] = value;

default.nix

@@ -21,14 +21,14 @@
 }:
 pkgs.stdenv.mkDerivation rec {
   pname = "tildefriends";
-  version = "0.0.24";
+  version = "0.0.25";
 
   src = pkgs.fetchFromGitea {
     domain = "dev.tildefriends.net";
     owner = "cory";
     repo = "tildefriends";
     rev = "v${version}";
-    hash = "sha256-XlmRr08UmScY//qxUEXHzagXHCFqARRYr3q8RK/jKFY=";
+    hash = "sha256-Rfk+CUhi+Ss0z70CCgmtVM/w4nCL1GX/MsD4sPYIa5s=";
     fetchSubmodules = true;
   };
 

deps/codemirror_src/package-lock.json

@@ -49,9 +49,9 @@
       }
     },
     "node_modules/@codemirror/lang-css": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.3.0.tgz",
-      "integrity": "sha512-CyR4rUNG9OYcXDZwMPvJdtb6PHbBDKUc/6Na2BIwZ6dKab1JQqKa4di+RNRY9Myn7JB81vayKwJeQ7jEdmNVDA==",
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.3.1.tgz",
+      "integrity": "sha512-kr5fwBGiGtmz6l0LSJIbno9QrifNMUusivHbnA1H6Dmqy4HZFte3UAICix1VuKo0lMPKQr2rqB+0BkKi/S3Ejg==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/autocomplete": "^6.0.0",
@@ -104,9 +104,9 @@
       }
     },
     "node_modules/@codemirror/language": {
-      "version": "6.10.3",
-      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.3.tgz",
-      "integrity": "sha512-kDqEU5sCP55Oabl6E7m5N+vZRoc0iWqgDVhEKifcHzPzjqCegcO4amfrYVL9PmPZpl4G0yjkpTpUO/Ui8CzO8A==",
+      "version": "6.10.5",
+      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.5.tgz",
+      "integrity": "sha512-sECWJyNmwqw6mSO6Qf0IVPHwhEnuYbqHBZaaIbdcXtZ6Y2r5vU/dxgC7K1ppWaJFy8XGtTBC0Pd60qI7NfJreQ==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/state": "^6.0.0",
@@ -118,20 +118,20 @@
       }
     },
     "node_modules/@codemirror/lint": {
-      "version": "6.8.2",
-      "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.8.2.tgz",
-      "integrity": "sha512-PDFG5DjHxSEjOXk9TQYYVjZDqlZTFaDBfhQixHnQOEVDDNHUbEh/hstAjcQJaA6FQdZTD1hquXTK0rVBLADR1g==",
+      "version": "6.8.3",
+      "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.8.3.tgz",
+      "integrity": "sha512-GSGfKxCo867P7EX1k2LoCrjuQFeqVgPGRRsSl4J4c0KMkD+k1y6WYvTQkzv0iZ8JhLJDujEvlnMchv4CZQLh3Q==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/state": "^6.0.0",
-        "@codemirror/view": "^6.0.0",
+        "@codemirror/view": "^6.35.0",
         "crelt": "^1.0.5"
       }
     },
     "node_modules/@codemirror/search": {
-      "version": "6.5.7",
-      "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.7.tgz",
-      "integrity": "sha512-6+iLsXvITWKHYlkgHPCs/qiX4dNzn8N78YfhOFvPtPYCkuXqZq10rAfsUMhOq7O/1VjJqdXRflyExlfVcu/9VQ==",
+      "version": "6.5.8",
+      "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.8.tgz",
+      "integrity": "sha512-PoWtZvo7c1XFeZWmmyaOp2G0XVbOnm+fJzvghqGAktBW3cufwJUWvSCcNG0ppXiBEM05mZu6RhMtXPv2hpllig==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/state": "^6.0.0",
@@ -158,9 +158,9 @@
       }
     },
     "node_modules/@codemirror/view": {
-      "version": "6.34.3",
-      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.34.3.tgz",
-      "integrity": "sha512-Ph5d+u8DxIeSgssXEakaakImkzBV4+slwIbcxl9oc9evexJhImeu/G8TK7+zp+IFK9KuJ0BdSn6kTBJeH2CHvA==",
+      "version": "6.35.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.35.0.tgz",
+      "integrity": "sha512-I0tYy63q5XkaWsJ8QRv5h6ves7kvtrBWjBcnf/bzohFJQc5c14a1AQRdE8QpPF9eMp5Mq2FMm59TCj1gDfE7kw==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/state": "^6.4.0",
@@ -370,9 +370,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.27.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.27.3.tgz",
-      "integrity": "sha512-EzxVSkIvCFxUd4Mgm4xR9YXrcp976qVaHnqom/Tgm+vU79k4vV4eYTjmRvGfeoW8m9LVcsAy/lGjcgVegKEhLQ==",
+      "version": "4.27.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.27.4.tgz",
+      "integrity": "sha512-2Y3JT6f5MrQkICUyRVCw4oa0sutfAsgaSsb0Lmmy1Wi2y7X5vT9Euqw4gOsCyy0YfKURBg35nhUKZS4mDcfULw==",
       "cpu": [
         "arm"
       ],
@@ -383,9 +383,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.27.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.27.3.tgz",
-      "integrity": "sha512-LJc5pDf1wjlt9o/Giaw9Ofl+k/vLUaYsE2zeQGH85giX2F+wn/Cg8b3c5CDP3qmVmeO5NzwVUzQQxwZvC2eQKw==",
+      "version": "4.27.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.27.4.tgz",
+      "integrity": "sha512-wzKRQXISyi9UdCVRqEd0H4cMpzvHYt1f/C3CoIjES6cG++RHKhrBj2+29nPF0IB5kpy9MS71vs07fvrNGAl/iA==",
       "cpu": [
         "arm64"
       ],
@@ -396,9 +396,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.27.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.27.3.tgz",
-      "integrity": "sha512-OuRysZ1Mt7wpWJ+aYKblVbJWtVn3Cy52h8nLuNSzTqSesYw1EuN6wKp5NW/4eSre3mp12gqFRXOKTcN3AI3LqA==",
+      "version": "4.27.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.27.4.tgz",
+      "integrity": "sha512-PlNiRQapift4LNS8DPUHuDX/IdXiLjf8mc5vdEmUR0fF/pyy2qWwzdLjB+iZquGr8LuN4LnUoSEvKRwjSVYz3Q==",
       "cpu": [
         "arm64"
       ],
@@ -409,9 +409,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.27.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.27.3.tgz",
-      "integrity": "sha512-xW//zjJMlJs2sOrCmXdB4d0uiilZsOdlGQIC/jjmMWT47lkLLoB1nsNhPUcnoqyi5YR6I4h+FjBpILxbEy8JRg==",
+      "version": "4.27.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.27.4.tgz",
+      "integrity": "sha512-o9bH2dbdgBDJaXWJCDTNDYa171ACUdzpxSZt+u/AAeQ20Nk5x+IhA+zsGmrQtpkLiumRJEYef68gcpn2ooXhSQ==",
       "cpu": [
         "x64"
       ],
@@ -422,9 +422,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.27.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.27.3.tgz",
-      "integrity": "sha512-58E0tIcwZ+12nK1WiLzHOD8I0d0kdrY/+o7yFVPRHuVGY3twBwzwDdTIBGRxLmyjciMYl1B/U515GJy+yn46qw==",
+      "version": "4.27.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.27.4.tgz",
+      "integrity": "sha512-NBI2/i2hT9Q+HySSHTBh52da7isru4aAAo6qC3I7QFVsuhxi2gM8t/EI9EVcILiHLj1vfi+VGGPaLOUENn7pmw==",
       "cpu": [
         "arm64"
       ],
@@ -435,9 +435,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.27.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.27.3.tgz",
-      "integrity": "sha512-78fohrpcVwTLxg1ZzBMlwEimoAJmY6B+5TsyAZ3Vok7YabRBUvjYTsRXPTjGEvv/mfgVBepbW28OlMEz4w8wGA==",
+      "version": "4.27.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.27.4.tgz",
+      "integrity": "sha512-wYcC5ycW2zvqtDYrE7deary2P2UFmSh85PUpAx+dwTCO9uw3sgzD6Gv9n5X4vLaQKsrfTSZZ7Z7uynQozPVvWA==",
       "cpu": [
         "x64"
       ],
@@ -448,9 +448,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.27.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.27.3.tgz",
-      "integrity": "sha512-h2Ay79YFXyQi+QZKo3ISZDyKaVD7uUvukEHTOft7kh00WF9mxAaxZsNs3o/eukbeKuH35jBvQqrT61fzKfAB/Q==",
+      "version": "4.27.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.27.4.tgz",
+      "integrity": "sha512-9OwUnK/xKw6DyRlgx8UizeqRFOfi9mf5TYCw1uolDaJSbUmBxP85DE6T4ouCMoN6pXw8ZoTeZCSEfSaYo+/s1w==",
       "cpu": [
         "arm"
       ],
@@ -461,9 +461,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.27.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.27.3.tgz",
-      "integrity": "sha512-Sv2GWmrJfRY57urktVLQ0VKZjNZGogVtASAgosDZ1aUB+ykPxSi3X1nWORL5Jk0sTIIwQiPH7iE3BMi9zGWfkg==",
+      "version": "4.27.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.27.4.tgz",
+      "integrity": "sha512-Vgdo4fpuphS9V24WOV+KwkCVJ72u7idTgQaBoLRD0UxBAWTF9GWurJO9YD9yh00BzbkhpeXtm6na+MvJU7Z73A==",
       "cpu": [
         "arm"
       ],
@@ -474,9 +474,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.27.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.27.3.tgz",
-      "integrity": "sha512-FPoJBLsPW2bDNWjSrwNuTPUt30VnfM8GPGRoLCYKZpPx0xiIEdFip3dH6CqgoT0RnoGXptaNziM0WlKgBc+OWQ==",
+      "version": "4.27.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.27.4.tgz",
+      "integrity": "sha512-pleyNgyd1kkBkw2kOqlBx+0atfIIkkExOTiifoODo6qKDSpnc6WzUY5RhHdmTdIJXBdSnh6JknnYTtmQyobrVg==",
       "cpu": [
         "arm64"
       ],
@@ -487,9 +487,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.27.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.27.3.tgz",
-      "integrity": "sha512-TKxiOvBorYq4sUpA0JT+Fkh+l+G9DScnG5Dqx7wiiqVMiRSkzTclP35pE6eQQYjP4Gc8yEkJGea6rz4qyWhp3g==",
+      "version": "4.27.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.27.4.tgz",
+      "integrity": "sha512-caluiUXvUuVyCHr5DxL8ohaaFFzPGmgmMvwmqAITMpV/Q+tPoaHZ/PWa3t8B2WyoRcIIuu1hkaW5KkeTDNSnMA==",
       "cpu": [
         "arm64"
       ],
@@ -500,9 +500,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.27.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.27.3.tgz",
-      "integrity": "sha512-v2M/mPvVUKVOKITa0oCFksnQQ/TqGrT+yD0184/cWHIu0LoIuYHwox0Pm3ccXEz8cEQDLk6FPKd1CCm+PlsISw==",
+      "version": "4.27.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.27.4.tgz",
+      "integrity": "sha512-FScrpHrO60hARyHh7s1zHE97u0KlT/RECzCKAdmI+LEoC1eDh/RDji9JgFqyO+wPDb86Oa/sXkily1+oi4FzJQ==",
       "cpu": [
         "ppc64"
       ],
@@ -513,9 +513,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.27.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.27.3.tgz",
-      "integrity": "sha512-LdrI4Yocb1a/tFVkzmOE5WyYRgEBOyEhWYJe4gsDWDiwnjYKjNs7PS6SGlTDB7maOHF4kxevsuNBl2iOcj3b4A==",
+      "version": "4.27.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.27.4.tgz",
+      "integrity": "sha512-qyyprhyGb7+RBfMPeww9FlHwKkCXdKHeGgSqmIXw9VSUtvyFZ6WZRtnxgbuz76FK7LyoN8t/eINRbPUcvXB5fw==",
       "cpu": [
         "riscv64"
       ],
@@ -526,9 +526,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.27.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.27.3.tgz",
-      "integrity": "sha512-d4wVu6SXij/jyiwPvI6C4KxdGzuZOvJ6y9VfrcleHTwo68fl8vZC5ZYHsCVPUi4tndCfMlFniWgwonQ5CUpQcA==",
+      "version": "4.27.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.27.4.tgz",
+      "integrity": "sha512-PFz+y2kb6tbh7m3A7nA9++eInGcDVZUACulf/KzDtovvdTizHpZaJty7Gp0lFwSQcrnebHOqxF1MaKZd7psVRg==",
       "cpu": [
         "s390x"
       ],
@@ -539,9 +539,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.27.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.27.3.tgz",
-      "integrity": "sha512-/6bn6pp1fsCGEY5n3yajmzZQAh+mW4QPItbiWxs69zskBzJuheb3tNynEjL+mKOsUSFK11X4LYF2BwwXnzWleA==",
+      "version": "4.27.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.27.4.tgz",
+      "integrity": "sha512-Ni8mMtfo+o/G7DVtweXXV/Ol2TFf63KYjTtoZ5f078AUgJTmaIJnj4JFU7TK/9SVWTaSJGxPi5zMDgK4w+Ez7Q==",
       "cpu": [
         "x64"
       ],
@@ -552,9 +552,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.27.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.27.3.tgz",
-      "integrity": "sha512-nBXOfJds8OzUT1qUreT/en3eyOXd2EH5b0wr2bVB5999qHdGKkzGzIyKYaKj02lXk6wpN71ltLIaQpu58YFBoQ==",
+      "version": "4.27.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.27.4.tgz",
+      "integrity": "sha512-5AeeAF1PB9TUzD+3cROzFTnAJAcVUGLuR8ng0E0WXGkYhp6RD6L+6szYVX+64Rs0r72019KHZS1ka1q+zU/wUw==",
       "cpu": [
         "x64"
       ],
@@ -565,9 +565,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.27.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.27.3.tgz",
-      "integrity": "sha512-ogfbEVQgIZOz5WPWXF2HVb6En+kWzScuxJo/WdQTqEgeyGkaa2ui5sQav9Zkr7bnNCLK48uxmmK0TySm22eiuw==",
+      "version": "4.27.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.27.4.tgz",
+      "integrity": "sha512-yOpVsA4K5qVwu2CaS3hHxluWIK5HQTjNV4tWjQXluMiiiu4pJj4BN98CvxohNCpcjMeTXk/ZMJBRbgRg8HBB6A==",
       "cpu": [
         "arm64"
       ],
@@ -578,9 +578,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.27.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.27.3.tgz",
-      "integrity": "sha512-ecE36ZBMLINqiTtSNQ1vzWc5pXLQHlf/oqGp/bSbi7iedcjcNb6QbCBNG73Euyy2C+l/fn8qKWEwxr+0SSfs3w==",
+      "version": "4.27.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.27.4.tgz",
+      "integrity": "sha512-KtwEJOaHAVJlxV92rNYiG9JQwQAdhBlrjNRp7P9L8Cb4Rer3in+0A+IPhJC9y68WAi9H0sX4AiG2NTsVlmqJeQ==",
       "cpu": [
         "ia32"
       ],
@@ -591,9 +591,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.27.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.27.3.tgz",
-      "integrity": "sha512-vliZLrDmYKyaUoMzEbMTg2JkerfBjn03KmAw9CykO0Zzkzoyd7o3iZNam/TpyWNjNT+Cz2iO3P9Smv2wgrR+Eg==",
+      "version": "4.27.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.27.4.tgz",
+      "integrity": "sha512-3j4jx1TppORdTAoBJRd+/wJRGCPC0ETWkXOecJ6PPZLj6SptXkrXcNqdj0oclbKML6FkQltdz7bBA3rUSirZug==",
       "cpu": [
         "x64"
       ],
@@ -780,9 +780,9 @@
       }
     },
     "node_modules/rollup": {
-      "version": "4.27.3",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.27.3.tgz",
-      "integrity": "sha512-SLsCOnlmGt9VoZ9Ek8yBK8tAdmPHeppkw+Xa7yDlCEhDTvwYei03JlWo1fdc7YTfLZ4tD8riJCUyAgTbszk1fQ==",
+      "version": "4.27.4",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.27.4.tgz",
+      "integrity": "sha512-RLKxqHEMjh/RGLsDxAEsaLO3mWgyoU6x9w6n1ikAzet4B3gI2/3yP6PWY2p9QzRTh6MfEIXB3MwsOY0Iv3vNrw==",
       "license": "MIT",
       "dependencies": {
         "@types/estree": "1.0.6"
@@ -795,24 +795,24 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.27.3",
-        "@rollup/rollup-android-arm64": "4.27.3",
-        "@rollup/rollup-darwin-arm64": "4.27.3",
-        "@rollup/rollup-darwin-x64": "4.27.3",
-        "@rollup/rollup-freebsd-arm64": "4.27.3",
-        "@rollup/rollup-freebsd-x64": "4.27.3",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.27.3",
-        "@rollup/rollup-linux-arm-musleabihf": "4.27.3",
-        "@rollup/rollup-linux-arm64-gnu": "4.27.3",
-        "@rollup/rollup-linux-arm64-musl": "4.27.3",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.27.3",
-        "@rollup/rollup-linux-riscv64-gnu": "4.27.3",
-        "@rollup/rollup-linux-s390x-gnu": "4.27.3",
-        "@rollup/rollup-linux-x64-gnu": "4.27.3",
-        "@rollup/rollup-linux-x64-musl": "4.27.3",
-        "@rollup/rollup-win32-arm64-msvc": "4.27.3",
-        "@rollup/rollup-win32-ia32-msvc": "4.27.3",
-        "@rollup/rollup-win32-x64-msvc": "4.27.3",
+        "@rollup/rollup-android-arm-eabi": "4.27.4",
+        "@rollup/rollup-android-arm64": "4.27.4",
+        "@rollup/rollup-darwin-arm64": "4.27.4",
+        "@rollup/rollup-darwin-x64": "4.27.4",
+        "@rollup/rollup-freebsd-arm64": "4.27.4",
+        "@rollup/rollup-freebsd-x64": "4.27.4",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.27.4",
+        "@rollup/rollup-linux-arm-musleabihf": "4.27.4",
+        "@rollup/rollup-linux-arm64-gnu": "4.27.4",
+        "@rollup/rollup-linux-arm64-musl": "4.27.4",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.27.4",
+        "@rollup/rollup-linux-riscv64-gnu": "4.27.4",
+        "@rollup/rollup-linux-s390x-gnu": "4.27.4",
+        "@rollup/rollup-linux-x64-gnu": "4.27.4",
+        "@rollup/rollup-linux-x64-musl": "4.27.4",
+        "@rollup/rollup-win32-arm64-msvc": "4.27.4",
+        "@rollup/rollup-win32-ia32-msvc": "4.27.4",
+        "@rollup/rollup-win32-x64-msvc": "4.27.4",
         "fsevents": "~2.3.2"
       }
     },

package-lock.json

@@ -11,9 +11,9 @@
 			}
 		},
 		"node_modules/prettier": {
-			"version": "3.3.3",
-			"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz",
-			"integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==",
+			"version": "3.4.2",
+			"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.4.2.tgz",
+			"integrity": "sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==",
 			"license": "MIT",
 			"bin": {
 				"prettier": "bin/prettier.cjs"

src/android/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.unprompted.tildefriends"
-	android:versionCode="30"
-	android:versionName="0.0.25">
+	android:versionCode="31"
+	android:versionName="0.0.26-wip">
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 	<uses-permission android:name="android.permission.INTERNET"/>
 	<application

src/android/com/unprompted/tildefriends/TildeFriendsActivity.java

@@ -385,8 +385,11 @@ public class TildeFriendsActivity extends Activity {
 			public void onServiceConnected(ComponentName name, IBinder binder) {
 				Log.w("tildefriends", "onServiceConnected");
 				Parcel data = Parcel.obtain();
-				ParcelFileDescriptor pfd = ParcelFileDescriptor.adoptFd(pipe_fd);
-				data.writeParcelable(pfd, 0);
+				try (ParcelFileDescriptor pfd = ParcelFileDescriptor.fromFd(pipe_fd)) {
+					data.writeParcelable(pfd, 0);
+				} catch (java.io.IOException e) {
+					Log.w("tildefriends", "IOException: " + e);
+				}
 				try {
 					binder.transact(TildeFriendsSandboxService.START_CALL,  data, null, IBinder.FLAG_ONEWAY);
 				} catch (RemoteException e) {

src/packetstream.c

@@ -12,6 +12,8 @@ typedef struct _tf_packetstream_t
 {
 	tf_packetstream_onreceive_t* onreceive;
 	void* onreceive_user_data;
+	tf_packetstream_on_close_t* on_close;
+	void* on_close_user_data;
 	uv_pipe_t stream;
 	char* buffer;
 	size_t buffer_size;
@@ -30,6 +32,8 @@ void tf_packetstream_destroy(tf_packetstream_t* stream)
 {
 	stream->onreceive = NULL;
 	stream->onreceive_user_data = NULL;
+	stream->on_close = NULL;
+	stream->on_close_user_data = NULL;
 	stream->destroyed = true;
 	if (stream->buffer)
 	{
@@ -110,6 +114,14 @@ static void _packetstream_on_read(uv_stream_t* handle, ssize_t count, const uv_b
 	}
 	else
 	{
+		tf_packetstream_on_close_t* on_close = stream->on_close;
+		void* user_data = stream->on_close_user_data;
+		stream->on_close = NULL;
+		stream->on_close_user_data = NULL;
+		if (on_close)
+		{
+			on_close(user_data);
+		}
 		tf_packetstream_close(stream);
 	}
 	tf_free(buffer->base);
@@ -150,7 +162,7 @@ void tf_packetstream_send(tf_packetstream_t* stream, int packet_type, const char
 		int result = uv_write(request, (uv_stream_t*)&stream->stream, &write_buffer, 1, _packetstream_on_write);
 		if (result)
 		{
-			tf_printf("uv_write: %s\n", uv_strerror(result));
+			tf_printf("tf_packetstream_send: uv_write: %s\n", uv_strerror(result));
 			tf_free(request);
 		}
 	}
@@ -162,6 +174,12 @@ void tf_packetstream_set_on_receive(tf_packetstream_t* stream, tf_packetstream_o
 	stream->onreceive_user_data = user_data;
 }
 
+void tf_packetstream_set_on_close(tf_packetstream_t* stream, tf_packetstream_on_close_t* callback, void* user_data)
+{
+	stream->on_close = callback;
+	stream->on_close_user_data = user_data;
+}
+
 static void _tf_packetstream_handle_closed(uv_handle_t* handle)
 {
 	tf_packetstream_t* packetstream = handle->data;

src/packetstream.h

@@ -23,6 +23,12 @@ typedef struct _tf_packetstream_t tf_packetstream_t;
 */
 typedef void(tf_packetstream_onreceive_t)(int packet_type, const char* begin, size_t length, void* user_data);
 
+/**
+** A function called when a packetstream reads EOF.
+** @param user_data User data.
+*/
+typedef void(tf_packetstream_on_close_t)(void* user_data);
+
 /**
 ** Create a packet stream.
 ** @return The packet stream.
@@ -58,6 +64,14 @@ void tf_packetstream_send(tf_packetstream_t* stream, int packet_type, const char
 */
 void tf_packetstream_set_on_receive(tf_packetstream_t* stream, tf_packetstream_onreceive_t* callback, void* user_data);
 
+/**
+** Register a callback for when a stream reads EOF.
+** @param stream The packet stream.
+** @param callback The callback.
+** @param user_data User data to pass to the callback.
+*/
+void tf_packetstream_set_on_close(tf_packetstream_t* stream, tf_packetstream_on_close_t* callback, void* user_data);
+
 /**
 ** Close a packet stream.
 ** @param stream The packet stream.

src/ssb.db.c

@@ -135,6 +135,7 @@ void tf_ssb_db_init(tf_ssb_t* ssb)
 	_tf_ssb_db_exec(db, "CREATE INDEX IF NOT EXISTS messages_timestamp_index ON messages (timestamp)");
 	_tf_ssb_db_exec(db, "CREATE INDEX IF NOT EXISTS messages_type_timestamp_index ON messages (content ->> 'type', timestamp)");
 	_tf_ssb_db_exec(db, "CREATE INDEX IF NOT EXISTS messages_size_by_author_index ON messages (author, length(content))");
+	_tf_ssb_db_exec(db, "CREATE INDEX IF NOT EXISTS messages_type_author_channel_index ON messages (content ->> 'type', author, content ->> 'channel');");
 	_tf_ssb_db_exec(db,
 		"CREATE TABLE IF NOT EXISTS blobs ("
 		"  id TEXT PRIMARY KEY,"
@@ -233,13 +234,21 @@ void tf_ssb_db_init(tf_ssb_t* ssb)
 	_tf_ssb_db_exec(db, "DROP VIEW IF EXISTS blob_wants_view");
 	_tf_ssb_db_exec(db,
 		"CREATE VIEW IF NOT EXISTS blob_wants_view (id, timestamp) AS "
-		"  SELECT messages_refs.ref AS id, messages.timestamp AS timestamp "
-		"  FROM messages_refs "
-		"  JOIN messages ON messages.id = messages_refs.message "
-		"  LEFT OUTER JOIN blobs ON messages_refs.ref = blobs.id "
+		"  WITH wanted AS ( "
+		"    SELECT messages_refs.ref AS id, messages.timestamp AS timestamp "
+		"    FROM messages_refs "
+		"    JOIN messages ON messages.id = messages_refs.message "
+		"    UNION "
+		"    SELECT messages_refs.ref AS id, unixepoch() * 1000 AS timestamp "
+		"    FROM messages_refs "
+		"    JOIN messages ON messages.id = messages_refs.message "
+		"    WHERE messages.content ->> 'type' = 'about' "
+		"  ) "
+		"  SELECT wanted.id, wanted.timestamp FROM wanted "
+		"  LEFT OUTER JOIN blobs ON wanted.id = blobs.id "
 		"  WHERE blobs.id IS NULL "
-		"    AND LENGTH(messages_refs.ref) = 52 "
-		"    AND messages_refs.ref LIKE '&%.sha256'");
+		"    AND LENGTH(wanted.id) = 52 "
+		"    AND wanted.id LIKE '&%.sha256'");
 
 	bool need_add_flags = true;
 	bool need_convert_timestamp_to_real = false;

src/task.c

@@ -1338,8 +1338,7 @@ void tf_task_resolve_promise(tf_task_t* task, promiseid_t promise, JSValue value
 	}
 	else
 	{
-		tf_printf("Didn't find promise %d to resolve.\n", promise);
-		abort();
+		tf_printf("WARNING: Didn't find promise %d to resolve.\n", promise);
 	}
 }
 
@@ -1368,8 +1367,7 @@ void tf_task_reject_promise(tf_task_t* task, promiseid_t promise, JSValue value)
 	}
 	else
 	{
-		tf_printf("Didn't find promise %d to reject.\n", promise);
-		abort();
+		tf_printf("WARNING: Didn't find promise %d to reject.\n", promise);
 	}
 }
 

src/taskstub.js.c

@@ -62,6 +62,7 @@ static JSValue _taskstub_set_on_print(JSContext* context, JSValueConst this_val,
 static JSValue _taskstub_loadFile(JSContext* context, JSValueConst this_val, int argc, JSValueConst* argv);
 static void _taskstub_on_process_exit(uv_process_t* process, int64_t status, int terminationSignal);
 static void _taskstub_finalizer(JSRuntime* runtime, JSValue value);
+static void _taskstub_cleanup(tf_taskstub_t* stub);
 
 static void _tf_taskstub_run_sandbox_thread(void* data)
 {
@@ -74,12 +75,60 @@ static void _tf_taskstub_run_sandbox_thread(void* data)
 	tf_task_destroy(task);
 }
 
+static void _taskstub_on_handle_close(uv_handle_t* handle)
+{
+	tf_taskstub_t* stub = handle->data;
+	tf_task_remove_child(stub->_owner, stub);
+	handle->data = NULL;
+	_taskstub_cleanup(stub);
+}
+
+static void _tf_taskstub_on_exit(tf_taskstub_t* stub, int64_t status, int termination_signal)
+{
+	JSContext* context = tf_task_get_context(stub->_owner);
+	if (!JS_IsUndefined(stub->_on_exit))
+	{
+		JSValue ref = JS_DupValue(context, stub->_on_exit);
+		JSValue argv[] = { JS_NewInt64(context, status), JS_NewInt32(context, termination_signal) };
+		JSValue result = JS_Call(context, stub->_on_exit, JS_NULL, 2, argv);
+		tf_util_report_error(context, result);
+		JS_FreeValue(context, result);
+		JS_FreeValue(context, argv[0]);
+		JS_FreeValue(context, argv[1]);
+		JS_FreeValue(context, ref);
+	}
+	if (stub->_stream)
+	{
+		tf_packetstream_destroy(stub->_stream);
+		stub->_stream = NULL;
+	}
+	tf_task_remove_child(stub->_owner, stub);
+	if (stub->_process.data)
+	{
+		uv_close((uv_handle_t*)&stub->_process, _taskstub_on_handle_close);
+	}
+	else
+	{
+		_taskstub_cleanup(stub);
+	}
+}
+
+static void _tf_taskstub_packetstream_close(void* user_data)
+{
+	tf_taskstub_t* stub = user_data;
+	if (!stub->_process.data)
+	{
+		_tf_taskstub_on_exit(stub, -1, -1);
+	}
+}
+
 static JSValue _taskstub_create(JSContext* context, JSValueConst this_val, int argc, JSValueConst* argv)
 {
 	tf_task_t* parent = tf_task_get(context);
 	tf_taskstub_t* stub = tf_malloc(sizeof(tf_taskstub_t));
 	memset(stub, 0, sizeof(*stub));
 	stub->_stream = tf_packetstream_create();
+	tf_packetstream_set_on_close(stub->_stream, _tf_taskstub_packetstream_close, stub);
 
 	JSValue taskObject = JS_NewObjectClass(context, _classId);
 	JS_SetOpaque(taskObject, stub);
@@ -314,35 +363,10 @@ static void _taskstub_finalizer(JSRuntime* runtime, JSValue value)
 	_taskstub_cleanup(stub);
 }
 
-static void _taskstub_on_handle_close(uv_handle_t* handle)
-{
-	tf_taskstub_t* stub = handle->data;
-	tf_task_remove_child(stub->_owner, stub);
-	handle->data = NULL;
-	_taskstub_cleanup(stub);
-}
-
-static void _taskstub_on_process_exit(uv_process_t* process, int64_t status, int terminationSignal)
+static void _taskstub_on_process_exit(uv_process_t* process, int64_t status, int termination_signal)
 {
 	tf_taskstub_t* stub = process->data;
-	JSContext* context = tf_task_get_context(stub->_owner);
-	if (!JS_IsUndefined(stub->_on_exit))
-	{
-		JSValue ref = JS_DupValue(context, stub->_on_exit);
-		JSValue argv[] = { JS_NewInt64(context, status), JS_NewInt32(context, terminationSignal) };
-		JSValue result = JS_Call(context, stub->_on_exit, JS_NULL, 2, argv);
-		tf_util_report_error(context, result);
-		JS_FreeValue(context, result);
-		JS_FreeValue(context, argv[0]);
-		JS_FreeValue(context, argv[1]);
-		JS_FreeValue(context, ref);
-	}
-	if (stub->_stream)
-	{
-		tf_packetstream_destroy(stub->_stream);
-		stub->_stream = NULL;
-	}
-	uv_close((uv_handle_t*)process, _taskstub_on_handle_close);
+	_tf_taskstub_on_exit(stub, status, termination_signal);
 }
 
 static JSValue _taskstub_getExports(JSContext* context, JSValueConst this_val, int argc, JSValueConst* argv)

src/version.h

@@ -1,2 +1,2 @@
-#define VERSION_NUMBER "0.0.25"
+#define VERSION_NUMBER "0.0.26-wip"
 #define VERSION_NAME "This program kills fascists."

tools/autotest.py

@@ -9,14 +9,54 @@ if sys.platform == 'haiku1':
 	print('Automation tests are disabled on Haiku.')
 	exit(0)
 
+import selenium
 from selenium import webdriver
 from selenium.webdriver.firefox.service import Service
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support import expected_conditions
 from selenium.webdriver.support.ui import WebDriverWait
 
-def exists_in_shadow_root(shadow_root, by, value):
-	return lambda driver: shadow_root.find_element(by, value)
+def select(driver, path, action = None):
+	start_time = time.time()
+	while True:
+		try:
+			driver.switch_to.default_content()
+			context = driver
+			for node in path:
+				if node.startswith('#'):
+					context = context.find_element(By.ID, node[1:])
+				elif node.startswith('/'):
+					context = context.find_element(By.XPATH, node)
+				elif node.startswith('.'):
+					context = context.find_element(By.CLASS_NAME, node[1:])
+				elif node.startswith('='):
+					context = context.find_element(By.LINK_TEXT, node[1:])
+				elif node == 'frame':
+					driver.switch_to.frame(context)
+					context = driver
+				elif node == 'shadow_root':
+					context = context.shadow_root
+				else:
+					context = context.find_element(By.TAG_NAME, node)
+			if action is not None:
+				if action[0] == 'click':
+					context.click()
+				elif action[0] == 'send_keys':
+					context.send_keys(action[1])
+				elif action[0] == 'clear':
+					context.clear()
+				else:
+					raise RuntimeError(f'Unexpected action: {action}.')
+				break
+			else:
+				return context
+		except (selenium.common.exceptions.NoSuchElementException,
+				selenium.common.exceptions.NoSuchShadowRootException,
+				selenium.common.exceptions.StaleElementReferenceException,
+				selenium.common.exceptions.WebDriverException):
+			if time.time() - start_time < 5.0:
+				time.sleep(0.1)
+				pass
 
 success = False
 try:
@@ -27,290 +67,177 @@ try:
 	wait = WebDriverWait(driver, 10)
 
 	driver.get('http://localhost:8888')
-	driver.find_element(By.TAG_NAME, 'tf-navigation').shadow_root.find_element(By.LINK_TEXT, 'login').click()
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'register_label').click()
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'name').send_keys('adminuser')
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'password').send_keys('admin_password')
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'confirm').send_keys('admin_password')
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'loginButton').click()
-	wait.until(expected_conditions.presence_of_element_located((By.ID, 'document')))
-	driver.switch_to.frame(driver.find_element(By.ID, 'document'))
-	wait.until(expected_conditions.presence_of_element_located((By.LINK_TEXT, 'identity')))
-	driver.switch_to.default_content()
+	select(driver, ['tf-navigation', 'shadow_root', '=login'], ('click',))
+	select(driver, ['tf-auth', 'shadow_root', '#register_label'], ('click',))
+	select(driver, ['tf-auth', 'shadow_root', '#name'], ('send_keys', 'adminuser'))
+	select(driver, ['tf-auth', 'shadow_root', '#password'], ('send_keys', 'admin_password'))
+	select(driver, ['tf-auth', 'shadow_root', '#confirm'], ('send_keys', 'admin_password'))
+	select(driver, ['tf-auth', 'shadow_root', '#loginButton'], ('click',))
+	select(driver, ['#document', 'frame', '=identity'])
 
 	driver.get('http://localhost:8888/~core/admin/')
-	wait.until(expected_conditions.presence_of_element_located((By.ID, 'document')))
-	driver.switch_to.frame(driver.find_element(By.ID, 'document'))
-	wait.until(expected_conditions.presence_of_element_located((By.ID, 'gs_room_name'))).send_keys('test room')
-	wait.until(expected_conditions.presence_of_element_located((By.XPATH, '//*[@id="gs_room_name"]/following-sibling::button'))).click()
+	select(driver, ['#document', 'frame', '#gs_room_name'], ('send_keys', 'test room'))
+	select(driver, ['#document', 'frame', '//*[@id="gs_room_name"]/following-sibling::button'], ('click',))
+	select(driver, ['//button[text()="✅ Allow"]'], ('click',))
 	driver.switch_to.alert.accept()
-	driver.switch_to.default_content()
 
-	driver.find_element(By.TAG_NAME, 'tf-navigation').shadow_root.find_element(By.ID, 'identity').click()
-	driver.find_element(By.TAG_NAME, 'tf-navigation').shadow_root.find_element(By.ID, 'logout').click()
+	select(driver, ['tf-navigation', 'shadow_root', '#identity'], ('click',))
+	select(driver, ['tf-navigation', 'shadow_root', '#logout'], ('click',))
 
 	driver.get('http://localhost:8888')
-	driver.find_element(By.TAG_NAME, 'tf-navigation').shadow_root.find_element(By.LINK_TEXT, 'login').click()
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'register_label').click()
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'name').send_keys('testuser')
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'password').send_keys('test_password')
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'confirm').send_keys('test_password')
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'loginButton').click()
+	select(driver, ['tf-navigation', 'shadow_root', '=login'], ('click',))
+	select(driver, ['tf-auth', 'shadow_root', '#register_label'], ('click',))
+	select(driver, ['tf-auth', 'shadow_root', '#name'], ('send_keys', 'testuser'))
+	select(driver, ['tf-auth', 'shadow_root', '#password'], ('send_keys', 'test_password'))
+	select(driver, ['tf-auth', 'shadow_root', '#confirm'], ('send_keys', 'test_password'))
+	select(driver, ['tf-auth', 'shadow_root', '#loginButton'], ('click',))
+	select(driver, ['#document'])
 
-	wait.until(expected_conditions.presence_of_element_located((By.ID, 'document')))
-
-	driver.switch_to.default_content()
-	driver.find_element(By.TAG_NAME, 'tf-navigation').shadow_root.find_element(By.ID, 'create_identity').click()
+	select(driver, ['tf-navigation', 'shadow_root', '#create_identity'], ('click',))
 	wait.until(expected_conditions.alert_is_present()).accept()
 
-	wait.until(expected_conditions.presence_of_element_located((By.ID, 'document')))
+	select(driver, ['tf-navigation', 'shadow_root', '#identity'], ('click',))
+	select(driver, ['tf-navigation', 'shadow_root', '#id_dropdown', '//button[position()=2]'], ('click',))
 
-	driver.switch_to.default_content()
-	driver.find_element(By.TAG_NAME, 'tf-navigation').shadow_root.find_element(By.ID, 'identity').click()
-	driver.find_element(By.TAG_NAME, 'tf-navigation').shadow_root.find_element(By.ID, 'id_dropdown').find_element(By.XPATH, '//button[position()=2]').click()
-	wait.until(expected_conditions.presence_of_element_located((By.ID, 'document')))
-	driver.switch_to.frame(driver.find_element(By.ID, 'document'))
-	# NoSuchShadowRootException
-	while True:
-		try:
-			tf_app = wait.until(expected_conditions.presence_of_element_located((By.TAG_NAME, 'tf-app'))).shadow_root
-			break
-		except:
-			pass
-	wait.until(exists_in_shadow_root(wait.until(exists_in_shadow_root(tf_app, By.ID, 'tf-tab-news')).shadow_root, By.CLASS_NAME, 'tf-profile')).shadow_root.find_element(By.ID, 'edit_profile').click()
-	wait.until(exists_in_shadow_root(wait.until(exists_in_shadow_root(tf_app, By.ID, 'tf-tab-news')).shadow_root, By.CLASS_NAME, 'tf-profile')).shadow_root.find_element(By.ID, 'name').send_keys('user')
-	wait.until(exists_in_shadow_root(wait.until(exists_in_shadow_root(tf_app, By.ID, 'tf-tab-news')).shadow_root, By.CLASS_NAME, 'tf-profile')).shadow_root.find_element(By.ID, 'save_profile').click()
-	driver.switch_to.default_content()
-	wait.until(expected_conditions.presence_of_element_located((By.XPATH, '//button[text()="✅ Allow"]'))).click()
+	select(driver, ['#document', 'frame', 'tf-app', 'shadow_root', '#tf-tab-news', 'shadow_root', '.tf-profile', 'shadow_root', '#edit_profile'], ('click',))
+	select(driver, ['#document', 'frame', 'tf-app', 'shadow_root', '#tf-tab-news', 'shadow_root', '.tf-profile', 'shadow_root', '#name'], ('send_keys', 'user'))
+	select(driver, ['#document', 'frame', 'tf-app', 'shadow_root', '#tf-tab-news', 'shadow_root', '.tf-profile', 'shadow_root', '#save_profile'], ('click',))
+
+	select(driver, ['//button[text()="✅ Allow"]'], ('click',))
 
-	driver.switch_to.default_content()
 	driver.get('http://localhost:8888/~testuser/test/')
-	wait.until(expected_conditions.presence_of_element_located((By.ID, 'document')))
-	while True:
-		try:
-			wait.until(exists_in_shadow_root(driver.find_element(By.TAG_NAME, 'tf-navigation').shadow_root, By.ID, 'close_error')).click()
-			break
-		except:
-			pass
+	select(driver, ['#document'])
+	select(driver, ['tf-navigation', 'shadow_root', '#close_error'], ('click',))
+	select(driver, ['tf-navigation', 'shadow_root', '=edit'], ('click',))
+	select(driver, ['#editor', '.cm-content'], ('click',))
+	select(driver, ['#editor', '.cm-content'], ('send_keys', 'app.setDocument(\n\t"<div id=\'test-div\'>Hello, world!</div>"\n);'))
+	select(driver, ['#save'], ('click',))
 
-	driver.switch_to.default_content()
-	driver.find_element(By.TAG_NAME, 'tf-navigation').shadow_root.find_element(By.LINK_TEXT, 'edit').click()
-	editor = driver.find_element(By.ID, 'editor').find_element(By.CLASS_NAME, 'cm-content')
-	editor.click()
-	editor.send_keys('app.setDocument(\n\t"<div id=\'test-div\'>Hello, world!</div>"\n);');
-	driver.find_element(By.ID, 'save').click()
-
-	wait.until(expected_conditions.presence_of_element_located((By.ID, 'document')))
-	driver.switch_to.frame(driver.find_element(By.ID, 'document'))
-	wait.until(expected_conditions.presence_of_element_located((By.ID, 'test-div')))
+	select(driver, ['#document', 'frame', '#test-div'])
 
 	size = driver.get_window_size()
 	driver.set_window_size(1200, 540)
 	driver.save_screenshot('out/screenshot0.png')
 	driver.set_window_size(size['width'], size['height'])
 
-	driver.switch_to.default_content()
-	editor = driver.find_element(By.ID, 'editor').find_element(By.CLASS_NAME, 'cm-content')
-	editor.click()
-	editor.clear()
-	editor.send_keys('app.setDocument("<div id=\'test-div2\'>Hello, world, again!</div>")');
-	driver.find_element(By.ID, 'save').click()
+	select(driver, ['#editor', '.cm-content'], ('click',))
+	select(driver, ['#editor', '.cm-content'], ('clear',))
+	select(driver, ['#editor', '.cm-content'], ('send_keys', 'app.setDocument("<div id=\'test-div2\'>Hello, world, again!</div>")'))
+	select(driver, ['#save'], ('click',))
+	select(driver, ['#document', 'frame', '#test-div2'])
 
-	wait.until(expected_conditions.presence_of_element_located((By.ID, 'document')))
-	driver.switch_to.frame(driver.find_element(By.ID, 'document'))
-	wait.until(expected_conditions.presence_of_element_located((By.ID, 'test-div2')))
-
-	driver.switch_to.default_content()
-	driver.find_element(By.ID, 'delete').click()
+	select(driver, ['#delete'], ('click',))
 	wait.until(expected_conditions.alert_is_present()).accept()
 	wait.until(expected_conditions.alert_is_present()).dismiss()
 	driver.get('http://localhost:8888/~testuser/test/')
-	wait.until(expected_conditions.presence_of_element_located((By.ID, 'document')))
-	while True:
-		try:
-			wait.until(exists_in_shadow_root(driver.find_element(By.TAG_NAME, 'tf-navigation').shadow_root, By.ID, 'close_error')).click()
-			break
-		except:
-			pass
-	driver.find_element(By.TAG_NAME, 'tf-navigation').shadow_root.find_element(By.LINK_TEXT, 'edit').click()
+
+	select(driver, ['#document'])
+	select(driver, ['tf-navigation', 'shadow_root', '#close_error'], ('click',))
+	select(driver, ['tf-navigation', 'shadow_root', '=edit'], ('click',))
 
 	driver.get('http://localhost:8888')
 
-	wait.until(expected_conditions.presence_of_element_located((By.ID, 'document')))
-	driver.switch_to.frame(driver.find_element(By.ID, 'document'))
-
-	wait.until(expected_conditions.presence_of_element_located((By.LINK_TEXT, 'identity')))
+	select(driver, ['#document', 'frame', '=identity'])
 
 	size = driver.get_window_size()
 	driver.set_window_size(540, 1200)
 	driver.save_screenshot('out/screenshot1.png')
 	driver.set_window_size(size['width'], size['height'])
 
-	wait.until(expected_conditions.presence_of_element_located((By.LINK_TEXT, 'identity'))).click()
+	select(driver, ['#document', 'frame', '=identity'], ('click',))
 
-	# StaleElementReferenceException
-	while True:
-		try:
-			driver.switch_to.default_content()
-			wait.until(expected_conditions.presence_of_element_located((By.ID, 'content')))
-			driver.switch_to.frame(wait.until(expected_conditions.presence_of_element_located((By.ID, 'document'))))
-			wait.until(expected_conditions.presence_of_element_located((By.ID, 'create_id'))).click()
-			driver.switch_to.alert.accept()
-			break
-		except:
-			pass
+	select(driver, ['#document', 'frame', '#create_id'], ('click',))
+	id0 = select(driver, ['#document', 'frame', 'li']).text.split(' ')[-1]
 
-	# StaleElementReferenceException
-	while True:
-		try:
-			id0 = wait.until(expected_conditions.presence_of_element_located((By.TAG_NAME, 'li'))).text.split(' ')[-1]
-			break
-		except:
-			pass
-	wait.until(expected_conditions.presence_of_element_located((By.XPATH, '//li/button[text()="Export Identity"]'))).click()
-	driver.switch_to.default_content()
-	wait.until(expected_conditions.presence_of_element_located((By.XPATH, '//button[text()="✅ Allow"]'))).click()
-	driver.switch_to.frame(wait.until(expected_conditions.presence_of_element_located((By.ID, 'document'))))
-	words = wait.until(expected_conditions.presence_of_element_located((By.XPATH, '//li//textarea'))).get_attribute('value')
-	wait.until(expected_conditions.presence_of_element_located((By.XPATH, '//li/button[text()="Delete Identity"]'))).click()
+	select(driver, ['#document', 'frame', '//li/button[text()="Export Identity"]'], ('click',))
+	select(driver, ['//button[text()="✅ Allow"]'], ('click',))
+	words = select(driver, ['#document', 'frame', '//li//textarea']).get_attribute('value')
+	select(driver, ['#document', 'frame', '//li/button[text()="Delete Identity"]'], ('click',))
 	driver.switch_to.alert.send_keys('DELETE')
 	driver.switch_to.alert.accept()
-	driver.switch_to.default_content()
-	wait.until(expected_conditions.presence_of_element_located((By.XPATH, '//button[text()="✅ Allow"]'))).click()
+	select(driver, ['//button[text()="✅ Allow"]'], ('click',))
+	driver.switch_to.alert.accept()
+	words = select(driver, ['#document', 'frame', '//textarea'], ('send_keys', words))
+	select(driver, ['#document', 'frame', '//button[text()="Import Identity"]'], ('click',))
+	select(driver, ['//button[text()="✅ Allow"]'], ('click',))
 	driver.switch_to.alert.accept()
 	driver.switch_to.frame(wait.until(expected_conditions.presence_of_element_located((By.ID, 'document'))))
-	words = wait.until(expected_conditions.presence_of_element_located((By.XPATH, '//textarea'))).send_keys(words)
-	wait.until(expected_conditions.presence_of_element_located((By.XPATH, '//button[text()="Import Identity"]'))).click()
-	driver.switch_to.default_content()
-	wait.until(expected_conditions.presence_of_element_located((By.XPATH, '//button[text()="✅ Allow"]'))).click()
-	driver.switch_to.alert.accept()
-	driver.switch_to.frame(wait.until(expected_conditions.presence_of_element_located((By.ID, 'document'))))
-	id1 = wait.until(expected_conditions.presence_of_element_located((By.TAG_NAME, 'li'))).text.split(' ')[-1]
+	id1 = select(driver, ['#document', 'frame', 'li']).text.split(' ')[-1]
+	assert id0 == id1
 
 	driver.get('http://localhost:8888')
-	wait.until(expected_conditions.presence_of_element_located((By.ID, 'document')))
-	driver.switch_to.frame(driver.find_element(By.ID, 'document'))
-	wait.until(expected_conditions.presence_of_element_located((By.LINK_TEXT, 'ssb'))).click()
-	driver.switch_to.default_content()
+	select(driver, ['#document', 'frame', '=ssb'], ('click',))
+	select(driver, ['#document', 'frame', 'tf-app', 'shadow_root', '#tf-tab-news', 'shadow_root', '#tf-compose', 'shadow_root', '#edit'], ('send_keys', 'Hello, world!'))
+	select(driver, ['#document', 'frame', 'tf-app', 'shadow_root', '#tf-tab-news', 'shadow_root', '#tf-compose', 'shadow_root', '#submit'], ('click',))
+	select(driver, ['//button[text()="✅ Allow"]'], ('click',))
 
-	wait.until(expected_conditions.presence_of_element_located((By.ID, 'content')))
+	select(driver, ['tf-navigation', 'shadow_root', '#identity'], ('click',))
+	select(driver, ['tf-navigation', 'shadow_root', '#logout'], ('click',))
+	select(driver, ['tf-auth', 'shadow_root', '#login_label'], ('click',))
+	select(driver, ['tf-auth', 'shadow_root', '#name'], ('send_keys', 'testuser'))
+	select(driver, ['tf-auth', 'shadow_root', '#password'], ('send_keys', 'test_password'))
+	select(driver, ['tf-auth', 'shadow_root', '#loginButton'], ('click',))
 
-	# StaleElementReferenceException
-	while True:
-		try:
-			driver.switch_to.frame(wait.until(expected_conditions.presence_of_element_located((By.ID, 'document'))))
-			break
-		except:
-			pass
-	# NoSuchShadowRootException
-	while True:
-		try:
-			tf_app = wait.until(expected_conditions.presence_of_element_located((By.TAG_NAME, 'tf-app'))).shadow_root
-			break
-		except:
-			pass
+	select(driver, ['tf-navigation', 'shadow_root', '#identity'], ('click',))
+	select(driver, ['tf-navigation', 'shadow_root', '#logout'], ('click',))
+	select(driver, ['tf-auth', 'shadow_root', '#guest_label'], ('click',))
+	select(driver, ['tf-auth', 'shadow_root', '#guestButton'], ('click',))
+	select(driver, ['#document', 'frame', 'tf-app', 'shadow_root'])
 
-	# WebDriverException (shadow root is detached)
-	while True:
-		try:
-			tf_tab_news = wait.until(exists_in_shadow_root(tf_app, By.ID, 'tf-tab-news')).shadow_root
-			tf_tab_news.find_element(By.ID, 'tf-compose').shadow_root.find_element(By.ID, 'edit').send_keys('Hello, world!')
-			tf_tab_news.find_element(By.ID, 'tf-compose').shadow_root.find_element(By.ID, 'submit').click()
-			break
-		except:
-			pass
+	select(driver, ['tf-navigation', 'shadow_root', '#logout'], ('click',))
+	select(driver, ['tf-auth', 'shadow_root', '#login_label'], ('click',))
 
-	driver.switch_to.default_content()
-	driver.find_element(By.ID, 'allow').click()
+	select(driver, ['tf-auth', 'shadow_root', '#name'], ('send_keys', 'testuser'))
+	select(driver, ['tf-auth', 'shadow_root', '#password'], ('send_keys', 'wrong_password'))
+	select(driver, ['tf-auth', 'shadow_root', '#loginButton'], ('click',))
+	select(driver, ['tf-auth', 'shadow_root', '#error'])
 
-	driver.find_element(By.TAG_NAME, 'tf-navigation').shadow_root.find_element(By.ID, 'identity').click()
-	driver.find_element(By.TAG_NAME, 'tf-navigation').shadow_root.find_element(By.ID, 'logout').click()
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'login_label').click()
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'name').send_keys('testuser')
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'password').send_keys('test_password')
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'loginButton').click()
+	select(driver, ['tf-auth', 'shadow_root', '#name'], ('send_keys', 'wrong_user'))
+	select(driver, ['tf-auth', 'shadow_root', '#password'], ('send_keys', 'test_password'))
+	select(driver, ['tf-auth', 'shadow_root', '#loginButton'], ('click',))
+	select(driver, ['tf-auth', 'shadow_root', '#error'])
 
-	wait.until(expected_conditions.presence_of_element_located((By.ID, 'content')))
+	select(driver, ['tf-auth', 'shadow_root', '#register_label'], ('click',))
+	select(driver, ['tf-auth', 'shadow_root', '#name'], ('send_keys', 'testuser'))
+	select(driver, ['tf-auth', 'shadow_root', '#password'], ('send_keys', 'wrong_test_password'))
+	select(driver, ['tf-auth', 'shadow_root', '#confirm'], ('send_keys', 'wrong_test_password'))
+	select(driver, ['tf-auth', 'shadow_root', '#loginButton'], ('click',))
+	select(driver, ['tf-auth', 'shadow_root', '#error'])
 
-	while True:
-		try:
-			driver.find_element(By.TAG_NAME, 'tf-navigation').shadow_root.find_element(By.ID, 'identity').click()
-			break
-		except:
-			pass
-	driver.find_element(By.TAG_NAME, 'tf-navigation').shadow_root.find_element(By.ID, 'logout').click()
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'guest_label').click()
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'guestButton').click()
+	select(driver, ['tf-auth', 'shadow_root', '#register_label'], ('click',))
+	select(driver, ['tf-auth', 'shadow_root', '#name'], ('send_keys', 'testuser'))
+	select(driver, ['tf-auth', 'shadow_root', '#password'], ('send_keys', 'test_password'))
+	select(driver, ['tf-auth', 'shadow_root', '#confirm'], ('send_keys', 'test_password'))
+	select(driver, ['tf-auth', 'shadow_root', '#loginButton'], ('click',))
+	select(driver, ['tf-auth', 'shadow_root', '#error'])
 
-	wait.until(expected_conditions.presence_of_element_located((By.ID, 'content')))
-	driver.switch_to.frame(wait.until(expected_conditions.presence_of_element_located((By.ID, 'document'))))
-	# NoSuchShadowRootException
-	while True:
-		try:
-			tf_app = wait.until(expected_conditions.presence_of_element_located((By.TAG_NAME, 'tf-app'))).shadow_root
-			break
-		except:
-			pass
-	driver.switch_to.default_content()
+	select(driver, ['tf-auth', 'shadow_root', '#register_label'], ('click',))
+	select(driver, ['tf-auth', 'shadow_root', '#name'], ('send_keys', '😁'))
+	select(driver, ['tf-auth', 'shadow_root', '#password'], ('send_keys', 'test_password'))
+	select(driver, ['tf-auth', 'shadow_root', '#confirm'], ('send_keys', 'test_password'))
+	select(driver, ['tf-auth', 'shadow_root', '#loginButton'], ('click',))
+	select(driver, ['tf-auth', 'shadow_root', '#error'])
 
-	driver.find_element(By.TAG_NAME, 'tf-navigation').shadow_root.find_element(By.ID, 'logout').click()
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'login_label').click()
+	select(driver, ['tf-auth', 'shadow_root', '#change_label'], ('click',))
+	select(driver, ['tf-auth', 'shadow_root', '#name'], ('send_keys', 'testuser'))
+	select(driver, ['tf-auth', 'shadow_root', '#password'], ('send_keys', 'test_password'))
+	select(driver, ['tf-auth', 'shadow_root', '#new_password'], ('send_keys', 'new_password'))
+	select(driver, ['tf-auth', 'shadow_root', '#confirm'], ('send_keys', 'new_password'))
+	select(driver, ['tf-auth', 'shadow_root', '#loginButton'], ('click',))
+	select(driver, ['#document', 'frame'])
 
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'name').send_keys('testuser')
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'password').send_keys('wrong_password')
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'loginButton').click()
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'error')
-
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'name').send_keys('wrong_user')
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'password').send_keys('test_password')
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'loginButton').click()
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'error')
-
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'register_label').click()
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'name').send_keys('testuser')
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'password').send_keys('wrong_test_password')
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'confirm').send_keys('wrong_test_password')
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'loginButton').click()
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'error')
-
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'register_label').click()
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'name').send_keys('1invalid')
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'password').send_keys('test_password')
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'confirm').send_keys('test_password')
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'loginButton').click()
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'error')
-
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'register_label').click()
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'name').send_keys('😁')
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'password').send_keys('test_password')
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'confirm').send_keys('test_password')
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'loginButton').click()
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'error')
-
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'change_label').click()
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'name').send_keys('testuser')
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'password').send_keys('test_password')
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'new_password').send_keys('new_password')
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'confirm').send_keys('new_password')
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'loginButton').click()
-	wait.until(expected_conditions.presence_of_element_located((By.ID, 'document')))
-	while True:
-		try:
-			driver.find_element(By.TAG_NAME, 'tf-navigation').shadow_root.find_element(By.ID, 'identity').click()
-			break
-		except:
-			pass
-	driver.find_element(By.TAG_NAME, 'tf-navigation').shadow_root.find_element(By.ID, 'logout').click()
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'login_label').click()
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'name').send_keys('testuser')
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'password').send_keys('test_password')
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'loginButton').click()
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'error')
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'login_label').click()
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'name').send_keys('testuser')
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'password').send_keys('new_password')
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'loginButton').click()
-	wait.until(expected_conditions.presence_of_element_located((By.ID, 'document')))
+	select(driver, ['tf-navigation', 'shadow_root', '#identity'], ('click',))
+	select(driver, ['tf-navigation', 'shadow_root', '#logout'], ('click',))
+	select(driver, ['tf-auth', 'shadow_root', '#login_label'], ('click',))
+	select(driver, ['tf-auth', 'shadow_root', '#name'], ('send_keys', 'testuser'))
+	select(driver, ['tf-auth', 'shadow_root', '#password'], ('send_keys', 'test_password'))
+	select(driver, ['tf-auth', 'shadow_root', '#loginButton'], ('click',))
+	select(driver, ['tf-auth', 'shadow_root', '#error'])
+	select(driver, ['tf-auth', 'shadow_root', '#login_label'], ('click',))
+	select(driver, ['tf-auth', 'shadow_root', '#name'], ('send_keys', 'testuser'))
+	select(driver, ['tf-auth', 'shadow_root', '#password'], ('send_keys', 'new_password'))
+	select(driver, ['tf-auth', 'shadow_root', '#loginButton'], ('click',))
+	select(driver, ['#document', 'frame'])
 
 	success = True
 finally:

tools/buttfeed.py

@@ -34,6 +34,11 @@ def get_entries():
                 if m:
                     results.append((time.mktime(entry.get('updated_parsed')), name, entry.link, f'new issue #{m.group(1)}: {m.group(2)}'))
                     continue
+            elif '/releases/' in entry.link:
+                m = re.match(r'(.*) released <a href=".*?">(.*?)</a>', entry.title)
+                if m:
+                    results.append((time.mktime(entry.get('updated_parsed')), name, entry.link, f'{m.group(1)} released {m.group(2)}'))
+                    continue
             if entry.summary.startswith('<a href='):
                 for m in re.findall(r'<a href="(.*?)">.*?</a>$\s*^([^\n]+)$', entry.summary, re.S | re.M):
                     results.append((time.mktime(entry.get('updated_parsed')), name, m[0], m[1]))

tools/emojis.py

@@ -0,0 +1,30 @@
+#!/usr/bin/env python3
+
+import json
+import os
+import re
+import urllib.request
+
+if not os.path.exists('out/emoji-test.txt'):
+    urllib.request.urlretrieve('https://unicode.org/Public/emoji/latest/emoji-test.txt', 'out/emoji-test.txt')
+
+doc = {}
+
+with open('out/emoji-test.txt', 'r') as f:
+    for line in f:
+        line = line.strip()
+        if line.startswith('# group: '):
+            group = line[len('# group: '):]
+        elif line.startswith('# subgroup: '):
+            subgroup = line[len('# subgroup: '):]
+        else:
+            m = re.match(r'((?:\s?[0-9A-F]+)+)\s+;.*#.*E\d+\.\d+ (.*)', line)
+            if m:
+                emoji = ''.join(chr(int(g, 16)) for g in m.group(1).split(' '))
+                name = m.group(2)
+                if not group in doc:
+                    doc[group] = {}
+                doc[group][name] = emoji
+
+with open('apps/ssb/emojis.json', 'w') as f:
+    json.dump(doc, f, ensure_ascii = False)