Update version and screenshot

Fix #66
Fix cog class
2021-01-31 18:50:31 -08:00 · 2021-01-31 14:10:13 -08:00 · 2021-01-31 13:49:55 -08:00 · 2021-01-31 13:22:11 -08:00 · 2021-01-31 12:40:32 -08:00 · 2021-01-31 19:41:32 +01:00
25 changed files with 2243 additions and 1179 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.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.
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.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.
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@ -3,18 +3,19 @@ name = "libreddit"
 description = " Alternative private front-end to Reddit"
 license = "AGPL-3.0"
 repository = "https://github.com/spikecodes/libreddit"
-version = "0.2.6"
+version = "0.2.9"
 authors = ["spikecodes <19519553+spikecodes@users.noreply.github.com>"]
 edition = "2018"

 [dependencies]
-base64 = "0.13.0"
-actix-web = { version = "3.2.0", features = ["rustls"] }
-reqwest = { version = "0.10", default_features = false, features = ["rustls-tls"] }
-askama = "0.8.0"
-serde = "1.0.117"
+base64 = "0.13"
+actix-web = { version = "3.3", features = ["rustls"] }
+futures = "0.3"
+askama = "0.10"
+ureq = "2"
+serde = { version = "1.0", default_features = false, features = ["derive"] }
 serde_json = "1.0"
-chrono = "0.4.19"
-async-recursion = "0.3.1"
-url = "2.2.0"
-regex = "1"
+async-recursion = "0.3"
+url = "2.2"
+regex = "1.4"
+time = "0.2"
--- a/README.md
+++ b/README.md
@ -2,41 +2,34 @@

 > An alternative private front-end to Reddit 

-Libre + Reddit = [Libreddit](https://libredd.it)
+![screenshot](https://i.ibb.co/185749F/image.png)

- 🚀 Fast: written in Rust for blazing fast speeds and safety
- ☁️ Light: no JavaScript, no ads, no tracking
+---
+
+**10 second pitch:** Libreddit is a portmanteau of "libre" (meaning freedom) and "Reddit". It is a private front-end 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).
+
+- 🚀 Fast: written in Rust for blazing fast speeds and memory safety
+- ☁️ Light: no JavaScript, no ads, no tracking, no bloat
 - 🕵 Private: all requests are proxied through the server, including media
- 🦺 Safe: does not rely on Reddit OAuth or require a Reddit API Key 
 - 🔒 Secure: strong [Content Security Policy](https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP) prevents browser requests to Reddit

-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)
+## Jump to...
 - [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)
