Basic Nested & Collapsible Comments

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.0"
 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

@@ -7,7 +7,7 @@ Libre + Reddit = Libreddit
 - 🚀 Fast: written in Rust for blazing fast speeds and safety
 - ☁️ 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.
@@ -16,44 +16,38 @@ Think Invidious but for Reddit. Watch your cat videos without being watched.
 
 ![](https://i.ibb.co/Tgjb3w7/image.png)
 
-## Status
+## About
 
-- [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
+### 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)
 
-- [ ] Search
-  - [ ] Post aggregating
-  - [ ] Comment aggregating
-  - [ ] Result sorting
+### 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
+- Nested comments
+- User flairs
+- 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 for speed and memory safety. It uses Actix Web, which was [benchmarked as the fastest web server for single queries](https://www.techempower.com/benchmarks/#hw=ph&test=db).
+- Unlike Teddit (at the time of writing this), Libreddit does not require a Reddit API key to host. 
 
 ## Instances
 
+Feel free to [open an issue](https://github.com/spikecodes/libreddit/issues/new) to have your selfhosted instance listed here!
+
 - [libredd.it](https://libredd.it) 🇺🇸 (Thank you to [YeapGuy](https://github.com/YeapGuy)!)
 - [libreddit.spike.codes](https://libreddit.spike.codes) 🇺🇸
 
@@ -81,7 +75,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,6 +85,7 @@ 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
 

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,28 @@ 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)
-			.service(favicon)
-			.service(robots)
+			.route("/style.css/", web::get().to(style))
+			.route("/favicon.ico/", web::get().to(|| HttpResponse::Ok()))
+			.route("/robots.txt/", web::get().to(robots))
 			// PROXY SERVICE
-			.service(proxy::handler)
-			// POST SERVICES
-			.service(post::short)
-			.service(post::page)
-			// SUBREDDIT SERVICES
-			.service(subreddit::page)
-			// POPULAR SERVICES
-			.service(popular::page)
+			.route("/proxy/{url:.*}/", web::get().to(proxy::handler))
 			// 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))
 	})
 	.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)]
@@ -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)]
@@ -16,7 +19,7 @@ struct PostTemplate {
 
 async fn render(id: String, sort: String) -> Result<HttpResponse> {
 	// Log the post ID being fetched
-	println!("id: {}", id);
+	dbg!(&id);
 
 	// Build the Reddit JSON API url
 	let url: String = format!("https://reddit.com/{}.json?sort={}", id, sort);
@@ -38,8 +41,8 @@ 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 comments = parse_comments(res).await;
+	let post = parse_post(res[0].clone()).await;
+	let comments = parse_comments(res[1].clone()).await;
 
 	// Use the Post and Comment structs to generate a website to show users
 	let s = PostTemplate {
@@ -53,13 +56,11 @@ async fn render(id: String, sort: String) -> Result<HttpResponse> {
 }
 
 // SERVICES
-#[get("/{id}")]
-async fn short(web::Path(id): web::Path<String>) -> Result<HttpResponse> {
+pub async fn short(web::Path(id): web::Path<String>) -> Result<HttpResponse> {
 	render(id.to_string(), "confidence".to_string()).await
 }
 
-#[get("/r/{sub}/comments/{id}/{title}/")]
-async fn page(web::Path((_sub, id)): web::Path<(String, String)>, params: web::Query<Params>) -> Result<HttpResponse> {
+pub async fn page(web::Path((_sub, id)): web::Path<(String, String)>, params: web::Query<Params>) -> Result<HttpResponse> {
 	match &params.sort {
 		Some(sort) => render(id, sort.to_string()).await,
 		None => render(id, "confidence".to_string()).await,
@@ -67,27 +68,23 @@ async fn page(web::Path((_sub, id)): web::Path<(String, String)>, params: web::Q
 }
 
 // UTILITIES
-async fn media(data: &serde_json::Value) -> String {
-	let post_hint: &str = data["data"]["post_hint"].as_str().unwrap_or("");
-	let has_media: bool = data["data"]["media"].is_object();
-
-	let prefix = if cfg!(feature = "proxy") { "/imageproxy/" } else { "" };
-
-	let media: String = if !has_media {
-		format!(r#"<h4 class="post_body"><a href="{u}">{u}</a></h4>"#, u = data["data"]["url"].as_str().unwrap())
+async fn media(data: &serde_json::Value) -> (String, String) {
+	let post_type: &str;
+	let url = if !data["preview"]["reddit_video_preview"]["fallback_url"].is_null() {
+		post_type = "video";
+		format_url(data["preview"]["reddit_video_preview"]["fallback_url"].as_str().unwrap()).await
+	} else if !data["secure_media"]["reddit_video"]["fallback_url"].is_null() {
+		post_type = "video";
+		format_url(data["secure_media"]["reddit_video"]["fallback_url"].as_str().unwrap()).await
+	} else if data["post_hint"].as_str().unwrap_or("") == "image" {
+		post_type = "image";
+		format_url(data["preview"]["images"][0]["source"]["url"].as_str().unwrap()).await
 	} else {
-		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 {
-		"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,
-	}
+	(post_type.to_string(), url)
 }
 
 async fn markdown_to_html(md: &str) -> String {
@@ -106,19 +103,22 @@ 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,
 		url: val(post_data, "permalink").await,
-		score: if score > 1000 { format!("{}k", score / 1000) } else { score.to_string() },
-		media: media(post_data).await,
+		score: format_num(score),
+		post_type: media.0,
+		media: media.1,
 		time: Utc.timestamp(unix_time, 0).format("%b %e %Y %H:%M UTC").to_string(),
 		flair: Flair(
 			val(post_data, "link_flair_text").await,
@@ -135,23 +135,35 @@ 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 {
 			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,
 		});
 	}
 

src/proxy.rs

@@ -1,17 +1,28 @@
-use actix_web::{get, web, HttpResponse, Result, client::Client, Error};
+use actix_web::{client::Client, web, Error, HttpResponse, Result};
 
-#[get("/imageproxy/{url:.*}")]
-async fn handler(web::Path(url): web::Path<String>) -> Result<HttpResponse> {
+#[cfg(feature = "proxy")]
+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| {
-				Ok(HttpResponse::build(res.status()).streaming(res))
-			})
+			.and_then(|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}")]
-async fn page(web::Path(sub): web::Path<String>, params: web::Query<Params>) -> Result<HttpResponse> {
+pub async fn page(web::Path(sub): web::Path<String>, params: web::Query<Params>) -> Result<HttpResponse> {
 	render(sub, params.sort.clone(), (params.before.clone(), params.after.clone())).await
 }
 
@@ -57,7 +57,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();
@@ -88,9 +88,9 @@ async fn subreddit(sub: &String) -> Result<Subreddit, &'static str> {
 		name: val(&res, "display_name").await,
 		title: val(&res, "title").await,
 		description: val(&res, "public_description").await,
-		icon: val(&res, "icon_img").await,
-		members: if members > 1000 { format!("{}k", members / 1000) } else { members.to_string() },
-		active: if active > 1000 { format!("{}k", active / 1000) } else { active.to_string() },
+		icon: format_url(val(&res, "icon_img").await.as_str()).await,
+		members: format_num(members.try_into().unwrap()),
+		active: format_num(active.try_into().unwrap()),
 	};
 
 	Ok(sub)

src/user.rs

@@ -1,7 +1,7 @@
 // CRATES
-use actix_web::{get, web, HttpResponse, Result, http::StatusCode};
+use crate::utils::{fetch_posts, 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)]
@@ -39,8 +39,7 @@ async fn render(username: String, sort: String) -> Result<HttpResponse> {
 }
 
 // SERVICES
-#[get("/u/{username}")]
-async fn page(web::Path(username): web::Path<String>, params: web::Query<Params>) -> Result<HttpResponse> {
+pub async fn page(web::Path(username): web::Path<String>, params: web::Query<Params>) -> Result<HttpResponse> {
 	match &params.sort {
 		Some(sort) => render(username, sort.to_string()).await,
 		None => render(username, "hot".to_string()).await,

src/utils.rs

@@ -2,8 +2,11 @@
 // CRATES
 //
 use chrono::{TimeZone, Utc};
-use surf::{get, client, middleware::Redirect};
-use serde_json::{Value, from_str};
+use serde_json::{from_str, Value};
+// use surf::{client, get, middleware::Redirect};
+
+#[cfg(feature = "proxy")]
+use base64::encode;
 
 //
 // STRUCTS
@@ -21,9 +24,10 @@ pub struct Post {
 	pub author: String,
 	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)]
@@ -32,7 +36,8 @@ pub struct Comment {
 	pub body: String,
 	pub author: String,
 	pub score: String,
-	pub time: String
+	pub time: String,
+	pub replies: Vec<Comment>,
 }
 
 #[allow(dead_code)]
@@ -42,7 +47,7 @@ pub struct User {
 	pub icon: String,
 	pub karma: i64,
 	pub banner: String,
-	pub description: String
+	pub description: String,
 }
 
 #[allow(dead_code)]
@@ -53,7 +58,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 +66,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 +134,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 +147,8 @@ 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() },
+			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(),
@@ -159,20 +187,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 client = client().with(Redirect::new(5));
-	let mut res = client.send(req).await.unwrap();
-	let success = res.status().is_success();
-	let body = res.body_string().await.unwrap();
-
-	dbg!(url.clone());
+	// let req = get(&url).header("User-Agent", "libreddit");
+	// let client = client().with(Redirect::new(5));
+	// let mut res = client.send(req).await.unwrap();
+	// let success = res.status().is_success();
+	// let body = res.body_string().await.unwrap();
 
 	// --- reqwest ---
-	// let res = reqwest::get(&url).await.unwrap();
-	// // Read the status from the response
-	// let success = res.status().is_success();
-	// // Read the body of the response
-	// let body = res.text().await.unwrap();
+	let res = reqwest::get(&url).await.unwrap();
+	// Read the status from the response
+	let success = res.status().is_success();
+	// Read the body of the response
+	let body = res.text().await.unwrap();
 
 	// Parse the response from Reddit as JSON
 	let json: Value = from_str(body.as_str()).unwrap_or(Value::Null);

static/style.css

@@ -1,5 +1,14 @@
 /* General */
 
+:root {
+	--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;
@@ -8,15 +17,15 @@
 	font-weight: normal;
 }
 
-html {
-	background: black;
+body {
+	background: var(--background);
 }
 
 header {
 	display: flex;
 	justify-content: space-between;
 	color: aqua;
-	background: #151515;
+	background: var(--outside);
 	padding: 15px;
 	font-weight: bold;
 	font-size: 20px;
@@ -53,14 +62,15 @@ a:not(.post_right):hover {
 	text-decoration: underline;
 }
 
-span {
-	color: aqua;
-}
-
 #about {
 	background: #151515;
 }
 
+#version {
+	color: white;
+	opacity: 25%;
+}
+
 /* Subreddit */
 
 .subreddit {
@@ -123,7 +133,7 @@ span {
 }
 
 #sort > div, footer > a {
-	background: #151515;
+	background: var(--outside);
 	color: lightgrey;
 	border-radius: 5px;
 	margin-right: 5px;
@@ -138,32 +148,24 @@ span {
 }
 
 #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,22 +176,18 @@ 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_subreddit {
+	font-weight: bold;
 }
 
 .post_title {
-	font-size: 20px;
-}
-
-.post_subreddit {
-	font-weight: bold;
+	font-size: 18px;
 }
 
 .post_score {
@@ -209,14 +207,15 @@ span {
 
 .post_right > p {
 	opacity: 0.75;
+	font-size: 16px;
 }
 
-.post_image {
-	max-width: 500px;
+.post_media {
+	max-width: 90%;
 	align-self: center;
 }
 
-.post_image[src=""] {
+.post_media[src=""] {
 	display: none;
 }
 
@@ -235,22 +234,28 @@ span {
 	color: aqua;
 }
 
+#post_url {
+	color: aqua;
+}
+
 .post_thumbnail {
 	object-fit: cover;
 	width: auto;
 	flex-shrink: 0;
 	padding: 10px;
 	border-radius: 15px;
+	max-width: 20%;
 }
 
 .post_thumbnail[src=""] {
-	border: none;
+	display: none;
 }
 
 small {
 	background: aqua;
 	color: black;
 	padding: 5px;
+	margin-right: 5px;
 	border-radius: 5px;
 	font-size: 12px;
 	font-weight: bold;
@@ -259,13 +264,14 @@ small {
 /* Comment */
 
 .comment {
+	margin-top: 1em;
 	border-radius: 5px;
 	display: flex;
-	border: 2px solid #222;
+	/* border: 2px solid var(--foreground); */
 }
 
 .comment:hover {
-	background: #111;
+	background: var(--post);
 }
 
 .comment_left, .comment_right {
@@ -277,17 +283,21 @@ small {
 	text-align: center;
 	min-width: 50px;
 	padding: 5px;
-	align-items: flex-end;
+	align-items: center;
 }
 
 .comment_title {
 	font-size: 20px;
 }
 
+.comment_author {
+	opacity: 0.9;
+}
+
 .comment_upvote {
 	margin-top: 0.5em;
 	border-radius: 5px 5px 0px 0px;
-	background: #222;
+	background: var(--foreground);
 	width: 40px;
 	padding: 10px 0px 0px 0px;
 }
@@ -298,27 +308,23 @@ small {
 
 .comment_score {
 	color: aqua;
-	background: #222;
-	width: 40px;
-	padding: 5px 0px 10px 0px;
-	border-radius: 0px 0px 5px 5px;
+	background: var(--foreground);
+	min-width: 40px;
+	border-radius: 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;
@@ -343,9 +349,28 @@ small {
 	color: aqua;
 }
 
+::marker {
+	color: aqua;
+}
+
+.reply {
+	margin-top: 0;
+	margin-left: 2em;
+}
+
+.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 {
@@ -355,11 +380,39 @@ small {
 /* Tables */
 
 table {
-	border: 3px #333 solid;
+	border: 3px var(--highlighted) solid;
 	border-spacing: 0rem;
 }
 
 td, th {
-	border: 1px #333 solid;
+	border: 1px var(--highlighted) solid;
 	padding: 0.5em;
 }
+
+/* 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;
+	}
+
+	.datetime {
+		width: 100%;
+	}
+}

templates/base.html

@@ -4,6 +4,7 @@
 		{% block head %}
 		<title>{% block title %}{% endblock %}</title>
 		<meta name="description" content="View on Libreddit, an alternative private front-end to Reddit.">
+		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 		<link rel="stylesheet" href="/style.css">
 		{% block sortstyle %}
@@ -17,14 +18,14 @@
 		{% endblock %}
     </head>
 	<body>
-		{% block body %}
 		{% block header %}
 		<header>
-			<a href="/"><span id="lib">lib</span>reddit.</a>
+			<a href="/"><span id="lib">lib</span>reddit. <span id="version">v{{ env!("CARGO_PKG_VERSION") }}</span></a>
 			<a id="github" href="https://github.com/spikecodes/libreddit">GITHUB</a>
 		</header>
 		{% endblock %}
 		
+		{% block body %}
 		<main>
 			{% block content %}
 			{% endblock %}

templates/popular.html

@@ -13,13 +13,13 @@
 			<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 style="float: right;">{{ post.time }}</span>
-			</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>

templates/post.html

@@ -4,26 +4,48 @@
 	{% call super() %}
 	<meta name="author" content="u/{{ post.author }}">
 {% endblock %}
+
+{% macro comment(item) -%}
+
+<div 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" href="/u/{{ item.author }}">u/{{ item.author }}</a> • <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>
-			</p>
-			<h3 class="post_title">
+				<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>
 				{% endif %}
-			</h3>
-			{{ post.media }}
+			</a>
+			{% if post.post_type == "image" %}
+			<img class="post_media" src="{{ post.media }}"/>
+			{% else if post.post_type == "video" %}
+			<video class="post_media" src="{{ post.media }}" controls autoplay loop>
+			{% else if post.post_type == "link" %}
+			<a id="post_url" href="{{ post.media }}">{{ post.media }}</a>
+			{% endif %}
 			<h4 class="post_body">{{ post.body }}</h4>
 		</div>
 	</div>
@@ -34,19 +56,21 @@
 		<div id="sort_controversial"><a href="?sort=controversial">Controversial</a></div>
 		<div id="sort_old"><a href="?sort=old">Old</a></div>
 	</div>
-	{% for comment in comments %}
-	<div class="comment">
-		<div class="comment_left">
-			<div class="comment_upvote">↑</div>
-			<h3 class="comment_score">{{ comment.score }}</h3>
-		</div>
-		<div class="comment_right">
-			<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>
+
+	{% for c in comments -%}
+		<div class="thread">
+			{% call comment(c) %}
+			<div class="replies">
+				{% for reply in c.replies %}
+					{% call comment(reply) %}
+					<div class="replies">
+						{% for response in reply.replies %}
+							{% call comment(response) %}</details></div>
 						{% endfor %}
+					</div></details></div>
+				{% endfor %}
+			</div></details></div>
+		</div>
+	{%- endfor %}
+
 {% endblock %}

templates/subreddit.html

@@ -1,12 +1,6 @@
 {% extends "base.html" %}
 {% block title %}r/{{ sub.name }}: {{ sub.description }}{% 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="subreddit">
 			<div class="subreddit_left">
@@ -31,13 +25,13 @@
 				<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>
 					&bull;
 					Posted by 
 					<a class="post_author" href="/u/{{ post.author }}">u/{{ post.author }}</a>
-					<span>{{ post.time }}</span>
-				</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>

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">
@@ -31,13 +25,13 @@
 				<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 style="float: right;">{{ post.time }}</span>
-				</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 == "" %}
@@ -52,14 +46,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>
-				</p>
+					<span class="datetime">{{ post.time }}</span>
+				</h4>
 				<h4 class="comment_body">{{ post.body }}</h4>
 			</div>
 		</div><br>