Update v0.2.2

Specify lack of Windows/MacOS binaries, update AUR installation method, correct Docker comparison

.github/workflows/rust.yml

@@ -0,0 +1,29 @@
+name: Rust
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Cache Packages
+        uses: Swatinem/rust-cache@v1.0.1
+
+      - name: Build
+        run: cargo build --release
+
+      - uses: actions/upload-artifact@v2.2.1
+        name: Upload a Build Artifact
+        with:
+          name: libreddit
+          path: target/release/libreddit

Cargo.toml

@@ -3,19 +3,21 @@ name = "libreddit"
 description = " Alternative private front-end to Reddit"
 license = "AGPL-3.0"
 repository = "https://github.com/spikecodes/libreddit"
-version = "0.1.7"
+version = "0.2.2"
 authors = ["spikecodes <19519553+spikecodes@users.noreply.github.com>"]
 edition = "2018"
 
 [features]
 default = ["proxy"]
-proxy = ["actix-web/rustls"]
+proxy = ["actix-web/rustls", "base64"]
 
 [dependencies]
+base64 = { version = "0.13.0", optional = true }
 actix-web = "3.2.0"
-surf = "2.1.0"
+reqwest = { version = "0.10", default_features = false, features = ["rustls-tls"] }
 askama = "0.8.0"
 serde = "1.0.117"
 serde_json = "1.0"
 pulldown-cmark = "0.8.0"
 chrono = "0.4.19"
+async-recursion = "0.3.1"

README.md

@@ -2,61 +2,133 @@
 
 > An alternative private front-end to Reddit 
 