+- [Deployment](#deployment)

-## Screenshot
+---

-![](https://i.ibb.co/6mXqb4G/libreddit-rust.png)
-
-## Instances
+# Instances

 Feel free to [open an issue](https://github.com/spikecodes/libreddit/issues/new) to have your [selfhosted instance](#deployment) listed here!

@ -47,25 +40,30 @@ Feel free to [open an issue](https://github.com/spikecodes/libreddit/issues/new)
 | [libreddit.dothq.co](https://libreddit.dothq.co) | 🇺🇸 US  | ✅ |
 | [libreddit.insanity.wtf](https://libreddit.insanity.wtf) | 🇺🇸 US  | ✅ |
 | [libreddit.kavin.rocks](https://libreddit.kavin.rocks) | 🇮🇳 IN  | ✅ |
+| [libreddit.himiko.cloud](https://libreddit.himiko.cloud) | 🇧🇬 BG |  |
 | [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)
- 🐋 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)
+# About

-### Info
+Find Libreddit on 💬 [Matrix](https://matrix.to/#/#libreddit:kde.org), 🐋 [Docker](https://hub.docker.com/r/spikecodes/libreddit), :octocat: [GitHub](https://github.com/spikecodes/libreddit), and 🦊 [GitLab](https://gitlab.com/spikecodes/libreddit).
+
+## Built with
+
+- [Rust](https://www.rust-lang.org/) - Programming language
+- [Actix Web](https://github.com/actix/actix-web) - Web server
+- [Askama](https://github.com/djc/askama) - Templating engine
+- [ureq](https://github.com/algesten/ureq) - HTTP client
+
+## 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 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?
+## How does it compare to Teddit?

 Teddit is another awesome open source project designed to provide an alternative frontend to Reddit. There is no connection between the two and you're welcome to use whichever one you favor. Competition fosters innovation and Teddit's release has motivated me to build Libreddit into an even more polished product.

@ -73,25 +71,27 @@ 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](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).

-## Comparison
+---
+
+# Comparison

 This section outlines how Libreddit compares to Reddit.

-### Speed
+## Speed

-Lasted tested December 21, 2020.
+Lasted tested Jan 17, 2021.

 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**|
+|                        | Libreddit     | Reddit     |
+|------------------------|---------------|------------|
+| Requests               | 20            | 70         |
+| Resource Size (card ui)| 1,224 KiB     | 1,690 KiB  |
+| Time to Interactive    | **1.5 s**     | **11.2 s** |

-### Privacy
+## Privacy

-#### Reddit
+### Reddit

 **Logging:** According to Reddit's [privacy policy](https://www.redditinc.com/policies/privacy-policy), they "may [automatically] log information" including:
 - IP address
@ -120,21 +120,23 @@ Results from Google Lighthouse ([Libreddit Report](https://lighthouse-dot-webdot
 - Third-Party Cookies
 - Third-Party Site

-#### Libreddit
+### 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 troubleshooting but nothing else.
+**Logging:** In production (when running the binary, hosting with docker, or using the official instances), Libreddit logs when Reddit is ratelimiting Libreddit and when Reddit's JSON responses can't be parsed. 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 no cookies currently but eventually, I plan to add a configuration page where users can store an optional cookie to save their preferred theme, default sorting algorithm, or default layout.
+**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.
+**Hosting:** The official instances 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
+---

-### A) Cargo
+# Installation
+
+## 1) Cargo

 Make sure Rust stable is installed along with `cargo`, Rust's package manager.

@ -142,9 +144,9 @@ Make sure Rust stable is installed along with `cargo`, Rust's package manager.
 cargo install libreddit
 ```

-### B) Docker
+## 2) Docker

-Deploy the Docker image of Libreddit:
+Deploy the [Docker image](https://hub.docker.com/r/spikecodes/libreddit) of Libreddit:
 ```
 docker run -d --name libreddit -p 8080:8080 spikecodes/libreddit
 ```
@ -154,23 +156,21 @@ Deploy using a different port (in this case, port 80):
 docker run -d --name libreddit -p 80:8080 spikecodes/libreddit
 ```

-### C) AUR
+## 3) AUR

 For ArchLinux users, Libreddit is available from the AUR as [`libreddit-git`](https://aur.archlinux.org/packages/libreddit-git).

-Install:
 ```
 yay -S libreddit-git
 ```

-### D) GitHub Releases
+## 4) 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.

-### E) Repl.it
+## 5) 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.
+**Note:** Repl.it is a free option but they are *not* private and will monitor server usage to prevent abuse. If you 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
@ -178,18 +178,22 @@ Currently, Libreddit does not have Windows or macOS binaries but those will be a

 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:
+# Deployment
+
+Once installed, deploy Libreddit to `0.0.0.0:8080` by running:

 ```
 libreddit
 ```

-Specify a custom address for the server by passing the `-a` or `--address` argument:
-```
-libreddit --address=0.0.0.0:8111
-```
+## Options
+
+| Short | Long               | Example                           |
+|-------|--------------------|-----------------------------------|
+| `-a`  | `--address`        | `libreddit --adress=0.0.0.0:8111` |
+| `-r`  | `--redirect-https` | `libreddit --redirect-https`      |

 ## Building

--- a/src/main.rs
+++ b/src/main.rs
@ -1,11 +1,15 @@
 // Import Crates
-use actix_web::{get, middleware::NormalizePath, web, App, HttpResponse, HttpServer};
+use actix_web::{
+	dev::{Service, ServiceResponse},
+	middleware, web, App, HttpResponse, HttpServer,
+};
+use futures::future::FutureExt;

 // Reference local files
 mod post;
 mod proxy;
 mod search;
-// mod settings;
+mod settings;
 mod subreddit;
 mod user;
 mod utils;
@ -16,70 +20,123 @@ 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()
+		.content_type("image/x-icon")
+		.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 force_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" => force_https = true,
+			_ => (),
 		}
 	}

 	// start http server
 	println!("Running Libreddit v{} on {}!", env!("CARGO_PKG_VERSION"), &address);

-	HttpServer::new(|| {
+	HttpServer::new(move || {
 		App::new()
-			// TRAILING SLASH MIDDLEWARE
-			.wrap(NormalizePath::default())
-			// DEFAULT SERVICE
-			.default_service(web::get().to(utils::error))
-			// GENERAL SERVICES
+			// Redirect to HTTPS if "--redirect-https" enabled
+			.wrap_fn(move |req, srv| {
+				let secure = req.connection_info().scheme() == "https";
+				let https_url = format!("https://{}{}", req.connection_info().host(), req.uri().to_string());
+				srv.call(req).map(move |res: Result<ServiceResponse, _>| {
+					if force_https && !secure {
+						Ok(ServiceResponse::new(
+							res.unwrap().request().to_owned(),
+							HttpResponse::Found().header("Location", https_url).finish(),
+						))
+					} else {
+						res
+					}
+				})
+			})
+			// Append trailing slash and remove double slashes
+			.wrap(middleware::NormalizePath::default())
+			// Apply default headers for security
+			.wrap(
+				middleware::DefaultHeaders::new()
+					.header("Referrer-Policy", "no-referrer")
+					.header("X-Content-Type-Options", "nosniff")
+					.header("X-Frame-Options", "DENY")
+					.header(
+						"Content-Security-Policy",
+						"default-src 'none'; media-src 'self'; style-src 'self' 'unsafe-inline'; base-uri 'none'; img-src 'self' data:; form-action 'self'; frame-ancestors 'none';",
+					),
+			)
+			// 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))
-			// SETTINGS SERVICE
-			// .route("/settings/", web::get().to(settings::get))
-			// .route("/settings/save/", web::post().to(settings::set))
-			// PROXY SERVICE
+			// Proxy media through Libreddit
 			.route("/proxy/{url:.*}/", web::get().to(proxy::handler))
-			// SEARCH SERVICES
-			.route("/search/", web::get().to(search::find))
-			.route("r/{sub}/search/", web::get().to(search::find))
-			// USER SERVICES
-			.route("/u/{username}/", web::get().to(user::profile))
-			.route("/user/{username}/", web::get().to(user::profile))
-			// WIKI SERVICES
-			.route("/wiki/", web::get().to(subreddit::wiki))
-			.route("/wiki/{page}/", web::get().to(subreddit::wiki))
-			.route("/r/{sub}/wiki/", web::get().to(subreddit::wiki))
-			.route("/r/{sub}/wiki/{page}/", web::get().to(subreddit::wiki))
-			// SUBREDDIT SERVICES
-			.route("/r/{sub}/", web::get().to(subreddit::page))
-			.route("/r/{sub}/{sort:hot|new|top|rising|controversial}/", web::get().to(subreddit::page))
-			// POPULAR SERVICES
+			// 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))
+					// Handle subscribe/unsubscribe
+					.route("/{action:subscribe|unsubscribe}/", web::post().to(subreddit::subscriptions))
+					// 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)),
+					),
+			)
+			// Front page
 			.route("/", web::get().to(subreddit::page))
 			.route("/{sort:best|hot|new|top|rising|controversial}/", web::get().to(subreddit::page))
-			// POST SERVICES
+			// 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))
-			.route("/r/{sub}/comments/{id}/{title}/", web::get().to(post::item))
-			.route("/r/{sub}/comments/{id}/{title}/{comment_id}/", web::get().to(post::item))
 	})
 	.bind(&address)
-	.unwrap_or_else(|_| panic!("Cannot bind to the address: {}", address))
+	.unwrap_or_else(|e| panic!("Cannot bind to the address {}: {}", address, e))
 	.run()
 	.await
 }
--- a/src/post.rs
+++ b/src/post.rs
@ -1,11 +1,10 @@
 // CRATES
-use crate::utils::{error, format_num, format_url, param, request, rewrite_url, val, Comment, Flags, Flair, Post};
-use actix_web::{HttpRequest, HttpResponse, Result};
+use crate::utils::*;
+use actix_web::{HttpRequest, HttpResponse};

 use async_recursion::async_recursion;

 use askama::Template;
-use chrono::{TimeZone, Utc};

 // STRUCTS
 #[derive(Template)]
@ -14,139 +13,176 @@ struct PostTemplate {
 	comments: Vec<Comment>,
 	post: Post,
 	sort: String,
+	prefs: Preferences,
 }

 pub async fn item(req: HttpRequest) -> HttpResponse {
-	let path = format!("{}.json?{}&raw_json=1", req.path(), req.query_string());
-	let sort = param(&path, "sort");
+	// Build Reddit API path
+	let mut path: String = format!("{}.json?{}&raw_json=1", req.path(), req.query_string());
+
+	// Set sort to sort query parameter
+	let mut sort: String = param(&path, "sort");
+
+	// 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
-	match request(&path).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.unwrap();
-			let comments = parse_comments(&res[1]).await.unwrap();
+			let post = parse_post(&res[0]).await;
+			let comments = parse_comments(&res[1]).await;

 			// Use the Post and Comment structs to generate a website to show users
-			let s = PostTemplate { comments, post, sort }.render().unwrap();
+			let s = PostTemplate {
+				comments,
+				post,
+				sort,
+				prefs: prefs(req),
+			}
+			.render()
+			.unwrap();
 			HttpResponse::Ok().content_type("text/html").body(s)
 		}
 		// If the Reddit API returns an error, exit and send error page to user
-		Err(msg) => error(msg.to_string()).await,
+		Err(msg) => error(msg).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_or_default().to_string())
-	} 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_or_default().to_string())
-	} else if data["post_hint"].as_str().unwrap_or("") == "image" {
-		post_type = "image";
-		format_url(data["preview"]["images"][0]["source"]["url"].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)
-}
-
 // POSTS
-async fn parse_post(json: &serde_json::Value) -> Result<Post, &'static str> {
+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];

 	// Grab UTC time as unix timestamp
-	let unix_time: i64 = post["data"]["created_utc"].as_f64().unwrap_or_default().round() as i64;
+	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;

 	// Determine the type of media along with the media URL
-	let media = media(&post["data"]).await;
+	let (post_type, media) = media(&post["data"]).await;

 	// Build a post using data parsed from Reddit post API
-	Ok(Post {
+	Post {
 		id: val(post, "id"),
 		title: val(post, "title"),
 		community: val(post, "subreddit"),
 		body: rewrite_url(&val(post, "selftext_html")),
-		author: val(post, "author"),
-		author_flair: Flair(
-			val(post, "author_flair_text"),
-			val(post, "author_flair_background_color"),
-			val(post, "author_flair_text_color"),
-		),
+		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),
 		upvote_ratio: ratio as i64,
-		post_type: media.0,
-		flair: Flair(
-			val(post, "link_flair_text"),
-			val(post, "link_flair_background_color"),
-			if val(post, "link_flair_text_color") == "dark" {
+		post_type,
+		media,
+		thumbnail: Media {
+			url: format_url(val(post, "thumbnail").as_str()),
+			width: post["data"]["thumbnail_width"].as_i64().unwrap_or_default(),
+			height: post["data"]["thumbnail_height"].as_i64().unwrap_or_default(),
+		},
+		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(false),
 			stickied: post["data"]["stickied"].as_bool().unwrap_or(false),
 		},
-		media: media.1,
-		time: Utc.timestamp(unix_time, 0).format("%b %e %Y %H:%M UTC").to_string(),
-	})
+		domain: val(post, "domain"),
+		rel_time,
+		created,
+		comments: format_num(post["data"]["num_comments"].as_i64().unwrap_or_default()),
+	}
 }

 // 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 {
-		let unix_time: i64 = comment["data"]["created_utc"].as_f64().unwrap_or(0.0).round() as i64;
-		if unix_time == 0 {
+		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 = rewrite_url(&val(comment, "body_html"));
+		let body = rewrite_url(&val(&comment, "body_html"));

 		let replies: Vec<Comment> = if comment["data"]["replies"].is_object() {
-			parse_comments(&comment["data"]["replies"]).await.unwrap_or_default()
+			parse_comments(&comment["data"]["replies"]).await
 		} else {
 			Vec::new()
 		};

+		dbg!();
+
 		comments.push(Comment {
-			id: val(comment, "id"),
+			id: val(&comment, "id"),
 			body,
-			author: val(comment, "author"),
-			score: format_num(score),
-			time: Utc.timestamp(unix_time, 0).format("%b %e %Y %H:%M UTC").to_string(),
+			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: if comment["data"]["score_hidden"].as_bool().unwrap_or_default() {
+				"•".to_string()
+			} else {
+				format_num(score)
+			},
+			rel_time,
+			created,
 			replies,
-			flair: Flair(
-				val(comment, "author_flair_text"),
-				val(comment, "author_flair_background_color"),
-				val(comment, "author_flair_text_color"),
-			),
 		});
 	}

-	Ok(comments)
+	comments
 }
--- a/src/proxy.rs
+++ b/src/proxy.rs
@ -8,6 +8,8 @@ pub async fn handler(web::Path(b64): web::Path<String>) -> Result<HttpResponse>
 		// THUMBNAILS
 		"a.thumbs.redditmedia.com",
 		"b.thumbs.redditmedia.com",
+		// EMOJI
+		"emoji.redditmedia.com",
 		// ICONS
 		"styles.redditmedia.com",
 		"www.redditstatic.com",
@ -19,28 +21,27 @@ pub async fn handler(web::Path(b64): web::Path<String>) -> Result<HttpResponse>
 		"v.redd.it",
 	];

-	match decode(b64) {
-		Ok(bytes) => {
-			let media = String::from_utf8(bytes).unwrap_or_default();
+	let decoded = decode(b64).map(|bytes| String::from_utf8(bytes).unwrap_or_default());

-			match Url::parse(media.as_str()) {
-				Ok(url) => {
-					let domain = url.domain().unwrap_or_default();
+	match decoded {
+		Ok(media) => match Url::parse(media.as_str()) {
+			Ok(url) => {
+				let domain = url.domain().unwrap_or_default();

-					if domains.contains(&domain) {
-						Client::default()
-							.get(media.replace("&amp;", "&"))
-							.send()
-							.await
-							.map_err(Error::from)
-							.map(|res| HttpResponse::build(res.status()).streaming(res))
-					} else {
-						Err(error::ErrorForbidden("Resource must be from Reddit"))
-					}
+				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(_) => Err(error::ErrorBadRequest("Can't parse encoded base64 URL")),
 			}
-		}
-		Err(_) => Err(error::ErrorBadRequest("Can't decode base64 URL")),
+			_ => Err(error::ErrorBadRequest("Can't parse base64 into URL")),
+		},
+		_ => Err(error::ErrorBadRequest("Can't decode base64")),
 	}
 }
--- a/src/search.rs
+++ b/src/search.rs
@ -1,5 +1,5 @@
 // CRATES
-use crate::utils::{error, fetch_posts, param, Post};
+use crate::utils::{cookie, error, fetch_posts, param, prefs, request, val, Post, Preferences};
 use actix_web::{HttpRequest, HttpResponse};
 use askama::Template;

@ -13,41 +13,87 @@ struct SearchParams {
 	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 nsfw_results = if cookie(&req, "show_nsfw") == "on" { "&include_over_18=on" } else { "" };
+	let path = format!("{}.json?{}{}", req.path(), req.query_string(), nsfw_results);
+	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 sub = req.match_info().get("sub").unwrap_or("").to_string();
+
+	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) => HttpResponse::Ok().content_type("text/html").body(
+		Ok((posts, after)) => HttpResponse::Ok().content_type("text/html").body(
 			SearchTemplate {
-				posts: posts.0,
+				posts,
+				subreddits,
 				sub,
 				params: SearchParams {
 					q: param(&path, "q"),
 					sort,
 					t: param(&path, "t"),
 					before: param(&path, "after"),
-					after: posts.1,
+					after,
 					restrict_sr: param(&path, "restrict_sr"),
 				},
+				prefs: prefs(req),
 			}
 			.render()
 			.unwrap(),
 		),
-		Err(msg) => error(msg.to_string()).await,
+		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(),
 	}
 }
--- a/src/settings.rs
+++ b/src/settings.rs
@ -1,48 +1,56 @@
-// // CRATES
-// use crate::utils::cookies;
-// use actix_web::{cookie::Cookie, web::Form, HttpRequest, HttpResponse, Result}; // http::Method,
-// use askama::Template;
+// CRATES
+use crate::utils::{prefs, Preferences};
+use actix_web::{cookie::Cookie, web::Form, HttpRequest, HttpResponse};
+use askama::Template;
+use time::{Duration, OffsetDateTime};

-// // STRUCTS
-// #[derive(Template)]
-// #[template(path = "settings.html", escape = "none")]
-// struct SettingsTemplate {
-// 	pref_nsfw: String,
-// }
+// STRUCTS
+#[derive(Template)]
+#[template(path = "settings.html")]
+struct SettingsTemplate {
+	prefs: Preferences,
+}

-// #[derive(serde::Deserialize)]
-// pub struct Preferences {
-// 	pref_nsfw: Option<String>,
-// }
+#[derive(serde::Deserialize)]
+pub struct SettingsForm {
+	theme: Option<String>,
+	front_page: Option<String>,
+	layout: Option<String>,
+	wide: Option<String>,
+	comment_sort: Option<String>,
+	show_nsfw: Option<String>,
+}

-// // FUNCTIONS
+// FUNCTIONS

-// // Retrieve cookies from request "Cookie" header
-// pub async fn get(req: HttpRequest) -> Result<HttpResponse> {
-// 	let cookies = cookies(req);
+// 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)
+}

-// 	let pref_nsfw: String = cookies.get("pref_nsfw").unwrap_or(&String::new()).to_owned();
+// Set cookies using response "Set-Cookie" header
+pub async fn set(_req: HttpRequest, form: Form<SettingsForm>) -> HttpResponse {
+	let mut res = HttpResponse::Found();

-// 	let s = SettingsTemplate { pref_nsfw }.render().unwrap();
-// 	Ok(HttpResponse::Ok().content_type("text/html").body(s))
-// }
+	let names = vec!["theme", "front_page", "layout", "wide", "comment_sort", "show_nsfw"];
+	let values = vec![&form.theme, &form.front_page, &form.layout, &form.wide, &form.comment_sort, &form.show_nsfw];

-// // Set cookies using response "Set-Cookie" header
-// pub async fn set(form: Form<Preferences>) -> HttpResponse {
-// 	let nsfw: Cookie = match &form.pref_nsfw {
-// 		Some(value) => Cookie::build("pref_nsfw", value).path("/").secure(true).http_only(true).finish(),
-// 		None => Cookie::build("pref_nsfw", "").finish(),
-// 	};
+	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 => res.del_cookie(&Cookie::named(name.to_owned())),
+		};
+	}

-// 	let body = SettingsTemplate {
-// 		pref_nsfw: form.pref_nsfw.clone().unwrap_or_default(),
-// 	}
-// 	.render()
-// 	.unwrap();
-
-// 	HttpResponse::Found()
-// 		.content_type("text/html")
-// 		.set_header("Set-Cookie", nsfw.to_string())
-// 		.set_header("Location", "/settings")
-// 		.body(body)
-// }
+	res
+		.content_type("text/html")
+		.set_header("Location", "/settings")
+		.body(r#"Redirecting to <a href="/settings">settings</a>..."#)
+}
--- a/src/subreddit.rs
+++ b/src/subreddit.rs
@ -1,7 +1,8 @@
 // CRATES
-use crate::utils::{error, fetch_posts, format_num, format_url, param, request, rewrite_url, val, Post, Subreddit};
-use actix_web::{HttpRequest, HttpResponse, Result};
+use crate::utils::*;
+use actix_web::{cookie::Cookie, HttpRequest, HttpResponse, Result};
 use askama::Template;
+use time::{Duration, OffsetDateTime};

 // STRUCTS
 #[derive(Template)]
@ -11,6 +12,7 @@ struct SubredditTemplate {
 	posts: Vec<Post>,
 	sort: (String, String),
 	ends: (String, String),
+	prefs: Preferences,
 }

 #[derive(Template)]
@ -19,63 +21,141 @@ struct WikiTemplate {
 	sub: String,
 	wiki: String,
 	page: String,
+	prefs: Preferences,
 }

 // SERVICES
 pub async fn page(req: HttpRequest) -> HttpResponse {
-	let path = format!("{}.json?{}", req.path(), req.query_string());
-	let sub = req.match_info().get("sub").unwrap_or("popular").to_string();
+	let subscribed = cookie(&req, "subscriptions");
+	let front_page = cookie(&req, "front_page");
 	let sort = req.match_info().get("sort").unwrap_or("hot").to_string();

-	let sub_result = if !&sub.contains('+') && sub != "popular" {
-		subreddit(&sub).await.unwrap_or_default()
-	} else {
-		Subreddit::default()
-	};
+	let sub = req
+		.match_info()
+		.get("sub")
+		.map(String::from)
+		.unwrap_or(if front_page == "default" || front_page.is_empty() {
+			if subscribed.is_empty() {
+				"popular".to_string()
+			} else {
+				subscribed.to_owned()
+			}
+		} else {
+			front_page.to_owned()
+		});
+
+	let path = format!("/r/{}/{}.json?{}", sub, sort, req.query_string());

 	match fetch_posts(&path, String::new()).await {
-		Ok(items) => {
+		Ok((posts, after)) => {
+			// If you can get subreddit posts, also request subreddit metadata
+			let sub = if !sub.contains('+') && sub != subscribed && sub != "popular" && sub != "all" {
+				// Regular subreddit
+				subreddit(&sub).await.unwrap_or_default()
+			} else if sub == subscribed {
+				// Subscription feed
+				if req.path().starts_with("/r/") {
+					subreddit(&sub).await.unwrap_or_default()
+				} else {
+					Subreddit::default()
+				}
+			} else if sub.contains('+') {
+				// Multireddit
+				Subreddit {
+					name: sub,
+					..Subreddit::default()
+				}
+			} else {
+				Subreddit::default()
+			};
+
 			let s = SubredditTemplate {
-				sub: sub_result,
-				posts: items.0,
+				sub,
+				posts,
 				sort: (sort, param(&path, "t")),
-				ends: (param(&path, "after"), items.1),
+				ends: (param(&path, "after"), after),
+				prefs: prefs(req),
 			}
 			.render()
 			.unwrap();
 			HttpResponse::Ok().content_type("text/html").body(s)
 		}
-		Err(msg) => error(msg.to_string()).await,
+		Err(msg) => error(msg).await,
 	}
 }

-pub async fn wiki(req: HttpRequest) -> HttpResponse {
-	let sub = req.match_info().get("sub").unwrap_or("reddit.com");
-	let page = req.match_info().get("page").unwrap_or("index");
-	let path: String = format!("r/{}/wiki/{}.json?raw_json=1", sub, page);
+// Sub or unsub by setting subscription cookie using response "Set-Cookie" header
+pub async fn subscriptions(req: HttpRequest) -> HttpResponse {
+	let mut res = HttpResponse::Found();

-	match request(&path).await {
+	let sub = req.match_info().get("sub").unwrap_or_default().to_string();
+	let action = req.match_info().get("action").unwrap_or_default().to_string();
+	let mut sub_list = prefs(req.to_owned()).subs;
+
+	// Modify sub list based on action
+	if action == "subscribe" && !sub_list.contains(&sub) {
+		sub_list.push(sub.to_owned());
+		sub_list.sort();
+	} else if action == "unsubscribe" {
+		sub_list.retain(|s| s != &sub);
+	}
+
+	// Delete cookie if empty, else set
+	if sub_list.is_empty() {
+		res.del_cookie(&Cookie::build("subscriptions", "").path("/").finish());
+	} else {
+		res.cookie(
+			Cookie::build("subscriptions", sub_list.join("+"))
+				.path("/")
+				.http_only(true)
+				.expires(OffsetDateTime::now_utc() + Duration::weeks(52))
+				.finish(),
+		);
+	}
+
+	// Redirect back to subreddit
+	// check for redirect parameter if unsubscribing from outside sidebar
+	let redirect_path = param(&req.uri().to_string(), "redirect");
+	let path = if !redirect_path.is_empty() && redirect_path.starts_with('/') {
+		redirect_path
+	} else {
+		format!("/r/{}", sub)
+	};
+
+	res
+		.content_type("text/html")
+		.set_header("Location", path.to_owned())
+		.body(format!("Redirecting to <a href=\"{0}\">{0}</a>...", path))
+}
+
+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);
+
+	match request(path).await {
 		Ok(res) => {
 			let s = WikiTemplate {
-				sub: sub.to_string(),
+				sub,
 				wiki: rewrite_url(res["data"]["content_html"].as_str().unwrap_or_default()),
-				page: page.to_string(),
+				page,
+				prefs: prefs(req),
 			}
 			.render()
 			.unwrap();
 			HttpResponse::Ok().content_type("text/html").body(s)
 		}
-		Err(msg) => error(msg.to_string()).await,
+		Err(msg) => error(msg).await,
 	}
 }

 // SUBREDDIT
-async fn subreddit(sub: &str) -> Result<Subreddit, &'static str> {
+async fn subreddit(sub: &str) -> Result<Subreddit, String> {
 	// Build the Reddit JSON API url
-	let path: String = format!("r/{}/about.json?raw_json=1", sub);
+	let path: String = format!("/r/{}/about.json?raw_json=1", sub);

 	// Send a request to the url
-	match request(&path).await {
+	match request(path).await {
 		// If success, receive JSON in response
 		Ok(res) => {
 			// Metadata regarding the subreddit
@ -83,7 +163,7 @@ async fn subreddit(sub: &str) -> Result<Subreddit, &'static str> {
 			let active: i64 = res["data"]["accounts_active"].as_u64().unwrap_or_default() as i64;

 			// 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 community_icon: &str = res["data"]["community_icon"].as_str().map_or("", |s| s.split('?').collect::<Vec<&str>>()[0]);
 			let icon = if community_icon.is_empty() { val(&res, "icon_img") } else { community_icon.to_string() };

 			let sub = Subreddit {
@ -91,7 +171,7 @@ async fn subreddit(sub: &str) -> Result<Subreddit, &'static str> {
 				title: val(&res, "title"),
 				description: val(&res, "public_description"),
 				info: rewrite_url(&val(&res, "description_html").replace("\\", "")),
-				icon: format_url(icon),
+				icon: format_url(icon.as_str()),
 				members: format_num(members),
 				active: format_num(active),
 				wiki: res["data"]["wiki_enabled"].as_bool().unwrap_or_default(),
--- a/src/user.rs
+++ b/src/user.rs
@ -1,8 +1,8 @@
 // CRATES
-use crate::utils::{error, fetch_posts, format_url, nested_val, param, request, Post, User};
+use crate::utils::{error, fetch_posts, format_url, param, prefs, request, Post, Preferences, User};
 use actix_web::{HttpRequest, HttpResponse, Result};
 use askama::Template;
-use chrono::{TimeZone, Utc};
+use time::OffsetDateTime;

 // STRUCTS
 #[derive(Template)]
@ -12,6 +12,7 @@ struct UserTemplate {
 	posts: Vec<Post>,
 	sort: (String, String),
 	ends: (String, String),
+	prefs: Preferences,
 }

 // FUNCTIONS
@ -23,55 +24,57 @@ pub async fn profile(req: HttpRequest) -> HttpResponse {
 	let sort = param(&path, "sort");
 	let username = req.match_info().get("username").unwrap_or("").to_string();

-	// Request user profile data and user posts/comments from Reddit
-	let user = user(&username).await;
+	// Request user posts/comments from Reddit
 	let posts = fetch_posts(&path, "Comment".to_string()).await;

 	match posts {
-		Ok(items) => {
+		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: user.unwrap(),
-				posts: items.0,
+				user,
+				posts,
 				sort: (sort, param(&path, "t")),
-				ends: (param(&path, "after"), items.1),
+				ends: (param(&path, "after"), after),
+				prefs: prefs(req),
 			}
 			.render()
 			.unwrap();
 			HttpResponse::Ok().content_type("text/html").body(s)
 		}
 		// If there is an error show error page
-		Err(msg) => error(msg.to_string()).await,
+		Err(msg) => error(msg).await,
 	}
 }

 // USER
-async fn user(name: &str) -> Result<User, &'static str> {
+async fn user(name: &str) -> Result<User, String> {
 	// Build the Reddit JSON API path
-	let path: String = format!("user/{}/about.json", name);
-
-	let res;
+	let path: String = format!("/user/{}/about.json", name);

 	// Send a request to the url
-	match request(&path).await {
+	match request(path).await {
 		// If success, receive JSON in response
-		Ok(response) => {
-			res = response;
+		Ok(res) => {
+			// Grab creation date as unix timestamp
+			let created: i64 = res["data"]["created"].as_f64().unwrap_or(0.0).round() as i64;
+
+			// 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),
 	}
-
-	// Grab creation date as unix timestamp
-	let created: i64 = res["data"]["created"].as_f64().unwrap_or(0.0).round() as i64;
-
-	// Parse the JSON output into a User struct
-	Ok(User {
-		name: name.to_string(),
-		title: nested_val(&res, "subreddit", "title"),
-		icon: format_url(nested_val(&res, "subreddit", "icon_img")),
-		karma: res["data"]["total_karma"].as_i64().unwrap_or(0),
-		created: Utc.timestamp(created, 0).format("%b %e, %Y").to_string(),
-		banner: nested_val(&res, "subreddit", "banner_img"),
-		description: nested_val(&res, "subreddit", "public_description"),
-	})
 }
--- a/src/utils.rs
+++ b/src/utils.rs
@ -1,57 +1,84 @@
-// use std::collections::HashMap;
-
 //
 // CRATES
 //
-use actix_web::{HttpResponse, Result};
+use actix_web::{cookie::Cookie, HttpRequest, HttpResponse, Result};
 use askama::Template;
 use base64::encode;
-use chrono::{TimeZone, Utc};
 use regex::Regex;
-use serde_json::from_str;
+use serde_json::{from_str, Value};
+use std::collections::HashMap;
+use time::{Duration, OffsetDateTime};
 use url::Url;
-// use surf::{client, get, middleware::Redirect};
+// use cached::proc_macro::cached;

 //
 // STRUCTS
 //
-// Post flair with text, background color and foreground color
-pub struct Flair(pub String, pub String, pub String);
+
+// 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,
 }

+pub struct Media {
+	pub url: String,
+	pub width: i64,
+	pub height: i64,
+}
+
 // 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 author: Author,
 	pub permalink: String,
 	pub score: String,
 	pub upvote_ratio: i64,
 	pub post_type: String,
 	pub flair: Flair,
 	pub flags: Flags,
-	pub media: String,
-	pub time: String,
+	pub thumbnail: Media,
+	pub media: Media,
+	pub domain: String,
+	pub rel_time: String,
+	pub created: String,
+	pub comments: String,
 }

 // 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>,
 }

+#[derive(Default)]
 // User struct containing metadata about user
 pub struct User {
 	pub name: String,
@ -90,41 +117,54 @@ pub struct Params {
 #[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 show_nsfw: String,
+	pub comment_sort: String,
+	pub subs: Vec<String>,
 }

 //
 // FORMATTING
 //

-// Grab a query param from a url
-pub fn param(path: &str, value: &str) -> String {
-	let url = Url::parse(format!("https://libredd.it/{}", path).as_str()).unwrap();
-	let pairs: std::collections::HashMap<_, _> = url.query_pairs().into_owned().collect();
-	pairs.get(value).unwrap_or(&String::new()).to_owned()
+// 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"),
+		show_nsfw: cookie(&req, "show_nsfw"),
+		comment_sort: cookie(&req, "comment_sort"),
+		subs: cookie(&req, "subscriptions").split('+').map(String::from).filter(|s| !s.is_empty()).collect(),
+	}
 }

-// Cookies from request
-// pub fn cookies(req: HttpRequest) -> HashMap<String, String> {
-// 	let mut result: HashMap<String, String> = HashMap::new();
+// 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(),
+	}
+}

-// 	let cookies: Vec<Cookie> = req
-// 		.headers()
-// 		.get_all("Cookie")
-// 		.map(|value| value.to_str().unwrap())
-// 		.map(|unparsed| Cookie::parse(unparsed).unwrap())
-// 		.collect();
-
-// 	for cookie in cookies {
-// 		result.insert(cookie.name().to_string(), cookie.value().to_string());
-// 	}
-
-// 	result
-// }
+// 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: String) -> String {
-	if url.is_empty() || url == "self" || url == "default" {
+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())
@ -139,36 +179,126 @@ pub fn rewrite_url(text: &str) -> String {

 // Append `m` and `k` for millions and thousands respectively
 pub fn format_num(num: i64) -> String {
-	if num > 1000000 {
-		format!("{}m", num / 1000000)
-	} else if num > 1000 {
-		format!("{}k", num / 1000)
+	if num >= 1_000_000 {
+		format!("{}m", num / 1_000_000)
+	} else if num >= 1000 {
+		format!("{}k", num / 1_000)
 	} else {
 		num.to_string()
 	}
 }

+pub async fn media(data: &Value) -> (String, Media) {
+	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(),
+		Media {
+			url,
+			width: data["preview"]["images"][0]["source"]["width"].as_i64().unwrap_or_default(),
+			height: data["preview"]["images"][0]["source"]["height"].as_i64().unwrap_or_default(),
+		},
+	)
+}
+
+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
 //

 // val() function used to parse JSON from Reddit APIs
-pub fn val(j: &serde_json::Value, k: &str) -> String {
-	String::from(j["data"][k].as_str().unwrap_or_default())
+pub fn val(j: &Value, k: &str) -> String {
+	j["data"][k].as_str().unwrap_or_default().to_string()
 }

-// nested_val() function used to parse JSON from Reddit APIs
-pub fn nested_val(j: &serde_json::Value, n: &str, k: &str) -> String {
-	String::from(j["data"][n][k].as_str().unwrap_or_default())
-}
-
-// Fetch posts of a user or subreddit
-pub async fn fetch_posts(path: &str, fallback_title: String) -> Result<(Vec<Post>, String), &'static str> {
+// 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;

 	// Send a request to the url
-	match request(&path).await {
+	match request(path.to_string()).await {
 		// If success, receive JSON in response
 		Ok(response) => {
 			res = response;
@ -180,49 +310,74 @@ pub async fn fetch_posts(path: &str, fallback_title: String) -> Result<(Vec<Post
 	// Fetch the list of posts from the JSON response
 	match res["data"]["children"].as_array() {
 		Some(list) => post_list = list,
-		None => return Err("No posts found"),
+		None => return Err("No posts found".to_string()),
 	}

 	let mut posts: Vec<Post> = Vec::new();

 	// For each post from posts list
 	for post in post_list {
-		let img = format_url(val(post, "thumbnail"));
-		let unix_time: i64 = post["data"]["created_utc"].as_f64().unwrap_or_default().round() as i64;
+		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"),
 			body: rewrite_url(&val(post, "body_html")),
-			author: val(post, "author"),
-			author_flair: Flair(
-				val(post, "author_flair_text"),
-				val(post, "author_flair_background_color"),
-				val(post, "author_flair_text_color"),
-			),
-			score: format_num(score),
+			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: if post["data"]["hide_score"].as_bool().unwrap_or_default() {
+				"•".to_string()
+			} else {
+				format_num(score)
+			},
 			upvote_ratio: ratio as i64,
-			post_type: "link".to_string(),
-			media: img,
-			flair: Flair(
-				val(post, "link_flair_text"),
-				val(post, "link_flair_background_color"),
-				if val(post, "link_flair_text_color") == "dark" {
+			post_type,
+			thumbnail: Media {
+				url: format_url(val(post, "thumbnail").as_str()),
+				width: post["data"]["thumbnail_width"].as_i64().unwrap_or_default(),
+				height: post["data"]["thumbnail_height"].as_i64().unwrap_or_default(),
+			},
+			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"),
-			time: Utc.timestamp(unix_time, 0).format("%b %e '%y").to_string(),
+			rel_time,
+			created,
+			comments: format_num(post["data"]["num_comments"].as_i64().unwrap_or_default()),
 		});
 	}

@ -234,43 +389,101 @@ pub async fn fetch_posts(path: &str, fallback_title: String) -> Result<(Vec<Post
 //

 pub async fn error(msg: String) -> HttpResponse {
-	let body = ErrorTemplate { message: msg }.render().unwrap_or_default();
+	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
-pub async fn request(path: &str) -> Result<serde_json::Value, &'static str> {
-	let url = format!("https://www.reddit.com/{}", path);
+// #[cached(size=100,time=60, result = true)]
+pub async fn request(path: String) -> Result<Value, String> {
+	let url = format!("https://www.reddit.com{}", path);
+	let user_agent = format!("web:libreddit:{}", env!("CARGO_PKG_VERSION"));

-	// Send request using reqwest
-	match reqwest::get(&url).await {
-		Ok(res) => {
-			// Read the status from the response
-			match res.status().is_success() {
-				true => {
-					// Parse the response from Reddit as JSON
-					match from_str(res.text().await.unwrap_or_default().as_str()) {
-						Ok(json) => Ok(json),
-						Err(_) => {
-							#[cfg(debug_assertions)]
-							dbg!(format!("{} - Failed to parse page JSON data", url));
-							Err("Failed to parse page JSON data")
-						}
-					}
-				}
-				// If Reddit returns error, tell user Page Not Found
-				false => {
-					#[cfg(debug_assertions)]
-					dbg!(format!("{} - Page not found", url));
-					Err("Page not found")
+	// 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;
+
+	// 	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())) },
+	// 	}
+	// }
+
+	// // 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 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()),
+	// 	}
+	// }
+
+	// // 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
+			let json_string = &response.into_string().unwrap_or_default();
+			match from_str(json_string) {
+				Ok(json) => Ok(json),
+				Err(e) => {
+					println!("{} - Failed to parse page JSON data: {} - {}", url, e, json_string);
+					Err("Failed to parse page JSON data".to_string())
 				}
 			}
 		}
-		// If can't send request to Reddit, return this to user
-		Err(e) => {
+		// If response is error
+		Err(ureq::Error::Status(_, _)) => {
 			#[cfg(debug_assertions)]
-			dbg!(format!("{} - {}", url, e));
-			Err("Couldn't send request to Reddit")
+			dbg!(format!("{} - Page not found", url));
+			Err("Page not found".to_string())
+		}
+		// If failed to send request
+		Err(e) => {
+			println!("{} - Couldn't send request to Reddit: {}", url, e);
+			Err("Couldn't send request to Reddit, this instance may be being rate-limited. Try another.".to_string())
 		}
 	}
 }
--- a/static/favicon.ico
+++ b/static/favicon.ico
--- a/static/robots.txt
+++ b/static/robots.txt
@ -1,2 +0,0 @@
-User-agent: *
-Allow: /
--- a/static/style.css
+++ b/static/style.css
--- a/templates/base.html
+++ b/templates/base.html
@ -3,20 +3,37 @@
 	<head>
 		{% block head %}
 		<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">
-		<link rel="stylesheet" href="/style.css">
+		<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico"> 
+		<link rel="stylesheet" type="text/css" href="/style.css">
 		{% endblock %}
 		</head>
-	<body>
+	<body class="
+		{% if prefs.layout != "" %}{{ prefs.layout }}{% endif %}
+		{% if prefs.wide == "on" %} wide{% endif %}
+		{% if prefs.theme != "system" %} {{ prefs.theme }}{% endif %}">
 		<!-- NAVIGATION BAR -->
 		<nav>
-			<a id="logo" href="/"><span id="lib">lib</span>reddit. <span id="version">v{{ env!("CARGO_PKG_VERSION") }}</span></a>
+			<div 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>
+				{% block subscriptions %}{% endblock %}
+			</div>
 			{% block search %}{% endblock %}
-			<a id="github" href="https://github.com/spikecodes/libreddit">GITHUB</a>
+			<div id="links">
+				<a id="settings_link" href="/settings">
+					<span>settings</span>
+					<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="3"/><path d="M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1 2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z"/></svg>
+				</a>
+				<a id="code" href="https://github.com/spikecodes/libreddit">
+					<span>code</span>
+					<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="16 18 22 12 16 6"/><polyline points="8 6 2 12 8 18"/></svg>
+				</a>
+			</div>
 		</nav>
 		
 		<!-- MAIN CONTENT -->
@ -27,4 +44,4 @@
 		</main>
 		{% endblock %}
 	</body>
-</html>
+</html>
--- a/templates/error.html
+++ b/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 %}
--- a/templates/post.html
+++ b/templates/post.html
@ -10,7 +10,11 @@
 {% block root %}/r/{{ post.community }}{% endblock %}{% block location %}r/{{ post.community }}{% endblock %}
 {% block head %}
 	{% call super() %}
-	<meta name="author" content="u/{{ post.author }}">
+	<meta name="author" content="u/{{ post.author.name }}">
+{% endblock %}
+
+{% block subscriptions %}
+	{% call utils::sub_list(post.community.as_str()) %}
 {% endblock %}

 <!-- OPEN COMMENT MACRO -->
@ -21,13 +25,14 @@
 		<div class="line"></div>
 	</div>
 	<details class="comment_right" open>
-		<summary class="comment_data"><a class="comment_author {% if item.author == post.author %}op{% endif %}" href="/u/{{ item.author }}">u/{{ item.author }}</a>
-			{% if item.flair.0 != "" %}
-				<small class="author_flair">{{ item.flair.0 }}</small>
+		<summary class="comment_data">
+			<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 %}
-			<span class="datetime">{{ item.time }}</span>
+			<span class="created" title="{{ post.created }}">{{ item.rel_time }}</span>
 		</summary>
-		<p class="comment_body">{{ item.body }}</p>
+		<div class="comment_body">{{ item.body }}</div>
 {%- endmacro %}

 <!-- CLOSE COMMENT MACRO -->
@ -39,57 +44,67 @@
 	<div id="column_one">

 		<!-- POST CONTENT -->
-		<div class="post highlighted panel">
-			<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 }}">u/{{ post.author }}</a>
-						{% if post.author_flair.0 != "" %}
-							<small class="author_flair">{{ post.author_flair.0 }}</small>
-						{% endif %}
-						<span class="dot">&bull;</span>
-						<span class="datetime">{{ post.time }}</span>
-					</p>
-					<a href="{{ post.permalink }}" 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>
+		<div class="post highlighted">
+			<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">
+				<a href="{{ post.permalink }}">{{ post.title }}</a>
+				{% 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 %}
+				{% if post.flags.nsfw %} <small class="nsfw">NSFW</small>{% endif %}
+			</p>

-					<!-- POST MEDIA -->
-					{% 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 %}
+			<!-- POST MEDIA -->
+			{% if post.post_type == "image" %}
+			<a href="{{ post.media.url }}" style="display:contents" >
+				<svg class="post_media" 
+					width="{{ post.media.width }}px" 
+					height="{{ post.media.height }}px" 
+					xmlns="http://www.w3.org/2000/svg">
+						<image width="100%" height="100%" href="{{ post.media.url }}"/>
+						<desc>
+							<img alt="Post image" src="{{ post.media.url }}"/>
+						</dev>
+				</svg>
+			</a>
+			{% else if post.post_type == "video" || post.post_type == "gif" %}
+			<video class="post_media" src="{{ post.media.url }}" controls autoplay loop></video>
+			{% else if post.post_type == "link" %}
+			<a id="post_url" href="{{ post.media.url }}">{{ post.media.url }}</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>
+			<!-- POST BODY -->
+			<div class="post_body">{{ post.body }}</div>
+			<div class="post_score">{{ post.score }}<span class="label"> Upvotes</span></div>
+			<div class="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>

 		<!-- SORT FORM -->
 		<form id="sort">
-			<select name="sort"> 
-				{% call utils::options(sort, ["confidence", "top", "new", "controversial", "old"], "") %}
-			</select><input id="sort_submit" type="submit" value="&rarr;">
+			<select name="sort" title="Sort comments by"> 
+				{% call utils::options(sort, ["confidence", "top", "new", "controversial", "old"], "confidence") %}
+			</select><button id="sort_submit" class="submit">
+				<svg width="15" viewBox="0 0 110 100" fill="none" stroke-width="10" stroke-linecap="round">
+					<path d="M20 50 H100" />
+					<path d="M75 15 L100 50 L75 85" />
+					&rarr;
+				</svg>
+			</button>
 		</form>

 		<!-- COMMENTS -->
@ -97,11 +112,11 @@
 		<div class="thread">
 			<!-- EACH COMMENT -->
 			{% call comment(c) %}
-			<div class="replies">{% for reply1 in c.replies %}{% call comment(reply1) %}
+			<blockquote class="replies">{% for reply1 in c.replies %}{% call comment(reply1) %}
 				<!-- FIRST-LEVEL REPLIES -->
-				<div class="replies">{% for reply2 in reply1.replies %}{% call comment(reply2) %}
+				<blockquote class="replies">{% for reply2 in reply1.replies %}{% call comment(reply2) %}
 					<!-- SECOND-LEVEL REPLIES -->
-					<div class="replies">{% for reply3 in reply2.replies %}{% call comment(reply3) %}
+					<blockquote class="replies">{% for reply3 in reply2.replies %}{% call comment(reply3) %}
 						<!-- THIRD-LEVEL REPLIES -->
 						{% if reply3.replies.len() > 0 %}
 							<!-- LINK TO CONTINUE REPLIES -->
@ -109,13 +124,13 @@
 						{% endif %}
 						{% call close() %}
 					{% endfor %}
-					</div>{% call close() %}
+					</blockquote>{% call close() %}
 				{% endfor %}
-				</div>{% call close() %}
+				</blockquote>{% call close() %}
 			{% endfor %}
-			</div>{% call close() %}
+			</blockquote>{% call close() %}
 		</div>
 		{%- endfor %}

 	</div>
-{% endblock %}
+{% endblock %}
--- a/templates/search.html
+++ b/templates/search.html
@ -3,49 +3,97 @@

 {% block title %}Libreddit: search results - {{ params.q }}{% endblock %}

+{% block subscriptions %}
+	{% call utils::sub_list("") %}
+{% endblock %}
+
 {% block content %}
 	<div id="column_one">
 		<form id="search_sort">
-			<input id="search" type="text" name="q" placeholder="Search" value="{{ params.q }}">
+			<input id="search" type="text" name="q" placeholder="Search" value="{{ params.q }}" title="Search libreddit">
 			{% if sub != "" %}
 			<div id="inside">
 				<input type="checkbox" name="restrict_sr" id="restrict_sr" {% if params.restrict_sr != "" %}checked{% endif %}>
-				<label for="restrict_sr">in r/{{ sub }}</label>
+				<label for="restrict_sr" class="search_label">in r/{{ sub }}</label>
 			</div>
 			{% endif %}
-			<select id="sort_options" name="sort">
+			<select id="sort_options" name="sort" title="Sort results by">
 				{% call utils::options(params.sort, ["relevance", "hot", "top", "new", "comments"], "") %}
-			</select>{% if params.sort != "new" %}<select id="timeframe" name="t"> 
+			</select>{% if params.sort != "new" %}<select id="timeframe" name="t" title="Timeframe"> 
 				{% call utils::options(params.t, ["hour", "day", "week", "month", "year", "all"], "all") %}
-			</select>{% endif %}<input id="sort_submit" type="submit" value="&rarr;">
+			</select>{% endif %}<button id="sort_submit" class="submit">
+					<svg width="15" viewBox="0 0 110 100" fill="none" stroke-width="10" stroke-linecap="round">
+						<path d="M20 50 H100" />
+						<path d="M75 15 L100 50 L75 85" />
+						&rarr;
+					</svg>
+				</button>
 		</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.title != "Comment" %}
-		<div class="post panel">
-			<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 }}">u/{{ post.author }}</a>
-						{% if post.author_flair.0 != "" %}
-							<small class="author_flair">{{ post.author_flair.0 }}</small>
-						{% endif %}
-						<span class="dot">&bull;</span>
-						<span class="datetime">{{ post.time }}</span>
-					</p>
-					<p 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.permalink }}">{{ post.title }}</a>
-					</p>
-				</div>
-				<img class="post_thumbnail" src="{{ post.media }}">
+
+		{% if post.flags.nsfw && prefs.show_nsfw != "on" %}
+		{% else if post.title != "Comment" %}
+		<div class="post {% if post.flags.stickied %}stickied{% endif %}">	
+			<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>{% if post.flags.nsfw %} <small class="nsfw">NSFW</small>{% endif %}
+			</p>
+			<!-- POST MEDIA/THUMBNAIL -->
+			{% if (prefs.layout.is_empty() || prefs.layout == "card") && post.post_type == "image" %}
+			<a href="{{ post.media.url }}" style="display:contents" >
+				<svg class="post_media {% if post.media.height /  post.media.width < 2 %}short{% endif %}" 
+					width="{{ post.media.width }}px" 
+					height="{{ post.media.height }}px" 
+					xmlns="http://www.w3.org/2000/svg">
+						<image width="100%" height="100%" href="{{ post.media.url }}"/>
+						<desc>
+							<img alt="Post image" src="{{ post.media.url }}"/>
+						</dev>
+				</svg>
+			</a>
+			{% else if post.post_type != "self" %}
+			<a class="post_thumbnail {% if post.thumbnail.url.is_empty() %}no_thumbnail{% endif %}" href="{% if post.post_type == "link" %}{{ post.media.url }}{% else %}{{ post.permalink }}{% endif %}">
+				{% if post.thumbnail.url.is_empty() %}
+				<svg viewBox="0 0 100 106" width="140" height="53" xmlns="http://www.w3.org/2000/svg">
+					<title>Thumbnail</title>
+					<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 %}
+				<svg width="{{ post.thumbnail.width }}px" height="{{ post.thumbnail.height }}px" xmlns="http://www.w3.org/2000/svg">
+					<image  alt="Thumbnail" width="100%" height="100%" href="{{ post.thumbnail.url }}"/>
+				</svg>
+				{% endif %}
+				<span>{% if post.post_type == "link" %}{{ post.domain }}{% else %}{{ post.post_type }}{% endif %}</span>
+			</a>
+			{% endif %}
+
+			<div class="post_score">{{ post.score }}<span class="label"> Upvotes</span></div>
+			<div class="post_footer">
+				<a href="{{ post.permalink }}" class="post_comments">{{ post.comments }} comments</a>
 			</div>
 		</div>
 		{% else %}
@ -57,7 +105,7 @@
 				<details class="comment_right" open>
 					<summary class="comment_data">
 						<a class="comment_link" href="{{ post.permalink }}">COMMENT</a>
-						<span class="datetime">{{ post.time }}</span>
+						<span class="created" title="{{ post.created }}">{{ post.rel_time }}</span>
 					</summary>
 					<p class="comment_body">{{ post.body }}</p>
 				</details>
--- a/templates/settings.html
+++ b/templates/settings.html
@ -7,12 +7,64 @@
 	{% call utils::search("".to_owned(), "", "") %}
 {% endblock %}

-{% block body %}
-	<main>
-		<form action="/settings/save" method="POST">
-			<label for="pref_nsfw">NSFW</label>
-			<input type="checkbox" name="pref_nsfw" id="pref_nsfw" {% if pref_nsfw == "on" %}checked{% endif %}>
-			<input id="sort_submit" type="submit" value="&rarr;">
-		</form>
-	</main>
-{% endblock %}
+{% block content %}
+	<div id="settings">
+	<form action="/settings" method="POST">
+		<div class="prefs">
+			<p>Appearance</p>
+			<div id="theme">
+				<label for="theme">Theme:</label>
+				<select name="theme"> 
+					{% call utils::options(prefs.theme, ["system", "light", "dark"], "system") %}
+				</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, ["default", "popular", "all"], "default") %}
+				</select>
+			</div>
+			<div id="layout">
+				<label for="layout">Layout:</label>
+				<select name="layout"> 
+					{% call utils::options(prefs.layout, ["card", "clean", "compact"], "card") %}
+				</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="show_nsfw">
+				<label for="show_nsfw">Show NSFW posts:</label>
+				<input type="checkbox" name="show_nsfw" {% if prefs.show_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>
+	{% if prefs.subs.len() > 0 %}
+		<aside class="prefs">
+			<p>Subscribed Subreddits</p>
+			<ul id="settings_subs">
+				{% for sub in prefs.subs %}
+					<li>
+						<span>{{ sub }}</span>
+						<form action="/r/{{ sub }}/unsubscribe/?redirect=/settings" method="POST">
+								<button class="unsubscribe">Unsubscribe</button>
+						</form>
+					</li>
+				{% endfor %}
+			</ul>
+		</aside>
+	{% endif %}
+</div>
+
+{% endblock %}
--- a/templates/subreddit.html
+++ b/templates/subreddit.html
@ -11,6 +11,10 @@
 	{% call utils::search(["/r/", sub.name.as_str()].concat(), "") %}
 {% endblock %}

+{% block subscriptions %}
+	{% call utils::sub_list(sub.name.as_str(), "wide") %}
+{% endblock %}
+
 {% block body %}
 	<main>
 		<div id="column_one">
@ -22,49 +26,86 @@
 						{% 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"> 
+				{% if sort.0 == "top" || sort.0 == "controversial" %}<select id="timeframe" name="t" title="Timeframe"> 
 					{% call utils::options(sort.1, ["hour", "day", "week", "month", "year", "all"], "day") %}
-					<input id="sort_submit" type="submit" value="&rarr;">
-				</select>{% endif %}
+				</select>
+				<button id="sort_submit" class="submit">
+					<svg width="15" viewBox="0 0 110 100" fill="none" stroke-width="10" stroke-linecap="round">
+						<path d="M20 50 H100" />
+						<path d="M75 15 L100 50 L75 85" />
+						&rarr;
+					</svg>
+				</button>
+				{% endif %}
 			</form>
+
+			<div id="posts">
 			{% for post in posts %}
-			<div class="post {% if post.flags.stickied %}stickied{% endif %} panel">
-				<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 }}">u/{{ post.author }}</a>
-							<span class="dot">&bull;</span>
-							<span class="datetime">{{ post.time }}</span>
-						</p>
-						<p 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.permalink }}">{{ post.title }}</a>
-						</p>
-					</div>
-					<img class="post_thumbnail" src="{{ post.media }}">
+			{% if !(post.flags.nsfw && prefs.show_nsfw != "on") %}
+			<hr class="sep" />
+			<div class="post {% if post.flags.stickied %}stickied{% endif %}">	
+				<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>{% if post.flags.nsfw %} <small class="nsfw">NSFW</small>{% endif %}
+				</p>
+				<!-- POST MEDIA/THUMBNAIL -->
+				{% if (prefs.layout.is_empty() || prefs.layout == "card") && post.post_type == "image" %}
+				<a href="{{ post.media.url }}" style="display:contents" >
+					<svg class="post_media {% if post.media.height /  post.media.width < 2 %}short{% endif %}" 
+						width="{{ post.media.width }}px" 
+						height="{{ post.media.height }}px" 
+						xmlns="http://www.w3.org/2000/svg">
+							<image width="100%" height="100%" href="{{ post.media.url }}"/>
+							<desc>
+								<img alt="Post image" src="{{ post.media.url }}"/>
+							</dev>
+					</svg>
+				</a>
+				{% else if post.post_type != "self" %}
+				<a class="post_thumbnail {% if post.thumbnail.url.is_empty() %}no_thumbnail{% endif %}" href="{% if post.post_type == "link" %}{{ post.media.url }}{% else %}{{ post.permalink }}{% endif %}">
+					{% if post.thumbnail.url.is_empty() %}
+					<svg viewBox="0 0 100 106" width="140" height="53" xmlns="http://www.w3.org/2000/svg">
+						<title>Thumbnail</title>
+						<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 %}
+					<svg width="{{ post.thumbnail.width }}px" height="{{ post.thumbnail.height }}px" xmlns="http://www.w3.org/2000/svg">
+						<image  alt="Thumbnail" width="100%" height="100%" href="{{ post.thumbnail.url }}"/>
+					</svg>
+					{% endif %}
+					<span>{% if post.post_type == "link" %}{{ post.domain }}{% else %}{{ post.post_type }}{% endif %}</span>
+				</a>
+				{% endif %}
+
+				<div class="post_score">{{ post.score }}<span class="label"> Upvotes</span></div>
+				<div class="post_footer">
+					<a href="{{ post.permalink }}" class="post_comments">{{ post.comments }} comments</a>
 				</div>
 			</div>
+			{% endif %}
 			{% endfor %}
+			</div>

 			<footer>
 				{% if ends.0 != "" %}
-				<a href="?sort={{ sort.0 }}&before={{ ends.0 }}">PREV</a>
+				<a href="?sort={{ sort.0 }}&t={{ sort.1 }}&before={{ ends.0 }}">PREV</a>
 				{% endif %}

 				{% if ends.1 != "" %}
-				<a href="?sort={{ sort.0 }}&after={{ ends.1 }}">NEXT</a>
+				<a href="?sort={{ sort.0 }}&t={{ sort.1 }}&after={{ ends.1 }}">NEXT</a>
 				{% endif %}
 			</footer>
 		</div>
-		{% if sub.name != "" %}
+		{% if sub.name != "" && !sub.name.contains("+") %}
 		<aside>
 			<div class="panel" id="subreddit">
 				{% if sub.wiki %}
@ -74,7 +115,7 @@
 				</div>
 				{% endif %}
 				<div id="sub_meta">
-					<img id="sub_icon" src="{{ sub.icon }}">
+					<img id="sub_icon" src="{{ sub.icon }}" alt="Icon for r/{{ sub.name }}">
 					<p id="sub_title">{{ sub.title }}</p>
 					<p id="sub_name">r/{{ sub.name }}</p>
 					<p id="sub_description">{{ sub.description }}</p>
@ -84,6 +125,17 @@
 						<div>{{ sub.members }}</div>
 						<div>{{ sub.active }}</div>
 					</div>
+					<div id="sub_subscription">
+						{% if prefs.subs.contains(sub.name) %}
+							<form action="/r/{{ sub.name }}/unsubscribe" method="POST">
+								<button class="unsubscribe">Unsubscribe</button>
+							</form>
+						{% else %}
+							<form action="/r/{{ sub.name }}/subscribe" method="POST">
+								<button class="subscribe">Subscribe</button>
+							</form>
+						{% endif %}
+					</div>
 				</div>
 			</div>
 			<details class="panel" id="sidebar">
@ -93,4 +145,4 @@
 		</aside>
 		{% endif %}
 	</main>
-{% endblock %}
+{% endblock %}
--- a/templates/user.html
+++ b/templates/user.html
@ -6,43 +6,79 @@
 {% endblock %}

 {% block title %}{{ user.name.replace("u/", "") }} (u/{{ user.name }}) - Libreddit{% endblock %}
+
+{% block subscriptions %}
+	{% call utils::sub_list("") %}
+{% endblock %}
+
 {% block body %}
-	<main style="max-width: 1000px;">
+	<main>
 		<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;">
+				</select>{% endif %}<button id="sort_submit" class="submit">
+					<svg width="15" viewBox="0 0 110 100" fill="none" stroke-width="10" stroke-linecap="round">
+						<path d="M20 50 H100" />
+						<path d="M75 15 L100 50 L75 85" />
+						&rarr;
+					</svg>
+				</button>
 			</form>
+
+			<div id="posts">
 			{% for post in posts %}
-			{% if post.title != "Comment" %}
-			<div class="post panel">
-				<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.0 != "" %}
-								<small class="author_flair">{{ post.author_flair.0 }}</small>
-							{% endif %}
-							<span class="dot">&bull;</span>
-							<span class="datetime" style="float: right;">{{ post.time }}</span>
-						</p>
-						<p 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.permalink }}">{{ post.title }}</a>
-						</p>
-					</div>
-					<img class="post_thumbnail" src="{{ post.media }}">
+
+			{% if post.flags.nsfw && prefs.show_nsfw != "on" %}
+			{% else if post.title != "Comment" %}
+			<div class="post {% if post.flags.stickied %}stickied{% endif %}">	
+				<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>{% if post.flags.nsfw %} <small class="nsfw">NSFW</small>{% endif %}
+				</p>
+				<!-- POST MEDIA/THUMBNAIL -->
+				{% if (prefs.layout.is_empty() || prefs.layout == "card") && post.post_type == "image" %}
+				<a href="{{ post.media.url }}" style="display:contents" >
+					<svg class="post_media {% if post.media.height /  post.media.width < 2 %}short{% endif %}" 
+						width="{{ post.media.width }}px" 
+						height="{{ post.media.height }}px" 
+						xmlns="http://www.w3.org/2000/svg">
+							<image width="100%" height="100%" href="{{ post.media.url }}"/>
+							<desc>
+								<img alt="Post image" src="{{ post.media.url }}"/>
+							</dev>
+					</svg>
+				</a>
+				{% else if post.post_type != "self" %}
+				<a class="post_thumbnail {% if post.thumbnail.url.is_empty() %}no_thumbnail{% endif %}" href="{% if post.post_type == "link" %}{{ post.media.url }}{% else %}{{ post.permalink }}{% endif %}">
+					{% if post.thumbnail.url.is_empty() %}
+					<svg viewBox="0 0 100 106" width="140" height="53" xmlns="http://www.w3.org/2000/svg">
+						<title>Thumbnail</title>
+						<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 %}
+					<svg width="{{ post.thumbnail.width }}px" height="{{ post.thumbnail.height }}px" xmlns="http://www.w3.org/2000/svg">
+						<image  alt="Thumbnail" width="100%" height="100%" href="{{ post.thumbnail.url }}"/>
+					</svg>
+					{% endif %}
+					<span>{% if post.post_type == "link" %}{{ post.domain }}{% else %}{{ post.post_type }}{% endif %}</span>
+				</a>
+				{% endif %}
+
+				<div class="post_score">{{ post.score }}<span class="label"> Upvotes</span></div>
+				<div class="post_footer">
+					<a href="{{ post.permalink }}" class="post_comments">{{ post.comments }} comments</a>
 				</div>
 			</div>
 			{% else %}
