Wrap long post titles (fixes #435)

* Add user listing buttons

* Update to v0.22

Co-authored-by: spikecodes <19519553+spikecodes@users.noreply.github.com>

.github/FUNDING.yml

@@ -0,0 +1 @@
+liberapay: spike

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,24 +1,33 @@
 ---
-name: Bug report
+name: 🐛 Bug report
 about: Create a report to help us improve
-title: Bug Report | [title]
+title: ''
 labels: bug
 assignees: ''
 
 ---
 
-**Describe the bug**
-A clear and concise description of what the bug is.
+## Describe the bug
+<!--
+  A clear and concise description of what the bug is.
+-->
 
-**To reproduce**
+## To reproduce
+
+<!--
 Steps to reproduce the behavior:
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
+-->
 
-**Expected behavior**
-A clear and concise description of what you expected to happen.
+## Expected behavior
+<!-- 
+  A clear and concise description of what you expected to happen.
+-->
 
-**Additional context**
-Add any other context about the problem here.
+## Additional context
+<!--
+  Add any other context about the problem here.
+-->

.github/ISSUE_TEMPLATE/feature_parity.md

@@ -0,0 +1,28 @@
+---
+name: ✨ Feature parity
+about: Suggest implementing a feature into Libreddit that is found in Reddit.com
+title: ''
+labels: feature parity
+assignees: ''
+
+---
+
+## How does this feature work on Reddit?
+<!--
+  A clear and concise description of what the feature is.
+-->
+
+## Describe the implementation into Libreddit
+<!--
+  A clear and concise description of what you want to happen.
+-->
+
+## Describe alternatives you've considered
+<!--
+  A clear and concise description of any alternative solutions or features you've considered.
+-->
+
+## Additional context
+<!--
+  Add any other context or screenshots about the feature parity request here.
+-->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,20 +1,28 @@
 ---
-name: Feature request
-about: Suggest an idea for this project
-title: Feature Request | [title]
+name: 💡 Feature request
+about: Suggest a feature for Libreddit that is not found in Reddit
+title: ''
 labels: enhancement
 assignees: ''
 
 ---
 
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+## Is your feature request related to a problem? Please describe.
+<!--
+  A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+-->
 
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
+## Describe the solution you'd like
+<!--
+  A clear and concise description of what you want to happen.
+-->
 
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
+## Describe alternatives you've considered
+<!--
+  A clear and concise description of any alternative solutions or features you've considered.
+-->
 
-**Additional context**
-Add any other context or screenshots about the feature request here.
+## Additional context
+<!--
+  Add any other context or screenshots about the feature request here.
+-->

.github/workflows/docker-arm.yml

@@ -0,0 +1,36 @@
+name: Docker ARM Build
+
+on:
+  push:
+    paths-ignore:
+      - "**.md"
+    branches:
+      - master
+
+jobs:
+  build-docker:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+        with:
+          platforms: all
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+        with:
+          version: latest
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile.arm
+          platforms: linux/arm64
+          push: true
+          tags: spikecodes/libreddit:arm

.github/workflows/docker-armv7.yml

@@ -0,0 +1,39 @@
+name: Docker ARM V7 Build
+
+on:
+  push:
+    paths-ignore:
+      - "**.md"
+    branches:
+      - master
+
+jobs:
+  build-docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Set up QEMU
+        id: qemu
+        uses: docker/setup-qemu-action@v1
+        with:
+          platforms: all
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+        with:
+          version: latest
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Build and push
+        id: build_push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile.armv7
+          platforms: linux/arm/v7
+          push: true
+          tags: spikecodes/libreddit:armv7

.github/workflows/docker.yml

@@ -1,4 +1,4 @@
-name: Docker Multi-Architecture Build
+name: Docker amd64 Build
 
 on:
   push:
@@ -31,6 +31,7 @@ jobs:
         with:
           context: .
           file: ./Dockerfile
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
           push: true
           tags: spikecodes/libreddit:latest
+

.github/workflows/rust.yml

@@ -2,9 +2,10 @@ name: Rust
 
 on:
   push:
-    branches: [master]
-  pull_request:
-    branches: [master]
+    paths-ignore:
+      - "**.md"
+    branches:
+      - master
 
 env:
   CARGO_TERM_COLOR: always
@@ -22,8 +23,37 @@ jobs:
       - name: Build
         run: cargo build --release
 
+      - name: Publish to crates.io
+        continue-on-error: true
+        run: cargo publish --no-verify --token ${{ secrets.CARGO_REGISTRY_TOKEN }}
+      
       - uses: actions/upload-artifact@v2.2.1
         name: Upload a Build Artifact
         with:
           name: libreddit
           path: target/release/libreddit
+        
+      - name: Versions
+        id: version
+        run: |
+          echo "::set-output name=version::$(cargo metadata --format-version 1 --no-deps | jq .packages[0].version -r | sed 's/^/v/')"
+          echo "::set-output name=tag::$(git describe --tags)"
+          
+      - name: Calculate SHA512 checksum
+        run: sha512sum target/release/libreddit > libreddit.sha512
+        
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        if: github.base_ref != 'master'
+        with:
+          tag_name: ${{ steps.version.outputs.version }}
+          name: ${{ steps.version.outputs.version }} - ${{ github.event.head_commit.message }}
+          draft: true
+          files: |
+            target/release/libreddit
+            libreddit.sha512
+          body: |
+            - ${{ github.event.head_commit.message }} ${{ github.sha }}
+          generate_release_notes: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}

.gitignore

@@ -1 +1 @@
-/target
+/target

.replit

@@ -0,0 +1,2 @@
+run = "while true; do wget -O libreddit https://github.com/spikecodes/libreddit/releases/latest/download/libreddit;chmod +x libreddit;./libreddit -H 63115200;sleep 1;done"
+language = "bash"

CODEOWNERS

@@ -1 +0,0 @@
-*       @spikecodes

Cargo.toml

@@ -3,19 +3,23 @@ name = "libreddit"
 description = " Alternative private front-end to Reddit"
 license = "AGPL-3.0"
 repository = "https://github.com/spikecodes/libreddit"
