Upgrade to version 0.23

* Use singular form of "comment" for posts with 1 comment

* Fix incorrect text on comment count tooltip

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

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+liberapay: spike
+custom: ['https://www.buymeacoffee.com/spikecodes']

.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: '🐛 Bug Report: '
 labels: bug
 assignees: ''
 
 ---
 
-**Describe the bug**
+## Describe the bug
-A clear and concise description of what the bug is.
+<!--
+  A clear and concise description of what the bug is.
+-->
 
-**To reproduce**
+## Steps to reproduce the bug
+
+<!--
 Steps to reproduce the behavior:
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
+-->
 
-**Expected behavior**
+## What's the expected behavior?
-A clear and concise description of what you expected to happen.
+<!-- 
+  A clear and concise description of what you expected to happen.
+-->
 
-**Additional context**
+## Additional context / screenshot
-Add any other context about the problem here.
+<!--
+  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: '✨ Feature parity: '
+labels: feature parity
+assignees: ''
+
+---
+
+## How does this feature work on Reddit?
+<!--
+  A clear and concise description of what the feature is.
+-->
+
+## Describe how this could be implemented 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 / screenshot
+<!--
+  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
+name: 💡 Feature request
-about: Suggest an idea for this project
+about: Suggest a feature for Libreddit that is not found in Reddit
-title: Feature Request | [title]
+title: '💡 Feature request: '
 labels: enhancement
 assignees: ''
 
 ---
 
-**Is your feature request related to a problem? Please describe.**
+## 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 [...]
+<!--
+  A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+-->
 
-**Describe the solution you'd like**
+## Describe the feature you would like to be implemented
-A clear and concise description of what you want to happen.
+<!--
+  A clear and concise description of what you want to happen.
+-->
 
-**Describe alternatives you've considered**
+## Describe alternatives you've considered
-A clear and concise description of any alternative solutions or features you've considered.
+<!--
+  A clear and concise description of any alternative solutions or features you've considered.
+-->
 
-**Additional context**
+## Additional context / screenshot
-Add any other context or screenshots about the feature request here.
+<!--
+  Add any other context or screenshots about the feature request here.
+-->

.github/workflows/docker-arm.yml

@@ -0,0 +1,38 @@
+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
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/docker-armv7.yml

@@ -0,0 +1,41 @@
+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
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/docker.yml

@@ -0,0 +1,38 @@
+name: Docker amd64 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
+          platforms: linux/amd64
+          push: true
+          tags: spikecodes/libreddit:latest
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/rust.yml

@@ -2,16 +2,17 @@ name: Rust
 
 on:
   push:
-    branches: [master]
+    paths-ignore:
-  pull_request:
+      - "**.md"
-    branches: [master]
+    branches:
+      - master
 
 env:
   CARGO_TERM_COLOR: always
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
       - uses: actions/checkout@v2
@@ -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"

Cargo.toml

@@ -3,18 +3,25 @@ name = "libreddit"
 description = " Alternative private front-end to Reddit"
 license = "AGPL-3.0"
 repository = "https://github.com/spikecodes/libreddit"