@ -54,20 +90,23 @@
 				<details class="comment_right" open>
 					<summary class="comment_data">
 						<a class="comment_link" href="{{ post.permalink }}">COMMENT</a>
-						<span class="datetime">{{ post.time }}</span>
+						<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 }}&before={{ ends.0 }}">PREV</a>
+				<a href="?sort={{ sort.0 }}&t={{ sort.1 }}&before={{ ends.0 }}">PREV</a>
 				{% endif %}

 				{% if ends.1 != "" %}
-				<a href="?sort={{ sort.0 }}&after={{ ends.1 }}">NEXT</a>
+				<a href="?sort={{ sort.0 }}&t={{ sort.1 }}&after={{ ends.1 }}">NEXT</a>
 				{% endif %}
 			</footer>
 		</div>
@ -86,4 +125,4 @@
 			</div>
 		</aside>
 	</main>
-{% endblock %}
+{% endblock %}
--- a/templates/utils.html
+++ b/templates/utils.html
@ -16,13 +16,39 @@

 {% 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 }}">
+	<input id="search" type="text" name="q" placeholder="Search" title="Search libreddit" value="{{ search }}">
 	{% if root != "/r/" && !root.is_empty() %}
 	<div id="inside">
 		<input type="checkbox" name="restrict_sr" id="restrict_sr">