-Libre + Reddit = Libreddit
+Libre + Reddit = [Libreddit](https://libredd.it)
 
 - 🚀 Fast: written in Rust for blazing fast speeds and safety
-- ☁️ Light: no javascript, no ads, no tracking
+- ☁️ Light: no JavaScript, no ads, no tracking
 - 🕵 Private: all requests are proxied through the server, including media
-- 🔒 Safe: does not rely on Reddit's OAuth-requiring APIs 
+- 🔒 Safe: does not rely on Reddit OAuth or require a Reddit API Key 
 - 📱 Responsive: works great on mobile!
 
-Think Invidious but for Reddit. Watch your cat videos without being watched.
+Like [Invidious](https://github.com/iv-org/invidious) but for Reddit. Browse the coldest takes of [r/unpopularopinion](https://libredd.it/r/unpopularopinion) without being [tracked](#reddit).
+
+## Contents
+- [Screenshot](#screenshot)
+- [Instances](#instances)
+- [About](#about)
+  - [Elsewhere](#elsewhere)
+  - [Info](#info)
+  - [In Progress](#in-progress)
+  - [Teddit Comparison](#how-does-it-compare-to-teddit)
+- [Comparison](#comparison)
+  - [Speed](#speed)
+  - [Privacy](#privacy)
+- [Installation](#installation)
+  - [Cargo](#a-cargo)
+  - [Docker](#b-docker)
+  - [AUR](#c-aur)
+  - [GitHub Releases](#d-github-releases)
+  - [Repl.it](#e-replit)
+- Developing
+  - [Deployment](#deployment)
+  - [Building](#building)
 
 ## Screenshot
 
-![](https://i.ibb.co/Tgjb3w7/image.png)
+![](https://i.ibb.co/1RyKrBz/libreddit-rust.png)
-
-## Status
-
-- [x] Hosting
-  - [x] Instances
-    - [x] Clearnet instance
-    - [ ] .onion instance
-  - [x] Cargo deployment
-  - [x] Docker deployment
-- [x] Subreddits
-  - [x] Title
-  - [x] Description
-  - [x] Posts
-    - [x] Post sorting
-- [x] Posts
-  - [x] Flairs
-  - [x] Comments
-    - [x] Comment sorting
-    - [ ] Nested comments
-  - [x] UTC post date
-  - [x] Image thumbnails
-  - [x] Embedded images
-    - [x] Proxied images 
-  - [x] Reddit-hosted video
-    - [x] Proxied video
-- [x] Users
-  - [x] Username
-  - [x] Karma
-  - [x] Description
-  - [x] Post history
-  - [x] Comment history
-
-- [ ] Search
-  - [ ] Post aggregating
-  - [ ] Comment aggregating
-  - [ ] Result sorting
 
 ## Instances
 
+Feel free to [open an issue](https://github.com/spikecodes/libreddit/issues/new) to have your [selfhosted instance](#deployment) listed here!
+
 - [libredd.it](https://libredd.it) 🇺🇸 (Thank you to [YeapGuy](https://github.com/YeapGuy)!)
 - [libreddit.spike.codes](https://libreddit.spike.codes) 🇺🇸
 
+## 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)
+
+### 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 functionalities but still lacks a few features that are being worked on below.
+
+### In Progress
+- Searching
+
+### 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.
+
+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).
+- Unlike Teddit (at the time of writing this), Libreddit does not require a Reddit API key to host. 
+
+## Comparison
+
+This section outlines how Libreddit compares to Reddit.
+
+### Speed
+
+Lasted tested December 21, 2020.
+
+Results from Google Lighthouse ([Libreddit Report](https://lighthouse-dot-webdotdevsite.appspot.com/lh/html?url=https%3A%2F%2Flibredd.it), [Reddit Report](https://lighthouse-dot-webdotdevsite.appspot.com/lh/html?url=https%3A%2F%2Fwww.reddit.com%2F)).
+
+|                     | Libreddit     | Reddit    |
+|---------------------|---------------|-----------|
+| Requests            | 22            | 70        |
+| Resource Size       | 135 KiB       | 2,222 KiB |
+| Time to Interactive | **1.7 s**     | **11.5 s**|
+
+### Privacy
+
+#### Reddit
+
+**Logging:** According to Reddit's [privacy policy](https://www.redditinc.com/policies/privacy-policy), they "may [automatically] log information" including:
+- IP address
+- User-agent string
+- Browser type
+- Operating system
+- Referral URLs
+- Device information (e.g., device IDs)
+- Device settings
+- Pages visited
+- Links clicked
+- The requested URL
+- Search terms
+
+**Location:** The same privacy policy goes on to describe location data may be collected through the use of:
+- GPS (consensual)
+- Bluetooth (consensual)
+- Content associated with a location (consensual)
+- Your IP Address
+
+**Cookies:** Reddit's [cookie notice](https://www.redditinc.com/policies/cookies) documents the array of cookies used by Reddit including/regarding:
+- Authentication
+- Functionality
+- Analytics and Performance
+- Advertising
+- Third-Party Cookies
+- Third-Party Site
+
+#### Libreddit
+
+For transparency, I hope to describe all the ways Libreddit handles user privacy.
+
+**Logging:** In production (when running the binary, hosting with docker, or using the official instances), Libreddit logs nothing. When debugging (running from source without `--release`), Libreddit logs post IDs fetched to aid troubleshooting but nothing else.
+
+**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.
+
+**Hosting:** The official instances (`libredd.it` and `libreddit.spike.codes`) are hosted on [Repl.it](https://repl.it/) which monitors usage to prevent abuse. I can understand if this invalidates certain users' threat models and therefore, selfhosting and browsing through Tor are welcomed.
+
 ## Installation
 
 ### A) Cargo
@@ -81,7 +153,7 @@ docker run -d --name libreddit -p 80:8080 spikecodes/libreddit
 
 ### C) AUR
 
-Libreddit is available from the Arch User Repository as [`libreddit-git`](https://aur.archlinux.org/packages/libreddit-git).
+For ArchLinux users, Libreddit is available from the AUR as [`libreddit-git`](https://aur.archlinux.org/packages/libreddit-git).
 
 Install:
 ```
@@ -91,8 +163,19 @@ yay -S libreddit-git
 ### D) GitHub Releases
 
 If you're on Linux and none of these methods work for you, you can grab a Linux binary from [the newest release](https://github.com/spikecodes/libreddit/releases/latest).
+Currently, Libreddit does not have Windows or macOS binaries but those will be available soon.
 
-## Deploy an Instance
+### E) Repl.it
+
+**Note:** Repl.it is a free option but they are *not* private and are monitor server usage to prevent abuse. If you really need a free and easy setup, this method may work best for you.
+
+1. Create a Repl.it account (see note above)
+2. Visit [the official Repl](https://repl.it/@spikethecoder/libreddit) and fork it
+3. Hit the run button to download the latest Libreddit version and start it
+
+In the web preview (defaults to top right), you should see your instance hosted where you can assign a [custom domain](https://docs.repl.it/repls/web-hosting#custom-domains).
+
+## Deployment
 
 Once installed, deploy Libreddit (unless you're using Docker) by running:
 
@@ -110,7 +193,7 @@ To disable the media proxy built into Libreddit, run:
 libreddit --no-default-features
 ```
 
-## Building from Source
+## Building
 
 ```
 git clone https://github.com/spikecodes/libreddit

rustfmt.toml

@@ -1,4 +1,4 @@
 edition = "2018"
 tab_spaces = 2
 hard_tabs = true
-max_width = 200
+max_width = 175

src/main.rs

@@ -1,21 +1,19 @@
 // Import Crates
-use actix_web::{get, App, HttpResponse, HttpServer};
+use actix_web::{get, middleware::NormalizePath, web, App, HttpResponse, HttpServer};
 
 // Reference local files
 mod popular;
 mod post;
+mod proxy;
 mod subreddit;
 mod user;
-mod proxy;
 mod utils;
 
 // Create Services
-#[get("/style.css")]
 async fn style() -> HttpResponse {
 	HttpResponse::Ok().content_type("text/css").body(include_str!("../static/style.css"))
 }
 
-#[get("/robots.txt")]
 async fn robots() -> HttpResponse {
 	HttpResponse::Ok().body(include_str!("../static/robots.txt"))
 }
@@ -40,25 +38,29 @@ async fn main() -> std::io::Result<()> {
 	}
 
 	// start http server
-	println!("Running Libreddit on {}!", address.clone());
+	println!("Running Libreddit v{} on {}!", env!("CARGO_PKG_VERSION"), address.clone());
 
 	HttpServer::new(|| {
 		App::new()
+			// TRAILING SLASH MIDDLEWARE
+			.wrap(NormalizePath::default())
 			// GENERAL SERVICES
-			.service(style)
+			.route("/style.css/", web::get().to(style))
-			.service(favicon)
+			.route("/favicon.ico/", web::get().to(|| HttpResponse::Ok()))
-			.service(robots)
+			.route("/robots.txt/", web::get().to(robots))
 			// PROXY SERVICE
-			.service(proxy::handler)
+			.route("/proxy/{url:.*}/", web::get().to(proxy::handler))
-			// POST SERVICES
-			.service(post::short)
-			.service(post::page)
-			// SUBREDDIT SERVICES
-			.service(subreddit::page)
-			// POPULAR SERVICES
-			.service(popular::page)
 			// USER SERVICES
-			.service(user::page)
+			.route("/u/{username}/", web::get().to(user::page))
+			.route("/user/{username}/", web::get().to(user::page))
+			// SUBREDDIT SERVICES
+			.route("/r/{sub}/", web::get().to(subreddit::page))
+			// POPULAR SERVICES
+			.route("/", web::get().to(popular::page))
+			// POST SERVICES
+			.route("/{id:.{5,6}}/", web::get().to(post::short))
+			.route("/r/{sub}/comments/{id}/{title}/", web::get().to(post::page))
+			.route("/r/{sub}/comments/{id}/{title}/{comment_id}/", web::get().to(post::comment))
 	})
 	.bind(address.clone())
 	.expect(format!("Cannot bind to the address: {}", address).as_str())

src/popular.rs

@@ -1,7 +1,7 @@
 // CRATES
-use actix_web::{get, web, HttpResponse, Result, http::StatusCode};
-use askama::Template;
 use crate::utils::{fetch_posts, ErrorTemplate, Params, Post};
+use actix_web::{http::StatusCode, web, HttpResponse, Result};
+use askama::Template;
 
 // STRUCTS
 #[derive(Template)]
@@ -19,10 +19,10 @@ async fn render(sub_name: String, sort: Option<String>, ends: (Option<String>, O
 
 	// Build the Reddit JSON API url
 	let url = match ends.0 {
-		Some(val) => format!("https://www.reddit.com/r/{}/{}.json?before={}&count=25", sub_name, sorting, val),
+		Some(val) => format!("r/{}/{}.json?before={}&count=25", sub_name, sorting, val),
 		None => match ends.1 {
-			Some(val) => format!("https://www.reddit.com/r/{}/{}.json?after={}&count=25", sub_name, sorting, val),
+			Some(val) => format!("r/{}/{}.json?after={}&count=25", sub_name, sorting, val),
-			None => format!("https://www.reddit.com/r/{}/{}.json", sub_name, sorting),
+			None => format!("r/{}/{}.json", sub_name, sorting),
 		},
 	};
 
@@ -50,7 +50,6 @@ async fn render(sub_name: String, sort: Option<String>, ends: (Option<String>, O
 }
 
 // SERVICES
-#[get("/")]
 pub async fn page(params: web::Query<Params>) -> Result<HttpResponse> {
 	render("popular".to_string(), params.sort.clone(), (params.before.clone(), params.after.clone())).await
 }

src/post.rs

@@ -1,9 +1,12 @@
 // CRATES
-use actix_web::{get, web, HttpResponse, Result, http::StatusCode};
+use crate::utils::{format_num, format_url, request, val, Comment, ErrorTemplate, Flair, Params, Post};
+use actix_web::{http::StatusCode, web, HttpResponse, Result};
+
+use async_recursion::async_recursion;
+
 use askama::Template;
 use chrono::{TimeZone, Utc};
 use pulldown_cmark::{html, Options, Parser};
-use crate::utils::{request, val, Comment, ErrorTemplate, Flair, Params, Post};
 
 // STRUCTS
 #[derive(Template)]
@@ -14,12 +17,19 @@ struct PostTemplate {
 	sort: String,
 }
 
-async fn render(id: String, sort: String) -> Result<HttpResponse> {
+async fn render(id: String, sort: Option<String>, comment_id: Option<String>) -> Result<HttpResponse> {
-	// Log the post ID being fetched
+	// Log the post ID being fetched in debug mode
-	println!("id: {}", id);
+	#[cfg(debug_assertions)]
+	dbg!(&id);
+
+	// Handling sort paramater
+	let sorting: String = sort.unwrap_or("confidence".to_string());
 
 	// Build the Reddit JSON API url
-	let url: String = format!("https://reddit.com/{}.json?sort={}", id, sort);
+	let url: String = match comment_id {
+		None => format!("{}.json?sort={}", id, sorting),
+		Some(val) => format!("{}.json?sort={}&comment={}", id, sorting, val)
+	};
 
 	// Send a request to the url, receive JSON in response
 	let req = request(url).await;
@@ -38,14 +48,14 @@ async fn render(id: String, sort: String) -> Result<HttpResponse> {
 	let res = req.unwrap();
 
 	// Parse the JSON into Post and Comment structs
-	let post = parse_post(res.clone()).await;
+	let post = parse_post(res[0].clone()).await;
-	let comments = parse_comments(res).await;
+	let comments = parse_comments(res[1].clone()).await;
 
 	// Use the Post and Comment structs to generate a website to show users
 	let s = PostTemplate {
 		comments: comments.unwrap(),
 		post: post.unwrap(),
-		sort: sort,
+		sort: sorting,
 	}
 	.render()
 	.unwrap();
@@ -53,41 +63,36 @@ async fn render(id: String, sort: String) -> Result<HttpResponse> {
 }
 
 // SERVICES
-#[get("/{id}")]
+pub async fn short(web::Path(id): web::Path<String>, params: web::Query<Params>) -> Result<HttpResponse> {
-async fn short(web::Path(id): web::Path<String>) -> Result<HttpResponse> {
+	render(id, params.sort.clone(), None).await
-	render(id.to_string(), "confidence".to_string()).await
 }
 
-#[get("/r/{sub}/comments/{id}/{title}/")]
+pub async fn comment(web::Path((_sub, id, _title, comment_id)): web::Path<(String, String, String, String)>, params: web::Query<Params>) -> Result<HttpResponse> {
-async fn page(web::Path((_sub, id)): web::Path<(String, String)>, params: web::Query<Params>) -> Result<HttpResponse> {
+	render(id, params.sort.clone(), Some(comment_id)).await
-	match &params.sort {
+}
-		Some(sort) => render(id, sort.to_string()).await,
+
-		None => render(id, "confidence".to_string()).await,
+pub async fn page(web::Path((_sub, id)): web::Path<(String, String)>, params: web::Query<Params>) -> Result<HttpResponse> {
-	}
+	render(id, params.sort.clone(), None).await
 }
 
 // UTILITIES
-async fn media(data: &serde_json::Value) -> String {
+async fn media(data: &serde_json::Value) -> (String, String) {
-	let post_hint: &str = data["data"]["post_hint"].as_str().unwrap_or("");
+	let post_type: &str;
-	let has_media: bool = data["data"]["media"].is_object();
+	let url = if !data["preview"]["reddit_video_preview"]["fallback_url"].is_null() {
-
+		post_type = "video";
-	let prefix = if cfg!(feature = "proxy") { "/imageproxy/" } else { "" };
+		format_url(data["preview"]["reddit_video_preview"]["fallback_url"].as_str().unwrap()).await
-
+	} else if !data["secure_media"]["reddit_video"]["fallback_url"].is_null() {
-	let media: String = if !has_media {
+		post_type = "video";
-		format!(r#"<h4 class="post_body"><a href="{u}">{u}</a></h4>"#, u = data["data"]["url"].as_str().unwrap())
+		format_url(data["secure_media"]["reddit_video"]["fallback_url"].as_str().unwrap()).await
+	} else if data["post_hint"].as_str().unwrap_or("") == "image" {
+		post_type = "image";
+		format_url(data["preview"]["images"][0]["source"]["url"].as_str().unwrap()).await
 	} else {
-		format!(r#"<img class="post_image" src="{}{}.png"/>"#, prefix, data["data"]["url"].as_str().unwrap())
+		post_type = "link";
+		data["url"].as_str().unwrap().to_string()
 	};
 
-	match post_hint {
+	(post_type.to_string(), url)
-		"hosted:video" => format!(
-			r#"<video class="post_image" src="{}{}" controls/>"#,
-			prefix, data["data"]["media"]["reddit_video"]["fallback_url"].as_str().unwrap()
-		),
-		"image" => format!(r#"<img class="post_image" src="{}{}"/>"#, prefix, data["data"]["url"].as_str().unwrap()),
-		"self" => String::from(""),
-		_ => media,
-	}
 }
 
 async fn markdown_to_html(md: &str) -> String {
@@ -106,19 +111,27 @@ async fn markdown_to_html(md: &str) -> String {
 
 // POSTS
 async fn parse_post(json: serde_json::Value) -> Result<Post, &'static str> {
-	let post_data: &serde_json::Value = &json[0]["data"]["children"][0];
+	let post_data: &serde_json::Value = &json["data"]["children"][0];
 
 	let unix_time: i64 = post_data["data"]["created_utc"].as_f64().unwrap().round() as i64;
 	let score = post_data["data"]["score"].as_i64().unwrap();
 
+	let media = media(&post_data["data"]).await;
+
 	let post = Post {
 		title: val(post_data, "title").await,
 		community: val(post_data, "subreddit").await,
 		body: markdown_to_html(post_data["data"]["selftext"].as_str().unwrap()).await,
 		author: val(post_data, "author").await,
+		author_flair: Flair(
+			val(post_data, "author_flair_text").await,
+			val(post_data, "author_flair_background_color").await,
+			val(post_data, "author_flair_text_color").await,
+		),
 		url: val(post_data, "permalink").await,
-		score: if score > 1000 { format!("{}k", score / 1000) } else { score.to_string() },
+		score: format_num(score),
-		media: media(post_data).await,
+		post_type: media.0,
+		media: media.1,
 		time: Utc.timestamp(unix_time, 0).format("%b %e %Y %H:%M UTC").to_string(),
 		flair: Flair(
 			val(post_data, "link_flair_text").await,
@@ -135,23 +148,41 @@ async fn parse_post(json: serde_json::Value) -> Result<Post, &'static str> {
 }
 
 // COMMENTS
+#[async_recursion]
 async fn parse_comments(json: serde_json::Value) -> Result<Vec<Comment>, &'static str> {
-	let comment_data = json[1]["data"]["children"].as_array().unwrap();
+	// Separate the comment JSON into a Vector of comments
+	let comment_data = json["data"]["children"].as_array().unwrap();
 
 	let mut comments: Vec<Comment> = Vec::new();
 
+	// For each comment, retrieve the values to build a Comment object
 	for comment in comment_data.iter() {
 		let unix_time: i64 = comment["data"]["created_utc"].as_f64().unwrap_or(0.0).round() as i64;
+		if unix_time == 0 {
+			continue;
+		}
+
 		let score = comment["data"]["score"].as_i64().unwrap_or(0);
 		let body = markdown_to_html(comment["data"]["body"].as_str().unwrap_or("")).await;
 
-		// println!("{}", body);
+		let replies: Vec<Comment> = if comment["data"]["replies"].is_object() {
+			parse_comments(comment["data"]["replies"].clone()).await.unwrap_or(Vec::new())
+		} else {
+			Vec::new()
+		};
 
 		comments.push(Comment {
+			id: val(comment, "id").await,
 			body: body,
 			author: val(comment, "author").await,
-			score: if score > 1000 { format!("{}k", score / 1000) } else { score.to_string() },
+			score: format_num(score),
 			time: Utc.timestamp(unix_time, 0).format("%b %e %Y %H:%M UTC").to_string(),
+			replies: replies,
+			flair: Flair(
+				val(comment, "author_flair_text").await,
+				val(comment, "author_flair_background_color").await,
+				val(comment, "author_flair_text_color").await,
+			),
 		});
 	}
 

src/proxy.rs

@@ -1,18 +1,29 @@
-use actix_web::{get, web, HttpResponse, Result, client::Client, Error};
+use actix_web::{client::Client, web, Error, HttpResponse, Result};
 
-#[get("/imageproxy/{url:.*}")]
+#[cfg(feature = "proxy")]
-async fn handler(web::Path(url): web::Path<String>) -> Result<HttpResponse> {
+use base64::decode;
+
+pub async fn handler(web::Path(url): web::Path<String>) -> Result<HttpResponse> {
 	if cfg!(feature = "proxy") {
-		dbg!(&url);
+		let media: String;
+
+		#[cfg(not(feature = "proxy"))]
+		let media = url;
+
+		#[cfg(feature = "proxy")]
+		match decode(url) {
+			Ok(bytes) => media = String::from_utf8(bytes).unwrap(),
+			Err(_e) => return Ok(HttpResponse::Ok().body("")),
+		};
+
 		let client = Client::default();
-		client.get(url)
+		client
+			.get(media.replace("&amp;", "&"))
 			.send()
 			.await
 			.map_err(Error::from)
-			.and_then(|res| {
+			.and_then(|res| Ok(HttpResponse::build(res.status()).streaming(res)))
-				Ok(HttpResponse::build(res.status()).streaming(res))
-			})
 	} else {
 		Ok(HttpResponse::Ok().body(""))
 	}
-}
+}

src/subreddit.rs

@@ -1,7 +1,8 @@
 // CRATES
-use actix_web::{get, web, HttpResponse, Result, http::StatusCode};
+use crate::utils::{fetch_posts, format_num, format_url, request, val, ErrorTemplate, Params, Post, Subreddit};
+use actix_web::{http::StatusCode, web, HttpResponse, Result};
 use askama::Template;
-use crate::utils::{request, val, fetch_posts, ErrorTemplate, Params, Post, Subreddit};
+use std::convert::TryInto;
 
 // STRUCTS
 #[derive(Template)]
@@ -10,13 +11,12 @@ struct SubredditTemplate {
 	sub: Subreddit,
 	posts: Vec<Post>,
 	sort: String,
-	ends: (String, String)
+	ends: (String, String),
 }
 
 // SERVICES
 #[allow(dead_code)]
-#[get("/r/{sub}")]
+pub async fn page(web::Path(sub): web::Path<String>, params: web::Query<Params>) -> Result<HttpResponse> {
-async fn page(web::Path(sub): web::Path<String>, params: web::Query<Params>) -> Result<HttpResponse> {
 	render(sub, params.sort.clone(), (params.before.clone(), params.after.clone())).await
 }
 
@@ -26,14 +26,25 @@ pub async fn render(sub_name: String, sort: Option<String>, ends: (Option<String
 
 	// Build the Reddit JSON API url
 	let url = match ends.0 {
-		Some(val) => format!("https://www.reddit.com/r/{}/{}.json?before={}&count=25", sub_name, sorting, val),
+		Some(val) => format!("r/{}/{}.json?before={}&count=25", sub_name, sorting, val),
 		None => match ends.1 {
-			Some(val) => format!("https://www.reddit.com/r/{}/{}.json?after={}&count=25", sub_name, sorting, val),
+			Some(val) => format!("r/{}/{}.json?after={}&count=25", sub_name, sorting, val),
-			None => format!("https://www.reddit.com/r/{}/{}.json", sub_name, sorting),
+			None => format!("r/{}/{}.json", sub_name, sorting),
 		},
 	};
 
-	let sub_result = subreddit(&sub_name).await;
+	let sub_result = if !&sub_name.contains("+") {
+		subreddit(&sub_name).await
+	} else {
+		Ok(Subreddit {
+			name: String::new(),
+			title: String::new(),
+			description: String::new(),
+			icon: String::new(),
+			members: String::new(),
+			active: String::new(),
+		})
+	};
 	let items_result = fetch_posts(url, String::new()).await;
 
 	if sub_result.is_err() || items_result.is_err() {
@@ -57,7 +68,7 @@ pub async fn render(sub_name: String, sort: Option<String>, ends: (Option<String
 			sub: sub,
 			posts: items.0,
 			sort: sorting,
-			ends: (before, items.1)
+			ends: (before, items.1),
 		}
 		.render()
 		.unwrap();
@@ -68,7 +79,7 @@ pub async fn render(sub_name: String, sort: Option<String>, ends: (Option<String
 // SUBREDDIT
 async fn subreddit(sub: &String) -> Result<Subreddit, &'static str> {
 	// Build the Reddit JSON API url
-	let url: String = format!("https://www.reddit.com/r/{}/about.json", sub);
+	let url: String = format!("r/{}/about.json", sub);
 
 	// Send a request to the url, receive JSON in response
 	let req = request(url).await;
@@ -82,16 +93,16 @@ async fn subreddit(sub: &String) -> Result<Subreddit, &'static str> {
 	let res = req.unwrap();
 
 	let members = res["data"]["subscribers"].as_u64().unwrap_or(0);
-	let active =  res["data"]["accounts_active"].as_u64().unwrap_or(0);
+	let active = res["data"]["accounts_active"].as_u64().unwrap_or(0);
 
 	let sub = Subreddit {
 		name: val(&res, "display_name").await,
 		title: val(&res, "title").await,
 		description: val(&res, "public_description").await,
-		icon: val(&res, "icon_img").await,
+		icon: format_url(val(&res, "icon_img").await.as_str()).await,
-		members: if members > 1000 { format!("{}k", members / 1000) } else { members.to_string() },
+		members: format_num(members.try_into().unwrap()),
-		active: if active > 1000 { format!("{}k", active / 1000) } else { active.to_string() },
+		active: format_num(active.try_into().unwrap()),
 	};
 
 	Ok(sub)
-}
+}

src/user.rs

@@ -1,7 +1,7 @@
 // CRATES
-use actix_web::{get, web, HttpResponse, Result, http::StatusCode};
+use crate::utils::{fetch_posts, format_url, nested_val, request, ErrorTemplate, Params, Post, User};
+use actix_web::{http::StatusCode, web, HttpResponse, Result};
 use askama::Template;
-use crate::utils::{nested_val, request, fetch_posts, ErrorTemplate, Params, Post, User};
 
 // STRUCTS
 #[derive(Template)]
@@ -14,7 +14,7 @@ struct UserTemplate {
 
 async fn render(username: String, sort: String) -> Result<HttpResponse> {
 	// Build the Reddit JSON API url
-	let url: String = format!("https://www.reddit.com/user/{}/.json?sort={}", username, sort);
+	let url: String = format!("user/{}/.json?sort={}", username, sort);
 
 	let user = user(&username).await;
 	let posts = fetch_posts(url, "Comment".to_string()).await;
@@ -39,8 +39,7 @@ async fn render(username: String, sort: String) -> Result<HttpResponse> {
 }
 
 // SERVICES
-#[get("/u/{username}")]
+pub async fn page(web::Path(username): web::Path<String>, params: web::Query<Params>) -> Result<HttpResponse> {
-async fn page(web::Path(username): web::Path<String>, params: web::Query<Params>) -> Result<HttpResponse> {
 	match &params.sort {
 		Some(sort) => render(username, sort.to_string()).await,
 		None => render(username, "hot".to_string()).await,
@@ -50,7 +49,7 @@ async fn page(web::Path(username): web::Path<String>, params: web::Query<Params>
 // USER
 async fn user(name: &String) -> Result<User, &'static str> {
 	// Build the Reddit JSON API url
-	let url: String = format!("https://www.reddit.com/user/{}/about.json", name);
+	let url: String = format!("user/{}/about.json", name);
 
 	// Send a request to the url, receive JSON in response
 	let req = request(url).await;
@@ -66,9 +65,9 @@ async fn user(name: &String) -> Result<User, &'static str> {
 	// Parse the JSON output into a User struct
 	Ok(User {
 		name: name.to_string(),
-		icon: nested_val(&res, "subreddit", "icon_img").await,
+		icon: format_url(nested_val(&res, "subreddit", "icon_img").await.as_str()).await,
 		karma: res["data"]["total_karma"].as_i64().unwrap(),
 		banner: nested_val(&res, "subreddit", "banner_img").await,
 		description: nested_val(&res, "subreddit", "public_description").await,
 	})
-}
+}

src/utils.rs

@@ -2,8 +2,11 @@
 // CRATES
 //
 use chrono::{TimeZone, Utc};
-use surf::{get, client, middleware::Redirect};
+use serde_json::{from_str, Value};
-use serde_json::{Value, from_str};
+// use surf::{client, get, middleware::Redirect};
+
+#[cfg(feature = "proxy")]
+use base64::encode;
 
 //
 // STRUCTS
@@ -19,20 +22,25 @@ pub struct Post {
 	pub community: String,
 	pub body: String,
 	pub author: String,
+	pub author_flair: Flair,
 	pub url: String,
 	pub score: String,
+	pub post_type: String,
 	pub media: String,
 	pub time: String,
-	pub flair: Flair
+	pub flair: Flair,
 }
 
 #[allow(dead_code)]
 // Comment with content, post, score and data/time that it was posted
 pub struct Comment {
+	pub id: String,
 	pub body: String,
 	pub author: String,
+	pub flair: Flair,
 	pub score: String,
-	pub time: String
+	pub time: String,
+	pub replies: Vec<Comment>,
 }
 
 #[allow(dead_code)]
@@ -42,7 +50,7 @@ pub struct User {
 	pub icon: String,
 	pub karma: i64,
 	pub banner: String,
-	pub description: String
+	pub description: String,
 }
 
 #[allow(dead_code)]
@@ -53,7 +61,7 @@ pub struct Subreddit {
 	pub description: String,
 	pub icon: String,
 	pub members: String,
-	pub active: String
+	pub active: String,
 }
 
 // Parser for query params, used in sorting (eg. /r/rust/?sort=hot)
@@ -61,14 +69,36 @@ pub struct Subreddit {
 pub struct Params {
 	pub sort: Option<String>,
 	pub after: Option<String>,
-	pub before: Option<String>
+	pub before: Option<String>,
 }
 
 // Error template
 #[derive(askama::Template)]
 #[template(path = "error.html", escape = "none")]
 pub struct ErrorTemplate {
-	pub message: String
+	pub message: String,
+}
+
+//
+// FORMATTING
+//
+
+pub async fn format_url(url: &str) -> String {
+	#[cfg(feature = "proxy")]
+	return "/proxy/".to_string() + encode(url).as_str();
+
+	#[cfg(not(feature = "proxy"))]
+	return url.to_string();
+}
+
+pub fn format_num(num: i64) -> String {
+	if num > 1000000 {
+		format!("{}m", num / 1000000)
+	} else if num > 1000 {
+		format!("{}k", num / 1000)
+	} else {
+		num.to_string()
+	}
 }
 
 //
@@ -107,7 +137,7 @@ pub async fn fetch_posts(url: String, fallback_title: String) -> Result<(Vec<Pos
 
 	for post in post_list.iter() {
 		let img = if val(post, "thumbnail").await.starts_with("https:/") {
-			val(post, "thumbnail").await
+			format_url(val(post, "thumbnail").await.as_str()).await
 		} else {
 			String::new()
 		};
@@ -120,7 +150,13 @@ pub async fn fetch_posts(url: String, fallback_title: String) -> Result<(Vec<Pos
 			community: val(post, "subreddit").await,
 			body: val(post, "body").await,
 			author: val(post, "author").await,
-			score: if score > 1000 { format!("{}k", score / 1000) } else { score.to_string() },
+			author_flair: Flair(
+				val(post, "author_flair_text").await,
+				val(post, "author_flair_background_color").await,
+				val(post, "author_flair_text_color").await,
+			),
+			score: format_num(score),
+			post_type: "link".to_string(),
 			media: img,
 			url: val(post, "permalink").await,
 			time: Utc.timestamp(unix_time, 0).format("%b %e '%y").to_string(),
@@ -145,7 +181,9 @@ pub async fn fetch_posts(url: String, fallback_title: String) -> Result<(Vec<Pos
 
 // Make a request to a Reddit API and parse the JSON response
 #[allow(dead_code)]
-pub async fn request(url: String) -> Result<serde_json::Value, &'static str> {
+pub async fn request(mut url: String) -> Result<serde_json::Value, &'static str> {
+	url = format!("https://www.reddit.com/{}", url);
+
 	// --- actix-web::client ---
 	// let client = actix_web::client::Client::default();
 	// let res = client
@@ -159,20 +197,18 @@ pub async fn request(url: String) -> Result<serde_json::Value, &'static str> {
 	// let body = std::str::from_utf8(res.as_ref())?; // .as_ref converts Bytes to [u8]
 
 	// --- surf ---
-	let req = get(&url).header("User-Agent", "libreddit");
+	// let req = get(&url).header("User-Agent", "libreddit");
-	let client = client().with(Redirect::new(5));
+	// let client = client().with(Redirect::new(5));
-	let mut res = client.send(req).await.unwrap();
+	// let mut res = client.send(req).await.unwrap();
-	let success = res.status().is_success();
+	// let success = res.status().is_success();
-	let body = res.body_string().await.unwrap();
+	// let body = res.body_string().await.unwrap();
-
-	dbg!(url.clone());
 
 	// --- reqwest ---
-	// let res = reqwest::get(&url).await.unwrap();
+	let res = reqwest::get(&url).await.unwrap();
-	// // Read the status from the response
+	// Read the status from the response
-	// let success = res.status().is_success();
+	let success = res.status().is_success();
-	// // Read the body of the response
+	// Read the body of the response
-	// let body = res.text().await.unwrap();
+	let body = res.text().await.unwrap();
 
 	// Parse the response from Reddit as JSON
 	let json: Value = from_str(body.as_str()).unwrap_or(Value::Null);

static/robots.txt

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

static/style.css

@@ -1,22 +1,34 @@
 /* General */
 
+:root {
+	--accent: aqua;
+	--background: #0F0F0F;
+	--foreground: #222;
+	--outside: #1F1F1F;
+	--post: #161616;
+	--highlighted: #333;
+	--black-contrast: 0 1px 3px rgba(0,0,0,0.5);
+}
+
 * {
 	transition: 0.2s all;
 	margin: 0px;
 	color: white;
 	font-family: sans-serif;
 	font-weight: normal;
+	outline: none;
 }
 
-html {
+body {
-	background: black;
+	background: var(--background);
+	visibility: visible !important;
 }
 
-header {
+nav {
 	display: flex;
 	justify-content: space-between;
-	color: aqua;
+	color: var(--accent);
-	background: #151515;
+	background: var(--outside);
 	padding: 15px;
 	font-weight: bold;
 	font-size: 20px;
@@ -53,12 +65,14 @@ a:not(.post_right):hover {
 	text-decoration: underline;
 }
 
-span {
+#about {
-	color: aqua;
+	padding-top: 20px;
+	background: #151515;
 }
 
-#about {
+#version {
-	background: #151515;
+	color: white;
+	opacity: 25%;
 }
 
 /* Subreddit */
@@ -115,15 +129,28 @@ span {
 /* Sorting */
 
 #sort {
-	max-width: 750px;
+	background: var(--outside);
-	margin: 20px -10px;
+	box-shadow: var(--black-contrast);
-	display: flex;
+	border: 0px;
-	justify-content: start;
+	padding: 0px 15px;
-	padding: 0px 10px;
+	margin: 20px 0px;
+	height: 40px;
+	font-size: 15px;
+	border-radius: 5px 0px 0px 5px;
+	appearance: none;
+}
+
+#sort_submit {
+	background: var(--highlighted);
+	border: 0px;
+	font-size: 15px;
+	height: 40px;
+	border-radius: 0px 5px 5px 0px;
 }
 
 #sort > div, footer > a {
-	background: #151515;
+	box-shadow: var(--black-contrast);
+	background: var(--outside);
 	color: lightgrey;
 	border-radius: 5px;
 	margin-right: 5px;
@@ -133,37 +160,29 @@ span {
 }
 
 #sort > div.selected {
-	background: aqua;
+	background: var(--accent);
 	color: black;
 }
 
 #sort > div:hover {
-	background: #222;
+	background: var(--foreground);
 }
 
 /* Post */
 
 .post {
 	border-radius: 5px;
-	background: #151515;
+	background: var(--post);
+	box-shadow: var(--black-contrast);
 	display: flex;
 }
 
-.post.highlighted {
-	border: 2px solid #555;
-	background: #222;
-}
-
-.post.highlighted > .post_left {
-	background: #333;
-}
-
 .post:hover {
-	background: #222;
+	background: var(--foreground);
 }
 
 .post:hover > .post_left {
-	background: #333;
+	background: var(--highlighted);
 }
 
 .post_left, .post_right {
@@ -174,27 +193,23 @@ span {
 
 .post_left {
 	text-align: center;
-	background: #222;
+	background: var(--foreground);
 	border-radius: 5px 0px 0px 5px;
 	min-width: 50px;
 	padding: 5px;
 }
 
-.post_right > p > span, .comment_right > p > span {
-	float: right;
-}
-
-.post_title {
-	font-size: 20px;
-}
-
 .post_subreddit {
 	font-weight: bold;
 }
 
+.post_title {
+	font-size: 18px;
+}
+
 .post_score {
-	margin-top: 1em;
+	margin-top: 20px;
-	color: aqua;
+	color: var(--accent);
 }
 
 .post_right {
@@ -209,14 +224,15 @@ span {
 
 .post_right > p {
 	opacity: 0.75;
+	font-size: 16px;
 }
 
-.post_image {
+.post_media {
-	max-width: 500px;
+	max-width: 90%;
 	align-self: center;
 }
 
-.post_image[src=""] {
+.post_media[src=""] {
 	display: none;
 }
 
@@ -227,12 +243,16 @@ span {
 }
 
 .post_body > p:not(:first-child) {
-	margin-top: 1.5em;
+	margin-top: 20px;
 }
 
 .post_body a {
 	text-decoration: underline;
-	color: aqua;
+	color: var(--accent);
+}
+
+#post_url {
+	color: var(--accent);
 }
 
 .post_thumbnail {
@@ -241,31 +261,30 @@ span {
 	flex-shrink: 0;
 	padding: 10px;
 	border-radius: 15px;
+	max-width: 20%;
 }
 
 .post_thumbnail[src=""] {
-	border: none;
+	display: none;
 }
 
-small {
+.post_flair {
-    background: aqua;
+	background: var(--accent);
-    color: black;
+	color: black;
-    padding: 5px;
+	padding: 5px;
-    border-radius: 5px;
+	margin-right: 5px;
-    font-size: 12px;
+	border-radius: 5px;
-    font-weight: bold;
+	font-size: 12px;
+	font-weight: bold;
 }
 
 /* Comment */
 
 .comment {
+	margin-top: 15px;
 	border-radius: 5px;
 	display: flex;
-	border: 2px solid #222;
+	font-size: 15px;
-}
-
-.comment:hover {
-	background: #111;
 }
 
 .comment_left, .comment_right {
@@ -276,20 +295,31 @@ small {
 .comment_left {
 	text-align: center;
 	min-width: 50px;
-	padding: 5px;
+	padding: 5px 0px;
-	align-items: flex-end;
+	align-items: center;
 }
 
 .comment_title {
 	font-size: 20px;
 }
 
-.comment_upvote {
+.comment_author {
-	margin-top: 0.5em;
+	opacity: 0.9;
-	border-radius: 5px 5px 0px 0px;
+}
-	background: #222;
+
-	width: 40px;
+.comment_author.op {
-	padding: 10px 0px 0px 0px;
+	color: var(--accent);
+	font-weight: bold;
+}
+
+.author_flair {
+	background: var(--highlighted);
+	color: white;
+	padding: 5px;
+	margin-right: 5px;
+	border-radius: 5px;
+	font-size: 12px;
+	font-weight: bold;
 }
 
 .comment_subreddit {
@@ -297,28 +327,24 @@ small {
 }
 
 .comment_score {
-	color: aqua;
+	color: var(--accent);
-	background: #222;
+	background: var(--foreground);
-	width: 40px;
+	min-width: 40px;
-	padding: 5px 0px 10px 0px;
+	border-radius: 5px;
-	border-radius: 0px 0px 5px 5px;
+	padding: 10px 0px;
 }
 
 .comment_right {
 	word-wrap: anywhere;
-	padding: 10px 25px 10px 10px;
+	padding: 10px 25px 10px 5px;
 	flex-grow: 1;
 	flex-shrink: 1;
 }
 
-.comment_right > * {
+.comment_data > * {
 	margin: 5px;
 }
 
-.comment_right > p {
-	opacity: 0.75;
-}
-
 .comment_image {
 	max-width: 500px;
 	align-self: center;
@@ -335,31 +361,103 @@ small {
 }
 
 .comment_body > p:not(:first-child) {
-	margin-top: 1.5em;
+	margin-top: 20px;
 }
 
 .comment_body a {
 	text-decoration: underline;
-	color: aqua;
+	color: var(--accent);
+}
+
+.deeper_replies {
+	color: var(--accent);
+	margin-left: 15px;
+}
+
+::marker {
+	color: var(--accent);
+}
+
+.replies > .comment {
+	margin-left: -20px;
+	padding: 5px;
+}
+
+.datetime {
+	opacity: 0.75;
+}
+
+.line {
+	width: 2px;
+	height: 100%;
+	background: var(--foreground);
 }
 
 .post.comment {
 	background: #000;
-	border: 2px solid #222;
+	border: 2px solid var(--foreground);
 }
 
 .post.comment > .post_left {
 	background: black;
 }
 
+/* Code */
+
+pre {
+	background: var(--outside);
+	padding: 20px;
+	margin-top: 10px;
+	border-radius: 5px;
+	box-shadow: var(--black-contrast);
+}
+
+code {
+	font-family: monospace;
+	font-size: 14px;
+}
+
 /* Tables */
 
 table {
-	border: 3px #333 solid;
+	border: 3px var(--highlighted) solid;
-	border-spacing: 0rem;
+	border-spacing: 0;
 }
 
 td, th {
-	border: 1px #333 solid;
+	border: 1px var(--highlighted) solid;
-	padding: 0.5em;
+	padding: 10px;
+}
+
+/* Mobile */
+
+@media screen and (max-width: 480px) {
+	.post {
+		flex-direction: column-reverse;
+	}
+
+	.post_left {
+		border-radius: 0px 0px 5px 5px;
+	}
+
+	.post_right {
+		padding: 20px;
+	}
+
+	.post_score {
+		margin-top: 0;
+	}
+
+	.post_thumbnail {
+		max-width: initial;
+	}
+
+	.replies > .comment {
+		margin-left: -25px;
+		padding: 5px 0px;
+	}
+
+	.datetime {
+		width: 100%;
+	}
 }

templates/base.html

@@ -2,29 +2,24 @@
 <html lang="en">
 	<head>
 		{% block head %}
-		<title>{% block title %}{% endblock %}</title>
+		<title>{% block title %}Libreddit{% endblock %}</title>
-		<meta name="description" content="View on Libreddit, an alternative private front-end to Reddit.">
+		<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">
-		{% block sortstyle %}
-		<style>
-			#sort > #sort_{{ sort }} {
-				background: aqua;
-				color: black;
-			}
-		</style>
-		{% endblock %}
 		{% endblock %}
     </head>
-	<body>
+	<body style="visibility: hidden;">
-		{% block body %}
+		{% block navbar %}
-		{% block header %}
+		<nav>
-		<header>
+			<a href="/"><span id="lib">lib</span>reddit. <span id="version">v{{ env!("CARGO_PKG_VERSION") }}</span></a>
-			<a href="/"><span id="lib">lib</span>reddit.</a>
 			<a id="github" href="https://github.com/spikecodes/libreddit">GITHUB</a>
-		</header>
+		</nav>
 		{% endblock %}
-
+		
+		{% block body %}
 		<main>
 			{% block content %}
 			{% endblock %}

templates/popular.html

@@ -1,28 +1,30 @@
 {% extends "base.html" %}
-{% block title %}Libreddit{% endblock %}
 {% block content %}
-	<div id="sort">
+	<form>
-		<div id="sort_hot"><a href="?sort=hot">Hot</a></div>
+		<select id="sort" name="sort"> 
-		<div id="sort_top"><a href="?sort=top">Top</a></div>
+			<option value="confidence" {% if sort == "confidence" %}selected{% endif %}>Best</option> 
-		<div id="sort_new"><a href="?sort=new">New</a></div>
+			<option value="hot" {% if sort == "hot" %}selected{% endif %}>Hot</option>
-		<div id="sort_rising"><a href="?sort=rising">Rising</a></div>
+			<option value="new" {% if sort == "new" %}selected{% endif %}>New</option> 
-	</div>
+			<option value="top" {% if sort == "top" %}selected{% endif %}>Top</option> 
+		</select><input id="sort_submit" type="submit" value="&rarr;">
+	</form>
 	{% for post in posts %}
 	<div class="post">
 		<div class="post_left">
 			<h3 class="post_score">{{ post.score }}</h3>
 		</div>
 		<div class="post_right">
-			<p>
+			<h4>
 				<b><a class="post_subreddit" href="/r/{{ post.community }}">r/{{ post.community }}</a></b>
-				&bull;
+				&bull; <a class="post_author" href="/u/{{ post.author }}">u/{{ post.author }}</a>
-				Posted by 
+				{% if post.author_flair.0 != "" %}
-				<a class="post_author" href="/u/{{ post.author }}">u/{{ post.author }}</a>
+					<small class="author_flair">{{ post.author_flair.0 }}</small>
-				<span style="float: right;">{{ post.time }}</span>
+				{% endif %}
-			</p>
+				<span class="datetime" style="float: right;">{{ post.time }}</span>
+			</h4>
 			<h3 class="post_title">
 				{% if post.flair.0 != "" %}
-				<small style="color:{{ post.flair.2 }}; background:{{ post.flair.1 }}">{{ post.flair.0 }}</small>
+				<small class="post_flair" style="color:{{ post.flair.2 }}; background:{{ post.flair.1 }}">{{ post.flair.0 }}</small>
 				{% endif %}
 				<a href="{{ post.url }}">{{ post.title }}</a>
 			</h3>

templates/post.html

@@ -4,49 +4,89 @@
 	{% call super() %}
 	<meta name="author" content="u/{{ post.author }}">
 {% endblock %}
+
+{% macro comment(item) -%}
+
+<div id="{{ item.id }}" class="comment">
+	<div class="comment_left">
+		<h3 class="comment_score">{{ item.score }}</h3>
+		<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>
+			{% endif %}
+			&bull; <span class="datetime">{{ item.time }}</span>
+		</summary>
+		<h4 class="comment_body">{{ item.body }}</h4>
+
+{%- endmacro %}
+
 {% block content %}
 	<div class="post highlighted">
 		<div class="post_left">
 			<h3 class="post_score">{{ post.score }}</h3>
 		</div>
 		<div class="post_right">
-			<p>
+			<h4>
 				<b><a class="post_subreddit" href="/r/{{ post.community }}">r/{{ post.community }}</a></b>
 				&bull;
-				Posted by 
 				<a class="post_author" href="/u/{{ post.author }}">u/{{ post.author }}</a>
-				<span>{{ post.time }}</span>
+				{% if post.author_flair.0 != "" %}
-			</p>
+					<small class="author_flair">{{ post.author_flair.0 }}</small>
-			<h3 class="post_title">
+				{% endif %}
+				<span class="datetime">{{ post.time }}</span>
+			</h4>
+			<a href="{{ post.url }}" class="post_title">
 				{{ post.title }}
 				{% if post.flair.0 != "" %}
-				<small style="color:{{ post.flair.2 }}; background:{{ post.flair.1 }}">{{ post.flair.0 }}</small>
+					<small class="post_flair" style="color:{{ post.flair.2 }}; background:{{ post.flair.1 }}">{{ post.flair.0 }}</small>
 				{% endif %}
-			</h3>
+			</a>
-			{{ 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 %}
 			<h4 class="post_body">{{ post.body }}</h4>
 		</div>
 	</div>
-	<div id="sort">
+	<form>
-		<div id="sort_confidence"><a href="?sort=confidence">Best</a></div>
+		<select id="sort" name="sort"> 
-		<div id="sort_top"><a href="?sort=top">Top</a></div>
+			<option value="confidence" {% if sort == "confidence" %}selected{% endif %}>Best</option> 
-		<div id="sort_new"><a href="?sort=new">New</a></div>
+			<option value="top" {% if sort == "top" %}selected{% endif %}>Top</option> 
-		<div id="sort_controversial"><a href="?sort=controversial">Controversial</a></div>
+			<option value="new" {% if sort == "new" %}selected{% endif %}>New</option> 
-		<div id="sort_old"><a href="?sort=old">Old</a></div>
+			<option value="controversial" {% if sort == "controversial" %}selected{% endif %}>Controversial</option> 
-	</div>
+			<option value="old" {% if sort == "old" %}selected{% endif %}>Old</option>
-	{% for comment in comments %}
+		</select><input id="sort_submit" type="submit" value="&rarr;">
-	<div class="comment">
+	</form>
-		<div class="comment_left">
+
-			<div class="comment_upvote">↑</div>
+	{% for c in comments -%}
-			<h3 class="comment_score">{{ comment.score }}</h3>
+		<div class="thread">
+			{% call comment(c) %}
+			<div class="replies">
+				{% for reply1 in c.replies %}
+					{% call comment(reply1) %}
+					<div class="replies">
+						{% for reply2 in reply1.replies %}
+							{% call comment(reply2) %}
+							<div class="replies">
+								{% for reply3 in reply2.replies %}
+									{% call comment(reply3) %}
+									{% if reply3.replies.len() > 0 %}
+										<a class="deeper_replies" href="{{ post.url }}{{ reply3.id }}">&rarr; More replies</a>
+									{% endif %}
+									</details></div>
+								{% endfor %}
+							</div></details></div>
+						{% endfor %}
+					</div></details></div>
+				{% endfor %}
+			</div></details></div>
 		</div>
-		<div class="comment_right">
+	{%- endfor %}
-			<p>
+
-				Posted by <a class="comment_author" href="/u/{{ comment.author }}">u/{{ comment.author }}</a>
-				<span>{{ comment.time }}</span>
-			</p>
-			<h4 class="comment_body">{{ comment.body }}</h4>
-		</div>
-	</div><br>
-	{% endfor %}
 {% endblock %}

templates/subreddit.html

@@ -1,12 +1,11 @@
 {% extends "base.html" %}
+
+{% if sub.name != "" %}
 {% block title %}r/{{ sub.name }}: {{ sub.description }}{% endblock %}
+{% endif %}
+
 {% block body %}
-	{% block header %}
+	{% if sub.name != "" %}
-	<header>
-		<a href="/"><span id="lib">lib</span>reddit.</a>
-		<a id="github" href="https://github.com/spikecodes/libreddit">GITHUB</a>
-	</header>
-	{% endblock %}
 	<div id="about">
 		<div class="subreddit">
 			<div class="subreddit_left">
@@ -19,28 +18,32 @@
 			</div>
 		</div>
 	</div>
+	{% endif %}
 	<main>
-		<div id="sort">
+		<form>
-			<div id="sort_hot"><a href="?sort=hot">Hot</a></div>
+			<select id="sort" name="sort"> 
-			<div id="sort_top"><a href="?sort=top">Top</a></div>
+				<option value="hot" {% if sort == "hot" %}selected{% endif %}>Hot</option>
-			<div id="sort_new"><a href="?sort=new">New</a></div>
+				<option value="new" {% if sort == "new" %}selected{% endif %}>New</option> 
-		</div>
+				<option value="top" {% if sort == "top" %}selected{% endif %}>Top</option> 
+			</select><input id="sort_submit" type="submit" value="&rarr;">
+		</form>
 		{% for post in posts %}
 		<div class="post">
 			<div class="post_left">
 				<h3 class="post_score">{{ post.score }}</h3>
 			</div>
 			<div class="post_right">
-				<p>
+				<h4>
-					<b><a class="post_subreddit" href="/r/{{ post.community }}">r/{{ sub.name }}</a></b>
+					<b><a class="post_subreddit" href="/r/{{ post.community }}">r/{{ post.community }}</a></b>
-					&bull;
+					&bull; <a class="post_author" href="/u/{{ post.author }}">u/{{ post.author }}</a>
-					Posted by 
+					{% if post.author_flair.0 != "" %}
-					<a class="post_author" href="/u/{{ post.author }}">u/{{ post.author }}</a>
+						<small class="author_flair">{{ post.author_flair.0 }}</small>
-					<span>{{ post.time }}</span>
+					{% endif %}
-				</p>
+					<span class="datetime">{{ post.time }}</span>
+				</h4>
 				<h3 class="post_title">
 					{% if post.flair.0 != "" %}
-					<small style="color:{{ post.flair.2 }}; background:{{ post.flair.1 }}">{{ post.flair.0 }}</small>
+					<small class="post_flair" style="color:{{ post.flair.2 }}; background:{{ post.flair.1 }}">{{ post.flair.0 }}</small>
 					{% endif %}
 					<a href="{{ post.url }}">{{ post.title }}</a>
 				</h3>

templates/user.html

@@ -1,12 +1,6 @@
 {% extends "base.html" %}
 {% block title %}Libreddit: u/{{ user.name }}{% endblock %}
 {% block body %}
-	{% block header %}
-	<header>
-		<a href="/"><span id="lib">lib</span>reddit.</a>
-		<a id="github" href="https://github.com/spikecodes/libreddit">GITHUB</a>
-	</header>
-	{% endblock %}
 	<div id="about">
 		<div class="user">
 			<div class="user_left">
@@ -19,11 +13,13 @@
 		</div>
 	</div>
 	<main>
-		<div id="sort">
+		<form>
-			<div id="sort_hot"><a href="?sort=hot">Hot</a></div>
+			<select id="sort" name="sort"> 
-			<div id="sort_top"><a href="?sort=top">Top</a></div>
+				<option value="hot" {% if sort == "hot" %}selected{% endif %}>Hot</option>
-			<div id="sort_new"><a href="?sort=new">New</a></div>
+				<option value="new" {% if sort == "new" %}selected{% endif %}>New</option> 
-		</div>
+				<option value="top" {% if sort == "top" %}selected{% endif %}>Top</option> 
+			</select><input id="sort_submit" type="submit" value="&rarr;">
+		</form>
 		{% for post in posts %}
 		{% if post.title != "Comment" %}
 		<div class='post'>
@@ -31,18 +27,19 @@
 				<h3 class="post_score">{{ post.score }}</h3>
 			</div>
 			<div class="post_right">
-				<p>
+				<h4>
 					<b><a class="post_subreddit" href="/r/{{ post.community }}">r/{{ post.community }}</a></b>
-					&bull;
+					&bull; <a class="post_author" href="/u/{{ post.author }}">u/{{ post.author }}</a>
-					Posted by 
+					{% if post.author_flair.0 != "" %}
-					<a class="post_author" href="/u/{{ post.author }}">u/{{ post.author }}</a>
+						<small class="author_flair">{{ post.author_flair.0 }}</small>
-					<span style="float: right;">{{ post.time }}</span>
+					{% endif %}
-				</p>
+					<span class="datetime" style="float: right;">{{ post.time }}</span>
+				</h4>
 				<h3 class="post_title">
 					{% if post.flair.0 == "Comment" %}
 					{% else if post.flair.0 == "" %}
 					{% else %}
-					<small style="color:{{ post.flair.2 }}; background:{{ post.flair.1 }}">{{ post.flair.0 }}</small>
+						<small class="post_flair" style="color:{{ post.flair.2 }}; background:{{ post.flair.1 }}">{{ post.flair.0 }}</small>
 					{% endif %}
 					<a href="{{ post.url }}">{{ post.title }}</a>
 				</h3>
@@ -52,14 +49,13 @@
 		{% else %}
 		<div class="comment">
 			<div class="comment_left">
-				<div class="comment_upvote">↑</div>
 				<h3 class="comment_score">{{ post.score }}</h3>
 			</div>
 			<div class="comment_right">
-				<p>
+				<h4>
 					COMMENT
-					<span>{{ post.time }}</span>
+					<span class="datetime">{{ post.time }}</span>
-				</p>
+				</h4>
 				<h4 class="comment_body">{{ post.body }}</h4>
 			</div>
 		</div><br>