Scroll overflowing tables (fixes #469)

* Fix backslash url rewriting.

Add test for rewrite_urls.

Fixes #281.

* Update to v0.22.5

Co-authored-by: spikecodes <19519553+spikecodes@users.noreply.github.com>

.github/workflows/rust.yml

@@ -22,6 +22,10 @@ jobs:
 
       - name: Build
         run: cargo build --release
+
+      - name: Publish to crates.io
+        continue-on-error: true
+        run: cargo publish --no-verify --token ${{ secrets.CARGO_REGISTRY_TOKEN }}
       
       - uses: actions/upload-artifact@v2.2.1
         name: Upload a Build Artifact

Cargo.toml

@@ -3,23 +3,23 @@ name = "libreddit"
 description = " Alternative private front-end to Reddit"
 license = "AGPL-3.0"
 repository = "https://github.com/spikecodes/libreddit"
-version = "0.20.4"
+version = "0.22.6"
 authors = ["spikecodes <19519553+spikecodes@users.noreply.github.com>"]
 edition = "2021"
 
 [dependencies]
-askama = { version = "0.11.0", default-features = false }
-async-recursion = "0.3.2"
-cached = "0.26.2"
-clap = { version = "2.34.0", default-features = false }
-regex = "1.5.4"
-serde = { version = "1.0.132", features = ["derive"] }
-cookie = "0.15.1"
+askama = { version = "0.11.1", default-features = false }
+async-recursion = "1.0.0"
+cached = "0.34.0"
+clap = { version = "3.1.6", default-features = false, features = ["std"] }
+regex = "1.5.5"
+serde = { version = "1.0.136", features = ["derive"] }
+cookie = "0.16.0"
 futures-lite = "1.12.0"
-hyper = { version = "0.14.16", features = ["full"] }
+hyper = { version = "0.14.18", features = ["full"] }
 hyper-rustls = "0.23.0"
 route-recognizer = "0.3.1"
-serde_json = "1.0.73"
-tokio = { version = "1.15.0", features = ["full"] }
-time = "0.2.7"
+serde_json = "1.0.79"
+tokio = { version = "1.17.0", features = ["full"] }
+time = "0.3.9"
 url = "2.2.2"

README.md

@@ -17,7 +17,9 @@
 
 I appreciate any donations! Your support allows me to continue developing Libreddit.
 
-<a href="https://www.buymeacoffee.com/spikecodes" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy Me A Coffee" style="height: 50px" ></a>
+<a href="https://www.buymeacoffee.com/spikecodes" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy Me A Coffee" style="height: 40px" ></a>
+<a href="https://liberapay.com/spike/donate"><img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg" style="height: 40px"></a>
+
 
 **Bitcoin:** [bc1qwyxjnafpu3gypcpgs025cw9wa7ryudtecmwa6y](bitcoin:bc1qwyxjnafpu3gypcpgs025cw9wa7ryudtecmwa6y)
 
@@ -29,6 +31,8 @@ I appreciate any donations! Your support allows me to continue developing Libred
 
 Feel free to [open an issue](https://github.com/spikecodes/libreddit/issues/new) to have your [selfhosted instance](#deployment) listed here!
 
+🔗 **Want to automatically redirect Reddit links to Libreddit? Use [LibRedirect](https://github.com/libredirect/libredirect) or [Privacy Redirect](https://github.com/SimonBrazell/privacy-redirect)!**
+
 | Website | Country | Cloudflare |
 |-|-|-|
 | [libredd.it](https://libredd.it) (official) | 🇺🇸 US |  |
@@ -41,7 +45,7 @@ Feel free to [open an issue](https://github.com/spikecodes/libreddit/issues/new)
 | [lr.riverside.rocks](https://lr.riverside.rocks) | 🇺🇸 US |  |
 | [libreddit.silkky.cloud](https://libreddit.silkky.cloud) | 🇫🇮 FI | ✅ |
 | [libreddit.database.red](https://libreddit.database.red) | 🇺🇸 US | ✅ |
-| [libreddit.exonip.de](https://libreddit.exonip.de) | 🇩🇪 DE |  |
+| [libreddit.privacy.com.de](https://libreddit.privacy.com.de) | 🇩🇪 DE |  |
 | [libreddit.domain.glass](https://libreddit.domain.glass) | 🇺🇸 US | ✅ |
 | [libreddit.sugoma.tk](https://libreddit.sugoma.tk) | 🇺🇸 US | |
 | [libreddit.jamiethalacker.dev](https://libreddit.jamiethalacker.dev) | 🇺🇸 US | ✅ |
@@ -55,17 +59,30 @@ Feel free to [open an issue](https://github.com/spikecodes/libreddit/issues/new)
 | [libreddit.igna.rocks](https://libreddit.igna.rocks) | 🇺🇸 US | |
 | [libreddit.autarkic.org](https://libreddit.autarkic.org) | 🇺🇸 US | |
 | [libreddit.flux.industries](https://libreddit.flux.industries) | 🇩🇪 DE | ✅ |
-| [libreddit.drivet.xyz](https://libreddit.drivet.xyz) | 🇫🇮 FI | ✅ |
+| [libreddit.drivet.xyz](https://libreddit.drivet.xyz) | 🇵🇱 PL |  |
 | [lr.oversold.host](https://lr.oversold.host) | 🇱🇺 LU | |
 | [libreddit.de](https://libreddit.de) | 🇩🇪 DE |  |
 | [libreddit.pussthecat.org](https://libreddit.pussthecat.org) | 🇩🇪 DE |  |
 | [libreddit.mutahar.rocks](https://libreddit.mutahar.rocks) | 🇫🇷 FR |  |
 | [libreddit.northboot.xyz](https://libreddit.northboot.xyz) | 🇩🇪 DE |  |
-| [leddit.xyz](https://www.leddit.xyz) | 🇩🇪 DE |  |
+| [leddit.xyz](https://leddit.xyz) | 🇺🇸 US |  |
+| [de.leddit.xyz](https://de.leddit.xyz) | 🇩🇪 DE |  |
 | [lr.cowfee.moe](https://lr.cowfee.moe) | 🇺🇸 US |  |
 | [libreddit.hu](https://libreddit.hu) | 🇫🇮 FI | ✅ |
 | [libreddit.totaldarkness.net](https://libreddit.totaldarkness.net) | 🇨🇦 CA |  |
-| [libreddit.esmailelbob.xyz](https://libreddit.esmailelbob.xyz) | 🇪🇬 EG |  |
+| [libreddit.esmailelbob.xyz](https://libreddit.esmailelbob.xyz) | 🇨🇦 CA |  |
+| [libreddit.nl](https://libreddit.nl) | 🇳🇱 NL |  |
+| [lr.stilic.ml](https://lr.stilic.ml) | 🇫🇷 FR | ✅ |
+| [reddi.tk](https://reddi.tk) | 🇺🇸 US | ✅ |
+| [libreddit.bus-hit.me](https://libreddit.bus-hit.me) | 🇨🇦 CA |  |
+| [libreddit.datatunnel.xyz](https://libreddit.datatunnel.xyz) | 🇫🇮 FI |  |
+| [libreddit.crewz.me](https://libreddit.crewz.me) | 🇳🇱 NL | ✅ |
+| [r.walkx.org](https://r.walkx.org) | 🇩🇪 DE | ✅ |
+| [libreddit.kylrth.com](https://libreddit.kylrth.com) | 🇨🇦 CA |  |
+| [libreddit.yonalee.eu](https://libreddit.yonalee.eu) | 🇱🇺 LU | ✅ |
+| [libreddit.winscloud.net](https://libreddit.winscloud.net) | 🇹🇭 TH | ✅ |
+| [libreddit.tiekoetter.com](https://libreddit.tiekoetter.com) | 🇩🇪 DE |  |
+| [reddit.rtrace.io](https://reddit.rtrace.io) | 🇩🇪 DE |  |
 | [spjmllawtheisznfs7uryhxumin26ssv2draj7oope3ok3wuhy43eoyd.onion](http://spjmllawtheisznfs7uryhxumin26ssv2draj7oope3ok3wuhy43eoyd.onion) | 🇮🇳 IN |  |
 | [fwhhsbrbltmrct5hshrnqlqygqvcgmnek3cnka55zj4y7nuus5muwyyd.onion](http://fwhhsbrbltmrct5hshrnqlqygqvcgmnek3cnka55zj4y7nuus5muwyyd.onion) | 🇩🇪 DE |  |
 | [kphht2jcflojtqte4b4kyx7p2ahagv4debjj32nre67dxz7y57seqwyd.onion](http://kphht2jcflojtqte4b4kyx7p2ahagv4debjj32nre67dxz7y57seqwyd.onion) | 🇳🇱 NL |  |
@@ -76,7 +93,10 @@ Feel free to [open an issue](https://github.com/spikecodes/libreddit/issues/new)
 | [ledditqo2mxfvlgobxnlhrkq4dh34jss6evfkdkb2thlvy6dn4f4gpyd.onion](http://ledditqo2mxfvlgobxnlhrkq4dh34jss6evfkdkb2thlvy6dn4f4gpyd.onion) | 🇺🇸 US |  |
 | [libredoxhxwnmsb6dvzzd35hmgzmawsq5i764es7witwhddvpc2razid.onion](http://libredoxhxwnmsb6dvzzd35hmgzmawsq5i764es7witwhddvpc2razid.onion) | 🇺🇸 US |  |
 | [libreddit.2syis2nnyytz6jnusnjurva4swlaizlnleiks5mjp46phuwjbdjqwgqd.onion](http://libreddit.2syis2nnyytz6jnusnjurva4swlaizlnleiks5mjp46phuwjbdjqwgqd.onion) | 🇪🇬 EG |  |
-
+| [ol5begilptoou34emq2sshf3may3hlblvipdjtybbovpb7c7zodxmtqd.onion](http://ol5begilptoou34emq2sshf3may3hlblvipdjtybbovpb7c7zodxmtqd.onion) | 🇩🇪 DE |  |
+| [lbrdtjaj7567ptdd4rv74lv27qhxfkraabnyphgcvptl64ijx2tijwid.onion](http://lbrdtjaj7567ptdd4rv74lv27qhxfkraabnyphgcvptl64ijx2tijwid.onion) | 🇨🇦 CA |  |
+| [libreddit.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion](http://libreddit.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion/) | 🇨🇦 CA |  |
+| [libreddit.lunar.icu](https://libreddit.lunar.icu) | 🇩🇪 DE | ✅ |
 
 A checkmark in the "Cloudflare" category here refers to the use of the reverse proxy, [Cloudflare](https://cloudflare). The checkmark will not be listed for a site which uses Cloudflare DNS but rather the proxying service which grants Cloudflare the ability to monitor traffic to the website.
 

src/main.rs

@@ -11,7 +11,7 @@ mod user;
 mod utils;
 
 // Import Crates
-use clap::{App as cli, Arg};
+use clap::{Command, Arg};
 
 use futures_lite::FutureExt;
 use hyper::{header::HeaderValue, Body, Request, Response};
@@ -87,19 +87,19 @@ async fn resource(body: &str, content_type: &str, cache: bool) -> Result<Respons
 
 #[tokio::main]
 async fn main() {
-	let matches = cli::new("Libreddit")
+	let matches = Command::new("Libreddit")
 		.version(env!("CARGO_PKG_VERSION"))
 		.about("Private front-end for Reddit written in Rust ")
 		.arg(
-			Arg::with_name("redirect-https")
-				.short("r")
+			Arg::new("redirect-https")
+				.short('r')
 				.long("redirect-https")
 				.help("Redirect all HTTP requests to HTTPS (no longer functional)")
 				.takes_value(false),
 		)
 		.arg(
-			Arg::with_name("address")
-				.short("a")
+			Arg::new("address")
+				.short('a')
 				.long("address")
 				.value_name("ADDRESS")
 				.help("Sets address to listen on")
@@ -107,8 +107,8 @@ async fn main() {
 				.takes_value(true),
 		)
 		.arg(
-			Arg::with_name("port")
-				.short("p")
+			Arg::new("port")
+				.short('p')
 				.long("port")
 				.value_name("PORT")
 				.help("Port to listen on")
@@ -116,8 +116,8 @@ async fn main() {
 				.takes_value(true),
 		)
 		.arg(
-			Arg::with_name("hsts")
-				.short("H")
+			Arg::new("hsts")
+				.short('H')
 				.long("hsts")
 				.value_name("EXPIRE_TIME")
 				.help("HSTS header to tell browsers that this site should only be accessed over HTTPS")
@@ -193,6 +193,7 @@ async fn main() {
 
 	app.at("/user/[deleted]").get(|req| error(req, "User has deleted their account".to_string()).boxed());
 	app.at("/user/:name").get(|r| user::profile(r).boxed());
+	app.at("/user/:name/:listing").get(|r| user::profile(r).boxed());
 	app.at("/user/:name/comments/:id").get(|r| post::item(r).boxed());
 	app.at("/user/:name/comments/:id/:title").get(|r| post::item(r).boxed());
 	app.at("/user/:name/comments/:id/:title/:comment_id").get(|r| post::item(r).boxed());

src/post.rs

@@ -97,12 +97,20 @@ async fn parse_post(json: &serde_json::Value) -> Post {
 
 	let awards: Awards = Awards::parse(&post["data"]["all_awardings"]);
 
+	let permalink = val(post, "permalink");
+
+	let body = if val(post, "removed_by_category") == "moderator" {
+		format!("<div class=\"md\"><p>[removed] — <a href=\"https://www.reveddit.com{}\">view removed post</a></p></div>", permalink)
+	} else {
+		rewrite_urls(&val(post, "selftext_html"))
+	};
+
 	// Build a post using data parsed from Reddit post API
 	Post {
 		id: val(post, "id"),
 		title: esc!(post, "title"),
 		community: val(post, "subreddit"),
-		body: rewrite_urls(&val(post, "selftext_html")).replace("\\", ""),
+		body,
 		author: Author {
 			name: val(post, "author"),
 			flair: Flair {
@@ -117,7 +125,7 @@ async fn parse_post(json: &serde_json::Value) -> Post {
 			},
 			distinguished: val(post, "distinguished"),
 		},
-		permalink: val(post, "permalink"),
+		permalink,
 		score: format_num(score),
 		upvote_ratio: ratio as i64,
 		post_type,
@@ -174,7 +182,6 @@ fn parse_comments(json: &serde_json::Value, post_link: &str, post_author: &str,
 			let edited = data["edited"].as_f64().map_or((String::new(), String::new()), time);
 
 			let score = data["score"].as_i64().unwrap_or(0);
-			let body = rewrite_urls(&val(&comment, "body_html"));
 
 			// If this comment contains replies, handle those too
 			let replies: Vec<Comment> = if data["replies"].is_object() {
@@ -191,6 +198,12 @@ fn parse_comments(json: &serde_json::Value, post_link: &str, post_author: &str,
 			let id = val(&comment, "id");
 			let highlighted = id == highlighted_comment;
 
+			let body = if val(&comment, "author") == "[deleted]" && val(&comment, "body") == "[removed]" {
+				format!("<div class=\"md\"><p>[removed] — <a href=\"https://www.reveddit.com{}{}\">view removed comment</a></p></div>", post_link, id)
+			} else {
+				rewrite_urls(&val(&comment, "body_html"))
+			};
+
 			let author = Author {
 				name: val(&comment, "author"),
 				flair: Flair {

src/search.rs

@@ -54,6 +54,10 @@ pub async fn find(req: Request<Body>) -> Result<Response<Body>, String> {
 		return Ok(redirect("/".to_string()));
 	}
 
+	if query.starts_with("r/") {
+		return Ok(redirect(format!("/{}", query)));
+	}
+
 	let sub = req.param("sub").unwrap_or_default();
 	let quarantined = can_access_quarantine(&req, &sub);
 	// Handle random subreddits

src/server.rs

@@ -105,7 +105,7 @@ impl ResponseExt for Response<Body> {
 	fn remove_cookie(&mut self, name: String) {
 		let mut cookie = Cookie::named(name);
 		cookie.set_path("/");
-		cookie.set_max_age(Duration::second());
+		cookie.set_max_age(Duration::seconds(1));
 		if let Ok(val) = HeaderValue::from_str(&cookie.to_string()) {
 			self.headers_mut().append("Set-Cookie", val);
 		}

src/subreddit.rs

@@ -19,6 +19,7 @@ struct SubredditTemplate {
 	ends: (String, String),
 	prefs: Preferences,
 	url: String,
+	redirect_url: String,
 	/// Whether the subreddit itself is filtered.
 	is_filtered: bool,
 	/// Whether all fetched posts are filtered (to differentiate between no posts fetched in the first place,
@@ -86,18 +87,17 @@ pub async fn community(req: Request<Body>) -> Result<Response<Body>, String> {
 		} else {
 			Subreddit::default()
 		}
-	} else if sub_name.contains('+') {
-		// Multireddit
+	} else {
+		// Multireddit, all, popular
 		Subreddit {
 			name: sub_name.clone(),
 			..Subreddit::default()
 		}
-	} else {
-		Subreddit::default()
 	};
 
 	let path = format!("/r/{}/{}.json?{}&raw_json=1", sub_name.clone(), sort, req.uri().query().unwrap_or_default());
 	let url = String::from(req.uri().path_and_query().map_or("", |val| val.as_str()));
+	let redirect_url = url[1..].replace('?', "%3F").replace('&', "%26");
 	let filters = get_filters(&req);
 
 	// If all requested subs are filtered, we don't need to fetch posts.
@@ -109,6 +109,7 @@ pub async fn community(req: Request<Body>) -> Result<Response<Body>, String> {
 			ends: (param(&path, "after").unwrap_or_default(), "".to_string()),
 			prefs: Preferences::new(req),
 			url,
+			redirect_url,
 			is_filtered: true,
 			all_posts_filtered: false,
 		})
@@ -124,6 +125,7 @@ pub async fn community(req: Request<Body>) -> Result<Response<Body>, String> {
 					ends: (param(&path, "after").unwrap_or_default(), after),
 					prefs: Preferences::new(req),
 					url,
+					redirect_url,
 					is_filtered: false,
 					all_posts_filtered,
 				})
@@ -211,7 +213,7 @@ pub async fn subscriptions_filters(req: Request<Body>) -> Result<Response<Body>,
 		.unwrap_or_default();
 
 	// Find each subreddit name (separated by '+') in sub parameter
-	for part in sub.split('+') {
+	for part in sub.split('+').filter(|x| x != &"") {
 		// Retrieve display name for the subreddit
 		let display;
 		let part = if part.starts_with("u_") {
@@ -253,7 +255,7 @@ pub async fn subscriptions_filters(req: Request<Body>) -> Result<Response<Body>,
 	// Redirect back to subreddit
 	// check for redirect parameter if unsubscribing/unfiltering from outside sidebar
 	let path = if let Some(redirect_path) = param(&format!("?{}", query), "redirect") {
-		format!("/{}/", redirect_path)
+		format!("/{}", redirect_path)
 	} else {
 		format!("/r/{}", sub)
 	};
@@ -334,10 +336,10 @@ pub async fn sidebar(req: Request<Body>) -> Result<Response<Body>, String> {
 	match json(path, quarantined).await {
 		// If success, receive JSON in response
 		Ok(response) => template(WikiTemplate {
-			wiki: rewrite_urls(&val(&response, "description_html").replace("\\", "")),
+			wiki: rewrite_urls(&val(&response, "description_html")),
 			// wiki: format!(
 			// 	"{}<hr><h1>Moderators</h1><br><ul>{}</ul>",
-			// 	rewrite_urls(&val(&response, "description_html").replace("\\", "")),
+			// 	rewrite_urls(&val(&response, "description_html"),
 			// 	moderators(&sub, quarantined).await.unwrap_or(vec!["Could not fetch moderators".to_string()]).join(""),
 			// ),
 			sub,
@@ -409,7 +411,7 @@ async fn subreddit(sub: &str, quarantined: bool) -> Result<Subreddit, String> {
 		name: esc!(&res, "display_name"),
 		title: esc!(&res, "title"),
 		description: esc!(&res, "public_description"),
-		info: rewrite_urls(&val(&res, "description_html").replace("\\", "")),
+		info: rewrite_urls(&val(&res, "description_html")),
 		// moderators: moderators_list(sub, quarantined).await.unwrap_or_default(),
 		icon: format_url(&icon),
 		members: format_num(members),

src/user.rs

@@ -5,7 +5,7 @@ use crate::server::RequestExt;
 use crate::utils::{error, filter_posts, format_url, get_filters, param, template, Post, Preferences, User};
 use askama::Template;
 use hyper::{Body, Request, Response};
-use time::OffsetDateTime;
+use time::{OffsetDateTime, macros::format_description};
 
 // STRUCTS
 #[derive(Template)]
@@ -15,8 +15,11 @@ struct UserTemplate {
 	posts: Vec<Post>,
 	sort: (String, String),
 	ends: (String, String),
+	/// "overview", "comments", or "submitted"
+	listing: String,
 	prefs: Preferences,
 	url: String,
+	redirect_url: String,
 	/// Whether the user themself is filtered.
 	is_filtered: bool,
 	/// Whether all fetched posts are filtered (to differentiate between no posts fetched in the first place,
@@ -26,13 +29,17 @@ struct UserTemplate {
 
 // FUNCTIONS
 pub async fn profile(req: Request<Body>) -> Result<Response<Body>, String> {
+	let listing = req.param("listing").unwrap_or_else(|| "overview".to_string());
+
 	// Build the Reddit JSON API path
 	let path = format!(
-		"/user/{}.json?{}&raw_json=1",
+		"/user/{}/{}.json?{}&raw_json=1",
 		req.param("name").unwrap_or_else(|| "reddit".to_string()),
-		req.uri().query().unwrap_or_default()
+		listing,
+		req.uri().query().unwrap_or_default(),
 	);
 	let url = String::from(req.uri().path_and_query().map_or("", |val| val.as_str()));
+	let redirect_url = url[1..].replace('?', "%3F").replace('&', "%26");
 
 	// Retrieve other variables from Libreddit request
 	let sort = param(&path, "sort").unwrap_or_default();
@@ -46,8 +53,10 @@ pub async fn profile(req: Request<Body>) -> Result<Response<Body>, String> {
 			posts: Vec::new(),
 			sort: (sort, param(&path, "t").unwrap_or_default()),
 			ends: (param(&path, "after").unwrap_or_default(), "".to_string()),
+			listing,
 			prefs: Preferences::new(req),
 			url,
+			redirect_url,
 			is_filtered: true,
 			all_posts_filtered: false,
 		})
@@ -62,8 +71,10 @@ pub async fn profile(req: Request<Body>) -> Result<Response<Body>, String> {
 					posts,
 					sort: (sort, param(&path, "t").unwrap_or_default()),
 					ends: (param(&path, "after").unwrap_or_default(), after),
+					listing,
 					prefs: Preferences::new(req),
 					url,
+					redirect_url,
 					is_filtered: false,
 					all_posts_filtered,
 				})
@@ -82,7 +93,8 @@ async fn user(name: &str) -> Result<User, String> {
 	// Send a request to the url
 	json(path, false).await.map(|res| {
 		// Grab creation date as unix timestamp
-		let created: i64 = res["data"]["created"].as_f64().unwrap_or(0.0).round() as i64;
+		let created_unix = res["data"]["created"].as_f64().unwrap_or(0.0).round() as i64;
+		let created = OffsetDateTime::from_unix_timestamp(created_unix).unwrap_or(OffsetDateTime::UNIX_EPOCH);
 
 		// Closure used to parse JSON from Reddit APIs
 		let about = |item| res["data"]["subreddit"][item].as_str().unwrap_or_default().to_string();
@@ -93,7 +105,7 @@ async fn user(name: &str) -> Result<User, String> {
 			title: esc!(about("title")),
 			icon: format_url(&about("icon_img")),
 			karma: res["data"]["total_karma"].as_i64().unwrap_or(0),
-			created: OffsetDateTime::from_unix_timestamp(created).format("%b %d '%y"),
+			created: created.format(format_description!("[month repr:short] [day] '[year repr:last_two]")).unwrap_or_default(),
 			banner: esc!(about("banner_img")),
 			description: about("public_description"),
 		}

src/utils.rs

@@ -9,7 +9,7 @@ use regex::Regex;
 use serde_json::Value;
 use std::collections::{HashMap, HashSet};
 use std::str::FromStr;
-use time::{Duration, OffsetDateTime};
+use time::{Duration, OffsetDateTime, macros::format_description};
 use url::Url;
 
 // Post flair with content, background color and foreground color
@@ -548,7 +548,7 @@ pub fn format_url(url: &str) -> String {
 	if url.is_empty() || url == "self" || url == "default" || url == "nsfw" || url == "spoiler" {
 		String::new()
 	} else {
-		Url::parse(url).map_or(String::new(), |parsed| {
+		Url::parse(url).map_or(url.to_string(), |parsed| {
 			let domain = parsed.domain().unwrap_or_default();
 
 			let capture = |regex: &str, format: &str, segments: i16| {
@@ -584,6 +584,9 @@ pub fn format_url(url: &str) -> String {
 
 			match domain {
 				"www.reddit.com" => capture(r"https://www\.reddit\.com/(.*)", "/", 1),
+				"old.reddit.com" => capture(r"https://old\.reddit\.com/(.*)", "/", 1),
+				"np.reddit.com" => capture(r"https://np\.reddit\.com/(.*)", "/", 1),
+				"reddit.com" => capture(r"https://reddit\.com/(.*)", "/", 1),
 				"v.redd.it" => chain!(
 					capture(r"https://v\.redd\.it/(.*)/DASH_([0-9]{2,4}(\.mp4|$|\?source=fallback))", "/vid/", 2),
 					capture(r"https://v\.redd\.it/(.+)/(HLSPlaylist\.m3u8.*)$", "/hls/", 2)
@@ -596,7 +599,7 @@ pub fn format_url(url: &str) -> String {
 				"external-preview.redd.it" => capture(r"https://external\-preview\.redd\.it/(.*)", "/preview/external-pre/", 1),
 				"styles.redditmedia.com" => capture(r"https://styles\.redditmedia\.com/(.*)", "/style/", 1),
 				"www.redditstatic.com" => capture(r"https://www\.redditstatic\.com/(.*)", "/static/", 1),
-				_ => String::new(),
+				_ => url.to_string(),
 			}
 		})
 	}
@@ -604,8 +607,12 @@ pub fn format_url(url: &str) -> String {
 
 // Rewrite Reddit links to Libreddit in body of text
 pub fn rewrite_urls(input_text: &str) -> String {
+
 	let text1 =
-		Regex::new(r#"href="(https|http|)://(www\.|old\.|np\.|amp\.|)(reddit\.com|redd\.it)/"#).map_or(String::new(), |re| re.replace_all(input_text, r#"href="/"#).to_string());
+		Regex::new(r#"href="(https|http|)://(www\.|old\.|np\.|amp\.|)(reddit\.com|redd\.it)/"#)
+			.map_or(String::new(), |re| re.replace_all(input_text, r#"href="/"#).to_string())
+			// Remove (html-encoded) "\" from URLs.
+			.replace("%5C", "").replace(r"\", "");
 
 	// Rewrite external media previews to Libreddit
 	Regex::new(r"https://external-preview\.redd\.it(.*)[^?]").map_or(String::new(), |re| {
@@ -634,12 +641,12 @@ pub fn format_num(num: i64) -> (String, String) {
 
 // Parse a relative and absolute time from a UNIX timestamp
 pub fn time(created: f64) -> (String, String) {
-	let time = OffsetDateTime::from_unix_timestamp(created.round() as i64);
+	let time = OffsetDateTime::from_unix_timestamp(created.round() as i64).unwrap_or(OffsetDateTime::UNIX_EPOCH);
 	let time_delta = OffsetDateTime::now_utc() - time;
 
 	// If the time difference is more than a month, show full date
 	let rel_time = if time_delta > Duration::days(30) {
-		time.format("%b %d '%y")
+		time.format(format_description!("[month repr:short] [day] '[year repr:last_two]")).unwrap_or_default()
 	// Otherwise, show relative date/time
 	} else if time_delta.whole_days() > 0 {
 		format!("{}d ago", time_delta.whole_days())
@@ -649,7 +656,7 @@ pub fn time(created: f64) -> (String, String) {
 		format!("{}m ago", time_delta.whole_minutes())
 	};
 
-	(rel_time, time.format("%b %d %Y, %H:%M:%S UTC"))
+	(rel_time, time.format(format_description!("[month repr:short] [day] [year], [hour]:[minute]:[second] UTC")).unwrap_or_default())
 }
 
 // val() function used to parse JSON from Reddit APIs
@@ -707,6 +714,7 @@ pub async fn error(req: Request<Body>, msg: String) -> Result<Response<Body>, St
 #[cfg(test)]
 mod tests {
 	use super::format_num;
+	use super::rewrite_urls;
 
 	#[test]
 	fn format_num_works() {
@@ -716,4 +724,13 @@ mod tests {
 		assert_eq!(format_num(1001), ("1.0k".to_string(), "1001".to_string()));
 		assert_eq!(format_num(1_999_999), ("2.0m".to_string(), "1999999".to_string()));
 	}
+
+	#[test]
+	fn rewrite_urls_removes_backslashes() {
+		let comment_body_html = r#"<a href=\"https://www.reddit.com/r/linux%5C_gaming/comments/x/just%5C_a%5C_test%5C/\">https://www.reddit.com/r/linux\\_gaming/comments/x/just\\_a\\_test/</a>"#;
+		assert_eq!(
+			rewrite_urls(comment_body_html),
+			r#"<a href="https://www.reddit.com/r/linux_gaming/comments/x/just_a_test/">https://www.reddit.com/r/linux_gaming/comments/x/just_a_test/</a>"#
+		)
+	}
 }

static/style.css

@@ -487,8 +487,8 @@ aside {
 
 /* Sorting and Search */
 
-select, #search, #sort_options, #inside, #searchbox > *, #sort_submit {
-	height: 40px;
+select, #search, #sort_options, #listing_options, #inside, #searchbox > *, #sort_submit {
+	height: 38px;
 }
 
 .search_label {
@@ -505,7 +505,7 @@ select {
 
 select, #search {
 	border: none;
-	padding: 0 15px;
+	padding: 0 10px;
 	
 	appearance: none;
 	-webkit-appearance: none;
@@ -563,6 +563,11 @@ button.submit:hover > svg { stroke: var(--accent); }
 	border-radius: 5px 0px 0px 5px;
 }
 
+#listing_options + #sort_select {
+	margin-left: 10px;
+	border-radius: 5px 0px 0px 5px;
+}
+
 #search_sort {
 	background: var(--highlighted);
 	border-radius: 5px;
@@ -591,15 +596,16 @@ button.submit:hover > svg { stroke: var(--accent); }
 	margin-bottom: 20px;
 }
 
-#sort_options, footer > a {
+#sort_options, #listing_options, footer > a {
 	border-radius: 5px;
+	align-items: center;
 	box-shadow: var(--shadow);
 	background: var(--outside);
 	display: flex;
-	overflow: auto;
+	overflow: hidden;
 }
 
-#sort_options > a, footer > a {
+#sort_options > a, #listing_options > a, footer > a {
 	color: var(--text);
 	padding: 10px 20px;
 	text-align: center;
@@ -607,12 +613,12 @@ button.submit:hover > svg { stroke: var(--accent); }
 	transition: 0.2s background;
 }
 
-#sort_options > a.selected {
+#sort_options > a.selected, #listing_options > a.selected {
 	background: var(--accent);
 	color: var(--foreground);
 }
 
-#sort_options > a:not(.selected):hover {
+#sort_options > a:not(.selected):hover, #listing_options > a:not(.selected):hover {
 	background: var(--foreground);
 }
 
@@ -719,7 +725,7 @@ a.search_subreddit:hover {
 }
 
 .post_score {
-	padding-top: 16px;
+	padding-top: 19px;
 	padding-left: 12px;
 	font-size: 13px;
 	font-weight: bold;
@@ -748,6 +754,7 @@ a.search_subreddit:hover {
 	font-size: 16px;
 	font-weight: 500;
 	line-height: 1.5;
+	overflow-wrap: anywhere;
 	margin: 5px 15px 5px 12px;
 	grid-area: post_title;
 }
@@ -875,8 +882,9 @@ a.search_subreddit:hover {
 
 #post_url {
 	color: var(--accent);
-	margin: 5px 15px;
+	margin: 5px 12px;
 	grid-area: post_media;
+	overflow-wrap: anywhere;
 }
 
 .post_body {
@@ -902,7 +910,7 @@ a.search_subreddit:hover {
 	opacity: 0.5;
 	font-size: 14px;
 	grid-area: post_footer;
-	margin: 5px 20px 15px 15px;
+	margin: 5px 20px 15px 12px;
 }
 
 .post_comments {
@@ -1180,12 +1188,10 @@ summary.comment_data {
 	color: var(--accent);
 }
 
-
 .prefs {
 	display: flex;
 	flex-direction: column;
 	justify-content: space-between;
-	align-items: center;
 	padding: 20px;
 	background: var(--post);
 	border-radius: 5px;
@@ -1198,11 +1204,19 @@ summary.comment_data {
 	width: 100%;
 	height: 35px;
 	align-items: center;
-	margin-top: 10px;
+	margin-top: 7px;
 }
 
-.prefs > p {
+.prefs legend {
 	font-weight: 500;
+	border-bottom: 1px solid var(--highlighted);
+	font-size: 18px;
+	padding-bottom: 10px;
+}
+
+.prefs legend:not(:first-child) {
+	padding-top: 10px;
+	margin-top: 15px;
 }
 
 .prefs select {
@@ -1304,6 +1318,8 @@ input[type="submit"] {
 .md table {
 	margin: 5px;
 	overflow-x: auto;
+	display: block;
+	max-width: fit-content;
 }
 
 .md code {

templates/comment.html

@@ -13,7 +13,7 @@
 			{% if author.name != "[deleted]" %}
 				<a class="comment_author {{ author.distinguished }} {% if author.name == post_author %}op{% endif %}" href="/user/{{ author.name }}">u/{{ author.name }}</a>
 			{% else %}
-				<span class="comment_author">u/[deleted]</span>
+				<span class="comment_author {{ author.distinguished }}">u/[deleted]</span>
 			{% endif %}
 			{% if author.flair.flair_parts.len() > 0 %}
 				<small class="author_flair">{% call utils::render_flair(author.flair.flair_parts) %}</small>

templates/post.html

@@ -37,7 +37,7 @@
 			<p class="post_header">
 				<a class="post_subreddit" href="/r/{{ post.community }}">r/{{ post.community }}</a>
 				<span class="dot">&bull;</span>
-				<a class="post_author" href="/user/{{ post.author.name }}">u/{{ post.author.name }}</a>
+				<a class="post_author {{ post.author.distinguished }}" href="/user/{{ post.author.name }}">u/{{ post.author.name }}</a>
 				{% if post.author.flair.flair_parts.len() > 0 %}
 					<small class="author_flair">{% call utils::render_flair(post.author.flair.flair_parts) %}</small>
 				{% endif %}
@@ -56,7 +56,7 @@
 				{% endif %}
 			</p>
 			<p class="post_title">
-				<a href="{{ post.permalink }}">{{ post.title }}</a>
+				{{ post.title }}
 				{% if post.flair.flair_parts.len() > 0 %}
 					<a href="/r/{{ post.community }}/search?q=flair_name%3A%22{{ post.flair.text }}%22&restrict_sr=on"
 						class="post_flair"

templates/settings.html

@@ -11,14 +11,14 @@
 	<div id="settings">
 	<form action="/settings" method="POST">
 		<div class="prefs">
-			<p>Appearance</p>
+			<legend>Appearance</legend>
 			<div id="theme">
 				<label for="theme">Theme:</label>
 				<select name="theme"> 
 					{% call utils::options(prefs.theme, ["system", "light", "dark", "black", "dracula", "nord", "laserwave", "violet", "gold", "rosebox"], "system") %}
 				</select>
 			</div>
-			<p>Interface</p>
+			<legend>Interface</legend>
 			<div id="front_page">
 				<label for="front_page">Front page:</label>
 				<select name="front_page"> 
@@ -36,7 +36,7 @@
 				<input type="hidden" value="off" name="wide">
 				<input type="checkbox" name="wide" {% if prefs.wide == "on" %}checked{% endif %}>
 			</div>
-			<p>Content</p>
+			<legend>Content</legend>
 			<div id="post_sort">
 				<label for="post_sort" title="Applies only to subreddit feeds">Default subreddit post sort:</label>
 				<select name="post_sort"> 
@@ -79,7 +79,7 @@
 	</form>
 	{% if prefs.subscriptions.len() > 0 %}
 		<div class="prefs" id="settings_subs">
-			<p>Subscribed Feeds</p>
+			<legend>Subscribed Feeds</legend>
 			{% for sub in prefs.subscriptions %}
 			<div>
 				{% let feed -%}
@@ -94,7 +94,7 @@
 	{% endif %}
 	{% if !prefs.filters.is_empty() %}
 		<div class="prefs" id="settings_filters">
-			<p>Filtered Feeds</p>
+			<legend>Filtered Feeds</legend>
 			{% for sub in prefs.filters %}
 			<div>
 				{% let feed -%}

templates/subreddit.html

@@ -41,7 +41,7 @@
 			</form>
 
 			{% if sub.name.contains("+") %}
-				<form action="/r/{{ sub.name }}/subscribe" method="POST">
+				<form action="/r/{{ sub.name }}/subscribe?redirect={{ redirect_url }}" method="POST">
 					<button id="multisub" class="subscribe" title="Subscribe to each sub in this multireddit">Subscribe to Multireddit</button>
 				</form>
 			{% endif %}
@@ -74,12 +74,12 @@
 			</footer>
 		</div>
 		{% endif %}
-		{% if is_filtered || (!sub.name.is_empty() && !sub.name.contains("+")) %}
+		{% if is_filtered || (!sub.name.is_empty() && sub.name != "all" && sub.name != "popular" && !sub.name.contains("+")) %}
 		<aside>
 			{% if is_filtered %}
 				<center>(Content from r/{{ sub.name }} has been filtered)</center>
 			{% endif %}
-			{% if !sub.name.is_empty() && !sub.name.contains("+") %}
+			{% if !sub.name.is_empty() && sub.name != "all" && sub.name != "popular" && !sub.name.contains("+") %}
 			<div class="panel" id="subreddit">
 				{% if sub.wiki %}
 				<div id="top">
@@ -101,22 +101,22 @@
 					<div id="sub_actions">
 						<div id="sub_subscription">
 							{% if prefs.subscriptions.contains(sub.name) %}
-								<form action="/r/{{ sub.name }}/unsubscribe" method="POST">
+								<form action="/r/{{ sub.name }}/unsubscribe?redirect={{ redirect_url }}" method="POST">
 									<button class="unsubscribe">Unsubscribe</button>
 								</form>
 							{% else %}
-								<form action="/r/{{ sub.name }}/subscribe" method="POST">
+								<form action="/r/{{ sub.name }}/subscribe?redirect={{ redirect_url }}" method="POST">
 									<button class="subscribe">Subscribe</button>
 								</form>
 							{% endif %}
 						</div>
 						<div id="sub_filter">
 							{% if prefs.filters.contains(sub.name) %}
-								<form action="/r/{{ sub.name }}/unfilter" method="POST">
+								<form action="/r/{{ sub.name }}/unfilter?redirect={{ redirect_url }}" method="POST">
 									<button class="unfilter">Unfilter</button>
 								</form>
 							{% else %}
-							<form action="/r/{{ sub.name }}/filter" method="POST">
+							<form action="/r/{{ sub.name }}/filter?redirect={{ redirect_url }}" method="POST">
 								<button class="filter">Filter</button>
 							</form>
 							{% endif %}

templates/user.html

@@ -16,9 +16,12 @@
 		{% if !is_filtered %}
 		<div id="column_one">
 			<form id="sort">
-				<select name="sort">
-					{% call utils::options(sort.0, ["hot", "new", "top"], "") %}
-				</select>{% if sort.0 == "top" %}<select id="timeframe" name="t">
+				<div id="listing_options">
+					{% call utils::sort(["/user/", user.name.as_str()].concat(), ["overview", "comments", "submitted"], listing) %}
+				</div>
+				<select id="sort_select" name="sort">
+					{% call utils::options(sort.0, ["hot", "new", "top", "controversial"], "") %}
+				</select>{% if sort.0 == "top" || sort.0 == "controversial" %}<select id="timeframe" name="t">
 					{% call utils::options(sort.1, ["hour", "day", "week", "month", "year", "all"], "all") %}
 				</select>{% endif %}<button id="sort_submit" class="submit">
 					<svg width="15" viewBox="0 0 110 100" fill="none" stroke-width="10" stroke-linecap="round">
@@ -91,22 +94,22 @@
 				{% let name = ["u_", user.name.as_str()].join("") %}
 				<div id="user_subscription">
 					{% if prefs.subscriptions.contains(name) %}
-						<form action="/r/{{ name }}/unsubscribe" method="POST">
+						<form action="/r/{{ name }}/unsubscribe?redirect={{ redirect_url }}" method="POST">
 							<button class="unsubscribe">Unfollow</button>
 						</form>
 					{% else %}
-						<form action="/r/{{ name }}/subscribe" method="POST">
+						<form action="/r/{{ name }}/subscribe?redirect={{ redirect_url }}" method="POST">
 							<button class="subscribe">Follow</button>
 						</form>
 					{% endif %}
 					</div>
 					<div id="user_filter">
 						{% if prefs.filters.contains(name) %}
-							<form action="/r/{{ name }}/unfilter" method="POST">
+							<form action="/r/{{ name }}/unfilter?redirect={{ redirect_url }}" method="POST">
 								<button class="unfilter">Unfilter</button>
 							</form>
 						{% else %}
-							<form action="/r/{{ name }}/filter" method="POST">
+							<form action="/r/{{ name }}/filter?redirect={{ redirect_url }}" method="POST">
 								<button class="filter">Filter</button>
 							</form>
 						{% endif %}

templates/utils.html

@@ -19,7 +19,7 @@
 	<input id="search" type="text" name="q" placeholder="Search" title="Search libreddit" value="{{ search }}">
 	{% if root != "/r/" && !root.is_empty() %}
 	<div id="inside">
-		<input type="checkbox" name="restrict_sr" id="restrict_sr">
+		<input type="checkbox" name="restrict_sr" id="restrict_sr" checked>
 		<label for="restrict_sr" class="search_label" title="Restrict search to this subreddit">in {{ root }}</label>
 	</div>
 	{% endif %}
@@ -72,7 +72,7 @@
 		{% endif -%}
 		<a class="post_subreddit" href="/{{ community }}">{{ community }}</a>
 		<span class="dot">&bull;</span>
-		<a class="post_author" href="/u/{{ post.author.name }}">u/{{ post.author.name }}</a>
+		<a class="post_author {{ post.author.distinguished }}" href="/u/{{ post.author.name }}">u/{{ post.author.name }}</a>
 		<span class="dot">&bull;</span>
 		<span class="created" title="{{ post.created }}">{{ post.rel_time }}</span>
 		{% if !post.awards.is_empty() %}