-version = "0.3.1"
+version = "0.22.1"
 authors = ["spikecodes <19519553+spikecodes@users.noreply.github.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
-tide = { version = "0.16.0", default-features = false, features = ["h1-server", "cookies"] }
-async-std = { version = "1.9.0", features = ["attributes"] }
-surf = { version = "2.2.0", default-features = false, features = ["curl-client", "encoding"] }
-cached = "0.23.0"
-askama = { version = "0.10.5", default-features = false }
-serde = { version = "1.0.123", features = ["derive"] }
-serde_json = "1.0.64"
-async-recursion = "0.3.2"
-regex = "1.4.3"
-clap = { version = "2.33.3", default-features = false }
-time = "0.2.25"
+askama = { version = "0.11.1", default-features = false }
+async-recursion = "1.0.0"
+cached = "0.34.0"
+clap = { version = "3.1.6", default-features = false, features = ["std"] }
+regex = "1.5.5"
+serde = { version = "1.0.136", features = ["derive"] }
+cookie = "0.16.0"
+futures-lite = "1.12.0"
+hyper = { version = "0.14.17", features = ["full"] }
+hyper-rustls = "0.23.0"
+route-recognizer = "0.3.1"
+serde_json = "1.0.79"
+tokio = { version = "1.17.0", features = ["full"] }
+time = "0.3.7"
+url = "2.2.2"

Dockerfile

@@ -1,17 +1,36 @@
-FROM rust:latest as builder
+####################################################################################################
+## Builder
+####################################################################################################
+FROM rust:alpine AS builder
+
+RUN apk add --no-cache musl-dev
+
+WORKDIR /libreddit
 
-WORKDIR /usr/src/libreddit
 COPY . .
-RUN cargo install --path .
 
+RUN cargo build --target x86_64-unknown-linux-musl --release
 
-FROM debian:buster-slim
+####################################################################################################
+## Final image
+####################################################################################################
+FROM alpine:latest
 
-RUN apt-get update && apt-get install -y libcurl4 && rm -rf /var/lib/apt/lists/*
-COPY --from=builder /usr/local/cargo/bin/libreddit /usr/local/bin/libreddit
-RUN useradd --system --user-group --home-dir /nonexistent --no-create-home --shell /usr/sbin/nologin libreddit
+# Import ca-certificates from builder
+COPY --from=builder /usr/share/ca-certificates /usr/share/ca-certificates
+COPY --from=builder /etc/ssl/certs /etc/ssl/certs
+
+# Copy our build
+COPY --from=builder /libreddit/target/x86_64-unknown-linux-musl/release/libreddit /usr/local/bin/libreddit
+
+# Use an unprivileged user.
+RUN adduser --home /nonexistent --no-create-home --disabled-password libreddit
 USER libreddit
 
+# Tell Docker to expose port 8080
 EXPOSE 8080
 
-CMD ["libreddit"]
+# Run a healthcheck every minute to make sure Libreddit is functional
+HEALTHCHECK --interval=1m --timeout=3s CMD wget --spider --q http://localhost:8080/settings || exit 1
+
+CMD ["libreddit"]

Dockerfile.arm

@@ -0,0 +1,36 @@
+####################################################################################################
+## Builder
+####################################################################################################
+FROM rust:alpine AS builder
+
+RUN apk add --no-cache g++
+
+WORKDIR /usr/src/libreddit
+
+COPY . .
+
+RUN cargo install --path .
+
+####################################################################################################
+## Final image
+####################################################################################################
+FROM alpine:latest
+
+# Import ca-certificates from builder
+COPY --from=builder /usr/share/ca-certificates /usr/share/ca-certificates
+COPY --from=builder /etc/ssl/certs /etc/ssl/certs
+
+# Copy our build
+COPY --from=builder /usr/local/cargo/bin/libreddit /usr/local/bin/libreddit
+
+# Use an unprivileged user.
+RUN adduser --home /nonexistent --no-create-home --disabled-password libreddit
+USER libreddit
+
+# Tell Docker to expose port 8080
+EXPOSE 8080
+
+# Run a healthcheck every minute to make sure Libreddit is functional
+HEALTHCHECK --interval=1m --timeout=3s CMD wget --spider --q http://localhost:8080/settings || exit 1
+
+CMD ["libreddit"]

Dockerfile.armv7

@@ -0,0 +1,43 @@
+####################################################################################################
+## Builder
+####################################################################################################
+FROM --platform=$BUILDPLATFORM rust:slim AS builder
+
+ENV CARGO_TARGET_ARMV7_UNKNOWN_LINUX_MUSLEABIHF_LINKER=arm-linux-gnueabihf-gcc
+ENV CC_armv7_unknown_linux_musleabihf=arm-linux-gnueabihf-gcc
+
+RUN apt-get update && apt-get -y install gcc-arm-linux-gnueabihf \
+    binutils-arm-linux-gnueabihf \
+    musl-tools
+
+RUN rustup target add armv7-unknown-linux-musleabihf
+
+WORKDIR /libreddit
+
+COPY . .
+
+RUN cargo build --target armv7-unknown-linux-musleabihf --release
+
+####################################################################################################
+## Final image
+####################################################################################################
+FROM alpine:latest
+
+# Import ca-certificates from builder
+COPY --from=builder /usr/share/ca-certificates /usr/share/ca-certificates
+COPY --from=builder /etc/ssl/certs /etc/ssl/certs
+
+# Copy our build
+COPY --from=builder /libreddit/target/armv7-unknown-linux-musleabihf/release/libreddit /usr/local/bin/libreddit
+
+# Use an unprivileged user.
+RUN adduser --home /nonexistent --no-create-home --disabled-password libreddit
+USER libreddit
+
+# Tell Docker to expose port 8080
+EXPOSE 8080
+
+# Run a healthcheck every minute to make sure Libreddit is functional
+HEALTHCHECK --interval=1m --timeout=3s CMD wget --spider --q http://localhost:8080/settings || exit 1
+
+CMD ["libreddit"]

FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: spike
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: ['https://www.buymeacoffee.com/spikecodes']

README.md

@@ -1,12 +1,12 @@
 # Libreddit
 
-> An alternative private front-end to Reddit 
+> An alternative private front-end to Reddit
 
-![screenshot](https://i.ibb.co/F0JsY5K/image.png)
+![screenshot](https://i.ibb.co/QYbqTQt/libreddit-rust.png)
 
 ---
 
-**10 second pitch:** Libreddit is a portmanteau of "libre" (meaning freedom) and "Reddit". It is a private front-end like [Invidious](https://github.com/iv-org/invidious) but for Reddit. Browse the coldest takes of [r/unpopularopinion](https://libredd.it/r/unpopularopinion) without being [tracked](#reddit).
+**10 second pitch:** Libreddit is a portmanteau of "libre" (meaning freedom) and "Reddit". It is a private front-end like [Invidious](https://github.com/iv-org/invidious) but for Reddit. Browse the coldest takes of [r/unpopularopinion](https://libreddit.spike.codes/r/unpopularopinion) without being [tracked](#reddit).
 
 - 🚀 Fast: written in Rust for blazing fast speeds and memory safety
 - ☁️ Light: no JavaScript, no ads, no tracking, no bloat
@@ -15,23 +15,15 @@
 
 ---
 
-**BTC:** bc1qwyxjnafpu3gypcpgs025cw9wa7ryudtecmwa6y
+I appreciate any donations! Your support allows me to continue developing Libreddit.
 
-**XMR:** 45FJrEuFPtG2o7QZz2Nps77TbHD4sPqxViwbdyV9A6ktfHiWs47UngG5zXPcLoDXAc8taeuBgeNjfeprwgeXYXhN3C9tVSR
+<a href="https://www.buymeacoffee.com/spikecodes" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy Me A Coffee" style="height: 40px" ></a>
+<a href="https://liberapay.com/spike/donate"><img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg" style="height: 40px"></a>
 
----
 
-## Jump to...
-- [About](#about)
-  - [Teddit Comparison](#how-does-it-compare-to-teddit)
-- [Comparison](#comparison)
-- [Installation](#installation)
-  - [Cargo](#1-cargo)
-  - [Docker](#2-docker)
-  - [AUR](#3-aur)
-  - [GitHub Releases](#4-github-releases)
-  - [Repl.it](#5-replit)
-- [Deployment](#deployment)
+**Bitcoin:** [bc1qwyxjnafpu3gypcpgs025cw9wa7ryudtecmwa6y](bitcoin:bc1qwyxjnafpu3gypcpgs025cw9wa7ryudtecmwa6y)
+
+**Monero:** [45FJrEuFPtG2o7QZz2Nps77TbHD4sPqxViwbdyV9A6ktfHiWs47UngG5zXPcLoDXAc8taeuBgeNjfeprwgeXYXhN3C9tVSR](monero:45FJrEuFPtG2o7QZz2Nps77TbHD4sPqxViwbdyV9A6ktfHiWs47UngG5zXPcLoDXAc8taeuBgeNjfeprwgeXYXhN3C9tVSR)
 
 ---
 
@@ -39,18 +31,67 @@
 
 Feel free to [open an issue](https://github.com/spikecodes/libreddit/issues/new) to have your [selfhosted instance](#deployment) listed here!
 
+🔗 **Want to automatically redirect Reddit links to Libreddit? Use [LibRedirect](https://github.com/libredirect/libredirect) or [Privacy Redirect](https://github.com/SimonBrazell/privacy-redirect)!**
+
 | Website | Country | Cloudflare |
 |-|-|-|
 | [libredd.it](https://libredd.it) (official) | 🇺🇸 US |  |
 | [libreddit.spike.codes](https://libreddit.spike.codes) (official) | 🇺🇸 US |  |
-| [libreddit.dothq.co](https://libreddit.dothq.co) | 🇺🇸 US | ✅ |
-| [libreddit.kavin.rocks](https://libreddit.kavin.rocks) | 🇮🇳 IN | ✅ |
-| [libreddit.himiko.cloud](https://libreddit.himiko.cloud) | 🇧🇬 BG |  |
-| [libreddit.bcow.xyz](https://libreddit.bcow.xyz) | 🇺🇸 US |  |
-| [spjmllawtheisznfs7uryhxumin26ssv2draj7oope3ok3wuhy43eoyd.onion](http://spjmllawtheisznfs7uryhxumin26ssv2draj7oope3ok3wuhy43eoyd.onion) | 🇮🇳 IN  |  |
-| [fwhhsbrbltmrct5hshrnqlqygqvcgmnek3cnka55zj4y7nuus5muwyyd.onion](http://fwhhsbrbltmrct5hshrnqlqygqvcgmnek3cnka55zj4y7nuus5muwyyd.onion) | 🇩🇪 DE  |  |
-| [libreddit.himiko7xl2skojc6odi7hykl626gt4qki3vxdbv33u2u3af76d6k32ad.onion](http://libreddit.himiko7xl2skojc6odi7hykl626gt4qki3vxdbv33u2u3af76d6k32ad.onion) | 🇧🇬 BG |  |
-| [dflv6yjt7il3n3tggf4qhcmkzbti2ppytqx3o7pjrzwgntutpewscyid.onion](http://dflv6yjt7il3n3tggf4qhcmkzbti2ppytqx3o7pjrzwgntutpewscyid.onion/) | 🇺🇸 US |  |
+| [libreddit.dothq.co](https://libreddit.dothq.co) | 🇩🇪 DE | ✅ |
+| [libreddit.kavin.rocks](https://libreddit.kavin.rocks) | 🇮🇳 IN |  |
+| [libreddit.40two.app](https://libreddit.40two.app) | 🇳🇱 NL |  |
+| [reddit.invak.id](https://reddit.invak.id) | 🇧🇬 BG |  |
+| [reddit.phii.me](https://reddit.phii.me) | 🇺🇸 US |  |
+| [lr.riverside.rocks](https://lr.riverside.rocks) | 🇺🇸 US |  |
+| [libreddit.silkky.cloud](https://libreddit.silkky.cloud) | 🇫🇮 FI | ✅ |
+| [libreddit.database.red](https://libreddit.database.red) | 🇺🇸 US | ✅ |
+| [libreddit.exonip.de](https://libreddit.exonip.de) | 🇩🇪 DE |  |
+| [libreddit.domain.glass](https://libreddit.domain.glass) | 🇺🇸 US | ✅ |
+| [libreddit.sugoma.tk](https://libreddit.sugoma.tk) | 🇺🇸 US | |
+| [libreddit.jamiethalacker.dev](https://libreddit.jamiethalacker.dev) | 🇺🇸 US | ✅ |
+| [reddit.artemislena.eu](https://reddit.artemislena.eu) | 🇩🇪 DE |  |
+| [r.nf](https://r.nf) | 🇩🇪 DE | ✅ |
+| [libreddit.awesomehub.io](https://libreddit.awesomehub.io) | 🇫🇮 FI |  |
+| [libreddit.some-things.org](https://libreddit.some-things.org) | 🇨🇭 CH |  |
+| [reddit.stuehieyr.com](https://reddit.stuehieyr.com) | 🇩🇪 DE  |  |
+| [lr.mint.lgbt](https://lr.mint.lgbt) | 🇨🇦 CA |  |
+| [libreddit.alefvanoon.xyz](https://libreddit.alefvanoon.xyz) | 🇺🇸 US | ✅ |
+| [libreddit.igna.rocks](https://libreddit.igna.rocks) | 🇺🇸 US | |
+| [libreddit.autarkic.org](https://libreddit.autarkic.org) | 🇺🇸 US | |
+| [libreddit.flux.industries](https://libreddit.flux.industries) | 🇩🇪 DE | ✅ |
+| [libreddit.drivet.xyz](https://libreddit.drivet.xyz) | 🇵🇱 PL |  |
+| [lr.oversold.host](https://lr.oversold.host) | 🇱🇺 LU | |
+| [libreddit.de](https://libreddit.de) | 🇩🇪 DE |  |
+| [libreddit.pussthecat.org](https://libreddit.pussthecat.org) | 🇩🇪 DE |  |
+| [libreddit.mutahar.rocks](https://libreddit.mutahar.rocks) | 🇫🇷 FR |  |
+| [libreddit.northboot.xyz](https://libreddit.northboot.xyz) | 🇩🇪 DE |  |
+| [leddit.xyz](https://leddit.xyz) | 🇺🇸 US |  |
+| [de.leddit.xyz](https://de.leddit.xyz) | 🇩🇪 DE |  |
+| [lr.cowfee.moe](https://lr.cowfee.moe) | 🇺🇸 US |  |
+| [libreddit.hu](https://libreddit.hu) | 🇫🇮 FI | ✅ |
+| [libreddit.totaldarkness.net](https://libreddit.totaldarkness.net) | 🇨🇦 CA |  |
+| [libreddit.esmailelbob.xyz](https://libreddit.esmailelbob.xyz) | 🇨🇦 CA |  |
+| [libreddit.nl](https://libreddit.nl) | 🇳🇱 NL |  |
+| [lr.stilic.ml](https://lr.stilic.ml) | 🇫🇷 FR | ✅ |
+| [reddi.tk](https://reddi.tk) | 🇺🇸 US | ✅ |
+| [libreddit.bus-hit.me](https://libreddit.bus-hit.me) | 🇨🇦 CA |  |
+| [libreddit.datatunnel.xyz](https://libreddit.datatunnel.xyz) | 🇫🇮 FI |  |
+| [libreddit.crewz.me](https://libreddit.crewz.me) | 🇳🇱 NL | ✅ |
+| [r.walkx.org](https://r.walkx.org) | 🇩🇪 DE | ✅ |
+| [libreddit.kylrth.com](https://libreddit.kylrth.com) | 🇨🇦 CA |  |
+| [spjmllawtheisznfs7uryhxumin26ssv2draj7oope3ok3wuhy43eoyd.onion](http://spjmllawtheisznfs7uryhxumin26ssv2draj7oope3ok3wuhy43eoyd.onion) | 🇮🇳 IN |  |
+| [fwhhsbrbltmrct5hshrnqlqygqvcgmnek3cnka55zj4y7nuus5muwyyd.onion](http://fwhhsbrbltmrct5hshrnqlqygqvcgmnek3cnka55zj4y7nuus5muwyyd.onion) | 🇩🇪 DE |  |
+| [kphht2jcflojtqte4b4kyx7p2ahagv4debjj32nre67dxz7y57seqwyd.onion](http://kphht2jcflojtqte4b4kyx7p2ahagv4debjj32nre67dxz7y57seqwyd.onion) | 🇳🇱 NL |  |
+| [inytumdgnri7xsqtvpntjevaelxtgbjqkuqhtf6txxhwbll2fwqtakqd.onion](http://inytumdgnri7xsqtvpntjevaelxtgbjqkuqhtf6txxhwbll2fwqtakqd.onion) | 🇨🇭 CH |  |
+| [liredejj74h5xjqr2dylnl5howb2bpikfowqoveub55ru27x43357iid.onion](http://liredejj74h5xjqr2dylnl5howb2bpikfowqoveub55ru27x43357iid.onion) | 🇩🇪 DE |  |
+| [kzhfp3nvb4qp575vy23ccbrgfocezjtl5dx66uthgrhu7nscu6rcwjyd.onion](http://kzhfp3nvb4qp575vy23ccbrgfocezjtl5dx66uthgrhu7nscu6rcwjyd.onion) | 🇺🇸 US |  |
+| [ecue64ybzvn6vjzl37kcsnwt4ycmbsyf74nbttyg7rkc3t3qwnj7mcyd.onion](http://ecue64ybzvn6vjzl37kcsnwt4ycmbsyf74nbttyg7rkc3t3qwnj7mcyd.onion) | 🇩🇪 DE |  |
+| [ledditqo2mxfvlgobxnlhrkq4dh34jss6evfkdkb2thlvy6dn4f4gpyd.onion](http://ledditqo2mxfvlgobxnlhrkq4dh34jss6evfkdkb2thlvy6dn4f4gpyd.onion) | 🇺🇸 US |  |
+| [libredoxhxwnmsb6dvzzd35hmgzmawsq5i764es7witwhddvpc2razid.onion](http://libredoxhxwnmsb6dvzzd35hmgzmawsq5i764es7witwhddvpc2razid.onion) | 🇺🇸 US |  |
+| [libreddit.2syis2nnyytz6jnusnjurva4swlaizlnleiks5mjp46phuwjbdjqwgqd.onion](http://libreddit.2syis2nnyytz6jnusnjurva4swlaizlnleiks5mjp46phuwjbdjqwgqd.onion) | 🇪🇬 EG |  |
+| [ol5begilptoou34emq2sshf3may3hlblvipdjtybbovpb7c7zodxmtqd.onion](http://ol5begilptoou34emq2sshf3may3hlblvipdjtybbovpb7c7zodxmtqd.onion) | 🇩🇪 DE |  |
+| [lbrdtjaj7567ptdd4rv74lv27qhxfkraabnyphgcvptl64ijx2tijwid.onion](http://lbrdtjaj7567ptdd4rv74lv27qhxfkraabnyphgcvptl64ijx2tijwid.onion) | 🇨🇦 CA |  |
+| [libreddit.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion](http://libreddit.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion/) | 🇨🇦 CA |  |
 
 A checkmark in the "Cloudflare" category here refers to the use of the reverse proxy, [Cloudflare](https://cloudflare). The checkmark will not be listed for a site which uses Cloudflare DNS but rather the proxying service which grants Cloudflare the ability to monitor traffic to the website.
 
@@ -63,9 +104,9 @@ Find Libreddit on 💬 [Matrix](https://matrix.to/#/#libreddit:kde.org), 🐋 [D
 ## Built with
 
 - [Rust](https://www.rust-lang.org/) - Programming language
-- [Tide](https://github.com/http-rs/tide) - Web server
+- [Hyper](https://github.com/hyperium/hyper) - HTTP server and client
 - [Askama](https://github.com/djc/askama) - Templating engine
-- [Surf](https://github.com/http-rs/surf) - HTTP client
+- [Rustls](https://github.com/ctz/rustls) - TLS library
 
 ## 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.
@@ -78,7 +119,7 @@ Teddit is another awesome open source project designed to provide an alternative
 
 If you are looking to compare, the biggest differences I have noticed are:
 - Libreddit is themed around Reddit's redesign whereas Teddit appears to stick much closer to Reddit's old design. This may suit some users better as design is always subjective.
-- Libreddit is written in [Rust](https://www.rust-lang.org) for speed and memory safety. It uses [Actix Web](https://actix.rs), which was [benchmarked as the fastest web server for single queries](https://www.techempower.com/benchmarks/#hw=ph&test=db).
+- Libreddit is written in [Rust](https://www.rust-lang.org) for speed and memory safety. It uses [Hyper](https://hyper.rs), a speedy and lightweight HTTP server/client implementation.
 
 ---
 
@@ -133,13 +174,13 @@ Results from Google Lighthouse ([Libreddit Report](https://lighthouse-dot-webdot
 
 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 when Reddit is ratelimiting Libreddit and when Reddit's JSON responses can't be parsed. When debugging (running from source without `--release`), Libreddit logs post IDs and URL paths fetched to aid with troubleshooting.
+**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 with troubleshooting.
 
 **DNS:** Both official domains (`libredd.it` and `libreddit.spike.codes`) use Cloudflare as the DNS resolver. Though, the sites are not proxied through Cloudflare meaning Cloudflare doesn't have access to user traffic.
 
-**Cookies:** Libreddit uses optional cookies to store any configured settings in [the settings menu](https://libredd.it/settings). This is not a cross-site cookie and the cookie holds no personal data, only a value of the possible layout.
+**Cookies:** Libreddit uses optional cookies to store any configured settings in [the settings menu](https://libreddit.spike.codes/settings). These are not cross-site cookies and the cookies hold no personal data.
 
-**Hosting:** The official instances are hosted on [Repl.it](https://repl.it/) which monitors usage to prevent abuse. I can understand if this invalidates certain users' threat models and therefore, selfhosting and browsing through Tor are welcomed.
+**Hosting:** The official instances are hosted on [Replit](https://replit.com/) which monitors usage to prevent abuse. I can understand if this invalidates certain users' threat models and therefore, selfhosting, using unofficial instances and browsing through Tor are welcomed.
 
 ---
 
@@ -157,14 +198,20 @@ cargo install libreddit
 
 Deploy the [Docker image](https://hub.docker.com/r/spikecodes/libreddit) of Libreddit:
 ```
+docker pull spikecodes/libreddit
 docker run -d --name libreddit -p 8080:8080 spikecodes/libreddit
 ```
 
 Deploy using a different port (in this case, port 80):
 ```
+docker pull spikecodes/libreddit
 docker run -d --name libreddit -p 80:8080 spikecodes/libreddit
 ```
 
+To deploy on `arm64` platforms, simply replace `spikecodes/libreddit` in the commands above with `spikecodes/libreddit:arm`.
+
+To deploy on `armv7` platforms, simply replace `spikecodes/libreddit` in the commands above with `spikecodes/libreddit:armv7`.
+
 ## 3) AUR
 
 For ArchLinux users, Libreddit is available from the AUR as [`libreddit-git`](https://aur.archlinux.org/packages/libreddit-git).
@@ -177,15 +224,13 @@ yay -S libreddit-git
 
 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).
 
-## 5) Repl.it
+## 5) Replit/Heroku/Glitch
 
-**Note:** Repl.it is a free option but they are *not* private and will monitor server usage to prevent abuse. If you need a free and easy setup, this method may work best for you.
+**Note:** These are free hosting options but they are *not* private and will monitor server usage to prevent abuse. If you need a free and easy setup, this method may work best for you.
 
-1. Create a Repl.it account (see note above)
-2. Visit [the official Repl](https://repl.it/@spikethecoder/libreddit) and fork it
-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).
+<a href="https://repl.it/github/spikecodes/libreddit"><img src="https://repl.it/badge/github/spikecodes/libreddit" alt="Run on Repl.it" height="32" /></a>
+[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/spikecodes/libreddit)
+[![Remix on Glitch](https://cdn.glitch.com/2703baf2-b643-4da7-ab91-7ee2a2d00b5b%2Fremix-button-v2.svg)](https://glitch.com/edit/#!/remix/libreddit)
 
 ---
 
@@ -197,6 +242,60 @@ Once installed, deploy Libreddit to `0.0.0.0:8080` by running:
 libreddit
 ```
 
+## Change Default Settings
+
+Assign a default value for each setting by passing environment variables to Libreddit in the format `LIBREDDIT_DEFAULT_{X}`. Replace `{X}` with the setting name (see list below) in capital letters.
+
+| Name                    | Possible values                                                                                     | Default value |
+|-------------------------|-----------------------------------------------------------------------------------------------------|---------------|
+| `THEME`                 | `["system", "light", "dark", "black", "dracula", "nord", "laserwave", "violet", "gold", "rosebox"]` | `system`      |
+| `FRONT_PAGE`            | `["default", "popular", "all"]`                                                                     | `default`     |
+| `LAYOUT`                | `["card", "clean", "compact"]`                                                                      | `card`        |
+| `WIDE`                  | `["on", "off"]`                                                                                     | `off`         |
+| `COMMENT_SORT`          | `["hot", "new", "top", "rising", "controversial"]`                                                  | `hot`         |
+| `POST_SORT`             | `["confidence", "top", "new", "controversial", "old"]`                                              | `confidence`  |
+| `SHOW_NSFW`             | `["on", "off"]`                                                                                     | `off`         |
+| `USE_HLS`               | `["on", "off"]`                                                                                     | `off`         |
+| `HIDE_HLS_NOTIFICATION` | `["on", "off"]`                                                                                     | `off`         |
+| `AUTOPLAY_VIDEOS`       | `["on", "off"]`                                                                                     | `off`         |
+
+### Examples
+
+```bash
+LIBREDDIT_DEFAULT_SHOW_NSFW=on libreddit
+```
+
+```bash
+LIBREDDIT_DEFAULT_WIDE=on LIBREDDIT_DEFAULT_THEME=dark libreddit -r
+```
+
+## Proxying using NGINX
+
+**NOTE** If you're [proxying Libreddit through a NGINX Reverse Proxy](https://github.com/spikecodes/libreddit/issues/122#issuecomment-782226853), add
+```nginx
+proxy_http_version 1.1;
+```
+to your NGINX configuration file above your `proxy_pass` line.
+
+## systemd
+
+You can use the systemd service available in `contrib/libreddit.service`
+(install it on `/etc/systemd/system/libreddit.service`).
+
+That service can be optionally configured in terms of environment variables by
+creating a file in `/etc/libreddit.conf`. Use the `contrib/libreddit.conf` as a
+template. You can also add the `LIBREDDIT_DEFAULT__{X}` settings explained
+above.
+
+When "Proxying using NGINX" where the proxy is on the same machine, you should
+guarantee nginx waits for this service to start. Edit
+`/etc/systemd/system/libreddit.service.d/reverse-proxy.conf`:
+
+```conf
+[Unit]
+Before=nginx.service
+```
+
 ## Building
 
 ```

app.json

@@ -0,0 +1,42 @@
+{
+  "name": "Libreddit",
+  "description": "Private front-end for Reddit",
+  "buildpacks": [
+    {
+      "url": "https://github.com/emk/heroku-buildpack-rust"
+    },
+    {
+      "url": "emk/rust"
+    }
+  ],
+  "stack": "container",
+  "env": {
+    "LIBREDDIT_DEFAULT_THEME": {
+      "required": false
+    },
+    "LIBREDDIT_DEFAULT_FRONT_PAGE": {
+      "required": false
+    },
+    "LIBREDDIT_DEFAULT_LAYOUT": {
+      "required": false
+    },
+    "LIBREDDIT_DEFAULT_WIDE": {
+      "required": false
+    },
+    "LIBREDDIT_DEFAULT_COMMENT_SORT": {
+      "required": false
+    },
+    "LIBREDDIT_DEFAULT_POST_SORT": {
+      "required": false
+    },
+    "LIBREDDIT_DEFAULT_SHOW_NSFW": {
+      "required": false
+    },
+    "LIBREDDIT_USE_HLS": {
+      "required": false
+    },
+    "LIBREDDIT_HIDE_HLS_NOTIFICATION": {
+      "required": false
+    }
+  }
+}

contrib/libreddit.conf

@@ -0,0 +1,2 @@
+ADDRESS=localhost
+PORT=12345

contrib/libreddit.service

@@ -0,0 +1,15 @@
+[Unit]
+Description=libreddit daemon
+After=network.service
+
+[Service]
+DynamicUser=yes
+# Default Values
+Environment=ADDRESS=0.0.0.0
+Environment=PORT=8080
+# Optional Override
+EnvironmentFile=-/etc/libreddit.conf
+ExecStart=/usr/bin/libreddit -a ${ADDRESS} -p ${PORT}
+
+[Install]
+WantedBy=default.target

docker-compose.yml

@@ -0,0 +1,13 @@
+version: "3.8"
+
+services:
+  web:
+    build: .
+    restart: always
+    container_name: "libreddit"
+    ports:
+      - 8080:8080
+    healthcheck:
+      test: ["CMD", "wget", "--spider", "-q", "--tries=1", "http://localhost:8080/settings"]
+      interval: 5m
+      timeout: 3s

heroku.yml

@@ -0,0 +1,3 @@
+build:
+  docker:
+    web: Dockerfile

src/client.rs

@@ -0,0 +1,168 @@
+use cached::proc_macro::cached;
+use futures_lite::{future::Boxed, FutureExt};
+use hyper::{body::Buf, client, Body, Request, Response, Uri};
+use serde_json::Value;
+use std::result::Result;
+
+use crate::server::RequestExt;
+
+pub async fn proxy(req: Request<Body>, format: &str) -> Result<Response<Body>, String> {
+	let mut url = format!("{}?{}", format, req.uri().query().unwrap_or_default());
+
+	// For each parameter in request
+	for (name, value) in req.params().iter() {
+		// Fill the parameter value in the url
+		url = url.replace(&format!("{{{}}}", name), value);
+	}
+
+	stream(&url, &req).await
+}
+
+async fn stream(url: &str, req: &Request<Body>) -> Result<Response<Body>, String> {
+	// First parameter is target URL (mandatory).
+	let uri = url.parse::<Uri>().map_err(|_| "Couldn't parse URL".to_string())?;
+
+	// Prepare the HTTPS connector.
+	let https = hyper_rustls::HttpsConnectorBuilder::new().with_native_roots().https_only().enable_http1().build();
+
+	// Build the hyper client from the HTTPS connector.
+	let client: client::Client<_, hyper::Body> = client::Client::builder().build(https);
+
+	let mut builder = Request::get(uri);
+
+	// Copy useful headers from original request
+	for &key in &["Range", "If-Modified-Since", "Cache-Control"] {
+		if let Some(value) = req.headers().get(key) {
+			builder = builder.header(key, value);
+		}
+	}
+
+	let stream_request = builder.body(Body::empty()).map_err(|_| "Couldn't build empty body in stream".to_string())?;
+
+	client
+		.request(stream_request)
+		.await
+		.map(|mut res| {
+			let mut rm = |key: &str| res.headers_mut().remove(key);
+
+			rm("access-control-expose-headers");
+			rm("server");
+			rm("vary");
+			rm("etag");
+			rm("x-cdn");
+			rm("x-cdn-client-region");
+			rm("x-cdn-name");
+			rm("x-cdn-server-region");
+			rm("x-reddit-cdn");
+			rm("x-reddit-video-features");
+
+			res
+		})
+		.map_err(|e| e.to_string())
+}
+
+fn request(url: String, quarantine: bool) -> Boxed<Result<Response<Body>, String>> {
+	// Prepare the HTTPS connector.
+	let https = hyper_rustls::HttpsConnectorBuilder::new().with_native_roots().https_or_http().enable_http1().build();
+
+	// Construct the hyper client from the HTTPS connector.
+	let client: client::Client<_, hyper::Body> = client::Client::builder().build(https);
+
+	// Build request
+	let builder = Request::builder()
+		.method("GET")
+		.uri(&url)
+		.header("User-Agent", format!("web:libreddit:{}", env!("CARGO_PKG_VERSION")))
+		.header("Host", "www.reddit.com")
+		.header("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8")
+		.header("Accept-Language", "en-US,en;q=0.5")
+		.header("Connection", "keep-alive")
+		.header("Cookie", if quarantine { "_options=%7B%22pref_quarantine_optin%22%3A%20true%7D" } else { "" })
+		.body(Body::empty());
+
+	async move {
+		match builder {
+			Ok(req) => match client.request(req).await {
+				Ok(response) => {
+					if response.status().to_string().starts_with('3') {
+						request(
+							response
+								.headers()
+								.get("Location")
+								.map(|val| {
+									let new_url = val.to_str().unwrap_or_default();
+									format!("{}{}raw_json=1", new_url, if new_url.contains('?') { "&" } else { "?" })
+								})
+								.unwrap_or_default()
+								.to_string(),
+							quarantine,
+						)
+						.await
+					} else {
+						Ok(response)
+					}
+				}
+				Err(e) => Err(e.to_string()),
+			},
+			Err(_) => Err("Post url contains non-ASCII characters".to_string()),
+		}
+	}
+	.boxed()
+}
+
+// Make a request to a Reddit API and parse the JSON response
+#[cached(size = 100, time = 30, result = true)]
+pub async fn json(path: String, quarantine: bool) -> Result<Value, String> {
+	// Build Reddit url from path
+	let url = format!("https://www.reddit.com{}", path);
+
+	// Closure to quickly build errors
+	let err = |msg: &str, e: String| -> Result<Value, String> {
+		// eprintln!("{} - {}: {}", url, msg, e);
+		Err(format!("{}: {}", msg, e))
+	};
+
+	// Fetch the url...
+	match request(url.clone(), quarantine).await {
+		Ok(response) => {
+			let status = response.status();
+
+			// asynchronously aggregate the chunks of the body
+			match hyper::body::aggregate(response).await {
+				Ok(body) => {
+					// Parse the response from Reddit as JSON
+					match serde_json::from_reader(body.reader()) {
+						Ok(value) => {
+							let json: Value = value;
+							// If Reddit returned an error
+							if json["error"].is_i64() {
+								Err(
+									json["reason"]
+										.as_str()
+										.unwrap_or_else(|| {
+											json["message"].as_str().unwrap_or_else(|| {
+												eprintln!("{} - Error parsing reddit error", url);
+												"Error parsing reddit error"
+											})
+										})
+										.to_string(),
+								)
+							} else {
+								Ok(json)
+							}
+						}
+						Err(e) => {
+							if status.is_server_error() {
+								Err("Reddit is having issues, check if there's an outage".to_string())
+							} else {
+								err("Failed to parse page JSON data", e.to_string())
+							}
+						}
+					}
+				}
+				Err(e) => err("Failed receiving body from Reddit", e.to_string()),
+			}
+		}
+		Err(e) => err("Couldn't send request to Reddit", e),
+	}
+}

src/main.rs

@@ -1,6 +1,9 @@
+// Global specifiers
+#![forbid(unsafe_code)]
+#![allow(clippy::cmp_owned)]
+
 // Reference local files
 mod post;
-mod proxy;
 mod search;
 mod settings;
 mod subreddit;
@@ -8,104 +11,95 @@ mod user;
 mod utils;
 
 // Import Crates
-use clap::{App, Arg};
-use proxy::handler;
-use tide::{
-	utils::{async_trait, After},
-	Middleware, Next, Request, Response,
-};
+use clap::{Command, Arg};
+
+use futures_lite::FutureExt;
+use hyper::{header::HeaderValue, Body, Request, Response};
+
+mod client;
+use client::proxy;
+use server::RequestExt;
 use utils::{error, redirect};
 
-// Build middleware
-struct HttpsRedirect<HttpsOnly>(HttpsOnly);
-struct NormalizePath;
-
-#[async_trait]
-impl<State, HttpsOnly> Middleware<State> for HttpsRedirect<HttpsOnly>
-where
-	State: Clone + Send + Sync + 'static,
-	HttpsOnly: Into<bool> + Copy + Send + Sync + 'static,
-{
-	async fn handle(&self, request: Request<State>, next: Next<'_, State>) -> tide::Result {
-		let secure = request.url().scheme() == "https";
-
-		if self.0.into() && !secure {
-			let mut secured = request.url().to_owned();
-			secured.set_scheme("https").unwrap_or_default();
-
-			Ok(redirect(secured.to_string()))
-		} else {
-			Ok(next.run(request).await)
-		}
-	}
-}
-
-#[async_trait]
-impl<State: Clone + Send + Sync + 'static> Middleware<State> for NormalizePath {
-	async fn handle(&self, request: Request<State>, next: Next<'_, State>) -> tide::Result {
-		let path = request.url().path();
-		let query = request.url().query().unwrap_or_default();
-		if path.ends_with('/') {
-			Ok(next.run(request).await)
-		} else {
-			let normalized = if query != "" {
-				format!("{}/?{}", path.replace("//", "/"), query)
-			} else {
-				format!("{}/", path.replace("//", "/"))
-			};
-			Ok(redirect(normalized))
-		}
-	}
-}
+mod server;
 
 // Create Services
 
 // Required for the manifest to be valid
-async fn pwa_logo(_req: Request<()>) -> tide::Result {
-	Ok(Response::builder(200).content_type("image/png").body(include_bytes!("../static/logo.png").as_ref()).build())
+async fn pwa_logo() -> Result<Response<Body>, String> {
+	Ok(
+		Response::builder()
+			.status(200)
+			.header("content-type", "image/png")
+			.body(include_bytes!("../static/logo.png").as_ref().into())
+			.unwrap_or_default(),
+	)
 }
 
 // Required for iOS App Icons
-async fn iphone_logo(_req: Request<()>) -> tide::Result {
+async fn iphone_logo() -> Result<Response<Body>, String> {
 	Ok(
-		Response::builder(200)
-			.content_type("image/png")
-			.body(include_bytes!("../static/apple-touch-icon.png").as_ref())
-			.build(),
+		Response::builder()
+			.status(200)
+			.header("content-type", "image/png")
+			.body(include_bytes!("../static/apple-touch-icon.png").as_ref().into())
+			.unwrap_or_default(),
 	)
 }
 
-async fn favicon(_req: Request<()>) -> tide::Result {
+async fn favicon() -> Result<Response<Body>, String> {
 	Ok(
-		Response::builder(200)
-			.content_type("image/vnd.microsoft.icon")
+		Response::builder()
+			.status(200)
+			.header("content-type", "image/vnd.microsoft.icon")
 			.header("Cache-Control", "public, max-age=1209600, s-maxage=86400")
-			.body(include_bytes!("../static/favicon.ico").as_ref())
-			.build(),
+			.body(include_bytes!("../static/favicon.ico").as_ref().into())
+			.unwrap_or_default(),
 	)
 }
 
-async fn resource(body: &str, content_type: &str, cache: bool) -> tide::Result {
-	let mut res = Response::new(200);
+async fn font() -> Result<Response<Body>, String> {
+	Ok(
+		Response::builder()
+			.status(200)
+			.header("content-type", "font/woff2")
+			.header("Cache-Control", "public, max-age=1209600, s-maxage=86400")
+			.body(include_bytes!("../static/Inter.var.woff2").as_ref().into())
+			.unwrap_or_default(),
+	)
+}
+
+async fn resource(body: &str, content_type: &str, cache: bool) -> Result<Response<Body>, String> {
+	let mut res = Response::builder()
+		.status(200)
+		.header("content-type", content_type)
+		.body(body.to_string().into())
+		.unwrap_or_default();
 
 	if cache {
-		res.insert_header("Cache-Control", "public, max-age=1209600, s-maxage=86400");
+		if let Ok(val) = HeaderValue::from_str("public, max-age=1209600, s-maxage=86400") {
+			res.headers_mut().insert("Cache-Control", val);
+		}
 	}
 
-	res.set_content_type(content_type);
-	res.set_body(body);
-
 	Ok(res)
 }
 
-#[async_std::main]
-async fn main() -> tide::Result<()> {
-	let matches = App::new("Libreddit")
+#[tokio::main]
+async fn main() {
+	let matches = Command::new("Libreddit")
 		.version(env!("CARGO_PKG_VERSION"))
 		.about("Private front-end for Reddit written in Rust ")
 		.arg(
-			Arg::with_name("address")
-				.short("a")
+			Arg::new("redirect-https")
+				.short('r')
+				.long("redirect-https")
+				.help("Redirect all HTTP requests to HTTPS (no longer functional)")
+				.takes_value(false),
+		)
+		.arg(
+			Arg::new("address")
+				.short('a')
 				.long("address")
 				.value_name("ADDRESS")
 				.help("Sets address to listen on")
@@ -113,8 +107,8 @@ async fn main() -> tide::Result<()> {
 				.takes_value(true),
 		)
 		.arg(
-			Arg::with_name("port")
-				.short("p")
+			Arg::new("port")
+				.short('p')
 				.long("port")
 				.value_name("PORT")
 				.help("Port to listen on")
@@ -122,142 +116,165 @@ async fn main() -> tide::Result<()> {
 				.takes_value(true),
 		)
 		.arg(
-			Arg::with_name("redirect-https")
-				.short("r")
-				.long("redirect-https")
-				.help("Redirect all HTTP requests to HTTPS")
-				.takes_value(false),
+			Arg::new("hsts")
+				.short('H')
+				.long("hsts")
+				.value_name("EXPIRE_TIME")
+				.help("HSTS header to tell browsers that this site should only be accessed over HTTPS")
+				.default_value("604800")
+				.takes_value(true),
 		)
 		.get_matches();
 
 	let address = matches.value_of("address").unwrap_or("0.0.0.0");
-	let port = matches.value_of("port").unwrap_or("8080");
-	let force_https = matches.is_present("redirect-https");
+	let port = std::env::var("PORT").unwrap_or_else(|_| matches.value_of("port").unwrap_or("8080").to_string());
+	let hsts = matches.value_of("hsts");
 
-	let listener = format!("{}:{}", address, port);
+	let listener = [address, ":", &port].concat();
 
 	println!("Starting Libreddit...");
 
-	// Start HTTP server
-	let mut app = tide::new();
+	// Begin constructing a server
+	let mut app = server::Server::new();
 
-	// Redirect to HTTPS if "--redirect-https" enabled
-	app.with(HttpsRedirect(force_https));
+	// Define default headers (added to all responses)
+	app.default_headers = headers! {
+		"Referrer-Policy" => "no-referrer",
+		"X-Content-Type-Options" => "nosniff",
+		"X-Frame-Options" => "DENY",
+		"Content-Security-Policy" => "default-src 'none'; font-src 'self'; script-src 'self' blob:; manifest-src 'self'; media-src 'self' data: blob: about:; style-src 'self' 'unsafe-inline'; base-uri 'none'; img-src 'self' data:; form-action 'self'; frame-ancestors 'none'; connect-src 'self'; worker-src blob:;"
+	};
 
-	// Append trailing slash and remove double slashes
-	app.with(NormalizePath);
-
-	// Apply default headers for security
-	app.with(After(|mut res: Response| async move {
-		res.insert_header("Referrer-Policy", "no-referrer");
-		res.insert_header("X-Content-Type-Options", "nosniff");
-		res.insert_header("X-Frame-Options", "DENY");
-		res.insert_header(
-			"Content-Security-Policy",
-			"default-src 'none'; manifest-src 'self'; media-src 'self'; style-src 'self' 'unsafe-inline'; base-uri 'none'; img-src 'self' data:; form-action 'self'; frame-ancestors 'none';",
-		);
-		Ok(res)
-	}));
+	if let Some(expire_time) = hsts {
+		if let Ok(val) = HeaderValue::from_str(&format!("max-age={}", expire_time)) {
+			app.default_headers.insert("Strict-Transport-Security", val);
+		}
+	}
 
 	// Read static files
-	app.at("/style.css/").get(|_| resource(include_str!("../static/style.css"), "text/css", false));
+	app.at("/style.css").get(|_| resource(include_str!("../static/style.css"), "text/css", false).boxed());
 	app
-		.at("/manifest.json/")
-		.get(|_| resource(include_str!("../static/manifest.json"), "application/json", false));
-	app.at("/robots.txt/").get(|_| resource("User-agent: *\nAllow: /", "text/plain", true));
-	app.at("/favicon.ico/").get(favicon);
-	app.at("/logo.png/").get(pwa_logo);
-	app.at("/touch-icon-iphone.png/").get(iphone_logo);
-	app.at("/apple-touch-icon.png/").get(iphone_logo);
+		.at("/manifest.json")
+		.get(|_| resource(include_str!("../static/manifest.json"), "application/json", false).boxed());
+	app
+		.at("/robots.txt")
+		.get(|_| resource("User-agent: *\nDisallow: /u/\nDisallow: /user/", "text/plain", true).boxed());
+	app.at("/favicon.ico").get(|_| favicon().boxed());
+	app.at("/logo.png").get(|_| pwa_logo().boxed());
+	app.at("/Inter.var.woff2").get(|_| font().boxed());
+	app.at("/touch-icon-iphone.png").get(|_| iphone_logo().boxed());
+	app.at("/apple-touch-icon.png").get(|_| iphone_logo().boxed());
+	app
+		.at("/playHLSVideo.js")
+		.get(|_| resource(include_str!("../static/playHLSVideo.js"), "text/javascript", false).boxed());
+	app
+		.at("/hls.min.js")
+		.get(|_| resource(include_str!("../static/hls.min.js"), "text/javascript", false).boxed());
 
 	// Proxy media through Libreddit
+	app.at("/vid/:id/:size").get(|r| proxy(r, "https://v.redd.it/{id}/DASH_{size}").boxed());
+	app.at("/hls/:id/*path").get(|r| proxy(r, "https://v.redd.it/{id}/{path}").boxed());
+	app.at("/img/*path").get(|r| proxy(r, "https://i.redd.it/{path}").boxed());
+	app.at("/thumb/:point/:id").get(|r| proxy(r, "https://{point}.thumbs.redditmedia.com/{id}").boxed());
+	app.at("/emoji/:id/:name").get(|r| proxy(r, "https://emoji.redditmedia.com/{id}/{name}").boxed());
 	app
-		.at("/vid/:id/:size/") /*      */
-		.get(|req| handler(req, "https://v.redd.it/{}/DASH_{}", vec!["id", "size"]));
-	app
-		.at("/img/:id/") /*            */
-		.get(|req| handler(req, "https://i.redd.it/{}", vec!["id"]));
-	app
-		.at("/thumb/:point/:id/") /*   */
-		.get(|req| handler(req, "https://{}.thumbs.redditmedia.com/{}", vec!["point", "id"]));
-	app
-		.at("/emoji/:id/:name/") /*    */
-		.get(|req| handler(req, "https://emoji.redditmedia.com/{}/{}", vec!["id", "name"]));
-	app
-		.at("/preview/:loc/:id/:query/")
-		.get(|req| handler(req, "https://{}view.redd.it/{}?{}", vec!["loc", "id", "query"]));
-	app
-		.at("/style/*path/") /*        */
-		.get(|req| handler(req, "https://styles.redditmedia.com/{}", vec!["path"]));
-	app
-		.at("/static/*path/") /*       */
-		.get(|req| handler(req, "https://www.redditstatic.com/{}", vec!["path"]));
+		.at("/preview/:loc/award_images/:fullname/:id")
+		.get(|r| proxy(r, "https://{loc}view.redd.it/award_images/{fullname}/{id}").boxed());
+	app.at("/preview/:loc/:id").get(|r| proxy(r, "https://{loc}view.redd.it/{id}").boxed());
+	app.at("/style/*path").get(|r| proxy(r, "https://styles.redditmedia.com/{path}").boxed());
+	app.at("/static/*path").get(|r| proxy(r, "https://www.redditstatic.com/{path}").boxed());
 
 	// Browse user profile
-	app.at("/u/:name/").get(user::profile);
-	app.at("/u/:name/comments/:id/:title/").get(post::item);
-	app.at("/u/:name/comments/:id/:title/:comment_id/").get(post::item);
+	app
+		.at("/u/:name")
+		.get(|r| async move { Ok(redirect(format!("/user/{}", r.param("name").unwrap_or_default()))) }.boxed());
+	app.at("/u/:name/comments/:id/:title").get(|r| post::item(r).boxed());
+	app.at("/u/:name/comments/:id/:title/:comment_id").get(|r| post::item(r).boxed());
 
-	app.at("/user/:name/").get(user::profile);
-	app.at("/user/:name/comments/:id/").get(post::item);
-	app.at("/user/:name/comments/:id/:title/").get(post::item);
-	app.at("/user/:name/comments/:id/:title/:comment_id/").get(post::item);
+	app.at("/user/[deleted]").get(|req| error(req, "User has deleted their account".to_string()).boxed());
+	app.at("/user/:name").get(|r| user::profile(r).boxed());
+	app.at("/user/:name/:listing").get(|r| user::profile(r).boxed());
+	app.at("/user/:name/comments/:id").get(|r| post::item(r).boxed());
+	app.at("/user/:name/comments/:id/:title").get(|r| post::item(r).boxed());
+	app.at("/user/:name/comments/:id/:title/:comment_id").get(|r| post::item(r).boxed());
 
 	// Configure settings
-	app.at("/settings/").get(settings::get).post(settings::set);
-	app.at("/settings/restore/").get(settings::restore);
+	app.at("/settings").get(|r| settings::get(r).boxed()).post(|r| settings::set(r).boxed());
+	app.at("/settings/restore").get(|r| settings::restore(r).boxed());
+	app.at("/settings/update").get(|r| settings::update(r).boxed());
 
 	// Subreddit services
-	app.at("/r/:sub/").get(subreddit::page);
+	app
+		.at("/r/:sub")
+		.get(|r| subreddit::community(r).boxed())
+		.post(|r| subreddit::add_quarantine_exception(r).boxed());
 
-	app.at("/r/:sub/subscribe/").post(subreddit::subscriptions);
-	app.at("/r/:sub/unsubscribe/").post(subreddit::subscriptions);
+	app
+		.at("/r/u_:name")
+		.get(|r| async move { Ok(redirect(format!("/user/{}", r.param("name").unwrap_or_default()))) }.boxed());
 
-	app.at("/r/:sub/comments/:id/").get(post::item);
-	app.at("/r/:sub/comments/:id/:title/").get(post::item);
-	app.at("/r/:sub/comments/:id/:title/:comment_id/").get(post::item);
+	app.at("/r/:sub/subscribe").post(|r| subreddit::subscriptions_filters(r).boxed());
+	app.at("/r/:sub/unsubscribe").post(|r| subreddit::subscriptions_filters(r).boxed());
+	app.at("/r/:sub/filter").post(|r| subreddit::subscriptions_filters(r).boxed());
+	app.at("/r/:sub/unfilter").post(|r| subreddit::subscriptions_filters(r).boxed());
 
-	app.at("/r/:sub/search/").get(search::find);
+	app.at("/r/:sub/comments/:id").get(|r| post::item(r).boxed());
+	app.at("/r/:sub/comments/:id/:title").get(|r| post::item(r).boxed());
+	app.at("/r/:sub/comments/:id/:title/:comment_id").get(|r| post::item(r).boxed());
 
-	app.at("/r/:sub/wiki/").get(subreddit::wiki);
-	app.at("/r/:sub/wiki/:page/").get(subreddit::wiki);
-	app.at("/r/:sub/w/").get(subreddit::wiki);
-	app.at("/r/:sub/w/:page/").get(subreddit::wiki);
+	app.at("/r/:sub/search").get(|r| search::find(r).boxed());
 
-	app.at("/r/:sub/:sort/").get(subreddit::page);
+	app
+		.at("/r/:sub/w")
+		.get(|r| async move { Ok(redirect(format!("/r/{}/wiki", r.param("sub").unwrap_or_default()))) }.boxed());
+	app
+		.at("/r/:sub/w/*page")
+		.get(|r| async move { Ok(redirect(format!("/r/{}/wiki/{}", r.param("sub").unwrap_or_default(), r.param("wiki").unwrap_or_default()))) }.boxed());
+	app.at("/r/:sub/wiki").get(|r| subreddit::wiki(r).boxed());
+	app.at("/r/:sub/wiki/*page").get(|r| subreddit::wiki(r).boxed());
+
+	app.at("/r/:sub/about/sidebar").get(|r| subreddit::sidebar(r).boxed());
+
+	app.at("/r/:sub/:sort").get(|r| subreddit::community(r).boxed());
+
+	// Comments handler
+	app.at("/comments/:id").get(|r| post::item(r).boxed());
 
 	// Front page
-	app.at("/").get(subreddit::page);
+	app.at("/").get(|r| subreddit::community(r).boxed());
 
 	// View Reddit wiki
-	app.at("/w/").get(subreddit::wiki);
-	app.at("/w/:page/").get(subreddit::wiki);
-	app.at("/wiki/").get(subreddit::wiki);
-	app.at("/wiki/:page/").get(subreddit::wiki);
+	app.at("/w").get(|_| async { Ok(redirect("/wiki".to_string())) }.boxed());
+	app
+		.at("/w/*page")
+		.get(|r| async move { Ok(redirect(format!("/wiki/{}", r.param("page").unwrap_or_default()))) }.boxed());
+	app.at("/wiki").get(|r| subreddit::wiki(r).boxed());
+	app.at("/wiki/*page").get(|r| subreddit::wiki(r).boxed());
 
 	// Search all of Reddit
-	app.at("/search/").get(search::find);
+	app.at("/search").get(|r| search::find(r).boxed());
 
 	// Handle about pages
-	app.at("/about/").get(|req| error(req, "About pages aren't here yet".to_string()));
+	app.at("/about").get(|req| error(req, "About pages aren't added yet".to_string()).boxed());
 
-	app.at("/:id/").get(|req: Request<()>| async {
-		match req.param("id") {
-			// Sort front page
-			Ok("best") | Ok("hot") | Ok("new") | Ok("top") | Ok("rising") | Ok("controversial") => subreddit::page(req).await,
-			// Short link for post
-			Ok(id) if id.len() > 4 && id.len() < 7 => post::item(req).await,
-			// Error message for unknown pages
-			_ => error(req, "Nothing here".to_string()).await,
-		}
+	app.at("/:id").get(|req: Request<Body>| match req.param("id").as_deref() {
+		// Sort front page
+		Some("best" | "hot" | "new" | "top" | "rising" | "controversial") => subreddit::community(req).boxed(),
+		// Short link for post
+		Some(id) if id.len() > 4 && id.len() < 7 => post::item(req).boxed(),
+		// Error message for unknown pages
+		_ => error(req, "Nothing here".to_string()).boxed(),
 	});
 
 	// Default service in case no routes match
-	app.at("*").get(|req| error(req, "Nothing here".to_string()));
+	app.at("/*").get(|req| error(req, "Nothing here".to_string()).boxed());
 
 	println!("Running Libreddit v{} on {}!", env!("CARGO_PKG_VERSION"), listener);
 
-	app.listen(&listener).await?;
+	let server = app.listen(listener);
 
-	Ok(())
+	// Run this server for... forever!
+	if let Err(e) = server.await {
+		eprintln!("Server error: {}", e);
+	}
 }

src/post.rs

@@ -1,10 +1,15 @@
 // CRATES
-use crate::utils::*;
-use tide::Request;
-
-use async_recursion::async_recursion;
+use crate::client::json;
+use crate::esc;
+use crate::server::RequestExt;
+use crate::subreddit::{can_access_quarantine, quarantine};
+use crate::utils::{
+	error, format_num, format_url, get_filters, param, rewrite_urls, setting, template, time, val, Author, Awards, Comment, Flags, Flair, FlairPart, Media, Post, Preferences,
+};
+use hyper::{Body, Request, Response};
 
 use askama::Template;
+use std::collections::HashSet;
 
 // STRUCTS
 #[derive(Template)]
@@ -15,38 +20,44 @@ struct PostTemplate {
 	sort: String,
 	prefs: Preferences,
 	single_thread: bool,
+	url: String,
 }
 
-pub async fn item(req: Request<()>) -> tide::Result {
+pub async fn item(req: Request<Body>) -> Result<Response<Body>, String> {
 	// Build Reddit API path
-	let mut path: String = format!("{}.json?{}&raw_json=1", req.url().path(), req.url().query().unwrap_or_default());
+	let mut path: String = format!("{}.json?{}&raw_json=1", req.uri().path(), req.uri().query().unwrap_or_default());
+	let sub = req.param("sub").unwrap_or_default();
+	let quarantined = can_access_quarantine(&req, &sub);
 
 	// Set sort to sort query parameter
-	let mut sort: String = param(&path, "sort");
+	let sort = param(&path, "sort").unwrap_or_else(|| {
+		// Grab default comment sort method from Cookies
+		let default_sort = setting(&req, "comment_sort");
 
-	// Grab default comment sort method from Cookies
-	let default_sort = cookie(&req, "comment_sort");
-
-	// If there's no sort query but there's a default sort, set sort to default_sort
-	if sort.is_empty() && !default_sort.is_empty() {
-		sort = default_sort;
-		path = format!("{}.json?{}&sort={}&raw_json=1", req.url().path(), req.url().query().unwrap_or_default(), sort);
-	}
+		// If there's no sort query but there's a default sort, set sort to default_sort
+		if default_sort.is_empty() {
+			String::new()
+		} else {
+			path = format!("{}.json?{}&sort={}&raw_json=1", req.uri().path(), req.uri().query().unwrap_or_default(), default_sort);
+			default_sort
+		}
+	});
 
 	// Log the post ID being fetched in debug mode
 	#[cfg(debug_assertions)]
-	dbg!(req.param("id").unwrap_or(""));
+	dbg!(req.param("id").unwrap_or_default());
 
-	let single_thread = &req.param("comment_id").is_ok();
+	let single_thread = req.param("comment_id").is_some();
 	let highlighted_comment = &req.param("comment_id").unwrap_or_default();
 
 	// Send a request to the url, receive JSON in response
-	match request(path).await {
+	match json(path, quarantined).await {
 		// Otherwise, grab the JSON output from the request
-		Ok(res) => {
+		Ok(response) => {
 			// Parse the JSON into Post and Comment structs
-			let post = parse_post(&res[0]).await;
-			let comments = parse_comments(&res[1], &post.permalink, &post.author.name, *highlighted_comment).await;
+			let post = parse_post(&response[0]).await;
+			let comments = parse_comments(&response[1], &post.permalink, &post.author.name, highlighted_comment, &get_filters(&req));
+			let url = req.uri().to_string();
 
 			// Use the Post and Comment structs to generate a website to show users
 			template(PostTemplate {
@@ -54,11 +65,19 @@ pub async fn item(req: Request<()>) -> tide::Result {
 				post,
 				sort,
 				prefs: Preferences::new(req),
-				single_thread: *single_thread,
+				single_thread,
+				url,
 			})
 		}
 		// If the Reddit API returns an error, exit and send error page to user
-		Err(msg) => error(req, msg).await,
+		Err(msg) => {
+			if msg == "quarantined" {
+				let sub = req.param("sub").unwrap_or_default();
+				quarantine(req, sub)
+			} else {
+				error(req, msg).await
+			}
+		}
 	}
 }
 
@@ -76,12 +95,22 @@ async fn parse_post(json: &serde_json::Value) -> Post {
 	// Determine the type of media along with the media URL
 	let (post_type, media, gallery) = Media::parse(&post["data"]).await;
 
+	let awards: Awards = Awards::parse(&post["data"]["all_awardings"]);
+
+	let permalink = val(post, "permalink");
+
+	let body = if val(post, "removed_by_category") == "moderator" {
+		format!("<div class=\"md\"><p>[removed] — <a href=\"https://www.reveddit.com{}\">view removed post</a></p></div>", permalink)
+	} else {
+		rewrite_urls(&val(post, "selftext_html")).replace("\\", "")
+	};
+
 	// Build a post using data parsed from Reddit post API
 	Post {
 		id: val(post, "id"),
-		title: val(post, "title"),
+		title: esc!(post, "title"),
 		community: val(post, "subreddit"),
-		body: rewrite_urls(&val(post, "selftext_html")).replace("\\", ""),
+		body,
 		author: Author {
 			name: val(post, "author"),
 			flair: Flair {
@@ -90,19 +119,20 @@ async fn parse_post(json: &serde_json::Value) -> Post {
 					post["data"]["author_flair_richtext"].as_array(),
 					post["data"]["author_flair_text"].as_str(),
 				),
-				text: val(post, "link_flair_text"),
+				text: esc!(post, "link_flair_text"),
 				background_color: val(post, "author_flair_background_color"),
 				foreground_color: val(post, "author_flair_text_color"),
 			},
 			distinguished: val(post, "distinguished"),
 		},
-		permalink: val(post, "permalink"),
+		permalink,
 		score: format_num(score),
 		upvote_ratio: ratio as i64,
 		post_type,
 		media,
 		thumbnail: Media {
 			url: format_url(val(post, "thumbnail").as_str()),
+			alt_url: String::new(),
 			width: post["data"]["thumbnail_width"].as_i64().unwrap_or_default(),
 			height: post["data"]["thumbnail_height"].as_i64().unwrap_or_default(),
 			poster: "".to_string(),
@@ -113,7 +143,7 @@ async fn parse_post(json: &serde_json::Value) -> Post {
 				post["data"]["link_flair_richtext"].as_array(),
 				post["data"]["link_flair_text"].as_str(),
 			),
-			text: val(post, "link_flair_text"),
+			text: esc!(post, "link_flair_text"),
 			background_color: val(post, "link_flair_background_color"),
 			foreground_color: if val(post, "link_flair_text_color") == "dark" {
 				"black".to_string()
@@ -130,58 +160,51 @@ async fn parse_post(json: &serde_json::Value) -> Post {
 		created,
 		comments: format_num(post["data"]["num_comments"].as_i64().unwrap_or_default()),
 		gallery,
+		awards,
 	}
 }
 
 // COMMENTS
-#[async_recursion]
-async fn parse_comments(json: &serde_json::Value, post_link: &str, post_author: &str, highlighted_comment: &str) -> Vec<Comment> {
-	// Separate the comment JSON into a Vector of comments
-	let comment_data = match json["data"]["children"].as_array() {
-		Some(f) => f.to_owned(),
-		None => Vec::new(),
-	};
-
-	let mut comments: Vec<Comment> = Vec::new();
+fn parse_comments(json: &serde_json::Value, post_link: &str, post_author: &str, highlighted_comment: &str, filters: &HashSet<String>) -> Vec<Comment> {
+	// Parse the comment JSON into a Vector of Comments
+	let comments = json["data"]["children"].as_array().map_or(Vec::new(), std::borrow::ToOwned::to_owned);
 
 	// For each comment, retrieve the values to build a Comment object
-	for comment in comment_data {
-		let kind = comment["kind"].as_str().unwrap_or_default().to_string();
-		let data = &comment["data"];
+	comments
+		.into_iter()
+		.map(|comment| {
+			let kind = comment["kind"].as_str().unwrap_or_default().to_string();
+			let data = &comment["data"];
 
-		let unix_time = data["created_utc"].as_f64().unwrap_or_default();
-		let (rel_time, created) = time(unix_time);
+			let unix_time = data["created_utc"].as_f64().unwrap_or_default();
+			let (rel_time, created) = time(unix_time);
 
-		let edited = match data["edited"].as_f64() {
-			Some(stamp) => time(stamp),
-			None => (String::new(), String::new()),
-		};
+			let edited = data["edited"].as_f64().map_or((String::new(), String::new()), time);
 
-		let score = data["score"].as_i64().unwrap_or(0);
-		let body = rewrite_urls(&val(&comment, "body_html"));
+			let score = data["score"].as_i64().unwrap_or(0);
 
-		// If this comment contains replies, handle those too
-		let replies: Vec<Comment> = if data["replies"].is_object() {
-			parse_comments(&data["replies"], post_link, post_author, highlighted_comment).await
-		} else {
-			Vec::new()
-		};
+			// If this comment contains replies, handle those too
+			let replies: Vec<Comment> = if data["replies"].is_object() {
+				parse_comments(&data["replies"], post_link, post_author, highlighted_comment, filters)
+			} else {
+				Vec::new()
+			};
 
-		let parent_kind_and_id = val(&comment, "parent_id");
-		let parent_info = parent_kind_and_id.split('_').collect::<Vec<&str>>();
+			let awards: Awards = Awards::parse(&data["all_awardings"]);
 
-		let id = val(&comment, "id");
-		let highlighted = id == highlighted_comment;
+			let parent_kind_and_id = val(&comment, "parent_id");
+			let parent_info = parent_kind_and_id.split('_').collect::<Vec<&str>>();
 
-		comments.push(Comment {
-			id,
-			kind,
-			parent_id: parent_info[1].to_string(),
-			parent_kind: parent_info[0].to_string(),
-			post_link: post_link.to_string(),
-			post_author: post_author.to_string(),
-			body,
-			author: Author {
+			let id = val(&comment, "id");
+			let highlighted = id == highlighted_comment;
+
+			let body = if val(&comment, "author") == "[deleted]" && val(&comment, "body") == "[removed]" {
+				format!("<div class=\"md\"><p>[removed] — <a href=\"https://www.reveddit.com{}{}\">view removed comment</a></p></div>", post_link, id)
+			} else {
+				rewrite_urls(&val(&comment, "body_html")).to_string()
+			};
+
+			let author = Author {
 				name: val(&comment, "author"),
 				flair: Flair {
 					flair_parts: FlairPart::parse(
@@ -189,24 +212,45 @@ async fn parse_comments(json: &serde_json::Value, post_link: &str, post_author:
 						data["author_flair_richtext"].as_array(),
 						data["author_flair_text"].as_str(),
 					),
-					text: val(&comment, "link_flair_text"),
+					text: esc!(&comment, "link_flair_text"),
 					background_color: val(&comment, "author_flair_background_color"),
 					foreground_color: val(&comment, "author_flair_text_color"),
 				},
 				distinguished: val(&comment, "distinguished"),
-			},
-			score: if data["score_hidden"].as_bool().unwrap_or_default() {
-				"•".to_string()
-			} else {
-				format_num(score)
-			},
-			rel_time,
-			created,
-			edited,
-			replies,
-			highlighted,
-		});
-	}
+			};
+			let is_filtered = filters.contains(&["u_", author.name.as_str()].concat());
 
-	comments
+			// Many subreddits have a default comment posted about the sub's rules etc.
+			// Many libreddit users do not wish to see this kind of comment by default.
+			// Reddit does not tell us which users are "bots", so a good heuristic is to
+			// collapse stickied moderator comments.
+			let is_moderator_comment = data["distinguished"].as_str().unwrap_or_default() == "moderator";
+			let is_stickied = data["stickied"].as_bool().unwrap_or_default();
+			let collapsed = (is_moderator_comment && is_stickied) || is_filtered;
+
+			Comment {
+				id,
+				kind,
+				parent_id: parent_info[1].to_string(),
+				parent_kind: parent_info[0].to_string(),
+				post_link: post_link.to_string(),
+				post_author: post_author.to_string(),
+				body,
+				author,
+				score: if data["score_hidden"].as_bool().unwrap_or_default() {
+					("\u{2022}".to_string(), "Hidden".to_string())
+				} else {
+					format_num(score)
+				},
+				rel_time,
+				created,
+				edited,
+				replies,
+				highlighted,
+				awards,
+				collapsed,
+				is_filtered,
+			}
+		})
+		.collect()
 }

src/proxy.rs

@@ -1,32 +0,0 @@
-use surf::Body;
-use tide::{Request, Response};
-
-pub async fn handler(req: Request<()>, format: &str, params: Vec<&str>) -> tide::Result {
-	let mut url = format.to_string();
-
-	for name in params {
-		let param = req.param(name).unwrap_or_default();
-		url = url.replacen("{}", param, 1);
-	}
-
-	request(url).await
-}
-
-async fn request(url: String) -> tide::Result {
-	match surf::get(url).await {
-		Ok(res) => {
-			let content_length = res.header("Content-Length").map(|v| v.to_string()).unwrap_or_default();
-			let content_type = res.content_type().map(|m| m.to_string()).unwrap_or_default();
-
-			Ok(
-				Response::builder(res.status())
-					.body(Body::from_reader(res, None))
-					.header("Cache-Control", "public, max-age=1209600, s-maxage=86400")
-					.header("Content-Length", content_length)
-					.header("Content-Type", content_type)
-					.build(),
-			)
-		}
-		Err(e) => Ok(Response::builder(503).body(e.to_string()).build()),
-	}
-}

src/search.rs

@@ -1,7 +1,12 @@
 // CRATES
-use crate::utils::{cookie, error, param, request, template, val, Post, Preferences};
+use crate::utils::{catch_random, error, filter_posts, format_num, format_url, get_filters, param, redirect, setting, template, val, Post, Preferences};
+use crate::{
+	client::json,
+	subreddit::{can_access_quarantine, quarantine},
+	RequestExt,
+};
 use askama::Template;
-use tide::Request;
+use hyper::{Body, Request, Response};
 
 // STRUCTS
 struct SearchParams {
@@ -11,14 +16,16 @@ struct SearchParams {
 	before: String,
 	after: String,
 	restrict_sr: String,
+	typed: String,
 }
 
 // STRUCTS
 struct Subreddit {
 	name: String,
 	url: String,
+	icon: String,
 	description: String,
-	subscribers: i64,
+	subscribers: (String, String),
 }
 
 #[derive(Template)]
@@ -29,68 +36,129 @@ struct SearchTemplate {
 	sub: String,
 	params: SearchParams,
 	prefs: Preferences,
+	url: String,
+	/// Whether the subreddit itself is filtered.
+	is_filtered: bool,
+	/// Whether all fetched posts are filtered (to differentiate between no posts fetched in the first place,
+	/// and all fetched posts being filtered).
+	all_posts_filtered: bool,
 }
 
 // SERVICES
-pub async fn find(req: Request<()>) -> tide::Result {
-	let nsfw_results = if cookie(&req, "show_nsfw") == "on" { "&include_over_18=on" } else { "" };
-	let path = format!("{}.json?{}{}", req.url().path(), req.url().query().unwrap_or_default(), nsfw_results);
-	let sub = req.param("sub").unwrap_or("").to_string();
-	let query = param(&path, "q");
+pub async fn find(req: Request<Body>) -> Result<Response<Body>, String> {
+	let nsfw_results = if setting(&req, "show_nsfw") == "on" { "&include_over_18=on" } else { "" };
+	let path = format!("{}.json?{}{}&raw_json=1", req.uri().path(), req.uri().query().unwrap_or_default(), nsfw_results);
+	let query = param(&path, "q").unwrap_or_default();
 
-	let sort = if param(&path, "sort").is_empty() {
-		"relevance".to_string()
-	} else {
-		param(&path, "sort")
-	};
+	if query.is_empty() {
+		return Ok(redirect("/".to_string()));
+	}
 
-	let subreddits = if param(&path, "restrict_sr").is_empty() {
-		search_subreddits(&query).await
+	if query.starts_with("r/") {
+		return Ok(redirect(format!("/{}", query)));
+	}
+
+	let sub = req.param("sub").unwrap_or_default();
+	let quarantined = can_access_quarantine(&req, &sub);
+	// Handle random subreddits
+	if let Ok(random) = catch_random(&sub, "/find").await {
+		return Ok(random);
+	}
+
+	let typed = param(&path, "type").unwrap_or_default();
+
+	let sort = param(&path, "sort").unwrap_or_else(|| "relevance".to_string());
+	let filters = get_filters(&req);
+
+	// If search is not restricted to this subreddit, show other subreddits in search results
+	let subreddits = if param(&path, "restrict_sr").is_none() {
+		let mut subreddits = search_subreddits(&query, &typed).await;
+		subreddits.retain(|s| !filters.contains(s.name.as_str()));
+		subreddits
 	} else {
 		Vec::new()
 	};
 
-	match Post::fetch(&path, String::new()).await {
-		Ok((posts, after)) => template(SearchTemplate {
-			posts,
+	let url = String::from(req.uri().path_and_query().map_or("", |val| val.as_str()));
+
+	// If all requested subs are filtered, we don't need to fetch posts.
+	if sub.split('+').all(|s| filters.contains(s)) {
+		template(SearchTemplate {
+			posts: Vec::new(),
 			subreddits,
 			sub,
 			params: SearchParams {
 				q: query.replace('"', "&quot;"),
 				sort,
-				t: param(&path, "t"),
-				before: param(&path, "after"),
-				after,
-				restrict_sr: param(&path, "restrict_sr"),
+				t: param(&path, "t").unwrap_or_default(),
+				before: param(&path, "after").unwrap_or_default(),
+				after: "".to_string(),
+				restrict_sr: param(&path, "restrict_sr").unwrap_or_default(),
+				typed,
 			},
 			prefs: Preferences::new(req),
-		}),
-		Err(msg) => error(req, msg).await,
-	}
-}
+			url,
+			is_filtered: true,
+			all_posts_filtered: false,
+		})
+	} else {
+		match Post::fetch(&path, quarantined).await {
+			Ok((mut posts, after)) => {
+				let all_posts_filtered = filter_posts(&mut posts, &filters);
 
-async fn search_subreddits(q: &str) -> Vec<Subreddit> {
-	let subreddit_search_path = format!("/subreddits/search.json?q={}&limit=3", q.replace(' ', "+"));
-
-	// Send a request to the url
-	match request(subreddit_search_path).await {
-		// If success, receive JSON in response
-		Ok(response) => {
-			match response["data"]["children"].as_array() {
-				// For each subreddit from subreddit list
-				Some(list) => list
-					.iter()
-					.map(|subreddit| Subreddit {
-						name: val(subreddit, "display_name_prefixed"),
-						url: val(subreddit, "url"),
-						description: val(subreddit, "public_description"),
-						subscribers: subreddit["data"]["subscribers"].as_u64().unwrap_or_default() as i64,
-					})
-					.collect::<Vec<Subreddit>>(),
-				_ => Vec::new(),
+				template(SearchTemplate {
+					posts,
+					subreddits,
+					sub,
+					params: SearchParams {
+						q: query.replace('"', "&quot;"),
+						sort,
+						t: param(&path, "t").unwrap_or_default(),
+						before: param(&path, "after").unwrap_or_default(),
+						after,
+						restrict_sr: param(&path, "restrict_sr").unwrap_or_default(),
+						typed,
+					},
+					prefs: Preferences::new(req),
+					url,
+					is_filtered: false,
+					all_posts_filtered,
+				})
+			}
+			Err(msg) => {
+				if msg == "quarantined" {
+					let sub = req.param("sub").unwrap_or_default();
+					quarantine(req, sub)
+				} else {
+					error(req, msg).await
+				}
 			}
 		}
-		// If the Reddit API returns an error, exit this function
-		_ => Vec::new(),
 	}
 }
+
+async fn search_subreddits(q: &str, typed: &str) -> Vec<Subreddit> {
+	let limit = if typed == "sr_user" { "50" } else { "3" };
+	let subreddit_search_path = format!("/subreddits/search.json?q={}&limit={}", q.replace(' ', "+"), limit);
+
+	// Send a request to the url
+	json(subreddit_search_path, false).await.unwrap_or_default()["data"]["children"]
+		.as_array()
+		.map(ToOwned::to_owned)
+		.unwrap_or_default()
+		.iter()
+		.map(|subreddit| {
+			// For each subreddit from subreddit list
+			// Fetch subreddit icon either from the community_icon or icon_img value
+			let icon = subreddit["data"]["community_icon"].as_str().map_or_else(|| val(subreddit, "icon_img"), ToString::to_string);
+
+			Subreddit {
+				name: val(subreddit, "display_name"),
+				url: val(subreddit, "url"),
+				icon: format_url(&icon),
+				description: val(subreddit, "public_description"),
+				subscribers: format_num(subreddit["data"]["subscribers"].as_f64().unwrap_or_default() as i64),
+			}
+		})
+		.collect::<Vec<Subreddit>>()
+}

src/server.rs

@@ -0,0 +1,215 @@
+use cookie::Cookie;
+use futures_lite::{future::Boxed, Future, FutureExt};
+use hyper::{
+	header::HeaderValue,
+	service::{make_service_fn, service_fn},
+	HeaderMap,
+};
+use hyper::{Body, Method, Request, Response, Server as HyperServer};
+use route_recognizer::{Params, Router};
+use std::{pin::Pin, result::Result};
+use time::Duration;
+
+type BoxResponse = Pin<Box<dyn Future<Output = Result<Response<Body>, String>> + Send>>;
+
+pub struct Route<'a> {
+	router: &'a mut Router<fn(Request<Body>) -> BoxResponse>,
+	path: String,
+}
+
+pub struct Server {
+	pub default_headers: HeaderMap,
+	router: Router<fn(Request<Body>) -> BoxResponse>,
+}
+
+#[macro_export]
+macro_rules! headers(
+	{ $($key:expr => $value:expr),+ } => {
+		{
+			let mut m = hyper::HeaderMap::new();
+			$(
+				if let Ok(val) = hyper::header::HeaderValue::from_str($value) {
+					m.insert($key, val);
+				}
+			)+
+			m
+		}
+	 };
+);
+
+pub trait RequestExt {
+	fn params(&self) -> Params;
+	fn param(&self, name: &str) -> Option<String>;
+	fn set_params(&mut self, params: Params) -> Option<Params>;
+	fn cookies(&self) -> Vec<Cookie>;
+	fn cookie(&self, name: &str) -> Option<Cookie>;
+}
+
+pub trait ResponseExt {
+	fn cookies(&self) -> Vec<Cookie>;
+	fn insert_cookie(&mut self, cookie: Cookie);
+	fn remove_cookie(&mut self, name: String);
+}
+
+impl RequestExt for Request<Body> {
+	fn params(&self) -> Params {
+		self.extensions().get::<Params>().unwrap_or(&Params::new()).clone()
+		// self.extensions()
+		// 	.get::<RequestMeta>()
+		// 	.and_then(|meta| meta.route_params())
+		// 	.expect("Routerify: No RouteParams added while processing request")
+	}
+
+	fn param(&self, name: &str) -> Option<String> {
+		self.params().find(name).map(std::borrow::ToOwned::to_owned)
+	}
+
+	fn set_params(&mut self, params: Params) -> Option<Params> {
+		self.extensions_mut().insert(params)
+	}
+
+	fn cookies(&self) -> Vec<Cookie> {
+		self.headers().get("Cookie").map_or(Vec::new(), |header| {
+			header
+				.to_str()
+				.unwrap_or_default()
+				.split("; ")
+				.map(|cookie| Cookie::parse(cookie).unwrap_or_else(|_| Cookie::named("")))
+				.collect()
+		})
+	}
+
+	fn cookie(&self, name: &str) -> Option<Cookie> {
+		self.cookies().into_iter().find(|c| c.name() == name)
+	}
+}
+
+impl ResponseExt for Response<Body> {
+	fn cookies(&self) -> Vec<Cookie> {
+		self.headers().get("Cookie").map_or(Vec::new(), |header| {
+			header
+				.to_str()
+				.unwrap_or_default()
+				.split("; ")
+				.map(|cookie| Cookie::parse(cookie).unwrap_or_else(|_| Cookie::named("")))
+				.collect()
+		})
+	}
+
+	fn insert_cookie(&mut self, cookie: Cookie) {
+		if let Ok(val) = HeaderValue::from_str(&cookie.to_string()) {
+			self.headers_mut().append("Set-Cookie", val);
+		}
+	}
+
+	fn remove_cookie(&mut self, name: String) {
+		let mut cookie = Cookie::named(name);
+		cookie.set_path("/");
+		cookie.set_max_age(Duration::seconds(1));
+		if let Ok(val) = HeaderValue::from_str(&cookie.to_string()) {
+			self.headers_mut().append("Set-Cookie", val);
+		}
+	}
+}
+
+impl Route<'_> {
+	fn method(&mut self, method: Method, dest: fn(Request<Body>) -> BoxResponse) -> &mut Self {
+		self.router.add(&format!("/{}{}", method.as_str(), self.path), dest);
+		self
+	}
+
+	/// Add an endpoint for `GET` requests
+	pub fn get(&mut self, dest: fn(Request<Body>) -> BoxResponse) -> &mut Self {
+		self.method(Method::GET, dest)
+	}
+
+	/// Add an endpoint for `POST` requests
+	pub fn post(&mut self, dest: fn(Request<Body>) -> BoxResponse) -> &mut Self {
+		self.method(Method::POST, dest)
+	}
+}
+
+impl Server {
+	pub fn new() -> Self {
+		Server {
+			default_headers: HeaderMap::new(),
+			router: Router::new(),
+		}
+	}
+
+	pub fn at(&mut self, path: &str) -> Route {
+		Route {
+			path: path.to_owned(),
+			router: &mut self.router,
+		}
+	}
+
+	pub fn listen(self, addr: String) -> Boxed<Result<(), hyper::Error>> {
+		let make_svc = make_service_fn(move |_conn| {
+			// For correct borrowing, these values need to be borrowed
+			let router = self.router.clone();
+			let default_headers = self.default_headers.clone();
+
+			// This is the `Service` that will handle the connection.
+			// `service_fn` is a helper to convert a function that
+			// returns a Response into a `Service`.
+			// let shared_router = router.clone();
+			async move {
+				Ok::<_, String>(service_fn(move |req: Request<Body>| {
+					let headers = default_headers.clone();
+
+					// Remove double slashes
+					let mut path = req.uri().path().replace("//", "/");
+
+					// Remove trailing slashes
+					if path != "/" && path.ends_with('/') {
+						path.pop();
+					}
+
+					// Match the visited path with an added route
+					match router.recognize(&format!("/{}{}", req.method().as_str(), path)) {
+						// If a route was configured for this path
+						Ok(found) => {
+							let mut parammed = req;
+							parammed.set_params(found.params().clone());
+
+							// Run the route's function
+							let func = (found.handler().to_owned().to_owned())(parammed);
+							async move {
+								let res: Result<Response<Body>, String> = func.await;
+								// Add default headers to response
+								res.map(|mut response| {
+									response.headers_mut().extend(headers);
+									response
+								})
+							}
+							.boxed()
+						}
+						// If there was a routing error
+						Err(e) => async move {
+							// Return a 404 error
+							let res: Result<Response<Body>, String> = Ok(Response::builder().status(404).body(e.into()).unwrap_or_default());
+							// Add default headers to response
+							res.map(|mut response| {
+								response.headers_mut().extend(headers);
+								response
+							})
+						}
+						.boxed(),
+					}
+				}))
+			}
+		});
+
+		// Build SocketAddr from provided address
+		let address = &addr.parse().unwrap_or_else(|_| panic!("Cannot parse {} as address (example format: 0.0.0.0:8080)", addr));
+
+		// Bind server to address specified above. Gracefully shut down if CTRL+C is pressed
+		let server = HyperServer::bind(address).serve(make_svc).with_graceful_shutdown(async {
+			// Wait for the CTRL+C signal
+			tokio::signal::ctrl_c().await.expect("Failed to install CTRL+C signal handler");
+		});
+
+		server.boxed()
+	}
+}

src/settings.rs

@@ -1,7 +1,12 @@
+use std::collections::HashMap;
+
 // CRATES
+use crate::server::ResponseExt;
 use crate::utils::{redirect, template, Preferences};
 use askama::Template;
-use tide::{http::Cookie, Request};
+use cookie::Cookie;
+use futures_lite::StreamExt;
+use hyper::{Body, Request, Response};
 use time::{Duration, OffsetDateTime};
 
 // STRUCTS
@@ -9,79 +14,126 @@ use time::{Duration, OffsetDateTime};
 #[template(path = "settings.html")]
 struct SettingsTemplate {
 	prefs: Preferences,
+	url: String,
 }
 
-#[derive(serde::Deserialize, Default)]
-#[serde(default)]
-pub struct SettingsForm {
-	theme: Option<String>,
-	front_page: Option<String>,
-	layout: Option<String>,
-	wide: Option<String>,
-	comment_sort: Option<String>,
-	show_nsfw: Option<String>,
-	redirect: Option<String>,
-	subscriptions: Option<String>,
-}
+// CONSTANTS
+
+const PREFS: [&str; 10] = [
+	"theme",
+	"front_page",
+	"layout",
+	"wide",
+	"comment_sort",
+	"post_sort",
+	"show_nsfw",
+	"use_hls",
+	"hide_hls_notification",
+	"autoplay_videos",
+];
 
 // FUNCTIONS
 
 // Retrieve cookies from request "Cookie" header
-pub async fn get(req: Request<()>) -> tide::Result {
-	template(SettingsTemplate { prefs: Preferences::new(req) })
+pub async fn get(req: Request<Body>) -> Result<Response<Body>, String> {
+	let url = req.uri().to_string();
+	template(SettingsTemplate {
+		prefs: Preferences::new(req),
+		url,
+	})
 }
 
 // Set cookies using response "Set-Cookie" header
-pub async fn set(mut req: Request<()>) -> tide::Result {
-	let form: SettingsForm = req.body_form().await.unwrap_or_default();
+pub async fn set(req: Request<Body>) -> Result<Response<Body>, String> {
+	// Split the body into parts
+	let (parts, mut body) = req.into_parts();
 
-	let mut res = redirect("/settings".to_string());
+	// Grab existing cookies
+	let _cookies: Vec<Cookie> = parts
+		.headers
+		.get_all("Cookie")
+		.iter()
+		.filter_map(|header| Cookie::parse(header.to_str().unwrap_or_default()).ok())
+		.collect();
 
-	let names = vec!["theme", "front_page", "layout", "wide", "comment_sort", "show_nsfw"];
-	let values = vec![form.theme, form.front_page, form.layout, form.wide, form.comment_sort, form.show_nsfw];
+	// Aggregate the body...
+	// let whole_body = hyper::body::aggregate(req).await.map_err(|e| e.to_string())?;
+	let body_bytes = body
+		.try_fold(Vec::new(), |mut data, chunk| {
+			data.extend_from_slice(&chunk);
+			Ok(data)
+		})
+		.await
+		.map_err(|e| e.to_string())?;
 
-	for (i, name) in names.iter().enumerate() {
-		match values.get(i) {
-			Some(value) => res.insert_cookie(
-				Cookie::build(name.to_owned(), value.to_owned().unwrap_or_default())
+	let form = url::form_urlencoded::parse(&body_bytes).collect::<HashMap<_, _>>();
+
+	let mut response = redirect("/settings".to_string());
+
+	for &name in &PREFS {
+		match form.get(name) {
+			Some(value) => response.insert_cookie(
+				Cookie::build(name.to_owned(), value.clone())
 					.path("/")
 					.http_only(true)
 					.expires(OffsetDateTime::now_utc() + Duration::weeks(52))
 					.finish(),
 			),
-			None => res.remove_cookie(Cookie::named(name.to_owned())),
+			None => response.remove_cookie(name.to_string()),
 		};
 	}
 
-	Ok(res)
+	Ok(response)
 }
 
-// Set cookies using response "Set-Cookie" header
-pub async fn restore(req: Request<()>) -> tide::Result {
-	let form: SettingsForm = req.query()?;
+fn set_cookies_method(req: Request<Body>, remove_cookies: bool) -> Response<Body> {
+	// Split the body into parts
+	let (parts, _) = req.into_parts();
 
-	let path = match form.redirect {
-		Some(value) => format!("/{}/", value),
+	// Grab existing cookies
+	let _cookies: Vec<Cookie> = parts
+		.headers
+		.get_all("Cookie")
+		.iter()
+		.filter_map(|header| Cookie::parse(header.to_str().unwrap_or_default()).ok())
+		.collect();
+
+	let query = parts.uri.query().unwrap_or_default().as_bytes();
+
+	let form = url::form_urlencoded::parse(query).collect::<HashMap<_, _>>();
+
+	let path = match form.get("redirect") {
+		Some(value) => format!("/{}", value.replace("%26", "&").replace("%23", "#")),
 		None => "/".to_string(),
 	};
 
-	let mut res = redirect(path);
+	let mut response = redirect(path);
 
-	let names = vec!["theme", "front_page", "layout", "wide", "comment_sort", "show_nsfw", "subscriptions"];
-	let values = vec![form.theme, form.front_page, form.layout, form.wide, form.comment_sort, form.show_nsfw, form.subscriptions];
-
-	for (i, name) in names.iter().enumerate() {
-		match values.get(i) {
-			Some(value) => res.insert_cookie(
-				Cookie::build(name.to_owned(), value.to_owned().unwrap_or_default())
+	for name in [PREFS.to_vec(), vec!["subscriptions", "filters"]].concat() {
+		match form.get(name) {
+			Some(value) => response.insert_cookie(
+				Cookie::build(name.to_owned(), value.clone())
 					.path("/")
 					.http_only(true)
 					.expires(OffsetDateTime::now_utc() + Duration::weeks(52))
 					.finish(),
 			),
-			None => res.remove_cookie(Cookie::named(name.to_owned())),
+			None => {
+				if remove_cookies {
+					response.remove_cookie(name.to_string());
+				}
+			}
 		};
 	}
 
-	Ok(res)
+	response
+}
+
+// Set cookies using response "Set-Cookie" header
+pub async fn restore(req: Request<Body>) -> Result<Response<Body>, String> {
+	Ok(set_cookies_method(req, true))
+}
+
+pub async fn update(req: Request<Body>) -> Result<Response<Body>, String> {
+	Ok(set_cookies_method(req, false))
 }

src/subreddit.rs

@@ -1,7 +1,12 @@
 // CRATES
-use crate::utils::*;
+use crate::esc;
+use crate::utils::{
+	catch_random, error, filter_posts, format_num, format_url, get_filters, param, redirect, rewrite_urls, setting, template, val, Post, Preferences, Subreddit,
+};
+use crate::{client::json, server::ResponseExt, RequestExt};
 use askama::Template;
-use tide::{http::Cookie, Request};
+use cookie::Cookie;
+use hyper::{Body, Request, Response};
 use time::{Duration, OffsetDateTime};
 
 // STRUCTS
@@ -13,6 +18,13 @@ struct SubredditTemplate {
 	sort: (String, String),
 	ends: (String, String),
 	prefs: Preferences,
+	url: String,
+	redirect_url: String,
+	/// Whether the subreddit itself is filtered.
+	is_filtered: bool,
+	/// Whether all fetched posts are filtered (to differentiate between no posts fetched in the first place,
+	/// and all fetched posts being filtered).
+	all_posts_filtered: bool,
 }
 
 #[derive(Template)]
@@ -22,106 +34,241 @@ struct WikiTemplate {
 	wiki: String,
 	page: String,
 	prefs: Preferences,
+	url: String,
+}
+
+#[derive(Template)]
+#[template(path = "wall.html", escape = "none")]
+struct WallTemplate {
+	title: String,
+	sub: String,
+	msg: String,
+	prefs: Preferences,
+	url: String,
 }
 
 // SERVICES
-pub async fn page(req: Request<()>) -> tide::Result {
+pub async fn community(req: Request<Body>) -> Result<Response<Body>, String> {
 	// Build Reddit API path
-	let subscribed = cookie(&req, "subscriptions");
-	let front_page = cookie(&req, "front_page");
-	let sort = req.param("sort").unwrap_or_else(|_| req.param("id").unwrap_or("hot")).to_string();
+	let root = req.uri().path() == "/";
+	let subscribed = setting(&req, "subscriptions");
+	let front_page = setting(&req, "front_page");
+	let post_sort = req.cookie("post_sort").map_or_else(|| "hot".to_string(), |c| c.value().to_string());
+	let sort = req.param("sort").unwrap_or_else(|| req.param("id").unwrap_or(post_sort));
 
-	let sub = req.param("sub").map(String::from).unwrap_or(if front_page == "default" || front_page.is_empty() {
+	let sub_name = req.param("sub").unwrap_or(if front_page == "default" || front_page.is_empty() {
 		if subscribed.is_empty() {
 			"popular".to_string()
 		} else {
-			subscribed.to_owned()
+			subscribed.clone()
 		}
 	} else {
-		front_page.to_owned()
+		front_page.clone()
 	});
+	let quarantined = can_access_quarantine(&req, &sub_name) || root;
 
-	let path = format!("/r/{}/{}.json?{}&raw_json=1", sub, sort, req.url().query().unwrap_or_default());
+	// Handle random subreddits
+	if let Ok(random) = catch_random(&sub_name, "").await {
+		return Ok(random);
+	}
 
-	match Post::fetch(&path, String::new()).await {
-		Ok((posts, after)) => {
-			// If you can get subreddit posts, also request subreddit metadata
-			let sub = if !sub.contains('+') && sub != subscribed && sub != "popular" && sub != "all" {
-				// Regular subreddit
-				subreddit(&sub).await.unwrap_or_default()
-			} else if sub == subscribed {
-				// Subscription feed
-				if req.url().path().starts_with("/r/") {
-					subreddit(&sub).await.unwrap_or_default()
-				} else {
-					Subreddit::default()
-				}
-			} else if sub.contains('+') {
-				// Multireddit
-				Subreddit {
-					name: sub,
-					..Subreddit::default()
-				}
-			} else {
-				Subreddit::default()
-			};
+	if req.param("sub").is_some() && sub_name.starts_with("u_") {
+		return Ok(redirect(["/user/", &sub_name[2..]].concat()));
+	}
 
-			template(SubredditTemplate {
-				sub,
-				posts,
-				sort: (sort, param(&path, "t")),
-				ends: (param(&path, "after"), after),
-				prefs: Preferences::new(req),
-			})
+	// Request subreddit metadata
+	let sub = if !sub_name.contains('+') && sub_name != subscribed && sub_name != "popular" && sub_name != "all" {
+		// Regular subreddit
+		subreddit(&sub_name, quarantined).await.unwrap_or_default()
+	} else if sub_name == subscribed {
+		// Subscription feed
+		if req.uri().path().starts_with("/r/") {
+			subreddit(&sub_name, quarantined).await.unwrap_or_default()
+		} else {
+			Subreddit::default()
+		}
+	} else if sub_name.contains('+') {
+		// Multireddit
+		Subreddit {
+			name: sub_name.clone(),
+			..Subreddit::default()
+		}
+	} else {
+		Subreddit::default()
+	};
+
+	let path = format!("/r/{}/{}.json?{}&raw_json=1", sub_name.clone(), sort, req.uri().query().unwrap_or_default());
+	let url = String::from(req.uri().path_and_query().map_or("", |val| val.as_str()));
+	let redirect_url = url[1..].replace('?', "%3F").replace('&', "%26");
+	let filters = get_filters(&req);
+
+	// If all requested subs are filtered, we don't need to fetch posts.
+	if sub_name.split('+').all(|s| filters.contains(s)) {
+		template(SubredditTemplate {
+			sub,
+			posts: Vec::new(),
+			sort: (sort, param(&path, "t").unwrap_or_default()),
+			ends: (param(&path, "after").unwrap_or_default(), "".to_string()),
+			prefs: Preferences::new(req),
+			url,
+			redirect_url,
+			is_filtered: true,
+			all_posts_filtered: false,
+		})
+	} else {
+		match Post::fetch(&path, quarantined).await {
+			Ok((mut posts, after)) => {
+				let all_posts_filtered = filter_posts(&mut posts, &filters);
+
+				template(SubredditTemplate {
+					sub,
+					posts,
+					sort: (sort, param(&path, "t").unwrap_or_default()),
+					ends: (param(&path, "after").unwrap_or_default(), after),
+					prefs: Preferences::new(req),
+					url,
+					redirect_url,
+					is_filtered: false,
+					all_posts_filtered,
+				})
+			}
+			Err(msg) => match msg.as_str() {
+				"quarantined" => quarantine(req, sub_name),
+				"private" => error(req, format!("r/{} is a private community", sub_name)).await,
+				"banned" => error(req, format!("r/{} has been banned from Reddit", sub_name)).await,
+				_ => error(req, msg).await,
+			},
 		}
-		Err(msg) => match msg.as_str() {
-			"quarantined" => error(req, format!("r/{} has been quarantined by Reddit", sub)).await,
-			"private" => error(req, format!("r/{} is a private community", sub)).await,
-			"banned" => error(req, format!("r/{} has been banned from Reddit", sub)).await,
-			_ => error(req, msg).await,
-		},
 	}
 }
 
-// Sub or unsub by setting subscription cookie using response "Set-Cookie" header
-pub async fn subscriptions(req: Request<()>) -> tide::Result {
-	let sub = req.param("sub").unwrap_or_default().to_string();
-	let query = req.url().query().unwrap_or_default().to_string();
-	let action: Vec<String> = req.url().path().split('/').map(String::from).collect();
+pub fn quarantine(req: Request<Body>, sub: String) -> Result<Response<Body>, String> {
+	let wall = WallTemplate {
+		title: format!("r/{} is quarantined", sub),
+		msg: "Please click the button below to continue to this subreddit.".to_string(),
+		url: req.uri().to_string(),
+		sub,
+		prefs: Preferences::new(req),
+	};
 
-	let mut sub_list = Preferences::new(req).subscriptions;
+	Ok(
+		Response::builder()
+			.status(403)
+			.header("content-type", "text/html")
+			.body(wall.render().unwrap_or_default().into())
+			.unwrap_or_default(),
+	)
+}
+
+pub async fn add_quarantine_exception(req: Request<Body>) -> Result<Response<Body>, String> {
+	let subreddit = req.param("sub").ok_or("Invalid URL")?;
+	let redir = param(&format!("?{}", req.uri().query().unwrap_or_default()), "redir").ok_or("Invalid URL")?;
+	let mut response = redirect(redir);
+	response.insert_cookie(
+		Cookie::build(&format!("allow_quaran_{}", subreddit.to_lowercase()), "true")
+			.path("/")
+			.http_only(true)
+			.expires(cookie::Expiration::Session)
+			.finish(),
+	);
+	Ok(response)
+}
+
+pub fn can_access_quarantine(req: &Request<Body>, sub: &str) -> bool {
+	// Determine if the subreddit can be accessed
+	setting(req, &format!("allow_quaran_{}", sub.to_lowercase())).parse().unwrap_or_default()
+}
+
+// Sub, filter, unfilter, or unsub by setting subscription cookie using response "Set-Cookie" header
+pub async fn subscriptions_filters(req: Request<Body>) -> Result<Response<Body>, String> {
+	let sub = req.param("sub").unwrap_or_default();
+	let action: Vec<String> = req.uri().path().split('/').map(String::from).collect();
+
+	// Handle random subreddits
+	if sub == "random" || sub == "randnsfw" {
+		if action.contains(&"filter".to_string()) || action.contains(&"unfilter".to_string()) {
+			return Err("Can't filter random subreddit!".to_string());
+		} else {
+			return Err("Can't subscribe to random subreddit!".to_string());
+		}
+	}
+
+	let query = req.uri().query().unwrap_or_default().to_string();
+
+	let preferences = Preferences::new(req);
+	let mut sub_list = preferences.subscriptions;
+	let mut filters = preferences.filters;
+
+	// Retrieve list of posts for these subreddits to extract display names
+	let posts = json(format!("/r/{}/hot.json?raw_json=1", sub), true).await?;
+	let display_lookup: Vec<(String, &str)> = posts["data"]["children"]
+		.as_array()
+		.map(|list| {
+			list
+				.iter()
+				.map(|post| {
+					let display_name = post["data"]["subreddit"].as_str().unwrap_or_default();
+					(display_name.to_lowercase(), display_name)
+				})
+				.collect::<Vec<_>>()
+		})
+		.unwrap_or_default();
 
 	// Find each subreddit name (separated by '+') in sub parameter
-	for part in sub.split('+') {
+	for part in sub.split('+').filter(|x| x != &"") {
+		// Retrieve display name for the subreddit
+		let display;
+		let part = if part.starts_with("u_") {
+			part
+		} else if let Some(&(_, display)) = display_lookup.iter().find(|x| x.0 == part.to_lowercase()) {
+			// This is already known, doesn't require separate request
+			display
+		} else {
+			// This subreddit display name isn't known, retrieve it
+			let path: String = format!("/r/{}/about.json?raw_json=1", part);
+			display = json(path, true).await?;
+			display["data"]["display_name"].as_str().ok_or_else(|| "Failed to query subreddit name".to_string())?
+		};
+
 		// Modify sub list based on action
 		if action.contains(&"subscribe".to_string()) && !sub_list.contains(&part.to_owned()) {
 			// Add each sub name to the subscribed list
 			sub_list.push(part.to_owned());
-			// Reorder sub names alphabettically
-			sub_list.sort_by_key(|a| a.to_lowercase())
+			filters.retain(|s| s.to_lowercase() != part.to_lowercase());
+			// Reorder sub names alphabetically
+			sub_list.sort_by_key(|a| a.to_lowercase());
+			filters.sort_by_key(|a| a.to_lowercase());
 		} else if action.contains(&"unsubscribe".to_string()) {
 			// Remove sub name from subscribed list
-			sub_list.retain(|s| s != part);
+			sub_list.retain(|s| s.to_lowercase() != part.to_lowercase());
+		} else if action.contains(&"filter".to_string()) && !filters.contains(&part.to_owned()) {
+			// Add each sub name to the filtered list
+			filters.push(part.to_owned());
+			sub_list.retain(|s| s.to_lowercase() != part.to_lowercase());
+			// Reorder sub names alphabetically
+			filters.sort_by_key(|a| a.to_lowercase());
+			sub_list.sort_by_key(|a| a.to_lowercase());
+		} else if action.contains(&"unfilter".to_string()) {
+			// Remove sub name from filtered list
+			filters.retain(|s| s.to_lowercase() != part.to_lowercase());
 		}
 	}
 
 	// Redirect back to subreddit
-	// check for redirect parameter if unsubscribing from outside sidebar
-	let redirect_path = param(&format!("/?{}", query), "redirect");
-	let path = if !redirect_path.is_empty() {
-		format!("/{}/", redirect_path)
+	// check for redirect parameter if unsubscribing/unfiltering from outside sidebar
+	let path = if let Some(redirect_path) = param(&format!("?{}", query), "redirect") {
+		format!("/{}", redirect_path)
 	} else {
 		format!("/r/{}", sub)
 	};
 
-	let mut res = redirect(path);
+	let mut response = redirect(path);
 
 	// Delete cookie if empty, else set
 	if sub_list.is_empty() {
-		// res.del_cookie(&Cookie::build("subscriptions", "").path("/").finish());
-		res.remove_cookie(Cookie::build("subscriptions", "").path("/").finish());
+		response.remove_cookie("subscriptions".to_string());
 	} else {
-		res.insert_cookie(
+		response.insert_cookie(
 			Cookie::build("subscriptions", sub_list.join("+"))
 				.path("/")
 				.http_only(true)
@@ -129,57 +276,148 @@ pub async fn subscriptions(req: Request<()>) -> tide::Result {
 				.finish(),
 		);
 	}
+	if filters.is_empty() {
+		response.remove_cookie("filters".to_string());
+	} else {
+		response.insert_cookie(
+			Cookie::build("filters", filters.join("+"))
+				.path("/")
+				.http_only(true)
+				.expires(OffsetDateTime::now_utc() + Duration::weeks(52))
+				.finish(),
+		);
+	}
 
-	Ok(res)
+	Ok(response)
 }
 
-pub async fn wiki(req: Request<()>) -> tide::Result {
-	let sub = req.param("sub").unwrap_or("reddit.com").to_string();
-	let page = req.param("page").unwrap_or("index").to_string();
-	let path: String = format!("/r/{}/wiki/{}.json?raw_json=1", sub, page);
+pub async fn wiki(req: Request<Body>) -> Result<Response<Body>, String> {
+	let sub = req.param("sub").unwrap_or_else(|| "reddit.com".to_string());
+	let quarantined = can_access_quarantine(&req, &sub);
+	// Handle random subreddits
+	if let Ok(random) = catch_random(&sub, "/wiki").await {
+		return Ok(random);
+	}
 
-	match request(path).await {
-		Ok(res) => template(WikiTemplate {
+	let page = req.param("page").unwrap_or_else(|| "index".to_string());
+	let path: String = format!("/r/{}/wiki/{}.json?raw_json=1", sub, page);
+	let url = req.uri().to_string();
+
+	match json(path, quarantined).await {
+		Ok(response) => template(WikiTemplate {
 			sub,
-			wiki: rewrite_urls(res["data"]["content_html"].as_str().unwrap_or_default()),
+			wiki: rewrite_urls(response["data"]["content_html"].as_str().unwrap_or("<h3>Wiki not found</h3>")),
 			page,
 			prefs: Preferences::new(req),
+			url,
 		}),
-		Err(msg) => error(req, msg).await,
+		Err(msg) => {
+			if msg == "quarantined" {
+				quarantine(req, sub)
+			} else {
+				error(req, msg).await
+			}
+		}
 	}
 }
 
+pub async fn sidebar(req: Request<Body>) -> Result<Response<Body>, String> {
+	let sub = req.param("sub").unwrap_or_else(|| "reddit.com".to_string());
+	let quarantined = can_access_quarantine(&req, &sub);
+
+	// Handle random subreddits
+	if let Ok(random) = catch_random(&sub, "/about/sidebar").await {
+		return Ok(random);
+	}
+
+	// Build the Reddit JSON API url
+	let path: String = format!("/r/{}/about.json?raw_json=1", sub);
+	let url = req.uri().to_string();
+
+	// Send a request to the url
+	match json(path, quarantined).await {
+		// If success, receive JSON in response
+		Ok(response) => template(WikiTemplate {
+			wiki: rewrite_urls(&val(&response, "description_html").replace("\\", "")),
+			// wiki: format!(
+			// 	"{}<hr><h1>Moderators</h1><br><ul>{}</ul>",
+			// 	rewrite_urls(&val(&response, "description_html").replace("\\", "")),
+			// 	moderators(&sub, quarantined).await.unwrap_or(vec!["Could not fetch moderators".to_string()]).join(""),
+			// ),
+			sub,
+			page: "Sidebar".to_string(),
+			prefs: Preferences::new(req),
+			url,
+		}),
+		Err(msg) => {
+			if msg == "quarantined" {
+				quarantine(req, sub)
+			} else {
+				error(req, msg).await
+			}
+		}
+	}
+}
+
+// pub async fn moderators(sub: &str, quarantined: bool) -> Result<Vec<String>, String> {
+// 	// Retrieve and format the html for the moderators list
+// 	Ok(
+// 		moderators_list(sub, quarantined)
+// 			.await?
+// 			.iter()
+// 			.map(|m| format!("<li><a style=\"color: var(--accent)\" href=\"/u/{name}\">{name}</a></li>", name = m))
+// 			.collect(),
+// 	)
+// }
+
+// async fn moderators_list(sub: &str, quarantined: bool) -> Result<Vec<String>, String> {
+// 	// Build the moderator list URL
+// 	let path: String = format!("/r/{}/about/moderators.json?raw_json=1", sub);
+
+// 	// Retrieve response
+// 	json(path, quarantined).await.map(|response| {
+// 		// Traverse json tree and format into list of strings
+// 		response["data"]["children"]
+// 			.as_array()
+// 			.unwrap_or(&Vec::new())
+// 			.iter()
+// 			.filter_map(|moderator| {
+// 				let name = moderator["name"].as_str().unwrap_or_default();
+// 				if name.is_empty() {
+// 					None
+// 				} else {
+// 					Some(name.to_string())
+// 				}
+// 			})
+// 			.collect::<Vec<_>>()
+// 	})
+// }
+
 // SUBREDDIT
-async fn subreddit(sub: &str) -> Result<Subreddit, String> {
+async fn subreddit(sub: &str, quarantined: bool) -> Result<Subreddit, String> {
 	// Build the Reddit JSON API url
 	let path: String = format!("/r/{}/about.json?raw_json=1", sub);
 
 	// Send a request to the url
-	match request(path).await {
-		// If success, receive JSON in response
-		Ok(res) => {
-			// Metadata regarding the subreddit
-			let members: i64 = res["data"]["subscribers"].as_u64().unwrap_or_default() as i64;
-			let active: i64 = res["data"]["accounts_active"].as_u64().unwrap_or_default() as i64;
+	let res = json(path, quarantined).await?;
 
-			// Fetch subreddit icon either from the community_icon or icon_img value
-			let community_icon: &str = res["data"]["community_icon"].as_str().map_or("", |s| s.split('?').collect::<Vec<&str>>()[0]);
-			let icon = if community_icon.is_empty() { val(&res, "icon_img") } else { community_icon.to_string() };
+	// Metadata regarding the subreddit
+	let members: i64 = res["data"]["subscribers"].as_u64().unwrap_or_default() as i64;
+	let active: i64 = res["data"]["accounts_active"].as_u64().unwrap_or_default() as i64;
 
-			let sub = Subreddit {
-				name: val(&res, "display_name"),
-				title: val(&res, "title"),
-				description: val(&res, "public_description"),
-				info: rewrite_urls(&val(&res, "description_html").replace("\\", "")),
-				icon: format_url(&icon),
-				members: format_num(members),
-				active: format_num(active),
-				wiki: res["data"]["wiki_enabled"].as_bool().unwrap_or_default(),
-			};
+	// Fetch subreddit icon either from the community_icon or icon_img value
+	let community_icon: &str = res["data"]["community_icon"].as_str().unwrap_or_default();
+	let icon = if community_icon.is_empty() { val(&res, "icon_img") } else { community_icon.to_string() };
 
-			Ok(sub)
-		}
-		// If the Reddit API returns an error, exit this function
-		Err(msg) => return Err(msg),
-	}
+	Ok(Subreddit {
+		name: esc!(&res, "display_name"),
+		title: esc!(&res, "title"),
+		description: esc!(&res, "public_description"),
+		info: rewrite_urls(&val(&res, "description_html").replace("\\", "")),
+		// moderators: moderators_list(sub, quarantined).await.unwrap_or_default(),
+		icon: format_url(&icon),
+		members: format_num(members),
+		active: format_num(active),
+		wiki: res["data"]["wiki_enabled"].as_bool().unwrap_or_default(),
+	})
 }

src/user.rs

@@ -1,8 +1,11 @@
 // CRATES
-use crate::utils::*;
+use crate::client::json;
+use crate::esc;
+use crate::server::RequestExt;
+use crate::utils::{error, filter_posts, format_url, get_filters, param, template, Post, Preferences, User};
 use askama::Template;
-use tide::Request;
-use time::OffsetDateTime;
+use hyper::{Body, Request, Response};
+use time::{OffsetDateTime, macros::format_description};
 
 // STRUCTS
 #[derive(Template)]
@@ -12,36 +15,73 @@ struct UserTemplate {
 	posts: Vec<Post>,
 	sort: (String, String),
 	ends: (String, String),
+	/// "overview", "comments", or "submitted"
+	listing: String,
 	prefs: Preferences,
+	url: String,
+	redirect_url: String,
+	/// Whether the user themself is filtered.
+	is_filtered: bool,
+	/// Whether all fetched posts are filtered (to differentiate between no posts fetched in the first place,
+	/// and all fetched posts being filtered).
+	all_posts_filtered: bool,
 }
 
 // FUNCTIONS
-pub async fn profile(req: Request<()>) -> tide::Result {
+pub async fn profile(req: Request<Body>) -> Result<Response<Body>, String> {
+	let listing = req.param("listing").unwrap_or_else(|| "overview".to_string());
+
 	// Build the Reddit JSON API path
-	let path = format!("{}.json?{}&raw_json=1", req.url().path(), req.url().query().unwrap_or_default());
+	let path = format!(
+		"/user/{}/{}.json?{}&raw_json=1",
+		req.param("name").unwrap_or_else(|| "reddit".to_string()),
+		listing,
+		req.uri().query().unwrap_or_default(),
+	);
+	let url = String::from(req.uri().path_and_query().map_or("", |val| val.as_str()));
+	let redirect_url = url[1..].replace('?', "%3F").replace('&', "%26");
 
 	// Retrieve other variables from Libreddit request
-	let sort = param(&path, "sort");
-	let username = req.param("name").unwrap_or("").to_string();
+	let sort = param(&path, "sort").unwrap_or_default();
+	let username = req.param("name").unwrap_or_default();
+	let user = user(&username).await.unwrap_or_default();
 
-	// Request user posts/comments from Reddit
-	let posts = Post::fetch(&path, "Comment".to_string()).await;
+	let filters = get_filters(&req);
+	if filters.contains(&["u_", &username].concat()) {
+		template(UserTemplate {
+			user,
+			posts: Vec::new(),
+			sort: (sort, param(&path, "t").unwrap_or_default()),
+			ends: (param(&path, "after").unwrap_or_default(), "".to_string()),
+			listing,
+			prefs: Preferences::new(req),
+			url,
+			redirect_url,
+			is_filtered: true,
+			all_posts_filtered: false,
+		})
+	} else {
+		// Request user posts/comments from Reddit
+		match Post::fetch(&path, false).await {
+			Ok((mut posts, after)) => {
+				let all_posts_filtered = filter_posts(&mut posts, &filters);
 
-	match posts {
-		Ok((posts, after)) => {
-			// If you can get user posts, also request user data
-			let user = user(&username).await.unwrap_or_default();
-
-			template(UserTemplate {
-				user,
-				posts,
-				sort: (sort, param(&path, "t")),
-				ends: (param(&path, "after"), after),
-				prefs: Preferences::new(req),
-			})
+				template(UserTemplate {
+					user,
+					posts,
+					sort: (sort, param(&path, "t").unwrap_or_default()),
+					ends: (param(&path, "after").unwrap_or_default(), after),
+					listing,
+					prefs: Preferences::new(req),
+					url,
+					redirect_url,
+					is_filtered: false,
+					all_posts_filtered,
+				})
+			}
+			// If there is an error show error page
+			Err(msg) => error(req, msg).await,
 		}
-		// If there is an error show error page
-		Err(msg) => error(req, msg).await,
 	}
 }
 
@@ -51,27 +91,23 @@ async fn user(name: &str) -> Result<User, String> {
 	let path: String = format!("/user/{}/about.json?raw_json=1", name);
 
 	// Send a request to the url
-	match request(path).await {
-		// If success, receive JSON in response
-		Ok(res) => {
-			// Grab creation date as unix timestamp
-			let created: i64 = res["data"]["created"].as_f64().unwrap_or(0.0).round() as i64;
+	json(path, false).await.map(|res| {
+		// Grab creation date as unix timestamp
+		let created_unix = res["data"]["created"].as_f64().unwrap_or(0.0).round() as i64;
+		let created = OffsetDateTime::from_unix_timestamp(created_unix).unwrap_or(OffsetDateTime::UNIX_EPOCH);
 
-			// nested_val function used to parse JSON from Reddit APIs
-			let about = |item| res["data"]["subreddit"][item].as_str().unwrap_or_default().to_string();
+		// Closure used to parse JSON from Reddit APIs
+		let about = |item| res["data"]["subreddit"][item].as_str().unwrap_or_default().to_string();
 
-			// Parse the JSON output into a User struct
-			Ok(User {
-				name: name.to_string(),
-				title: about("title"),
-				icon: format_url(&about("icon_img")),
-				karma: res["data"]["total_karma"].as_i64().unwrap_or(0),
-				created: OffsetDateTime::from_unix_timestamp(created).format("%b %d '%y"),
-				banner: about("banner_img"),
-				description: about("public_description"),
-			})
+		// Parse the JSON output into a User struct
+		User {
+			name: res["data"]["name"].as_str().unwrap_or(name).to_owned(),
+			title: esc!(about("title")),
+			icon: format_url(&about("icon_img")),
+			karma: res["data"]["total_karma"].as_i64().unwrap_or(0),
+			created: created.format(format_description!("[month repr:short] [day] '[year repr:last_two]")).unwrap_or_default(),
+			banner: esc!(about("banner_img")),
+			description: about("public_description"),
 		}
-		// If the Reddit API returns an error, exit this function
-		Err(msg) => return Err(msg),
-	}
+	})
 }

src/utils.rs

@@ -1,13 +1,16 @@
 //
 // CRATES
 //
+use crate::{client::json, esc, server::RequestExt};
 use askama::Template;
-use cached::proc_macro::cached;
+use cookie::Cookie;
+use hyper::{Body, Request, Response};
 use regex::Regex;
-use serde_json::{from_str, Error, Value};
-use std::collections::HashMap;
-use tide::{http::url::Url, http::Cookie, Request, Response};
-use time::{Duration, OffsetDateTime};
+use serde_json::Value;
+use std::collections::{HashMap, HashSet};
+use std::str::FromStr;
+use time::{Duration, OffsetDateTime, macros::format_description};
+use url::Url;
 
 // Post flair with content, background color and foreground color
 pub struct Flair {
@@ -18,6 +21,7 @@ pub struct Flair {
 }
 
 // Part of flair, either emoji or text
+#[derive(Clone)]
 pub struct FlairPart {
 	pub flair_part_type: String,
 	pub value: String,
@@ -37,7 +41,7 @@ impl FlairPart {
 						Self {
 							flair_part_type: value("e").to_string(),
 							value: match value("e") {
-								"text" => value("t").to_string(),
+								"text" => esc!(value("t")),
 								"emoji" => format_url(value("u")),
 								_ => String::new(),
 							},
@@ -50,7 +54,7 @@ impl FlairPart {
 			"text" => match text_flair {
 				Some(text) => vec![Self {
 					flair_part_type: "text".to_string(),
-					value: text.to_string(),
+					value: esc!(text),
 				}],
 				None => Vec::new(),
 			},
@@ -71,8 +75,10 @@ pub struct Flags {
 	pub stickied: bool,
 }
 
+#[derive(Debug)]
 pub struct Media {
 	pub url: String,
+	pub alt_url: String,
 	pub width: i64,
 	pub height: i64,
 	pub poster: String,
@@ -82,13 +88,30 @@ impl Media {
 	pub async fn parse(data: &Value) -> (String, Self, Vec<GalleryMedia>) {
 		let mut gallery = Vec::new();
 
+		// Define the various known places that Reddit might put video URLs.
+		let data_preview = &data["preview"]["reddit_video_preview"];
+		let secure_media = &data["secure_media"]["reddit_video"];
+		let crosspost_parent_media = &data["crosspost_parent_list"][0]["secure_media"]["reddit_video"];
+
 		// If post is a video, return the video
-		let (post_type, url_val) = if data["preview"]["reddit_video_preview"]["fallback_url"].is_string() {
-			// Return reddit video
-			("video", &data["preview"]["reddit_video_preview"]["fallback_url"])
-		} else if data["secure_media"]["reddit_video"]["fallback_url"].is_string() {
-			// Return reddit video
-			("video", &data["secure_media"]["reddit_video"]["fallback_url"])
+		let (post_type, url_val, alt_url_val) = if data_preview["fallback_url"].is_string() {
+			(
+				if data_preview["is_gif"].as_bool().unwrap_or(false) { "gif" } else { "video" },
+				&data_preview["fallback_url"],
+				Some(&data_preview["hls_url"]),
+			)
+		} else if secure_media["fallback_url"].is_string() {
+			(
+				if secure_media["is_gif"].as_bool().unwrap_or(false) { "gif" } else { "video" },
+				&secure_media["fallback_url"],
+				Some(&secure_media["hls_url"]),
+			)
+		} else if crosspost_parent_media["fallback_url"].is_string() {
+			(
+				if crosspost_parent_media["is_gif"].as_bool().unwrap_or(false) { "gif" } else { "video" },
+				&crosspost_parent_media["fallback_url"],
+				Some(&crosspost_parent_media["hls_url"]),
+			)
 		} else if data["post_hint"].as_str().unwrap_or("") == "image" {
 			// Handle images, whether GIFs or pics
 			let preview = &data["preview"]["images"][0];
@@ -96,40 +119,37 @@ impl Media {
 
 			if mp4.is_object() {
 				// Return the mp4 if the media is a gif
-				("gif", &mp4["source"]["url"])
+				("gif", &mp4["source"]["url"], None)
 			} else {
 				// Return the picture if the media is an image
 				if data["domain"] == "i.redd.it" {
-					("image", &data["url"])
+					("image", &data["url"], None)
 				} else {
-					("image", &preview["source"]["url"])
+					("image", &preview["source"]["url"], None)
 				}
 			}
 		} else if data["is_self"].as_bool().unwrap_or_default() {
 			// If type is self, return permalink
-			("self", &data["permalink"])
+			("self", &data["permalink"], None)
 		} else if data["is_gallery"].as_bool().unwrap_or_default() {
 			// If this post contains a gallery of images
 			gallery = GalleryMedia::parse(&data["gallery_data"]["items"], &data["media_metadata"]);
 
-			("gallery", &data["url"])
+			("gallery", &data["url"], None)
 		} else {
 			// If type can't be determined, return url
-			("link", &data["url"])
+			("link", &data["url"], None)
 		};
 
 		let source = &data["preview"]["images"][0]["source"];
 
-		let url = if post_type == "self" || post_type == "link" {
-			url_val.as_str().unwrap_or_default().to_string()
-		} else {
-			format_url(url_val.as_str().unwrap_or_default()).to_string()
-		};
+		let alt_url = alt_url_val.map_or(String::new(), |val| format_url(val.as_str().unwrap_or_default()));
 
 		(
 			post_type.to_string(),
 			Self {
-				url,
+				url: format_url(url_val.as_str().unwrap_or_default()),
+				alt_url,
 				width: source["width"].as_i64().unwrap_or_default(),
 				height: source["height"].as_i64().unwrap_or_default(),
 				poster: format_url(source["url"].as_str().unwrap_or_default()),
@@ -179,7 +199,7 @@ pub struct Post {
 	pub body: String,
 	pub author: Author,
 	pub permalink: String,
-	pub score: String,
+	pub score: (String, String),
 	pub upvote_ratio: i64,
 	pub post_type: String,
 	pub flair: Flair,
@@ -189,18 +209,19 @@ pub struct Post {
 	pub domain: String,
 	pub rel_time: String,
 	pub created: String,
-	pub comments: String,
+	pub comments: (String, String),
 	pub gallery: Vec<GalleryMedia>,
+	pub awards: Awards,
 }
 
 impl Post {
 	// Fetch posts of a user or subreddit and return a vector of posts and the "after" value
-	pub async fn fetch(path: &str, fallback_title: String) -> Result<(Vec<Self>, String), String> {
+	pub async fn fetch(path: &str, quarantine: bool) -> Result<(Vec<Self>, String), String> {
 		let res;
 		let post_list;
 
 		// Send a request to the url
-		match request(path.to_string()).await {
+		match json(path.to_string(), quarantine).await {
 			// If success, receive JSON in response
 			Ok(response) => {
 				res = response;
@@ -224,16 +245,23 @@ impl Post {
 			let (rel_time, created) = time(data["created_utc"].as_f64().unwrap_or_default());
 			let score = data["score"].as_i64().unwrap_or_default();
 			let ratio: f64 = data["upvote_ratio"].as_f64().unwrap_or(1.0) * 100.0;
-			let title = val(post, "title");
+			let title = esc!(post, "title");
 
 			// Determine the type of media along with the media URL
-			let (post_type, media, gallery) = Media::parse(&data).await;
+			let (post_type, media, gallery) = Media::parse(data).await;
+			let awards = Awards::parse(&data["all_awardings"]);
+
+			// selftext_html is set for text posts when browsing.
+			let mut body = rewrite_urls(&val(post, "selftext_html"));
+			if body.is_empty() {
+				body = rewrite_urls(&val(post, "body_html"));
+			}
 
 			posts.push(Self {
 				id: val(post, "id"),
-				title: if title.is_empty() { fallback_title.to_owned() } else { title },
+				title,
 				community: val(post, "subreddit"),
-				body: rewrite_urls(&val(post, "body_html")),
+				body,
 				author: Author {
 					name: val(post, "author"),
 					flair: Flair {
@@ -242,14 +270,14 @@ impl Post {
 							data["author_flair_richtext"].as_array(),
 							data["author_flair_text"].as_str(),
 						),
-						text: val(post, "link_flair_text"),
+						text: esc!(post, "link_flair_text"),
 						background_color: val(post, "author_flair_background_color"),
 						foreground_color: val(post, "author_flair_text_color"),
 					},
 					distinguished: val(post, "distinguished"),
 				},
 				score: if data["hide_score"].as_bool().unwrap_or_default() {
-					"•".to_string()
+					("\u{2022}".to_string(), "Hidden".to_string())
 				} else {
 					format_num(score)
 				},
@@ -257,6 +285,7 @@ impl Post {
 				post_type,
 				thumbnail: Media {
 					url: format_url(val(post, "thumbnail").as_str()),
+					alt_url: String::new(),
 					width: data["thumbnail_width"].as_i64().unwrap_or_default(),
 					height: data["thumbnail_height"].as_i64().unwrap_or_default(),
 					poster: "".to_string(),
@@ -269,7 +298,7 @@ impl Post {
 						data["link_flair_richtext"].as_array(),
 						data["link_flair_text"].as_str(),
 					),
-					text: val(post, "link_flair_text"),
+					text: esc!(post, "link_flair_text"),
 					background_color: val(post, "link_flair_background_color"),
 					foreground_color: if val(post, "link_flair_text_color") == "dark" {
 						"black".to_string()
@@ -286,6 +315,7 @@ impl Post {
 				created,
 				comments: format_num(data["num_comments"].as_i64().unwrap_or_default()),
 				gallery,
+				awards,
 			});
 		}
 
@@ -305,12 +335,68 @@ pub struct Comment {
 	pub post_author: String,
 	pub body: String,
 	pub author: Author,
-	pub score: String,
+	pub score: (String, String),
 	pub rel_time: String,
 	pub created: String,
 	pub edited: (String, String),
 	pub replies: Vec<Comment>,
 	pub highlighted: bool,
+	pub awards: Awards,
+	pub collapsed: bool,
+	pub is_filtered: bool,
+}
+
+#[derive(Default, Clone)]
+pub struct Award {
+	pub name: String,
+	pub icon_url: String,
+	pub description: String,
+	pub count: i64,
+}
+
+impl std::fmt::Display for Award {
+	fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+		write!(f, "{} {} {}", self.name, self.icon_url, self.description)
+	}
+}
+
+pub struct Awards(pub Vec<Award>);
+
+impl std::ops::Deref for Awards {
+	type Target = Vec<Award>;
+
+	fn deref(&self) -> &Self::Target {
+		&self.0
+	}
+}
+
+impl std::fmt::Display for Awards {
+	fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+		self.iter().fold(Ok(()), |result, award| result.and_then(|_| writeln!(f, "{}", award)))
+	}
+}
+
+// Convert Reddit awards JSON to Awards struct
+impl Awards {
+	pub fn parse(items: &Value) -> Self {
+		let parsed = items.as_array().unwrap_or(&Vec::new()).iter().fold(Vec::new(), |mut awards, item| {
+			let name = item["name"].as_str().unwrap_or_default().to_string();
+			let icon_url = format_url(item["resized_icons"][0]["url"].as_str().unwrap_or_default());
+			let description = item["description"].as_str().unwrap_or_default().to_string();
+			let count: i64 = i64::from_str(&item["count"].to_string()).unwrap_or(1);
+
+			awards.push(Award {
+				name,
+				icon_url,
+				description,
+				count,
+			});
+
+			awards
+		});
+
+		Self(parsed)
+	}
 }
 
 #[derive(Template)]
@@ -318,6 +404,7 @@ pub struct Comment {
 pub struct ErrorTemplate {
 	pub msg: String,
 	pub prefs: Preferences,
+	pub url: String,
 }
 
 #[derive(Default)]
@@ -339,9 +426,10 @@ pub struct Subreddit {
 	pub title: String,
 	pub description: String,
 	pub info: String,
+	// pub moderators: Vec<String>,
 	pub icon: String,
-	pub members: String,
-	pub active: String,
+	pub members: (String, String),
+	pub active: (String, String),
 	pub wiki: bool,
 }
 
@@ -362,41 +450,97 @@ pub struct Preferences {
 	pub layout: String,
 	pub wide: String,
 	pub show_nsfw: String,
+	pub hide_hls_notification: String,
+	pub use_hls: String,
+	pub autoplay_videos: String,
 	pub comment_sort: String,
+	pub post_sort: String,
 	pub subscriptions: Vec<String>,
+	pub filters: Vec<String>,
 }
 
 impl Preferences {
 	// Build preferences from cookies
-	pub fn new(req: Request<()>) -> Self {
+	pub fn new(req: Request<Body>) -> Self {
 		Self {
-			theme: cookie(&req, "theme"),
-			front_page: cookie(&req, "front_page"),
-			layout: cookie(&req, "layout"),
-			wide: cookie(&req, "wide"),
-			show_nsfw: cookie(&req, "show_nsfw"),
-			comment_sort: cookie(&req, "comment_sort"),
-			subscriptions: cookie(&req, "subscriptions").split('+').map(String::from).filter(|s| !s.is_empty()).collect(),
+			theme: setting(&req, "theme"),
+			front_page: setting(&req, "front_page"),
+			layout: setting(&req, "layout"),
+			wide: setting(&req, "wide"),
+			show_nsfw: setting(&req, "show_nsfw"),
+			use_hls: setting(&req, "use_hls"),
+			hide_hls_notification: setting(&req, "hide_hls_notification"),
+			autoplay_videos: setting(&req, "autoplay_videos"),
+			comment_sort: setting(&req, "comment_sort"),
+			post_sort: setting(&req, "post_sort"),
+			subscriptions: setting(&req, "subscriptions").split('+').map(String::from).filter(|s| !s.is_empty()).collect(),
+			filters: setting(&req, "filters").split('+').map(String::from).filter(|s| !s.is_empty()).collect(),
 		}
 	}
 }
 
+/// Gets a `HashSet` of filters from the cookie in the given `Request`.
+pub fn get_filters(req: &Request<Body>) -> HashSet<String> {
+	setting(req, "filters").split('+').map(String::from).filter(|s| !s.is_empty()).collect::<HashSet<String>>()
+}
+
+/// Filters a `Vec<Post>` by the given `HashSet` of filters (each filter being a subreddit name or a user name). If a
+/// `Post`'s subreddit or author is found in the filters, it is removed. Returns `true` if _all_ posts were filtered
+/// out, or `false` otherwise.
+pub fn filter_posts(posts: &mut Vec<Post>, filters: &HashSet<String>) -> bool {
+	if posts.is_empty() {
+		false
+	} else {
+		posts.retain(|p| !filters.contains(&p.community) && !filters.contains(&["u_", &p.author.name].concat()));
+		posts.is_empty()
+	}
+}
+
 //
 // FORMATTING
 //
 
 // Grab a query parameter from a url
-pub fn param(path: &str, value: &str) -> String {
-	match Url::parse(format!("https://libredd.it/{}", path).as_str()) {
-		Ok(url) => url.query_pairs().into_owned().collect::<HashMap<_, _>>().get(value).unwrap_or(&String::new()).to_owned(),
-		_ => String::new(),
-	}
+pub fn param(path: &str, value: &str) -> Option<String> {
+	Some(
+		Url::parse(format!("https://libredd.it/{}", path).as_str())
+			.ok()?
+			.query_pairs()
+			.into_owned()
+			.collect::<HashMap<_, _>>()
+			.get(value)?
+			.clone(),
+	)
 }
 
-// Parse a cookie value from request
-pub fn cookie(req: &Request<()>, name: &str) -> String {
-	let cookie = req.cookie(name).unwrap_or_else(|| Cookie::named(name));
-	cookie.value().to_string()
+// Retrieve the value of a setting by name
+pub fn setting(req: &Request<Body>, name: &str) -> String {
+	// Parse a cookie value from request
+	req
+		.cookie(name)
+		.unwrap_or_else(|| {
+			// If there is no cookie for this setting, try receiving a default from an environment variable
+			if let Ok(default) = std::env::var(format!("LIBREDDIT_DEFAULT_{}", name.to_uppercase())) {
+				Cookie::new(name, default)
+			} else {
+				Cookie::named(name)
+			}
+		})
+		.value()
+		.to_string()
+}
+
+// Detect and redirect in the event of a random subreddit
+pub async fn catch_random(sub: &str, additional: &str) -> Result<Response<Body>, String> {
+	if sub == "random" || sub == "randnsfw" {
+		let new_sub = json(format!("/r/{}/about.json?raw_json=1", sub), false).await?["data"]["display_name"]
+			.as_str()
+			.unwrap_or_default()
+			.to_string();
+		Ok(redirect(format!("/r/{}{}", new_sub, additional)))
+	} else {
+		Err("No redirect needed".to_string())
+	}
 }
 
 // Direct urls to proxy if proxy is enabled
@@ -404,68 +548,101 @@ pub fn format_url(url: &str) -> String {
 	if url.is_empty() || url == "self" || url == "default" || url == "nsfw" || url == "spoiler" {
 		String::new()
 	} else {
-		match Url::parse(url) {
-			Ok(parsed) => {
-				let domain = parsed.domain().unwrap_or_default();
+		Url::parse(url).map_or(url.to_string(), |parsed| {
+			let domain = parsed.domain().unwrap_or_default();
 
-				let capture = |regex: &str, format: &str, levels: i16| {
-					Regex::new(regex)
-						.map(|re| match re.captures(url) {
-							Some(caps) => match levels {
-								1 => [format, &caps[1], "/"].join(""),
-								2 => [format, &caps[1], "/", &caps[2], "/"].join(""),
-								_ => String::new(),
-							},
-							None => String::new(),
-						})
-						.unwrap_or_default()
+			let capture = |regex: &str, format: &str, segments: i16| {
+				Regex::new(regex).map_or(String::new(), |re| {
+					re.captures(url).map_or(String::new(), |caps| match segments {
+						1 => [format, &caps[1]].join(""),
+						2 => [format, &caps[1], "/", &caps[2]].join(""),
+						_ => String::new(),
+					})
+				})
+			};
+
+			macro_rules! chain {
+				() => {
+					{
+						String::new()
+					}
 				};
 
-				match domain {
-					"v.redd.it" => capture(r"https://v\.redd\.it/(.*)/DASH_([0-9]{2,4}(\.mp4|$))", "/vid/", 2),
-					"i.redd.it" => capture(r"https://i\.redd\.it/(.*)", "/img/", 1),
-					"a.thumbs.redditmedia.com" => capture(r"https://a\.thumbs\.redditmedia\.com/(.*)", "/thumb/a/", 1),
-					"b.thumbs.redditmedia.com" => capture(r"https://b\.thumbs\.redditmedia\.com/(.*)", "/thumb/b/", 1),
-					"emoji.redditmedia.com" => capture(r"https://emoji\.redditmedia\.com/(.*)/(.*)", "/emoji/", 2),
-					"preview.redd.it" => capture(r"https://preview\.redd\.it/(.*)\?(.*)", "/preview/pre/", 2),
-					"external-preview.redd.it" => capture(r"https://external\-preview\.redd\.it/(.*)\?(.*)", "/preview/external-pre/", 2),
-					"styles.redditmedia.com" => capture(r"https://styles\.redditmedia\.com/(.*)", "/style/", 1),
-					"www.redditstatic.com" => capture(r"https://www\.redditstatic\.com/(.*)", "/static/", 1),
-					_ => String::new(),
-				}
+				( $first_fn:expr, $($other_fns:expr), *) => {
+					{
+						let result = $first_fn;
+						if result.is_empty() {
+							chain!($($other_fns,)*)
+						}
+						else
+						{
+							result
+						}
+					}
+				};
 			}
-			Err(_) => String::new(),
-		}
+
+			match domain {
+				"www.reddit.com" => capture(r"https://www\.reddit\.com/(.*)", "/", 1),
+				"old.reddit.com" => capture(r"https://old\.reddit\.com/(.*)", "/", 1),
+				"np.reddit.com" => capture(r"https://np\.reddit\.com/(.*)", "/", 1),
+				"reddit.com" => capture(r"https://reddit\.com/(.*)", "/", 1),
+				"v.redd.it" => chain!(
+					capture(r"https://v\.redd\.it/(.*)/DASH_([0-9]{2,4}(\.mp4|$|\?source=fallback))", "/vid/", 2),
+					capture(r"https://v\.redd\.it/(.+)/(HLSPlaylist\.m3u8.*)$", "/hls/", 2)
+				),
+				"i.redd.it" => capture(r"https://i\.redd\.it/(.*)", "/img/", 1),
+				"a.thumbs.redditmedia.com" => capture(r"https://a\.thumbs\.redditmedia\.com/(.*)", "/thumb/a/", 1),
+				"b.thumbs.redditmedia.com" => capture(r"https://b\.thumbs\.redditmedia\.com/(.*)", "/thumb/b/", 1),
+				"emoji.redditmedia.com" => capture(r"https://emoji\.redditmedia\.com/(.*)/(.*)", "/emoji/", 2),
+				"preview.redd.it" => capture(r"https://preview\.redd\.it/(.*)", "/preview/pre/", 1),
+				"external-preview.redd.it" => capture(r"https://external\-preview\.redd\.it/(.*)", "/preview/external-pre/", 1),
+				"styles.redditmedia.com" => capture(r"https://styles\.redditmedia\.com/(.*)", "/style/", 1),
+				"www.redditstatic.com" => capture(r"https://www\.redditstatic\.com/(.*)", "/static/", 1),
+				_ => url.to_string(),
+			}
+		})
 	}
 }
 
 // Rewrite Reddit links to Libreddit in body of text
-pub fn rewrite_urls(text: &str) -> String {
-	match Regex::new(r#"href="(https|http|)://(www.|old.|np.|)(reddit).(com)/"#) {
-		Ok(re) => re.replace_all(text, r#"href="/"#).to_string(),
-		Err(_) => String::new(),
-	}
+pub fn rewrite_urls(input_text: &str) -> String {
+	let text1 =
+		Regex::new(r#"href="(https|http|)://(www\.|old\.|np\.|amp\.|)(reddit\.com|redd\.it)/"#).map_or(String::new(), |re| re.replace_all(input_text, r#"href="/"#).to_string());
+
+	// Rewrite external media previews to Libreddit
+	Regex::new(r"https://external-preview\.redd\.it(.*)[^?]").map_or(String::new(), |re| {
+		if re.is_match(&text1) {
+			re.replace_all(&text1, format_url(re.find(&text1).map(|x| x.as_str()).unwrap_or_default())).to_string()
+		} else {
+			text1
+		}
+	})
 }
 
-// Append `m` and `k` for millions and thousands respectively
-pub fn format_num(num: i64) -> String {
-	if num >= 1_000_000 {
-		format!("{}m", num / 1_000_000)
-	} else if num >= 1000 {
-		format!("{}k", num / 1_000)
+// Format vote count to a string that will be displayed.
+// Append `m` and `k` for millions and thousands respectively, and
+// round to the nearest tenth.
+pub fn format_num(num: i64) -> (String, String) {
+	let truncated = if num >= 1_000_000 || num <= -1_000_000 {
+		format!("{:.1}m", num as f64 / 1_000_000.0)
+	} else if num >= 1000 || num <= -1000 {
+		format!("{:.1}k", num as f64 / 1_000.0)
 	} else {
 		num.to_string()
-	}
+	};
+
+	(truncated, num.to_string())
 }
 
 // Parse a relative and absolute time from a UNIX timestamp
 pub fn time(created: f64) -> (String, String) {
-	let time = OffsetDateTime::from_unix_timestamp(created.round() as i64);
+	let time = OffsetDateTime::from_unix_timestamp(created.round() as i64).unwrap_or(OffsetDateTime::UNIX_EPOCH);
 	let time_delta = OffsetDateTime::now_utc() - time;
 
 	// If the time difference is more than a month, show full date
 	let rel_time = if time_delta > Duration::days(30) {
-		time.format("%b %d '%y")
+		time.format(format_description!("[month repr:short] [day] '[year repr:last_two]")).unwrap_or_default()
 	// Otherwise, show relative date/time
 	} else if time_delta.whole_days() > 0 {
 		format!("{}d ago", time_delta.whole_days())
@@ -475,7 +652,7 @@ pub fn time(created: f64) -> (String, String) {
 		format!("{}m ago", time_delta.whole_minutes())
 	};
 
-	(rel_time, time.format("%b %d %Y, %H:%M:%S UTC"))
+	(rel_time, time.format(format_description!("[month repr:short] [day] [year], [hour]:[minute]:[second] UTC")).unwrap_or_default())
 }
 
 // val() function used to parse JSON from Reddit APIs
@@ -483,81 +660,63 @@ pub fn val(j: &Value, k: &str) -> String {
 	j["data"][k].as_str().unwrap_or_default().to_string()
 }
 
+// Escape < and > to accurately render HTML
+#[macro_export]
+macro_rules! esc {
+	($f:expr) => {
+		$f.replace('&', "&amp;").replace('<', "&lt;").replace('>', "&gt;")
+	};
+	($j:expr, $k:expr) => {
+		$j["data"][$k].as_str().unwrap_or_default().to_string().replace('<', "&lt;").replace('>', "&gt;")
+	};
+}
+
 //
 // NETWORKING
 //
 
-pub fn template(t: impl Template) -> tide::Result {
-	Ok(Response::builder(200).content_type("text/html").body(t.render().unwrap_or_default()).build())
+pub fn template(t: impl Template) -> Result<Response<Body>, String> {
+	Ok(
+		Response::builder()
+			.status(200)
+			.header("content-type", "text/html")
+			.body(t.render().unwrap_or_default().into())
+			.unwrap_or_default(),
+	)
 }
 
-pub fn redirect(path: String) -> Response {
-	Response::builder(302)
-		.content_type("text/html")
+pub fn redirect(path: String) -> Response<Body> {
+	Response::builder()
+		.status(302)
+		.header("content-type", "text/html")
 		.header("Location", &path)
-		.body(format!("Redirecting to <a href=\"{0}\">{0}</a>...", path))
-		.build()
+		.body(format!("Redirecting to <a href=\"{0}\">{0}</a>...", path).into())
+		.unwrap_or_default()
 }
 
-pub async fn error(req: Request<()>, msg: String) -> tide::Result {
+pub async fn error(req: Request<Body>, msg: String) -> Result<Response<Body>, String> {
+	let url = req.uri().to_string();
 	let body = ErrorTemplate {
 		msg,
 		prefs: Preferences::new(req),
+		url,
 	}
 	.render()
 	.unwrap_or_default();
 
-	Ok(Response::builder(404).content_type("text/html").body(body).build())
+	Ok(Response::builder().status(404).header("content-type", "text/html").body(body.into()).unwrap_or_default())
 }
 
-// Make a request to a Reddit API and parse the JSON response
-#[cached(size = 100, time = 30, result = true)]
-pub async fn request(path: String) -> Result<Value, String> {
-	let url = format!("https://www.reddit.com{}", path);
-	// Build reddit-compliant user agent for Libreddit
-	let user_agent = format!("web:libreddit:{}", env!("CARGO_PKG_VERSION"));
+#[cfg(test)]
+mod tests {
+	use super::format_num;
 
-	// Send request using surf
-	let req = surf::get(&url).header("User-Agent", user_agent.as_str());
-	let client = surf::client().with(surf::middleware::Redirect::new(5));
-
-	let res = client.send(req).await;
-
-	let err = |msg: &str, e: String| -> Result<Value, String> {
-		eprintln!("{} - {}: {}", url, msg, e);
-		Err(msg.to_string())
-	};
-
-	match res {
-		Ok(mut response) => match response.take_body().into_string().await {
-			// If response is success
-			Ok(body) => {
-				// Parse the response from Reddit as JSON
-				let parsed: Result<Value, Error> = from_str(&body);
-				match parsed {
-					Ok(json) => {
-						// If Reddit returned an error
-						if json["error"].is_i64() {
-							Err(
-								json["reason"]
-									.as_str()
-									.unwrap_or_else(|| {
-										json["message"].as_str().unwrap_or_else(|| {
-											eprintln!("{} - Error parsing reddit error", url);
-											"Error parsing reddit error"
-										})
-									})
-									.to_string(),
-							)
-						} else {
-							Ok(json)
-						}
-					}
-					Err(e) => err("Failed to parse page JSON data", e.to_string()),
-				}
-			}
-			Err(e) => err("Couldn't parse request body", e.to_string()),
-		},
-		Err(e) => err("Couldn't send request to Reddit", e.to_string()),
+	#[test]
+	fn format_num_works() {
+		assert_eq!(format_num(567), ("567".to_string(), "567".to_string()));
+		assert_eq!(format_num(1234), ("1.2k".to_string(), "1234".to_string()));
+		assert_eq!(format_num(1999), ("2.0k".to_string(), "1999".to_string()));
+		assert_eq!(format_num(1001), ("1.0k".to_string(), "1001".to_string()));
+		assert_eq!(format_num(1_999_999), ("2.0m".to_string(), "1999999".to_string()));
 	}
 }

static/playHLSVideo.js

@@ -0,0 +1,77 @@
+// @license http://www.gnu.org/licenses/agpl-3.0.html AGPL-3.0
+(function () {
+    if (Hls.isSupported()) {
+        var videoSources = document.querySelectorAll("video source[type='application/vnd.apple.mpegurl']");
+        videoSources.forEach(function (source) {
+            var playlist = source.src;
+
+            var oldVideo = source.parentNode;
+            var autoplay = oldVideo.classList.contains("hls_autoplay");
+
+            // If HLS is supported natively then don't use hls.js
+            if (oldVideo.canPlayType(source.type)) {
+                if (autoplay) {
+                    oldVideo.play();
+                }
+                return;
+            }
+
+            // Replace video with copy that will have all "source" elements removed
+            var newVideo = oldVideo.cloneNode(true);
+            var allSources = newVideo.querySelectorAll("source");
+            allSources.forEach(function (source) {
+                source.remove();
+            });
+
+            // Empty source to enable play event
+            newVideo.src = "about:blank";
+
+            oldVideo.parentNode.replaceChild(newVideo, oldVideo);
+
+            function initializeHls() {
+                newVideo.removeEventListener('play', initializeHls);
+
+                var hls = new Hls({ autoStartLoad: false });
+                hls.loadSource(playlist);
+                hls.attachMedia(newVideo);
+                hls.on(Hls.Events.MANIFEST_PARSED, function () {
+                    hls.loadLevel = hls.levels.length - 1;
+                    hls.startLoad();
+                    newVideo.play();
+                });
+
+                hls.on(Hls.Events.ERROR, function (event, data) {
+                    var errorType = data.type;
+                    var errorFatal = data.fatal;
+                    if (errorFatal) {
+                        switch (errorType) {
+                            case Hls.ErrorType.NETWORK_ERROR:
+                                hls.startLoad();
+                                break;
+                            case Hls.ErrorType.MEDIA_ERROR:
+                                hls.recoverMediaError();
+                                break;
+                            default:
+                                hls.destroy();
+                                break;
+                        }
+                    }
+
+                    console.error("HLS error", data);
+                });
+            }
+
+            newVideo.addEventListener('play', initializeHls);
+
+            if (autoplay) {
+                newVideo.play();
+            }
+        });
+    } else {
+        var videos = document.querySelectorAll("video.hls_autoplay");
+        videos.forEach(function (video) {
+            video.setAttribute("autoplay", "");
+        });
+    }
+})();
+// @license-end

static/style.css

@@ -6,6 +6,12 @@
 	--admin: #ea0027;
 }
 
+@font-face {
+	font-family: 'Inter';
+	src: url('/Inter.var.woff2') format('woff2-variations');
+	font-style: normal;
+}
+
 /* Automatic theme selection */
 :root, .dark{
 	/* Default & fallback theme (dark) */
@@ -18,6 +24,7 @@
 	--post: #161616;
 	--panel-border: 1px solid #333;
 	--highlighted: #333;
+	--visited: #aaa;
 	--shadow: 0 1px 3px rgba(0, 0, 0, 0.5);
 }
 
@@ -33,6 +40,7 @@
 		--post: #eee;
 		--panel-border: 1px solid #ccc;
 		--highlighted: white;
+		--visited: #555;
 		--shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
 	}
 }
@@ -48,6 +56,7 @@
 	--post: #eee;
 	--panel-border: 1px solid #ccc;
 	--highlighted: white;
+	--visited: #555;
 	--shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
 }
 
@@ -62,9 +71,98 @@
 	--post: black;
 	--panel-border: 2px solid #0f0f0f;
 	--highlighted: #0f0f0f;
+	--visited: #aaa;
 	--shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
 }
 
+/* Dracula theme setting */
+.dracula {
+	--accent: #bd93f9;
+	--green: #50fa7b;
+	--text: #f8f8f2;
+	--foreground: #3d4051;
+	--background: #282a36;
+	--outside: #393c4d;
+	--post: #333544;
+	--panel-border: 2px solid #44475a;
+	--highlighted: #4e5267;
+	--visited: #969692;
+	--shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+}
+
+/* Nord theme setting */
+.nord {
+	--accent: #8fbcbb; 
+	--green: #a3be8c;
+	--text: #eceff4;
+	--foreground: #3b4252;
+	--background: #2e3440;
+	--outside: #434c5e;
+	--post: #434c5e;
+	--panel-border: 2px solid #4c566a;
+	--highlighted: #3b4252;
+	--visited: #a3a5aa;
+	--shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+}
+
+/* Laserwave theme setting */
+.laserwave {
+	--accent: #eb64b9;
+	--green: #74dfc4;
+	--text: #e0dfe1;
+	--foreground: #302a36;
+	--background: #27212e;
+	--outside: #3e3647;
+	--post: #3e3647;
+	--panel-border: 2px solid #2f2738;
+	--highlighted: #302a36;
+	--visited: #91889b;
+	--shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+}
+
+/* Violet theme setting */
+.violet {
+	--accent: #7c71dd;
+	--green: #5cff85;
+	--text: white;
+	--foreground: #1F2347;
+	--background: #12152b;
+	--outside: #181c3a;
+	--post: #181c3a;
+	--panel-border: 1px solid #1F2347;
+	--highlighted: #1F2347;
+	--visited: #aaa;
+	--shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
+}
+
+/* Gold theme setting */
+.gold {
+	--accent: #f2aa4c;
+	--green: #5cff85;
+	--text: white;
+	--foreground: #234;
+	--background: #101820;
+	--outside: #1b2936;
+	--post: #1b2936;
+	--panel-border: 0px solid black;
+	--highlighted: #234;
+	--visited: #aaa;
+	--shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
+}
+
+/* Rosebox theme setting */
+.rosebox {
+	--accent: #a57562;
+	--green: #a3be8c;
+	--text: white;
+	--foreground: #222;
+	--background: #262626;
+	--outside: #222;
+	--post: #222;
+	--panel-border: 1px solid #222;
+	--highlighted: #262626;
+	--shadow: 0 1px 3px rgba(0, 0, 0, 0.5);
+}
 
 /* General */
 
@@ -81,7 +179,7 @@ html, body, div, h1, h2, h3, h4, h5, h6, ul, ol, dl, li, dt, dd, p, blockquote,
 pre, form, fieldset, table, th, td, select, input {
 	margin: 0;
 	color: var(--text);
-	font-family: sans-serif;
+	font-family: "Inter", sans-serif;
 }
 
 body {
@@ -143,10 +241,15 @@ nav #libreddit {
 
 #settings_link {
 	opacity: 0.8;
+	margin-left: 10px;
+}
+
+#reddit_link {
+	opacity: 0.8;
 }
 
 #code {
-	margin-left: 5px;
+	margin-left: 10px;
 }
 
 main {
@@ -169,7 +272,7 @@ main {
 #column_one {
 	max-width: 750px;
 	border-radius: 5px;
-	overflow: hidden;
+	overflow: inherit;
 }
 
 footer {
@@ -262,6 +365,7 @@ aside {
 #user_description, #sub_description {
 	margin: 0 15px;
 	text-align: left;
+	overflow-wrap: anywhere;
 }
 
 #user_name, #user_description:not(:empty), #user_icon,
@@ -269,7 +373,7 @@ aside {
 	margin-bottom: 20px;
 }
 
-#user_details, #sub_details {
+#user_details, #sub_details, #sub_actions, #user_actions {
 	display: grid;
 	grid-template-columns: repeat(2, 1fr);
 	grid-column-gap: 20px;
@@ -281,7 +385,7 @@ aside {
 
 /* Subscriptions */
 
-#sub_subscription {
+#sub_subscription, #user_subscription, #user_filter, #sub_filter {
 	margin-top: 20px;
 }
 
@@ -289,18 +393,18 @@ aside {
 	margin-bottom: 20px;
 }
 
-.subscribe, .unsubscribe {
+.subscribe, .unsubscribe, .filter, .unfilter {
 	padding: 10px 20px;
 	border-radius: 5px;
 	cursor: pointer;
 }
 
-.subscribe {
+.subscribe, .filter {
 	color: var(--foreground);
 	background-color: var(--accent);
 }
 
-.unsubscribe { 
+.unsubscribe, .unfilter {
 	color: var(--text);
 	background-color: var(--highlighted);
 }
@@ -361,6 +465,7 @@ aside {
 #wiki {
 	background: var(--foreground);
 	padding: 35px;
+	overflow-wrap: anywhere;
 }
 
 #top {
@@ -382,8 +487,8 @@ aside {
 
 /* Sorting and Search */
 
-select, #search, #sort_options, #inside, #searchbox > *, #sort_submit {
-	height: 40px;
+select, #search, #sort_options, #listing_options, #inside, #searchbox > *, #sort_submit {
+	height: 38px;
 }
 
 .search_label {
@@ -400,7 +505,7 @@ select {
 
 select, #search {
 	border: none;
-	padding: 0 15px;
+	padding: 0 10px;
 	
 	appearance: none;
 	-webkit-appearance: none;
@@ -458,6 +563,11 @@ button.submit:hover > svg { stroke: var(--accent); }
 	border-radius: 5px 0px 0px 5px;
 }
 
+#listing_options + #sort_select {
+	margin-left: 10px;
+	border-radius: 5px 0px 0px 5px;
+}
+
 #search_sort {
 	background: var(--highlighted);
 	border-radius: 5px;
@@ -486,15 +596,16 @@ button.submit:hover > svg { stroke: var(--accent); }
 	margin-bottom: 20px;
 }
 
-#sort_options, footer > a {
+#sort_options, #listing_options, footer > a {
 	border-radius: 5px;
+	align-items: center;
 	box-shadow: var(--shadow);
 	background: var(--outside);
 	display: flex;
-	overflow: auto;
+	overflow: hidden;
 }
 
-#sort_options > a, footer > a {
+#sort_options > a, #listing_options > a, footer > a {
 	color: var(--text);
 	padding: 10px 20px;
 	text-align: center;
@@ -502,12 +613,12 @@ button.submit:hover > svg { stroke: var(--accent); }
 	transition: 0.2s background;
 }
 
-#sort_options > a.selected {
+#sort_options > a.selected, #listing_options > a.selected {
 	background: var(--accent);
 	color: var(--foreground);
 }
 
-#sort_options > a:not(.selected):hover {
+#sort_options > a:not(.selected):hover, #listing_options > a:not(.selected):hover {
 	background: var(--foreground);
 }
 
@@ -522,7 +633,26 @@ button.submit:hover > svg { stroke: var(--accent); }
 
 .search_subreddit { 
 	padding: 16px 20px;
-	display: block;
+	display: flex;
+}
+
+.search_subreddit_left {
+	display: flex;
+	align-items: center;
+}
+
+.search_subreddit_left:not(:empty) {
+	margin-right: 10px;
+}
+
+.search_subreddit_left img {
+	width: 35px;
+	height: 35px;
+	border-radius: 100%;
+}
+
+.search_subreddit_right {
+	overflow: auto;
 }
 
 a.search_subreddit:hover {
@@ -550,6 +680,13 @@ a.search_subreddit:hover {
 	opacity: 0.5;
 }
 
+#more_subreddits {
+	justify-content: center;
+	color: var(--accent);
+	font-weight: 600;
+	text-align: center;
+}
+
 /* Post */
 
 .sep {
@@ -576,6 +713,7 @@ a.search_subreddit:hover {
 			"post_score post_title  post_thumbnail" 1fr
 			"post_score post_media  post_thumbnail" auto
 			"post_score post_body   post_thumbnail" auto
+			"post_score post_notification post_thumbnail" auto
 			"post_score post_footer post_thumbnail" auto
 			/ minmax(40px, auto) minmax(0, 1fr) fit-content(min(20%, 152px));
 }
@@ -587,13 +725,13 @@ a.search_subreddit:hover {
 }
 
 .post_score {
-	padding-top: 16px;
+	padding-top: 19px;
+	padding-left: 12px;
 	font-size: 13px;
 	font-weight: bold;
-	text-align: end;
 	color: var(--accent);
 	grid-area: post_score;
-	text-align: end;
+	text-align: center;
 	border-radius: 5px 0 0 5px;
 	transition: 0.2s background;
 }
@@ -603,8 +741,9 @@ a.search_subreddit:hover {
 } 
 
 .post_header {
-	margin: 15px 20px 5px 15px;
+	margin: 15px 20px 5px 12px;
 	grid-area: post_header;
+	line-height: 25px;
 }
 
 .post_subreddit {
@@ -613,11 +752,28 @@ a.search_subreddit:hover {
 
 .post_title {
 	font-size: 16px;
+	font-weight: 500;
 	line-height: 1.5;
-	margin: 5px 15px;
+	overflow-wrap: anywhere;
+	margin: 5px 15px 5px 12px;
 	grid-area: post_title;
 }
 
+.post:not(.highlighted) .post_title a:visited {
+	color: var(--visited);
+}
+
+.post_notification {
+	grid-area: post_notification;
+	margin: 5px 15px;
+	text-align: center;
+	font-size: 12px;
+}
+
+.post_notification a {
+	text-decoration: underline;
+}
+
 .post_flair {
 	background: var(--accent);
 	color: var(--background);
@@ -628,13 +784,33 @@ a.search_subreddit:hover {
 	font-weight: bold;
 }
 
-.author_flair, .post_flair:empty {
+.awards {
+	background-color: var(--foreground);
+	border-radius: 5px;
+	margin: auto;
+	padding: 5px;
+}
+
+.awards .award {
+	margin-right: 2px;
+}
+
+.award {
+	position: relative;
+	display: inline-block;
+}
+
+.award > img {
+	vertical-align: middle;
+}
+
+.author_flair:empty, .post_flair:empty {
 	display: none;
 }
 
 .emoji {
-	width: 1em;
-	height: 1em;
+	width: 1.25em;
+	height: 1.25em;
 	display: inline-block;
 	background-size: contain;
 	background-position: 50% 50%;
@@ -652,7 +828,7 @@ a.search_subreddit:hover {
 	font-weight: bold;
 }
 
-.post_media_image, .post .__NoScript_PlaceHolder__, .post_media_video, .gallery  {
+.post_media_image, .post .__NoScript_PlaceHolder__, .post_media_video, .gallery {
 	max-width: calc(100% - 40px);
 	grid-area: post_media;
 	margin: 15px auto 5px auto;
@@ -706,25 +882,34 @@ a.search_subreddit:hover {
 
 #post_url {
 	color: var(--accent);
-	margin: 5px 15px;
+	margin: 5px 12px;
 	grid-area: post_media;
 }
 
 .post_body {
 	opacity: 0.9;
 	font-weight: normal;
-	margin: 5px 15px;
+	padding: 5px 15px 5px 12px;
 	grid-area: post_body;
 	width: calc(100% - 30px);
 }
 
+/* Used only for text post preview */
+.post_preview {
+	-webkit-mask-image: linear-gradient(180deg,#000 60%,transparent);;
+	mask-image: linear-gradient(180deg,#000 60%,transparent);
+	opacity: 0.8;
+	max-height: 250px;
+	overflow: hidden;
+}
+
 .post_footer {
 	display: flex;
 	justify-content: space-between;
 	opacity: 0.5;
 	font-size: 14px;
 	grid-area: post_footer;
-	margin: 5px 20px 15px 15px;
+	margin: 5px 20px 15px 12px;
 }
 
 .post_comments {
@@ -837,7 +1022,8 @@ a.search_subreddit:hover {
 	min-width: 40px;
 	border-radius: 5px;
 	padding: 10px 0;
-	font-size: 16px;
+	font-size: 14px;
+	font-weight: 600;
 }
 
 .comment_right {
@@ -862,9 +1048,10 @@ a.search_subreddit:hover {
 	font-weight: normal;
 	padding: 5px 5px;
 	margin: 5px 0;
+	overflow: auto;
 }
 
-.comment_body.highlighted {
+.comment_body.highlighted, .comment_body_filtered.highlighted {
 	background: var(--highlighted);
 }
 
@@ -877,6 +1064,15 @@ a.search_subreddit:hover {
 	color: var(--accent);
 }
 
+.comment_body_filtered {
+	opacity: 0.4;
+	font-weight: normal;
+	font-style: italic;
+	padding: 5px 5px;
+	margin: 5px 0;
+	overflow: auto;
+}
+
 .deeper_replies {
 	color: var(--accent);
 	margin-left: 15px;
@@ -907,6 +1103,10 @@ a.search_subreddit:hover {
 	background: var(--foreground);
 }
 
+summary.comment_data {
+	cursor: pointer;
+}
+
 .moderator, .admin { opacity: 1; }
 .op, .moderator, .admin { font-weight: bold; }
 
@@ -941,7 +1141,7 @@ a.search_subreddit:hover {
 }
 
 .compact .post_header {
-	margin: 15px 15px 2.5px 15px;
+	margin: 11px 15px 2.5px 12px;
 	font-size: 14px;
 }
 
@@ -949,6 +1149,10 @@ a.search_subreddit:hover {
 	margin: 2.5px 15px;
 }
 
+.compact .post_preview {
+	display: none;
+}
+
 .compact .post_media {
 	max-width: calc(100% - 30px);
 	margin: 2.5px auto;
@@ -983,12 +1187,10 @@ a.search_subreddit:hover {
 	color: var(--accent);
 }
 
-
 .prefs {
 	display: flex;
 	flex-direction: column;
 	justify-content: space-between;
-	align-items: center;
 	padding: 20px;
 	background: var(--post);
 	border-radius: 5px;
@@ -1001,7 +1203,19 @@ a.search_subreddit:hover {
 	width: 100%;
 	height: 35px;
 	align-items: center;
-	margin-top: 10px;
+	margin-top: 7px;
+}
+
+.prefs legend {
+	font-weight: 500;
+	border-bottom: 1px solid var(--highlighted);
+	font-size: 18px;
+	padding-bottom: 10px;
+}
+
+.prefs legend:not(:first-child) {
+	padding-top: 10px;
+	margin-top: 15px;
 }
 
 .prefs select {
@@ -1032,6 +1246,24 @@ input[type="submit"] {
 	margin-left: 30px;
 }
 
+#settings_subs a {
+	color: var(--accent);
+}
+
+#settings_filters .unsubscribe {
+	margin-left: 30px;
+}
+
+#settings_filters a {
+	color: var(--accent);
+}
+
+.helper {
+	padding: 10px;
+	width: 250px;
+	background: var(--highlighted) !important;
+}
+
 /* Markdown */
 
 .md {
@@ -1084,10 +1316,11 @@ input[type="submit"] {
 
 .md table {
 	margin: 5px;
+	overflow-x: auto;
 }
 
 .md code {
-	font-family: monospace;
+	font-family: monospace, sans-serif;
 	font-size: 14px;
 }
 
@@ -1115,46 +1348,6 @@ td, th {
 
 /* Mobile */
 
-@media screen and (max-width: 480px) {
-	#version { display: none; }
-
-	.post {
-		grid-template: 	"post_header post_header post_thumbnail" auto
-				"post_title  post_title  post_thumbnail" 1fr
-				"post_media  post_media  post_thumbnail" auto
-				"post_body   post_body   post_thumbnail" auto
-				"post_score  post_footer post_thumbnail" auto
-				/ auto 1fr fit-content(min(20%, 152px));
-	}
-	
-	.post_score {
-		margin: 5px 0px 20px 15px;
-		padding: 0;
-	}
-	
-	.compact .post_score { padding: 0; }
-	
-	.post_score::before {	content: "↑" }
-
-	.post_header { font-size: 14px; }
-	.post_footer { margin-left: 15px;	}
-
-	.replies > .comment {
-		margin-left: -25px;
-		padding: 5px 0;
-	}
-
-	.comment_left {
-		min-width: 45px;
-		padding: 5px 0px;
-	}
-
-	.comment_author { margin-left: 10px; }
-	.comment_score { min-width: 35px;	}
-	.comment_data::marker { font-size: 18px; }
-	.created { width: 100%; }
-}
-
 @media screen and (max-width: 800px) {
 	body { padding-top: 120px }
 
@@ -1196,3 +1389,61 @@ td, th {
 	#logo, #links { margin-bottom: 5px; }
 	#searchbox { width: calc(100vw - 35px); }
 }
+
+@media screen and (max-width: 480px) {
+	body { padding-top: 100px; }
+	#version { display: none; }
+
+	.post {
+		grid-template: 	"post_header post_header post_thumbnail" auto
+				"post_title  post_title  post_thumbnail" 1fr
+				"post_media  post_media  post_thumbnail" auto
+				"post_body   post_body   post_thumbnail" auto
+				"post_notification post_notification post_thumbnail" auto
+				"post_score  post_footer post_thumbnail" auto
+				/ auto 1fr fit-content(min(20%, 152px));
+	}
+	
+	.post_score {
+		margin: 5px 0px 20px 15px;
+		padding: 0;
+	}
+	
+	.compact .post_score { padding: 0; }
+	
+	.post_score::before {	content: "↑" }
+
+	.post_header { font-size: 14px; }
+	.post_footer { margin-left: 15px;	}
+
+	.replies > .comment {
+		margin-left: -12px;
+		padding: 5px 0;
+	}
+
+	.comment_left {
+		min-width: auto;
+		padding: 5px 0px;
+		align-items: initial;
+		margin-top: -5px;
+	}
+
+	.line {
+		margin-left: 5px;
+	}
+
+	/* .thread { margin-left: -5px; } */
+	.comment_right { padding: 5px 0 10px 2px; }
+	.comment_author { margin-left: 12px; }
+	.comment_data { margin-left: 12px; }
+	.comment_data::marker { font-size: 25px; }
+	.created { width: 100%; }
+
+	.comment_score {
+		min-width: 32px;
+		height: 20px;
+		font-size: 15px;
+		padding: 7px 0px;
+		margin-right: -5px;
+	}
+}

templates/base.html

@@ -12,14 +12,14 @@
 		<meta name="apple-mobile-web-app-title" content="Libreddit">
 		<meta name="apple-mobile-web-app-capable" content="yes">
 		<meta name="apple-mobile-web-app-status-bar-style" content="default">
-		<!-- Android  -->
+		<!-- Android -->
 		<meta name="mobile-web-app-capable" content="yes">
 		<!-- iOS Logo -->
-		<link href="/touch-icon-iphone.png/" rel="apple-touch-icon">
+		<link href="/touch-icon-iphone.png" rel="apple-touch-icon">
 		<!-- PWA Manifest -->
-		<link rel="manifest" type="application/json" href="/manifest.json/">
-		<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico/"> 
-		<link rel="stylesheet" type="text/css" href="/style.css/">
+		<link rel="manifest" type="application/json" href="/manifest.json">
+		<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico"> 
+		<link rel="stylesheet" type="text/css" href="/style.css">
 		{% endblock %}
 		</head>
 	<body class="
@@ -35,7 +35,13 @@
 			</div>
 			{% block search %}{% endblock %}
 			<div id="links">
-				<a id="settings_link" href="/settings/">
+				<a id="reddit_link" href="https://www.reddit.com{{ url }}" rel="nofollow">
+					<span>reddit</span>
+					<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+						<path d="M23 12.0737C23 10.7308 21.9222 9.64226 20.5926 9.64226C19.9435 9.64226 19.3557 9.90274 18.923 10.3244C17.2772 9.12492 15.0099 8.35046 12.4849 8.26135L13.5814 3.05002L17.1643 3.8195C17.2081 4.73947 17.9539 5.47368 18.8757 5.47368C19.8254 5.47368 20.5951 4.69626 20.5951 3.73684C20.5951 2.77769 19.8254 2 18.8758 2C18.2001 2 17.6214 2.39712 17.3404 2.96952L13.3393 2.11066C13.2279 2.08679 13.1116 2.10858 13.016 2.17125C12.9204 2.23393 12.8533 2.33235 12.8295 2.44491L11.6051 8.25987C9.04278 8.33175 6.73904 9.10729 5.07224 10.3201C4.63988 9.90099 4.05398 9.64226 3.40757 9.64226C2.0781 9.64226 1 10.7308 1 12.0737C1 13.0618 1.58457 13.9105 2.4225 14.2909C2.38466 14.5342 2.36545 14.78 2.36505 15.0263C2.36505 18.7673 6.67626 21.8 11.9945 21.8C17.3131 21.8 21.6243 18.7673 21.6243 15.0263C21.6243 14.7794 21.6043 14.5359 21.5678 14.2957C22.4109 13.9175 23 13.0657 23 12.0737Z"/>
+					</svg>
+				</a>
+				<a id="settings_link" href="/settings">
 					<span>settings</span>
 					<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
 						<title>settings</title>

templates/comment.html

@@ -2,22 +2,38 @@
 
 {% if kind == "more" && parent_kind == "t1" %}
 <a class="deeper_replies" href="{{ post_link }}{{ parent_id }}">&rarr; More replies</a>
-{% else if kind == "t1"  %}
+{% else if kind == "t1" %}
 <div id="{{ id }}" class="comment">
 	<div class="comment_left">
-		<p class="comment_score">{{ score }}</p>
+		<p class="comment_score" title="{{ score.1 }}">{{ score.0 }}</p>
 		<div class="line"></div>
 	</div>
-	<details class="comment_right" open>
+	<details class="comment_right" {% if !collapsed || highlighted %}open{% endif %}>
 		<summary class="comment_data">
-			<a class="comment_author {{ author.distinguished }} {% if author.name == post_author %}op{% endif %}" href="/u/{{ author.name }}">u/{{ author.name }}</a>
+			{% if author.name != "[deleted]" %}
+				<a class="comment_author {{ author.distinguished }} {% if author.name == post_author %}op{% endif %}" href="/user/{{ author.name }}">u/{{ author.name }}</a>
+			{% else %}
+				<span class="comment_author {{ author.distinguished }}">u/[deleted]</span>
+			{% endif %}
 			{% if author.flair.flair_parts.len() > 0 %}
 				<small class="author_flair">{% call utils::render_flair(author.flair.flair_parts) %}</small>
 			{% endif %}
 			<a href="{{ post_link }}{{ id }}/?context=3" class="created" title="{{ created }}">{{ rel_time }}</a>
 			{% if edited.0 != "".to_string() %}<span class="edited" title="{{ edited.1 }}">edited {{ edited.0 }}</span>{% endif %}
+			{% if !awards.is_empty() %}
+			<span class="dot">&bull;</span>
+			{% for award in awards.clone() %}
+			<span class="award" title="{{ award.name }}">
+				<img alt="{{ award.name }}" src="{{ award.icon_url }}" width="16" height="16"/>
+			</span>
+			{% endfor %}
+			{% endif %}
 		</summary>
+		{% if is_filtered %}
+		<div class="comment_body_filtered {% if highlighted %}highlighted{% endif %}">(Filtered content)</div>
+		{% else %}
 		<div class="comment_body {% if highlighted %}highlighted{% endif %}">{{ body }}</div>
+		{% endif %}
 		<blockquote class="replies">{% for c in replies -%}{{ c.render().unwrap() }}{%- endfor %}
 		</blockquote>
 	</details>

templates/post.html

@@ -13,7 +13,6 @@
 	<!-- Meta Tags -->
 	<meta name="author" content="u/{{ post.author.name }}">
 	<meta name="title" content="{{ post.title }} - r/{{ post.community }}">
-	<meta name="description" content="View on Libreddit, an alternative private front-end to Reddit.">
 	<meta property="og:type" content="website">
 	<meta property="og:url" content="{{ post.permalink }}">
 	<meta property="og:title" content="{{ post.title }} - r/{{ post.community }}">
@@ -38,17 +37,28 @@
 			<p class="post_header">
 				<a class="post_subreddit" href="/r/{{ post.community }}">r/{{ post.community }}</a>
 				<span class="dot">&bull;</span>
-				<a class="post_author" href="/u/{{ post.author.name }}">u/{{ post.author.name }}</a>
+				<a class="post_author {{ post.author.distinguished }}" href="/user/{{ post.author.name }}">u/{{ post.author.name }}</a>
 				{% if post.author.flair.flair_parts.len() > 0 %}
 					<small class="author_flair">{% call utils::render_flair(post.author.flair.flair_parts) %}</small>
 				{% endif %}
 				<span class="dot">&bull;</span>
 				<span class="created" title="{{ post.created }}">{{ post.rel_time }}</span>
+				{% if !post.awards.is_empty() %}
+				<span class="dot">&bull;</span>
+				<span class="awards">
+					{% for award in post.awards.clone() %}
+					<span class="award" title="{{ award.name }}">
+						<img alt="{{ award.name }}" src="{{ award.icon_url }}" width="16" height="16"/>
+						{{ award.count }}
+					</span>
+					{% endfor %}
+				</span>
+				{% endif %}
 			</p>
 			<p class="post_title">
-				<a href="{{ post.permalink }}">{{ post.title }}</a>
+				{{ post.title }}
 				{% if post.flair.flair_parts.len() > 0 %}
-					<a href="/r/{{ post.community }}/search/?q=flair_name%3A%22{{ post.flair.text }}%22&restrict_sr=on"
+					<a href="/r/{{ post.community }}/search?q=flair_name%3A%22{{ post.flair.text }}%22&restrict_sr=on"
 						class="post_flair"
 						style="color:{{ post.flair.foreground_color }}; background:{{ post.flair.background_color }};">{% call utils::render_flair(post.flair.flair_parts) %}</a>
 				{% endif %}
@@ -56,6 +66,7 @@
 			</p>
 
 			<!-- POST MEDIA -->
+			<!-- post_type: {{ post.post_type }} -->
 			{% if post.post_type == "image" %}
 			<a href="{{ post.media.url }}" class="post_media_image" >
 				<svg
@@ -64,37 +75,47 @@
 					xmlns="http://www.w3.org/2000/svg">
 						<image width="100%" height="100%" href="{{ post.media.url }}"/>
 						<desc>
-							<img alt="Post image" src="{{ post.media.url }}"/>
+							<img loading="lazy" alt="Post image" src="{{ post.media.url }}"/>
 						</desc>
 				</svg>
 			</a>
 			{% else if post.post_type == "video" || post.post_type == "gif" %}
-			<video class="post_media_video" src="{{ post.media.url }}" controls autoplay loop><a href={{ post.media.url }}>Video</a></video>
+			{% if prefs.use_hls == "on" && !post.media.alt_url.is_empty() %}
+			<script src="/hls.min.js"></script>
+			<video class="post_media_video short {% if prefs.autoplay_videos == "on" %}hls_autoplay{% endif %}" width="{{ post.media.width }}" height="{{ post.media.height }}" poster="{{ post.media.poster }}" preload="none" controls>
+				<source src="{{ post.media.alt_url }}" type="application/vnd.apple.mpegurl" />
+				<source src="{{ post.media.url }}" type="video/mp4" />
+			</video>
+			<script src="/playHLSVideo.js"></script>
+			{% else %}
+			<video class="post_media_video" src="{{ post.media.url }}" controls {% if prefs.autoplay_videos == "on" %}autoplay{% endif %} loop><a href={{ post.media.url }}>Video</a></video>
+			{% call utils::render_hls_notification(post.permalink[1..]) %}
+			{% endif %}
 			{% else if post.post_type == "gallery" %}
 			<div class="gallery">
 			{% for image in post.gallery -%}
 				<figure>
-					<a href="{{ image.url }}" ><img alt="Gallery image" src="{{ image.url }}"/></a>
+					<a href="{{ image.url }}" ><img loading="lazy" alt="Gallery image" src="{{ image.url }}"/></a>
 					<figcaption>
 						<p>{{ image.caption }}</p>
 						{% if image.outbound_url.len() > 0 %}
-						<p><a class="outbound_url" href="{{ image.outbound_url }}">{{ image.outbound_url }}</a>
+						<p><a class="outbound_url" href="{{ image.outbound_url }}" rel="nofollow">{{ image.outbound_url }}</a>
 						{% endif %}
 					</figcaption>
 				</figure>
 			{%- endfor %}
 			</div>			
 			{% else if post.post_type == "link" %}
-			<a id="post_url" href="{{ post.media.url }}">{{ post.media.url }}</a>
+			<a id="post_url" href="{{ post.media.url }}" rel="nofollow">{{ post.media.url }}</a>
 			{% endif %}
 
 			<!-- POST BODY -->
 			<div class="post_body">{{ post.body }}</div>
-			<div class="post_score">{{ post.score }}<span class="label"> Upvotes</span></div>
+			<div class="post_score" title="{{ post.score.1 }}">{{ post.score.0 }}<span class="label"> Upvotes</span></div>
 			<div class="post_footer">
 				<ul id="post_links">
 					<li><a href="/{{ post.id }}">permalink</a></li>
-					<li><a href="https://reddit.com/{{ post.id }}">reddit</a></li>
+					<li><a href="https://reddit.com/{{ post.id }}" rel="nofollow">reddit</a></li>
 				</ul>
 				<p>{{ post.upvote_ratio }}% Upvoted</p>
 			</div>

templates/search.html

@@ -17,6 +17,7 @@
 				<label for="restrict_sr" class="search_label">in r/{{ sub }}</label>
 			</div>
 			{% endif %}
+			{% if params.typed == "sr_user" %}<input type="hidden" name="type" value="sr_user">{% endif %}
 			<select id="sort_options" name="sort" title="Sort results by">
 				{% call utils::options(params.sort, ["relevance", "hot", "top", "new", "comments"], "") %}
 			</select>{% if params.sort != "new" %}<select id="timeframe" name="t" title="Timeframe"> 
@@ -29,43 +30,64 @@
 					</svg>
 				</button>
 		</form>
-		
-		{% if subreddits.len() > 0 %}
+
+		{% if !is_filtered %}
+		{% if subreddits.len() > 0 || params.typed == "sr_user" %}
 		<div id="search_subreddits">
+			{% if params.typed == "sr_user" %}
+			<a href="?q={{ params.q }}&sort={{ params.sort }}&t={{ params.t }}" class="search_subreddit" id="more_subreddits">← Back to post/comment results</a>
+			{% endif %}
 			{% for subreddit in subreddits %}
 			<a href="{{ subreddit.url }}" class="search_subreddit">
-				<p class="search_subreddit_header"> 
-					<span class="search_subreddit_name">{{ subreddit.name }}</span>
-					<span class="dot">&bull;</span>
-					<span class="search_subreddit_members">{{ subreddit.subscribers }} Members</span>
-				</p>
-				<p class="search_subreddit_description">{{ subreddit.description }}</p>
+				<div class="search_subreddit_left">{% if subreddit.icon != "" %}<img loading="lazy" src="{{ subreddit.icon }}" alt="r/{{ subreddit.name }} icon">{% endif %}</div>
+				<div class="search_subreddit_right">
+					<p class="search_subreddit_header"> 
+						<span class="search_subreddit_name">r/{{ subreddit.name }}</span>
+						<span class="dot">&bull;</span>
+						<span class="search_subreddit_members" title="{{ subreddit.subscribers.1 }} Members">{{ subreddit.subscribers.0 }} Members</span>
+					</p>
+					<p class="search_subreddit_description">{{ subreddit.description }}</p>
+				</div>
 			</a>
 			{% endfor %}
+			{% if params.typed != "sr_user" %}
+			<a href="?q={{ params.q }}&sort={{ params.sort }}&t={{ params.t }}&type=sr_user" class="search_subreddit" id="more_subreddits">More subreddit results →</a>
+			{% endif %}
 		</div>
-		{%  endif %}
-		{% for post in posts %}
-
-		{% if post.flags.nsfw && prefs.show_nsfw != "on" %}
-		{% else if post.title != "Comment" %}
-		{% call utils::post_in_list(post) %}
-		{% else %}
-			<div class="comment">
-				<div class="comment_left">
-					<p class="comment_score">{{ post.score }}</p>
-					<div class="line"></div>
-				</div>
-				<details class="comment_right" open>
-					<summary class="comment_data">
-						<a class="comment_link" href="{{ post.permalink }}">COMMENT</a>
-						<span class="created" title="{{ post.created }}">{{ post.rel_time }}</span>
-					</summary>
-					<p class="comment_body">{{ post.body }}</p>
-				</details>
-			</div>
 		{% endif %}
-		{% endfor %}
+		{% endif %}
+		{% if all_posts_filtered %}
+			<center>(All content on this page has been filtered)</center>
+		{% else if is_filtered %}
+			<center>(Content from r/{{ sub }} has been filtered)</center>
+		{% else if params.typed != "sr_user" %}
+			{% for post in posts %}
+				{% if post.flags.nsfw && prefs.show_nsfw != "on" %}
+				{% else if !post.title.is_empty() %}
+					{% call utils::post_in_list(post) %}
+				{% else %}
+					<div class="comment">
+						<div class="comment_left">
+							<p class="comment_score" title="{{ post.score.1 }}">{{ post.score.0 }}</p>
+							<div class="line"></div>
+						</div>
+						<details class="comment_right" open>
+							<summary class="comment_data">
+								<a class="comment_link" href="{{ post.permalink }}">COMMENT</a>
+								<span class="created" title="{{ post.created }}">{{ post.rel_time }}</span>
+							</summary>
+							<p class="comment_body">{{ post.body }}</p>
+						</details>
+					</div>
+				{% endif %}
+			{% endfor %}
+		{% endif %}
+		{% if prefs.use_hls == "on" %}
+		<script src="/hls.min.js"></script>
+		<script src="/playHLSVideo.js"></script>
+		{% endif %}
 
+		{% if params.typed != "sr_user" %}
 		<footer>
 			{% if params.before != "" %}
 			<a href="?q={{ params.q }}&restrict_sr={{ params.restrict_sr }}
@@ -79,5 +101,6 @@
 				&after={{ params.after }}">NEXT</a>
 			{% endif %}
 		</footer>
+		{% endif %}
 	</div>
 {% endblock %}

templates/settings.html

@@ -9,16 +9,16 @@
 
 {% block content %}
 	<div id="settings">
-	<form action="/settings/" method="POST">
+	<form action="/settings" method="POST">
 		<div class="prefs">
-			<p>Appearance</p>
+			<legend>Appearance</legend>
 			<div id="theme">
 				<label for="theme">Theme:</label>
 				<select name="theme"> 
-					{% call utils::options(prefs.theme, ["system", "light", "dark", "black"], "system") %}
+					{% call utils::options(prefs.theme, ["system", "light", "dark", "black", "dracula", "nord", "laserwave", "violet", "gold", "rosebox"], "system") %}
 				</select>
 			</div>
-			<p>Interface</p>
+			<legend>Interface</legend>
 			<div id="front_page">
 				<label for="front_page">Front page:</label>
 				<select name="front_page"> 
@@ -33,9 +33,16 @@
 			</div>
 			<div id="wide">
 				<label for="wide">Wide UI:</label>
+				<input type="hidden" value="off" name="wide">
 				<input type="checkbox" name="wide" {% if prefs.wide == "on" %}checked{% endif %}>
 			</div>
-			<p>Content</p>
+			<legend>Content</legend>
+			<div id="post_sort">
+				<label for="post_sort" title="Applies only to subreddit feeds">Default subreddit post sort:</label>
+				<select name="post_sort"> 
+					{% call utils::options(prefs.post_sort, ["hot", "new", "top", "rising", "controversial"], "hot") %}
+				</select>
+			</div>
 			<div id="comment_sort">
 				<label for="comment_sort">Default comment sort:</label>
 				<select name="comment_sort"> 
@@ -44,17 +51,40 @@
 			</div>
 			<div id="show_nsfw">
 				<label for="show_nsfw">Show NSFW posts:</label>
+				<input type="hidden" value="off" name="show_nsfw">
 				<input type="checkbox" name="show_nsfw" {% if prefs.show_nsfw == "on" %}checked{% endif %}>
 			</div>
+			<div id="autoplay_videos">
+				<label for="autoplay_videos">Autoplay videos</label>
+				<input type="hidden" value="off" name="autoplay_videos">
+				<input type="checkbox" name="autoplay_videos" {% if prefs.autoplay_videos == "on" %}checked{% endif %}>
+			</div>
+			<div id="use_hls">
+				<label for="use_hls">Use HLS for videos
+					<details id="feeds">
+						<summary>Why?</summary>
+						<div id="feed_list" class="helper">Reddit videos require JavaScript (via HLS.js) to be enabled to be played with audio. Therefore, this toggle lets you either use Libreddit JS-free or utilize this feature.</div>
+					</details>
+				</label>
+				<input type="hidden" value="off" name="use_hls">
+				<input type="checkbox" name="use_hls" {% if prefs.use_hls == "on" %}checked{% endif %}>
+			</div>
+			<div id="hide_hls_notification">
+				<label for="hide_hls_notification">Hide notification about possible HLS usage</label>
+				<input type="hidden" value="off" name="hide_hls_notification">
+				<input type="checkbox" name="hide_hls_notification" {% if prefs.hide_hls_notification == "on" %}checked{% endif %}>
+			</div>
 			<input id="save" type="submit" value="Save">
 		</div>
 	</form>
 	{% if prefs.subscriptions.len() > 0 %}
 		<div class="prefs" id="settings_subs">
-			<p>Subscribed Subreddits</p>
+			<legend>Subscribed Feeds</legend>
 			{% for sub in prefs.subscriptions %}
 			<div>
-				<span>{{ sub }}</span>
+				{% let feed -%}
+				{% if sub.starts_with("u_") -%}{% let feed = format!("u/{}", &sub[2..]) -%}{% else -%}{% let feed = format!("r/{}", sub) -%}{% endif -%}
+				<a href="/{{ feed }}">{{ feed }}</a>
 				<form action="/r/{{ sub }}/unsubscribe/?redirect=settings" method="POST">
 						<button class="unsubscribe">Unsubscribe</button>
 				</form>
@@ -62,10 +92,25 @@
 			{% endfor %}
 		</div>
 	{% endif %}
-	
+	{% if !prefs.filters.is_empty() %}
+		<div class="prefs" id="settings_filters">
+			<legend>Filtered Feeds</legend>
+			{% for sub in prefs.filters %}
+			<div>
+				{% let feed -%}
+				{% if sub.starts_with("u_") -%}{% let feed = format!("u/{}", &sub[2..]) -%}{% else -%}{% let feed = format!("r/{}", sub) -%}{% endif -%}
+				<a href="/{{ feed }}">{{ feed }}</a>
+				<form action="/r/{{ sub }}/unfilter/?redirect=settings" method="POST">
+					<button class="unfilter">Unfilter</button>
+				</form>
+			</div>
+			{% endfor %}
+		</div>
+	{% endif %}
+
 	<div id="settings_note">
 		<p><b>Note:</b> settings and subscriptions are saved in browser cookies. Clearing your cookies will reset them.</p><br>
-		<p>You can restore your current settings and subscriptions after clearing your cookies using <a href="/settings/restore/?theme={{ prefs.theme }}&front_page={{ prefs.front_page }}&layout={{ prefs.layout }}&wide={{ prefs.wide }}&comment_sort={{ prefs.comment_sort }}&show_nsfw={{ prefs.show_nsfw }}&subscriptions={{ prefs.subscriptions.join("%2B") }}">this link</a>.</p>
+		<p>You can restore your current settings and subscriptions after clearing your cookies using <a href="/settings/restore/?theme={{ prefs.theme }}&front_page={{ prefs.front_page }}&layout={{ prefs.layout }}&wide={{ prefs.wide }}&comment_sort={{ prefs.comment_sort }}&show_nsfw={{ prefs.show_nsfw }}&use_hls={{ prefs.use_hls }}&hide_hls_notification={{ prefs.hide_hls_notification }}&subscriptions={{ prefs.subscriptions.join("%2B") }}&filters={{ prefs.filters.join("%2B") }}">this link</a>.</p>
 	</div>
 </div>
 

templates/subreddit.html

@@ -17,6 +17,7 @@
 
 {% block body %}
 	<main>
+		{% if !is_filtered %}
 		<div id="column_one">
 			<form id="sort">
 				<div id="sort_options">
@@ -40,11 +41,14 @@
 			</form>
 
 			{% if sub.name.contains("+") %}
-				<form action="/r/{{ sub.name }}/subscribe/" method="POST">
+				<form action="/r/{{ sub.name }}/subscribe?redirect={{ redirect_url }}" method="POST">
 					<button id="multisub" class="subscribe" title="Subscribe to each sub in this multireddit">Subscribe to Multireddit</button>
 				</form>
 			{% endif %}
 
+			{% if all_posts_filtered %}
+				 <center>(All content on this page has been filtered)</center>
+			{% else %}
 			<div id="posts">
 			{% for post in posts %}
 			{% if !(post.flags.nsfw && prefs.show_nsfw != "on") %}
@@ -52,20 +56,30 @@
 			{% call utils::post_in_list(post) %}
 			{% endif %}
 			{% endfor %}
+			{% if prefs.use_hls == "on" %}
+			<script src="/hls.min.js"></script>
+			<script src="/playHLSVideo.js"></script>
+			{% endif %}
 			</div>
+			{% endif %}
 
 			<footer>
-				{% if ends.0 != "" %}
+				{% if !ends.0.is_empty() %}
 				<a href="?sort={{ sort.0 }}&t={{ sort.1 }}&before={{ ends.0 }}">PREV</a>
 				{% endif %}
 
-				{% if ends.1 != "" %}
+				{% if !ends.1.is_empty() %}
 				<a href="?sort={{ sort.0 }}&t={{ sort.1 }}&after={{ ends.1 }}">NEXT</a>
 				{% endif %}
 			</footer>
 		</div>
-		{% if sub.name != "" && !sub.name.contains("+") %}
+		{% endif %}
+		{% if is_filtered || (!sub.name.is_empty() && !sub.name.contains("+")) %}
 		<aside>
+			{% if is_filtered %}
+				<center>(Content from r/{{ sub.name }} has been filtered)</center>
+			{% endif %}
+			{% if !sub.name.is_empty() && !sub.name.contains("+") %}
 			<div class="panel" id="subreddit">
 				{% if sub.wiki %}
 				<div id="top">
@@ -74,33 +88,57 @@
 				</div>
 				{% endif %}
 				<div id="sub_meta">
-					<img id="sub_icon" src="{{ sub.icon }}" alt="Icon for r/{{ sub.name }}">
+					<img loading="lazy" id="sub_icon" src="{{ sub.icon }}" alt="Icon for r/{{ sub.name }}">
 					<p id="sub_title">{{ sub.title }}</p>
 					<p id="sub_name">r/{{ sub.name }}</p>
 					<p id="sub_description">{{ sub.description }}</p>
 					<div id="sub_details">
 						<label>Members</label>
 						<label>Active</label>
-						<div>{{ sub.members }}</div>
-						<div>{{ sub.active }}</div>
+						<div title="{{ sub.members.1 }}">{{ sub.members.0 }}</div>
+						<div title="{{ sub.active.1 }}">{{ sub.active.0 }}</div>
 					</div>
-					<div id="sub_subscription">
-						{% if prefs.subscriptions.contains(sub.name) %}
-							<form action="/r/{{ sub.name }}/unsubscribe/" method="POST">
-								<button class="unsubscribe">Unsubscribe</button>
+					<div id="sub_actions">
+						<div id="sub_subscription">
+							{% if prefs.subscriptions.contains(sub.name) %}
+								<form action="/r/{{ sub.name }}/unsubscribe?redirect={{ redirect_url }}" method="POST">
+									<button class="unsubscribe">Unsubscribe</button>
+								</form>
+							{% else %}
+								<form action="/r/{{ sub.name }}/subscribe?redirect={{ redirect_url }}" method="POST">
+									<button class="subscribe">Subscribe</button>
+								</form>
+							{% endif %}
+						</div>
+						<div id="sub_filter">
+							{% if prefs.filters.contains(sub.name) %}
+								<form action="/r/{{ sub.name }}/unfilter?redirect={{ redirect_url }}" method="POST">
+									<button class="unfilter">Unfilter</button>
+								</form>
+							{% else %}
+							<form action="/r/{{ sub.name }}/filter?redirect={{ redirect_url }}" method="POST">
+								<button class="filter">Filter</button>
 							</form>
-						{% else %}
-							<form action="/r/{{ sub.name }}/subscribe/" method="POST">
-								<button class="subscribe">Subscribe</button>
-							</form>
-						{% endif %}
+							{% endif %}
+						</div>
 					</div>
 				</div>
 			</div>
 			<details class="panel" id="sidebar">
 				<summary id="sidebar_label">Sidebar</summary>
-				<div id="sidebar_contents">{{ sub.info }}</div>
+				<div id="sidebar_contents">
+					{{ sub.info }}
+					{# <hr>
+					<h2>Moderators</h2>
+					<br>
+					<ul>
+					{% for moderator in sub.moderators %}
+					<li><a style="color: var(--accent)" href="/u/{{ moderator }}">{{ moderator }}</a></li>
+					{% endfor %}
+					</ul> #}
+				</div>
 			</details>
+			{% endif %}
 		</aside>
 		{% endif %}
 	</main>

templates/user.html

@@ -13,11 +13,15 @@
 
 {% block body %}
 	<main>
+		{% if !is_filtered %}
 		<div id="column_one">
 			<form id="sort">
-				<select name="sort"> 
-					{% call utils::options(sort.0, ["hot", "new", "top"], "") %}
-				</select>{% if sort.0 == "top" %}<select id="timeframe" name="t"> 
+				<div id="listing_options">
+					{% call utils::sort(["/user/", user.name.as_str()].concat(), ["overview", "comments", "submitted"], listing) %}
+				</div>
+				<select id="sort_select" name="sort">
+					{% call utils::options(sort.0, ["hot", "new", "top", "controversial"], "") %}
+				</select>{% if sort.0 == "top" || sort.0 == "controversial" %}<select id="timeframe" name="t">
 					{% call utils::options(sort.1, ["hour", "day", "week", "month", "year", "all"], "all") %}
 				</select>{% endif %}<button id="sort_submit" class="submit">
 					<svg width="15" viewBox="0 0 110 100" fill="none" stroke-width="10" stroke-linecap="round">
@@ -28,16 +32,19 @@
 				</button>
 			</form>
 
+			{% if all_posts_filtered %}
+				 <center>(All content on this page has been filtered)</center>
+			{% else %}
 			<div id="posts">
 			{% for post in posts %}
 
 			{% if post.flags.nsfw && prefs.show_nsfw != "on" %}
-			{% else if post.title != "Comment" %}
+			{% else if !post.title.is_empty() %}
 			{% call utils::post_in_list(post) %}
 			{% else %}
 			<div class="comment">
 				<div class="comment_left">
-					<p class="comment_score">{{ post.score }}</p>
+					<p class="comment_score" title="{{ post.score.1 }}">{{ post.score.0 }}</p>
 					<div class="line"></div>
 				</div>
 				<details class="comment_right" open>
@@ -49,9 +56,13 @@
 				</details>
 			</div>
 			{% endif %}
-
 			{% endfor %}
+			{% if prefs.use_hls == "on" %}
+			<script src="/hls.min.js"></script>
+			<script src="/playHLSVideo.js"></script>
+			{% endif %}
 			</div>
+			{% endif %}
 
 			<footer>
 				{% if ends.0 != "" %}
@@ -63,9 +74,13 @@
 				{% endif %}
 			</footer>
 		</div>
+		{% endif %}
 		<aside>
+			{% if is_filtered %}
+			<center>(Content from u/{{ user.name }} has been filtered)</center>
+			{% endif %}
 			<div class="panel" id="user">
-				<img id="user_icon" src="{{ user.icon }}">
+				<img loading="lazy" id="user_icon" src="{{ user.icon }}" alt="User icon">
 				<p id="user_title">{{ user.title }}</p>
 				<p id="user_name">u/{{ user.name }}</p>
 				<div id="user_description">{{ user.description }}</div>
@@ -75,6 +90,31 @@
 					<div>{{ user.karma }}</div>
 					<div>{{ user.created }}</div>
 				</div>
+				<div id="user_actions">
+				{% let name = ["u_", user.name.as_str()].join("") %}
+				<div id="user_subscription">
+					{% if prefs.subscriptions.contains(name) %}
+						<form action="/r/{{ name }}/unsubscribe?redirect={{ redirect_url }}" method="POST">
+							<button class="unsubscribe">Unfollow</button>
+						</form>
+					{% else %}
+						<form action="/r/{{ name }}/subscribe?redirect={{ redirect_url }}" method="POST">
+							<button class="subscribe">Follow</button>
+						</form>
+					{% endif %}
+					</div>
+					<div id="user_filter">
+						{% if prefs.filters.contains(name) %}
+							<form action="/r/{{ name }}/unfilter?redirect={{ redirect_url }}" method="POST">
+								<button class="unfilter">Unfilter</button>
+							</form>
+						{% else %}
+							<form action="/r/{{ name }}/filter?redirect={{ redirect_url }}" method="POST">
+								<button class="filter">Filter</button>
+							</form>
+						{% endif %}
+					</div>
+				</div>
 			</div>
 		</aside>
 	</main>

templates/utils.html

@@ -1,6 +1,6 @@
 {% macro options(current, values, default) -%}
 	{% for value in values %}
-		<option value="{{ value }}" {% if current == value || (current == "" && value == default) %}selected{% endif %}>
+		<option value="{{ value }}" {% if current == value.to_string() || (current == "" && value.to_string() == default.to_string()) %}selected{% endif %}>
 			{{ format!("{}{}", value.get(0..1).unwrap_or_default().to_uppercase(), value.get(1..).unwrap_or_default()) }}
 		</option>
 	{% endfor %}
@@ -8,18 +8,18 @@
 
 {% macro sort(root, methods, selected) -%}
 	{% for method in methods %}
-		<a {% if method == selected %}class="selected"{% endif %} href="{{ root }}/{{ method }}">
+		<a {% if method.to_string() == selected.to_string() %}class="selected"{% endif %} href="{{ root }}/{{ method }}">
 			{{ format!("{}{}", method.get(0..1).unwrap_or_default().to_uppercase(), method.get(1..).unwrap_or_default()) }}
 		</a>
 	{% endfor %}
 {%- endmacro %}
 
 {% macro search(root, search) -%}
-<form action="{% if root != "/r/" && !root.is_empty() %}{{ root }}{% endif %}/search/" id="searchbox">
+<form action="{% if root != "/r/" && !root.is_empty() %}{{ root }}{% endif %}/search" id="searchbox">
 	<input id="search" type="text" name="q" placeholder="Search" title="Search libreddit" value="{{ search }}">
 	{% if root != "/r/" && !root.is_empty() %}
 	<div id="inside">
-		<input type="checkbox" name="restrict_sr" id="restrict_sr">
+		<input type="checkbox" name="restrict_sr" id="restrict_sr" checked>
 		<label for="restrict_sr" class="search_label" title="Restrict search to this subreddit">in {{ root }}</label>
 	</div>
 	{% endif %}
@@ -34,7 +34,7 @@
 {%- endmacro %}
 
 {% macro render_flair(flair_parts) -%}
-	{% for flair_part in flair_parts %}{% if flair_part.flair_part_type == "emoji" %}<span class="emoji" style="background-image:url('{{ flair_part.value }}');"></span>{% else if flair_part.flair_part_type == "text" && !flair_part.value.is_empty() %}<span>{{ flair_part.value }}</span>{% endif %}{% endfor %}
+	{% for flair_part in flair_parts.clone() %}{% if flair_part.flair_part_type == "emoji" %}<span class="emoji" style="background-image:url('{{ flair_part.value }}');"></span>{% else if flair_part.flair_part_type == "text" && !flair_part.value.is_empty() %}<span>{{ flair_part.value }}</span>{% endif %}{% endfor %}
 {%- endmacro %}
 
 {% macro sub_list(current) -%}
@@ -55,42 +55,70 @@
 {% endif %}
 {%- endmacro %}
 
+{% macro render_hls_notification(redirect_url) -%}
+{% if post.post_type == "video" && !post.media.alt_url.is_empty() && prefs.hide_hls_notification != "on" %}
+<div class="post_notification"><p><a href="/settings/update/?use_hls=on&redirect={{ redirect_url }}">Enable HLS</a> to view with audio, or <a href="/settings/update/?hide_hls_notification=on&redirect={{ redirect_url }}">disable this notification</a></p></div>
+{% endif %}
+{%- endmacro %}
+
 {% macro post_in_list(post) -%}
-<div class="post {% if post.flags.stickied %}stickied{% endif %}">	
+<div class="post {% if post.flags.stickied %}stickied{% endif %}" id="{{ post.id }}">
 	<p class="post_header">
-		<a class="post_subreddit" href="/r/{{ post.community }}">r/{{ post.community }}</a>
+		{% let community -%}
+		{% if post.community.starts_with("u_") -%}
+			{% let community = format!("u/{}", &post.community[2..]) -%}
+		{% else -%}
+			{% let community = format!("r/{}", post.community) -%}
+		{% endif -%}
+		<a class="post_subreddit" href="/{{ community }}">{{ community }}</a>
 		<span class="dot">&bull;</span>
-		<a class="post_author" href="/u/{{ post.author.name }}">u/{{ post.author.name }}</a>
+		<a class="post_author {{ post.author.distinguished }}" href="/u/{{ post.author.name }}">u/{{ post.author.name }}</a>
 		<span class="dot">&bull;</span>
 		<span class="created" title="{{ post.created }}">{{ post.rel_time }}</span>
+		{% if !post.awards.is_empty() %}
+			{% for award in post.awards.clone() %}
+			<span class="award" title="{{ award.name }}">
+				<img alt="{{ award.name }}" src="{{ award.icon_url }}" width="16" height="16"/>
+			</span>
+			{% endfor %}
+		{% endif %}
 	</p>
 	<p class="post_title">
 		{% if post.flair.flair_parts.len() > 0 %}
-			<a href="/r/{{ post.community }}/search/?q=flair_name%3A%22{{ post.flair.text }}%22&restrict_sr=on"
+			<a href="/r/{{ post.community }}/search?q=flair_name%3A%22{{ post.flair.text }}%22&restrict_sr=on"
 				class="post_flair"
-				style="color:{{ post.flair.foreground_color }}; background:{{ post.flair.background_color }};">{% call render_flair(post.flair.flair_parts) %}</a>
+				style="color:{{ post.flair.foreground_color }}; background:{{ post.flair.background_color }};"
+				dir="ltr">{% call render_flair(post.flair.flair_parts) %}</a>
 		{% endif %}
 		<a href="{{ post.permalink }}">{{ post.title }}</a>{% if post.flags.nsfw %} <small class="nsfw">NSFW</small>{% endif %}
 	</p>
 	<!-- POST MEDIA/THUMBNAIL -->
 	{% if (prefs.layout.is_empty() || prefs.layout == "card") && post.post_type == "image" %}
-	<a href="{{ post.media.url }}" class="post_media_image {% if post.media.height /  post.media.width < 2 %}short{% endif %}" >
+	<a href="{{ post.media.url }}" class="post_media_image {% if post.media.height / post.media.width < 2 %}short{% endif %}" >
 		<svg
 			width="{{ post.media.width }}px" 
 			height="{{ post.media.height }}px" 
 			xmlns="http://www.w3.org/2000/svg">
 				<image width="100%" height="100%" href="{{ post.media.url }}"/>
 				<desc>
-					<img alt="Post image" src="{{ post.media.url }}"/>
+					<img loading="lazy" alt="Post image" src="{{ post.media.url }}"/>
 				</desc>
 		</svg>
 	</a>
 	{% else if (prefs.layout.is_empty() || prefs.layout == "card") && post.post_type == "gif" %}
-	<video class="post_media_video short" src="{{ post.media.url }}" width="{{ post.media.width }}px" height="{{ post.media.height }}px" controls loop autoplay><a href={{ post.media.url }}>Video</a></video>
+	<video class="post_media_video short" src="{{ post.media.url }}" width="{{ post.media.width }}" height="{{ post.media.height }}" poster="{{ post.media.poster }}" preload="none" controls loop {% if prefs.autoplay_videos == "on" %}autoplay{% endif %}><a href={{ post.media.url }}>Video</a></video>
 	{% else if (prefs.layout.is_empty() || prefs.layout == "card") && post.post_type == "video" %}
-	<video class="post_media_video short" src="{{ post.media.url }}" width="{{ post.media.width }}px" height="{{ post.media.height }}px" poster="{{ post.media.poster }}" preload="none" controls autoplay><a href={{ post.media.url }}>Video</a></video>
+	{% if prefs.use_hls == "on" && !post.media.alt_url.is_empty() %}
+	<video class="post_media_video short {% if prefs.autoplay_videos == "on" %}hls_autoplay{% endif %}" width="{{ post.media.width }}" height="{{ post.media.height }}" poster="{{ post.media.poster }}" controls preload="none">
+		<source src="{{ post.media.alt_url }}" type="application/vnd.apple.mpegurl" />
+		<source src="{{ post.media.url }}" type="video/mp4" />
+	</video>
+	{% else %}
+	<video class="post_media_video short" src="{{ post.media.url }}" width="{{ post.media.width }}" height="{{ post.media.height }}" poster="{{ post.media.poster }}" preload="none" controls {% if prefs.autoplay_videos == "on" %}autoplay{% endif %}><a href={{ post.media.url }}>Video</a></video>
+	{% call render_hls_notification(format!("{}%23{}", &self.url[1..].replace("&", "%26").replace("+", "%2B"), post.id)) %}
+	{% endif %}
 	{% else if post.post_type != "self" %}
-	<a class="post_thumbnail {% if post.thumbnail.url.is_empty() %}no_thumbnail{% endif %}" href="{% if post.post_type == "link" %}{{ post.media.url }}{% else %}{{ post.permalink }}{% endif %}">
+	<a class="post_thumbnail {% if post.thumbnail.url.is_empty() %}no_thumbnail{% endif %}" href="{% if post.post_type == "link" %}{{ post.media.url }}{% else %}{{ post.permalink }}{% endif %}" rel="nofollow">
 		{% if post.thumbnail.url.is_empty() %}
 		<svg viewBox="0 0 100 106" width="140" height="53" xmlns="http://www.w3.org/2000/svg">
 			<title>Thumbnail</title>
@@ -98,9 +126,9 @@
 		</svg>
 		{% else %}
 		<svg width="{{ post.thumbnail.width }}px" height="{{ post.thumbnail.height }}px" xmlns="http://www.w3.org/2000/svg">
-			<image  width="100%" height="100%" href="{{ post.thumbnail.url }}"/>
+			<image width="100%" height="100%" href="{{ post.thumbnail.url }}"/>
 			<desc>
-				<img alt="Thumbnail" src="{{ post.thumbnail.url }}"/>
+				<img loading="lazy" alt="Thumbnail" src="{{ post.thumbnail.url }}"/>
 			</desc>
 		</svg>
 		{% endif %}
@@ -108,9 +136,12 @@
 	</a>
 	{% endif %}
 
-	<div class="post_score">{{ post.score }}<span class="label"> Upvotes</span></div>
+	<div class="post_score" title="{{ post.score.1 }}">{{ post.score.0 }}<span class="label"> Upvotes</span></div>
+	<div class="post_body post_preview">
+		{{ post.body }}
+	</div>
 	<div class="post_footer">
-		<a href="{{ post.permalink }}" class="post_comments">{{ post.comments }} comments</a>
+		<a href="{{ post.permalink }}" class="post_comments" title="{{ post.comments.1 }} comments">{{ post.comments.0 }} comments</a>
 	</div>
 </div>
 {%- endmacro %}

templates/wall.html

@@ -0,0 +1,13 @@
+{% extends "base.html" %}
+{% block title %}{{ msg }}{% endblock %}
+{% block sortstyle %}{% endblock %}
+{% block content %}
+	<div id="wall">
+		<h1>{{ title }}</h1>
+		<br>
+		<p>{{ msg }}</p>
+		<form action="/r/{{ sub }}?redir={{ url }}" method="POST">
+			<input id="save" type="submit" value="Continue">
+		</form>
+	</div>
+{% endblock %}