ssb: Revise the message queries slightly to not include votes where it might just be noisy.

apps/ssb.json

@@ -1,5 +1,5 @@
 {
 	"type": "tildefriends-app",
 	"emoji": "🦀",
-	"previous": "&lOCyez82jwCUs8R/Ynx2nBK598+qDZ7RhGnWOaNQO9U=.sha256"
+	"previous": "&9egAArMLNHQzp1yniwnxD41e4T7qXWAfLNJdH4LrXS8=.sha256"
 }

apps/ssb/tf-app.js

@@ -422,16 +422,6 @@ class TfElement extends LitElement {
 				`,
 					k_args
 				),
-				this.query_timed(
-					`
-					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' = 'vote' AND
-						messages.author != ?4
-				`,
-					k_args
-				),
 			])
 		).flat();
 		let latest = {};

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

@@ -174,13 +174,13 @@ class TfTabNewsFeedElement extends LitElement {
 							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.content ->> 'channel' = ?4
+								WHERE messages.content ->> 'channel' = ?4 AND messages.content ->> 'type' != 'vote'
 							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_refs
 								JOIN messages ON messages.id = messages_refs.message
 								JOIN json_each(?1) AS following ON messages.author = following.value
-								WHERE messages_refs.ref = '#' || ?4
+								WHERE messages_refs.ref = '#' || ?4 AND messages.content ->> 'type' != 'vote'
 							)
 					SELECT TRUE AS is_primary, all_news.* FROM all_news
 						WHERE (?2 IS NULL OR all_news.timestamp >= ?2) AND all_news.timestamp < ?3
@@ -235,18 +235,12 @@ class TfTabNewsFeedElement extends LitElement {
 			let t0 = new Date();
 			let initial_messages = await tfrpc.rpc.query(
 				`
-					WITH
-						all_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
-						),
-						news AS (
-							SELECT * FROM all_news
-							WHERE all_news.timestamp < ?3 AND (?2 IS NULL OR all_news.timestamp >= ?2)
-							ORDER BY timestamp DESC LIMIT 20
-						)
-					SELECT TRUE AS is_primary, news.* FROM news
+					SELECT TRUE AS is_primary, 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 < ?3 AND (?2 IS NULL OR messages.timestamp >= ?2) AND
+						messages.content ->> 'type' != 'vote'
+					ORDER BY timestamp DESC LIMIT 20
 				`,
 				[JSON.stringify(this.following), start_time, end_time]
 			);