Compare commits

...

42 Commits

Author SHA1 Message Date
3516404a5f Update v0.2.2 2020-12-22 09:15:55 -08:00
d96daa335f Add Repl.it as Hosting Method 2020-12-22 09:11:03 -08:00
285d9da26d Further Document Libreddit Privacy 2020-12-22 08:45:21 -08:00
9ab7a72bce Fix Comparison Heading Position 2020-12-21 21:53:54 -08:00
46dd905509 Fix Grammar Mistakes 2020-12-21 21:52:50 -08:00
63d595c67d Revise README 2020-12-21 21:51:18 -08:00
dc0b5f42e6 Update README with Reddit Comparison 2020-12-21 21:40:06 -08:00
9ecbd25488 Reorganize CSS 2020-12-21 21:39:55 -08:00
83816fbcc6 Allow Indexing 2020-12-21 21:39:10 -08:00
11cfbdc3ed More Replies Button 2020-12-21 17:17:40 -08:00
4b7cbb3de2 Fix User Icons 2020-12-21 14:12:53 -08:00
b1a572072c Highlight Post Authors in Comments 2020-12-21 08:38:24 -08:00
b1071e9579 Switch Sorting System to Dropdown 2020-12-20 21:49:31 -08:00
da971f8680 Optimized Nested Comments for Mobile, Added IDs 2020-12-20 20:52:15 -08:00
b596f86cc2 Update Screenshot 2020-12-20 19:05:44 -08:00
3bcf0832a1 Correct README Regarding Multireddits 2020-12-20 17:45:52 -08:00
565f4f23b3 Multireddit Support & Referrer Policy 2020-12-20 17:45:26 -08:00
ef3820a2e1 User Flairs 2020-12-20 11:29:23 -08:00
1678245750 Add Sorting to Short Links 2020-12-20 09:10:37 -08:00
3594b6d41f Fix CSS and CSP 2020-12-19 22:25:00 -08:00
a754d42b9e Enforce Content Security Policy 2020-12-19 21:49:10 -08:00
c7e0234d33 Fix comment hover color 2020-12-19 21:44:30 -08:00
11a9ff53e4 Update README 2020-12-19 21:44:07 -08:00
7b8f694c8c Basic Nested & Collapsible Comments 2020-12-19 19:54:46 -08:00
19dc7de3c5 Update README.md 2020-12-18 16:24:09 -08:00
cd29cfbf29 Update Readme
Specify lack of Windows/MacOS binaries, update AUR installation method, correct Docker comparison
2020-12-16 13:01:11 -08:00
d0ec1fcc43 Update v0.1.11 2020-12-14 16:35:38 -08:00
75bc170eba Rewrite URL Dispatch 2020-12-14 16:35:04 -08:00
148d87fb45 Add Elsewhere Links 2020-12-12 08:57:23 -08:00
5219c919af Refactor Last Commit 2020-12-11 20:36:25 -08:00
5bda103356 Fix Post URL Colors 2020-12-11 20:36:06 -08:00
81274e35d7 Fix Post Body Links 2020-12-08 11:31:01 -08:00
e1962c7b66 Fix Header 2020-12-08 09:58:36 -08:00
528fe15819 Add million support 2020-12-07 11:36:05 -08:00
8509f6e22d Merge branch 'master' of https://github.com/spikecodes/libreddit 2020-12-07 11:20:33 -08:00
77886579f4 Link Post Titles 2020-12-07 11:20:24 -08:00
4f5ba35ddb Merge pull request from Scoder12/feature/improve-actions
Use rust-cache action and prettify workflow yml
2020-12-07 11:07:22 -08:00
c738300bc4 Use rust-cache action and prettify
Run `prettier` on the workflow file
2020-12-07 11:05:00 -08:00
293a4d5c50 Merge pull request from Scoder12/master
Add number format utility
2020-12-07 11:00:38 -08:00
312d162c09 Fix mistakes 2020-12-07 10:53:22 -08:00
9f19d729d1 Add number format utility 2020-12-07 10:32:46 -08:00
6794f7d6ba Show and Log Version 2020-12-05 21:29:25 -08:00
18 changed files with 589 additions and 363 deletions

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

172
Cargo.lock generated