-		<label for="restrict_sr">in {{ root }}</label>
+		<label for="restrict_sr" class="search_label">in {{ root }}</label>
 	</div>
 	{% endif %}
-	<input type="submit" value="&rarr;">
+	<button class="submit">
+		<svg width="15" viewBox="0 0 110 100" fill="none" stroke-width="10" stroke-linecap="round">
+			<path d="M20 50 H100" />
+			<path d="M75 15 L100 50 L75 85" />
+			&rarr;
+		</svg>
+	</button>
 </form>
-{%- endmacro %}
+{%- 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 %}
+
+{% macro sub_list(current) -%}
+{% if prefs.subs.len() > 0 %}
+	<details id="subscriptions">
+		<summary>Subscriptions</summary>
+		<div id="sub_list">
+			{% for sub in prefs.subs %}
+				<a href="/r/{{ sub }}" {% if sub == current %}class="selected"{% endif %}>{{ sub }}</a>
+			{% endfor %}
+		</div>
+	</details>
+{% endif %}
+{%- endmacro %}
--- a/templates/wiki.html
+++ b/templates/wiki.html
@ -10,6 +10,10 @@
 	{% call utils::search(["/r/", sub.as_str()].concat(), "") %}
 {% endblock %}

+{% block subscriptions %}
+	{% call utils::sub_list(sub.as_str()) %}
+{% endblock %}
+
 {% block body %}
 	<main>
 		<div class="panel" id="column_one">
