Disable production error logging

Improve support for text-only browsers

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,24 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: Bug Report | [title]
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: Feature Request | [title]
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

Cargo.toml

@@ -3,21 +3,18 @@ name = "libreddit"
 description = " Alternative private front-end to Reddit"
 license = "AGPL-3.0"
 repository = "https://github.com/spikecodes/libreddit"
-version = "0.2.1"
+version = "0.2.7"
 authors = ["spikecodes <19519553+spikecodes@users.noreply.github.com>"]
 edition = "2018"
 
-[features]
-default = ["proxy"]
-proxy = ["actix-web/rustls", "base64"]
-
 [dependencies]
-base64 = { version = "0.13.0", optional = true }
-actix-web = "3.2.0"
-reqwest = { version = "0.10", default_features = false, features = ["rustls-tls"] }
-askama = "0.8.0"
-serde = "1.0.117"
+base64 = "0.13.0"
+actix-web = { version = "3.3.2", features = ["rustls"] }
+askama = "0.10.5"
+ureq = "2.0.1"
+serde = { version = "1.0.118", default_features = false, features = ["derive"] }
 serde_json = "1.0"
-pulldown-cmark = "0.8.0"
-chrono = "0.4.19"
-async-recursion = "0.3.1"
+async-recursion = "0.3.1"
+url = "2.2.0"
+regex = "1.4.2"
+time = "0.2.23"

README.md

@@ -2,37 +2,67 @@
 
 > An alternative private front-end to Reddit 
 
