v0.27.1

This will run tests on every push and PR to master.

.devcontainer/devcontainer.json

@@ -0,0 +1,14 @@
+{
+    "name": "Rust",
+    "image": "mcr.microsoft.com/devcontainers/rust:0-1-bullseye",
+    "features": {
+        "ghcr.io/devcontainers/features/docker-in-docker:2": {}
+    },
+    "portsAttributes": {
+        "8080": {
+            "label": "libreddit",
+            "onAutoForward": "notify"
+        }
+    },
+    "postCreateCommand": "cargo build"
+}

.github/workflows/rust-tests.yml

@@ -0,0 +1,22 @@
+name: Tests
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Build
+      run: cargo build --verbose
+    - name: Run tests
+      run: cargo test --verbose

Cargo.lock

@@ -659,7 +659,7 @@ dependencies = [
 
 [[package]]
 name = "libreddit"
-version = "0.27.0"
+version = "0.27.1"
 dependencies = [
  "askama",
  "brotli",
@@ -1304,9 +1304,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.23.0"
+version = "1.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46"
+checksum = "38a54aca0c15d014013256222ba0ebed095673f89345dd79119d912eb561b7a8"
 dependencies = [
  "autocfg",
  "bytes",

Cargo.toml

@@ -3,14 +3,14 @@ name = "libreddit"
 description = " Alternative private front-end to Reddit"
 license = "AGPL-3.0"
 repository = "https://github.com/spikecodes/libreddit"
-version = "0.27.0"
+version = "0.27.1"
 authors = ["spikecodes <19519553+spikecodes@users.noreply.github.com>"]
 edition = "2021"
 
 [dependencies]
 askama = { version = "0.11.1", default-features = false }
 cached = "0.40.0"
-clap = { version = "4.0.24", default-features = false, features = ["std"] }
+clap = { version = "4.0.24", default-features = false, features = ["std", "env"] }
 regex = "1.7.0"
 serde = { version = "1.0.147", features = ["derive"] }
 cookie = "0.16.1"
@@ -20,7 +20,7 @@ hyper-rustls = "0.23.0"
 percent-encoding = "2.2.0"
 route-recognizer = "0.3.1"
 serde_json = "1.0.87"
-tokio = { version = "1.21.2", features = ["full"] }
+tokio = { version = "1.23.1", features = ["full"] }
 time = "0.3.17"
 url = "2.3.1"
 rust-embed = { version = "6.4.2", features = ["include-exclude"] }

src/config.rs

@@ -100,7 +100,7 @@ pub(crate) fn get_setting(name: &str) -> Option<String> {
 use {sealed_test::prelude::*, std::fs::write};
 
 #[test]
-#[sealed_test(env = [("LIBREDDIT_SFW_ONLY", "1")])]
+#[sealed_test(env = [("LIBREDDIT_SFW_ONLY", "on")])]
 fn test_env_var() {
 	assert!(crate::utils::sfw_only())
 }

src/main.rs

@@ -13,7 +13,7 @@ mod user;
 mod utils;
 
 // Import Crates
-use clap::{Arg, Command};
+use clap::{Arg, ArgAction, Command};
 
 use futures_lite::FutureExt;
 use hyper::{header::HeaderValue, Body, Request, Response};
@@ -130,8 +130,10 @@ async fn main() {
 				.short('p')
 				.long("port")
 				.value_name("PORT")
+				.env("PORT")
 				.help("Port to listen on")
 				.default_value("8080")
+				.action(ArgAction::Set)
 				.num_args(1),
 		)
 		.arg(
@@ -145,11 +147,11 @@ async fn main() {
 		)
 		.get_matches();
 
-	let address = matches.get_one("address").map(|m: &String| m.as_str()).unwrap_or("0.0.0.0");
-	let port = std::env::var("PORT").unwrap_or_else(|_| matches.get_one("port").map(|m: &String| m.as_str()).unwrap_or("8080").to_string());
+	let address = matches.get_one::<String>("address").unwrap();
+	let port = matches.get_one::<String>("port").unwrap();
 	let hsts = matches.get_one("hsts").map(|m: &String| m.as_str());
 
-	let listener = [address, ":", &port].concat();
+	let listener = [address, ":", port].concat();
 
 	println!("Starting Libreddit...");
 

static/style.css

@@ -26,6 +26,9 @@
 	--highlighted: #333;
 	--visited: #aaa;
 	--shadow: 0 1px 3px rgba(0, 0, 0, 0.5);
+
+	/* Hint color theme to browser for scrollbar */
+	color-scheme: dark;
 }
 
 /* Browser-defined light theme */
@@ -42,6 +45,9 @@
 		--highlighted: white;
 		--visited: #555;
 		--shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+
+		/* Hint color theme to browser for scrollbar */
+		color-scheme: light;
 	}
 }
 

static/themes/gruvboxlight.css

@@ -11,3 +11,8 @@
 	--highlighted: #fbf1c7;
 	--shadow: 0 1px 3px rgba(0, 0, 0, 0.25);
 }
+
+html:has(> .gruvboxlight) {
+	/* Hint color theme to browser for scrollbar */
+	color-scheme: light;
+}

static/themes/light.css

@@ -11,4 +11,9 @@
 	--highlighted: white;
 	--visited: #555;
 	--shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+}
+
+html:has(> .light) {
+  /* Hint color theme to browser for scrollbar */
+  color-scheme: light;
 }

templates/search.html

@@ -10,7 +10,7 @@
 {% block content %}
 	<div id="column_one">
 		<form id="search_sort">
-			<input id="search" type="text" name="q" placeholder="Search" value="{{ params.q }}" title="Search libreddit">
+			<input id="search" type="text" name="q" placeholder="Search" value="{{ params.q|safe }}" title="Search libreddit">
 			{% if sub != "" %}
 			<div id="inside">
 				<input type="checkbox" name="restrict_sr" id="restrict_sr" {% if params.restrict_sr != "" %}checked{% endif %}>