-version = "0.2.7"
+version = "0.23.0"
 authors = ["spikecodes <19519553+spikecodes@users.noreply.github.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
-base64 = "0.13.0"
+askama = { version = "0.11.1", default-features = false }
-actix-web = { version = "3.3.2", features = ["rustls"] }
+async-recursion = "1.0.0"
-askama = "0.10.5"
+cached = "0.40.0"
-ureq = "2.0.1"
+clap = { version = "4.0.18", default-features = false, features = ["std"] }
-serde = { version = "1.0.118", default_features = false, features = ["derive"] }
+regex = "1.6.0"
-serde_json = "1.0"
+serde = { version = "1.0.147", features = ["derive"] }
-async-recursion = "0.3.1"
+cookie = "0.16.1"
-url = "2.2.0"
+futures-lite = "1.12.0"
-regex = "1.4.2"
+hyper = { version = "0.14.22", features = ["full"] }
-time = "0.2.23"
+hyper-rustls = "0.23.0"
+percent-encoding = "2.2.0"
+route-recognizer = "0.3.1"
+serde_json = "1.0.87"
+tokio = { version = "1.21.2", features = ["full"] }
+time = "0.3.16"
+url = "2.3.1"
+rust-embed = { version = "6.4.2", features = ["include-exclude"] }

Dockerfile

@@ -1,9 +1,36 @@
-FROM rust:alpine as builder
+####################################################################################################
-WORKDIR /usr/src/libreddit
+## Builder
-COPY . .
+####################################################################################################
-RUN apk add --no-cache g++ openssl-dev
+FROM rust:alpine AS builder
-RUN cargo install --path .
 
+RUN apk add --no-cache musl-dev
+
+WORKDIR /libreddit
+
+COPY . .
+
+RUN cargo build --target x86_64-unknown-linux-musl --release
+
+####################################################################################################
+## Final image
+####################################################################################################
 FROM alpine:latest
-COPY --from=builder /usr/local/cargo/bin/libreddit /usr/local/bin/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
+
+# 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"]

README.md

@@ -1,96 +1,158 @@
 # Libreddit
 
-> An alternative private front-end to Reddit 
+> An alternative private front-end to Reddit
 
-Libre + Reddit = [Libreddit](https://libredd.it)
+![screenshot](https://i.ibb.co/QYbqTQt/libreddit-rust.png)
 
-- 🚀 Fast: written in Rust for blazing fast speeds and safety
+---
-- ☁️ Light: no JavaScript, no ads, no tracking
+
+**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
 - 🕵 Private: all requests are proxied through the server, including media
 - 🔒 Secure: strong [Content Security Policy](https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP) prevents browser requests to Reddit
 
-Like [Invidious](https://github.com/iv-org/invidious) but for Reddit. Browse the coldest takes of [r/unpopularopinion](https://libredd.it/r/unpopularopinion) without being [tracked](#reddit).
+---
 
-## Contents
+I appreciate any donations! Your support allows me to continue developing Libreddit.
-- [Screenshot](#screenshot)
-- [Instances](#instances)
-- [About](#about)
-  - [Elsewhere](#elsewhere)
-  - [Info](#info)
-  - [Teddit Comparison](#how-does-it-compare-to-teddit)
-- [Comparison](#comparison)
-  - [Speed](#speed)
-  - [Privacy](#privacy)
-- [Installation](#installation)
-  - [Cargo](#a-cargo)
-  - [Docker](#b-docker)
-  - [AUR](#c-aur)
-  - [GitHub Releases](#d-github-releases)
-  - [Repl.it](#e-replit)
-- Developing
-  - [Deployment](#deployment)
-  - [Building](#building)
 
-## Screenshot
+<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>
 
-![](https://i.ibb.co/6mXqb4G/libreddit-rust.png)
 
-## Instances
+**Bitcoin:** `bc1qwyxjnafpu3gypcpgs025cw9wa7ryudtecmwa6y`
+
+**Monero:** `45FJrEuFPtG2o7QZz2Nps77TbHD4sPqxViwbdyV9A6ktfHiWs47UngG5zXPcLoDXAc8taeuBgeNjfeprwgeXYXhN3C9tVSR`
+
+---
+
+# Instances
 
 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  |  |
+| [libredd.it](https://libredd.it) (official) | 🇺🇸 US |  |
-| [libreddit.spike.codes](https://libreddit.spike.codes) (official) | 🇺🇸 US  |  |
+| [libreddit.spike.codes](https://libreddit.spike.codes) (official) | 🇺🇸 US |  |
-| [libreddit.dothq.co](https://libreddit.dothq.co) | 🇺🇸 US  | ✅ |
+| [libreddit.dothq.co](https://libreddit.dothq.co) | 🇩🇪 DE | ✅ |
-| [libreddit.insanity.wtf](https://libreddit.insanity.wtf) | 🇺🇸 US  | ✅ |
+| [libreddit.kavin.rocks](https://libreddit.kavin.rocks) | 🇮🇳 IN |  |
-| [libreddit.kavin.rocks](https://libreddit.kavin.rocks) | 🇮🇳 IN  | ✅ |
+| [reddit.invak.id](https://reddit.invak.id) | 🇧🇬 BG |  |
-| [spjmllawtheisznfs7uryhxumin26ssv2draj7oope3ok3wuhy43eoyd.onion](http://spjmllawtheisznfs7uryhxumin26ssv2draj7oope3ok3wuhy43eoyd.onion) | 🇮🇳 IN  |  |
+| [lr.riverside.rocks](https://lr.riverside.rocks) | 🇺🇸 US |  |
+| [libreddit.strongthany.cc](https://libreddit.strongthany.cc) | 🇺🇸 US |  |
+| [libreddit.privacy.com.de](https://libreddit.privacy.com.de) | 🇩🇪 DE |  |
+| [libreddit.domain.glass](https://libreddit.domain.glass) | 🇺🇸 US | ✅ |
+| [r.nf](https://r.nf) | 🇩🇪 DE | ✅ |
+| [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.intent.cool](https://libreddit.intent.cool) | 🇺🇸 US |  |
+| [libreddit.drivet.xyz](https://libreddit.drivet.xyz) | 🇵🇱 PL |  |
+| [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 |  |
+| [lr.vern.cc](https://lr.vern.cc) | 🇨🇦 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 |  |
+| [r.walkx.org](https://r.walkx.org) | 🇳🇱 NL | ✅ |
+| [libreddit.kylrth.com](https://libreddit.kylrth.com) | 🇨🇦 CA |  |
+| [libreddit.yonalee.eu](https://libreddit.yonalee.eu) | 🇱🇺 LU | ✅ |
+| [libreddit.winscloud.net](https://libreddit.winscloud.net) | 🇹🇭 TH | ✅ |
+| [libreddit.tiekoetter.com](https://libreddit.tiekoetter.com) | 🇩🇪 DE |  |
+| [reddit.rtrace.io](https://reddit.rtrace.io) | 🇩🇪 DE |  |
+| [libreddit.lunar.icu](https://libreddit.lunar.icu) | 🇩🇪 DE | ✅ |
+| [libreddit.privacydev.net](https://libreddit.privacydev.net) | 🇺🇸 US |  |
+| [libreddit.notyourcomputer.net](https://libreddit.notyourcomputer.net) | 🇺🇸 US |  |
+| [r.ahwx.org](https://r.ahwx.org) | 🇳🇱 NL | ✅ |
+| [bob.fr.to](https://bob.fr.to) | 🇺🇸 US |  |
+| [reddit.beparanoid.de](https://reddit.beparanoid.de) | 🇨🇭 CH |  |
+| [libreddit.dcs0.hu](https://libreddit.dcs0.hu) | 🇭🇺 HU |  |
+| [reddit.dr460nf1r3.org](https://reddit.dr460nf1r3.org) | 🇩🇪 DE | ✅ |
+| [rd.jae.su](https://rd.jae.su) | 🇫🇮 FI |  |
+| [libreddit.mha.fi](https://libreddit.mha.fi) | 🇫🇮 FI |  |
+| [libreddit.foss.wtf](https://libreddit.foss.wtf) | 🇩🇪 DE |  |
+| [libreddit.encrypted-data.xyz](https://libreddit.encrypted-data.xyz)| 🇫🇷 FR | ✅ |
+| [libreddit.eu.org](https://libreddit.eu.org)| 🇮🇪 IE | ✅ |
+| [l.opnxng.com](https://l.opnxng.com)| 🇸🇬 SG |  |
+| [libreddit.cachyos.org](https://libreddit.cachyos.org) | 🇩🇪 DE | ✅ |
+| [libreddit.oxymagnesium.com](https://libreddit.oxymagnesium.com) | 🇺🇸 US |  |
+| [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.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion](http://libreddit.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion) | 🇨🇦 CA |  |
+| [reddit.prnoid54e44a4bduq5due64jkk7wcnkxcp5kv3juncm7veptjcqudgyd.onion](http://reddit.prnoid54e44a4bduq5due64jkk7wcnkxcp5kv3juncm7veptjcqudgyd.onion) | 🇨🇭 CH |  |
+| [inz6tbezfwzexva6dize4cqraj2tjdhygxabmcgysccesvw2pybzhbyd.onion](http://inz6tbezfwzexva6dize4cqraj2tjdhygxabmcgysccesvw2pybzhbyd.onion) | 🇫🇮 FI |  |
+| [libreddit.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion](http://libreddit.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion/)| 🇫🇮 FI |  |
+| [lr.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion](http://lr.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion/) | 🇨🇦 CA |  |
+A checkmark in the "Cloudflare" category here refers to the use of the reverse proxy, [Cloudflare](https://cloudflare.com). The checkmark will not be listed for a site that uses Cloudflare DNS but rather the proxying service which grants Cloudflare the ability to monitor traffic to the website.
 
-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.
+---
 
-## About
+# About
 
-### Elsewhere
+Find Libreddit on 💬 [Matrix](https://matrix.to/#/#libreddit:kde.org), 🐋 [Docker](https://hub.docker.com/r/spikecodes/libreddit), :octocat: [GitHub](https://github.com/spikecodes/libreddit), and 🦊 [GitLab](https://gitlab.com/spikecodes/libreddit).
-Find Libreddit on...
-- 💬 Matrix: [#libreddit:kde.org](https://matrix.to/#/#libreddit:matrix.org)
-- 🐋 Docker: [spikecodes/libreddit](https://hub.docker.com/r/spikecodes/libreddit)
-- :octocat: GitHub: [spikecodes/libreddit](https://github.com/spikecodes/libreddit)
-- 🦊 GitLab: [spikecodes/libreddit](https://gitlab.com/spikecodes/libreddit)
 
-### Info
+## Built with
+
+- [Rust](https://www.rust-lang.org/) - Programming language
+- [Hyper](https://github.com/hyperium/hyper) - HTTP server and client
+- [Askama](https://github.com/djc/askama) - Templating engine
+- [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.
 
 Libreddit currently implements most of Reddit's (signed-out) functionalities but still lacks [a few features](https://github.com/spikecodes/libreddit/issues).
 
-### How does it compare to Teddit?
+## How does it compare to Teddit?
 
 Teddit is another awesome open source project designed to provide an alternative frontend to Reddit. There is no connection between the two and you're welcome to use whichever one you favor. Competition fosters innovation and Teddit's release has motivated me to build Libreddit into an even more polished product.
 
 If you are looking to compare, the biggest differences I have noticed are:
 - Libreddit is themed around Reddit's redesign whereas Teddit appears to stick much closer to Reddit's old design. This may suit some users better as design is always subjective.
-- Libreddit is written in [Rust](https://www.rust-lang.org) for speed and memory safety. It uses [Actix Web](https://actix.rs), which was [benchmarked as the fastest web server for single queries](https://www.techempower.com/benchmarks/#hw=ph&test=db).
+- 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.
 
-## Comparison
+---
+
+# Comparison
 
 This section outlines how Libreddit compares to Reddit.
 
-### Speed
+## Speed
 
-Lasted tested December 21, 2020.
+Lasted tested Jan 17, 2021.
 
 Results from Google Lighthouse ([Libreddit Report](https://lighthouse-dot-webdotdevsite.appspot.com/lh/html?url=https%3A%2F%2Flibredd.it), [Reddit Report](https://lighthouse-dot-webdotdevsite.appspot.com/lh/html?url=https%3A%2F%2Fwww.reddit.com%2F)).
 
-|                     | Libreddit     | Reddit    |
+|                        | Libreddit     | Reddit     |
-|---------------------|---------------|-----------|
+|------------------------|---------------|------------|
-| Requests            | 22            | 70        |
+| Requests               | 20            | 70         |
-| Resource Size       | 135 KiB       | 2,222 KiB |
+| Resource Size (card ui)| 1,224 KiB     | 1,690 KiB  |
-| Time to Interactive | **1.7 s**     | **11.5 s**|
+| Time to Interactive    | **1.5 s**     | **11.2 s** |
 
-### Privacy
+## Privacy
 
-#### Reddit
+### Reddit
 
 **Logging:** According to Reddit's [privacy policy](https://www.redditinc.com/policies/privacy-policy), they "may [automatically] log information" including:
 - IP address
@@ -105,7 +167,7 @@ Results from Google Lighthouse ([Libreddit Report](https://lighthouse-dot-webdot
 - The requested URL
 - Search terms
 
-**Location:** The same privacy policy goes on to describe location data may be collected through the use of:
+**Location:** The same privacy policy goes on to describe that location data may be collected through the use of:
 - GPS (consensual)
 - Bluetooth (consensual)
 - Content associated with a location (consensual)
@@ -119,21 +181,23 @@ Results from Google Lighthouse ([Libreddit Report](https://lighthouse-dot-webdot
 - Third-Party Cookies
 - Third-Party Site
 
-#### Libreddit
+### Libreddit
 
 For transparency, I hope to describe all the ways Libreddit handles user privacy.
 
-**Logging:** In production (when running the binary, hosting with docker, or using the official instances), Libreddit logs nothing. When debugging (running from source without `--release`), Libreddit logs post IDs 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 (`libredd.it` and `libreddit.spike.codes`) are hosted on [Repl.it](https://repl.it/) which monitors usage to prevent abuse. I can understand if this invalidates certain users' threat models and therefore, selfhosting and browsing through Tor are welcomed.
+**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, self-hosting, using unofficial instances, and browsing through Tor are welcomed.
 
-## Installation
+---
 
-### A) Cargo
+# Installation
+
+## 1) Cargo
 
 Make sure Rust stable is installed along with `cargo`, Rust's package manager.
 
@@ -141,53 +205,106 @@ Make sure Rust stable is installed along with `cargo`, Rust's package manager.
 cargo install libreddit
 ```
 
-### B) Docker
+## 2) Docker
 
-Deploy the Docker image of 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
 ```
 
-### C) AUR
+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).
 
-Install:
 ```
 yay -S libreddit-git
 ```
 
-### D) GitHub Releases
+## 4) GitHub Releases
 
 If you're on Linux and none of these methods work for you, you can grab a Linux binary from [the newest release](https://github.com/spikecodes/libreddit/releases/latest).
-Currently, Libreddit does not have Windows or macOS binaries but those will be available soon.
 
-### E) Repl.it
+## 5) Replit/Heroku/Glitch
 
-**Note:** Repl.it is a free option but they are *not* private and are monitor server usage to prevent abuse. If you really need a free and easy setup, this method may work best for you.
+**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)
+<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>
-2. Visit [the official Repl](https://repl.it/@spikethecoder/libreddit) and fork it
+[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/spikecodes/libreddit)
-3. Hit the run button to download the latest Libreddit version and start it
+[![Remix on Glitch](https://cdn.glitch.com/2703baf2-b643-4da7-ab91-7ee2a2d00b5b%2Fremix-button-v2.svg)](https://glitch.com/edit/#!/remix/libreddit)
 
-In the web preview (defaults to top right), you should see your instance hosted where you can assign a [custom domain](https://docs.repl.it/repls/web-hosting#custom-domains).
+---
 
-## Deployment
+# Deployment
 
-Once installed, deploy Libreddit (unless you're using Docker) by running:
+Once installed, deploy Libreddit to `0.0.0.0:8080` by running:
 
 ```
 libreddit
 ```
 
-Specify a custom address for the server by passing the `-a` or `--address` argument:
+## 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`         |
+| `POST_SORT`             | `["hot", "new", "top", "rising", "controversial"]`                                                  | `hot`         |
+| `COMMENT_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
 ```
-libreddit --address=0.0.0.0:8111
+
+```bash
+LIBREDDIT_DEFAULT_WIDE=on LIBREDDIT_DEFAULT_THEME=dark libreddit -r
+```
+
+## Proxying using NGINX
+
+**NOTE** If you're [proxying Libreddit through an 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=0.0.0.0
+PORT=12345

contrib/libreddit.service

@@ -0,0 +1,37 @@
+[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}
+
+# Hardening
+DeviceAllow=
+LockPersonality=yes
+MemoryDenyWriteExecute=yes
+PrivateDevices=yes
+ProcSubset=pid
+ProtectClock=yes
+ProtectControlGroups=yes
+ProtectHome=yes
+ProtectHostname=yes
+ProtectKernelLogs=yes
+ProtectKernelModules=yes
+ProtectKernelTunables=yes
+ProtectProc=invisible
+RestrictAddressFamilies=AF_INET AF_INET6
+RestrictNamespaces=yes
+RestrictRealtime=yes
+RestrictSUIDSGID=yes
+SystemCallArchitectures=native
+SystemCallFilter=@system-service ~@privileged ~@resources
+UMask=0077
+
+[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,169 @@
+use cached::proc_macro::cached;
+use futures_lite::{future::Boxed, FutureExt};
+use hyper::{body::Buf, client, Body, Request, Response, Uri};
+use percent_encoding::{percent_encode, CONTROLS};
+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 = percent_encode(val.as_bytes(), CONTROLS).to_string();
+									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,115 +1,297 @@
-// Import Crates
+// Global specifiers
-use actix_web::{middleware, web, App, HttpResponse, HttpServer}; // dev::Service
+#![forbid(unsafe_code)]
+#![allow(clippy::cmp_owned)]
 
 // Reference local files
 mod post;
-mod proxy;
 mod search;
 mod settings;
 mod subreddit;
 mod user;
 mod utils;
 
+// Import Crates
+use clap::{Arg, Command};
+
+use futures_lite::FutureExt;
+use hyper::{header::HeaderValue, Body, Request, Response};
+
+mod client;
+use client::proxy;
+use server::RequestExt;
+use utils::{error, redirect, ThemeAssets};
+
+mod server;
+
 // Create Services
-async fn style() -> HttpResponse {
+
-	HttpResponse::Ok().content_type("text/css").body(include_str!("../static/style.css"))
+// Required for the manifest to be valid
+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(),
+	)
 }
 
-async fn robots() -> HttpResponse {
+// Required for iOS App Icons
-	HttpResponse::Ok()
+async fn iphone_logo() -> Result<Response<Body>, String> {
-		.header("Cache-Control", "public, max-age=1209600, s-maxage=86400")
+	Ok(
-		.body("User-agent: *\nAllow: /")
+		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() -> HttpResponse {
+async fn favicon() -> Result<Response<Body>, String> {
-	HttpResponse::Ok()
+	Ok(
-		.header("Cache-Control", "public, max-age=1209600, s-maxage=86400")
+		Response::builder()
-		.body(include_bytes!("../static/favicon.ico").as_ref())
+			.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().into())
+			.unwrap_or_default(),
+	)
 }
 
-#[actix_web::main]
+async fn font() -> Result<Response<Body>, String> {
-async fn main() -> std::io::Result<()> {
+	Ok(
-	let mut address = "0.0.0.0:8080".to_string();
+		Response::builder()
-	// let mut https = false;
+			.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(),
+	)
+}
 
-	for arg in std::env::args().collect::<Vec<String>>() {
+async fn resource(body: &str, content_type: &str, cache: bool) -> Result<Response<Body>, String> {
-		match arg.split('=').collect::<Vec<&str>>()[0] {
+	let mut res = Response::builder()
-			"--address" | "-a" => address = arg.split('=').collect::<Vec<&str>>()[1].to_string(),
+		.status(200)
-			// "--redirect-https" | "-r" => https = true,
+		.header("content-type", content_type)
-			_ => (),
+		.body(body.to_string().into())
+		.unwrap_or_default();
+
+	if cache {
+		if let Ok(val) = HeaderValue::from_str("public, max-age=1209600, s-maxage=86400") {
+			res.headers_mut().insert("Cache-Control", val);
 		}
 	}
 
-	// start http server
+	Ok(res)
-	println!("Running Libreddit v{} on {}!", env!("CARGO_PKG_VERSION"), &address);
+}
-
+
-	HttpServer::new(|| {
+async fn style() -> Result<Response<Body>, String> {
-		App::new()
+	let mut res = include_str!("../static/style.css").to_string();
-			// Redirect to HTTPS
+	for file in ThemeAssets::iter() {
-			// .wrap_fn(|req, srv| { let fut = srv.call(req); async { let mut res = fut.await?; if https {}	Ok(res) } })
+		res.push('\n');
-			// Append trailing slash and remove double slashes
+		let theme = ThemeAssets::get(file.as_ref()).unwrap();
-			.wrap(middleware::NormalizePath::default())
+		res.push_str(std::str::from_utf8(theme.data.as_ref()).unwrap());
-			// Default service in case no routes match
+	}
-			.default_service(web::get().to(|| utils::error("Nothing here".to_string())))
+	Ok(
-			// Read static files
+		Response::builder()
-			.route("/style.css/", web::get().to(style))
+			.status(200)
-			.route("/favicon.ico/", web::get().to(favicon))
+			.header("content-type", "text/css")
-			.route("/robots.txt/", web::get().to(robots))
+			.header("Cache-Control", "public, max-age=1209600, s-maxage=86400")
-			// Proxy media through Libreddit
+			.body(res.to_string().into())
-			.route("/proxy/{url:.*}/", web::get().to(proxy::handler))
+			.unwrap_or_default(),
-			// Browse user profile
+	)
-			.service(
+}
-				web::scope("/{scope:user|u}").service(
+
-					web::scope("/{username}").route("/", web::get().to(user::profile)).service(
+#[tokio::main]
-						web::scope("/comments/{id}/{title}")
+async fn main() {
-							.route("/", web::get().to(post::item))
+	let matches = Command::new("Libreddit")
-							.route("/{comment_id}/", web::get().to(post::item)),
+		.version(env!("CARGO_PKG_VERSION"))
-					),
+		.about("Private front-end for Reddit written in Rust ")
-				),
+		.arg(
-			)
+			Arg::new("redirect-https")
-			// Configure settings
+				.short('r')
-			.service(web::resource("/settings/").route(web::get().to(settings::get)).route(web::post().to(settings::set)))
+				.long("redirect-https")
-			// Subreddit services
+				.help("Redirect all HTTP requests to HTTPS (no longer functional)")
-			.service(
+				.num_args(0),
-				web::scope("/r/{sub}")
+		)
-					// See posts and info about subreddit
+		.arg(
-					.route("/", web::get().to(subreddit::page))
+			Arg::new("address")
-					.route("/{sort:hot|new|top|rising|controversial}/", web::get().to(subreddit::page))
+				.short('a')
-					// View post on subreddit
+				.long("address")
-					.service(
+				.value_name("ADDRESS")
-						web::scope("/comments/{id}/{title}")
+				.help("Sets address to listen on")
-							.route("/", web::get().to(post::item))
+				.default_value("0.0.0.0")
-							.route("/{comment_id}/", web::get().to(post::item)),
+				.num_args(1),
-					)
+		)
-					// Search inside subreddit
+		.arg(
-					.route("/search/", web::get().to(search::find))
+			Arg::new("port")
-					// View wiki of subreddit
+				.short('p')
-					.service(
+				.long("port")
-						web::scope("/wiki")
+				.value_name("PORT")
-							.route("/", web::get().to(subreddit::wiki))
+				.help("Port to listen on")
-							.route("/{page}/", web::get().to(subreddit::wiki)),
+				.default_value("8080")
-					),
+				.num_args(1),
-			)
+		)
-			// Universal services
+		.arg(
-			.service(
+			Arg::new("hsts")
-				web::scope("")
+				.short('H')
-					// Front page
+				.long("hsts")
-					.route("/", web::get().to(subreddit::page))
+				.value_name("EXPIRE_TIME")
-					.route("/{sort:best|hot|new|top|rising|controversial}/", web::get().to(subreddit::page))
+				.help("HSTS header to tell browsers that this site should only be accessed over HTTPS")
-					// View Reddit wiki
+				.default_value("604800")
-					.service(
+				.num_args(1),
-						web::scope("/wiki")
+		)
-							.route("/", web::get().to(subreddit::wiki))
+		.get_matches();
-							.route("/{page}/", web::get().to(subreddit::wiki)),
+
-					)
+	let address = matches.get_one("address").map(|m: &String| m.as_str()).unwrap_or("0.0.0.0");
-					// Search all of Reddit
+	let port = std::env::var("PORT").unwrap_or_else(|_| matches.get_one("port").map(|m: &String| m.as_str()).unwrap_or("8080").to_string());
-					.route("/search/", web::get().to(search::find))
+	let hsts = matches.get_one("hsts").map(|m: &String| m.as_str());
-					// Short link for post
+
-					.route("/{id:.{5,6}}/", web::get().to(post::item)),
+	let listener = [address, ":", &port].concat();
-			)
+
-	})
+	println!("Starting Libreddit...");
-	.bind(&address)
+
-	.unwrap_or_else(|e| panic!("Cannot bind to the address {}: {}", address, e))
+	// Begin constructing a server
-	.run()
+	let mut app = server::Server::new();
-	.await
+
+	// 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:;"
+	};
+
+	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(|_| style().boxed());
+	app
+		.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("/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(|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/[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(|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(|r| subreddit::community(r).boxed())
+		.post(|r| subreddit::add_quarantine_exception(r).boxed());
+
+	app
+		.at("/r/u_:name")
+		.get(|r| async move { Ok(redirect(format!("/user/{}", r.param("name").unwrap_or_default()))) }.boxed());
+
+	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/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/search").get(|r| search::find(r).boxed());
+
+	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(|r| subreddit::community(r).boxed());
+
+	// View Reddit 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(|r| search::find(r).boxed());
+
+	// Handle about pages
+	app.at("/about").get(|req| error(req, "About pages aren't added yet".to_string()).boxed());
+
+	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()).boxed());
+
+	println!("Running Libreddit v{} on {}!", env!("CARGO_PKG_VERSION"), listener);
+
+	let server = app.listen(listener);
+
+	// Run this server for... forever!
+	if let Err(e) = server.await {
+		eprintln!("Server error: {}", e);
+	}
 }

src/post.rs

@@ -1,62 +1,82 @@
 // CRATES
-use crate::utils::*;
+use crate::client::json;
-use actix_web::{HttpRequest, HttpResponse};
+use crate::server::RequestExt;
-
+use crate::subreddit::{can_access_quarantine, quarantine};
-use async_recursion::async_recursion;
+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)]
-#[template(path = "post.html", escape = "none")]
+#[template(path = "post.html")]
 struct PostTemplate {
 	comments: Vec<Comment>,
 	post: Post,
 	sort: String,
 	prefs: Preferences,
+	single_thread: bool,
+	url: String,
 }
 
-pub async fn item(req: HttpRequest) -> HttpResponse {
+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.path(), req.query_string());
+	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
+		// If there's no sort query but there's a default sort, set sort to default_sort
-	let default_sort = cookie(&req, "comment_sort");
+		if default_sort.is_empty() {
-
+			String::new()
-	// If there's no sort query but there's a default sort, set sort to default_sort
+		} else {
-	if sort.is_empty() && !default_sort.is_empty() {
+			path = format!("{}.json?{}&sort={}&raw_json=1", req.uri().path(), req.uri().query().unwrap_or_default(), default_sort);
-		sort = default_sort;
+			default_sort
-		path = format!("{}.json?{}&sort={}&raw_json=1", req.path(), req.query_string(), sort);
+		}
-	}
+	});
 
 	// Log the post ID being fetched in debug mode
 	#[cfg(debug_assertions)]
-	dbg!(req.match_info().get("id").unwrap_or(""));
+	dbg!(req.param("id").unwrap_or_default());
+
+	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 post = parse_post(&response[0]).await;
-			let comments = parse_comments(&res[1]).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
-			let s = PostTemplate {
+			template(PostTemplate {
 				comments,
 				post,
 				sort,
-				prefs: prefs(req),
+				prefs: Preferences::new(req),
-			}
+				single_thread,
-			.render()
+				url,
-			.unwrap();
+			})
-			HttpResponse::Ok().content_type("text/html").body(s)
 		}
 		// If the Reddit API returns an error, exit and send error page to user
-		Err(msg) => error(msg).await,
+		Err(msg) => {
+			if msg == "quarantined" {
+				let sub = req.param("sub").unwrap_or_default();
+				quarantine(req, sub)
+			} else {
+				error(req, msg).await
+			}
+		}
 	}
 }
 
@@ -72,38 +92,60 @@ async fn parse_post(json: &serde_json::Value) -> Post {
 	let ratio: f64 = post["data"]["upvote_ratio"].as_f64().unwrap_or(1.0) * 100.0;
 
 	// Determine the type of media along with the media URL
-	let (post_type, media) = media(&post["data"]).await;
+	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"))
+	};
 
 	// Build a post using data parsed from Reddit post API
 	Post {
 		id: val(post, "id"),
 		title: val(post, "title"),
 		community: val(post, "subreddit"),
-		body: rewrite_url(&val(post, "selftext_html")),
+		body,
 		author: Author {
 			name: val(post, "author"),
 			flair: Flair {
-				flair_parts: parse_rich_flair(
+				flair_parts: FlairPart::parse(
-					val(post, "author_flair_type"),
+					post["data"]["author_flair_type"].as_str().unwrap_or_default(),
 					post["data"]["author_flair_richtext"].as_array(),
 					post["data"]["author_flair_text"].as_str(),
 				),
+				text: val(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,
-		thumbnail: format_url(val(post, "thumbnail").as_str()),
+		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(),
+		},
 		flair: Flair {
-			flair_parts: parse_rich_flair(
+			flair_parts: FlairPart::parse(
-				val(post, "link_flair_type"),
+				post["data"]["link_flair_type"].as_str().unwrap_or_default(),
 				post["data"]["link_flair_richtext"].as_array(),
 				post["data"]["link_flair_text"].as_str(),
 			),
+			text: val(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()
@@ -115,63 +157,105 @@ async fn parse_post(json: &serde_json::Value) -> Post {
 			nsfw: post["data"]["over_18"].as_bool().unwrap_or(false),
 			stickied: post["data"]["stickied"].as_bool().unwrap_or(false),
 		},
-		media,
 		domain: val(post, "domain"),
 		rel_time,
 		created,
+		comments: format_num(post["data"]["num_comments"].as_i64().unwrap_or_default()),
+		gallery,
+		awards,
 	}
 }
 
 // COMMENTS
-#[async_recursion]
+fn parse_comments(json: &serde_json::Value, post_link: &str, post_author: &str, highlighted_comment: &str, filters: &HashSet<String>) -> Vec<Comment> {
-async fn parse_comments(json: &serde_json::Value) -> Vec<Comment> {
+	// Parse the comment JSON into a Vector of Comments
-	// Separate the comment JSON into a Vector of comments
+	let comments = json["data"]["children"].as_array().map_or(Vec::new(), std::borrow::ToOwned::to_owned);
-	let comment_data = match json["data"]["children"].as_array() {
-		Some(f) => f.to_owned(),
-		None => Vec::new(),
-	};
-
-	let mut comments: Vec<Comment> = Vec::new();
 
 	// For each comment, retrieve the values to build a Comment object
-	for comment in comment_data {
+	comments
-		let unix_time = comment["data"]["created_utc"].as_f64().unwrap_or_default();
+		.into_iter()
-		if unix_time == 0.0 {
+		.map(|comment| {
-			continue;
+			let kind = comment["kind"].as_str().unwrap_or_default().to_string();
-		}
+			let data = &comment["data"];
-		let (rel_time, created) = time(unix_time);
 
-		let score = comment["data"]["score"].as_i64().unwrap_or(0);
+			let unix_time = data["created_utc"].as_f64().unwrap_or_default();
-		let body = rewrite_url(&val(&comment, "body_html"));
+			let (rel_time, created) = time(unix_time);
 
-		let replies: Vec<Comment> = if comment["data"]["replies"].is_object() {
+			let edited = data["edited"].as_f64().map_or((String::new(), String::new()), time);
-			parse_comments(&comment["data"]["replies"]).await
-		} else {
-			Vec::new()
-		};
 
-		comments.push(Comment {
+			let score = data["score"].as_i64().unwrap_or(0);
-			id: val(&comment, "id"),
+
-			body,
+			// If this comment contains replies, handle those too
-			author: Author {
+			let replies: Vec<Comment> = if data["replies"].is_object() {
+				parse_comments(&data["replies"], post_link, post_author, highlighted_comment, filters)
+			} else {
+				Vec::new()
+			};
+
+			let awards: Awards = Awards::parse(&data["all_awardings"]);
+
+			let parent_kind_and_id = val(&comment, "parent_id");
+			let parent_info = parent_kind_and_id.split('_').collect::<Vec<&str>>();
+
+			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"))
+			};
+
+			let author = Author {
 				name: val(&comment, "author"),
 				flair: Flair {
-					flair_parts: parse_rich_flair(
+					flair_parts: FlairPart::parse(
-						val(&comment, "author_flair_type"),
+						data["author_flair_type"].as_str().unwrap_or_default(),
-						comment["data"]["author_flair_richtext"].as_array(),
+						data["author_flair_richtext"].as_array(),
-						comment["data"]["author_flair_text"].as_str(),
+						data["author_flair_text"].as_str(),
 					),
+					text: val(&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: format_num(score),
+			let is_filtered = filters.contains(&["u_", author.name.as_str()].concat());
-			rel_time,
-			created,
-			replies,
-		});
-	}
 
-	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,49 +0,0 @@
-use actix_web::{client::Client, error, web, Error, HttpResponse, Result};
-use url::Url;
-
-use base64::decode;
-
-pub async fn handler(web::Path(b64): web::Path<String>) -> Result<HttpResponse> {
-	let domains = vec![
-		// THUMBNAILS
-		"a.thumbs.redditmedia.com",
-		"b.thumbs.redditmedia.com",
-		// EMOJI
-		"emoji.redditmedia.com",
-		// ICONS
-		"styles.redditmedia.com",
-		"www.redditstatic.com",
-		// PREVIEWS
-		"preview.redd.it",
-		"external-preview.redd.it",
-		// MEDIA
-		"i.redd.it",
-		"v.redd.it",
-	];
-
-	match decode(b64) {
-		Ok(bytes) => {
-			let media = String::from_utf8(bytes).unwrap_or_default();
-
-			match Url::parse(media.as_str()) {
-				Ok(url) => {
-					let domain = url.domain().unwrap_or_default();
-
-					if domains.contains(&domain) {
-						Client::default().get(media.replace("&amp;", "&")).send().await.map_err(Error::from).map(|res| {
-							HttpResponse::build(res.status())
-								.header("Cache-Control", "public, max-age=1209600, s-maxage=86400")
-								.header("Content-Length", res.headers().get("Content-Length").unwrap().to_owned())
-								.header("Content-Type", res.headers().get("Content-Type").unwrap().to_owned())
-								.streaming(res)
-						})
-					} else {
-						Err(error::ErrorForbidden("Resource must be from Reddit"))
-					}
-				}
-				_ => Err(error::ErrorBadRequest("Can't parse base64 into URL")),
-			}
-		}
-		_ => Err(error::ErrorBadRequest("Can't decode base64")),
-	}
-}

src/search.rs

@@ -1,7 +1,12 @@
 // CRATES
-use crate::utils::{error, fetch_posts, param, prefs, request, 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 actix_web::{HttpRequest, HttpResponse};
+use crate::{
+	client::json,
+	subreddit::{can_access_quarantine, quarantine},
+	RequestExt,
+};
 use askama::Template;
+use hyper::{Body, Request, Response};
 
 // STRUCTS
 struct SearchParams {
@@ -11,88 +16,149 @@ 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)]
-#[template(path = "search.html", escape = "none")]
+#[template(path = "search.html")]
 struct SearchTemplate {
 	posts: Vec<Post>,
 	subreddits: Vec<Subreddit>,
 	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: HttpRequest) -> HttpResponse {
+pub async fn find(req: Request<Body>) -> Result<Response<Body>, String> {
-	let path = format!("{}.json?{}", req.path(), req.query_string());
+	let nsfw_results = if setting(&req, "show_nsfw") == "on" { "&include_over_18=on" } else { "" };
-	let sub = req.match_info().get("sub").unwrap_or("").to_string();
+	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() {
+	if query.is_empty() {
-		"relevance".to_string()
+		return Ok(redirect("/".to_string()));
-	} else {
+	}
-		param(&path, "sort")
-	};
 
-	let subreddits = if param(&path, "restrict_sr").is_empty() {
+	if query.starts_with("r/") {
-		search_subreddits(param(&path, "q")).await
+		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 fetch_posts(&path, String::new()).await {
+	let url = String::from(req.uri().path_and_query().map_or("", |val| val.as_str()));
-		Ok((posts, after)) => HttpResponse::Ok().content_type("text/html").body(
+
-			SearchTemplate {
+	// If all requested subs are filtered, we don't need to fetch posts.
-				posts,
+	if sub.split('+').all(|s| filters.contains(s)) {
-				subreddits,
+		template(SearchTemplate {
-				sub,
+			posts: Vec::new(),
-				params: SearchParams {
+			subreddits,
-					q: param(&path, "q"),
+			sub,
-					sort,
+			params: SearchParams {
-					t: param(&path, "t"),
+				q: query.replace('"', "&quot;"),
-					before: param(&path, "after"),
+				sort,
-					after,
+				t: param(&path, "t").unwrap_or_default(),
-					restrict_sr: param(&path, "restrict_sr"),
+				before: param(&path, "after").unwrap_or_default(),
-				},
+				after: "".to_string(),
-				prefs: prefs(req),
+				restrict_sr: param(&path, "restrict_sr").unwrap_or_default(),
+				typed,
+			},
+			prefs: Preferences::new(req),
+			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(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,
+				})
 			}
-			.render()
+			Err(msg) => {
-			.unwrap(),
+				if msg == "quarantined" {
-		),
+					let sub = req.param("sub").unwrap_or_default();
-		Err(msg) => error(msg).await,
+					quarantine(req, sub)
-	}
+				} else {
-}
+					error(req, msg).await
-
+				}
-async fn search_subreddits(q: String) -> 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(),
 			}
 		}
-		// 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 and decode encoded slashes
+					let mut path = req.uri().path().replace("//", "/").replace("%2F","/");
+
+					// 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::utils::{prefs, Preferences};
+use crate::server::ResponseExt;
-use actix_web::{cookie::Cookie, web::Form, HttpMessage, HttpRequest, HttpResponse};
+use crate::utils::{redirect, template, Preferences};
 use askama::Template;
+use cookie::Cookie;
+use futures_lite::StreamExt;
+use hyper::{Body, Request, Response};
 use time::{Duration, OffsetDateTime};
 
 // STRUCTS
@@ -9,51 +14,126 @@ use time::{Duration, OffsetDateTime};
 #[template(path = "settings.html")]
 struct SettingsTemplate {
 	prefs: Preferences,
+	url: String,
 }
 
-#[derive(serde::Deserialize)]
+// CONSTANTS
-pub struct SettingsForm {
+
-	theme: Option<String>,
+const PREFS: [&str; 10] = [
-	front_page: Option<String>,
+	"theme",
-	layout: Option<String>,
+	"front_page",
-	wide: Option<String>,
+	"layout",
-	comment_sort: Option<String>,
+	"wide",
-	hide_nsfw: Option<String>,
+	"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: HttpRequest) -> HttpResponse {
+pub async fn get(req: Request<Body>) -> Result<Response<Body>, String> {
-	let s = SettingsTemplate { prefs: prefs(req) }.render().unwrap();
+	let url = req.uri().to_string();
-	HttpResponse::Ok().content_type("text/html").body(s)
+	template(SettingsTemplate {
+		prefs: Preferences::new(req),
+		url,
+	})
 }
 
 // Set cookies using response "Set-Cookie" header
-pub async fn set(req: HttpRequest, form: Form<SettingsForm>) -> HttpResponse {
+pub async fn set(req: Request<Body>) -> Result<Response<Body>, String> {
-	let mut res = HttpResponse::Found();
+	// Split the body into parts
+	let (parts, mut body) = req.into_parts();
 
-	let names = vec!["theme", "front_page", "layout", "wide", "comment_sort", "hide_nsfw"];
+	// Grab existing cookies
-	let values = vec![&form.theme, &form.front_page, &form.layout, &form.wide, &form.comment_sort, &form.hide_nsfw];
+	let _cookies: Vec<Cookie> = parts
+		.headers
+		.get_all("Cookie")
+		.iter()
+		.filter_map(|header| Cookie::parse(header.to_str().unwrap_or_default()).ok())
+		.collect();
 
-	for (i, name) in names.iter().enumerate() {
+	// Aggregate the body...
-		match values[i] {
+	// let whole_body = hyper::body::aggregate(req).await.map_err(|e| e.to_string())?;
-			Some(value) => res.cookie(
+	let body_bytes = body
-				Cookie::build(name.to_owned(), value)
+		.try_fold(Vec::new(), |mut data, chunk| {
+			data.extend_from_slice(&chunk);
+			Ok(data)
+		})
+		.await
+		.map_err(|e| e.to_string())?;
+
+	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 => match HttpMessage::cookie(&req, name.to_owned()) {
+			None => response.remove_cookie(name.to_string()),
-				Some(cookie) => res.del_cookie(&cookie),
-				None => &mut res,
-			},
 		};
 	}
 
-	res
+	Ok(response)
-		.content_type("text/html")
+}
-		.set_header("Location", "/settings")
+
-		.body(r#"Redirecting to <a href="/settings">settings</a>..."#)
+fn set_cookies_method(req: Request<Body>, remove_cookies: bool) -> Response<Body> {
+	// Split the body into parts
+	let (parts, _) = req.into_parts();
+
+	// 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 response = redirect(path);
+
+	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 => {
+				if remove_cookies {
+					response.remove_cookie(name.to_string());
+				}
+			}
+		};
+	}
+
+	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,120 +1,420 @@
 // CRATES
-use crate::utils::*;
+use crate::utils::{
-use actix_web::{HttpRequest, HttpResponse, Result};
+	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 cookie::Cookie;
+use hyper::{Body, Request, Response};
+use time::{Duration, OffsetDateTime};
 
 // STRUCTS
 #[derive(Template)]
-#[template(path = "subreddit.html", escape = "none")]
+#[template(path = "subreddit.html")]
 struct SubredditTemplate {
 	sub: Subreddit,
 	posts: Vec<Post>,
 	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)]
-#[template(path = "wiki.html", escape = "none")]
+#[template(path = "wiki.html")]
 struct WikiTemplate {
 	sub: String,
 	wiki: String,
 	page: String,
 	prefs: Preferences,
+	url: String,
+}
+
+#[derive(Template)]
+#[template(path = "wall.html")]
+struct WallTemplate {
+	title: String,
+	sub: String,
+	msg: String,
+	prefs: Preferences,
+	url: String,
 }
 
 // SERVICES
-pub async fn page(req: HttpRequest) -> HttpResponse {
+pub async fn community(req: Request<Body>) -> Result<Response<Body>, String> {
-	let path = format!("{}.json?{}", req.path(), req.query_string());
+	// Build Reddit API path
-	let default = cookie(&req, "front_page");
+	let root = req.uri().path() == "/";
-	let sub_name = req
+	let subscribed = setting(&req, "subscriptions");
-		.match_info()
+	let front_page = setting(&req, "front_page");
-		.get("sub")
+	let post_sort = req.cookie("post_sort").map_or_else(|| "hot".to_string(), |c| c.value().to_string());
-		.unwrap_or(if default.is_empty() { "popular" } else { default.as_str() })
+	let sort = req.param("sort").unwrap_or_else(|| req.param("id").unwrap_or(post_sort));
-		.to_string();
-	let sort = req.match_info().get("sort").unwrap_or("hot").to_string();
 
-	match fetch_posts(&path, String::new()).await {
+	let sub_name = req.param("sub").unwrap_or(if front_page == "default" || front_page.is_empty() {
-		Ok((posts, after)) => {
+		if subscribed.is_empty() {
-			// If you can get subreddit posts, also request subreddit metadata
+			"popular".to_string()
-			let sub = if !sub_name.contains('+') && sub_name != "popular" && sub_name != "all" {
+		} else {
-				subreddit(&sub_name).await.unwrap_or_default()
+			subscribed.clone()
-			} else if sub_name.contains('+') {
+		}
-				Subreddit {
+	} else {
-					name: sub_name,
+		front_page.clone()
-					..Subreddit::default()
+	});
-				}
+	let quarantined = can_access_quarantine(&req, &sub_name) || root;
-			} else {
+
-				Subreddit::default()
+	// Handle random subreddits
-			};
+	if let Ok(random) = catch_random(&sub_name, "").await {
-
+		return Ok(random);
-			let s = SubredditTemplate {
+	}
-				sub,
+
-				posts,
+	if req.param("sub").is_some() && sub_name.starts_with("u_") {
-				sort: (sort, param(&path, "t")),
+		return Ok(redirect(["/user/", &sub_name[2..]].concat()));
-				ends: (param(&path, "after"), after),
+	}
-				prefs: prefs(req),
+
-			}
+	// Request subreddit metadata
-			.render()
+	let sub = if !sub_name.contains('+') && sub_name != subscribed && sub_name != "popular" && sub_name != "all" {
-			.unwrap();
+		// Regular subreddit
-			HttpResponse::Ok().content_type("text/html").body(s)
+		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 {
+		// Multireddit, all, popular
+		Subreddit {
+			name: sub_name.clone(),
+			..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").replace('+', "%2B");
+	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) => error(msg).await,
 	}
 }
 
-pub async fn wiki(req: HttpRequest) -> HttpResponse {
+pub fn quarantine(req: Request<Body>, sub: String) -> Result<Response<Body>, String> {
-	let sub = req.match_info().get("sub").unwrap_or("reddit.com").to_string();
+	let wall = WallTemplate {
-	let page = req.match_info().get("page").unwrap_or("index").to_string();
+		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),
+	};
+
+	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('+').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());
+			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.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/unfiltering from outside sidebar
+	let path = if let Some(redirect_path) = param(&format!("?{}", query), "redirect") {
+		format!("/{}", redirect_path)
+	} else {
+		format!("/r/{}", sub)
+	};
+
+	let mut response = redirect(path);
+
+	// Delete cookie if empty, else set
+	if sub_list.is_empty() {
+		response.remove_cookie("subscriptions".to_string());
+	} else {
+		response.insert_cookie(
+			Cookie::build("subscriptions", sub_list.join("+"))
+				.path("/")
+				.http_only(true)
+				.expires(OffsetDateTime::now_utc() + Duration::weeks(52))
+				.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(response)
+}
+
+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);
+	}
+
+	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 request(&path).await {
+	match json(path, quarantined).await {
-		Ok(res) => {
+		Ok(response) => template(WikiTemplate {
-			let s = WikiTemplate {
+			sub,
-				sub,
+			wiki: rewrite_urls(response["data"]["content_html"].as_str().unwrap_or("<h3>Wiki not found</h3>")),
-				wiki: rewrite_url(res["data"]["content_html"].as_str().unwrap_or_default()),
+			page,
-				page,
+			prefs: Preferences::new(req),
-				prefs: prefs(req),
+			url,
+		}),
+		Err(msg) => {
+			if msg == "quarantined" {
+				quarantine(req, sub)
+			} else {
+				error(req, msg).await
 			}
-			.render()
-			.unwrap();
-			HttpResponse::Ok().content_type("text/html").body(s)
 		}
-		Err(msg) => error(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")),
+			// wiki: format!(
+			// 	"{}<hr><h1>Moderators</h1><br><ul>{}</ul>",
+			// 	rewrite_urls(&val(&response, "description_html"),
+			// 	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 {
+	let res = json(path, quarantined).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;
 
-			// Fetch subreddit icon either from the community_icon or icon_img value
+	// Metadata regarding the subreddit
-			let community_icon: &str = res["data"]["community_icon"].as_str().unwrap_or("").split('?').collect::<Vec<&str>>()[0];
+	let members: i64 = res["data"]["subscribers"].as_u64().unwrap_or_default() as i64;
-			let icon = if community_icon.is_empty() { val(&res, "icon_img") } else { community_icon.to_string() };
+	let active: i64 = res["data"]["accounts_active"].as_u64().unwrap_or_default() as i64;
 
-			let sub = Subreddit {
+	// Fetch subreddit icon either from the community_icon or icon_img value
-				name: val(&res, "display_name"),
+	let community_icon: &str = res["data"]["community_icon"].as_str().unwrap_or_default();
-				title: val(&res, "title"),
+	let icon = if community_icon.is_empty() { val(&res, "icon_img") } else { community_icon.to_string() };
-				description: val(&res, "public_description"),
-				info: rewrite_url(&val(&res, "description_html").replace("\\", "")),
-				icon: format_url(icon.as_str()),
-				members: format_num(members),
-				active: format_num(active),
-				wiki: res["data"]["wiki_enabled"].as_bool().unwrap_or_default(),
-			};
 
-			Ok(sub)
+	Ok(Subreddit {
-		}
+		name: val(&res, "display_name"),
-		// If the Reddit API returns an error, exit this function
+		title: val(&res, "title"),
-		Err(msg) => return Err(msg),
+		description: val(&res, "public_description"),
-	}
+		info: rewrite_urls(&val(&res, "description_html")),
+		// 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,80 +1,112 @@
 // CRATES
-use crate::utils::{error, fetch_posts, format_url, param, prefs, request, Post, Preferences, User};
+use crate::client::json;
-use actix_web::{HttpRequest, HttpResponse, Result};
+use crate::server::RequestExt;
+use crate::utils::{error, filter_posts, format_url, get_filters, param, template, Post, Preferences, User};
 use askama::Template;
-use time::OffsetDateTime;
+use hyper::{Body, Request, Response};
+use time::{macros::format_description, OffsetDateTime};
 
 // STRUCTS
 #[derive(Template)]
-#[template(path = "user.html", escape = "none")]
+#[template(path = "user.html")]
 struct UserTemplate {
 	user: User,
 	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: HttpRequest) -> HttpResponse {
+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.path(), req.query_string());
+	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 sort = param(&path, "sort").unwrap_or_default();
-	let username = req.match_info().get("username").unwrap_or("").to_string();
+	let username = req.param("name").unwrap_or_default();
+	let user = user(&username).await.unwrap_or_default();
 
-	// Request user posts/comments from Reddit
+	let filters = get_filters(&req);
-	let posts = fetch_posts(&path, "Comment".to_string()).await;
+	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 {
+				template(UserTemplate {
-		Ok((posts, after)) => {
+					user,
-			// If you can get user posts, also request user data
+					posts,
-			let user = user(&username).await.unwrap_or_default();
+					sort: (sort, param(&path, "t").unwrap_or_default()),
-
+					ends: (param(&path, "after").unwrap_or_default(), after),
-			let s = UserTemplate {
+					listing,
-				user,
+					prefs: Preferences::new(req),
-				posts,
+					url,
-				sort: (sort, param(&path, "t")),
+					redirect_url,
-				ends: (param(&path, "after"), after),
+					is_filtered: false,
-				prefs: prefs(req),
+					all_posts_filtered,
+				})
 			}
-			.render()
+			// If there is an error show error page
-			.unwrap();
+			Err(msg) => error(req, msg).await,
-			HttpResponse::Ok().content_type("text/html").body(s)
 		}
-		// If there is an error show error page
-		Err(msg) => error(msg).await,
 	}
 }
 
 // USER
 async fn user(name: &str) -> Result<User, String> {
 	// Build the Reddit JSON API path
-	let path: String = format!("/user/{}/about.json", name);
+	let path: String = format!("/user/{}/about.json?raw_json=1", name);
 
 	// Send a request to the url
-	match request(&path).await {
+	json(path, false).await.map(|res| {
-		// If success, receive JSON in response
+		// Grab creation date as unix timestamp
-		Ok(res) => {
+		let created_unix = res["data"]["created"].as_f64().unwrap_or(0.0).round() as i64;
-			// Grab creation date as unix timestamp
+		let created = OffsetDateTime::from_unix_timestamp(created_unix).unwrap_or(OffsetDateTime::UNIX_EPOCH);
-			let created: i64 = res["data"]["created"].as_f64().unwrap_or(0.0).round() as i64;
 
-			// nested_val function used to parse JSON from Reddit APIs
+		// Closure used to parse JSON from Reddit APIs
-			let about = |item| res["data"]["subreddit"][item].as_str().unwrap_or_default().to_string();
+		let about = |item| res["data"]["subreddit"][item].as_str().unwrap_or_default().to_string();
 
-			// Parse the JSON output into a User struct
+		// Parse the JSON output into a User struct
-			Ok(User {
+		User {
-				name: name.to_string(),
+			name: res["data"]["name"].as_str().unwrap_or(name).to_owned(),
-				title: about("title"),
+			title: about("title"),
-				icon: format_url(about("icon_img").as_str()),
+			icon: format_url(&about("icon_img")),
-				karma: res["data"]["total_karma"].as_i64().unwrap_or(0),
+			karma: res["data"]["total_karma"].as_i64().unwrap_or(0),
-				created: OffsetDateTime::from_unix_timestamp(created).format("%b %d '%y"),
+			created: created.format(format_description!("[month repr:short] [day] '[year repr:last_two]")).unwrap_or_default(),
-				banner: about("banner_img"),
+			banner: about("banner_img"),
-				description: about("public_description"),
+			description: about("public_description"),
-			})
 		}
-		// If the Reddit API returns an error, exit this function
+	})
-		Err(msg) => return Err(msg),
-	}
 }

static/manifest.json

@@ -0,0 +1,23 @@
+{
+	"name": "Libreddit",
+	"short_name": "Libreddit",
+	"display": "standalone",
+	"background_color": "#1f1f1f",
+	"description": "An alternative private front-end to Reddit",
+	"theme_color": "#1f1f1f",
+	"icons": [
+		{
+			"src": "logo.png",
+			"sizes": "512x512",
+			"type": "image/png"
+		},
+		{
+			"src": "apple-touch-icon.png",
+			"sizes": "180x180"
+		},
+		{
+			"src": "favicon.ico",
+			"sizes": "32x32"
+		}
+	]
+}

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/robots.txt

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

static/themes/black.css

@@ -0,0 +1,14 @@
+/* Black theme setting */
+.black {
+	--accent: #009a9a;
+	--green: #00a229;
+	--text: white;
+	--foreground: #0f0f0f;
+	--background: black;
+	--outside: black;
+	--post: black;
+	--panel-border: 2px solid #0f0f0f;
+	--highlighted: #0f0f0f;
+	--visited: #aaa;
+	--shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+}

static/themes/dark.css

@@ -0,0 +1,14 @@
+/* Dark theme setting */
+.dark{
+	--accent: aqua;
+	--green: #5cff85;
+	--text: white;
+	--foreground: #222;
+	--background: #0f0f0f;
+	--outside: #1f1f1f;
+	--post: #161616;
+	--panel-border: 1px solid #333;
+	--highlighted: #333;
+	--visited: #aaa;
+	--shadow: 0 1px 3px rgba(0, 0, 0, 0.5);
+}

static/themes/dracula.css

@@ -0,0 +1,14 @@
+/* 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);
+}

static/themes/gold.css

@@ -0,0 +1,14 @@
+/* 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);
+}

static/themes/laserwave.css

@@ -0,0 +1,14 @@
+/* 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);
+}

static/themes/light.css

@@ -0,0 +1,14 @@
+/* Light theme setting */
+.light {
+	--accent: #009a9a;
+	--green: #00a229;
+	--text: black;
+	--foreground: #f5f5f5;
+	--background: #ddd;
+	--outside: #ececec;
+	--post: #eee;
+	--panel-border: 1px solid #ccc;
+	--highlighted: white;
+	--visited: #555;
+	--shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+}

static/themes/nord.css

@@ -0,0 +1,14 @@
+/* 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);
+}

static/themes/rosebox.css

@@ -0,0 +1,13 @@
+/* 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);
+}

static/themes/violet.css

@@ -0,0 +1,14 @@
+/* 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);
+}

templates/base.html

@@ -3,30 +3,59 @@
 	<head>
 		{% block head %}
 		<title>{% block title %}Libreddit{% endblock %}</title>
-		<meta http-equiv="Referrer-Policy" content="no-referrer">
-		<meta http-equiv="Content-Security-Policy" content="default-src 'self'; style-src 'self' 'unsafe-inline'; base-uri 'none'; form-action 'self';">
 		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 		<meta name="description" content="View on Libreddit, an alternative private front-end to Reddit.">
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
+		<!-- General PWA -->
+		<meta name="theme-color" content="#1F1F1F">
+		<!-- iOS Application -->
+		<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 -->
+		<meta name="mobile-web-app-capable" content="yes">
+		<!-- iOS Logo -->
+		<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" href="/style.css">
+		<link rel="stylesheet" type="text/css" href="/style.css">
 		{% endblock %}
 		</head>
 	<body class="
 		{% if prefs.layout != "" %}{{ prefs.layout }}{% endif %}
 		{% if prefs.wide == "on" %} wide{% endif %}
-		{% if prefs.theme == "light" %} light{% endif %}">
+		{% if prefs.theme != "system" %} {{ prefs.theme }}{% endif %}">
 		<!-- NAVIGATION BAR -->
 		<nav>
-			<p id="logo">
+			<div id="logo">
-				<a id="libreddit" href="/">
+				<a id="libreddit" href="/"><span id="lib">lib</span><span id="reddit">reddit.</span></a>
-					<span id="lib">lib</span><span id="reddit">reddit.</span>
-				</a>
 				<span id="version">v{{ env!("CARGO_PKG_VERSION") }}</span>
-				<a id="settings_link" href="/settings">settings</a>
+				{% block subscriptions %}{% endblock %}
-			</p>
+			</div>
 			{% block search %}{% endblock %}
-			<a id="github" href="https://github.com/spikecodes/libreddit">GITHUB</a>
+			<div id="links">
+				<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>
+						<circle cx="12" cy="12" r="3"/><path d="M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1 2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z"/>
+					</svg>
+				</a>
+				<a id="code" href="https://github.com/spikecodes/libreddit">
+					<span>code</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>code</title>
+						<polyline points="16 18 22 12 16 6"/><polyline points="8 6 2 12 8 18"/>
+					</svg>
+				</a>
+			</div>
 		</nav>
 		
 		<!-- MAIN CONTENT -->
@@ -37,4 +66,4 @@
 		</main>
 		{% endblock %}
 	</body>
-</html>
+</html>

templates/comment.html

@@ -0,0 +1,41 @@
+{% import "utils.html" as utils %}
+
+{% if kind == "more" && parent_kind == "t1" %}
+<a class="deeper_replies" href="{{ post_link }}{{ parent_id }}">&rarr; More replies</a>
+{% else if kind == "t1" %}
+<div id="{{ id }}" class="comment">
+	<div class="comment_left">
+		<p class="comment_score" title="{{ score.1 }}">{{ score.0 }}</p>
+		<div class="line"></div>
+	</div>
+	<details class="comment_right" {% if !collapsed || highlighted %}open{% endif %}>
+		<summary class="comment_data">
+			{% 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|safe }}</div>
+		{% endif %}
+		<blockquote class="replies">{% for c in replies -%}{{ c.render().unwrap()|safe }}{%- endfor %}
+		</blockquote>
+	</details>
+</div>
+{% endif %}

templates/error.html

@@ -2,5 +2,8 @@
 {% block title %}Error: {{ msg }}{% endblock %}
 {% block sortstyle %}{% endblock %}
 {% block content %}
-	<h1 style="text-align: center; font-size: 50px;">{{ msg }}</h1>
+	<div id="error">
+		<h1>{{ msg }}</h1>
+		<h3>Head back <a href="/">home</a>?</h3>
+	</div>
 {% endblock %}

templates/post.html

@@ -10,112 +10,141 @@
 {% block root %}/r/{{ post.community }}{% endblock %}{% block location %}r/{{ post.community }}{% endblock %}
 {% block head %}
 	{% call super() %}
+	<!-- Meta Tags -->
 	<meta name="author" content="u/{{ post.author.name }}">
+	<meta name="title" content="{{ post.title }} - r/{{ post.community }}">
+	<meta property="og:type" content="website">
+	<meta property="og:url" content="{{ post.permalink }}">
+	<meta property="og:title" content="{{ post.title }} - r/{{ post.community }}">
+	<meta property="og:description" content="View on Libreddit, an alternative private front-end to Reddit.">
+	<meta property="og:image" content="{{ post.thumbnail.url }}">
+	<meta property="twitter:card" content="summary_large_image">
+	<meta property="twitter:url" content="{{ post.permalink }}">
+	<meta property="twitter:title" content="{{ post.title }} - r/{{ post.community }}">
+	<meta property="twitter:description" content="View on Libreddit, an alternative private front-end to Reddit.">
+	<meta property="twitter:image" content="{{ post.thumbnail.url }}">
 {% endblock %}
 
-<!-- OPEN COMMENT MACRO -->
+{% block subscriptions %}
-{% macro comment(item) -%}
+	{% call utils::sub_list(post.community.as_str()) %}
-<div id="{{ item.id }}" class="comment">
+{% endblock %}
-	<div class="comment_left">
-		<p class="comment_score">{{ item.score }}</p>
-		<div class="line"></div>
-	</div>
-	<details class="comment_right" open>
-		<summary class="comment_data">
-			<a class="comment_author {{ item.author.distinguished }} {% if item.author.name == post.author.name %}op{% endif %}" href="/u/{{ item.author.name }}">u/{{ item.author.name }}</a>
-			{% if item.author.flair.flair_parts.len() > 0 %}
-				<small class="author_flair">{% call utils::render_flair(item.author.flair.flair_parts) %}</small>
-			{% endif %}
-			<span class="created" title="{{ post.created }}">{{ item.rel_time }}</span>
-		</summary>
-		<div class="comment_body">{{ item.body }}</div>
-{%- endmacro %}
-
-<!-- CLOSE COMMENT MACRO -->
-{% macro close() %}
-</details></div>
-{% endmacro %}
 
 {% block content %}
 	<div id="column_one">
 
 		<!-- POST CONTENT -->
 		<div class="post highlighted">
-			<div class="post_left">
+			<p class="post_header">
-				<p class="post_score">{{ post.score }}</p>
+				<a class="post_subreddit" href="/r/{{ post.community }}">r/{{ post.community }}</a>
-				{% if post.flags.nsfw %}<div class="nsfw">NSFW</div>{% endif %}
+				<span class="dot">&bull;</span>
-			</div>
+				<a class="post_author {{ post.author.distinguished }}" href="/user/{{ post.author.name }}">u/{{ post.author.name }}</a>
-			<div class="post_right">
+				{% if post.author.flair.flair_parts.len() > 0 %}
-				<div class="post_text">
+					<small class="author_flair">{% call utils::render_flair(post.author.flair.flair_parts) %}</small>
-					<p class="post_header">
+				{% endif %}
-						<a class="post_subreddit" href="/r/{{ post.community }}">r/{{ post.community }}</a>
+				<span class="dot">&bull;</span>
-						<span class="dot">&bull;</span>
+				<span class="created" title="{{ post.created }}">{{ post.rel_time }}</span>
-						<a class="post_author" href="/u/{{ post.author.name }}">u/{{ post.author.name }}</a>
+				{% if !post.awards.is_empty() %}
-						{% if post.author.flair.flair_parts.len() > 0 %}
+				<span class="dot">&bull;</span>
-							<small class="author_flair">{% call utils::render_flair(post.author.flair.flair_parts) %}</small>
+				<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>
+			<h1 class="post_title">
+				{{ 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"
+						class="post_flair"
+						style="color:{{ post.flair.foreground_color }}; background:{{ post.flair.background_color }};">{% call utils::render_flair(post.flair.flair_parts) %}</a>
+				{% endif %}
+				{% if post.flags.nsfw %} <small class="nsfw">NSFW</small>{% endif %}
+			</h1>
+
+			<!-- POST MEDIA -->
+			<!-- post_type: {{ post.post_type }} -->
+			{% if post.post_type == "image" %}
+			<a href="{{ post.media.url }}" class="post_media_image" >
+				<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 loading="lazy" alt="Post image" src="{{ post.media.url }}"/>
+						</desc>
+				</svg>
+			</a>
+			{% else if post.post_type == "video" || post.post_type == "gif" %}
+			{% 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 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 }}" rel="nofollow">{{ image.outbound_url }}</a>
 						{% endif %}
-						<span class="dot">&bull;</span>
+					</figcaption>
-						<span class="created" title="{{ post.created }}">{{ post.rel_time }}</span>
+				</figure>
-					</p>
+			{%- endfor %}
-					<a href="{{ post.permalink }}" class="post_title">
+			</div>			
-						{{ post.title }}
+			{% else if post.post_type == "link" %}
-						{% if post.flair.flair_parts.len() > 0 %}
+			<a id="post_url" href="{{ post.media.url }}" rel="nofollow">{{ post.media.url }}</a>
-							<small class="post_flair" style="color:{{ post.flair.foreground_color }}; background:{{ post.flair.background_color }}">{% call utils::render_flair(post.flair.flair_parts) %}</small>
+			{% endif %}
-						{% endif %}
-					</a>
 
-					<!-- POST MEDIA -->
+			<!-- POST BODY -->
-					{% if post.post_type == "image" %}
+			<div class="post_body">{{ post.body|safe }}</div>
-					<img class="post_media" src="{{ post.media }}"/>
+			<div class="post_score" title="{{ post.score.1 }}">{{ post.score.0 }}<span class="label"> Upvotes</span></div>
-					{% else if post.post_type == "video" || post.post_type == "gif" %}
+			<div class="post_footer">
-					<video class="post_media" src="{{ post.media }}" controls autoplay loop></video>
+				<ul id="post_links">
-					{% else if post.post_type == "link" %}
+					<li><a href="/{{ post.id }}">permalink</a></li>
-					<a id="post_url" href="{{ post.media }}">{{ post.media }}</a>
+					<li><a href="https://reddit.com/{{ post.id }}" rel="nofollow">reddit</a></li>
-					{% endif %}
+				</ul>
-
+				<p>{{ post.upvote_ratio }}% Upvoted</p>
-					<!-- POST BODY -->
-					<div class="post_body">{{ post.body }}</div>
-					<div id="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>
-						</ul>
-						<p>{{ post.upvote_ratio }}% Upvoted</p>
-					</div>
-
-				</div>
 			</div>
 		</div>
 
 		<!-- SORT FORM -->
 		<form id="sort">
-			<select name="sort"> 
+			<select name="sort" title="Sort comments by"> 
 				{% call utils::options(sort, ["confidence", "top", "new", "controversial", "old"], "confidence") %}
-			</select><input id="sort_submit" type="submit" value="&rarr;">
+			</select><button id="sort_submit" class="submit">
+				<svg width="15" viewBox="0 0 110 100" fill="none" stroke-width="10" stroke-linecap="round">
+					<path d="M20 50 H100" />
+					<path d="M75 15 L100 50 L75 85" />
+					&rarr;
+				</svg>
+			</button>
 		</form>
 
 		<!-- COMMENTS -->
 		{% for c in comments -%}
 		<div class="thread">
-			<!-- EACH COMMENT -->
+			{% if single_thread %}
-			{% call comment(c) %}
+			<p class="thread_nav"><a href="/{{ post.id }}">View all comments</a></p>
-			<blockquote class="replies">{% for reply1 in c.replies %}{% call comment(reply1) %}
+			{% if c.parent_kind == "t1" %}
-				<!-- FIRST-LEVEL REPLIES -->
+			<p class="thread_nav"><a href="?context=9999">Show parent comments</a></p>
-				<blockquote class="replies">{% for reply2 in reply1.replies %}{% call comment(reply2) %}
+			{% endif %}
-					<!-- SECOND-LEVEL REPLIES -->
+			{% endif %}
-					<blockquote class="replies">{% for reply3 in reply2.replies %}{% call comment(reply3) %}
+			
-						<!-- THIRD-LEVEL REPLIES -->
+			{{ c.render().unwrap()|safe }}
-						{% if reply3.replies.len() > 0 %}
-							<!-- LINK TO CONTINUE REPLIES -->
-							<a class="deeper_replies" href="{{ post.permalink }}{{ reply3.id }}">&rarr; More replies</a>
-						{% endif %}
-						{% call close() %}
-					{% endfor %}
-					</blockquote>{% call close() %}
-				{% endfor %}
-				</blockquote>{% call close() %}
-			{% endfor %}
-			</blockquote>{% call close() %}
 		</div>
 		{%- endfor %}
 

templates/search.html

@@ -3,112 +3,104 @@
 
 {% block title %}Libreddit: search results - {{ params.q }}{% endblock %}
 
+{% block subscriptions %}
+	{% call utils::sub_list("") %}
+{% endblock %}
+
 {% block content %}
 	<div id="column_one">
 		<form id="search_sort">
-			<input id="search" type="text" name="q" placeholder="Search" value="{{ params.q }}">
+			<input id="search" type="text" name="q" placeholder="Search" value="{{ params.q }}" title="Search libreddit">
 			{% if sub != "" %}
 			<div id="inside">
 				<input type="checkbox" name="restrict_sr" id="restrict_sr" {% if params.restrict_sr != "" %}checked{% endif %}>
 				<label for="restrict_sr" class="search_label">in r/{{ sub }}</label>
 			</div>
 			{% endif %}
-			<select id="sort_options" name="sort">
+			{% 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"> 
+			</select>{% if params.sort != "new" %}<select id="timeframe" name="t" title="Timeframe"> 
 				{% call utils::options(params.t, ["hour", "day", "week", "month", "year", "all"], "all") %}
-			</select>{% endif %}<input id="sort_submit" type="submit" value="&rarr;">
+			</select>{% endif %}<button id="sort_submit" class="submit">
+					<svg width="15" viewBox="0 0 110 100" fill="none" stroke-width="10" stroke-linecap="round">
+						<path d="M20 50 H100" />
+						<path d="M75 15 L100 50 L75 85" />
+						&rarr;
+					</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"> 
+				<div class="search_subreddit_left">{% if subreddit.icon != "" %}<img loading="lazy" src="{{ subreddit.icon|safe }}" alt="r/{{ subreddit.name }} icon">{% endif %}</div>
-					<span class="search_subreddit_name">{{ subreddit.name }}</span>
+				<div class="search_subreddit_right">
-					<span class="dot">&bull;</span>
+					<p class="search_subreddit_header"> 
-					<span class="search_subreddit_members">{{ subreddit.subscribers }} Members</span>
+						<span class="search_subreddit_name">r/{{ subreddit.name }}</span>
-				</p>
+						<span class="dot">&bull;</span>
-				<p class="search_subreddit_description">{{ subreddit.description }}</p>
+						<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.hide_nsfw == "on" %}
-		{% else if post.title != "Comment" %}
-		<div class="post {% if prefs.layout == "card" && post.post_type == "image" %}card_post{% endif %}">
-			<div class="post_left">
-				<p class="post_score">{{ post.score }}</p>
-				{% if post.flags.nsfw %}<div class="nsfw">NSFW</div>{% endif %}
-			</div>
-			<div class="post_right">
-				<div class="post_text">
-					<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>
-						{% 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>
-					</p>
-					<p class="post_title">
-						{% if post.flair.flair_parts.len() > 0 %}
-							<small class="post_flair" style="color:{{ post.flair.foreground_color }}; background:{{ post.flair.background_color }}">{% call utils::render_flair(post.flair.flair_parts) %}</small>
-						{% endif %}
-						<a href="{{ post.permalink }}">{{ post.title }}</a>
-					</p>
-				</div>
-				
-				<!-- POST MEDIA/THUMBNAIL -->
-				{% if prefs.layout == "card" && post.post_type == "image" %}
-					<img class="post_media" src="{{ post.media }}"/>
-				{% else if post.post_type != "self" %}
-					<a class="post_thumbnail {% if post.thumbnail == "" %}no_thumbnail{% endif %}" href="{% if post.post_type == "link" %}{{ post.media }}{% else %}{{ post.permalink }}{% endif %}">
-						{% if post.thumbnail == "" %}
-							<svg viewBox="0 0 100 106" width="50" height="53" xmlns="http://www.w3.org/2000/svg">
-								<path d="M35,15h-15a10,10 0,0,0 0,20h25a10,10 0,0,0 10,-10m-12.5,0a10, 10 0,0,1 10, -10h25a10,10 0,0,1 0,20h-15" fill="none" stroke-width="5" stroke-linecap="round"/>
-							</svg>
-						{% else %}
-							<img src="{{ post.thumbnail }}">
-						{% endif %}
-						<span>{% if post.post_type == "link" %}{{ post.domain }}{% else %}{{ post.post_type }}{% endif %}</span>
-					</a>
-				{% endif %}
-			</div>
-		</div>
-		{% 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 }}
 				&sort={{ params.sort }}&t={{ params.t }}
-				&before={{ params.before }}">PREV</a>
+				&before={{ params.before }}" accesskey="P">PREV</a>
 			{% endif %}
 
 			{% if params.after != "" %}
 			<a href="?q={{ params.q }}&restrict_sr={{ params.restrict_sr }}
 				&sort={{ params.sort }}&t={{ params.t }}
-				&after={{ params.after }}">NEXT</a>
+				&after={{ params.after }}" accesskey="N">NEXT</a>
 			{% endif %}
 		</footer>
+		{% endif %}
 	</div>
 {% endblock %}

templates/settings.html

@@ -8,45 +8,110 @@
 {% endblock %}
 
 {% block content %}
-<form id="settings" action="/settings" method="POST">
+	<div id="settings">
-	<div id="prefs">
+	<form action="/settings" method="POST">
-		<p>Appearance</p>
+		<div class="prefs">
-		<div id="theme">
+			<legend>Appearance</legend>
-			<label for="theme">Theme:</label>
+			<div id="theme">
-			<select name="theme"> 
+				<label for="theme">Theme:</label>
-				{% call utils::options(prefs.theme, ["dark", "light"], "dark") %}
+				<select name="theme"> 
-			</select>
+					{% call utils::options(prefs.theme, prefs.available_themes, "system") %}
+				</select>
+			</div>
+			<legend>Interface</legend>
+			<div id="front_page">
+				<label for="front_page">Front page:</label>
+				<select name="front_page"> 
+					{% call utils::options(prefs.front_page, ["default", "popular", "all"], "default") %}
+				</select>
+			</div>
+			<div id="layout">
+				<label for="layout">Layout:</label>
+				<select name="layout"> 
+					{% call utils::options(prefs.layout, ["card", "clean", "compact"], "card") %}
+				</select>
+			</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>
+			<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"> 
+					{% call utils::options(prefs.comment_sort, ["confidence", "top", "new", "controversial", "old"], "confidence") %}
+				</select>
+			</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>
-		<p>Interface</p>
+	</form>
-		<div id="front_page">
+	{% if prefs.subscriptions.len() > 0 %}
-			<label for="front_page">Front page:</label>
+		<div class="prefs" id="settings_subs">
-			<select name="front_page"> 
+			<legend>Subscribed Feeds</legend>
-				{% call utils::options(prefs.front_page, ["popular", "all"], "popular") %}
+			{% for sub in prefs.subscriptions %}
-			</select>
+			<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 }}/unsubscribe/?redirect=settings" method="POST">
+						<button class="unsubscribe">Unsubscribe</button>
+				</form>
+			</div>
+			{% endfor %}
 		</div>
-		<div id="layout">
+	{% endif %}
-			<label for="layout">Layout:</label>
+	{% if !prefs.filters.is_empty() %}
-			<select name="layout"> 
+		<div class="prefs" id="settings_filters">
-				{% call utils::options(prefs.layout, ["card", "clean", "compact"], "clean") %}
+			<legend>Filtered Feeds</legend>
-			</select>
+			{% for sub in prefs.filters %}
-		</div>
+			<div>
-		<div id="wide">
+				{% let feed -%}
-			<label for="wide">Wide UI:</label>
+				{% if sub.starts_with("u_") -%}{% let feed = format!("u/{}", &sub[2..]) -%}{% else -%}{% let feed = format!("r/{}", sub) -%}{% endif -%}
-			<input type="checkbox" name="wide" {% if prefs.wide == "on" %}checked{% endif %}>
+				<a href="/{{ feed }}">{{ feed }}</a>
-		</div>
+				<form action="/r/{{ sub }}/unfilter/?redirect=settings" method="POST">
-		<p>Content</p>
+					<button class="unfilter">Unfilter</button>
-		<div id="comment_sort">
+				</form>
-			<label for="comment_sort">Default comment sort:</label>
+			</div>
-			<select name="comment_sort"> 
+			{% endfor %}
-				{% call utils::options(prefs.comment_sort, ["confidence", "top", "new", "controversial", "old"], "confidence") %}
-			</select>
-		</div>
-		<div id="hide_nsfw">
-			<label for="hide_nsfw">Hide NSFW posts:</label>
-			<input type="checkbox" name="hide_nsfw" {% if prefs.hide_nsfw == "on" %}checked{% endif %}>
 		</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 }}&post_sort={{ prefs.post_sort }}&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>
-	<p id="settings_note"><b>Note:</b> settings are saved in browser cookies. Clearing your cookie data will reset them.</p>
+</div>
-	<input id="save" type="submit" value="Save">
+
-</form>
+{% endblock %}
-{% endblock %}

templates/subreddit.html

@@ -11,8 +11,13 @@
 	{% call utils::search(["/r/", sub.name.as_str()].concat(), "") %}
 {% endblock %}
 
+{% block subscriptions %}
+	{% call utils::sub_list(sub.name.as_str(), "wide") %}
+{% endblock %}
+
 {% block body %}
 	<main>
+		{% if !is_filtered %}
 		<div id="column_one">
 			<form id="sort">
 				<div id="sort_options">
@@ -22,71 +27,59 @@
 						{% call utils::sort(["/r/", sub.name.as_str()].concat(), ["hot", "new", "top", "rising", "controversial"], sort.0) %}
 					{% endif %}
 				</div>
-				{% if sort.0 == "top" || sort.0 == "controversial" %}<select id="timeframe" name="t"> 
+				{% if sort.0 == "top" || sort.0 == "controversial" %}<select id="timeframe" name="t" title="Timeframe"> 
 					{% call utils::options(sort.1, ["hour", "day", "week", "month", "year", "all"], "day") %}
-					<input id="sort_submit" type="submit" value="&rarr;">
+				</select>
-				</select>{% endif %}
+				<button id="sort_submit" class="submit">
+					<svg width="15" viewBox="0 0 110 100" fill="none" stroke-width="10" stroke-linecap="round">
+						<path d="M20 50 H100" />
+						<path d="M75 15 L100 50 L75 85" />
+						&rarr;
+					</svg>
+				</button>
+				{% endif %}
 			</form>
 
+			{% if sub.name.contains("+") %}
+				<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.hide_nsfw == "on") %}
+			{% if !(post.flags.nsfw && prefs.show_nsfw != "on") %}
 			<hr class="sep" />
-			<div class="post {% if post.flags.stickied %}stickied{% endif %} {% if prefs.layout == "card" && post.post_type == "image" %}card_post{% endif %}">
+			{% call utils::post_in_list(post) %}
-				<div class="post_left">
-					<p class="post_score">{{ post.score }}</p>
-					{% if post.flags.nsfw %}<div class="nsfw">NSFW</div>{% endif %}
-				</div>
-				<div class="post_right">
-					<div class="post_text">
-						<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>
-							<span class="dot">&bull;</span>
-							<span class="created" title="{{ post.created }}">{{ post.rel_time }}</span>
-						</p>
-						<p class="post_title">
-							{% if post.flair.flair_parts.len() > 0 %}
-							<small class="post_flair" style="color:{{ post.flair.foreground_color }}; background:{{ post.flair.background_color }}">{% call utils::render_flair(post.flair.flair_parts) %}</small>
-							{% endif %}
-							<a href="{{ post.permalink }}">{{ post.title }}</a>
-						</p>
-					</div>
-
-					<!-- POST MEDIA/THUMBNAIL -->
-					{% if prefs.layout == "card" && post.post_type == "image" %}
-						<img class="post_media" src="{{ post.media }}"/>
-					{% else if post.post_type != "self" %}
-						<a class="post_thumbnail {% if post.thumbnail == "" %}no_thumbnail{% endif %}" href="{% if post.post_type == "link" %}{{ post.media }}{% else %}{{ post.permalink }}{% endif %}">
-							{% if post.thumbnail == "" %}
-								<svg viewBox="0 0 100 106" width="50" height="53" xmlns="http://www.w3.org/2000/svg">
-									<path d="M35,15h-15a10,10 0,0,0 0,20h25a10,10 0,0,0 10,-10m-12.5,0a10, 10 0,0,1 10, -10h25a10,10 0,0,1 0,20h-15" fill="none" stroke-width="5" stroke-linecap="round"/>
-								</svg>
-							{% else %}
-								<img src="{{ post.thumbnail }}">
-							{% endif %}
-							<span>{% if post.post_type == "link" %}{{ post.domain }}{% else %}{{ post.post_type }}{% endif %}</span>
-						</a>
-					{% endif %}
-				</div>
-			</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 != "" %}
+				{% if !ends.0.is_empty() %}
-				<a href="?sort={{ sort.0 }}&t={{ sort.1 }}&before={{ ends.0 }}">PREV</a>
+				<a href="?sort={{ sort.0 }}&t={{ sort.1 }}&before={{ ends.0 }}" accesskey="P">PREV</a>
 				{% endif %}
 
-				{% if ends.1 != "" %}
+				{% if !ends.1.is_empty() %}
-				<a href="?sort={{ sort.0 }}&t={{ sort.1 }}&after={{ ends.1 }}">NEXT</a>
+				<a href="?sort={{ sort.0 }}&t={{ sort.1 }}&after={{ ends.1 }}" accesskey="N">NEXT</a>
 				{% endif %}
 			</footer>
 		</div>
-		{% if sub.name != "" && !sub.name.contains("+") %}
+		{% endif %}
+		{% if is_filtered || (!sub.name.is_empty() && sub.name != "all" && sub.name != "popular" && !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 != "all" && sub.name != "popular" && !sub.name.contains("+") %}
 			<div class="panel" id="subreddit">
 				{% if sub.wiki %}
 				<div id="top">
@@ -95,22 +88,57 @@
 				</div>
 				{% endif %}
 				<div id="sub_meta">
-					<img id="sub_icon" src="{{ sub.icon }}">
+					<img loading="lazy" id="sub_icon" src="{{ sub.icon }}" alt="Icon for r/{{ sub.name }}">
-					<p id="sub_title">{{ sub.title }}</p>
+					<h1 id="sub_title">{{ sub.title }}</h1>
 					<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 title="{{ sub.members.1 }}">{{ sub.members.0 }}</div>
-						<div>{{ sub.active }}</div>
+						<div title="{{ sub.active.1 }}">{{ sub.active.0 }}</div>
+					</div>
+					<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>
+							{% 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|safe }}
+					{# <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

@@ -7,68 +7,44 @@
 
 {% block title %}{{ user.name.replace("u/", "") }} (u/{{ user.name }}) - Libreddit{% endblock %}
 
+{% block subscriptions %}
+	{% call utils::sub_list("") %}
+{% endblock %}
+
 {% block body %}
 	<main>
+		{% if !is_filtered %}
 		<div id="column_one">
 			<form id="sort">
-				<select name="sort"> 
+				<div id="listing_options">
-					{% call utils::options(sort.0, ["hot", "new", "top"], "") %}
+					{% call utils::sort(["/user/", user.name.as_str()].concat(), ["overview", "comments", "submitted"], listing) %}
-				</select>{% if sort.0 == "top" %}<select id="timeframe" name="t"> 
+				</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 %}<input id="sort_submit" type="submit" value="&rarr;">
+				</select>{% endif %}<button id="sort_submit" class="submit">
+					<svg width="15" viewBox="0 0 110 100" fill="none" stroke-width="10" stroke-linecap="round">
+						<path d="M20 50 H100" />
+						<path d="M75 15 L100 50 L75 85" />
+						&rarr;
+					</svg>
+				</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.hide_nsfw == "on" %}
+			{% if post.flags.nsfw && prefs.show_nsfw != "on" %}
-			{% else if post.title != "Comment" %}
+			{% else if !post.title.is_empty() %}
-			<div class="post {% if post.flags.stickied %}stickied{% endif %} {% if prefs.layout == "card" && post.post_type == "image" %}card_post{% endif %}">
+			{% call utils::post_in_list(post) %}
-				<div class="post_left">
-					<p class="post_score">{{ post.score }}</p>
-					{% if post.flags.nsfw %}<div class="nsfw">NSFW</div>{% endif %}
-				</div>
-				<div class="post_right">
-					<div class="post_text">
-						<p class="post_header">
-							<a class="post_subreddit" href="/r/{{ post.community }}">r/{{ post.community }}</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>
-						</p>
-						<p class="post_title">
-							{% if post.flair.background_color == "Comment" %}
-							{% else if post.flair.background_color == "" %}
-							{% else %}
-								<small class="post_flair" style="color:{{ post.flair.foreground_color }}; background:{{ post.flair.background_color }}">{% call utils::render_flair(post.flair.flair_parts) %}</small>
-							{% endif %}
-							<a href="{{ post.permalink }}">{{ post.title }}</a>
-						</p>
-					</div>
-					
-					<!-- POST MEDIA/THUMBNAIL -->
-					{% if prefs.layout == "card" && post.post_type == "image" %}
-						<img class="post_media" src="{{ post.media }}"/>
-					{% else if post.post_type != "self" %}
-						<a class="post_thumbnail {% if post.thumbnail == "" %}no_thumbnail{% endif %}" href="{% if post.post_type == "link" %}{{ post.media }}{% else %}{{ post.permalink }}{% endif %}">
-							{% if post.thumbnail == "" %}
-								<svg viewBox="0 0 100 106" width="50" height="53" xmlns="http://www.w3.org/2000/svg">
-									<path d="M35,15h-15a10,10 0,0,0 0,20h25a10,10 0,0,0 10,-10m-12.5,0a10, 10 0,0,1 10, -10h25a10,10 0,0,1 0,20h-15" fill="none" stroke-width="5" stroke-linecap="round"/>
-								</svg>
-							{% else %}
-								<img src="{{ post.thumbnail }}">
-							{% endif %}
-							<span>{% if post.post_type == "link" %}{{ post.domain }}{% else %}{{ post.post_type }}{% endif %}</span>
-						</a>
-					{% endif %}
-				</div>
-			</div>
 			{% 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>
@@ -76,28 +52,36 @@
 						<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>
+					<p class="comment_body">{{ post.body|safe }}</p>
 				</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 != "" %}
-				<a href="?sort={{ sort.0 }}&t={{ sort.1 }}&before={{ ends.0 }}">PREV</a>
+				<a href="?sort={{ sort.0 }}&t={{ sort.1 }}&before={{ ends.0 }}" accesskey="P">PREV</a>
 				{% endif %}
 
 				{% if ends.1 != "" %}
-				<a href="?sort={{ sort.0 }}&t={{ sort.1 }}&after={{ ends.1 }}">NEXT</a>
+				<a href="?sort={{ sort.0 }}&t={{ sort.1 }}&after={{ ends.1 }}" accesskey="N">NEXT</a>
 				{% 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>
+				<h1 id="user_title">{{ user.title }}</h1>
 				<p id="user_name">u/{{ user.name }}</p>
 				<div id="user_description">{{ user.description }}</div>
 				<div id="user_details">
@@ -106,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,35 +1,147 @@
 {% 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().to_uppercase(), value.get(1..).unwrap()) }}
+			{{ format!("{}{}", value.get(0..1).unwrap_or_default().to_uppercase(), value.get(1..).unwrap_or_default()) }}
 		</option>
 	{% endfor %}
 {%- endmacro %}
 
 {% 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().to_uppercase(), method.get(1..).unwrap()) }}
+			{{ 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" value="{{ search }}">
+	<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">in {{ root }}</label>
+		<label for="restrict_sr" class="search_label" title="Restrict search to this subreddit">in {{ root }}</label>
 	</div>
 	{% endif %}
-	<input type="submit" value="&rarr;">
+	<button class="submit">
+		<svg width="15" viewBox="0 0 110 100" fill="none" stroke-width="10" stroke-linecap="round">
+			<path d="M20 50 H100" />
+			<path d="M75 15 L100 50 L75 85" />
+			&rarr;
+		</svg>
+	</button>
 </form>
 {%- endmacro %}
 
-{% macro render_flair(flair) -%}
+{% macro render_flair(flair_parts) -%}
-{% for flair_part in flair %}
+	{% 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 %}
-	{% if flair_part.flair_part_type == "emoji" %}<span class="emoji" style="background-image:url('{{ flair_part.value }}')"></span>
+{%- endmacro %}
-	{% else if flair_part.flair_part_type == "text" %}<span>{{ flair_part.value }}</span>{% endif %}
+
-{% endfor %}
+{% macro sub_list(current) -%}
+	<details id="feeds">
+		<summary>Feeds</summary>
+		<div id="feed_list">
+			<p>MAIN FEEDS</p>
+			<a href="/">Home</a>
+			<a href="/r/popular">Popular</a>
+			<a href="/r/all">All</a>
+			{% if prefs.subscriptions.len() > 0 %}
+				<p>REDDIT FEEDS</p>
+				{% for sub in prefs.subscriptions %}
+					<a href="/r/{{ sub }}" {% if sub == current %}class="selected"{% endif %}>{{ sub }}</a>
+				{% endfor %}
+			{% endif %}
+		</div>
+	</details>
+{%- 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 %}" id="{{ post.id }}">
+	<p class="post_header">
+		{% 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 {{ 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>
+	<h2 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"
+				class="post_flair"
+				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 %}
+	</h2>
+	<!-- 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 %}" >
+		<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 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 }}" 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" %}
+	{% 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 %}" 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>
+			<path d="M35,15h-15a10,10 0,0,0 0,20h25a10,10 0,0,0 10,-10m-12.5,0a10, 10 0,0,1 10, -10h25a10,10 0,0,1 0,20h-15" fill="none" stroke-width="5" stroke-linecap="round"/>
+		</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 }}"/>
+			<desc>
+				<img loading="lazy" alt="Thumbnail" src="{{ post.thumbnail.url }}"/>
+			</desc>
+		</svg>
+		{% endif %}
+		<span>{% if post.post_type == "link" %}{{ post.domain }}{% else %}{{ post.post_type }}{% endif %}</span>
+	</a>
+	{% endif %}
+
+	<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|safe }}
+	</div>
+	<div class="post_footer">
+		<a href="{{ post.permalink }}" class="post_comments" title="{{ post.comments.1 }} {% if post.comments.1 == "1" %}comment{% else %}comments{% endif %}">{{ post.comments.0 }} {% if post.comments.1 == "1" %}comment{% else %}comments{% endif %}</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 %}

templates/wiki.html

@@ -10,6 +10,10 @@
 	{% call utils::search(["/r/", sub.as_str()].concat(), "") %}
 {% endblock %}
 
+{% block subscriptions %}
+	{% call utils::sub_list(sub.as_str()) %}
+{% endblock %}
+
 {% block body %}
 	<main>
 		<div class="panel" id="column_one">
@@ -18,8 +22,8 @@
 				<div>Wiki</div>
 			</div>
 			<div id="wiki">
-				{{ wiki }}
+				{{ wiki|safe }}
 			</div>
 		</div>
 	</main>
-{% endblock %}
+{% endblock %}