-Libre + Reddit = Libreddit
+Libre + Reddit = [Libreddit](https://libredd.it)
 
 - 🚀 Fast: written in Rust for blazing fast speeds and safety
-- ☁️ Light: no javascript, no ads, no tracking
+- ☁️ Light: no JavaScript, no ads, no tracking
 - 🕵 Private: all requests are proxied through the server, including media
-- 🔒 Safe: does not rely on Reddit OAuth or require a Reddit API Key 
-- 📱 Responsive: works great on mobile!
+- 🔒 Secure: strong [Content Security Policy](https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP) prevents browser requests to Reddit
 
-Think Invidious but for Reddit. Watch your cat videos without being watched.
+Like [Invidious](https://github.com/iv-org/invidious) but for Reddit. Browse the coldest takes of [r/unpopularopinion](https://libredd.it/r/unpopularopinion) without being [tracked](#reddit).
+
+## Contents
+- [Screenshot](#screenshot)
+- [Instances](#instances)
+- [About](#about)
+  - [Elsewhere](#elsewhere)
+  - [Info](#info)
+  - [Teddit Comparison](#how-does-it-compare-to-teddit)
+- [Comparison](#comparison)
+  - [Speed](#speed)
+  - [Privacy](#privacy)
+- [Installation](#installation)
+  - [Cargo](#a-cargo)
+  - [Docker](#b-docker)
+  - [AUR](#c-aur)
+  - [GitHub Releases](#d-github-releases)
+  - [Repl.it](#e-replit)
+- Developing
+  - [Deployment](#deployment)
+  - [Building](#building)
 
 ## Screenshot
 
-![](https://i.ibb.co/Tgjb3w7/image.png)
+![](https://i.ibb.co/6mXqb4G/libreddit-rust.png)
+
+## Instances
+
+Feel free to [open an issue](https://github.com/spikecodes/libreddit/issues/new) to have your [selfhosted instance](#deployment) listed here!
+
+| Website | Country | Cloudflare |
+|-|-|-|
+| [libredd.it](https://libredd.it) (official) | 🇺🇸 US  |  |
+| [libreddit.spike.codes](https://libreddit.spike.codes) (official) | 🇺🇸 US  |  |
+| [libreddit.dothq.co](https://libreddit.dothq.co) | 🇺🇸 US  | ✅ |
+| [libreddit.insanity.wtf](https://libreddit.insanity.wtf) | 🇺🇸 US  | ✅ |
+| [libreddit.kavin.rocks](https://libreddit.kavin.rocks) | 🇮🇳 IN  | ✅ |
+| [spjmllawtheisznfs7uryhxumin26ssv2draj7oope3ok3wuhy43eoyd.onion](http://spjmllawtheisznfs7uryhxumin26ssv2draj7oope3ok3wuhy43eoyd.onion) | 🇮🇳 IN  |  |
+
+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.
 
 ## About
 
 ### Elsewhere
 Find Libreddit on...
-- 💬 Matrix: [#libreddit:matrix.org](https://matrix.to/#/#libreddit:matrix.org)
+- 💬 Matrix: [#libreddit:kde.org](https://matrix.to/#/#libreddit:matrix.org)
 - 🐋 Docker: [spikecodes/libreddit](https://hub.docker.com/r/spikecodes/libreddit)
 - :octocat: GitHub: [spikecodes/libreddit](https://github.com/spikecodes/libreddit)
 - 🦊 GitLab: [spikecodes/libreddit](https://gitlab.com/spikecodes/libreddit)
 
 ### Info
-Libreddit hopes to provide an easier way to browse Reddit, without the ads, trackers and bloat. Libreddit was inspired by other alternative front-ends to popular services such as [Invidious](https://github.com/iv-org/invidious) for YouTube, [Nitter](https://github.com/zedeus/nitter) for Twitter, and [Bibliogram](https://sr.ht/~cadence/bibliogram/) for Instagram.
+Libreddit hopes to provide an easier way to browse Reddit, without the ads, trackers, and bloat. Libreddit was inspired by other alternative front-ends to popular services such as [Invidious](https://github.com/iv-org/invidious) for YouTube, [Nitter](https://github.com/zedeus/nitter) for Twitter, and [Bibliogram](https://sr.ht/~cadence/bibliogram/) for Instagram.
 
-Libreddit currently implements most of Reddit's functionalities but still lacks a few features that are being worked on below.
-
-### In Progress
-- Searching
-- Multireddits
+Libreddit currently implements most of Reddit's (signed-out) functionalities but still lacks [a few features](https://github.com/spikecodes/libreddit/issues).
 
 ### How does it compare to Teddit?
 
@@ -40,15 +70,66 @@ Teddit is another awesome open source project designed to provide an alternative
 
 If you are looking to compare, the biggest differences I have noticed are:
 - Libreddit is themed around Reddit's redesign whereas Teddit appears to stick much closer to Reddit's old design. This may suit some users better as design is always subjective.
-- Libreddit is written in Rust for speed and memory safety. It uses Actix Web, which was [benchmarked as the fastest web server for single queries](https://www.techempower.com/benchmarks/#hw=ph&test=db).
-- Unlike Teddit (at the time of writing this), Libreddit does not require a Reddit API key to host. 
+- Libreddit is written in [Rust](https://www.rust-lang.org) for speed and memory safety. It uses [Actix Web](https://actix.rs), which was [benchmarked as the fastest web server for single queries](https://www.techempower.com/benchmarks/#hw=ph&test=db).
 
-## Instances
+## Comparison
 
-Feel free to [open an issue](https://github.com/spikecodes/libreddit/issues/new) to have your selfhosted instance listed here!
+This section outlines how Libreddit compares to Reddit.
 
-- [libredd.it](https://libredd.it) 🇺🇸 (Thank you to [YeapGuy](https://github.com/YeapGuy)!)
-- [libreddit.spike.codes](https://libreddit.spike.codes) 🇺🇸
+### Speed
+
+Lasted tested December 21, 2020.
+
+Results from Google Lighthouse ([Libreddit Report](https://lighthouse-dot-webdotdevsite.appspot.com/lh/html?url=https%3A%2F%2Flibredd.it), [Reddit Report](https://lighthouse-dot-webdotdevsite.appspot.com/lh/html?url=https%3A%2F%2Fwww.reddit.com%2F)).
+
+|                     | Libreddit     | Reddit    |
+|---------------------|---------------|-----------|
+| Requests            | 22            | 70        |
+| Resource Size       | 135 KiB       | 2,222 KiB |
+| Time to Interactive | **1.7 s**     | **11.5 s**|
+
+### Privacy
+
+#### Reddit
+
+**Logging:** According to Reddit's [privacy policy](https://www.redditinc.com/policies/privacy-policy), they "may [automatically] log information" including:
+- IP address
+- User-agent string
+- Browser type
+- Operating system
+- Referral URLs
+- Device information (e.g., device IDs)
+- Device settings
+- Pages visited
+- Links clicked
+- The requested URL
+- Search terms
+
+**Location:** The same privacy policy goes on to describe location data may be collected through the use of:
+- GPS (consensual)
+- Bluetooth (consensual)
+- Content associated with a location (consensual)
+- Your IP Address
+
+**Cookies:** Reddit's [cookie notice](https://www.redditinc.com/policies/cookies) documents the array of cookies used by Reddit including/regarding:
+- Authentication
+- Functionality
+- Analytics and Performance
+- Advertising
+- Third-Party Cookies
+- Third-Party Site
+
+#### Libreddit
+
+For transparency, I hope to describe all the ways Libreddit handles user privacy.
+
+**Logging:** In production (when running the binary, hosting with docker, or using the official instances), Libreddit logs nothing. When debugging (running from source without `--release`), Libreddit logs post IDs and URL paths fetched to aid with troubleshooting.
+
+**DNS:** Both official domains (`libredd.it` and `libreddit.spike.codes`) use Cloudflare as the DNS resolver. Though, the sites are not proxied through Cloudflare meaning Cloudflare doesn't have access to user traffic.
+
+**Cookies:** Libreddit uses optional cookies to store any configured settings in [the settings menu](https://libredd.it/settings). This is not a cross-site cookie and the cookie holds no personal data, only a value of the possible layout.
+
+**Hosting:** The official instances (`libredd.it` and `libreddit.spike.codes`) are hosted on [Repl.it](https://repl.it/) which monitors usage to prevent abuse. I can understand if this invalidates certain users' threat models and therefore, selfhosting and browsing through Tor are welcomed.
 
 ## Installation
 
@@ -84,9 +165,19 @@ yay -S libreddit-git
 ### D) GitHub Releases
 
 If you're on Linux and none of these methods work for you, you can grab a Linux binary from [the newest release](https://github.com/spikecodes/libreddit/releases/latest).
-Currently Libreddit does not have Windows or MacOS binaries but those will be available soon.
+Currently, Libreddit does not have Windows or macOS binaries but those will be available soon.
 
-## Deploy an Instance
+### E) Repl.it
+
+**Note:** Repl.it is a free option but they are *not* private and are monitor server usage to prevent abuse. If you really need a free and easy setup, this method may work best for you.
+
+1. Create a Repl.it account (see note above)
+2. Visit [the official Repl](https://repl.it/@spikethecoder/libreddit) and fork it
+3. Hit the run button to download the latest Libreddit version and start it
+
+In the web preview (defaults to top right), you should see your instance hosted where you can assign a [custom domain](https://docs.repl.it/repls/web-hosting#custom-domains).
+
+## Deployment
 
 Once installed, deploy Libreddit (unless you're using Docker) by running:
 
@@ -99,12 +190,7 @@ Specify a custom address for the server by passing the `-a` or `--address` argum
 libreddit --address=0.0.0.0:8111
 ```
 
-To disable the media proxy built into Libreddit, run:
-```
-libreddit --no-default-features
-```
-
-## Building from Source
+## Building
 
 ```
 git clone https://github.com/spikecodes/libreddit

src/main.rs

@@ -1,10 +1,11 @@
 // Import Crates
-use actix_web::{get, middleware::NormalizePath, web, App, HttpResponse, HttpServer};
+use actix_web::{middleware, web, App, HttpResponse, HttpServer}; // dev::Service
 
 // Reference local files
-mod popular;
 mod post;
 mod proxy;
+mod search;
+mod settings;
 mod subreddit;
 mod user;
 mod utils;
@@ -15,54 +16,100 @@ async fn style() -> HttpResponse {
 }
 
 async fn robots() -> HttpResponse {
-	HttpResponse::Ok().body(include_str!("../static/robots.txt"))
+	HttpResponse::Ok()
+		.header("Cache-Control", "public, max-age=1209600, s-maxage=86400")
+		.body("User-agent: *\nAllow: /")
 }
 
-#[get("/favicon.ico")]
 async fn favicon() -> HttpResponse {
-	HttpResponse::Ok().body("")
+	HttpResponse::Ok()
+		.header("Cache-Control", "public, max-age=1209600, s-maxage=86400")
+		.body(include_bytes!("../static/favicon.ico").as_ref())
 }
 
 #[actix_web::main]
 async fn main() -> std::io::Result<()> {
-	let args: Vec<String> = std::env::args().collect();
 	let mut address = "0.0.0.0:8080".to_string();
+	// let mut https = false;
 
-	if args.len() > 1 {
-		for arg in args {
-			if arg.starts_with("--address=") || arg.starts_with("-a=") {
-				let split: Vec<&str> = arg.split("=").collect();
-				address = split[1].to_string();
-			}
+	for arg in std::env::args().collect::<Vec<String>>() {
+		match arg.split('=').collect::<Vec<&str>>()[0] {
+			"--address" | "-a" => address = arg.split('=').collect::<Vec<&str>>()[1].to_string(),
+			// "--redirect-https" | "-r" => https = true,
+			_ => (),
 		}
 	}
 
 	// start http server
-	println!("Running Libreddit v{} on {}!", env!("CARGO_PKG_VERSION"), address.clone());
+	println!("Running Libreddit v{} on {}!", env!("CARGO_PKG_VERSION"), &address);
 
 	HttpServer::new(|| {
 		App::new()
-			// TRAILING SLASH MIDDLEWARE
-			.wrap(NormalizePath::default())
-			// GENERAL SERVICES
+			// Redirect to HTTPS
+			// .wrap_fn(|req, srv| { let fut = srv.call(req); async { let mut res = fut.await?; if https {}	Ok(res) } })
+			// Append trailing slash and remove double slashes
+			.wrap(middleware::NormalizePath::default())
+			// Default service in case no routes match
+			.default_service(web::get().to(|| utils::error("Nothing here".to_string())))
+			// Read static files
 			.route("/style.css/", web::get().to(style))
-			.route("/favicon.ico/", web::get().to(|| HttpResponse::Ok()))
+			.route("/favicon.ico/", web::get().to(favicon))
 			.route("/robots.txt/", web::get().to(robots))
-			// PROXY SERVICE
+			// Proxy media through Libreddit
 			.route("/proxy/{url:.*}/", web::get().to(proxy::handler))
-			// USER SERVICES
-			.route("/u/{username}/", web::get().to(user::page))
-			.route("/user/{username}/", web::get().to(user::page))
-			// SUBREDDIT SERVICES
-			.route("/r/{sub}/", web::get().to(subreddit::page))
-			// POPULAR SERVICES
-			.route("/", web::get().to(popular::page))
-			// POST SERVICES
-			.route("/{id:.{5,6}}/", web::get().to(post::short))
-			.route("/r/{sub}/comments/{id}/{title}/", web::get().to(post::page))
+			// Browse user profile
+			.service(
+				web::scope("/{scope:user|u}").service(
+					web::scope("/{username}").route("/", web::get().to(user::profile)).service(
+						web::scope("/comments/{id}/{title}")
+							.route("/", web::get().to(post::item))
+							.route("/{comment_id}/", web::get().to(post::item)),
+					),
+				),
+			)
+			// Configure settings
+			.service(web::resource("/settings/").route(web::get().to(settings::get)).route(web::post().to(settings::set)))
+			// Subreddit services
+			.service(
+				web::scope("/r/{sub}")
+					// See posts and info about subreddit
+					.route("/", web::get().to(subreddit::page))
+					.route("/{sort:hot|new|top|rising|controversial}/", web::get().to(subreddit::page))
+					// View post on subreddit
+					.service(
+						web::scope("/comments/{id}/{title}")
+							.route("/", web::get().to(post::item))
+							.route("/{comment_id}/", web::get().to(post::item)),
+					)
+					// Search inside subreddit
+					.route("/search/", web::get().to(search::find))
+					// View wiki of subreddit
+					.service(
+						web::scope("/wiki")
+							.route("/", web::get().to(subreddit::wiki))
+							.route("/{page}/", web::get().to(subreddit::wiki)),
+					),
+			)
+			// Universal services
+			.service(
+				web::scope("")
+					// Front page
+					.route("/", web::get().to(subreddit::page))
+					.route("/{sort:best|hot|new|top|rising|controversial}/", web::get().to(subreddit::page))
+					// View Reddit wiki
+					.service(
+						web::scope("/wiki")
+							.route("/", web::get().to(subreddit::wiki))
+							.route("/{page}/", web::get().to(subreddit::wiki)),
+					)
+					// Search all of Reddit
+					.route("/search/", web::get().to(search::find))
+					// Short link for post
+					.route("/{id:.{5,6}}/", web::get().to(post::item)),
+			)
 	})
-	.bind(address.clone())
-	.expect(format!("Cannot bind to the address: {}", address).as_str())
+	.bind(&address)
+	.unwrap_or_else(|e| panic!("Cannot bind to the address {}: {}", address, e))
 	.run()
 	.await
 }

src/popular.rs

@@ -1,55 +0,0 @@
-// CRATES
-use crate::utils::{fetch_posts, ErrorTemplate, Params, Post};
-use actix_web::{http::StatusCode, web, HttpResponse, Result};
-use askama::Template;
-
-// STRUCTS
-#[derive(Template)]
-#[template(path = "popular.html", escape = "none")]
-struct PopularTemplate {
-	posts: Vec<Post>,
-	sort: String,
-	ends: (String, String),
-}
-
-// RENDER
-async fn render(sub_name: String, sort: Option<String>, ends: (Option<String>, Option<String>)) -> Result<HttpResponse> {
-	let sorting = sort.unwrap_or("hot".to_string());
-	let before = ends.1.clone().unwrap_or(String::new()); // If there is an after, there must be a before
-
-	// Build the Reddit JSON API url
-	let url = match ends.0 {
-		Some(val) => format!("https://www.reddit.com/r/{}/{}.json?before={}&count=25", sub_name, sorting, val),
-		None => match ends.1 {
-			Some(val) => format!("https://www.reddit.com/r/{}/{}.json?after={}&count=25", sub_name, sorting, val),
-			None => format!("https://www.reddit.com/r/{}/{}.json", sub_name, sorting),
-		},
-	};
-
-	let items_result = fetch_posts(url, String::new()).await;
-
-	if items_result.is_err() {
-		let s = ErrorTemplate {
-			message: items_result.err().unwrap().to_string(),
-		}
-		.render()
-		.unwrap();
-		Ok(HttpResponse::Ok().status(StatusCode::NOT_FOUND).content_type("text/html").body(s))
-	} else {
-		let items = items_result.unwrap();
-
-		let s = PopularTemplate {
-			posts: items.0,
-			sort: sorting,
-			ends: (before, items.1),
-		}
-		.render()
-		.unwrap();
-		Ok(HttpResponse::Ok().content_type("text/html").body(s))
-	}
-}
-
-// SERVICES
-pub async fn page(params: web::Query<Params>) -> Result<HttpResponse> {
-	render("popular".to_string(), params.sort.clone(), (params.before.clone(), params.after.clone())).await
-}

src/post.rs

@@ -1,12 +1,10 @@
 // CRATES
-use crate::utils::{format_num, format_url, request, val, Comment, ErrorTemplate, Flair, Params, Post};
-use actix_web::{http::StatusCode, web, HttpResponse, Result};
+use crate::utils::*;
+use actix_web::{HttpRequest, HttpResponse};
 
 use async_recursion::async_recursion;
 
 use askama::Template;
-use chrono::{TimeZone, Utc};
-use pulldown_cmark::{html, Options, Parser};
 
 // STRUCTS
 #[derive(Template)]
@@ -15,167 +13,165 @@ struct PostTemplate {
 	comments: Vec<Comment>,
 	post: Post,
 	sort: String,
+	prefs: Preferences,
 }
 
-async fn render(id: String, sort: Option<String>) -> Result<HttpResponse> {
-	// Log the post ID being fetched
-	dbg!(&id);
+pub async fn item(req: HttpRequest) -> HttpResponse {
+	// Build Reddit API path
+	let mut path: String = format!("{}.json?{}&raw_json=1", req.path(), req.query_string());
 
-	// Handling sort paramater
-	let sorting: String = sort.unwrap_or("confidence".to_string());
+	// Set sort to sort query parameter
+	let mut sort: String = param(&path, "sort");
 
-	// Build the Reddit JSON API url
-	let url: String = format!("https://reddit.com/{}.json?sort={}", id, sorting);
+	// Grab default comment sort method from Cookies
+	let default_sort = cookie(&req, "comment_sort");
+
+	// If there's no sort query but there's a default sort, set sort to default_sort
+	if sort.is_empty() && !default_sort.is_empty() {
+		sort = default_sort;
+		path = format!("{}.json?{}&sort={}&raw_json=1", req.path(), req.query_string(), sort);
+	}
+
+	// Log the post ID being fetched in debug mode
+	#[cfg(debug_assertions)]
+	dbg!(req.match_info().get("id").unwrap_or(""));
 
 	// Send a request to the url, receive JSON in response
-	let req = request(url).await;
+	match request(&path).await {
+		// Otherwise, grab the JSON output from the request
+		Ok(res) => {
+			// Parse the JSON into Post and Comment structs
+			let post = parse_post(&res[0]).await;
+			let comments = parse_comments(&res[1]).await;
 
-	// If the Reddit API returns an error, exit and send error page to user
-	if req.is_err() {
-		let s = ErrorTemplate {
-			message: req.err().unwrap().to_string(),
+			// Use the Post and Comment structs to generate a website to show users
+			let s = PostTemplate {
+				comments,
+				post,
+				sort,
+				prefs: prefs(req),
+			}
+			.render()
+			.unwrap();
+			HttpResponse::Ok().content_type("text/html").body(s)
 		}
-		.render()
-		.unwrap();
-		return Ok(HttpResponse::Ok().status(StatusCode::NOT_FOUND).content_type("text/html").body(s));
+		// If the Reddit API returns an error, exit and send error page to user
+		Err(msg) => error(msg).await,
 	}
-
-	// Otherwise, grab the JSON output from the request
-	let res = req.unwrap();
-
-	// Parse the JSON into Post and Comment structs
-	let post = parse_post(res[0].clone()).await;
-	let comments = parse_comments(res[1].clone()).await;
-
-	// Use the Post and Comment structs to generate a website to show users
-	let s = PostTemplate {
-		comments: comments.unwrap(),
-		post: post.unwrap(),
-		sort: sorting,
-	}
-	.render()
-	.unwrap();
-	Ok(HttpResponse::Ok().content_type("text/html").body(s))
-}
-
-// SERVICES
-pub async fn short(web::Path(id): web::Path<String>, params: web::Query<Params>) -> Result<HttpResponse> {
-	render(id, params.sort.clone()).await
-}
-
-pub async fn page(web::Path((_sub, id)): web::Path<(String, String)>, params: web::Query<Params>) -> Result<HttpResponse> {
-	render(id, params.sort.clone()).await
-}
-
-// UTILITIES
-async fn media(data: &serde_json::Value) -> (String, String) {
-	let post_type: &str;
-	let url = if !data["preview"]["reddit_video_preview"]["fallback_url"].is_null() {
-		post_type = "video";
-		format_url(data["preview"]["reddit_video_preview"]["fallback_url"].as_str().unwrap()).await
-	} else if !data["secure_media"]["reddit_video"]["fallback_url"].is_null() {
-		post_type = "video";
-		format_url(data["secure_media"]["reddit_video"]["fallback_url"].as_str().unwrap()).await
-	} else if data["post_hint"].as_str().unwrap_or("") == "image" {
-		post_type = "image";
-		format_url(data["preview"]["images"][0]["source"]["url"].as_str().unwrap()).await
-	} else {
-		post_type = "link";
-		data["url"].as_str().unwrap().to_string()
-	};
-
-	(post_type.to_string(), url)
-}
-
-async fn markdown_to_html(md: &str) -> String {
-	let mut options = Options::empty();
-	options.insert(Options::ENABLE_TABLES);
-	options.insert(Options::ENABLE_FOOTNOTES);
-	options.insert(Options::ENABLE_STRIKETHROUGH);
-	options.insert(Options::ENABLE_TASKLISTS);
-	let parser = Parser::new_ext(md, options);
-
-	// Write to String buffer.
-	let mut html_output = String::new();
-	html::push_html(&mut html_output, parser);
-	html_output
 }
 
 // POSTS
-async fn parse_post(json: serde_json::Value) -> Result<Post, &'static str> {
-	let post_data: &serde_json::Value = &json["data"]["children"][0];
+async fn parse_post(json: &serde_json::Value) -> Post {
+	// Retrieve post (as opposed to comments) from JSON
+	let post: &serde_json::Value = &json["data"]["children"][0];
 
-	let unix_time: i64 = post_data["data"]["created_utc"].as_f64().unwrap().round() as i64;
-	let score = post_data["data"]["score"].as_i64().unwrap();
+	// Grab UTC time as unix timestamp
+	let (rel_time, created) = time(post["data"]["created_utc"].as_f64().unwrap_or_default());
+	// Parse post score and upvote ratio
+	let score = post["data"]["score"].as_i64().unwrap_or_default();
+	let ratio: f64 = post["data"]["upvote_ratio"].as_f64().unwrap_or(1.0) * 100.0;
 
-	let media = media(&post_data["data"]).await;
+	// Determine the type of media along with the media URL
+	let (post_type, media) = media(&post["data"]).await;
 
-	let post = Post {
-		title: val(post_data, "title").await,
-		community: val(post_data, "subreddit").await,
-		body: markdown_to_html(post_data["data"]["selftext"].as_str().unwrap()).await,
-		author: val(post_data, "author").await,
-		author_flair: Flair(
-			val(post_data, "author_flair_text").await,
-			val(post_data, "author_flair_background_color").await,
-			val(post_data, "author_flair_text_color").await,
-		),
-		url: val(post_data, "permalink").await,
+	// Build a post using data parsed from Reddit post API
+	Post {
+		id: val(post, "id"),
+		title: val(post, "title"),
+		community: val(post, "subreddit"),
+		body: rewrite_url(&val(post, "selftext_html")),
+		author: Author {
+			name: val(post, "author"),
+			flair: Flair {
+				flair_parts: parse_rich_flair(
+					val(post, "author_flair_type"),
+					post["data"]["author_flair_richtext"].as_array(),
+					post["data"]["author_flair_text"].as_str(),
+				),
+				background_color: val(post, "author_flair_background_color"),
+				foreground_color: val(post, "author_flair_text_color"),
+			},
+			distinguished: val(post, "distinguished"),
+		},
+		permalink: val(post, "permalink"),
 		score: format_num(score),
-		post_type: media.0,
-		media: media.1,
-		time: Utc.timestamp(unix_time, 0).format("%b %e %Y %H:%M UTC").to_string(),
-		flair: Flair(
-			val(post_data, "link_flair_text").await,
-			val(post_data, "link_flair_background_color").await,
-			if val(post_data, "link_flair_text_color").await == "dark" {
+		upvote_ratio: ratio as i64,
+		post_type,
+		thumbnail: format_url(val(post, "thumbnail").as_str()),
+		flair: Flair {
+			flair_parts: parse_rich_flair(
+				val(post, "link_flair_type"),
+				post["data"]["link_flair_richtext"].as_array(),
+				post["data"]["link_flair_text"].as_str(),
+			),
+			background_color: val(post, "link_flair_background_color"),
+			foreground_color: if val(post, "link_flair_text_color") == "dark" {
 				"black".to_string()
 			} else {
 				"white".to_string()
 			},
-		)
-	};
-
-	Ok(post)
+		},
+		flags: Flags {
+			nsfw: post["data"]["over_18"].as_bool().unwrap_or(false),
+			stickied: post["data"]["stickied"].as_bool().unwrap_or(false),
+		},
+		media,
+		domain: val(post, "domain"),
+		rel_time,
+		created,
+	}
 }
 
 // COMMENTS
 #[async_recursion]
-async fn parse_comments(json: serde_json::Value) -> Result<Vec<Comment>, &'static str> {
+async fn parse_comments(json: &serde_json::Value) -> Vec<Comment> {
 	// Separate the comment JSON into a Vector of comments
-	let comment_data = json["data"]["children"].as_array().unwrap();
+	let comment_data = match json["data"]["children"].as_array() {
+		Some(f) => f.to_owned(),
+		None => Vec::new(),
+	};
 
 	let mut comments: Vec<Comment> = Vec::new();
 
 	// For each comment, retrieve the values to build a Comment object
-	for comment in comment_data.iter() {
-		let unix_time: i64 = comment["data"]["created_utc"].as_f64().unwrap_or(0.0).round() as i64;
-		if unix_time == 0 {
+	for comment in comment_data {
+		let unix_time = comment["data"]["created_utc"].as_f64().unwrap_or_default();
+		if unix_time == 0.0 {
 			continue;
 		}
+		let (rel_time, created) = time(unix_time);
 
 		let score = comment["data"]["score"].as_i64().unwrap_or(0);
-		let body = markdown_to_html(comment["data"]["body"].as_str().unwrap_or("")).await;
+		let body = rewrite_url(&val(&comment, "body_html"));
 
 		let replies: Vec<Comment> = if comment["data"]["replies"].is_object() {
-			parse_comments(comment["data"]["replies"].clone()).await.unwrap_or(Vec::new())
+			parse_comments(&comment["data"]["replies"]).await
 		} else {
 			Vec::new()
 		};
 
 		comments.push(Comment {
-			body: body,
-			author: val(comment, "author").await,
+			id: val(&comment, "id"),
+			body,
+			author: Author {
+				name: val(&comment, "author"),
+				flair: Flair {
+					flair_parts: parse_rich_flair(
+						val(&comment, "author_flair_type"),
+						comment["data"]["author_flair_richtext"].as_array(),
+						comment["data"]["author_flair_text"].as_str(),
+					),
+					background_color: val(&comment, "author_flair_background_color"),
+					foreground_color: val(&comment, "author_flair_text_color"),
+				},
+				distinguished: val(&comment, "distinguished"),
+			},
 			score: format_num(score),
-			time: Utc.timestamp(unix_time, 0).format("%b %e %Y %H:%M UTC").to_string(),
-			replies: replies,
-			flair: Flair(
-				val(comment, "author_flair_text").await,
-				val(comment, "author_flair_background_color").await,
-				val(comment, "author_flair_text_color").await,
-			),
+			rel_time,
+			created,
+			replies,
 		});
 	}
 
-	Ok(comments)
+	comments
 }

src/proxy.rs

@@ -1,29 +1,49 @@
-use actix_web::{client::Client, web, Error, HttpResponse, Result};
+use actix_web::{client::Client, error, web, Error, HttpResponse, Result};
+use url::Url;
 
-#[cfg(feature = "proxy")]
 use base64::decode;
 
-pub async fn handler(web::Path(url): web::Path<String>) -> Result<HttpResponse> {
-	if cfg!(feature = "proxy") {
-		let media: String;
+pub async fn handler(web::Path(b64): web::Path<String>) -> Result<HttpResponse> {
+	let domains = vec![
+		// THUMBNAILS
+		"a.thumbs.redditmedia.com",
+		"b.thumbs.redditmedia.com",
+		// EMOJI
+		"emoji.redditmedia.com",
+		// ICONS
+		"styles.redditmedia.com",
+		"www.redditstatic.com",
+		// PREVIEWS
+		"preview.redd.it",
+		"external-preview.redd.it",
+		// MEDIA
+		"i.redd.it",
+		"v.redd.it",
+	];
 
-		#[cfg(not(feature = "proxy"))]
-		let media = url;
+	match decode(b64) {
+		Ok(bytes) => {
+			let media = String::from_utf8(bytes).unwrap_or_default();
 
-		#[cfg(feature = "proxy")]
-		match decode(url) {
-			Ok(bytes) => media = String::from_utf8(bytes).unwrap(),
-			Err(_e) => return Ok(HttpResponse::Ok().body("")),
-		};
+			match Url::parse(media.as_str()) {
+				Ok(url) => {
+					let domain = url.domain().unwrap_or_default();
 
-		let client = Client::default();
-		client
-			.get(media.replace("&amp;", "&"))
-			.send()
-			.await
-			.map_err(Error::from)
-			.and_then(|res| Ok(HttpResponse::build(res.status()).streaming(res)))
-	} else {
-		Ok(HttpResponse::Ok().body(""))
+					if domains.contains(&domain) {
+						Client::default().get(media.replace("&amp;", "&")).send().await.map_err(Error::from).map(|res| {
+							HttpResponse::build(res.status())
+								.header("Cache-Control", "public, max-age=1209600, s-maxage=86400")
+								.header("Content-Length", res.headers().get("Content-Length").unwrap().to_owned())
+								.header("Content-Type", res.headers().get("Content-Type").unwrap().to_owned())
+								.streaming(res)
+						})
+					} else {
+						Err(error::ErrorForbidden("Resource must be from Reddit"))
+					}
+				}
+				_ => Err(error::ErrorBadRequest("Can't parse base64 into URL")),
+			}
+		}
+		_ => Err(error::ErrorBadRequest("Can't decode base64")),
 	}
 }

src/search.rs

@@ -0,0 +1,98 @@
+// CRATES
+use crate::utils::{error, fetch_posts, param, prefs, request, val, Post, Preferences};
+use actix_web::{HttpRequest, HttpResponse};
+use askama::Template;
+
+// STRUCTS
+struct SearchParams {
+	q: String,
+	sort: String,
+	t: String,
+	before: String,
+	after: String,
+	restrict_sr: String,
+}
+
+// STRUCTS
+struct Subreddit {
+	name: String,
+	url: String,
+	description: String,
+	subscribers: i64,
+}
+
+#[derive(Template)]
+#[template(path = "search.html", escape = "none")]
+struct SearchTemplate {
+	posts: Vec<Post>,
+	subreddits: Vec<Subreddit>,
+	sub: String,
+	params: SearchParams,
+	prefs: Preferences,
+}
+
+// SERVICES
+pub async fn find(req: HttpRequest) -> HttpResponse {
+	let path = format!("{}.json?{}", req.path(), req.query_string());
+	let sub = req.match_info().get("sub").unwrap_or("").to_string();
+
+	let sort = if param(&path, "sort").is_empty() {
+		"relevance".to_string()
+	} else {
+		param(&path, "sort")
+	};
+
+	let subreddits = if param(&path, "restrict_sr").is_empty() {
+		search_subreddits(param(&path, "q")).await
+	} else {
+		Vec::new()
+	};
+
+	match fetch_posts(&path, String::new()).await {
+		Ok((posts, after)) => HttpResponse::Ok().content_type("text/html").body(
+			SearchTemplate {
+				posts,
+				subreddits,
+				sub,
+				params: SearchParams {
+					q: param(&path, "q"),
+					sort,
+					t: param(&path, "t"),
+					before: param(&path, "after"),
+					after,
+					restrict_sr: param(&path, "restrict_sr"),
+				},
+				prefs: prefs(req),
+			}
+			.render()
+			.unwrap(),
+		),
+		Err(msg) => error(msg).await,
+	}
+}
+
+async fn search_subreddits(q: String) -> Vec<Subreddit> {
+	let subreddit_search_path = format!("/subreddits/search.json?q={}&limit=3", q.replace(' ', "+"));
+
+	// Send a request to the url
+	match request(&subreddit_search_path).await {
+		// If success, receive JSON in response
+		Ok(response) => {
+			match response["data"]["children"].as_array() {
+				// For each subreddit from subreddit list
+				Some(list) => list
+					.iter()
+					.map(|subreddit| Subreddit {
+						name: val(subreddit, "display_name_prefixed"),
+						url: val(subreddit, "url"),
+						description: val(subreddit, "public_description"),
+						subscribers: subreddit["data"]["subscribers"].as_u64().unwrap_or_default() as i64,
+					})
+					.collect::<Vec<Subreddit>>(),
+				_ => Vec::new(),
+			}
+		}
+		// If the Reddit API returns an error, exit this function
+		_ => Vec::new(),
+	}
+}

src/settings.rs

@@ -0,0 +1,59 @@
+// CRATES
+use crate::utils::{prefs, Preferences};
+use actix_web::{cookie::Cookie, web::Form, HttpMessage, HttpRequest, HttpResponse};
+use askama::Template;
+use time::{Duration, OffsetDateTime};
+
+// STRUCTS
+#[derive(Template)]
+#[template(path = "settings.html")]
+struct SettingsTemplate {
+	prefs: Preferences,
+}
+
+#[derive(serde::Deserialize)]
+pub struct SettingsForm {
+	theme: Option<String>,
+	front_page: Option<String>,
+	layout: Option<String>,
+	wide: Option<String>,
+	comment_sort: Option<String>,
+	hide_nsfw: Option<String>,
+}
+
+// FUNCTIONS
+
+// Retrieve cookies from request "Cookie" header
+pub async fn get(req: HttpRequest) -> HttpResponse {
+	let s = SettingsTemplate { prefs: prefs(req) }.render().unwrap();
+	HttpResponse::Ok().content_type("text/html").body(s)
+}
+
+// Set cookies using response "Set-Cookie" header
+pub async fn set(req: HttpRequest, form: Form<SettingsForm>) -> HttpResponse {
+	let mut res = HttpResponse::Found();
+
+	let names = vec!["theme", "front_page", "layout", "wide", "comment_sort", "hide_nsfw"];
+	let values = vec![&form.theme, &form.front_page, &form.layout, &form.wide, &form.comment_sort, &form.hide_nsfw];
+
+	for (i, name) in names.iter().enumerate() {
+		match values[i] {
+			Some(value) => res.cookie(
+				Cookie::build(name.to_owned(), value)
+					.path("/")
+					.http_only(true)
+					.expires(OffsetDateTime::now_utc() + Duration::weeks(52))
+					.finish(),
+			),
+			None => match HttpMessage::cookie(&req, name.to_owned()) {
+				Some(cookie) => res.del_cookie(&cookie),
+				None => &mut res,
+			},
+		};
+	}
+
+	res
+		.content_type("text/html")
+		.set_header("Location", "/settings")
+		.body(r#"Redirecting to <a href="/settings">settings</a>..."#)
+}

src/subreddit.rs

@@ -1,8 +1,7 @@
 // CRATES
-use crate::utils::{fetch_posts, format_num, format_url, request, val, ErrorTemplate, Params, Post, Subreddit};
-use actix_web::{http::StatusCode, web, HttpResponse, Result};
+use crate::utils::*;
+use actix_web::{HttpRequest, HttpResponse, Result};
 use askama::Template;
-use std::convert::TryInto;
 
 // STRUCTS
 #[derive(Template)]
@@ -10,88 +9,112 @@ use std::convert::TryInto;
 struct SubredditTemplate {
 	sub: Subreddit,
 	posts: Vec<Post>,
-	sort: String,
+	sort: (String, String),
 	ends: (String, String),
+	prefs: Preferences,
+}
+
+#[derive(Template)]
+#[template(path = "wiki.html", escape = "none")]
+struct WikiTemplate {
+	sub: String,
+	wiki: String,
+	page: String,
+	prefs: Preferences,
 }
 
 // SERVICES
-#[allow(dead_code)]
-pub async fn page(web::Path(sub): web::Path<String>, params: web::Query<Params>) -> Result<HttpResponse> {
-	render(sub, params.sort.clone(), (params.before.clone(), params.after.clone())).await
+pub async fn page(req: HttpRequest) -> HttpResponse {
+	let path = format!("{}.json?{}", req.path(), req.query_string());
+	let default = cookie(&req, "front_page");
+	let sub_name = req
+		.match_info()
+		.get("sub")
+		.unwrap_or(if default.is_empty() { "popular" } else { default.as_str() })
+		.to_string();
+	let sort = req.match_info().get("sort").unwrap_or("hot").to_string();
+
+	match fetch_posts(&path, String::new()).await {
+		Ok((posts, after)) => {
+			// If you can get subreddit posts, also request subreddit metadata
+			let sub = if !sub_name.contains('+') && sub_name != "popular" && sub_name != "all" {
+				subreddit(&sub_name).await.unwrap_or_default()
+			} else if sub_name.contains('+') {
+				Subreddit {
+					name: sub_name,
+					..Subreddit::default()
+				}
+			} else {
+				Subreddit::default()
+			};
+
+			let s = SubredditTemplate {
+				sub,
+				posts,
+				sort: (sort, param(&path, "t")),
+				ends: (param(&path, "after"), after),
+				prefs: prefs(req),
+			}
+			.render()
+			.unwrap();
+			HttpResponse::Ok().content_type("text/html").body(s)
+		}
+		Err(msg) => error(msg).await,
+	}
 }
 
-pub async fn render(sub_name: String, sort: Option<String>, ends: (Option<String>, Option<String>)) -> Result<HttpResponse> {
-	let sorting = sort.unwrap_or("hot".to_string());
-	let before = ends.1.clone().unwrap_or(String::new()); // If there is an after, there must be a before
+pub async fn wiki(req: HttpRequest) -> HttpResponse {
+	let sub = req.match_info().get("sub").unwrap_or("reddit.com").to_string();
+	let page = req.match_info().get("page").unwrap_or("index").to_string();
+	let path: String = format!("/r/{}/wiki/{}.json?raw_json=1", sub, page);
 
-	// Build the Reddit JSON API url
-	let url = match ends.0 {
-		Some(val) => format!("https://www.reddit.com/r/{}/{}.json?before={}&count=25", sub_name, sorting, val),
-		None => match ends.1 {
-			Some(val) => format!("https://www.reddit.com/r/{}/{}.json?after={}&count=25", sub_name, sorting, val),
-			None => format!("https://www.reddit.com/r/{}/{}.json", sub_name, sorting),
-		},
-	};
-
-	let sub_result = subreddit(&sub_name).await;
-	let items_result = fetch_posts(url, String::new()).await;
-
-	if sub_result.is_err() || items_result.is_err() {
-		let s = ErrorTemplate {
-			message: sub_result.err().unwrap().to_string(),
+	match request(&path).await {
+		Ok(res) => {
+			let s = WikiTemplate {
+				sub,
+				wiki: rewrite_url(res["data"]["content_html"].as_str().unwrap_or_default()),
+				page,
+				prefs: prefs(req),
+			}
+			.render()
+			.unwrap();
+			HttpResponse::Ok().content_type("text/html").body(s)
 		}
-		.render()
-		.unwrap();
-		Ok(HttpResponse::Ok().status(StatusCode::NOT_FOUND).content_type("text/html").body(s))
-	} else {
-		let mut sub = sub_result.unwrap();
-		let items = items_result.unwrap();
-
-		sub.icon = if sub.icon != "" {
-			format!(r#"<img class="subreddit_icon" src="{}">"#, sub.icon)
-		} else {
-			String::new()
-		};
-
-		let s = SubredditTemplate {
-			sub: sub,
-			posts: items.0,
-			sort: sorting,
-			ends: (before, items.1),
-		}
-		.render()
-		.unwrap();
-		Ok(HttpResponse::Ok().content_type("text/html").body(s))
+		Err(msg) => error(msg).await,
 	}
 }
 
 // SUBREDDIT
-async fn subreddit(sub: &String) -> Result<Subreddit, &'static str> {
+async fn subreddit(sub: &str) -> Result<Subreddit, String> {
 	// Build the Reddit JSON API url
-	let url: String = format!("https://www.reddit.com/r/{}/about.json", sub);
+	let path: String = format!("/r/{}/about.json?raw_json=1", sub);
 
-	// Send a request to the url, receive JSON in response
-	let req = request(url).await;
+	// Send a request to the url
+	match request(&path).await {
+		// If success, receive JSON in response
+		Ok(res) => {
+			// Metadata regarding the subreddit
+			let members: i64 = res["data"]["subscribers"].as_u64().unwrap_or_default() as i64;
+			let active: i64 = res["data"]["accounts_active"].as_u64().unwrap_or_default() as i64;
 
-	// If the Reddit API returns an error, exit this function
-	if req.is_err() {
-		return Err(req.err().unwrap());
+			// Fetch subreddit icon either from the community_icon or icon_img value
+			let community_icon: &str = res["data"]["community_icon"].as_str().unwrap_or("").split('?').collect::<Vec<&str>>()[0];
+			let icon = if community_icon.is_empty() { val(&res, "icon_img") } else { community_icon.to_string() };
+
+			let sub = Subreddit {
+				name: val(&res, "display_name"),
+				title: val(&res, "title"),
+				description: val(&res, "public_description"),
+				info: rewrite_url(&val(&res, "description_html").replace("\\", "")),
+				icon: format_url(icon.as_str()),
+				members: format_num(members),
+				active: format_num(active),
+				wiki: res["data"]["wiki_enabled"].as_bool().unwrap_or_default(),
+			};
+
+			Ok(sub)
+		}
+		// If the Reddit API returns an error, exit this function
+		Err(msg) => return Err(msg),
 	}
-
-	// Otherwise, grab the JSON output from the request
-	let res = req.unwrap();
-
-	let members = res["data"]["subscribers"].as_u64().unwrap_or(0);
-	let active = res["data"]["accounts_active"].as_u64().unwrap_or(0);
-
-	let sub = Subreddit {
-		name: val(&res, "display_name").await,
-		title: val(&res, "title").await,
-		description: val(&res, "public_description").await,
-		icon: format_url(val(&res, "icon_img").await.as_str()).await,
-		members: format_num(members.try_into().unwrap()),
-		active: format_num(active.try_into().unwrap()),
-	};
-
-	Ok(sub)
 }

src/user.rs

@@ -1,7 +1,8 @@
 // CRATES
-use crate::utils::{fetch_posts, nested_val, request, ErrorTemplate, Params, Post, User};
-use actix_web::{http::StatusCode, web, HttpResponse, Result};
+use crate::utils::{error, fetch_posts, format_url, param, prefs, request, Post, Preferences, User};
+use actix_web::{HttpRequest, HttpResponse, Result};
 use askama::Template;
+use time::OffsetDateTime;
 
 // STRUCTS
 #[derive(Template)]
@@ -9,65 +10,71 @@ use askama::Template;
 struct UserTemplate {
 	user: User,
 	posts: Vec<Post>,
-	sort: String,
+	sort: (String, String),
+	ends: (String, String),
+	prefs: Preferences,
 }
 
-async fn render(username: String, sort: String) -> Result<HttpResponse> {
-	// Build the Reddit JSON API url
-	let url: String = format!("https://www.reddit.com/user/{}/.json?sort={}", username, sort);
+// FUNCTIONS
+pub async fn profile(req: HttpRequest) -> HttpResponse {
+	// Build the Reddit JSON API path
+	let path = format!("{}.json?{}&raw_json=1", req.path(), req.query_string());
 
-	let user = user(&username).await;
-	let posts = fetch_posts(url, "Comment".to_string()).await;
+	// Retrieve other variables from Libreddit request
+	let sort = param(&path, "sort");
+	let username = req.match_info().get("username").unwrap_or("").to_string();
 
-	if user.is_err() || posts.is_err() {
-		let s = ErrorTemplate {
-			message: user.err().unwrap().to_string(),
+	// Request user posts/comments from Reddit
+	let posts = fetch_posts(&path, "Comment".to_string()).await;
+
+	match posts {
+		Ok((posts, after)) => {
+			// If you can get user posts, also request user data
+			let user = user(&username).await.unwrap_or_default();
+
+			let s = UserTemplate {
+				user,
+				posts,
+				sort: (sort, param(&path, "t")),
+				ends: (param(&path, "after"), after),
+				prefs: prefs(req),
+			}
+			.render()
+			.unwrap();
+			HttpResponse::Ok().content_type("text/html").body(s)
 		}
-		.render()
-		.unwrap();
-		Ok(HttpResponse::Ok().status(StatusCode::NOT_FOUND).content_type("text/html").body(s))
-	} else {
-		let s = UserTemplate {
-			user: user.unwrap(),
-			posts: posts.unwrap().0,
-			sort: sort,
-		}
-		.render()
-		.unwrap();
-		Ok(HttpResponse::Ok().content_type("text/html").body(s))
-	}
-}
-
-// SERVICES
-pub async fn page(web::Path(username): web::Path<String>, params: web::Query<Params>) -> Result<HttpResponse> {
-	match &params.sort {
-		Some(sort) => render(username, sort.to_string()).await,
-		None => render(username, "hot".to_string()).await,
+		// If there is an error show error page
+		Err(msg) => error(msg).await,
 	}
 }
 
 // USER
-async fn user(name: &String) -> Result<User, &'static str> {
-	// Build the Reddit JSON API url
-	let url: String = format!("https://www.reddit.com/user/{}/about.json", name);
+async fn user(name: &str) -> Result<User, String> {
+	// Build the Reddit JSON API path
+	let path: String = format!("/user/{}/about.json", name);
 
-	// Send a request to the url, receive JSON in response
-	let req = request(url).await;
+	// Send a request to the url
+	match request(&path).await {
+		// If success, receive JSON in response
+		Ok(res) => {
+			// Grab creation date as unix timestamp
+			let created: i64 = res["data"]["created"].as_f64().unwrap_or(0.0).round() as i64;
 
-	// If the Reddit API returns an error, exit this function
-	if req.is_err() {
-		return Err(req.err().unwrap());
+			// nested_val function used to parse JSON from Reddit APIs
+			let about = |item| res["data"]["subreddit"][item].as_str().unwrap_or_default().to_string();
+
+			// Parse the JSON output into a User struct
+			Ok(User {
+				name: name.to_string(),
+				title: about("title"),
+				icon: format_url(about("icon_img").as_str()),
+				karma: res["data"]["total_karma"].as_i64().unwrap_or(0),
+				created: OffsetDateTime::from_unix_timestamp(created).format("%b %d '%y"),
+				banner: about("banner_img"),
+				description: about("public_description"),
+			})
+		}
+		// If the Reddit API returns an error, exit this function
+		Err(msg) => return Err(msg),
 	}
-
-	// Otherwise, grab the JSON output from the request
-	let res = req.unwrap();
-
-	// Parse the JSON output into a User struct
-	Ok(User {
-		name: name.to_string(),
-		icon: nested_val(&res, "subreddit", "icon_img").await,
-		karma: res["data"]["total_karma"].as_i64().unwrap(),
-		banner: nested_val(&res, "subreddit", "banner_img").await,
-		description: nested_val(&res, "subreddit", "public_description").await,
-	})
 }

src/utils.rs

@@ -1,222 +1,463 @@
 //
 // CRATES
 //
-use chrono::{TimeZone, Utc};
-use serde_json::{from_str, Value};
-// use surf::{client, get, middleware::Redirect};
-
-#[cfg(feature = "proxy")]
+use actix_web::{cookie::Cookie, HttpRequest, HttpResponse, Result};
+use askama::Template;
 use base64::encode;
+use regex::Regex;
+use serde_json::{from_str, Value};
+use std::collections::HashMap;
+use time::{Duration, OffsetDateTime};
+use url::Url;
 
 //
 // STRUCTS
 //
-#[allow(dead_code)]
-// Post flair with text, background color and foreground color
-pub struct Flair(pub String, pub String, pub String);
 
-#[allow(dead_code)]
+// Post flair with content, background color and foreground color
+pub struct Flair {
+	pub flair_parts: Vec<FlairPart>,
+	pub background_color: String,
+	pub foreground_color: String,
+}
+
+// Part of flair, either emoji or text
+pub struct FlairPart {
+	pub flair_part_type: String,
+	pub value: String,
+}
+
+pub struct Author {
+	pub name: String,
+	pub flair: Flair,
+	pub distinguished: String,
+}
+
+// Post flags with nsfw and stickied
+pub struct Flags {
+	pub nsfw: bool,
+	pub stickied: bool,
+}
+
 // Post containing content, metadata and media
 pub struct Post {
+	pub id: String,
 	pub title: String,
 	pub community: String,
 	pub body: String,
-	pub author: String,
-	pub author_flair: Flair,
-	pub url: String,
+	pub author: Author,
+	pub permalink: String,
 	pub score: String,
+	pub upvote_ratio: i64,
 	pub post_type: String,
-	pub media: String,
-	pub time: String,
 	pub flair: Flair,
+	pub flags: Flags,
+	pub thumbnail: String,
+	pub media: String,
+	pub domain: String,
+	pub rel_time: String,
+	pub created: String,
 }
 
-#[allow(dead_code)]
 // Comment with content, post, score and data/time that it was posted
 pub struct Comment {
+	pub id: String,
 	pub body: String,
-	pub author: String,
-	pub flair: Flair,
+	pub author: Author,
 	pub score: String,
-	pub time: String,
+	pub rel_time: String,
+	pub created: String,
 	pub replies: Vec<Comment>,
 }
 
-#[allow(dead_code)]
+#[derive(Default)]
 // User struct containing metadata about user
 pub struct User {
 	pub name: String,
+	pub title: String,
 	pub icon: String,
 	pub karma: i64,
+	pub created: String,
 	pub banner: String,
 	pub description: String,
 }
 
-#[allow(dead_code)]
+#[derive(Default)]
 // Subreddit struct containing metadata about community
 pub struct Subreddit {
 	pub name: String,
 	pub title: String,
 	pub description: String,
+	pub info: String,
 	pub icon: String,
 	pub members: String,
 	pub active: String,
+	pub wiki: bool,
 }
 
 // Parser for query params, used in sorting (eg. /r/rust/?sort=hot)
 #[derive(serde::Deserialize)]
 pub struct Params {
+	pub t: Option<String>,
+	pub q: Option<String>,
 	pub sort: Option<String>,
 	pub after: Option<String>,
 	pub before: Option<String>,
 }
 
 // Error template
-#[derive(askama::Template)]
+#[derive(Template)]
 #[template(path = "error.html", escape = "none")]
 pub struct ErrorTemplate {
-	pub message: String,
+	pub msg: String,
+	pub prefs: Preferences,
+}
+
+#[derive(Default)]
+pub struct Preferences {
+	pub theme: String,
+	pub front_page: String,
+	pub layout: String,
+	pub wide: String,
+	pub hide_nsfw: String,
+	pub comment_sort: String,
 }
 
 //
 // FORMATTING
 //
 
-pub async fn format_url(url: &str) -> String {
-	#[cfg(feature = "proxy")]
-	return "/proxy/".to_string() + encode(url).as_str();
-
-	#[cfg(not(feature = "proxy"))]
-	return url.to_string();
+// Build preferences from cookies
+pub fn prefs(req: HttpRequest) -> Preferences {
+	Preferences {
+		theme: cookie(&req, "theme"),
+		front_page: cookie(&req, "front_page"),
+		layout: cookie(&req, "layout"),
+		wide: cookie(&req, "wide"),
+		hide_nsfw: cookie(&req, "hide_nsfw"),
+		comment_sort: cookie(&req, "comment_sort"),
+	}
 }
 
+// Grab a query param from a url
+pub fn param(path: &str, value: &str) -> String {
+	match Url::parse(format!("https://libredd.it/{}", path).as_str()) {
+		Ok(url) => url.query_pairs().into_owned().collect::<HashMap<_, _>>().get(value).unwrap_or(&String::new()).to_owned(),
+		_ => String::new(),
+	}
+}
+
+// Parse Cookie value from request
+pub fn cookie(req: &HttpRequest, name: &str) -> String {
+	actix_web::HttpMessage::cookie(req, name).unwrap_or_else(|| Cookie::new(name, "")).value().to_string()
+}
+
+// Direct urls to proxy if proxy is enabled
+pub fn format_url(url: &str) -> String {
+	if url.is_empty() || url == "self" || url == "default" || url == "nsfw" || url == "spoiler" {
+		String::new()
+	} else {
+		format!("/proxy/{}", encode(url).as_str())
+	}
+}
+
+// Rewrite Reddit links to Libreddit in body of text
+pub fn rewrite_url(text: &str) -> String {
+	let re = Regex::new(r#"href="(https://|http://|)(www.|)(reddit).(com)/"#).unwrap();
+	re.replace_all(text, r#"href="/"#).to_string()
+}
+
+// Append `m` and `k` for millions and thousands respectively
 pub fn format_num(num: i64) -> String {
-	if num > 1000000 {
-		format!("{}m", num / 1000000)
+	if num > 1_000_000 {
+		format!("{}m", num / 1_000_000)
 	} else if num > 1000 {
-		format!("{}k", num / 1000)
+		format!("{}k", num / 1_000)
 	} else {
 		num.to_string()
 	}
 }
 
+pub async fn media(data: &Value) -> (String, String) {
+	let post_type: &str;
+	// If post is a video, return the video
+	let url = if data["preview"]["reddit_video_preview"]["fallback_url"].is_string() {
+		post_type = "video";
+		format_url(data["preview"]["reddit_video_preview"]["fallback_url"].as_str().unwrap_or_default())
+	} else if data["secure_media"]["reddit_video"]["fallback_url"].is_string() {
+		post_type = "video";
+		format_url(data["secure_media"]["reddit_video"]["fallback_url"].as_str().unwrap_or_default())
+	// Handle images, whether GIFs or pics
+	} else if data["post_hint"].as_str().unwrap_or("") == "image" {
+		let preview = data["preview"]["images"][0].clone();
+		match preview["variants"]["mp4"].as_object() {
+			// Return the mp4 if the media is a gif
+			Some(gif) => {
+				post_type = "gif";
+				format_url(gif["source"]["url"].as_str().unwrap_or_default())
+			}
+			// Return the picture if the media is an image
+			None => {
+				post_type = "image";
+				format_url(preview["source"]["url"].as_str().unwrap_or_default())
+			}
+		}
+	} else if data["is_self"].as_bool().unwrap_or_default() {
+		post_type = "self";
+		data["permalink"].as_str().unwrap_or_default().to_string()
+	} else {
+		post_type = "link";
+		data["url"].as_str().unwrap_or_default().to_string()
+	};
+
+	(post_type.to_string(), url)
+}
+
+pub fn parse_rich_flair(flair_type: String, rich_flair: Option<&Vec<Value>>, text_flair: Option<&str>) -> Vec<FlairPart> {
+	// Parse type of flair
+	match flair_type.as_str() {
+		// If flair contains emojis and text
+		"richtext" => match rich_flair {
+			Some(rich) => rich
+				.iter()
+				// For each part of the flair, extract text and emojis
+				.map(|part| {
+					let value = |name: &str| part[name].as_str().unwrap_or_default();
+					FlairPart {
+						flair_part_type: value("e").to_string(),
+						value: match value("e") {
+							"text" => value("t").to_string(),
+							"emoji" => format_url(value("u")),
+							_ => String::new(),
+						},
+					}
+				})
+				.collect::<Vec<FlairPart>>(),
+			None => Vec::new(),
+		},
+		// If flair contains only text
+		"text" => match text_flair {
+			Some(text) => vec![FlairPart {
+				flair_part_type: "text".to_string(),
+				value: text.to_string(),
+			}],
+			None => Vec::new(),
+		},
+		_ => Vec::new(),
+	}
+}
+
+pub fn time(created: f64) -> (String, String) {
+	let time = OffsetDateTime::from_unix_timestamp(created.round() as i64);
+	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")
+	// Otherwise, show relative date/time
+	} else if time_delta.whole_days() > 0 {
+		format!("{}d ago", time_delta.whole_days())
+	} else if time_delta.whole_hours() > 0 {
+		format!("{}h ago", time_delta.whole_hours())
+	} else {
+		format!("{}m ago", time_delta.whole_minutes())
+	};
+
+	(rel_time, time.format("%b %d %Y, %H:%M UTC"))
+}
+
 //
 // JSON PARSING
 //
 
-#[allow(dead_code)]
 // val() function used to parse JSON from Reddit APIs
-pub async fn val(j: &serde_json::Value, k: &str) -> String {
-	String::from(j["data"][k].as_str().unwrap_or(""))
+pub fn val(j: &Value, k: &str) -> String {
+	String::from(j["data"][k].as_str().unwrap_or_default())
 }
 
-#[allow(dead_code)]
-// nested_val() function used to parse JSON from Reddit APIs
-pub async fn nested_val(j: &serde_json::Value, n: &str, k: &str) -> String {
-	String::from(j["data"][n][k].as_str().unwrap())
-}
+// Fetch posts of a user or subreddit and return a vector of posts and the "after" value
+pub async fn fetch_posts(path: &str, fallback_title: String) -> Result<(Vec<Post>, String), String> {
+	let res;
+	let post_list;
 
-#[allow(dead_code)]
-pub async fn fetch_posts(url: String, fallback_title: String) -> Result<(Vec<Post>, String), &'static str> {
-	// Send a request to the url, receive JSON in response
-	let req = request(url).await;
-
-	// If the Reddit API returns an error, exit this function
-	if req.is_err() {
-		return Err(req.err().unwrap());
+	// Send a request to the url
+	match request(&path).await {
+		// If success, receive JSON in response
+		Ok(response) => {
+			res = response;
+		}
+		// If the Reddit API returns an error, exit this function
+		Err(msg) => return Err(msg),
 	}
 
-	// Otherwise, grab the JSON output from the request
-	let res = req.unwrap();
-
 	// Fetch the list of posts from the JSON response
-	let post_list = res["data"]["children"].as_array().unwrap();
+	match res["data"]["children"].as_array() {
+		Some(list) => post_list = list,
+		None => return Err("No posts found".to_string()),
+	}
 
 	let mut posts: Vec<Post> = Vec::new();
 
-	for post in post_list.iter() {
-		let img = if val(post, "thumbnail").await.starts_with("https:/") {
-			format_url(val(post, "thumbnail").await.as_str()).await
-		} else {
-			String::new()
-		};
-		let unix_time: i64 = post["data"]["created_utc"].as_f64().unwrap().round() as i64;
-		let score = post["data"]["score"].as_i64().unwrap();
-		let title = val(post, "title").await;
+	// For each post from posts list
+	for post in post_list {
+		let (rel_time, created) = time(post["data"]["created_utc"].as_f64().unwrap_or_default());
+		let score = post["data"]["score"].as_i64().unwrap_or_default();
+		let ratio: f64 = post["data"]["upvote_ratio"].as_f64().unwrap_or(1.0) * 100.0;
+		let title = val(post, "title");
+
+		// Determine the type of media along with the media URL
+		let (post_type, media) = media(&post["data"]).await;
 
 		posts.push(Post {
+			id: val(post, "id"),
 			title: if title.is_empty() { fallback_title.to_owned() } else { title },
-			community: val(post, "subreddit").await,
-			body: val(post, "body").await,
-			author: val(post, "author").await,
-			author_flair: Flair(
-				val(post, "author_flair_text").await,
-				val(post, "author_flair_background_color").await,
-				val(post, "author_flair_text_color").await,
-			),
+			community: val(post, "subreddit"),
+			body: rewrite_url(&val(post, "body_html")),
+			author: Author {
+				name: val(post, "author"),
+				flair: Flair {
+					flair_parts: parse_rich_flair(
+						val(post, "author_flair_type"),
+						post["data"]["author_flair_richtext"].as_array(),
+						post["data"]["author_flair_text"].as_str(),
+					),
+					background_color: val(post, "author_flair_background_color"),
+					foreground_color: val(post, "author_flair_text_color"),
+				},
+				distinguished: val(post, "distinguished"),
+			},
 			score: format_num(score),
-			post_type: "link".to_string(),
-			media: img,
-			url: val(post, "permalink").await,
-			time: Utc.timestamp(unix_time, 0).format("%b %e '%y").to_string(),
-			flair: Flair(
-				val(post, "link_flair_text").await,
-				val(post, "link_flair_background_color").await,
-				if val(post, "link_flair_text_color").await == "dark" {
+			upvote_ratio: ratio as i64,
+			post_type,
+			thumbnail: format_url(val(post, "thumbnail").as_str()),
+			media,
+			domain: val(post, "domain"),
+			flair: Flair {
+				flair_parts: parse_rich_flair(
+					val(post, "link_flair_type"),
+					post["data"]["link_flair_richtext"].as_array(),
+					post["data"]["link_flair_text"].as_str(),
+				),
+				background_color: val(post, "link_flair_background_color"),
+				foreground_color: if val(post, "link_flair_text_color") == "dark" {
 					"black".to_string()
 				} else {
 					"white".to_string()
 				},
-			),
+			},
+			flags: Flags {
+				nsfw: post["data"]["over_18"].as_bool().unwrap_or_default(),
+				stickied: post["data"]["stickied"].as_bool().unwrap_or_default(),
+			},
+			permalink: val(post, "permalink"),
+			rel_time,
+			created,
 		});
 	}
 
-	Ok((posts, res["data"]["after"].as_str().unwrap_or("").to_string()))
+	Ok((posts, res["data"]["after"].as_str().unwrap_or_default().to_string()))
 }
 
 //
 // NETWORKING
 //
 
+pub async fn error(msg: String) -> HttpResponse {
+	let body = ErrorTemplate {
+		msg,
+		prefs: Preferences::default(),
+	}
+	.render()
+	.unwrap_or_default();
+	HttpResponse::NotFound().content_type("text/html").body(body)
+}
+
 // Make a request to a Reddit API and parse the JSON response
-#[allow(dead_code)]
-pub async fn request(url: String) -> Result<serde_json::Value, &'static str> {
-	// --- actix-web::client ---
-	// let client = actix_web::client::Client::default();
-	// let res = client
-	// 	.get(url)
-	// 	.send()
-	// 	.await?
-	// 	.body()
-	// 	.limit(1000000)
-	// 	.await?;
+pub async fn request(path: &str) -> Result<Value, String> {
+	let url = format!("https://www.reddit.com{}", path);
+	let user_agent = format!("web:libreddit:{}", env!("CARGO_PKG_VERSION"));
 
-	// let body = std::str::from_utf8(res.as_ref())?; // .as_ref converts Bytes to [u8]
+	// Send request using awc
+	// async fn send(url: &str) -> Result<String, (bool, String)> {
+	// 	let client = actix_web::client::Client::default();
+	// 	let response = client.get(url).header("User-Agent", format!("web:libreddit:{}", env!("CARGO_PKG_VERSION"))).send().await;
 
-	// --- surf ---
-	// let req = get(&url).header("User-Agent", "libreddit");
-	// let client = client().with(Redirect::new(5));
-	// let mut res = client.send(req).await.unwrap();
-	// let success = res.status().is_success();
-	// let body = res.body_string().await.unwrap();
+	// 	match response {
+	// 		Ok(mut payload) => {
+	// 			// Get first number of response HTTP status code
+	// 			match payload.status().to_string().chars().next() {
+	// 				// If success
+	// 				Some('2') => Ok(String::from_utf8(payload.body().limit(20_000_000).await.unwrap_or_default().to_vec()).unwrap_or_default()),
+	// 				// If redirection
+	// 				Some('3') => match payload.headers().get("location") {
+	// 					Some(location) => Err((true, location.to_str().unwrap_or_default().to_string())),
+	// 					None => Err((false, "Page not found".to_string())),
+	// 				},
+	// 				// Otherwise
+	// 				_ => Err((false, "Page not found".to_string())),
+	// 			}
+	// 		}
+	// 		Err(e) => { dbg!(e); Err((false, "Couldn't send request to Reddit, this instance may be being rate-limited. Try another.".to_string())) },
+	// 	}
+	// }
 
-	// --- reqwest ---
-	let res = reqwest::get(&url).await.unwrap();
-	// Read the status from the response
-	let success = res.status().is_success();
-	// Read the body of the response
-	let body = res.text().await.unwrap();
+	// // Print error if debugging then return error based on error message
+	// fn err(url: String, msg: String) -> Result<Value, String> {
+	// 	// #[cfg(debug_assertions)]
+	// 	dbg!(format!("{} - {}", url, msg));
+	// 	Err(msg)
+	// };
 
-	// Parse the response from Reddit as JSON
-	let json: Value = from_str(body.as_str()).unwrap_or(Value::Null);
+	// // Parse JSON from body. If parsing fails, return error
+	// fn json(url: String, body: String) -> Result<Value, String> {
+	// 	match from_str(body.as_str()) {
+	// 		Ok(json) => Ok(json),
+	// 		Err(_) => err(url, "Failed to parse page JSON data".to_string()),
+	// 	}
+	// }
 
-	if !success {
-		println!("! {} - {}", url, "Page not found");
-		Err("Page not found")
-	} else if json == Value::Null {
-		println!("! {} - {}", url, "Failed to parse page JSON data");
-		Err("Failed to parse page JSON data")
-	} else {
-		Ok(json)
+	// // Make request to Reddit using send function
+	// match send(&url).await {
+	// 	// If success, parse and return body
+	// 	Ok(body) => json(url, body),
+	// 	// Follow any redirects
+	// 	Err((true, location)) => match send(location.as_str()).await {
+	// 		// If success, parse and return body
+	// 		Ok(body) => json(url, body),
+	// 		// Follow any redirects again
+	// 		Err((true, location)) => err(url, location),
+	// 		// Return errors if request fails
+	// 		Err((_, msg)) => err(url, msg),
+	// 	},
+	// 	// Return errors if request fails
+	// 	Err((_, msg)) => err(url, msg),
+	// }
+
+	// Send request using ureq
+	match ureq::get(&url).set("User-Agent", user_agent.as_str()).call() {
+		// If response is success
+		Ok(response) => {
+			// Parse the response from Reddit as JSON
+			match from_str(&response.into_string().unwrap()) {
+				Ok(json) => Ok(json),
+				Err(_) => {
+					#[cfg(debug_assertions)]
+					dbg!(format!("{} - Failed to parse page JSON data", url));
+					Err("Failed to parse page JSON data".to_string())
+				}
+			}
+		}
+		// If response is error
+		Err(ureq::Error::Status(_, _)) => {
+			#[cfg(debug_assertions)]
+			dbg!(format!("{} - Page not found", url));
+			Err("Page not found".to_string())
+		}
+		// If failed to send request
+		Err(e) => {
+			#[cfg(debug_assertions)]
+			dbg!(format!("{} - {}", url, e));
+			Err("Couldn't send request to Reddit, this instance may be being rate-limited. Try another.".to_string())
+		}
 	}
 }

static/robots.txt

@@ -1,2 +1,2 @@
-User-Agent: *
-Disallow: / 
+User-agent: *
+Allow: /

templates/base.html

@@ -2,30 +2,34 @@
 <html lang="en">
 	<head>
 		{% block head %}
-		<title>{% block title %}{% endblock %}</title>
-		<meta http-equiv="Content-Security-Policy" content="default-src 'self'; style-src 'self' 'unsafe-inline';">
+		<title>{% block title %}Libreddit{% endblock %}</title>
+		<meta http-equiv="Referrer-Policy" content="no-referrer">
+		<meta http-equiv="Content-Security-Policy" content="default-src 'self'; style-src 'self' 'unsafe-inline'; base-uri 'none'; form-action 'self';">
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 		<meta name="description" content="View on Libreddit, an alternative private front-end to Reddit.">
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
-		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+		<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico"> 
 		<link rel="stylesheet" href="/style.css">
-		{% block sortstyle %}
-		<style>
-			#sort > #sort_{{ sort }} {
-				background: aqua;
-				color: black;
-			}
-		</style>
 		{% endblock %}
-		{% endblock %}
-    </head>
-	<body>
-		{% block header %}
-		<header>
-			<a href="/"><span id="lib">lib</span>reddit. <span id="version">v{{ env!("CARGO_PKG_VERSION") }}</span></a>
+		</head>
+	<body class="
+		{% if prefs.layout != "" %}{{ prefs.layout }}{% endif %}
+		{% if prefs.wide == "on" %} wide{% endif %}
+		{% if prefs.theme == "light" %} light{% endif %}">
+		<!-- NAVIGATION BAR -->
+		<nav>
+			<p id="logo">
+				<a id="libreddit" href="/">
+					<span id="lib">lib</span><span id="reddit">reddit.</span>
+				</a>
+				<span id="version">v{{ env!("CARGO_PKG_VERSION") }}</span>
+				<a id="settings_link" href="/settings">settings</a>
+			</p>
+			{% block search %}{% endblock %}
 			<a id="github" href="https://github.com/spikecodes/libreddit">GITHUB</a>
-		</header>
-		{% endblock %}
+		</nav>
 		
+		<!-- MAIN CONTENT -->
 		{% block body %}
 		<main>
 			{% block content %}

templates/error.html

@@ -1,6 +1,6 @@
 {% extends "base.html" %}
-{% block title %}Error: {{ message }}{% endblock %}
+{% block title %}Error: {{ msg }}{% endblock %}
 {% block sortstyle %}{% endblock %}
 {% block content %}
-	<h1 style="text-align: center; font-size: 50px;">{{ message }}</h1>
+	<h1 style="text-align: center; font-size: 50px;">{{ msg }}</h1>
 {% endblock %}

templates/popular.html

@@ -1,44 +0,0 @@
-{% extends "base.html" %}
-{% block title %}Libreddit{% endblock %}
-{% block content %}
-	<div id="sort">
-		<div id="sort_hot"><a href="?sort=hot">Hot</a></div>
-		<div id="sort_top"><a href="?sort=top">Top</a></div>
-		<div id="sort_new"><a href="?sort=new">New</a></div>
-		<div id="sort_rising"><a href="?sort=rising">Rising</a></div>
-	</div>
-	{% for post in posts %}
-	<div class="post">
-		<div class="post_left">
-			<h3 class="post_score">{{ post.score }}</h3>
-		</div>
-		<div class="post_right">
-			<h4>
-				<b><a class="post_subreddit" href="/r/{{ post.community }}">r/{{ post.community }}</a></b>
-				&bull; <a class="post_author" href="/u/{{ post.author }}">u/{{ post.author }}</a>
-				{% if post.author_flair.0 != "" %}
-					<small class="author_flair">{{ post.author_flair.0 }}</small>
-				{% endif %}
-				<span class="datetime" style="float: right;">{{ post.time }}</span>
-			</h4>
-			<h3 class="post_title">
-				{% if post.flair.0 != "" %}
-				<small class="post_flair" style="color:{{ post.flair.2 }}; background:{{ post.flair.1 }}">{{ post.flair.0 }}</small>
-				{% endif %}
-				<a href="{{ post.url }}">{{ post.title }}</a>
-			</h3>
-		</div>
-		<img class="post_thumbnail" src="{{ post.media }}">
-	</div><br>
-	{% endfor %}
-
-	<footer>
-		{% if ends.0 != "" %}
-		<a href="?before={{ ends.0 }}">PREV</a>
-		{% endif %}
-
-		{% if ends.1 != "" %}
-		<a href="?after={{ ends.1 }}">NEXT</a>
-		{% endif %}
-	</footer>
-{% endblock %}

templates/post.html

@@ -1,82 +1,123 @@
 {% extends "base.html" %}
+{% import "utils.html" as utils %}
+
 {% block title %}{{ post.title }} - r/{{ post.community }}{% endblock %}
-{% block head %}
-	{% call super() %}
-	<meta name="author" content="u/{{ post.author }}">
+
+{% block search %}
+	{% call utils::search(["/r/", post.community.as_str()].concat(), "") %}
 {% endblock %}
 
-{% macro comment(item) -%}
+{% block root %}/r/{{ post.community }}{% endblock %}{% block location %}r/{{ post.community }}{% endblock %}
+{% block head %}
+	{% call super() %}
+	<meta name="author" content="u/{{ post.author.name }}">
+{% endblock %}
 
-<div class="comment">
+<!-- OPEN COMMENT MACRO -->
+{% macro comment(item) -%}
+<div id="{{ item.id }}" class="comment">
 	<div class="comment_left">
-		<h3 class="comment_score">{{ item.score }}</h3>
+		<p class="comment_score">{{ item.score }}</p>
 		<div class="line"></div>
 	</div>
 	<details class="comment_right" open>
 		<summary class="comment_data">
-			<a class="comment_author" href="/u/{{ item.author }}">u/{{ item.author }}</a>
-			{% if item.flair.0 != "" %}
-				<small class="author_flair">{{ item.flair.0 }}</small>
+			<a class="comment_author {{ item.author.distinguished }} {% if item.author.name == post.author.name %}op{% endif %}" href="/u/{{ item.author.name }}">u/{{ item.author.name }}</a>
+			{% if item.author.flair.flair_parts.len() > 0 %}
+				<small class="author_flair">{% call utils::render_flair(item.author.flair.flair_parts) %}</small>
 			{% endif %}
-			&bull; <span class="datetime">{{ item.time }}</span>
+			<span class="created" title="{{ post.created }}">{{ item.rel_time }}</span>
 		</summary>
-		<h4 class="comment_body">{{ item.body }}</h4>
-
+		<div class="comment_body">{{ item.body }}</div>
 {%- endmacro %}
 
+<!-- CLOSE COMMENT MACRO -->
+{% macro close() %}
+</details></div>
+{% endmacro %}
+
 {% block content %}
-	<div class="post highlighted">
-		<div class="post_left">
-			<h3 class="post_score">{{ post.score }}</h3>
-		</div>
-		<div class="post_right">
-			<h4>
-				<b><a class="post_subreddit" href="/r/{{ post.community }}">r/{{ post.community }}</a></b>
-				&bull;
-				<a class="post_author" href="/u/{{ post.author }}">u/{{ post.author }}</a>
-				{% if post.author_flair.0 != "" %}
-					<small class="author_flair">{{ post.author_flair.0 }}</small>
-				{% endif %}
-				<span class="datetime">{{ post.time }}</span>
-			</h4>
-			<a href="{{ post.url }}" class="post_title">
-				{{ post.title }}
-				{% if post.flair.0 != "" %}
-					<small class="post_flair" style="color:{{ post.flair.2 }}; background:{{ post.flair.1 }}">{{ post.flair.0 }}</small>
-				{% endif %}
-			</a>
-			{% if post.post_type == "image" %}
-			<img class="post_media" src="{{ post.media }}"/>
-			{% else if post.post_type == "video" %}
-			<video class="post_media" src="{{ post.media }}" controls autoplay loop>
-			{% else if post.post_type == "link" %}
-			<a id="post_url" href="{{ post.media }}">{{ post.media }}</a>
-			{% endif %}
-			<h4 class="post_body">{{ post.body }}</h4>
-		</div>
-	</div>
-	<div id="sort">
-		<div id="sort_confidence"><a href="?sort=confidence">Best</a></div>
-		<div id="sort_top"><a href="?sort=top">Top</a></div>
-		<div id="sort_new"><a href="?sort=new">New</a></div>
-		<div id="sort_controversial"><a href="?sort=controversial">Controversial</a></div>
-		<div id="sort_old"><a href="?sort=old">Old</a></div>
-	</div>
+	<div id="column_one">
 
-	{% for c in comments -%}
+		<!-- POST CONTENT -->
+		<div class="post highlighted">
+			<div class="post_left">
+				<p class="post_score">{{ post.score }}</p>
+				{% if post.flags.nsfw %}<div class="nsfw">NSFW</div>{% endif %}
+			</div>
+			<div class="post_right">
+				<div class="post_text">
+					<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="/u/{{ 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 %}
+						<span class="dot">&bull;</span>
+						<span class="created" title="{{ post.created }}">{{ post.rel_time }}</span>
+					</p>
+					<a href="{{ post.permalink }}" class="post_title">
+						{{ post.title }}
+						{% if post.flair.flair_parts.len() > 0 %}
+							<small class="post_flair" style="color:{{ post.flair.foreground_color }}; background:{{ post.flair.background_color }}">{% call utils::render_flair(post.flair.flair_parts) %}</small>
+						{% endif %}
+					</a>
+
+					<!-- POST MEDIA -->
+					{% if post.post_type == "image" %}
+					<img class="post_media" src="{{ post.media }}"/>
+					{% else if post.post_type == "video" || post.post_type == "gif" %}
+					<video class="post_media" src="{{ post.media }}" controls autoplay loop></video>
+					{% else if post.post_type == "link" %}
+					<a id="post_url" href="{{ post.media }}">{{ post.media }}</a>
+					{% endif %}
+
+					<!-- POST BODY -->
+					<div class="post_body">{{ post.body }}</div>
+					<div id="post_footer">
+						<ul id="post_links">
+							<li><a href="/{{ post.id }}">permalink</a></li>
+							<li><a href="https://reddit.com/{{ post.id }}">reddit</a></li>
+						</ul>
+						<p>{{ post.upvote_ratio }}% Upvoted</p>
+					</div>
+
+				</div>
+			</div>
+		</div>
+
+		<!-- SORT FORM -->
+		<form id="sort">
+			<select name="sort"> 
+				{% call utils::options(sort, ["confidence", "top", "new", "controversial", "old"], "confidence") %}
+			</select><input id="sort_submit" type="submit" value="&rarr;">
+		</form>
+
+		<!-- COMMENTS -->
+		{% for c in comments -%}
 		<div class="thread">
+			<!-- EACH COMMENT -->
 			{% call comment(c) %}
-			<div class="replies">
-				{% for reply in c.replies %}
-					{% call comment(reply) %}
-					<div class="replies">
-						{% for response in reply.replies %}
-							{% call comment(response) %}</details></div>
-						{% endfor %}
-					</div></details></div>
+			<blockquote class="replies">{% for reply1 in c.replies %}{% call comment(reply1) %}
+				<!-- FIRST-LEVEL REPLIES -->
+				<blockquote class="replies">{% for reply2 in reply1.replies %}{% call comment(reply2) %}
+					<!-- SECOND-LEVEL REPLIES -->
+					<blockquote class="replies">{% for reply3 in reply2.replies %}{% call comment(reply3) %}
+						<!-- THIRD-LEVEL REPLIES -->
+						{% if reply3.replies.len() > 0 %}
+							<!-- LINK TO CONTINUE REPLIES -->
+							<a class="deeper_replies" href="{{ post.permalink }}{{ reply3.id }}">&rarr; More replies</a>
+						{% endif %}
+						{% call close() %}
+					{% endfor %}
+					</blockquote>{% call close() %}
 				{% endfor %}
-			</div></details></div>
+				</blockquote>{% call close() %}
+			{% endfor %}
+			</blockquote>{% call close() %}
 		</div>
-	{%- endfor %}
+		{%- endfor %}
 
-{% endblock %}
+	</div>
+{% endblock %}

templates/search.html

@@ -0,0 +1,114 @@
+{% extends "base.html" %}
+{% import "utils.html" as utils %}
+
+{% block title %}Libreddit: search results - {{ params.q }}{% endblock %}
+
+{% block content %}
+	<div id="column_one">
+		<form id="search_sort">
+			<input id="search" type="text" name="q" placeholder="Search" value="{{ params.q }}">
+			{% if sub != "" %}
+			<div id="inside">
+				<input type="checkbox" name="restrict_sr" id="restrict_sr" {% if params.restrict_sr != "" %}checked{% endif %}>
+				<label for="restrict_sr" class="search_label">in r/{{ sub }}</label>
+			</div>
+			{% endif %}
+			<select id="sort_options" name="sort">
+				{% call utils::options(params.sort, ["relevance", "hot", "top", "new", "comments"], "") %}
+			</select>{% if params.sort != "new" %}<select id="timeframe" name="t"> 
+				{% call utils::options(params.t, ["hour", "day", "week", "month", "year", "all"], "all") %}
+			</select>{% endif %}<input id="sort_submit" type="submit" value="&rarr;">
+		</form>
+		
+		{% if subreddits.len() > 0 %}
+		<div id="search_subreddits">
+			{% for subreddit in subreddits %}
+			<a href="{{ subreddit.url }}" class="search_subreddit">
+				<p class="search_subreddit_header"> 
+					<span class="search_subreddit_name">{{ subreddit.name }}</span>
+					<span class="dot">&bull;</span>
+					<span class="search_subreddit_members">{{ subreddit.subscribers }} Members</span>
+				</p>
+				<p class="search_subreddit_description">{{ subreddit.description }}</p>
+			</a>
+			{% endfor %}
+		</div>
+		{%  endif %}
+		{% for post in posts %}
+
+		{% if post.flags.nsfw && prefs.hide_nsfw == "on" %}
+		{% else if post.title != "Comment" %}
+		<div class="post {% if prefs.layout == "card" && post.post_type == "image" %}card_post{% endif %}">
+			<div class="post_left">
+				<p class="post_score">{{ post.score }}</p>
+				{% if post.flags.nsfw %}<div class="nsfw">NSFW</div>{% endif %}
+			</div>
+			<div class="post_right">
+				<div class="post_text">
+					<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="/u/{{ 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 %}
+						<span class="dot">&bull;</span>
+						<span class="created" title="{{ post.created }}">{{ post.rel_time }}</span>
+					</p>
+					<p class="post_title">
+						{% if post.flair.flair_parts.len() > 0 %}
+							<small class="post_flair" style="color:{{ post.flair.foreground_color }}; background:{{ post.flair.background_color }}">{% call utils::render_flair(post.flair.flair_parts) %}</small>
+						{% endif %}
+						<a href="{{ post.permalink }}">{{ post.title }}</a>
+					</p>
+				</div>
+				
+				<!-- POST MEDIA/THUMBNAIL -->
+				{% if prefs.layout == "card" && post.post_type == "image" %}
+					<img class="post_media" src="{{ post.media }}"/>
+				{% else if post.post_type != "self" %}
+					<a class="post_thumbnail {% if post.thumbnail == "" %}no_thumbnail{% endif %}" href="{% if post.post_type == "link" %}{{ post.media }}{% else %}{{ post.permalink }}{% endif %}">
+						{% if post.thumbnail == "" %}
+							<svg viewBox="0 0 100 106" width="50" height="53" xmlns="http://www.w3.org/2000/svg">
+								<path d="M35,15h-15a10,10 0,0,0 0,20h25a10,10 0,0,0 10,-10m-12.5,0a10, 10 0,0,1 10, -10h25a10,10 0,0,1 0,20h-15" fill="none" stroke-width="5" stroke-linecap="round"/>
+							</svg>
+						{% else %}
+							<img src="{{ post.thumbnail }}">
+						{% endif %}
+						<span>{% if post.post_type == "link" %}{{ post.domain }}{% else %}{{ post.post_type }}{% endif %}</span>
+					</a>
+				{% endif %}
+			</div>
+		</div>
+		{% else %}
+			<div class="comment">
+				<div class="comment_left">
+					<p class="comment_score">{{ post.score }}</p>
+					<div class="line"></div>
+				</div>
+				<details class="comment_right" open>
+					<summary class="comment_data">
+						<a class="comment_link" href="{{ post.permalink }}">COMMENT</a>
+						<span class="created" title="{{ post.created }}">{{ post.rel_time }}</span>
+					</summary>
+					<p class="comment_body">{{ post.body }}</p>
+				</details>
+			</div>
+		{% endif %}
+		{% endfor %}
+
+		<footer>
+			{% if params.before != "" %}
+			<a href="?q={{ params.q }}&restrict_sr={{ params.restrict_sr }}
+				&sort={{ params.sort }}&t={{ params.t }}
+				&before={{ params.before }}">PREV</a>
+			{% endif %}
+
+			{% if params.after != "" %}
+			<a href="?q={{ params.q }}&restrict_sr={{ params.restrict_sr }}
+				&sort={{ params.sort }}&t={{ params.t }}
+				&after={{ params.after }}">NEXT</a>
+			{% endif %}
+		</footer>
+	</div>
+{% endblock %}

templates/settings.html

@@ -0,0 +1,52 @@
+{% extends "base.html" %}
+{% import "utils.html" as utils %}
+
+{% block title %}Libreddit Settings{% endblock %}
+
+{% block search %}
+	{% call utils::search("".to_owned(), "", "") %}
+{% endblock %}
+
+{% block content %}
+<form id="settings" action="/settings" method="POST">
+	<div id="prefs">
+		<p>Appearance</p>
+		<div id="theme">
+			<label for="theme">Theme:</label>
+			<select name="theme"> 
+				{% call utils::options(prefs.theme, ["dark", "light"], "dark") %}
+			</select>
+		</div>
+		<p>Interface</p>
+		<div id="front_page">
+			<label for="front_page">Front page:</label>
+			<select name="front_page"> 
+				{% call utils::options(prefs.front_page, ["popular", "all"], "popular") %}
+			</select>
+		</div>
+		<div id="layout">
+			<label for="layout">Layout:</label>
+			<select name="layout"> 
+				{% call utils::options(prefs.layout, ["card", "clean", "compact"], "clean") %}
+			</select>
+		</div>
+		<div id="wide">
+			<label for="wide">Wide UI:</label>
+			<input type="checkbox" name="wide" {% if prefs.wide == "on" %}checked{% endif %}>
+		</div>
+		<p>Content</p>
+		<div id="comment_sort">
+			<label for="comment_sort">Default comment sort:</label>
+			<select name="comment_sort"> 
+				{% call utils::options(prefs.comment_sort, ["confidence", "top", "new", "controversial", "old"], "confidence") %}
+			</select>
+		</div>
+		<div id="hide_nsfw">
+			<label for="hide_nsfw">Hide NSFW posts:</label>
+			<input type="checkbox" name="hide_nsfw" {% if prefs.hide_nsfw == "on" %}checked{% endif %}>
+		</div>
+	</div>
+	<p id="settings_note"><b>Note:</b> settings are saved in browser cookies. Clearing your cookie data will reset them.</p>
+	<input id="save" type="submit" value="Save">
+</form>
+{% endblock %}

templates/subreddit.html

@@ -1,57 +1,117 @@
 {% extends "base.html" %}
-{% block title %}r/{{ sub.name }}: {{ sub.description }}{% endblock %}
+{% import "utils.html" as utils %}
+
+{% block title %}
+	{% if sub.title != "" %}{{ sub.title }}
+	{% else if sub.name != "" %}{{ sub.name }}
+	{% else %}Libreddit{% endif %}
+{% endblock %}
+
+{% block search %}
+	{% call utils::search(["/r/", sub.name.as_str()].concat(), "") %}
+{% endblock %}
+
 {% block body %}
-	<div id="about">
-		<div class="subreddit">
-			<div class="subreddit_left">
-				{{ sub.icon }}
-			</div>
-			<div class="subreddit_right">
-				<h2 class="subreddit_name">r/{{ sub.name }}</h2>
-				<p class="subreddit_description">{{ sub.description }}</p>
-				<div id="stats">👤 {{ sub.members }} 🟢 {{ sub.active }}</div>
-			</div>
-		</div>
-	</div>
 	<main>
-		<div id="sort">
-			<div id="sort_hot"><a href="?sort=hot">Hot</a></div>
-			<div id="sort_top"><a href="?sort=top">Top</a></div>
-			<div id="sort_new"><a href="?sort=new">New</a></div>
+		<div id="column_one">
+			<form id="sort">
+				<div id="sort_options">
+					{% if sub.name.is_empty() %}
+						{% call utils::sort("", ["hot", "new", "top", "rising", "controversial"], sort.0) %}
+					{% else %}
+						{% call utils::sort(["/r/", sub.name.as_str()].concat(), ["hot", "new", "top", "rising", "controversial"], sort.0) %}
+					{% endif %}
+				</div>
+				{% if sort.0 == "top" || sort.0 == "controversial" %}<select id="timeframe" name="t"> 
+					{% call utils::options(sort.1, ["hour", "day", "week", "month", "year", "all"], "day") %}
+					<input id="sort_submit" type="submit" value="&rarr;">
+				</select>{% endif %}
+			</form>
+
+			<div id="posts">
+			{% for post in posts %}
+			{% if !(post.flags.nsfw && prefs.hide_nsfw == "on") %}
+			<hr class="sep" />
+			<div class="post {% if post.flags.stickied %}stickied{% endif %} {% if prefs.layout == "card" && post.post_type == "image" %}card_post{% endif %}">
+				<div class="post_left">
+					<p class="post_score">{{ post.score }}</p>
+					{% if post.flags.nsfw %}<div class="nsfw">NSFW</div>{% endif %}
+				</div>
+				<div class="post_right">
+					<div class="post_text">
+						<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="/u/{{ post.author.name }}">u/{{ post.author.name }}</a>
+							<span class="dot">&bull;</span>
+							<span class="created" title="{{ post.created }}">{{ post.rel_time }}</span>
+						</p>
+						<p class="post_title">
+							{% if post.flair.flair_parts.len() > 0 %}
+							<small class="post_flair" style="color:{{ post.flair.foreground_color }}; background:{{ post.flair.background_color }}">{% call utils::render_flair(post.flair.flair_parts) %}</small>
+							{% endif %}
+							<a href="{{ post.permalink }}">{{ post.title }}</a>
+						</p>
+					</div>
+
+					<!-- POST MEDIA/THUMBNAIL -->
+					{% if prefs.layout == "card" && post.post_type == "image" %}
+						<img class="post_media" src="{{ post.media }}"/>
+					{% else if post.post_type != "self" %}
+						<a class="post_thumbnail {% if post.thumbnail == "" %}no_thumbnail{% endif %}" href="{% if post.post_type == "link" %}{{ post.media }}{% else %}{{ post.permalink }}{% endif %}">
+							{% if post.thumbnail == "" %}
+								<svg viewBox="0 0 100 106" width="50" height="53" xmlns="http://www.w3.org/2000/svg">
+									<path d="M35,15h-15a10,10 0,0,0 0,20h25a10,10 0,0,0 10,-10m-12.5,0a10, 10 0,0,1 10, -10h25a10,10 0,0,1 0,20h-15" fill="none" stroke-width="5" stroke-linecap="round"/>
+								</svg>
+							{% else %}
+								<img src="{{ post.thumbnail }}">
+							{% endif %}
+							<span>{% if post.post_type == "link" %}{{ post.domain }}{% else %}{{ post.post_type }}{% endif %}</span>
+						</a>
+					{% endif %}
+				</div>
+			</div>
+			{% endif %}
+			{% endfor %}
+			</div>
+
+			<footer>
+				{% if ends.0 != "" %}
+				<a href="?sort={{ sort.0 }}&t={{ sort.1 }}&before={{ ends.0 }}">PREV</a>
+				{% endif %}
+
+				{% if ends.1 != "" %}
+				<a href="?sort={{ sort.0 }}&t={{ sort.1 }}&after={{ ends.1 }}">NEXT</a>
+				{% endif %}
+			</footer>
 		</div>
-		{% for post in posts %}
-		<div class="post">
-			<div class="post_left">
-				<h3 class="post_score">{{ post.score }}</h3>
+		{% if sub.name != "" && !sub.name.contains("+") %}
+		<aside>
+			<div class="panel" id="subreddit">
+				{% if sub.wiki %}
+				<div id="top">
+					<div>Posts</div>
+					<a href="/r/{{ sub.name }}/wiki/index">Wiki</a>
+				</div>
+				{% endif %}
+				<div id="sub_meta">
+					<img id="sub_icon" src="{{ sub.icon }}">
+					<p id="sub_title">{{ sub.title }}</p>
+					<p id="sub_name">r/{{ sub.name }}</p>
+					<p id="sub_description">{{ sub.description }}</p>
+					<div id="sub_details">
+						<label>Members</label>
+						<label>Active</label>
+						<div>{{ sub.members }}</div>
+						<div>{{ sub.active }}</div>
+					</div>
+				</div>
 			</div>
-			<div class="post_right">
-				<h4>
-					<b><a class="post_subreddit" href="/r/{{ post.community }}">r/{{ sub.name }}</a></b>
-					&bull; <a class="post_author" href="/u/{{ post.author }}">u/{{ post.author }}</a>
-					{% if post.author_flair.0 != "" %}
-						<small class="author_flair">{{ post.author_flair.0 }}</small>
-					{% endif %}
-					<span class="datetime">{{ post.time }}</span>
-				</h4>
-				<h3 class="post_title">
-					{% if post.flair.0 != "" %}
-					<small class="post_flair" style="color:{{ post.flair.2 }}; background:{{ post.flair.1 }}">{{ post.flair.0 }}</small>
-					{% endif %}
-					<a href="{{ post.url }}">{{ post.title }}</a>
-				</h3>
-			</div>
-			<img class="post_thumbnail" src="{{ post.media }}">
-		</div><br>
-		{% endfor %}
-
-		<footer>
-			{% if ends.0 != "" %}
-			<a href="?before={{ ends.0 }}">PREV</a>
-			{% endif %}
-
-			{% if ends.1 != "" %}
-			<a href="?after={{ ends.1 }}">NEXT</a>
-			{% endif %}
-		</footer>
+			<details class="panel" id="sidebar">
+				<summary id="sidebar_label">Sidebar</summary>
+				<div id="sidebar_contents">{{ sub.info }}</div>
+			</details>
+		</aside>
+		{% endif %}
 	</main>
-{% endblock %}
+{% endblock %}

templates/user.html

@@ -1,63 +1,112 @@
 {% extends "base.html" %}
-{% block title %}Libreddit: u/{{ user.name }}{% endblock %}
+{% import "utils.html" as utils %}
+
+{% block search %}
+	{% call utils::search("".to_owned(), "", "") %}
+{% endblock %}
+
+{% block title %}{{ user.name.replace("u/", "") }} (u/{{ user.name }}) - Libreddit{% endblock %}
+
 {% block body %}
-	<div id="about">
-		<div class="user">
-			<div class="user_left">
-				<img class="user_icon" src="{{ user.icon }}">
-			</div>
-			<div class="user_right">
-				<h2 class="user_name">u/{{ user.name }}</h2>
-				<p class="user_description"><span>Karma:</span> {{ user.karma }} | <span>Description:</span> "{{ user.description }}"</p>
-			</div>
-		</div>
-	</div>
 	<main>
-		<div id="sort">
-			<div id="sort_hot"><a href="?sort=hot">Hot</a></div>
-			<div id="sort_top"><a href="?sort=top">Top</a></div>
-			<div id="sort_new"><a href="?sort=new">New</a></div>
+		<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"> 
+					{% call utils::options(sort.1, ["hour", "day", "week", "month", "year", "all"], "all") %}
+				</select>{% endif %}<input id="sort_submit" type="submit" value="&rarr;">
+			</form>
+
+			<div id="posts">
+			{% for post in posts %}
+
+			{% if post.flags.nsfw && prefs.hide_nsfw == "on" %}
+			{% else if post.title != "Comment" %}
+			<div class="post {% if post.flags.stickied %}stickied{% endif %} {% if prefs.layout == "card" && post.post_type == "image" %}card_post{% endif %}">
+				<div class="post_left">
+					<p class="post_score">{{ post.score }}</p>
+					{% if post.flags.nsfw %}<div class="nsfw">NSFW</div>{% endif %}
+				</div>
+				<div class="post_right">
+					<div class="post_text">
+						<p class="post_header">
+							<a class="post_subreddit" href="/r/{{ post.community }}">r/{{ post.community }}</a>
+							{% if post.author.flair.flair_parts.len() > 0 %}
+							<small class="author_flair">{% call utils::render_flair(post.author.flair.flair_parts) %}</small>
+							{% endif %}
+							<span class="dot">&bull;</span>
+							<span class="created" title="{{ post.created }}">{{ post.rel_time }}</span>
+						</p>
+						<p class="post_title">
+							{% if post.flair.background_color == "Comment" %}
+							{% else if post.flair.background_color == "" %}
+							{% else %}
+								<small class="post_flair" style="color:{{ post.flair.foreground_color }}; background:{{ post.flair.background_color }}">{% call utils::render_flair(post.flair.flair_parts) %}</small>
+							{% endif %}
+							<a href="{{ post.permalink }}">{{ post.title }}</a>
+						</p>
+					</div>
+					
+					<!-- POST MEDIA/THUMBNAIL -->
+					{% if prefs.layout == "card" && post.post_type == "image" %}
+						<img class="post_media" src="{{ post.media }}"/>
+					{% else if post.post_type != "self" %}
+						<a class="post_thumbnail {% if post.thumbnail == "" %}no_thumbnail{% endif %}" href="{% if post.post_type == "link" %}{{ post.media }}{% else %}{{ post.permalink }}{% endif %}">
+							{% if post.thumbnail == "" %}
+								<svg viewBox="0 0 100 106" width="50" height="53" xmlns="http://www.w3.org/2000/svg">
+									<path d="M35,15h-15a10,10 0,0,0 0,20h25a10,10 0,0,0 10,-10m-12.5,0a10, 10 0,0,1 10, -10h25a10,10 0,0,1 0,20h-15" fill="none" stroke-width="5" stroke-linecap="round"/>
+								</svg>
+							{% else %}
+								<img src="{{ post.thumbnail }}">
+							{% endif %}
+							<span>{% if post.post_type == "link" %}{{ post.domain }}{% else %}{{ post.post_type }}{% endif %}</span>
+						</a>
+					{% endif %}
+				</div>
+			</div>
+			{% else %}
+			<div class="comment">
+				<div class="comment_left">
+					<p class="comment_score">{{ post.score }}</p>
+					<div class="line"></div>
+				</div>
+				<details class="comment_right" open>
+					<summary class="comment_data">
+						<a class="comment_link" href="{{ post.permalink }}">COMMENT</a>
+						<span class="created" title="{{ post.created }}">{{ post.rel_time }}</span>
+					</summary>
+					<p class="comment_body">{{ post.body }}</p>
+				</details>
+			</div>
+			{% endif %}
+
+			{% endfor %}
+			</div>
+
+			<footer>
+				{% if ends.0 != "" %}
+				<a href="?sort={{ sort.0 }}&t={{ sort.1 }}&before={{ ends.0 }}">PREV</a>
+				{% endif %}
+
+				{% if ends.1 != "" %}
+				<a href="?sort={{ sort.0 }}&t={{ sort.1 }}&after={{ ends.1 }}">NEXT</a>
+				{% endif %}
+			</footer>
 		</div>
-		{% for post in posts %}
-		{% if post.title != "Comment" %}
-		<div class='post'>
-			<div class="post_left">
-				<h3 class="post_score">{{ post.score }}</h3>
+		<aside>
+			<div class="panel" id="user">
+				<img id="user_icon" src="{{ user.icon }}">
+				<p id="user_title">{{ user.title }}</p>
+				<p id="user_name">u/{{ user.name }}</p>
+				<div id="user_description">{{ user.description }}</div>
+				<div id="user_details">
+					<label>Karma</label>
+					<label>Created</label>
+					<div>{{ user.karma }}</div>
+					<div>{{ user.created }}</div>
+				</div>
 			</div>
-			<div class="post_right">
-				<h4>
-					<b><a class="post_subreddit" href="/r/{{ post.community }}">r/{{ post.community }}</a></b>
-					&bull; <a class="post_author" href="/u/{{ post.author }}">u/{{ post.author }}</a>
-					{% if post.author_flair.0 != "" %}
-						<small class="author_flair">{{ post.author_flair.0 }}</small>
-					{% endif %}
-					<span class="datetime" style="float: right;">{{ post.time }}</span>
-				</h4>
-				<h3 class="post_title">
-					{% if post.flair.0 == "Comment" %}
-					{% else if post.flair.0 == "" %}
-					{% else %}
-						<small class="post_flair" style="color:{{ post.flair.2 }}; background:{{ post.flair.1 }}">{{ post.flair.0 }}</small>
-					{% endif %}
-					<a href="{{ post.url }}">{{ post.title }}</a>
-				</h3>
-			</div>
-			<img class="post_thumbnail" src="{{ post.media }}">
-		</div><br>
-		{% else %}
-		<div class="comment">
-			<div class="comment_left">
-				<h3 class="comment_score">{{ post.score }}</h3>
-			</div>
-			<div class="comment_right">
-				<h4>
-					COMMENT
-					<span class="datetime">{{ post.time }}</span>
-				</h4>
-				<h4 class="comment_body">{{ post.body }}</h4>
-			</div>
-		</div><br>
-		{% endif %}
-		{% endfor %}
+		</aside>
 	</main>
-{% endblock %}
+{% endblock %}

templates/utils.html

@@ -0,0 +1,35 @@
+{% macro options(current, values, default) -%}
+	{% for value in values %}
+		<option value="{{ value }}" {% if current == value || (current == "" && value == default) %}selected{% endif %}>
+			{{ format!("{}{}", value.get(0..1).unwrap().to_uppercase(), value.get(1..).unwrap()) }}
+		</option>
+	{% endfor %}
+{%- endmacro %}
+
+{% macro sort(root, methods, selected) -%}
+	{% for method in methods %}
+		<a {% if method == selected %}class="selected"{% endif %} href="{{ root }}/{{ method }}">
+			{{ format!("{}{}", method.get(0..1).unwrap().to_uppercase(), method.get(1..).unwrap()) }}
+		</a>
+	{% endfor %}
+{%- endmacro %}
+
+{% macro search(root, search) -%}
+<form action="{% if root != "/r/" && !root.is_empty() %}{{ root }}{% endif %}/search/" id="searchbox">
+	<input id="search" type="text" name="q" placeholder="Search" value="{{ search }}">
+	{% if root != "/r/" && !root.is_empty() %}
+	<div id="inside">
+		<input type="checkbox" name="restrict_sr" id="restrict_sr">
+		<label for="restrict_sr" class="search_label">in {{ root }}</label>
+	</div>
+	{% endif %}
+	<input type="submit" value="&rarr;">
+</form>
+{%- endmacro %}
+
+{% macro render_flair(flair) -%}
+{% for flair_part in flair %}
+	{% if flair_part.flair_part_type == "emoji" %}<span class="emoji" style="background-image:url('{{ flair_part.value }}')"></span>
+	{% else if flair_part.flair_part_type == "text" %}<span>{{ flair_part.value }}</span>{% endif %}
+{% endfor %}
+{%- endmacro %}

templates/wiki.html

@@ -0,0 +1,25 @@
+{% extends "base.html" %}
+{% import "utils.html" as utils %}
+
+{% block title %}
+	{% if sub != "" %}{{ page }} - {{ sub }}
+	{% else %}Libreddit{% endif %}
+{% endblock %}
+
+{% block search %}
+	{% call utils::search(["/r/", sub.as_str()].concat(), "") %}
+{% endblock %}
+
+{% block body %}
+	<main>
+		<div class="panel" id="column_one">
+			<div id="top">
+				<a href="/r/{{ sub }}">Posts</a>
+				<div>Wiki</div>
+			</div>
+			<div id="wiki">
+				{{ wiki }}
+			</div>
+		</div>
+	</main>
+{% endblock %}