@ -92,8 +92,8 @@ version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4ca8ce00b267af8ccebbd647de0d61e0674b6e61185cc7a592ff88772bed655" checksum = "b4ca8ce00b267af8ccebbd647de0d61e0674b6e61185cc7a592ff88772bed655"
dependencies = [ dependencies = [
"quote 1.0.7", "quote 1.0.8",
"syn 1.0.53", "syn 1.0.55",
] ]
[[package]] [[package]]
@ -266,8 +266,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ad26f77093333e0e7c6ffe54ebe3582d908a104e448723eec6d43d08b07143fb" checksum = "ad26f77093333e0e7c6ffe54ebe3582d908a104e448723eec6d43d08b07143fb"
dependencies = [ dependencies = [
"proc-macro2 1.0.24", "proc-macro2 1.0.24",
"quote 1.0.7", "quote 1.0.8",
"syn 1.0.53", "syn 1.0.55",
] ]
[[package]] [[package]]
@ -338,6 +338,17 @@ dependencies = [
"toml", "toml",
] ]
[[package]]
name = "async-recursion"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5444eec77a9ec2bfe4524139e09195862e981400c4358d3b760cae634e4c4ee"
dependencies = [
"proc-macro2 1.0.24",
"quote 1.0.8",
"syn 1.0.55",
]
[[package]] [[package]]
name = "async-trait" name = "async-trait"
version = "0.1.42" version = "0.1.42"
@ -345,8 +356,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d3a45e77e34375a7923b1e8febb049bb011f064714a8e17a1a616fef01da13d" checksum = "8d3a45e77e34375a7923b1e8febb049bb011f064714a8e17a1a616fef01da13d"
dependencies = [ dependencies = [
"proc-macro2 1.0.24", "proc-macro2 1.0.24",
"quote 1.0.7", "quote 1.0.8",
"syn 1.0.53", "syn 1.0.55",
] ]
[[package]] [[package]]
@ -505,21 +516,11 @@ dependencies = [
"winapi 0.3.9", "winapi 0.3.9",
] ]
[[package]]
name = "console_error_panic_hook"
version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211"
dependencies = [
"cfg-if 0.1.10",
"wasm-bindgen",
]
[[package]] [[package]]
name = "const_fn" name = "const_fn"
version = "0.4.3" version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c478836e029dcef17fb47c89023448c64f781a046e0300e257ad8225ae59afab" checksum = "cd51eab21ab4fd6a3bf889e2d0958c0a6e3a61ad04260325e919e652a2a62826"
[[package]] [[package]]
name = "cookie" name = "cookie"
@ -560,8 +561,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41cb0e6161ad61ed084a36ba71fbba9e3ac5aee3606fb607fe08da6acbcf3d8c" checksum = "41cb0e6161ad61ed084a36ba71fbba9e3ac5aee3606fb607fe08da6acbcf3d8c"
dependencies = [ dependencies = [
"proc-macro2 1.0.24", "proc-macro2 1.0.24",
"quote 1.0.7", "quote 1.0.8",
"syn 1.0.53", "syn 1.0.55",
] ]
[[package]] [[package]]
@ -602,8 +603,8 @@ checksum = "7c5f0096a91d210159eceb2ff5e1c4da18388a170e1e3ce948aac9c8fdbbf595"
dependencies = [ dependencies = [
"heck", "heck",
"proc-macro2 1.0.24", "proc-macro2 1.0.24",
"quote 1.0.7", "quote 1.0.8",
"syn 1.0.53", "syn 1.0.55",
] ]
[[package]] [[package]]
@ -694,8 +695,8 @@ checksum = "77408a692f1f97bcc61dc001d752e00643408fbc922e4d634c655df50d595556"
dependencies = [ dependencies = [
"proc-macro-hack", "proc-macro-hack",
"proc-macro2 1.0.24", "proc-macro2 1.0.24",
"quote 1.0.7", "quote 1.0.8",
"syn 1.0.53", "syn 1.0.55",
] ]
[[package]] [[package]]
@ -806,9 +807,9 @@ checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
[[package]] [[package]]
name = "heck" name = "heck"
version = "0.3.1" version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac"
dependencies = [ dependencies = [
"unicode-segmentation", "unicode-segmentation",
] ]
@ -835,9 +836,9 @@ dependencies = [
[[package]] [[package]]
name = "http" name = "http"
version = "0.2.1" version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9" checksum = "84129d298a6d57d246960ff8eb831ca4af3f96d29e2e28848dae275408658e26"
dependencies = [ dependencies = [
"bytes", "bytes",
"fnv", "fnv",
@ -925,9 +926,9 @@ dependencies = [
[[package]] [[package]]
name = "indexmap" name = "indexmap"
version = "1.6.0" version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55e2e4c765aa53a0424761bf9f41aa7a6ac1efa87238f59560640e27fca028f2" checksum = "4fb1fa934250de4de8aef298d81c729a7d33d8c239daa3a7575e6b92bfc7313b"
dependencies = [ dependencies = [
"autocfg", "autocfg",
"hashbrown", "hashbrown",
@ -1008,16 +1009,17 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]] [[package]]
name = "libc" name = "libc"
version = "0.2.80" version = "0.2.81"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614" checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb"
[[package]] [[package]]
name = "libreddit" name = "libreddit"
version = "0.1.10" version = "0.2.2"
dependencies = [ dependencies = [
"actix-web", "actix-web",
"askama", "askama",
"async-recursion",
"base64 0.13.0", "base64 0.13.0",
"chrono", "chrono",
"pulldown-cmark", "pulldown-cmark",
@ -1147,9 +1149,9 @@ dependencies = [
[[package]] [[package]]
name = "net2" name = "net2"
version = "0.2.36" version = "0.2.37"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d7cf75f38f16cb05ea017784dc6dbfd354f76c223dba37701734c4f5a9337d02" checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae"
dependencies = [ dependencies = [
"cfg-if 0.1.10", "cfg-if 0.1.10",
"libc", "libc",
@ -1226,9 +1228,9 @@ dependencies = [
[[package]] [[package]]
name = "parking_lot_core" name = "parking_lot_core"
version = "0.8.1" version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d7c6d9b8427445284a09c55be860a15855ab580a417ccad9da88f5a06787ced0" checksum = "9ccb628cad4f84851442432c60ad8e1f607e29752d0bf072cbd0baf28aa34272"
dependencies = [ dependencies = [
"cfg-if 1.0.0", "cfg-if 1.0.0",
"instant", "instant",
@ -1269,8 +1271,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895" checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895"
dependencies = [ dependencies = [
"proc-macro2 1.0.24", "proc-macro2 1.0.24",
"quote 1.0.7", "quote 1.0.8",
"syn 1.0.53", "syn 1.0.55",
] ]
[[package]] [[package]]
@ -1280,8 +1282,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8e8d2bf0b23038a4424865103a4df472855692821aab4e4f5c3312d461d9e5f" checksum = "f8e8d2bf0b23038a4424865103a4df472855692821aab4e4f5c3312d461d9e5f"
dependencies = [ dependencies = [
"proc-macro2 1.0.24", "proc-macro2 1.0.24",
"quote 1.0.7", "quote 1.0.8",
"syn 1.0.53", "syn 1.0.55",
] ]
[[package]] [[package]]
@ -1367,9 +1369,9 @@ dependencies = [
[[package]] [[package]]
name = "quote" name = "quote"
version = "1.0.7" version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df"
dependencies = [ dependencies = [
"proc-macro2 1.0.24", "proc-macro2 1.0.24",
] ]
@ -1441,9 +1443,9 @@ checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189"
[[package]] [[package]]
name = "reqwest" name = "reqwest"
version = "0.10.9" version = "0.10.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb15d6255c792356a0f578d8a645c677904dc02e862bebe2ecc18e0c01b9a0ce" checksum = "0718f81a8e14c4dbb3b34cf23dc6aaf9ab8a0dfec160c534b3dbca1aaa21f47c"
dependencies = [ dependencies = [
"base64 0.13.0", "base64 0.13.0",
"bytes", "bytes",
@ -1470,7 +1472,6 @@ dependencies = [
"url", "url",
"wasm-bindgen", "wasm-bindgen",
"wasm-bindgen-futures", "wasm-bindgen-futures",
"wasm-bindgen-test",
"web-sys", "web-sys",
"webpki-roots", "webpki-roots",
"winreg 0.7.0", "winreg 0.7.0",
@ -1535,12 +1536,6 @@ version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
[[package]]
name = "scoped-tls"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
[[package]] [[package]]
name = "scopeguard" name = "scopeguard"
version = "1.1.0" version = "1.1.0"
@ -1588,8 +1583,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df" checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df"
dependencies = [ dependencies = [
"proc-macro2 1.0.24", "proc-macro2 1.0.24",
"quote 1.0.7", "quote 1.0.8",
"syn 1.0.53", "syn 1.0.55",
] ]
[[package]] [[package]]
@ -1636,9 +1631,9 @@ checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
[[package]] [[package]]
name = "signal-hook-registry" name = "signal-hook-registry"
version = "1.2.2" version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce32ea0c6c56d5eacaeb814fbed9960547021d3edd010ded1425f180536b20ab" checksum = "16f1d0fef1604ba8f7a073c7e701f213e056707210e9020af4528e0101ce11a6"
dependencies = [ dependencies = [
"libc", "libc",
] ]
@ -1657,13 +1652,12 @@ checksum = "ae524f056d7d770e174287294f562e95044c68e88dec909a00d2094805db9d75"
[[package]] [[package]]
name = "socket2" name = "socket2"
version = "0.3.17" version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c29947abdee2a218277abeca306f25789c938e500ea5a9d4b12a5a504466902" checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
dependencies = [ dependencies = [
"cfg-if 1.0.0", "cfg-if 1.0.0",
"libc", "libc",
"redox_syscall",
"winapi 0.3.9", "winapi 0.3.9",
] ]
@ -1703,10 +1697,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
dependencies = [ dependencies = [
"proc-macro2 1.0.24", "proc-macro2 1.0.24",
"quote 1.0.7", "quote 1.0.8",
"serde", "serde",
"serde_derive", "serde_derive",
"syn 1.0.53", "syn 1.0.55",
] ]
[[package]] [[package]]
@ -1717,12 +1711,12 @@ checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11"
dependencies = [ dependencies = [
"base-x", "base-x",
"proc-macro2 1.0.24", "proc-macro2 1.0.24",
"quote 1.0.7", "quote 1.0.8",
"serde", "serde",
"serde_derive", "serde_derive",
"serde_json", "serde_json",
"sha1", "sha1",
"syn 1.0.53", "syn 1.0.55",
] ]
[[package]] [[package]]
@ -1744,12 +1738,12 @@ dependencies = [
[[package]] [[package]]
name = "syn" name = "syn"
version = "1.0.53" version = "1.0.55"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8833e20724c24de12bbaba5ad230ea61c3eafb05b881c7c9d3cfe8638b187e68" checksum = "a571a711dddd09019ccc628e1b17fe87c59b09d513c06c026877aa708334f37a"
dependencies = [ dependencies = [
"proc-macro2 1.0.24", "proc-macro2 1.0.24",
"quote 1.0.7", "quote 1.0.8",
"unicode-xid 0.2.1", "unicode-xid 0.2.1",
] ]
@ -1769,8 +1763,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ba20f23e85b10754cd195504aebf6a27e2e6cbe28c17778a0c930724628dd56" checksum = "9ba20f23e85b10754cd195504aebf6a27e2e6cbe28c17778a0c930724628dd56"
dependencies = [ dependencies = [
"proc-macro2 1.0.24", "proc-macro2 1.0.24",
"quote 1.0.7", "quote 1.0.8",
"syn 1.0.53", "syn 1.0.55",
] ]
[[package]] [[package]]
@ -1835,9 +1829,9 @@ checksum = "e5c3be1edfad6027c69f5491cf4cb310d1a71ecd6af742788c6ff8bced86b8fa"
dependencies = [ dependencies = [
"proc-macro-hack", "proc-macro-hack",
"proc-macro2 1.0.24", "proc-macro2 1.0.24",
"quote 1.0.7", "quote 1.0.8",
"standback", "standback",
"syn 1.0.53", "syn 1.0.55",
] ]
[[package]] [[package]]
@ -1857,9 +1851,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]] [[package]]
name = "tokio" name = "tokio"
version = "0.2.23" version = "0.2.24"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a6d7ad61edd59bfcc7e80dababf0f4aed2e6d5e0ba1659356ae889752dfc12ff" checksum = "099837d3464c16a808060bb3f02263b412f6fafcb5d01c533d309985fbeebe48"
dependencies = [ dependencies = [
"bytes", "bytes",
"fnv", "fnv",
@ -2125,8 +2119,8 @@ dependencies = [
"lazy_static", "lazy_static",
"log", "log",
"proc-macro2 1.0.24", "proc-macro2 1.0.24",
"quote 1.0.7", "quote 1.0.8",
"syn 1.0.53", "syn 1.0.55",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
@ -2148,7 +2142,7 @@ version = "0.2.69"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a6ac8995ead1f084a8dea1e65f194d0973800c7f571f6edd70adf06ecf77084" checksum = "7a6ac8995ead1f084a8dea1e65f194d0973800c7f571f6edd70adf06ecf77084"
dependencies = [ dependencies = [
"quote 1.0.7", "quote 1.0.8",
"wasm-bindgen-macro-support", "wasm-bindgen-macro-support",
] ]
@ -2159,8 +2153,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b5a48c72f299d80557c7c62e37e7225369ecc0c963964059509fbafe917c7549" checksum = "b5a48c72f299d80557c7c62e37e7225369ecc0c963964059509fbafe917c7549"
dependencies = [ dependencies = [
"proc-macro2 1.0.24", "proc-macro2 1.0.24",
"quote 1.0.7", "quote 1.0.8",
"syn 1.0.53", "syn 1.0.55",
"wasm-bindgen-backend", "wasm-bindgen-backend",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
@ -2171,30 +2165,6 @@ version = "0.2.69"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158" checksum = "7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158"
[[package]]
name = "wasm-bindgen-test"
version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0355fa0c1f9b792a09b6dcb6a8be24d51e71e6d74972f9eb4a44c4c004d24a25"
dependencies = [
"console_error_panic_hook",
"js-sys",
"scoped-tls",
"wasm-bindgen",
"wasm-bindgen-futures",
"wasm-bindgen-test-macro",
]
[[package]]
name = "wasm-bindgen-test-macro"
version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "27e07b46b98024c2ba2f9e83a10c2ef0515f057f2da299c1762a2017de80438b"
dependencies = [
"proc-macro2 1.0.24",
"quote 1.0.7",
]
[[package]] [[package]]
name = "web-sys" name = "web-sys"
version = "0.3.46" version = "0.3.46"

@ -3,7 +3,7 @@ name = "libreddit"
description = " Alternative private front-end to Reddit" description = " Alternative private front-end to Reddit"
license = "AGPL-3.0" license = "AGPL-3.0"
repository = "https://github.com/spikecodes/libreddit" repository = "https://github.com/spikecodes/libreddit"
version = "0.1.10" version = "0.2.2"
authors = ["spikecodes <19519553+spikecodes@users.noreply.github.com>"] authors = ["spikecodes <19519553+spikecodes@users.noreply.github.com>"]
edition = "2018" edition = "2018"
@ -20,3 +20,4 @@ serde = "1.0.117"
serde_json = "1.0" serde_json = "1.0"
pulldown-cmark = "0.8.0" pulldown-cmark = "0.8.0"
chrono = "0.4.19" chrono = "0.4.19"
async-recursion = "0.3.1"

133
README.md

@ -2,48 +2,132 @@
> An alternative private front-end to Reddit > 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 - 🚀 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 - 🕵 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! - 📱 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 ## Screenshot
![](https://i.ibb.co/Tgjb3w7/image.png) ![](https://i.ibb.co/1RyKrBz/libreddit-rust.png)
## Instances
Feel free to [open an issue](https://github.com/spikecodes/libreddit/issues/new) to have your [selfhosted instance](#deployment) listed here!
- [libredd.it](https://libredd.it) 🇺🇸 (Thank you to [YeapGuy](https://github.com/YeapGuy)!)
- [libreddit.spike.codes](https://libreddit.spike.codes) 🇺🇸
## About ## About
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. ### 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. Libreddit currently implements most of Reddit's functionalities but still lacks a few features that are being worked on below.
### In Progress ### In Progress
- Nested comments
- User flairs
- Searching - Searching
### How does it compare to Teddit? ### How does it compare to Teddit?
Teddit is another awesome open source project designed to provide an alternative frontend to Reddit. There is no connection (AFAIK) 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. 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: 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 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). - 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. - Unlike Teddit (at the time of writing this), Libreddit does not require a Reddit API key to host.
- Currently, Teddit does not support hosting on Docker whereas Libreddit does.
- Libreddit lacks certain functionality that Teddit offers, primarily: nested comments, configuration & multireddits. If these are features that you need, Teddit may suit your needs better.
## Instances ## Comparison
Feel free to [open an issue](https://github.com/spikecodes/libreddit/issues/new) to have your selfhosted instance listed here! This section outlines how Libreddit compares to Reddit.
- [libredd.it](https://libredd.it) 🇺🇸 (Thank you to [YeapGuy](https://github.com/YeapGuy)!) ### Speed
- [libreddit.spike.codes](https://libreddit.spike.codes) 🇺🇸
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 ## Installation
@ -69,7 +153,7 @@ docker run -d --name libreddit -p 80:8080 spikecodes/libreddit
### C) AUR ### 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: Install:
``` ```
@ -79,8 +163,19 @@ yay -S libreddit-git
### D) GitHub Releases ### 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). 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: Once installed, deploy Libreddit (unless you're using Docker) by running:
@ -98,7 +193,7 @@ To disable the media proxy built into Libreddit, run:
libreddit --no-default-features libreddit --no-default-features
``` ```
## Building from Source ## Building
``` ```
git clone https://github.com/spikecodes/libreddit git clone https://github.com/spikecodes/libreddit

@ -1,5 +1,5 @@
// Import Crates // Import Crates
use actix_web::{get, App, HttpResponse, HttpServer}; use actix_web::{get, middleware::NormalizePath, web, App, HttpResponse, HttpServer};
// Reference local files // Reference local files
mod popular; mod popular;
@ -10,12 +10,10 @@ mod user;
mod utils; mod utils;
// Create Services // Create Services
#[get("/style.css")]
async fn style() -> HttpResponse { async fn style() -> HttpResponse {
HttpResponse::Ok().content_type("text/css").body(include_str!("../static/style.css")) HttpResponse::Ok().content_type("text/css").body(include_str!("../static/style.css"))
} }
#[get("/robots.txt")]
async fn robots() -> HttpResponse { async fn robots() -> HttpResponse {
HttpResponse::Ok().body(include_str!("../static/robots.txt")) HttpResponse::Ok().body(include_str!("../static/robots.txt"))
} }
@ -40,25 +38,29 @@ async fn main() -> std::io::Result<()> {
} }
// start http server // start http server
println!("Running Libreddit on {}!", address.clone()); println!("Running Libreddit v{} on {}!", env!("CARGO_PKG_VERSION"), address.clone());
HttpServer::new(|| { HttpServer::new(|| {
App::new() App::new()
// TRAILING SLASH MIDDLEWARE
.wrap(NormalizePath::default())
// GENERAL SERVICES // 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 // 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 // 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()) .bind(address.clone())
.expect(format!("Cannot bind to the address: {}", address).as_str()) .expect(format!("Cannot bind to the address: {}", address).as_str())

@ -1,6 +1,6 @@
// CRATES // CRATES
use crate::utils::{fetch_posts, ErrorTemplate, Params, Post}; use crate::utils::{fetch_posts, ErrorTemplate, Params, Post};
use actix_web::{get, http::StatusCode, web, HttpResponse, Result}; use actix_web::{http::StatusCode, web, HttpResponse, Result};
use askama::Template; use askama::Template;
// STRUCTS // STRUCTS
@ -19,10 +19,10 @@ async fn render(sub_name: String, sort: Option<String>, ends: (Option<String>, O
// Build the Reddit JSON API url // Build the Reddit JSON API url
let url = match ends.0 { 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 { 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 // SERVICES
#[get("/")]
pub async fn page(params: web::Query<Params>) -> Result<HttpResponse> { pub async fn page(params: web::Query<Params>) -> Result<HttpResponse> {
render("popular".to_string(), params.sort.clone(), (params.before.clone(), params.after.clone())).await render("popular".to_string(), params.sort.clone(), (params.before.clone(), params.after.clone())).await
} }

@ -1,6 +1,9 @@
// CRATES // CRATES
use crate::utils::{format_url, request, val, Comment, ErrorTemplate, Flair, Params, Post}; use crate::utils::{format_num, format_url, request, val, Comment, ErrorTemplate, Flair, Params, Post};
use actix_web::{get, http::StatusCode, web, HttpResponse, Result}; use actix_web::{http::StatusCode, web, HttpResponse, Result};
use async_recursion::async_recursion;
use askama::Template; use askama::Template;
use chrono::{TimeZone, Utc}; use chrono::{TimeZone, Utc};
use pulldown_cmark::{html, Options, Parser}; use pulldown_cmark::{html, Options, Parser};
@ -14,12 +17,19 @@ struct PostTemplate {
sort: String, 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
#[cfg(debug_assertions)]
dbg!(&id); dbg!(&id);
// Handling sort paramater
let sorting: String = sort.unwrap_or("confidence".to_string());
// Build the Reddit JSON API url // 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 // Send a request to the url, receive JSON in response
let req = request(url).await; let req = request(url).await;
@ -45,7 +55,7 @@ async fn render(id: String, sort: String) -> Result<HttpResponse> {
let s = PostTemplate { let s = PostTemplate {
comments: comments.unwrap(), comments: comments.unwrap(),
post: post.unwrap(), post: post.unwrap(),
sort: sort, sort: sorting,
} }
.render() .render()
.unwrap(); .unwrap();
@ -53,17 +63,16 @@ async fn render(id: String, sort: String) -> Result<HttpResponse> {
} }
// SERVICES // 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 // UTILITIES
@ -114,8 +123,13 @@ async fn parse_post(json: serde_json::Value) -> Result<Post, &'static str> {
community: val(post_data, "subreddit").await, community: val(post_data, "subreddit").await,
body: markdown_to_html(post_data["data"]["selftext"].as_str().unwrap()).await, body: markdown_to_html(post_data["data"]["selftext"].as_str().unwrap()).await,
author: val(post_data, "author").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, url: val(post_data, "permalink").await,
score: if score > 1000 { format!("{}k", score / 1000) } else { score.to_string() }, score: format_num(score),
post_type: media.0, post_type: media.0,
media: media.1, media: media.1,
time: Utc.timestamp(unix_time, 0).format("%b %e %Y %H:%M UTC").to_string(), time: Utc.timestamp(unix_time, 0).format("%b %e %Y %H:%M UTC").to_string(),
@ -134,25 +148,41 @@ async fn parse_post(json: serde_json::Value) -> Result<Post, &'static str> {
} }
// COMMENTS // COMMENTS
#[async_recursion]
async fn parse_comments(json: serde_json::Value) -> Result<Vec<Comment>, &'static str> { async fn parse_comments(json: serde_json::Value) -> Result<Vec<Comment>, &'static str> {
// Separate the comment JSON into a Vector of comments
let comment_data = json["data"]["children"].as_array().unwrap(); let comment_data = json["data"]["children"].as_array().unwrap();
let mut comments: Vec<Comment> = Vec::new(); let mut comments: Vec<Comment> = Vec::new();
// For each comment, retrieve the values to build a Comment object
for comment in comment_data.iter() { for comment in comment_data.iter() {
let unix_time: i64 = comment["data"]["created_utc"].as_f64().unwrap_or(0.0).round() as i64; 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 score = comment["data"]["score"].as_i64().unwrap_or(0);
let body = markdown_to_html(comment["data"]["body"].as_str().unwrap_or("")).await; let body = markdown_to_html(comment["data"]["body"].as_str().unwrap_or("")).await;
// if comment["data"]["replies"].is_object() { let replies: Vec<Comment> = if comment["data"]["replies"].is_object() {
// let replies = parse_comments(comment["data"]["replies"].clone()).await.unwrap(); parse_comments(comment["data"]["replies"].clone()).await.unwrap_or(Vec::new())
// } } else {
Vec::new()
};
comments.push(Comment { comments.push(Comment {
id: val(comment, "id").await,
body: body, body: body,
author: val(comment, "author").await, 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(), 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,
),
}); });
} }

@ -1,10 +1,9 @@
use actix_web::{client::Client, get, web, Error, HttpResponse, Result}; use actix_web::{client::Client, web, Error, HttpResponse, Result};
#[cfg(feature = "proxy")] #[cfg(feature = "proxy")]
use base64::decode; use base64::decode;
#[get("/imageproxy/{url:.*}")] pub async fn handler(web::Path(url): web::Path<String>) -> Result<HttpResponse> {
async fn handler(web::Path(url): web::Path<String>) -> Result<HttpResponse> {
if cfg!(feature = "proxy") { if cfg!(feature = "proxy") {
let media: String; let media: String;

@ -1,7 +1,8 @@
// CRATES // CRATES
use crate::utils::{fetch_posts, format_url, request, val, ErrorTemplate, Params, Post, Subreddit}; use crate::utils::{fetch_posts, format_num, format_url, request, val, ErrorTemplate, Params, Post, Subreddit};
use actix_web::{get, http::StatusCode, web, HttpResponse, Result}; use actix_web::{http::StatusCode, web, HttpResponse, Result};
use askama::Template; use askama::Template;
use std::convert::TryInto;
// STRUCTS // STRUCTS
#[derive(Template)] #[derive(Template)]
@ -15,8 +16,7 @@ struct SubredditTemplate {
// SERVICES // SERVICES
#[allow(dead_code)] #[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 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 // Build the Reddit JSON API url
let url = match ends.0 { 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 { 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; let items_result = fetch_posts(url, String::new()).await;
if sub_result.is_err() || items_result.is_err() { if sub_result.is_err() || items_result.is_err() {
@ -68,7 +79,7 @@ pub async fn render(sub_name: String, sort: Option<String>, ends: (Option<String
// SUBREDDIT // SUBREDDIT
async fn subreddit(sub: &String) -> Result<Subreddit, &'static str> { async fn subreddit(sub: &String) -> Result<Subreddit, &'static str> {
// Build the Reddit JSON API url // 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 // Send a request to the url, receive JSON in response
let req = request(url).await; let req = request(url).await;
@ -89,8 +100,8 @@ async fn subreddit(sub: &String) -> Result<Subreddit, &'static str> {
title: val(&res, "title").await, title: val(&res, "title").await,
description: val(&res, "public_description").await, description: val(&res, "public_description").await,
icon: format_url(val(&res, "icon_img").await.as_str()).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) Ok(sub)

@ -1,6 +1,6 @@
// CRATES // CRATES
use crate::utils::{fetch_posts, nested_val, request, ErrorTemplate, Params, Post, User}; use crate::utils::{fetch_posts, format_url, nested_val, request, ErrorTemplate, Params, Post, User};
use actix_web::{get, http::StatusCode, web, HttpResponse, Result}; use actix_web::{http::StatusCode, web, HttpResponse, Result};
use askama::Template; use askama::Template;
// STRUCTS // STRUCTS
@ -14,7 +14,7 @@ struct UserTemplate {
async fn render(username: String, sort: String) -> Result<HttpResponse> { async fn render(username: String, sort: String) -> Result<HttpResponse> {
// Build the Reddit JSON API url // 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 user = user(&username).await;
let posts = fetch_posts(url, "Comment".to_string()).await; let posts = fetch_posts(url, "Comment".to_string()).await;
@ -39,8 +39,7 @@ async fn render(username: String, sort: String) -> Result<HttpResponse> {
} }
// SERVICES // 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 { match &params.sort {
Some(sort) => render(username, sort.to_string()).await, Some(sort) => render(username, sort.to_string()).await,
None => render(username, "hot".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 // USER
async fn user(name: &String) -> Result<User, &'static str> { async fn user(name: &String) -> Result<User, &'static str> {
// Build the Reddit JSON API url // 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 // Send a request to the url, receive JSON in response
let req = request(url).await; let req = request(url).await;
@ -66,7 +65,7 @@ async fn user(name: &String) -> Result<User, &'static str> {
// Parse the JSON output into a User struct // Parse the JSON output into a User struct
Ok(User { Ok(User {
name: name.to_string(), 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(), karma: res["data"]["total_karma"].as_i64().unwrap(),
banner: nested_val(&res, "subreddit", "banner_img").await, banner: nested_val(&res, "subreddit", "banner_img").await,
description: nested_val(&res, "subreddit", "public_description").await, description: nested_val(&res, "subreddit", "public_description").await,

@ -22,6 +22,7 @@ pub struct Post {
pub community: String, pub community: String,
pub body: String, pub body: String,
pub author: String, pub author: String,
pub author_flair: Flair,
pub url: String, pub url: String,
pub score: String, pub score: String,
pub post_type: String, pub post_type: String,
@ -33,10 +34,13 @@ pub struct Post {
#[allow(dead_code)] #[allow(dead_code)]
// Comment with content, post, score and data/time that it was posted // Comment with content, post, score and data/time that it was posted
pub struct Comment { pub struct Comment {
pub id: String,
pub body: String, pub body: String,
pub author: String, pub author: String,
pub flair: Flair,
pub score: String, pub score: String,
pub time: String, pub time: String,
pub replies: Vec<Comment>,
} }
#[allow(dead_code)] #[allow(dead_code)]
@ -76,17 +80,27 @@ pub struct ErrorTemplate {
} }
// //
// URL HANDLING // FORMATTING
// //
pub async fn format_url(url: &str) -> String { pub async fn format_url(url: &str) -> String {
#[cfg(feature = "proxy")] #[cfg(feature = "proxy")]
return "/imageproxy/".to_string() + encode(url).as_str(); return "/proxy/".to_string() + encode(url).as_str();
#[cfg(not(feature = "proxy"))] #[cfg(not(feature = "proxy"))]
return url.to_string(); 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()
}
}
// //
// JSON PARSING // JSON PARSING
// //
@ -136,7 +150,12 @@ pub async fn fetch_posts(url: String, fallback_title: String) -> Result<(Vec<Pos
community: val(post, "subreddit").await, community: val(post, "subreddit").await,
body: val(post, "body").await, body: val(post, "body").await,
author: val(post, "author").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(), post_type: "link".to_string(),
media: img, media: img,
url: val(post, "permalink").await, url: val(post, "permalink").await,
@ -162,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 // Make a request to a Reddit API and parse the JSON response
#[allow(dead_code)] #[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 --- // --- actix-web::client ---
// let client = actix_web::client::Client::default(); // let client = actix_web::client::Client::default();
// let res = client // let res = client

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

@ -1,22 +1,34 @@
/* General */ /* 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; transition: 0.2s all;
margin: 0px; margin: 0px;
color: white; color: white;
font-family: sans-serif; font-family: sans-serif;
font-weight: normal; font-weight: normal;
outline: none;
} }
html { body {
background: black; background: var(--background);
visibility: visible !important;
} }
header { nav {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
color: aqua; color: var(--accent);
background: #151515; background: var(--outside);
padding: 15px; padding: 15px;
font-weight: bold; font-weight: bold;
font-size: 20px; font-size: 20px;
@ -53,12 +65,14 @@ a:not(.post_right):hover {
text-decoration: underline; text-decoration: underline;
} }
span { #about {
color: aqua; padding-top: 20px;
background: #151515;
} }
#about { #version {
background: #151515; color: white;
opacity: 25%;
} }
/* Subreddit */ /* Subreddit */
@ -115,15 +129,28 @@ span {
/* Sorting */ /* Sorting */
#sort { #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 { #sort > div, footer > a {
background: #151515; box-shadow: var(--black-contrast);
background: var(--outside);
color: lightgrey; color: lightgrey;
border-radius: 5px; border-radius: 5px;
margin-right: 5px; margin-right: 5px;
@ -133,37 +160,29 @@ span {
} }
#sort > div.selected { #sort > div.selected {
background: aqua; background: var(--accent);
color: black; color: black;
} }
#sort > div:hover { #sort > div:hover {
background: #222; background: var(--foreground);
} }
/* Post */ /* Post */
.post { .post {
border-radius: 5px; border-radius: 5px;
background: #151515; background: var(--post);
box-shadow: var(--black-contrast);
display: flex; display: flex;
} }
.post.highlighted {
border: 2px solid #555;
background: #222;
}
.post.highlighted > .post_left {
background: #333;
}
.post:hover { .post:hover {
background: #222; background: var(--foreground);
} }
.post:hover > .post_left { .post:hover > .post_left {
background: #333; background: var(--highlighted);
} }
.post_left, .post_right { .post_left, .post_right {
@ -174,23 +193,23 @@ span {
.post_left { .post_left {
text-align: center; text-align: center;
background: #222; background: var(--foreground);
border-radius: 5px 0px 0px 5px; border-radius: 5px 0px 0px 5px;
min-width: 50px; min-width: 50px;
padding: 5px; padding: 5px;
} }
.datetime {
float: right;
}
.post_subreddit { .post_subreddit {
font-weight: bold; font-weight: bold;
} }
.post_title {
font-size: 18px;
}
.post_score { .post_score {
margin-top: 1em; margin-top: 20px;
color: aqua; color: var(--accent);
} }
.post_right { .post_right {
@ -203,10 +222,6 @@ span {
margin: 5px; margin: 5px;
} }
.post_right > a {
color: aqua;
}
.post_right > p { .post_right > p {
opacity: 0.75; opacity: 0.75;
font-size: 16px; font-size: 16px;
@ -228,12 +243,16 @@ span {
} }
.post_body > p:not(:first-child) { .post_body > p:not(:first-child) {
margin-top: 1.5em; margin-top: 20px;
} }
.post_body > a { .post_body a {
text-decoration: underline; text-decoration: underline;
color: aqua; color: var(--accent);
}
#post_url {
color: var(--accent);
} }
.post_thumbnail { .post_thumbnail {
@ -249,8 +268,8 @@ span {
display: none; display: none;
} }
small { .post_flair {
background: aqua; background: var(--accent);
color: black; color: black;
padding: 5px; padding: 5px;
margin-right: 5px; margin-right: 5px;
@ -262,13 +281,10 @@ small {
/* Comment */ /* Comment */
.comment { .comment {
margin-top: 15px;
border-radius: 5px; border-radius: 5px;
display: flex; display: flex;
border: 2px solid #222; font-size: 15px;
}
.comment:hover {
background: #111;
} }
.comment_left, .comment_right { .comment_left, .comment_right {
@ -279,20 +295,31 @@ small {
.comment_left { .comment_left {
text-align: center; text-align: center;
min-width: 50px; min-width: 50px;
padding: 5px; padding: 5px 0px;
align-items: flex-end; align-items: center;
} }
.comment_title { .comment_title {
font-size: 20px; 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 { .comment_subreddit {
@ -300,28 +327,24 @@ small {
} }
.comment_score { .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 { .comment_right {
word-wrap: anywhere; word-wrap: anywhere;
padding: 10px 25px 10px 10px; padding: 10px 25px 10px 5px;
flex-grow: 1; flex-grow: 1;
flex-shrink: 1; flex-shrink: 1;
} }
.comment_right > * { .comment_data > * {
margin: 5px; margin: 5px;
} }
.comment_right > p {
opacity: 0.75;
}
.comment_image { .comment_image {
max-width: 500px; max-width: 500px;
align-self: center; align-self: center;
@ -338,33 +361,72 @@ small {
} }
.comment_body > p:not(:first-child) { .comment_body > p:not(:first-child) {
margin-top: 1.5em; margin-top: 20px;
} }
.comment_body a { .comment_body a {
text-decoration: underline; 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 { .post.comment {
background: #000; background: #000;
border: 2px solid #222; border: 2px solid var(--foreground);
} }
.post.comment > .post_left { .post.comment > .post_left {
background: black; 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 */ /* Tables */
table { table {
border: 3px #333 solid; border: 3px var(--highlighted) solid;
border-spacing: 0rem; border-spacing: 0;
} }
td, th { td, th {
border: 1px #333 solid; border: 1px var(--highlighted) solid;
padding: 0.5em; padding: 10px;
} }
/* Mobile */ /* Mobile */
@ -390,6 +452,11 @@ td, th {
max-width: initial; max-width: initial;
} }
.replies > .comment {
margin-left: -25px;
padding: 5px 0px;
}
.datetime { .datetime {
width: 100%; width: 100%;
} }

@ -2,30 +2,24 @@
<html lang="en"> <html lang="en">
<head> <head>
{% block head %} {% block head %}
<title>{% block title %}{% endblock %}</title> <title>{% block title %}Libreddit{% endblock %}</title>
<meta http-equiv="Referrer-Policy" content="no-referrer">
<meta http-equiv="Content-Security-Policy" content="default-src 'self'; style-src 'self' 'unsafe-inline'; base-uri 'none'; form-action 'self';">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta name="description" content="View on Libreddit, an alternative private front-end to Reddit."> <meta name="description" content="View on Libreddit, an alternative private front-end to Reddit.">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <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"> <link rel="stylesheet" href="/style.css">
{% block sortstyle %}
<style>
#sort > #sort_{{ sort }} {
background: aqua;
color: black;
}
</style>
{% endblock %}
{% endblock %} {% endblock %}
</head> </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> <a id="github" href="https://github.com/spikecodes/libreddit">GITHUB</a>
</header> </nav>
{% endblock %} {% endblock %}
{% block body %}
<main> <main>
{% block content %} {% block content %}
{% endblock %} {% endblock %}

@ -1,12 +1,13 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block title %}Libreddit{% endblock %}
{% block content %} {% 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 %} {% for post in posts %}
<div class="post"> <div class="post">
<div class="post_left"> <div class="post_left">
@ -15,14 +16,15 @@
<div class="post_right"> <div class="post_right">
<h4> <h4>
<b><a class="post_subreddit" href="/r/{{ post.community }}">r/{{ post.community }}</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>
{% endif %}
<span class="datetime" style="float: right;">{{ post.time }}</span> <span class="datetime" style="float: right;">{{ post.time }}</span>
</h4> </h4>
<h3 class="post_title"> <h3 class="post_title">
{% if post.flair.0 != "" %} {% 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 %} {% endif %}
<a href="{{ post.url }}">{{ post.title }}</a> <a href="{{ post.url }}">{{ post.title }}</a>
</h3> </h3>

@ -4,6 +4,25 @@
{% call super() %} {% call super() %}
<meta name="author" content="u/{{ post.author }}"> <meta name="author" content="u/{{ post.author }}">
{% endblock %} {% 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 %} {% block content %}
<div class="post highlighted"> <div class="post highlighted">
<div class="post_left"> <div class="post_left">
@ -13,46 +32,61 @@
<h4> <h4>
<b><a class="post_subreddit" href="/r/{{ post.community }}">r/{{ post.community }}</a></b> <b><a class="post_subreddit" href="/r/{{ post.community }}">r/{{ post.community }}</a></b>
&bull; &bull;
Posted by
<a class="post_author" href="/u/{{ post.author }}">u/{{ post.author }}</a> <a class="post_author" href="/u/{{ post.author }}">u/{{ post.author }}</a>
{% if post.author_flair.0 != "" %}
<small class="author_flair">{{ post.author_flair.0 }}</small>
{% endif %}
<span class="datetime">{{ post.time }}</span> <span class="datetime">{{ post.time }}</span>
</h4> </h4>
<h3 class="post_title"> <a href="{{ post.url }}" class="post_title">
{{ post.title }} {{ post.title }}
{% if post.flair.0 != "" %} {% 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 %} {% endif %}
</h3> </a>
{% if post.post_type == "image" %} {% if post.post_type == "image" %}
<img class="post_media" src="{{ post.media }}"/> <img class="post_media" src="{{ post.media }}"/>
{% else if post.post_type == "video" %} {% else if post.post_type == "video" %}
<video class="post_media" src="{{ post.media }}" controls autoplay loop> <video class="post_media" src="{{ post.media }}" controls autoplay loop>
{% else if post.post_type == "link" %} {% else if post.post_type == "link" %}
<a href="{{ post.media }}">{{ post.media }}</a> <a id="post_url" href="{{ post.media }}">{{ post.media }}</a>
{% endif %} {% endif %}
<h4 class="post_body">{{ post.body }}</h4> <h4 class="post_body">{{ post.body }}</h4>
</div> </div>
</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>
<div class="comment_right"> {%- endfor %}
<h4>
Posted by <a class="comment_author" href="/u/{{ comment.author }}">u/{{ comment.author }}</a>
<span class="datetime">{{ comment.time }}</span>
</h4>
<h4 class="comment_body">{{ comment.body }}</h4>
</div>
</div><br>
{% endfor %}
{% endblock %} {% endblock %}

@ -1,12 +1,11 @@
{% extends "base.html" %} {% extends "base.html" %}
{% if sub.name != "" %}
{% block title %}r/{{ sub.name }}: {{ sub.description }}{% endblock %} {% block title %}r/{{ sub.name }}: {{ sub.description }}{% endblock %}
{% endif %}
{% block body %} {% 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 id="about">
<div class="subreddit"> <div class="subreddit">
<div class="subreddit_left"> <div class="subreddit_left">
@ -19,12 +18,15 @@
</div> </div>
</div> </div>
</div> </div>
{% endif %}
<main> <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 %} {% for post in posts %}
<div class="post"> <div class="post">
<div class="post_left"> <div class="post_left">
@ -32,15 +34,16 @@
</div> </div>
<div class="post_right"> <div class="post_right">
<h4> <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>
{% endif %}
<span class="datetime">{{ post.time }}</span> <span class="datetime">{{ post.time }}</span>
</h4> </h4>
<h3 class="post_title"> <h3 class="post_title">
{% if post.flair.0 != "" %} {% 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 %} {% endif %}
<a href="{{ post.url }}">{{ post.title }}</a> <a href="{{ post.url }}">{{ post.title }}</a>
</h3> </h3>

@ -1,12 +1,6 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block title %}Libreddit: u/{{ user.name }}{% endblock %} {% block title %}Libreddit: u/{{ user.name }}{% endblock %}
{% block body %} {% 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 id="about">
<div class="user"> <div class="user">
<div class="user_left"> <div class="user_left">
@ -19,11 +13,13 @@
</div> </div>
</div> </div>
<main> <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 %} {% for post in posts %}
{% if post.title != "Comment" %} {% if post.title != "Comment" %}
<div class='post'> <div class='post'>
@ -33,16 +29,17 @@
<div class="post_right"> <div class="post_right">
<h4> <h4>
<b><a class="post_subreddit" href="/r/{{ post.community }}">r/{{ post.community }}</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>
{% endif %}
<span class="datetime" style="float: right;">{{ post.time }}</span> <span class="datetime" style="float: right;">{{ post.time }}</span>
</h4> </h4>
<h3 class="post_title"> <h3 class="post_title">
{% if post.flair.0 == "Comment" %} {% if post.flair.0 == "Comment" %}
{% else if post.flair.0 == "" %} {% else if post.flair.0 == "" %}
{% else %} {% 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 %} {% endif %}
<a href="{{ post.url }}">{{ post.title }}</a> <a href="{{ post.url }}">{{ post.title }}</a>
</h3> </h3>
@ -52,7 +49,6 @@
{% else %} {% else %}
<div class="comment"> <div class="comment">
<div class="comment_left"> <div class="comment_left">
<div class="comment_upvote"></div>
<h3 class="comment_score">{{ post.score }}</h3> <h3 class="comment_score">{{ post.score }}</h3>
</div> </div>
<div class="comment_right"> <div class="comment_right">