Add websockets URL to parsing

.github/workflows/main-rust.yml

@@ -34,6 +34,16 @@ jobs:
       - name: Build
         run: RUSTFLAGS='-C target-feature=+crt-static' cargo build --release --target x86_64-unknown-linux-gnu
 
+      - name: Versions
+        id: version
+        run: echo "VERSION=$(cargo metadata --format-version 1 --no-deps | jq .packages[0].version -r | sed 's/^/v/')" >> "$GITHUB_OUTPUT"
+        
+      # Publishing actions
+
+      - name: Publish to crates.io
+        if: github.event_name == 'release'
+        run: cargo publish --no-verify --token ${{ secrets.CARGO_REGISTRY_TOKEN }}
+
       - name: Calculate SHA512 checksum
         run: sha512sum target/x86_64-unknown-linux-gnu/release/redlib > redlib.sha512
 
@@ -49,15 +59,6 @@ jobs:
             redlib.sha512
             redlib.sha256
         
-      - name: Versions
-        id: version
-        run: echo "VERSION=$(cargo metadata --format-version 1 --no-deps | jq .packages[0].version -r | sed 's/^/v/')" >> "$GITHUB_OUTPUT"
-        
-      # Publishing actions
-
-      - name: Publish to crates.io
-        if: github.event_name == 'release'
-        run: cargo publish --no-verify --token ${{ secrets.CARGO_REGISTRY_TOKEN }}
 
       - name: Release
         uses: softprops/action-gh-release@v1

src/main.rs

@@ -229,6 +229,9 @@ async fn main() {
 	app
 		.at("/hls.min.js")
 		.get(|_| resource(include_str!("../static/hls.min.js"), "text/javascript", false).boxed());
+	app
+		.at("/highlighted.js")
+		.get(|_| resource(include_str!("../static/highlighted.js"), "text/javascript", false).boxed());
 
 	// Proxy media through Redlib
 	app.at("/vid/:id/:size").get(|r| proxy(r, "https://v.redd.it/{id}/DASH_{size}").boxed());

src/utils.rs

@@ -311,6 +311,7 @@ pub struct Post {
 	pub gallery: Vec<GalleryMedia>,
 	pub awards: Awards,
 	pub nsfw: bool,
+	pub ws_url: String,
 }
 
 impl Post {
@@ -413,6 +414,7 @@ impl Post {
 				gallery,
 				awards,
 				nsfw: post["data"]["over_18"].as_bool().unwrap_or_default(),
+				ws_url: val(post, "websocket_url"),
 			});
 		}
 
@@ -739,6 +741,7 @@ pub async fn parse_post(post: &serde_json::Value) -> Post {
 		gallery,
 		awards,
 		nsfw: post["data"]["over_18"].as_bool().unwrap_or_default(),
+		ws_url: val(post, "websocket_url"),
 	}
 }
 
@@ -871,18 +874,23 @@ pub fn format_url(url: &str) -> String {
 	}
 }
 
+// These are links we want to replace in-body
 static REDDIT_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r#"href="(https|http|)://(www\.|old\.|np\.|amp\.|new\.|)(reddit\.com|redd\.it)/"#).unwrap());
-static REDDIT_PREVIEW_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r"https?://external-preview\.redd\.it(.*)[^?]").unwrap());
+static REDDIT_PREVIEW_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r"https?://(external-preview|preview)\.redd\.it(.*)[^?]").unwrap());
+static REDDIT_EMOJI_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r"https?://(www|).redditstatic\.com/(.*)").unwrap());
 
 // Rewrite Reddit links to Redlib in body of text
 pub fn rewrite_urls(input_text: &str) -> String {
 	let text1 =
 		// Rewrite Reddit links to Redlib
 		REDDIT_REGEX.replace_all(input_text, r#"href="/"#)
-			.to_string()
-			// Remove (html-encoded) "\" from URLs.
-			.replace("%5C", "")
-			.replace("\\_", "_");
+			.to_string();
+	let text1 = REDDIT_EMOJI_REGEX
+		.replace_all(&text1, format_url(REDDIT_EMOJI_REGEX.find(&text1).map(|x| x.as_str()).unwrap_or_default()))
+		.to_string()
+		// Remove (html-encoded) "\" from URLs.
+		.replace("%5C", "")
+		.replace("\\_", "_");
 
 	// Rewrite external media previews to Redlib
 	if REDDIT_PREVIEW_REGEX.is_match(&text1) {
@@ -1100,6 +1108,10 @@ mod tests {
 			"/hls/foo/HLSPlaylist.m3u8?a=bar&v=1&f=sd"
 		);
 		assert_eq!(format_url("https://www.redditstatic.com/gold/awards/icon/icon.png"), "/static/gold/awards/icon/icon.png");
+		assert_eq!(
+			format_url("https://www.redditstatic.com/marketplace-assets/v1/core/emotes/snoomoji_emotes/free_emotes_pack/shrug.gif"),
+			"/static/marketplace-assets/v1/core/emotes/snoomoji_emotes/free_emotes_pack/shrug.gif"
+		);
 
 		assert_eq!(format_url(""), "");
 		assert_eq!(format_url("self"), "");
@@ -1109,6 +1121,13 @@ mod tests {
 	}
 }
 
+#[test]
+fn test_rewriting_emoji() {
+	let input = r#"<div class="md"><p>How can you have such hard feelings towards a license? <img src="https://www.redditstatic.com/marketplace-assets/v1/core/emotes/snoomoji_emotes/free_emotes_pack/shrug.gif" width="20" height="20" style="vertical-align:middle"> Let people use what license they want, and BSD is one of the least restrictive ones AFAIK.</p>"#;
+	let output = r#"<div class="md"><p>How can you have such hard feelings towards a license? <img src="/static/marketplace-assets/v1/core/emotes/snoomoji_emotes/free_emotes_pack/shrug.gif" width="20" height="20" style="vertical-align:middle"> Let people use what license they want, and BSD is one of the least restrictive ones AFAIK.</p>"#;
+	assert_eq!(rewrite_urls(input), output);
+}
+
 #[tokio::test(flavor = "multi_thread")]
 async fn test_fetching_subreddit_quarantined() {
 	let subreddit = Post::fetch("/r/drugs", true).await;
@@ -1122,3 +1141,12 @@ async fn test_fetching_nsfw_subreddit() {
 	assert!(subreddit.is_ok());
 	assert!(!subreddit.unwrap().0.is_empty());
 }
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_fetching_ws() {
+	let subreddit = Post::fetch("/r/popular", false).await;
+	assert!(subreddit.is_ok());
+	for post in subreddit.unwrap().0 {
+		assert!(post.ws_url.starts_with("wss://k8s-lb.wss.redditmedia.com/link/"));
+	}
+}

static/highlighted.js

@@ -0,0 +1 @@
+document.querySelector('#commentQueryForms').scrollIntoView();

templates/post.html

@@ -31,6 +31,9 @@
 	<meta property="og:video:type" content="video/mp4">
 	{% else %}
 	<meta property="og:type" content="website">
+	{% if single_thread %}
+	<script src="/highlighted.js" defer></script>
+	{% endif %}
 	{% endif %}
 {% endblock %}