Author	SHA1	Message	Date
spikecodes	ee0da63862	Update version and screenshot	2021-01-31 18:50:31 -08:00
spikecodes	971f14bb55	Fix #66	2021-01-31 14:10:13 -08:00
spikecodes	9a1733ac99	Fix cog class	2021-01-31 13:49:55 -08:00
spikecodes	c32d62fbd5	Shrink links to icons on mobile	2021-01-31 13:22:11 -08:00
Spike	1a0d12d2ff	Merge pull request #82 from robrobinbin/patch-2 Minor style tweak	2021-01-31 12:40:32 -08:00
robrobinbin	2a27850914	Minor style tweak on small screens, subscriptions are put below the logo, which looks a bit strange and makes it somehow harder to hit	2021-01-31 19:41:32 +01:00
spikecodes	bfcc4c985d	Fix subreddit sorting and media	2021-01-30 21:46:35 -08:00
spikecodes	1653d4fb4c	Hide NSFW content by default	2021-01-30 21:43:46 -08:00
Spike	79027c4c75	Merge pull request #78 from mcrossman/subscriptions Subscribing to subreddits (favorites)	2021-01-30 21:28:51 -08:00
spikecodes	269bb0bfb6	Convert subscription requests to POST	2021-01-30 21:21:46 -08:00
spikecodes	7933d840b3	Squish navbar further	2021-01-30 20:42:12 -08:00
Spike	b875e9377e	Merge branch 'master' into subscriptions	2021-01-30 20:25:48 -08:00
spikecodes	8c80946121	Fix multireddit sidebars	2021-01-30 20:24:09 -08:00
spikecodes	21d96e261f	Set subscriptions as default front page	2021-01-30 20:18:57 -08:00
spikecodes	9c58d23b41	Unwrap #subscriptions	2021-01-30 18:16:42 -08:00
spikecodes	4ae2191392	Refactor subscriptions	2021-01-30 18:10:38 -08:00
spikecodes	d62a3ab86b	Refactor redirect path setting	2021-01-30 17:50:26 -08:00
Matthew Crossman	9b7cd1da5a	Prevent adding duplicate subs.	2021-01-31 12:45:19 +11:00
spikecodes	a301f1ecb6	Simplify redirect path	2021-01-30 17:38:47 -08:00
Matthew Crossman	f14639ee00	Simplify sub list editing.	2021-01-31 12:25:07 +11:00
Matthew Crossman	b527735f6f	Fix cookie deletion when removing last sub.	2021-01-31 12:17:43 +11:00
Matthew Crossman	8cc01c58f3	Move the subs list into the navbar.	2021-01-31 09:52:18 +11:00
spikecodes	a1d800a0f0	Fix video loading	2021-01-30 11:00:55 -08:00
Matthew Crossman	449899962a	Change subscription to get. Add subs to settings.	2021-01-30 22:27:49 +11:00
Matthew Crossman	dc2030e6f3	Vertical list subscriptions.	2021-01-30 21:21:54 +11:00
Matthew Crossman	ef5a1cd66e	Rename block sub_list > subscriptions	2021-01-30 19:47:30 +11:00
Matthew Crossman	11e4ff42ed	Clean-up and more consistent styles.	2021-01-30 19:33:38 +11:00
Matthew Crossman	c71df35b22	Add basic unsubscribe.	2021-01-30 18:18:53 +11:00
Matthew Crossman	345308a9ac	Basic subscribe functionality.	2021-01-30 18:00:00 +11:00
Matthew Crossman	75bbcefbec	Display sub list from list in cookie. Very basic sub list setup. Cookie must be manually added in devtools.	2021-01-30 16:00:55 +11:00
spikecodes	49a6168607	Improve CSP	2021-01-29 14:39:03 -08:00
spikecodes	f55ea5a353	Specify default headers for security	2021-01-28 21:53:10 -08:00
spikecodes	30c33d91e1	Specify video MIME in posts	2021-01-28 20:06:35 -08:00
spikecodes	00b135fb0f	Fix #75	2021-01-28 15:50:18 -08:00
spikecodes	5fe9ce8d7b	Refactor JSON parsing error logging	2021-01-27 21:48:32 -08:00
spikecodes	8c04365049	Improve error logging	2021-01-27 17:48:58 -08:00
spikecodes	d5b1c3a5bb	Fix connection reset error	2021-01-26 11:00:07 -08:00
spikecodes	f038aa61f4	Log JSON parse errors and Reddit request failures	2021-01-26 10:54:57 -08:00
spikecodes	f72c9d39be	Simplify proxy	2021-01-25 17:01:02 -08:00
Spike	e6c2d08425	Add libreddit.himiko.cloud instance	2021-01-24 23:33:18 +00:00
Spike	e901e99278	Merge pull request #71 from robrobinbin/patch-1 Lower number of cached items	2021-01-24 16:22:58 +00:00
robrobinbin	acd2cff747	Lower number of cached items	2021-01-24 11:08:24 +01:00
Spike	8f913e696c	Merge pull request #70 from robrobinbin/master Experiment with caching requests to Reddit	2021-01-23 21:50:16 +00:00
robrobinbin	226d39328c	Make it 60	2021-01-23 22:45:41 +01:00
Robin	b2ad2f636c	Resolve merge conflicts	2021-01-23 10:55:11 +01:00
robrobinbin	18fe7ff8cf	Merge pull request #4 from spikecodes/master Merge upstream	2021-01-23 10:48:54 +01:00
Robin	077c222a4e	Experiment with caching	2021-01-23 10:48:33 +01:00
spikecodes	2270b6cf95	Reduce post padding	2021-01-21 21:25:51 -08:00
Spike	758b627660	Merge pull request #68 from robrobinbin/master Absolutly no jumping when images (fail to) load	2021-01-21 23:32:59 +00:00
robin	baf7272cfd	Absolutly no jumping when images (fail to) load	2021-01-21 22:04:06 +01:00
spikecodes	6641e242af	Allow NSFW searching	2021-01-20 18:26:58 -08:00
spikecodes	610fcfbf87	Fix #67	2021-01-20 17:55:04 -08:00
spikecodes	dea7f33910	Add code optimizations	2021-01-20 17:38:34 -08:00
robin	c299e128ab	Inline images rework	2021-01-21 00:12:54 +01:00
Spike	53fa946c75	Merge pull request #64 from robrobinbin/master Should fix the strange overflowing placeholder when an image fails to load	2021-01-20 21:46:58 +00:00
robin	5d44a071f9	Why??	2021-01-20 20:59:57 +01:00
robrobinbin	e29e203188	Merge pull request #3 from spikecodes/master Merge upstream	2021-01-20 20:18:08 +01:00
Spike	6ead6e08dc	Update README.md	2021-01-20 05:55:59 +00:00
spikecodes	7360503234	Make posts single-color	2021-01-18 21:32:25 -08:00
spikecodes	140c1b1bfa	Small fixes	2021-01-18 13:12:59 -08:00
Spike	040982f1fd	Document command line options in Readme	2021-01-18 18:44:03 +00:00
robrobinbin	4b0677d10e	Merge pull request #2 from spikecodes/master Merge upstream	2021-01-18 18:48:23 +01:00
spikecodes	616751e054	Embolden markdown blockquotes	2021-01-17 22:32:42 -08:00
Spike	5df957f193	Update README.md	2021-01-18 06:30:34 +00:00
spikecodes	7f9cb1b35a	Fix post score and thumbnail backgrounds	2021-01-17 20:35:49 -08:00
spikecodes	c030771d36	Refine transitions	2021-01-17 19:16:15 -08:00
spikecodes	a562395c26	Refactor system theme	2021-01-17 18:11:36 -08:00
Spike	2bcdf68e40	Merge pull request #62 from mcrossman/master Add "system" theme that matches browser/OS theme	2021-01-18 01:59:12 +00:00
Matthew Crossman	72eaa685d0	Prevent "system" class from being added to body.	2021-01-18 11:25:39 +11:00
Matthew Crossman	899a414cf6	Merge branch 'master' of https://github.com/spikecodes/libreddit	2021-01-18 11:24:49 +11:00
spikecodes	524538eeb8	Update Google Lighthouse Report	2021-01-17 16:22:34 -08:00
spikecodes	a184559c21	Clean CSS	2021-01-17 16:20:17 -08:00
Matthew Crossman	1c9fd46e98	Merge branch 'master' of https://github.com/spikecodes/libreddit	2021-01-18 11:16:02 +11:00
spikecodes	738941d830	Fix arrow alignment	2021-01-17 16:03:14 -08:00
Matthew Crossman	06ab7a4181	Merge branch 'master' of https://github.com/spikecodes/libreddit	2021-01-18 10:59:26 +11:00
Matthew Crossman	6981d94417	Clean up theme section of CSS.	2021-01-18 10:56:30 +11:00
spikecodes	dd60cb5b2b	SVG arrow	2021-01-17 15:51:03 -08:00
Matthew Crossman	1d57e29d56	Add "system" theme to settings.	2021-01-18 10:44:51 +11:00
Matthew Crossman	2d973707f3	Add auto theme selection in style.	2021-01-18 10:42:55 +11:00
Spike	cbb937b494	Merge pull request #61 from robrobinbin/master Improve accessibility rating	2021-01-17 23:00:25 +00:00
Robin	d45ee03122	Resolve merge conflicts	2021-01-17 23:54:48 +01:00
Robin	162e00b243	Improve accessibility rating	2021-01-17 23:49:36 +01:00
robrobinbin	7a32ba087e	Merge pull request #1 from spikecodes/master Merge upstream	2021-01-17 23:47:09 +01:00
spikecodes	801216dfe9	Include code link on mobile	2021-01-17 13:24:44 -08:00
spikecodes	21763c51cd	Make number formatting inclusive	2021-01-17 12:59:40 -08:00
spikecodes	138f8320e9	Create media struct	2021-01-17 12:58:12 -08:00
Spike	571ba3392c	Merge pull request #60 from robrobinbin/master Add comment counter and other post improvements	2021-01-17 20:05:01 +00:00
Robin	090ca1a140	Add comment counter and other post improvements	2021-01-17 20:39:57 +01:00
spikecodes	6127f2a90c	Support forced HTTPS redirects #39	2021-01-16 22:04:03 -08:00
spikecodes	ef9bc791e1	Fix inline style tags	2021-01-16 19:21:47 -08:00
spikecodes	894323becf	Update Screenshot	2021-01-16 17:47:45 -08:00
spikecodes	4c89d31948	Fix version number	2021-01-16 17:45:45 -08:00
spikecodes	471d181284	Disable production error logging	2021-01-16 15:17:08 -08:00
spikecodes	0e48c66b8c	Fix user agent	2021-01-16 15:13:34 -08:00
spikecodes	a0bc1732cf	Moderator and admin distinguishers	2021-01-16 15:02:24 -08:00
spikecodes	6d5fd1dbf6	Use main instance more in Readme	2021-01-16 11:56:13 -08:00
spikecodes	0f6e73dd87	Reformat code	2021-01-16 11:50:12 -08:00
spikecodes	151490faf0	Add space next to comment collapse marker	2021-01-16 11:49:49 -08:00
spikecodes	fdf60e7255	Separate datetime into relative and absolute	2021-01-16 11:40:32 -08:00
Spike	ab102ca32c	Merge pull request #57 from robrobinbin/master Improve support for text-only browsers	2021-01-16 10:49:41 -08:00
robrobinbin	998b301229	Improve support for text-only browsers	2021-01-16 11:00:15 +01:00
robrobinbin	d7839899e6	Merge pull request #3 from spikecodes/master Merge upstream	2021-01-16 09:20:14 +01:00
spikecodes	2385fa33ec	Use ureq until AWC IO error is fixed	2021-01-15 21:26:51 -08:00
spikecodes	1fd688eeed	Improve awc error log	2021-01-15 20:57:51 -08:00
spikecodes	65543a43b2	Make User-Agent Reddit-compliant	2021-01-15 20:29:34 -08:00
spikecodes	0099021478	Refactor flair spacing	2021-01-15 15:55:10 -08:00
spikecodes	3a9b2dba32	Fix error log	2021-01-15 15:35:09 -08:00
spikecodes	59021b9331	Switch back to ureq temporarily	2021-01-15 15:28:51 -08:00
spikecodes	078d6fe25b	Request about pages before posts	2021-01-15 15:05:55 -08:00
spikecodes	373ce55203	Recommend secondary instance	2021-01-15 11:27:06 -08:00
spikecodes	aef0442e9d	Add rate-limit warning	2021-01-15 11:24:12 -08:00
spikecodes	21ff8d7b6f	Fix #56	2021-01-15 11:21:59 -08:00
spikecodes	bca2a7e540	Error logging	2021-01-15 10:58:53 -08:00
spikecodes	0c014ad41b	Comment utils.rs	2021-01-14 15:13:52 -08:00
spikecodes	32b8637c7e	Handle failed redirects	2021-01-14 14:56:28 -08:00
Spike	5ed122d92c	Merge pull request #55 from robrobinbin/master Add placeholder image for posts without thumbnail	2021-01-14 14:26:40 -08:00
robrobinbin	45660816ce	Add cardview to search results too	2021-01-14 21:53:07 +01:00
robrobinbin	d19e73f059	Add placeholder for posts without thumbnail	2021-01-14 21:45:43 +01:00
spikecodes	18684c934b	Refactor subreddit searching	2021-01-14 11:45:04 -08:00
spikecodes	cf4c5e1fe8	Implement #53	2021-01-14 10:57:50 -08:00
Spike	7ef4a20aff	Merge pull request #54 from robrobinbin/master Add subreddits to search results, closes #18	2021-01-14 10:54:20 -08:00
robrobinbin	292f8fbbb7	remove lines that aren't used yet	2021-01-14 19:33:17 +01:00
robrobinbin	735f79d80b	Merge pull request #2 from spikecodes/master Merge upstream into code	2021-01-14 19:29:06 +01:00
robrobinbin	a85a4278f6	Add subreddits to search results	2021-01-14 19:22:50 +01:00
spikecodes	dbe617d7eb	Switch to awc	2021-01-14 09:53:54 -08:00
spikecodes	842d97e9fa	Fix short post IDs	2021-01-13 21:02:48 -08:00
spikecodes	0bf5576427	Categorize routes and refactor error handlers	2021-01-13 19:53:52 -08:00
spikecodes	dd027bff4b	Refactor flair parsing	2021-01-13 18:19:40 -08:00
spikecodes	f95ef51017	Add days to time()	2021-01-13 16:31:24 -08:00
spikecodes	740641cb4e	Move nested_val() to user.rs	2021-01-13 15:55:10 -08:00
spikecodes	09c98c8da6	Refactor code	2021-01-13 12:52:00 -08:00
robrobinbin	33c8bdffb9	Merge pull request #1 from spikecodes/master Merge upstream	2021-01-13 20:22:43 +01:00
Spike	5ab88567de	Merge pull request #50 from robrobinbin/rich-flairs Add support for rich flairs with "Emoji"	2021-01-13 10:48:25 -08:00
robrobinbin	c6627ceece	Merge branch 'master' into rich-flairs	2021-01-13 08:27:39 +01:00
robrobinbin	d9affcdefc	Rich flairs	2021-01-13 08:23:48 +01:00
spikecodes	96607256fc	Add Favicon	2021-01-12 20:18:20 -08:00
spikecodes	eb9a0dcb4a	Fix GIFs	2021-01-12 19:52:02 -08:00
Spike	89fa0d5489	Merge pull request #47 from robrobinbin/scrollbar-for-overflowing-code Add overflow "auto" to "pre"	2021-01-12 15:16:02 -08:00
Spike	22589c8296	Merge pull request #48 from robrobinbin/relative_timestamps Relative timestamps for posts younger than 24h	2021-01-12 15:15:37 -08:00
robrobinbin	b0540d2c57	Rich flairs	2021-01-13 00:10:06 +01:00
robrobinbin	41c4661bbb	Rich flairs	2021-01-12 23:55:35 +01:00
robrobinbin	d2314580a9	Rich flairs	2021-01-12 23:50:50 +01:00
robrobinbin	a4d77926b6	Rich flairs	2021-01-12 23:34:16 +01:00
robrobinbin	bbe7024323	Start richtext flairs	2021-01-12 22:43:03 +01:00
robrobinbin	32e1469e11	whitespace	2021-01-12 20:03:54 +01:00
robrobinbin	2d4ca2379f	whitespace	2021-01-12 20:02:35 +01:00
robrobinbin	374f53eb32	Relative timestamps for recent posts	2021-01-12 19:59:32 +01:00
robrobinbin	add7efea3c	Update style.css	2021-01-12 18:53:10 +01:00
Spike	065d82a5f5	Merge pull request #45 from somoso/long-label-fix Stop label from being long for joined subreddits	2021-01-12 08:46:35 -08:00
Spike	1895bbc025	Merge pull request #46 from somoso/ios-thumbnail-fix Fix the thumbnail issue on iOS	2021-01-12 08:46:17 -08:00
somoso	65f1a2afb2	Stop label from being long for joined subreddits Browsing with a long joined subreddit list will cause the label to look a bit weird. Example: https://libredd.it/r/Android+AnimalsBeingBros+AnimalsBeingDerps+AnimalsBeingJerks+AppleWatch+CatSlaps+CatSmiles+CatsBeingAdorable+FreeTube+Games+Ijustwatched+IllegallySmol+IllegallySmolCats+IpodClassic+LearnRubyonRails+Megadrive+MovieDetails+Music+NetflixBestOf+NintendoSwitch+Possums+Teefers+UKPersonalFinance+airplaneears+apple+aww+brushybrushy+cats+catswhotrill+curledfeetsies+cyberpunkgame+dataisbeautiful+dechonkers+digital_ocean+dogs+dogsareliquid+dogswithjobs+emulation+greebles+happycowgifs+hardware+iOSDevelopment+iOSProgramming+iosdev+kittykankles+learnruby+likeus+mac+mashups+microsoft+movies+netflix+netsec+pihole+playstation+programming+rarepuppers+raspberry_pi+redditsync+rubyonrails+satelliteears+shittymoviedetails+spookyteefies+technology+teefies+vampirecats+velvethippos That will cause the label to be excessively long	2021-01-12 15:47:39 +00:00
somoso	6eb9e6f0c0	Fix the thumbnail issue on iOS	2021-01-12 15:43:27 +00:00
spikecodes	eb735a42fe	Handle comment parsing errors	2021-01-11 18:05:13 -08:00
spikecodes	541c741bde	Parse GIFs correctly	2021-01-11 17:47:14 -08:00
spikecodes	7a33ed3434	Card thumbnails for users	2021-01-11 17:38:35 -08:00
spikecodes	48d2943f72	Fix subreddits not showing sidebars	2021-01-11 16:44:31 -08:00
spikecodes	6bbc90bc0d	Clean Subreddit struct	2021-01-11 16:35:50 -08:00
Spike	4d18dc0bb8	Merge pull request #44 from robrobinbin/master Make thumbnail clickable and bring behavior closer to reddit.	2021-01-11 16:35:14 -08:00
robrobinbin	6dbd002acd	Add direct link to thumbnail	2021-01-11 23:08:12 +01:00
spikecodes	bf6245a505	Fix multireddit sidebars	2021-01-11 10:39:36 -08:00
spikecodes	91746908a1	Switch to ureq	2021-01-11 10:33:48 -08:00
spikecodes	bb8273bab4	Fix #41	2021-01-11 10:33:42 -08:00
spikecodes	62bcc31305	Fix Wide UI on Mobile	2021-01-10 18:48:08 -08:00
spikecodes	08683fa5a6	Light theme	2021-01-10 18:15:34 -08:00
spikecodes	c58b077330	Update Dependencies	2021-01-10 13:20:47 -08:00
spikecodes	f445c42f55	Wide UI Mode	2021-01-10 13:08:36 -08:00
Spike	a0866b251e	Update issue templates	2021-01-10 11:23:53 -08:00
spikecodes	aa819544f6	Update Matrix Address	2021-01-09 13:08:08 -08:00
spikecodes	fac56d7f87	Markdown spoilers and post footers on videos	2021-01-08 21:57:36 -08:00
spikecodes	ef1ad17234	Unknown path error handling	2021-01-08 21:11:20 -08:00
spikecodes	b8cdc605a2	Front page config and settings note	2021-01-08 20:55:40 -08:00
spikecodes	ef2f9ad12b	Unify preferences under one struct	2021-01-08 17:50:03 -08:00
spikecodes	b13874d0db	Add "hide nsfw" option	2021-01-08 17:35:04 -08:00
Spike	3d142afd03	Merge pull request #38 from somoso/patch-3 Break word to stop it disappearing on mobile	2021-01-08 17:07:50 -08:00
Soheb	7fcb7fcfed	Break word to stop it disappearing on mobile This kept happening to me but I couldn't reproduce it in the iPad Simulator. Finally got it nailed down and sorted. Tested this on Safari (mobile and desktop), Firefox, and Edge browser.	2021-01-08 23:08:58 +00:00
Spike	747d5a7c67	Merge pull request #37 from somoso/patch-2 Fix theming for all browsers	2021-01-08 12:56:00 -08:00
Soheb	770c4d3630	Fix themeing for all browsers Really noticable on iOS, but ensuring all browsers get the love. The buttons and input aren't as flat as they usually are on my desktop Firefox. This patch should sort that out.	2021-01-08 20:26:29 +00:00
spikecodes	e7b448a282	Add shadow to navbar	2021-01-07 10:49:10 -08:00
spikecodes	c7c787dff1	Fix comment padding	2021-01-07 10:49:00 -08:00
spikecodes	59a34a0e85	Fixed navbar	2021-01-07 10:46:00 -08:00
spikecodes	6e8cf69227	Fix Default Comment Sorting	2021-01-07 10:32:55 -08:00
spikecodes	3444989f9a	Default Comment Sort Setting	2021-01-07 08:38:05 -08:00
spikecodes	7e96bb3d80	Optimize use of Result<>	2021-01-06 21:27:24 -08:00
spikecodes	0adbb1556e	Merge branch 'master' of https://github.com/spikecodes/libreddit	2021-01-06 16:45:57 -08:00
Spike	710eecdb9d	Add issue templates	2021-01-06 16:01:13 -08:00
spikecodes	8a57fa8a1d	Remove "Safe" description from README	2021-01-06 14:19:55 -08:00
spikecodes	b33d79ed9b	Cache robots.txt	2021-01-06 14:19:10 -08:00
spikecodes	0f506fc41b	Cache proxied media	2021-01-06 11:11:04 -08:00
spikecodes	c9cd825d55	Create CSS variables for shadow and text color	2021-01-06 10:51:13 -08:00
spikecodes	e63384e6a6	Update cookie description	2021-01-06 09:54:32 -08:00
spikecodes	3260a4d596	Disable "secure" flag for cookies	2021-01-06 09:52:23 -08:00
spikecodes	da5c4603d9	Switch from chrono to time-rs	2021-01-05 20:01:21 -08:00
spikecodes	b50fa6f3ae	Settings Button	2021-01-05 18:16:32 -08:00
spikecodes	aa7b4b2af7	Settings with Layouts	2021-01-05 18:04:49 -08:00
spikecodes	2b0193f5ea	Fix proxying of NSFW images	2021-01-05 08:15:34 -08:00
spikecodes	2185d895c0	Prevent user datetimes from floating	2021-01-04 21:32:22 -08:00