Merge pull request 'Add additional features to readme' (#16) from readme-updates into main

Reviewed-on: #16

.devcontainer/devcontainer.json

@@ -1,6 +1,6 @@
 {
     "name": "Rust",
-    "image": "mcr.microsoft.com/devcontainers/rust:0-1-bullseye",
+    "image": "mcr.microsoft.com/devcontainers/rust:1.0.9-bookworm",
     "features": {
         "ghcr.io/devcontainers/features/docker-in-docker:2": {}
     },

.dockerignore

@@ -0,0 +1 @@
+target

.env.example

@@ -0,0 +1,58 @@
+# Redlib configuration
+# See the Configuration section of the README for a more detailed explanation of these settings.
+
+# Instance-specific settings
+# Enable SFW-only mode for the instance
+REDLIB_SFW_ONLY=off
+# Set a banner message for the instance
+REDLIB_BANNER=
+# Disable search engine indexing
+REDLIB_ROBOTS_DISABLE_INDEXING=off
+# Set the Pushshift frontend for "removed" links
+REDLIB_PUSHSHIFT_FRONTEND=undelete.pullpush.io
+
+# Default user settings
+# Set the default theme (options: system, light, dark, black, dracula, nord, laserwave, violet, gold, rosebox, gruvboxdark, gruvboxlight)
+REDLIB_DEFAULT_THEME=system
+# Set the default mascot
+REDLIB_DEFAULT_MASCOT=none
+# Enable showing redsunlib colorway by default
+REDLIB_DEFAULT_REDSUNLIB_COLORWAY=off
+# Set the default front page (options: default, popular, all)
+REDLIB_DEFAULT_FRONT_PAGE=default
+# Set the default layout (options: card, clean, compact)
+REDLIB_DEFAULT_LAYOUT=card
+# Enable wide mode by default
+REDLIB_DEFAULT_WIDE=off
+# Set the default post sort method (options: hot, new, top, rising, controversial)
+REDLIB_DEFAULT_POST_SORT=hot
+# Set the default comment sort method (options: confidence, top, new, controversial, old)
+REDLIB_DEFAULT_COMMENT_SORT=confidence
+# Enable blurring Spoiler content by default
+REDLIB_DEFAULT_BLUR_SPOILER=off
+# Enable showing NSFW content by default
+REDLIB_DEFAULT_SHOW_NSFW=off
+# Enable blurring NSFW content by default
+REDLIB_DEFAULT_BLUR_NSFW=off
+# Enable HLS video format by default
+REDLIB_DEFAULT_USE_HLS=off
+# Enable audio+video downloads with ffmpeg.wasm
+REDLIB_DEFAULT_FFMPEG_VIDEO_DOWNLOADS=off
+# Hide HLS notification by default
+REDLIB_DEFAULT_HIDE_HLS_NOTIFICATION=off
+# Disable autoplay videos by default
+REDLIB_DEFAULT_AUTOPLAY_VIDEOS=off
+# Define a default list of subreddit subscriptions (format: sub1+sub2+sub3)
+REDLIB_DEFAULT_SUBSCRIPTIONS=
+# Define a default list of subreddit filters (format: sub1+sub2+sub3)
+REDLIB_DEFAULT_FILTERS=
+# Hide awards by default
+REDLIB_DEFAULT_HIDE_AWARDS=off
+# Hide sidebar and summary
+REDLIB_DEFAULT_HIDE_SIDEBAR_AND_SUMMARY=off
+# Disable the confirmation before visiting Reddit
+REDLIB_DEFAULT_DISABLE_VISIT_REDDIT_CONFIRMATION=off
+# Hide score by default
+REDLIB_DEFAULT_HIDE_SCORE=off
+# Enable fixed navbar by default
+REDLIB_DEFAULT_FIXED_NAVBAR=on

.envrc

@@ -0,0 +1 @@
+use flake

.github/FUNDING.yml

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

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,6 +7,10 @@ assignees: ''
 
 ---
 
+<!-- 
+  BEFORE FILING A BUG REPORT: Ensure that you are running the latest git commit. Visit /info on your instance, and ensure the git commit listed is the same commit listed on the home page.
+-->
+
 ## Describe the bug
 <!--
   A clear and concise description of what the bug is.
@@ -31,3 +35,7 @@ Steps to reproduce the behavior:
 <!--
   Add any other context about the problem here.
 -->
+
+
+<!-- Mandatory -->
+- [ ] I checked that the instance that this was reported on is running the latest git commit, or I can reproduce it locally on the latest git commit

.github/workflows/build-artifacts.yaml

@@ -0,0 +1,76 @@
+name: Release Build
+
+on:
+  push:
+    paths-ignore:
+      - "*.md"
+      - "compose.*"
+    branches:
+      - "main"
+  release:
+    types: [published]
+
+env: 
+  CARGO_TERM_COLOR: always
+
+  CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER: aarch64-linux-gnu-gcc
+  CC_aarch64_unknown_linux_musl: aarch64-linux-gnu-gcc
+  CARGO_TARGET_ARMV7_UNKNOWN_LINUX_MUSLEABIHF_LINKER: arm-linux-gnueabihf-gcc
+  CC_armv7_unknown_linux_musleabihf: arm-linux-gnueabihf-gcc
+
+jobs:
+  build:
+    name: Rust project - latest
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        target:
+          - x86_64-unknown-linux-musl
+          - aarch64-unknown-linux-musl
+          - armv7-unknown-linux-musleabihf
+    steps:
+      - uses: actions/checkout@v4
+      
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          target: ${{ matrix.target }}
+      
+      - if: matrix.target == 'x86_64-unknown-linux-musl'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y --no-install-recommends musl-tools
+ 
+      - if: matrix.target == 'armv7-unknown-linux-musleabihf'
+        run: |
+          sudo apt update
+          sudo apt install -y gcc-arm-linux-gnueabihf musl-tools
+
+      - if: matrix.target == 'aarch64-unknown-linux-musl'
+        run: |
+          sudo apt update
+          sudo apt install -y gcc-aarch64-linux-gnu musl-tools
+
+      - name: Versions
+        id: version
+        run: echo "VERSION=$(cargo metadata --format-version 1 --no-deps | jq .packages[0].version -r | sed 's/^/v/')" >> "$GITHUB_OUTPUT"
+
+      - name: Build
+        run: cargo build --release --target ${{ matrix.target }}
+
+      - name: Package release
+        run: tar czf redlib-${{ matrix.target }}.tar.gz -C target/${{ matrix.target }}/release/ redlib
+
+      - name: Upload release
+        uses: softprops/action-gh-release@v1
+        with:
+          tag_name: ${{ steps.version.outputs.VERSION }}
+          name: ${{ steps.version.outputs.VERSION }} - ${{ github.event.head_commit.message }}
+          draft: true
+          files: |
+            redlib-${{ matrix.target }}.tar.gz
+          body: |
+            - ${{ github.event.head_commit.message }} ${{ github.sha }}
+          generate_release_notes: true
+
+
+

.github/workflows/main-docker.yml

@@ -1,59 +1,109 @@
-name: Docker Build
+name: Container build
 
 on:
-  push:
-    paths-ignore:
-      - "**.md"
-    branches:
-      - 'main'
+  workflow_run:
+    workflows: ["Release Build"]
+    types:
+      - completed
+env:
+  REGISTRY_IMAGE: quay.io/redlib/redlib
 
 jobs:
-  build-docker:
+  build:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        config:
-          - { platform: 'linux/amd64', tag: 'latest', dockerfile: 'Dockerfile' }
-          - { platform: 'linux/arm64', tag: 'latest-arm', dockerfile: 'Dockerfile.arm' }
-          - { platform: 'linux/arm/v7', tag: 'latest-armv7', dockerfile: 'Dockerfile.armv7' }
+        include:
+          - { platform: linux/amd64, target: x86_64-unknown-linux-musl }
+          - { platform: linux/arm64, target: aarch64-unknown-linux-musl }
+          - { platform: linux/arm/v7, target: armv7-unknown-linux-musleabihf }
     steps:
-      - name: Checkout sources
-        uses: actions/checkout@v3
-
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY_IMAGE }}
+          tags: |
+            type=sha
+            type=raw,value=latest,enable={{is_default_branch}}
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-        with:
-          platforms: all
-
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v2
-        with:
-          version: latest
-
-      - name: Login to Quay.io
+        uses: docker/setup-buildx-action@v3
+      - name: Login to Quay.io Container Registry
         uses: docker/login-action@v3
         with:
           registry: quay.io
           username: ${{ secrets.QUAY_USERNAME }}
           password: ${{ secrets.QUAY_ROBOT_TOKEN }}
-
-      - name: push README to Quay.io
-        uses: christian-korneck/update-container-description-action@v1
-        env:
-          DOCKER_APIKEY: ${{ secrets.APIKEY__QUAY_IO }}
-        with:
-          destination_container_repo: quay.io/redlib/redlib
-          provider: quay
-          readme_file: 'README.md'
-
       - name: Build and push
+        id: build
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: ./${{ matrix.config.dockerfile }}
-          platforms: ${{ matrix.config.platform }}
-          push: true
-          tags: quay.io/redlib/redlib:${{ matrix.config.tag }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          platforms: ${{ matrix.platform }}
+          labels: ${{ steps.meta.outputs.labels }}
+          outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true
+          file: Dockerfile
+          build-args: TARGET=${{ matrix.target }}
+      - name: Export digest
+        run: |
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"
+      - name: Upload digest
+        uses: actions/upload-artifact@v4
+        with:
+          name: digests-${{ matrix.target }}
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+  merge:
+    runs-on: ubuntu-latest
+    needs:
+      - build
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v4.1.7
+        with:
+          path: /tmp/digests
+          pattern: digests-*
+          merge-multiple: true
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY_IMAGE }}
+          tags: |
+            type=sha
+            type=raw,value=latest,enable={{is_default_branch}}
+      - name: Login to Quay.io Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: quay.io
+          username: ${{ secrets.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_ROBOT_TOKEN }}
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *)
+
+      # - name: Push README to Quay.io
+      #   uses: christian-korneck/update-container-description-action@v1
+      #   env:
+      #     DOCKER_APIKEY: ${{ secrets.APIKEY__QUAY_IO }}
+      #   with:
+      #     destination_container_repo: quay.io/redlib/redlib
+      #     provider: quay
+      #     readme_file: 'README.md'
+
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}

.github/workflows/main-rust.yml

@@ -30,25 +30,16 @@ jobs:
         with:
           toolchain: stable
 
+      - name: Install musl-gcc
+        run: sudo apt-get install musl-tools
+
+      - name: Install cargo musl target
+        run: rustup target add x86_64-unknown-linux-musl
+
       # Building actions
       - name: Build
-        run: RUSTFLAGS='-C target-feature=+crt-static' cargo build --release --target x86_64-unknown-linux-gnu
+        run: RUSTFLAGS='-C target-feature=+crt-static' cargo build --release --target x86_64-unknown-linux-musl
 
-      - name: Calculate SHA512 checksum
-        run: sha512sum target/x86_64-unknown-linux-gnu/release/redlib > redlib.sha512
-
-      - name: Calculate SHA256 checksum
-        run: sha256sum target/x86_64-unknown-linux-gnu/release/redlib > redlib.sha256
-
-      - uses: actions/upload-artifact@v3
-        name: Upload a Build Artifact
-        with:
-          name: redlib
-          path: |
-            target/x86_64-unknown-linux-gnu/release/redlib
-            redlib.sha512
-            redlib.sha256
-        
       - name: Versions
         id: version
         run: echo "VERSION=$(cargo metadata --format-version 1 --no-deps | jq .packages[0].version -r | sed 's/^/v/')" >> "$GITHUB_OUTPUT"
@@ -59,6 +50,22 @@ jobs:
         if: github.event_name == 'release'
         run: cargo publish --no-verify --token ${{ secrets.CARGO_REGISTRY_TOKEN }}
 
+      - name: Calculate SHA512 checksum
+        run: sha512sum target/x86_64-unknown-linux-musl/release/redlib > redlib.sha512
+
+      - name: Calculate SHA256 checksum
+        run: sha256sum target/x86_64-unknown-linux-musl/release/redlib > redlib.sha256
+
+      - uses: actions/upload-artifact@v4
+        name: Upload a Build Artifact
+        with:
+          name: redlib
+          path: |
+            target/x86_64-unknown-linux-musl/release/redlib
+            redlib.sha512
+            redlib.sha256
+        
+
       - name: Release
         uses: softprops/action-gh-release@v1
         if: github.base_ref != 'main' && github.event_name == 'release'
@@ -67,7 +74,7 @@ jobs:
           name: ${{ steps.version.outputs.VERSION }} - ${{ github.event.head_commit.message }}
           draft: true
           files: |
-            target/x86_64-unknown-linux-gnu/release/redlib
+            target/x86_64-unknown-linux-musl/release/redlib
             redlib.sha512
             redlib.sha256
           body: |

.gitignore

@@ -1,4 +1,10 @@
 /target
 .env
+redlib.toml
+
 # Idea Files
 .idea/
+
+# nix files
+.direnv/
+result

.replit

@@ -1,2 +0,0 @@
-run = "while :; do set -ex; nix-env -iA nixpkgs.unzip; curl -o./redlib.zip -fsSL -- https://nightly.link/redlib-org/redlib/workflows/main-rust/main/redlib.zip; unzip -n redlib.zip; mv target/x86_64-unknown-linux-gnu/release/redlib .; chmod +x redlib; set +e; ./redlib -H 63115200; sleep 1; done"
-language = "bash"

CREDITS

@@ -2,7 +2,9 @@
 674Y3r <87250374+674Y3r@users.noreply.github.com>
 accountForIssues <52367365+accountForIssues@users.noreply.github.com>
 Adrian Lebioda <adrianlebioda@gmail.com>
+Akanksh Chitimalla <55909985+Akanksh12@users.noreply.github.com>
 alefvanoon <53198048+alefvanoon@users.noreply.github.com>
+Ales Lerch <13370338+axeII@users.noreply.github.com>
 Alexandre Iooss <erdnaxe@crans.org>
 alyaeanyx <alexandra.hollmeier@mailbox.org>
 AndreVuillemot160 <84594011+AndreVuillemot160@users.noreply.github.com>
@@ -11,58 +13,90 @@ Artemis <51862164+artemislena@users.noreply.github.com>
 arthomnix <35371030+arthomnix@users.noreply.github.com>
 Arya K <73596856+gi-yt@users.noreply.github.com>
 Austin Huang <im@austinhuang.me>
+Ayaka <ayaka@kitty.community>
+backfire-monism-net <development.0extl@simplelogin.com>
 Basti <pred2k@users.noreply.github.com>
+Ben Sherman <bennettmsherman@gmail.com>
 Ben Smith <37027883+smithbm2316@users.noreply.github.com>
+beucismis <beucismis@tutamail.com>
 BobIsMyManager <ahoumatt@yahoo.com>
+Butter Cat <butteredcats@protonmail.com>
+Butter Cat <ButteredCats@protonmail.com>
+Carbrex <95964955+Carbrex@users.noreply.github.com>
+ccuser44 <68124053+ccuser44@users.noreply.github.com>
+Connor Holloway <c.holloway314@outlook.com>
 curlpipe <11898833+curlpipe@users.noreply.github.com>
 dacousb <53299044+dacousb@users.noreply.github.com>
+Daniel Nathan Gray <dng@disroot.org>
 Daniel Valentine <Daniel-Valentine@users.noreply.github.com>
 Daniel Valentine <daniel@vielle.ws>
 dbrennand <52419383+dbrennand@users.noreply.github.com>
+Dean Sallinen <deza604@gmail.com>
 dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 Diego Magdaleno <38844659+DiegoMagdaleno@users.noreply.github.com>
 domve <domve@posteo.net>
 Dyras <jevwmguf@duck.com>
 Edward <101938856+EdwardLangdon@users.noreply.github.com>
+Éli Marshal <835958+EMarshal@users.noreply.github.com>
 elliot <75391956+ellieeet123@users.noreply.github.com>
 erdnaxe <erdnaxe@users.noreply.github.com>
 Esmail EL BoB <github.defilable@simplelogin.co>
+fawn <fawn@envs.net>
 FireMasterK <20838718+FireMasterK@users.noreply.github.com>
 George Roubos <cowkingdom@hotmail.com>
 git-bruh <e817509a-8ee9-4332-b0ad-3a6bdf9ab63f@aleeas.com>
 gmnsii <95436780+gmnsii@users.noreply.github.com>
+gmnsii <github.gmnsii@pm.me>
+gmnsii <gmnsii@void.noreply>
+Gonçalo Valério <dethos@users.noreply.github.com>
 guaddy <67671414+guaddy@users.noreply.github.com>
 Harsh Mishra <erbeusgriffincasper@gmail.com>
+hinto.janai <hinto.janai@protonmail.com>
 igna <igna@intent.cool>
 imabritishcow <bcow@protonmail.com>
+invakid404 <invakid404@riseup.net>
+İsmail Karslı <ismail@karsli.net>
 Johannes Schleifenbaum <johannes@js-webcoding.de>
+Jonathan Dahan <git@jonathan.is>
 Josiah <70736638+fres7h@users.noreply.github.com>
 JPyke3 <pyke.jacob1@gmail.com>
 Kavin <20838718+FireMasterK@users.noreply.github.com>
 Kazi <kzshantonu@users.noreply.github.com>
 Kieran <42723993+EnderDev@users.noreply.github.com>
 Kieran <kieran@dothq.co>
+Kirk1984 <christoph-m@posteo.de>
+kuanhulio <66286575+kuanhulio@users.noreply.github.com>
 Kyle Roth <kylrth@gmail.com>
 laazyCmd <laazy.pr00gramming@protonmail.com>
 Laurențiu Nicola <lnicola@users.noreply.github.com>
 Lena <102762572+MarshDeer@users.noreply.github.com>
+Leopardus <leopardus3@pm.me>
 Macic <46872282+Macic-Dev@users.noreply.github.com>
 Mario A <10923513+Midblyte@users.noreply.github.com>
+Márton <marton2@gmail.com>
+Mathew Davies <ThePixelDeveloper@users.noreply.github.com>
 Matthew Crossman <matt@crossman.page>
 Matthew E <matt@matthew.science>
 Matthew Esposito <matt@matthew.science>
 Mennaruuk <52135169+Mennaruuk@users.noreply.github.com>
+Midou36O <midou@midou.dev>
 mikupls <93015331+mikupls@users.noreply.github.com>
+Myzel394 <50424412+Myzel394@users.noreply.github.com>
 Nainar <nainar.mb@gmail.com>
 Nathan Moos <moosingin3space@gmail.com>
+Nazar <63452145+Tokarak@users.noreply.github.com>
 Nicholas Christopher <nchristopher@tuta.io>
 Nick Lowery <ClockVapor@users.noreply.github.com>
 Nico <github@dr460nf1r3.org>
 NKIPSC <15067635+NKIPSC@users.noreply.github.com>
+nohoster <136514837+nohoster@users.noreply.github.com>
 o69mar <119129086+o69mar@users.noreply.github.com>
 obeho <71698631+obeho@users.noreply.github.com>
 obscurity <z@x4.pm>
 Om G <34579088+OxyMagnesium@users.noreply.github.com>
+Ondřej Pešek <iTzBoboCz@users.noreply.github.com>
+perennial <mail@perennialte.ch>
+Peter Sawyer <petersawyer314@gmail.com>
 pin <90570748+0323pin@users.noreply.github.com>
 potatoesAreGod <118043038+potatoesAreGod@users.noreply.github.com>
 RiversideRocks <59586759+RiversideRocks@users.noreply.github.com>
@@ -86,11 +120,14 @@ TheCultLeader666 <65368815+TheCultLeader666@users.noreply.github.com>
 TheFrenchGhosty <47571719+TheFrenchGhosty@users.noreply.github.com>
 The TwilightBlood <hwengerstickel@protonmail.com>
 tirz <36501933+tirz@users.noreply.github.com>
+tmak2002 <torben@tmak2002.dev>
 Tokarak <63452145+Tokarak@users.noreply.github.com>
 Tsvetomir Bonev <invakid404@riseup.net>
+Vivek <vivek@revankar.net>
 Vladislav Nepogodin <nepogodin.vlad@gmail.com>
 Walkx <walkxnl@gmail.com>
 Wichai <1482605+Chengings@users.noreply.github.com>
 wsy2220 <wsy@dogben.com>
 xatier <xatierlike@gmail.com>
+Yaroslav Chvanov <yaroslav.chvanov@gmail.com>
 Zach <72994911+zachjmurphy@users.noreply.github.com>

Cargo.toml

@@ -1,47 +1,62 @@
 [package]
-name = "redlib"
+name = "redsunlib"
 description = " Alternative private front-end to Reddit"
-license = "AGPL-3.0"
-repository = "https://github.com/redlib-org/redlib"
-version = "0.31.0"
+license = "AGPL-3.0-only"
+repository = "https://git.stardust.wtf/iridium/redsunlib"
+version = "0.36.0"
 authors = [
     "Matthew Esposito <matt+cargo@matthew.science>",
     "spikecodes <19519553+spikecodes@users.noreply.github.com>",
 ]
 edition = "2021"
+default-run = "redsunlib"
 
 [dependencies]
-askama = { version = "0.11.1", default-features = false }
-cached = { version = "0.46.1", features = ["async"] }
+rinja = { version = "0.3.4", default-features = false }
+cached = { version = "0.54.0", features = ["async"] }
 clap = { version = "4.4.11", default-features = false, features = [
     "std",
     "env",
+    "derive",
 ] }
 regex = "1.10.2"
 serde = { version = "1.0.193", features = ["derive"] }
 cookie = "0.18.0"
-futures-lite = "1.13.0"
-hyper = { version = "0.14.28", features = ["full"] }
-hyper-rustls = "0.24.2"
+futures-lite = "2.2.0"
+hyper = { version = "0.14.31", features = ["full"] }
 percent-encoding = "2.3.1"
 route-recognizer = "0.3.1"
-serde_json = "1.0.108"
-tokio = { version = "1.35.1", features = ["full"] }
+serde_json = "1.0.133"
+tokio = { version = "1.44.2", features = ["full"] }
 time = { version = "0.3.31", features = ["local-offset"] }
 url = "2.5.0"
 rust-embed = { version = "8.1.0", features = ["include-exclude"] }
 libflate = "2.0.0"
-brotli = { version = "3.4.0", features = ["std"] }
+brotli = { version = "7.0.0", features = ["std"] }
 toml = "0.8.8"
 once_cell = "1.19.0"
 serde_yaml = "0.9.29"
 build_html = "2.4.0"
 uuid = { version = "1.6.1", features = ["v4"] }
-base64 = "0.21.5"
+base64 = "0.22.1"
 fastrand = "2.0.1"
 log = "0.4.20"
 pretty_env_logger = "0.5.0"
 dotenvy = "0.15.7"
+rss = "2.0.7"
+arc-swap = "1.7.1"
+serde_json_path = "0.7.1"
+async-recursion = "1.1.1"
+pulldown-cmark = { version = "0.12.0", features = ["simd", "html"], default-features = false }
+hyper-rustls = { version = "0.24.2", features = [ "http2" ] }
+tegen = "0.1.4"
+serde_urlencoded = "0.7.1"
+chrono = { version = "0.4.39", default-features = false, features = [ "std" ] }
+htmlescape = "0.3.1"
+bincode = "1.3.3"
+base2048 = "2.0.2"
+revision = "0.10.0"
+
 
 [dev-dependencies]
 lipsum = "0.9.0"
@@ -51,3 +66,11 @@ sealed_test = "1.0.0"
 codegen-units = 1
 lto = true
 strip = "symbols"
+
+[[bin]]
+name = "redsunlib"
+path = "src/main.rs"
+
+[[bin]]
+name = "scraper"
+path = "src/scraper/main.rs"

Dockerfile

@@ -1,19 +1,17 @@
-####################################################################################################
 ## Builder
-####################################################################################################
+
 FROM rust:alpine AS builder
 
-RUN apk add --no-cache musl-dev
+RUN apk add --no-cache musl-dev git
 
-WORKDIR /redlib
+WORKDIR /redsunlib
 
 COPY . .
 
 RUN cargo build --target x86_64-unknown-linux-musl --release
 
-####################################################################################################
 ## Final image
-####################################################################################################
+
 FROM alpine:latest
 
 # Import ca-certificates from builder
@@ -21,16 +19,16 @@ 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 /redlib/target/x86_64-unknown-linux-musl/release/redlib /usr/local/bin/redlib
+COPY --from=builder /redsunlib/target/x86_64-unknown-linux-musl/release/redsunlib /usr/local/bin/redsunlib
 
 # Use an unprivileged user.
-RUN adduser --home /nonexistent --no-create-home --disabled-password redlib
-USER redlib
+RUN adduser --home /nonexistent --no-create-home --disabled-password redsunlib
+USER redsunlib
 
 # Tell Docker to expose port 8080
 EXPOSE 8080
 
-# Run a healthcheck every minute to make sure redlib is functional
-HEALTHCHECK --interval=1m --timeout=3s CMD wget --spider --q http://localhost:8080/settings || exit 1
+# Run a healthcheck every minute to make sure redsunlib is functional
+HEALTHCHECK --interval=1m --timeout=3s CMD wget --spider -q http://localhost:8080/settings || exit 1
 
-CMD ["redlib"]
+CMD ["redsunlib"]

Dockerfile.alpine

@@ -0,0 +1,45 @@
+# supported versions here: https://hub.docker.com/_/rust
+ARG ALPINE_VERSION=3.20
+
+########################
+## builder image
+########################
+FROM rust:alpine${ALPINE_VERSION} AS builder
+
+RUN apk add --no-cache musl-dev
+
+WORKDIR /redlib
+
+# download (most) dependencies in their own layer
+COPY Cargo.lock Cargo.toml ./
+RUN mkdir src && echo "fn main() { panic!(\"why am i running?\") }" > src/main.rs
+RUN cargo build --release --locked --bin redlib
+RUN rm ./src/main.rs && rmdir ./src
+
+# copy the source and build the redlib binary
+COPY . ./
+RUN cargo build --release --locked --bin redlib
+RUN echo "finished building redlib!"
+
+########################
+## release image
+########################
+FROM alpine:${ALPINE_VERSION} AS release
+
+# Import redlib binary from builder
+COPY --from=builder /redlib/target/release/redlib /usr/local/bin/redlib
+
+# Add non-root user for running redlib
+RUN adduser --home /nonexistent --no-create-home --disabled-password redlib
+USER redlib
+
+# Document that we intend to expose port 8080 to whoever runs the container
+EXPOSE 8080
+
+# Run a healthcheck every minute to make sure redlib is functional
+HEALTHCHECK --interval=1m --timeout=3s CMD wget --spider --q http://localhost:8080/settings || exit 1
+
+# Add container metadata
+LABEL org.opencontainers.image.authors="sigaloid"
+
+CMD ["redlib"]

Dockerfile.arm

@@ -1,45 +0,0 @@
-####################################################################################################
-## Builder
-####################################################################################################
-FROM rust:alpine AS builder
-
-RUN apk add --no-cache g++ git
-
-WORKDIR /usr/src/redlib
-
-# cache dependencies in their own layer
-COPY Cargo.lock Cargo.toml .
-RUN mkdir src && echo "fn main() {}" > src/main.rs && cargo install --config net.git-fetch-with-cli=true --path . && rm -rf ./src
-
-COPY . .
-
-# net.git-fetch-with-cli is specified in order to prevent a potential OOM kill
-# in low memory environments. See:
-#     https://users.rust-lang.org/t/cargo-uses-too-much-memory-being-run-in-qemu/76531
-# This is tracked under issue #641. This also requires us to install git in the
-# builder.
-RUN cargo install --config net.git-fetch-with-cli=true --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/redlib /usr/local/bin/redlib
-
-# Use an unprivileged user.
-RUN adduser --home /nonexistent --no-create-home --disabled-password redlib
-USER redlib
-
-# Tell Docker to expose port 8080
-EXPOSE 8080
-
-# Run a healthcheck every minute to make sure redlib is functional
-HEALTHCHECK --interval=1m --timeout=3s CMD wget --spider --q http://localhost:8080/settings || exit 1
-
-CMD ["redlib"]

Dockerfile.armv7

@@ -1,43 +0,0 @@
-####################################################################################################
-## 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 /redlib
-
-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 /redlib/target/armv7-unknown-linux-musleabihf/release/redlib /usr/local/bin/redlib
-
-# Use an unprivileged user.
-RUN adduser --home /nonexistent --no-create-home --disabled-password redlib
-USER redlib
-
-# Tell Docker to expose port 8080
-EXPOSE 8080
-
-# Run a healthcheck every minute to make sure redlib is functional
-HEALTHCHECK --interval=1m --timeout=3s CMD wget --spider --q http://localhost:8080/settings || exit 1
-
-CMD ["redlib"]

Dockerfile.ubuntu

@@ -0,0 +1,51 @@
+# supported versions here: https://hub.docker.com/_/rust
+ARG RUST_BUILDER_VERSION=slim-bookworm
+ARG UBUNTU_RELEASE_VERSION=noble
+
+########################
+## builder image
+########################
+FROM rust:${RUST_BUILDER_VERSION} AS builder
+
+WORKDIR /redlib
+
+# download (most) dependencies in their own layer
+COPY Cargo.lock Cargo.toml ./
+RUN mkdir src && echo "fn main() { panic!(\"why am i running?\") }" > src/main.rs
+RUN cargo build --release --locked --bin redlib
+RUN rm ./src/main.rs && rmdir ./src
+
+# copy the source and build the redlib binary
+COPY . ./
+RUN cargo build --release --locked --bin redlib
+RUN echo "finished building redlib!"
+
+########################
+## release image
+########################
+FROM ubuntu:${UBUNTU_RELEASE_VERSION} AS release
+
+# Install ca-certificates
+RUN apt-get update && apt-get install -y ca-certificates
+
+# Import redlib binary from builder
+COPY --from=builder /redlib/target/release/redlib /usr/local/bin/redlib
+
+# Add non-root user for running redlib
+RUN useradd \
+    --no-create-home \
+    --password "!" \
+    --comment "user for running redlib" \
+    redlib
+USER redlib
+
+# Document that we intend to expose port 8080 to whoever runs the container
+EXPOSE 8080
+
+# Run a healthcheck every minute to make sure redlib is functional
+HEALTHCHECK --interval=1m --timeout=3s CMD wget --spider --q http://localhost:8080/settings || exit 1
+
+# Add container metadata
+LABEL org.opencontainers.image.authors="sigaloid"
+
+CMD ["redlib"]

README.md

@@ -1,92 +1,137 @@
-# Redlib
+<img align="left" width="128" height="128" src="https://git.stardust.wtf/attachments/842086e3-b718-4379-b718-c3a542842152" alt="logo">
 
-> An alternative private front-end to Reddit
+# Redsunlib
+> An alternative private front-end to Reddit, a fork of [Redlib](https://github.com/redlib-org/redlib) with some <sup><sub>(minor)</sub></sup> function and cosmetic changes. [(See.)](#additional-features)
 
-# ⚠️ Why do I get TOO MANY REQUESTS errors? ⚠️
-#### As of July 12th, 2023, Redlib is currently not operational as Reddit's API changes, that were designed to kill third-party apps and content scrapers who don't pay [large fees](https://www.theverge.com/2023/5/31/23743993/reddit-apollo-client-api-cost), went into effect. [Read the full announcement here.](https://github.com/libreddit/libreddit/issues/840)
+<br>
 
-![screenshot](https://i.ibb.co/QYbqTQt/libreddit-rust.png)
+![screenshot](https://git.stardust.wtf/attachments/ccf81f52-e653-4722-94b9-b370c58d6359)
+
+### Disclaimer
+
+There are rapid changes/features in this fork that can<sup>(will)</sup> change without notice. If you want to host this version, be aware that it's likely to break at some point. I still wouldn't recommend it in a production environment unless you know what you're doing. Or like living on the edge.......
+
+> I would also like to thank the maintainers and contributors of both [Redlib](https://github.com/redlib-org/redlib) and [Libreddit](https://github.com/libreddit/libreddit) for all the work they did while I just added some low quality tacky features. ❤️
 
 ---
 
-**10-second pitch:** Redlib 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
-
----
-
-I appreciate any donations! Your support allows me to continue developing Redlib.
-
-<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>
-
-
-**Bitcoin:** `bc1qwyxjnafpu3gypcpgs025cw9wa7ryudtecmwa6y`
-
-**Monero:** `45FJrEuFPtG2o7QZz2Nps77TbHD4sPqxViwbdyV9A6ktfHiWs47UngG5zXPcLoDXAc8taeuBgeNjfeprwgeXYXhN3C9tVSR`
+## Table of Contents
+1. [Redsunlib](#redsunlib)
+   - [Disclaimer](#disclaimer)
+2. [Table of Contents](#table-of-contents)
+3. [Instances](#instances)
+4. [About](#about)
+   - [The Name](#the-name)
+   - [Built with](#built-with)
+   - [How is it different from other Reddit front ends?](#how-is-it-different-from-other-reddit-front-ends)
+     - [Teddit](#teddit)
+     - [Libreddit](#libreddit)
+5. [Comparison](#comparison)
+   - [Additional features](#additional-features)
+   - [Speed](#speed)
+   - [Privacy](#privacy)
+     - [Reddit](#reddit)
+     - [Redlib](#redlib-1)
+       - [Server](#server)
+6. [Deployment](#deployment)
+   - [Docker](#docker)
+     - [Docker Compose](#docker-compose)
+     - [Docker CLI](#docker-cli)
+   - [Binary](#binary)
+     - [Running as a systemd service](#running-as-a-systemd-service)
+   - [Building from source](#building-from-source)
+7. [Configuration](#configuration)
+   - [Instance settings](#instance-settings)
+   - [Default user settings](#default-user-settings)
 
 ---
 
 # Instances
 
-🔗 **Want to automatically redirect Reddit links to Redlib? Use [LibRedirect](https://github.com/libredirect/libredirect) or [Privacy Redirect](https://github.com/SimonBrazell/privacy-redirect)!**
+> [!WARNING]
+> 🔗 **Currently public Redsunlib instance are not available, consider using a [redlib](https://github.com/redlib-org/redlib-instances/blob/main/instances.md) instance if you are not comfortable running your own**
 
-[Follow this link](https://github.com/redlib-org/redlib-instances/blob/main/instances.md) for an up-to-date table of instances in Markdown format. This list is also available as [a machine-readable JSON](https://github.com/redlib-org/redlib-instances/blob/main/instances.json).
-
-Both files are part of the [libreddit-instances](https://github.com/redlib-org/redlib-instances) repository. To contribute your [self-hosted instance](#deployment) to the list, see the [libreddit-instances README](https://github.com/redlib-org/redlib-instances/blob/main/README.md).
+You are more than welcome to host an instance and submit an issue if you want it added. That is, if you've read the [Disclaimer](#disclaimer) and it's within your "personal risk tolerance." ;)
 
 ---
 
 # About
 
-Find Redlib on 💬 [Matrix](https://matrix.to/#/#redlib:matrix.org), 🐋 [Quay.io](https://quay.io/repository/redlib/redlib), :octocat: [GitHub](https://github.com/redlib-org/redlib), and 🦊 [GitLab](https://gitlab.com/redlib/redlib).
+Redlib hopes to provide an easier way to browse Reddit, without the ads, trackers, and bloat. Redlib 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.
+
+Redlib currently implements most of Reddit's (signed-out) functionalities but still lacks [a few features](https://github.com/redlib-org/redlib/issues).
+
+## The Name
+
+**Red sun** in the sky + Red**lib**  = Redsunlib
+
+<sup>I do self criticism constantly, because I'm trapped in a Maoist *cult* where comrades (white terrorists) criticize me merciloussly for having a fascist credit card (VISA Silver Signature Rewards) They won't let me order vegan pizza anymore because the phone is fascist and "summoning my pizza slave with bourgeois app" is "bad vibes"</sup>
 
 ## 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
+- [Rinja](https://github.com/rinja-rs/rinja) - Templating engine
 - [Rustls](https://github.com/rustls/rustls) - TLS library
 
-## Info
-Redlib hopes to provide an easier way to browse Reddit, without the ads, trackers, and bloat. Redlib 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.
+## How is it different from other Reddit front ends?
 
-Redlib currently implements most of Reddit's (signed-out) functionalities but still lacks [a few features](https://github.com/libreddit/libreddit/issues).
-
-## How does it compare to Teddit?
+### 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 Redlib into an even more polished product.
 
 If you are looking to compare, the biggest differences I have noticed are:
+
 - Redlib 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.
 - Redlib 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.
 
+### Libreddit
+
+While originating as a fork of Libreddit, the name "Redlib" was adopted to avoid legal issues, as Reddit only allows the use of their name if structured as "XYZ For Reddit".
+
+Several technical improvements have also been made, including:
+
+- **OAuth token spoofing**: To circumvent rate limits imposed by Reddit, OAuth token spoofing is used to mimick the most common iOS and Android clients. While spoofing both iOS and Android clients was explored, only the Android client was chosen due to content restrictions when using an anonymous iOS client.
+- **Token refreshing**: The authentication token is refreshed every 24 hours, emulating the behavior of the official Android app.
+- **HTTP header mimicking**: Efforts are made to send along as many of the official app's headers as possible to reduce the likelihood of Reddit's crackdown on Redlib's requests.
+
 ---
 
 # Comparison
 
-This section outlines how Redlib compares to Reddit.
+## Additional features
+
+|Quick Access Feeds<br>*<sup>(Beta)</sup>*|![screenshot](https://git.stardust.wtf/attachments/fa732ded-8618-440c-98b4-8e491456b538)<br>*Toolbar*<br>![screenshot](https://git.stardust.wtf/attachments/fb21a7fb-3944-407b-b8b7-c664a1538d66)<br>*Dropdown*
+|:-:|---|
+|**Video Downloads**<br>*using FFmpeg.wasm*|<img align="left" width="400" src="https://git.stardust.wtf/attachments/2d5356dc-ce99-4e5e-bb64-b6e7cc343862" alt="Video Downloads">
+|**Mascot Overlays**<br>*A friendly companion while you browse*|<img align="left" width="400" src="https://git.stardust.wtf/attachments/d8e1507d-8fde-4bf1-9150-6ec08b843f85" alt="Mascot Overlays (Image of boymoder)">
+|**Extra Themes**<br>*Well... One.*|***Catppuccin*** <img width="400" src="https://git.stardust.wtf/attachments/ccf81f52-e653-4722-94b9-b370c58d6359" alt="Catppuccin">
+|**Extra Layouts**|<br>***Waterfall*** <img width="400" src="https://git.stardust.wtf/attachments/b4f9e41e-27a9-4bd0-bb1e-f7aa025ffd38" alt="Waterfall"><br>***Old <sup>(Beta)</sup>*** <img width="400" src="https://git.stardust.wtf/attachments/fa4d78b9-17dd-4b64-90c9-510a75b3bc8e" alt="Old">
+|**Tweaked Interface Elements**|<img width="200" src="https://git.stardust.wtf/attachments/1148dd14-63cf-481e-99f0-a2236f9414cd"><img width="200" src="https://git.stardust.wtf/attachments/c2055e09-fa96-46c6-9724-41a0bad28bc6"><br><br><img width="200" src="https://git.stardust.wtf/attachments/e99365d5-64d2-458e-a572-90ef030a0cfa"><img width="200" src="https://git.stardust.wtf/attachments/9248dfaa-28c2-443b-98f9-ed736f663701">
+|**QoL**<br>*Quality of life*| Option to skip gated/quarantined <br> Option to disable banners to save bandwidth <br> Display more information <br> Mute Users [?](## "Automaticly collapse content (A Weaker filter)") |
+
+---
+
+This section outlines how Redlib compares to Reddit in terms of speed and privacy.
 
 ## Speed
 
-Lasted tested Nov 11, 2022.
+Last tested on January 12, 2024.
 
-Results from Google PageSpeed Insights ([Redlib Report](https://pagespeed.web.dev/report?url=https%3A%2F%2Flibreddit.spike.codes%2F), [Reddit Report](https://pagespeed.web.dev/report?url=https://www.reddit.com)).
+Results from Google PageSpeed Insights ([Redlib Report](https://pagespeed.web.dev/report?url=https%3A%2F%2Fredlib.matthew.science%2F), [Reddit Report](https://pagespeed.web.dev/report?url=https://www.reddit.com)).
 
-|                        | Redlib   | Reddit    |
-|------------------------|-------------|-----------|
-| Requests               | 60          | 83        |
-| Speed Index            | 2.0s        | 10.4s     |
-| Time to Interactive    | **2.8s**    | **12.4s** |
+| Performance metric  | Redlib   | Reddit    |
+| ------------------- | -------- | --------- |
+| Speed Index         | 0.6s     | 1.9s      |
+| Performance Score   | 100%     | 64%       |
+| Time to Interactive | **2.8s** | **12.4s** |
 
 ## Privacy
 
 ### Reddit
 
 **Logging:** According to Reddit's [privacy policy](https://www.redditinc.com/policies/privacy-policy), they "may [automatically] log information" including:
+
 - IP address
 - User-agent string
 - Browser type
@@ -100,12 +145,14 @@ Results from Google PageSpeed Insights ([Redlib Report](https://pagespeed.web.de
 - Search terms
 
 **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)
 - Your IP Address
 
 **Cookies:** Reddit's [cookie notice](https://www.redditinc.com/policies/cookies) documents the array of cookies used by Reddit including/regarding:
+
 - Authentication
 - Functionality
 - Analytics and Performance
@@ -119,156 +166,93 @@ For transparency, I hope to describe all the ways Redlib handles user privacy.
 
 #### Server
 
-* **Logging:** In production (when running the binary, hosting with docker, or using the official instances), Redlib logs nothing. When debugging (running from source without `--release`), Redlib logs post IDs fetched to aid with troubleshooting.
+- **Logging:** In production (when running the binary, hosting with docker, or using the official instances), Redlib logs nothing. When debugging (running from source without `--release`), Redlib logs post IDs fetched to aid with troubleshooting.
 
-* **Cookies:** Redlib 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.
-
-#### Official instance (libreddit.spike.codes)
-
-The official instance is hosted at https://libreddit.spike.codes.
-
-* **Server:** The official instance runs a production binary, and thus logs nothing.
-
-* **DNS:** The domain for the official instance uses Cloudflare as the DNS resolver. However, this site is not proxied through Cloudflare, and thus Cloudflare doesn't have access to user traffic.
-
-* **Hosting:** The official instance is 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
-
-## 1) Cargo
-
-Make sure Rust stable is installed along with `cargo`, Rust's package manager.
-
-```
-cargo install libreddit
-```
-
-## 2) Docker
-
-Deploy the [Docker image](https://quay.io/repository/redlib/redlib) of Redlib:
-```
-docker pull quay.io/redlib/redlib
-docker run -d --name redlib -p 8080:8080 quay.io/redlib/redlib
-```
-
-Deploy using a different port (in this case, port 80):
-```
-docker pull quay.io/redlib/redlib
-docker run -d --name redlib -p 80:8080 quay.io/redlib/redlib
-```
-
-To deploy on `arm64` platforms, simply replace `quay.io/redlib/redlib` in the commands above with `quay.io/redlib/redlib:latest-arm`.
-
-To deploy on `armv7` platforms, simply replace `quay.io/redlib/redlib` in the commands above with `quay.io/redlib/redlib:latest-armv7`.
-
-## 3) AUR
-
-For ArchLinux users, Redlib is available from the AUR as [`libreddit-git`](https://aur.archlinux.org/packages/libreddit-git).
-
-```
-yay -S libreddit-git
-```
-## 4) NetBSD/pkgsrc
-
-For NetBSD users, Redlib is available from the official repositories.
-
-```
-pkgin install libreddit
-```
-
-Or, if you prefer to build from source
-
-```
-cd /usr/pkgsrc/libreddit
-make install
-```
-
-## 5) 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/redlib-org/redlib/releases/latest).
-
-## 6) Replit/Heroku/Glitch
-
-> **Warning**
-> 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.
-
-<a href="https://repl.it/github/redlib-org/redlib"><img src="https://repl.it/badge/github/redlib-org/redlib" alt="Run on Repl.it" height="32" /></a>
-[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/redlib-org/redlib)
-[![Remix on Glitch](https://cdn.glitch.com/2703baf2-b643-4da7-ab91-7ee2a2d00b5b%2Fremix-button-v2.svg)](https://glitch.com/edit/#!/remix/libreddit)
+- **Cookies:** Redlib uses optional cookies to store any configured settings in [the settings menu](https://redlib.matthew.science/settings). These are not cross-site cookies and the cookies hold no personal data.
 
 ---
 
 # Deployment
 
-Once installed, deploy Redlib to `0.0.0.0:8080` by running:
+This section covers multiple ways of deploying Redlib. Using [Docker](#docker) is recommended for production.
 
+For configuration options, see the [Configuration section](#Configuration).
+
+## Docker
+
+[Docker](https://www.docker.com) lets you run containerized applications. Containers are loosely isolated environments that are lightweight and contain everything needed to run the application, so there's no need to rely on what's installed on the host.
+
+Docker images for Redsunlib are available at our [Gitea container registry](https://git.stardust.wtf/iridium/-/packages/container/redsunlib/latest), currently only with support for `amd64`, if you need `arm64`, or `armv7` platforms you can either build Redsunlib yourself or open an [issue](https://git.stardust.wtf/iridium/redsunlib/issues) :)
+
+### Docker Compose
+
+> [!IMPORTANT]
+> These instructions assume the [Compose plugin](https://docs.docker.com/compose/migrate/#what-are-the-differences-between-compose-v1-and-compose-v2) has already been installed. If not, follow these [instructions on the Docker Docs](https://docs.docker.com/compose/install) for how to do so.
+
+Copy `compose.yaml` and modify any relevant values (for example, the ports Redlib should listen on).
+
+Start Redlib in detached mode (running in the background):
+
+```bash
+docker compose up -d
 ```
+
+Stream logs from the Redlib container:
+
+```bash
+docker logs -f redlib
+```
+
+### Docker CLI
+
+Deploy Redlib:
+
+```bash
+docker pull git.stardust.wtf/iridium/redsunlib:latest
+docker run -d --name redlib -p 8080:8080 git.stardust.wtf/iridium/redsunlib:latest
+```
+
+Deploy using a different port on the host (in this case, port 80):
+
+```bash
+docker pull git.stardust.wtf/iridium/redsunlib:latest
+docker run -d --name redlib -p 80:8080 git.stardust.wtf/iridium/redsunlib:latest
+```
+
+If you're using a reverse proxy in front of Redlib, prefix the port numbers with `127.0.0.1` so that Redlib only listens on the host port **locally**. For example, if the host port for Redlib is `8080`, specify `127.0.0.1:8080:8080`.
+
+Stream logs from the Redlib container:
+
+```bash
+docker logs -f redlib
+```
+
+## Binary
+
+Currently binaries are not supplied at this moment but will be at some point in the future but can be [built from source](#building-from-source)
+
+Copy the binary to `/usr/bin`:
+
+```bash
+sudo cp ./redlib /usr/bin/redlib
+```
+
+Deploy Redlib to `0.0.0.0:8080`:
+
+```bash
 redlib
 ```
 
-## Instance settings
-
-Assign a default value for each instance-specific setting by passing environment variables to Redlib in the format `REDLIB_{X}`. Replace `{X}` with the setting name (see list below) in capital letters.
-
-| Name                      | Possible values | Default value    | Description                                                                                               |
-|---------------------------|-----------------|------------------|-----------------------------------------------------------------------------------------------------------|
-| `SFW_ONLY`                | `["on", "off"]` | `off`            | Enables SFW-only mode for the instance, i.e. all NSFW content is filtered.                                |
-| `BANNER`                  | String          | (empty)          | Allows the server to set a banner to be displayed. Currently this is displayed on the instance info page. | 
-| `ROBOTS_DISABLE_INDEXING` | `["on", "off"]` | `off`            | Disables indexing of the instance by search engines.                                                      |
-| `PUSHSHIFT_FRONTEND`      | String          | `www.unddit.com` | Allows the server to set the Pushshift frontend to be used with "removed" links.                          |
-
-## Default User Settings
-
-Assign a default value for each user-modifiable setting by passing environment variables to Redlib in the format `REDLIB_DEFAULT_{Y}`. Replace `{Y}` 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", "gruvboxdark", "gruvboxlight"]` | `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`         |
-| `BLUR_NSFW`                         | `["on", "off"]`                                                                                                                    | `off`         |
-| `USE_HLS`                           | `["on", "off"]`                                                                                                                    | `off`         |
-| `HIDE_HLS_NOTIFICATION`             | `["on", "off"]`                                                                                                                    | `off`         |
-| `AUTOPLAY_VIDEOS`                   | `["on", "off"]`                                                                                                                    | `off`         |
-| `SUBSCRIPTIONS`                     | `+`-delimited list of subreddits (`sub1+sub2+sub3+...`)                                                                            | _(none)_      | 
-| `HIDE_AWARDS`                       | `["on", "off"]`                                                                                                                    | `off`         |
-| `DISABLE_VISIT_REDDIT_CONFIRMATION` | `["on", "off"]`                                                                                                                    | `off`         |
-| `HIDE_SCORE`                        | `["on", "off"]`                                                                                                                    | `off`         |
-| `FIXED_NAVBAR`                      | `["on", "off"]`                                                                                                                    | `on`          |
-
-You can also configure Redlib with a configuration file. An example `redlib.toml` can be found below:
-
-```toml
-REDLIB_DEFAULT_WIDE = "on"
-REDLIB_DEFAULT_USE_HLS = "on"
-```
-
-### Examples
-
-```bash
-REDLIB_DEFAULT_SHOW_NSFW=on redlib
-```
-
-```bash
-REDLIB_DEFAULT_WIDE=on REDLIB_DEFAULT_THEME=dark redlib -r
-```
-
-## Proxying using NGINX
-
-> **Note**
-> If you're [proxying Redlib through an NGINX Reverse Proxy](https://github.com/libreddit/libreddit/issues/122#issuecomment-782226853), add
+> [!IMPORTANT]
+> If you're proxying Redlib through NGINX (see [issue #122](https://github.com/libreddit/libreddit/issues/122#issuecomment-782226853)), add
+>
 > ```nginx
 > proxy_http_version 1.1;
 > ```
+>
 > to your NGINX configuration file above your `proxy_pass` line.
 
-## systemd
+### Running as a systemd service
 
 You can use the systemd service available in `contrib/redlib.service`
 (install it on `/etc/systemd/system/redlib.service`).
@@ -287,18 +271,98 @@ guarantee nginx waits for this service to start. Edit
 Before=nginx.service
 ```
 
-## launchd
+## Building from source
 
-If you are on macOS, you can use the launchd service available in `contrib/redlib.plist`.
+To deploy Redsunlib with changes not yet included in the latest release, you can build the application from source.
 
-Install it with `cp contrib/redlib.plist ~/Library/LaunchAgents/`.
-
-Load and start it with `launchctl load ~/Library/LaunchAgents/redlib.plist`.
-
-## Building
-
-```
-git clone https://github.com/redlib-org/redlib
-cd redlib
+```bash
+git clone https://git.stardust.wtf/iridium/redsunlib && cd redsunlib
 cargo run
 ```
+
+---
+
+# Configuration
+
+You can configure Redlib further using environment variables. For example:
+
+```bash
+REDLIB_DEFAULT_SHOW_NSFW=on redlib
+```
+
+```bash
+REDLIB_DEFAULT_WIDE=on REDLIB_DEFAULT_THEME=dark redlib -r
+```
+
+You can also configure Redlib with a configuration file named `redlib.toml`. For example:
+
+```toml
+REDLIB_DEFAULT_WIDE = "on"
+REDLIB_DEFAULT_USE_HLS = "on"
+```
+
+> [!NOTE]
+> If you're deploying Redlib using the **Docker CLI or Docker Compose**, environment variables can be defined in a [`.env` file](https://docs.docker.com/compose/environment-variables/set-environment-variables/), allowing you to centralize and manage configuration in one place.
+>
+> To configure Redlib using a `.env` file, copy the `.env.example` file to `.env` and edit it accordingly.
+>
+> If using the Docker CLI, add ` --env-file .env` to the command that runs Redlib. For example:
+>
+> ```bash
+> docker run -d --name redlib -p 8080:8080 --env-file .env git.stardust.wtf/iridium/redsunlib:latest
+> ```
+>
+> If using Docker Compose, no changes are needed as the `.env` file is already referenced in `compose.yaml` via the `env_file: .env` line.
+
+## Command Line Flags
+
+Redlib supports the following command line flags:
+
+- `-4`, `--ipv4-only`: Listen on IPv4 only.
+- `-6`, `--ipv6-only`: Listen on IPv6 only.
+- `-r`, `--redirect-https`: Redirect all HTTP requests to HTTPS (no longer functional).
+- `-a`, `--address <ADDRESS>`: Sets address to listen on. Default is `[::]`.
+- `-p`, `--port <PORT>`: Port to listen on. Default is `8080`.
+- `-H`, `--hsts <EXPIRE_TIME>`: HSTS header to tell browsers that this site should only be accessed over HTTPS. Default is `604800`.
+
+## Instance settings
+
+Assign a default value for each instance-specific setting by passing environment variables to Redlib in the format `REDLIB_{X}`. Replace `{X}` with the setting name (see list below) in capital letters.
+
+| Name                      | Possible values | Default value          | Description                                                                                               |
+| ------------------------- | --------------- | ----------------       | --------------------------------------------------------------------------------------------------------- |
+| `SFW_ONLY`                | `["on", "off"]` | `off`                  | Enables SFW-only mode for the instance, i.e. all NSFW content is filtered.                                |
+| `BANNER`                  | String          | (empty)                | Allows the server to set a banner to be displayed. Currently this is displayed on the instance info page. |
+| `ROBOTS_DISABLE_INDEXING` | `["on", "off"]` | `off`                  | Disables indexing of the instance by search engines.                                                      |
+| `PUSHSHIFT_FRONTEND`      | String          | `undelete.pullpush.io` | Allows the server to set the Pushshift frontend to be used with "removed" links.                          |
+| `PORT`                    | Integer 0-65535 | `8080`                 | The **internal** port Redlib listens on.                                                                  |
+| `ENABLE_RSS`              | `["on", "off"]` | `off`                  | Enables RSS feed generation.                                                                              |
+| `FULL_URL`                | String          | (empty)                | Allows for proper URLs (for now, only needed by RSS)
+## Default user settings
+
+Assign a default value for each user-modifiable setting by passing environment variables to Redlib in the format `REDLIB_DEFAULT_{Y}`. Replace `{Y}` 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", "gruvboxdark", "gruvboxlight", "tokyoNight", "catppuccin", "icebergDark", "doomone", "libredditBlack", "libredditDark", "libredditLight"]` | `system`      |
+| `MASCOT`                           | `["BoymoderBlahaj", "redsunlib" ... Add more at ./static/mascots] `                                                                                                                    | _(none)_          |
+| `FRONT_PAGE`                        | `["default", "popular", "all"]`                                                                                                    | `default`     |
+| `LAYOUT`                            | `["card", "clean", "compact", "old", "waterfall"]`                                                                                                     | `card`        |
+| `WIDE`                              | `["on", "off"]`                                                                                                                    | `off`         |
+| `POST_SORT`                         | `["hot", "new", "top", "rising", "controversial"]`                                                                                 | `hot`         |
+| `COMMENT_SORT`                      | `["confidence", "top", "new", "controversial", "old"]`                                                                             | `confidence`  |
+| `BLUR_SPOILER`                      | `["on", "off"]`                                                                                                                    | `off`         |
+| `SHOW_NSFW`                         | `["on", "off"]`                                                                                                                    | `off`         |
+| `BLUR_NSFW`                         | `["on", "off"]`                                                                                                                    | `off`         |
+| `USE_HLS`                           | `["on", "off"]`                                                                                                                    | `off`         |
+| `FFMPEG_VIDEO_DOWNLOADS`            | `["on", "off"]`                                                                                                                    | `off`         |
+| `HIDE_HLS_NOTIFICATION`             | `["on", "off"]`                                                                                                                    | `off`         |
+| `AUTOPLAY_VIDEOS`                   | `["on", "off"]`                                                                                                                    | `off`         |
+| `SUBSCRIPTIONS`                     | `+`-delimited list of subreddits (`sub1+sub2+sub3+...`)                                                                            | _(none)_      |
+| `HIDE_AWARDS`                       | `["on", "off"]`                                                                                                                    | `off`         |
+| `DISABLE_VISIT_REDDIT_CONFIRMATION` | `["on", "off"]`                                                                                                                    | `off`         |
+| `HIDE_SCORE`                        | `["on", "off"]`                                                                                                                    | `off`         |
+| `HIDE_SIDEBAR_AND_SUMMARY`          | `["on", "off"]`                                                                                                                    | `off`         |
+| `HIDE_BANNER`                       | `["on", "off"]`                                                                                                                    | `off`         |
+| `FIXED_NAVBAR`                      | `["on", "off"]`                                                                                                                    | `on`          |
+| `REMOVE_DEFAULT_FEEDS`              | `["on", "off"]`                                                                                                                    | `off`         |

app.json

@@ -1,5 +1,5 @@
 {
-  "name": "Redlib",
+  "name": "Redsunlib",
   "description": "Private front-end for Reddit",
   "buildpacks": [
     {
@@ -14,6 +14,9 @@
     "REDLIB_DEFAULT_THEME": {
       "required": false
     },
+    "REDLIB_DEFAULT_MASCOT": {
+      "required": false
+    },
     "REDLIB_DEFAULT_FRONT_PAGE": {
       "required": false
     },
@@ -29,13 +32,19 @@
     "REDLIB_DEFAULT_POST_SORT": {
       "required": false
     },
+    "REDLIB_DEFAULT_BLUR_SPOILER": {
+      "required": false
+    },
     "REDLIB_DEFAULT_SHOW_NSFW": {
       "required": false
     },
     "REDLIB_DEFAULT_BLUR_NSFW": {
       "required": false
     },
-    "REDLIB_USE_HLS": {
+    "REDLIB_DEFAULT_USE_HLS": {
+      "required": false
+    },
+    "REDLIB_DEFAULT_FFMPEG_VIDEO_DOWNLOADS": {
       "required": false
     },
     "REDLIB_HIDE_HLS_NOTIFICATION": {
@@ -53,17 +62,29 @@
     "REDLIB_BANNER": {
       "required": false
     },
-    "REDLIB_ROBOTS_DISABLE_INDEXING":  {
-        "required": false
+    "REDLIB_ROBOTS_DISABLE_INDEXING": {
+      "required": false
     },
     "REDLIB_DEFAULT_SUBSCRIPTIONS": {
       "required": false
     },
+    "REDLIB_DEFAULT_FILTERS": {
+      "required": false
+    },
     "REDLIB_DEFAULT_DISABLE_VISIT_REDDIT_CONFIRMATION": {
       "required": false
     },
     "REDLIB_PUSHSHIFT_FRONTEND": {
       "required": false
     },
+    "REDLIB_ENABLE_RSS": {
+      "required": false
+    },
+    "REDLIB_FULL_URL": {
+      "required": false
+    },
+    "REDLIB_DEFAULT_REMOVE_DEFAULT_FEEDS": {
+      "required": false
+    }
   }
 }

compose.dev.yaml

@@ -1,26 +1,26 @@
+# docker-compose -f docker-compose.dev.yml up -d
 version: "3.8"
 
 services:
-  web:
+  redsunlib:
     build: .
     restart: always
-    container_name: "redlib"
+    container_name: "redsunlib"
     ports:
-      - 8080:8080
+      - 8080:8080 # Specify `127.0.0.1:8080:8080` instead if using a reverse proxy
     user: nobody
     read_only: true
     security_opt:
       - no-new-privileges:true
+      # - seccomp=seccomp-redsunlib.json
     cap_drop:
       - ALL
     networks:
-      - redlib
-    security_opt:
-      - seccomp="seccomp-redlib.json"
+      - redsunlib
     healthcheck:
       test: ["CMD", "wget", "--spider", "-q", "--tries=1", "http://localhost:8080/settings"]
       interval: 5m
       timeout: 3s
 
 networks:
-  redlib:
+  redsunlib:

compose.yaml

@@ -0,0 +1,24 @@
+services:
+  redsunlib:
+    image: git.stardust.wtf/iridium/redsunlib:latest
+    restart: always
+    container_name: "redsunlib"
+    ports:
+      - 8080:8080 # Specify `127.0.0.1:8080:8080` instead if using a reverse proxy
+    user: nobody
+    read_only: true
+    security_opt:
+      - no-new-privileges:true
+      # - seccomp=seccomp-redsunlib.json
+    cap_drop:
+      - ALL
+    env_file: .env
+    networks:
+      - redsunlib
+    healthcheck:
+      test: ["CMD", "wget", "--spider", "-q", "--tries=1", "http://localhost:8080/settings"]
+      interval: 5m
+      timeout: 3s
+
+networks:
+  redsunlib:

contrib/redlib.conf

@@ -1,16 +1,19 @@
 ADDRESS=0.0.0.0
 PORT=12345
 #REDLIB_DEFAULT_THEME=default
+#REDLIB_DEFAULT_MASCOT=none
 #REDLIB_DEFAULT_FRONT_PAGE=default
 #REDLIB_DEFAULT_LAYOUT=card
 #REDLIB_DEFAULT_WIDE=off
 #REDLIB_DEFAULT_POST_SORT=hot
 #REDLIB_DEFAULT_COMMENT_SORT=confidence
+#REDLIB_DEFAULT_BLUR_SPOILER=off
 #REDLIB_DEFAULT_SHOW_NSFW=off
 #REDLIB_DEFAULT_BLUR_NSFW=off
 #REDLIB_DEFAULT_USE_HLS=off
+#REDLIB_DEFAULT_FFMPEG_VIDEO_DOWNLOADS=off
 #REDLIB_DEFAULT_HIDE_HLS_NOTIFICATION=off
 #REDLIB_DEFAULT_AUTOPLAY_VIDEOS=off
-#REDLIB_DEFAULT_SUBSCRIPTIONS=off (sub1+sub2+sub3)
+#REDLIB_DEFAULT_SUBSCRIPTIONS=(sub1+sub2+sub3)
 #REDLIB_DEFAULT_HIDE_AWARDS=off
 #REDLIB_DEFAULT_DISABLE_VISIT_REDDIT_CONFIRMATION=off

contrib/redlib.service

@@ -30,7 +30,8 @@ RestrictNamespaces=yes
 RestrictRealtime=yes
 RestrictSUIDSGID=yes
 SystemCallArchitectures=native
-SystemCallFilter=@system-service ~@privileged ~@resources
+SystemCallFilter=@system-service
+SystemCallFilter=~@privileged @resources
 UMask=0077
 
 [Install]

flake.lock

@@ -0,0 +1,98 @@
+{
+  "nodes": {
+    "crane": {
+      "locked": {
+        "lastModified": 1731974733,
+        "narHash": "sha256-enYSSZVVl15FI5p+0Y5/Ckf5DZAvXe6fBrHxyhA/njc=",
+        "owner": "ipetkov",
+        "repo": "crane",
+        "rev": "3cb338ce81076ce5e461cf77f7824476addb0e1c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ipetkov",
+        "repo": "crane",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1731890469,
+        "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "5083ec887760adfe12af64830a66807423a859a7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "crane": "crane",
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs",
+        "rust-overlay": "rust-overlay"
+      }
+    },
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1732069891,
+        "narHash": "sha256-moKx8AVJrViCSdA0e0nSsG8b1dAsObI4sRAtbqbvBY8=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "8509a51241c407d583b1963d5079585a992506e8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -0,0 +1,65 @@
+{
+  description = "Redlib: Private front-end for Reddit";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+
+    crane.url = "github:ipetkov/crane";
+
+    flake-utils.url = "github:numtide/flake-utils";
+
+    rust-overlay = {
+      url = "github:oxalica/rust-overlay";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+  };
+
+  outputs = { nixpkgs, crane, flake-utils, rust-overlay, ... }:
+    flake-utils.lib.eachSystem [ "x86_64-linux" ] (system:
+      let
+        pkgs = import nixpkgs {
+          inherit system;
+          overlays = [ (import rust-overlay) ];
+        };
+
+        inherit (pkgs) lib;
+
+        rustToolchain = pkgs.rust-bin.stable.latest.default.override {
+          targets = [ "x86_64-unknown-linux-musl" ];
+        };
+
+        craneLib = (crane.mkLib pkgs).overrideToolchain rustToolchain;
+
+
+        src = lib.cleanSourceWith {
+          src = craneLib.path ./.;
+          filter = path: type:
+            (lib.hasInfix "/templates/" path) ||
+            (lib.hasInfix "/static/" path) ||
+            (craneLib.filterCargoSources path type);
+        };
+
+        redlib = craneLib.buildPackage {
+          inherit src;
+          strictDeps = true;
+          doCheck = false;
+
+          CARGO_BUILD_TARGET = "x86_64-unknown-linux-musl";
+          CARGO_BUILD_RUSTFLAGS = "-C target-feature=+crt-static";
+        };
+      in
+      {
+        checks = {
+          my-crate = redlib;
+        };
+
+        packages.default = redlib;
+        packages.docker = pkgs.dockerTools.buildImage {
+          name = "quay.io/redlib/redlib";
+          tag = "latest";
+          created = "now";
+          copyToRoot = with pkgs.dockerTools; [ caCertificates fakeNss ];
+          config.Cmd = "${redlib}/bin/redlib";
+        };
+      });
+}

redlib.container

@@ -0,0 +1,16 @@
+[Install]
+WantedBy=default.target
+
+[Container]
+AutoUpdate=registry
+ContainerName=redlib
+DropCapability=ALL
+EnvironmentFile=.env
+HealthCmd=["wget","--spider","-q","--tries=1","http://localhost:8080/settings"]
+HealthInterval=5m
+HealthTimeout=3s
+Image=quay.io/redlib/redlib:latest
+NoNewPrivileges=true
+PublishPort=8080:8080
+ReadOnly=true
+User=nobody

scripts/load_test.py

@@ -0,0 +1,31 @@
+import requests
+from bs4 import BeautifulSoup
+from concurrent.futures import ThreadPoolExecutor
+
+base_url = "http://localhost:8080"
+
+full_path = f"{base_url}/r/politics"
+
+ctr = 0
+
+def fetch_url(url):
+    global ctr
+    response = requests.get(url)
+    ctr += 1
+    print(f"Request count: {ctr}")
+    return response
+
+while full_path:
+    response = requests.get(full_path)
+    ctr += 1
+    print(f"Request count: {ctr}")
+    soup = BeautifulSoup(response.text, 'html.parser')
+    comment_links = soup.find_all('a', class_='post_comments')
+    comment_urls = [base_url + link['href'] for link in comment_links]
+    with ThreadPoolExecutor(max_workers=10) as executor:
+        executor.map(fetch_url, comment_urls)
+    next_link = soup.find('a', accesskey='N')
+    if next_link:
+        full_path = base_url + next_link['href']
+    else:
+        break

scripts/update_hls_js.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+cd "$(dirname "$0")"
+LATEST_TAG=$(curl -s https://api.github.com/repos/video-dev/hls.js/releases/latest | jq -r '.tag_name')
+
+if [[ -z "$LATEST_TAG" || "$LATEST_TAG" == "null" ]]; then
+  echo "Failed to fetch the latest release tag from GitHub."
+  exit 1
+fi
+
+LICENSE="// @license http://www.apache.org/licenses/LICENSE-2.0 Apache-2.0
+// @source  https://github.com/video-dev/hls.js/tree/$LATEST_TAG"
+
+echo "$LICENSE" > ../static/hls.min.js
+
+curl -s https://cdn.jsdelivr.net/npm/hls.js@${LATEST_TAG}/dist/hls.min.js >> ../static/hls.min.js
+
+echo "Update complete. The latest hls.js (${LATEST_TAG}) has been saved to static/hls.min.js."

scripts/update_oauth_resources.sh

@@ -24,7 +24,7 @@ echo "// Please do not edit manually" >> "$filename"
 echo "// Filled in with real app versions" >> "$filename"
 
 # Open the array in the source file
-echo "pub static _IOS_APP_VERSION_LIST: &[&str; $ios_app_count] = &[" >> "$filename"
+echo "pub const _IOS_APP_VERSION_LIST: &[&str; $ios_app_count] = &[" >> "$filename"
 
 num=0
 
@@ -39,12 +39,12 @@ done
 echo "];" >> "$filename"
 
 # Fetch Android app versions
-page_1=$(curl -s "https://apkcombo.com/reddit/com.reddit.frontpage/old-versions/" | rg "<a class=\"ver-item\" href=\"(/reddit/com\.reddit\.frontpage/download/phone-20\d{2}\.\d+\.\d+-apk)\" rel=\"nofollow\">" -r "https://apkcombo.com\$1" | sort | uniq)
+page_1=$(curl -s "https://apkcombo.com/reddit/com.reddit.frontpage/old-versions/" | rg "<a class=\"ver-item\" href=\"(/reddit/com\.reddit\.frontpage/download/phone-20\d{2}\.\d+\.\d+-apk)\" rel=\"nofollow\">" -r "https://apkcombo.com\$1" | sort | uniq | sed 's/      //g')
 # Append with pages
-page_2=$(curl -s "https://apkcombo.com/reddit/com.reddit.frontpage/old-versions?page=2" | rg "<a class=\"ver-item\" href=\"(/reddit/com\.reddit\.frontpage/download/phone-20\d{2}\.\d+\.\d+-apk)\" rel=\"nofollow\">" -r "https://apkcombo.com\$1" | sort | uniq)
-page_3=$(curl -s "https://apkcombo.com/reddit/com.reddit.frontpage/old-versions?page=3" | rg "<a class=\"ver-item\" href=\"(/reddit/com\.reddit\.frontpage/download/phone-20\d{2}\.\d+\.\d+-apk)\" rel=\"nofollow\">" -r "https://apkcombo.com\$1" | sort | uniq)
-page_4=$(curl -s "https://apkcombo.com/reddit/com.reddit.frontpage/old-versions?page=4" | rg "<a class=\"ver-item\" href=\"(/reddit/com\.reddit\.frontpage/download/phone-20\d{2}\.\d+\.\d+-apk)\" rel=\"nofollow\">" -r "https://apkcombo.com\$1" | sort | uniq)
-page_5=$(curl -s "https://apkcombo.com/reddit/com.reddit.frontpage/old-versions?page=5" | rg "<a class=\"ver-item\" href=\"(/reddit/com\.reddit\.frontpage/download/phone-20\d{2}\.\d+\.\d+-apk)\" rel=\"nofollow\">" -r "https://apkcombo.com\$1" | sort | uniq)
+page_2=$(curl -s "https://apkcombo.com/reddit/com.reddit.frontpage/old-versions?page=2" | rg "<a class=\"ver-item\" href=\"(/reddit/com\.reddit\.frontpage/download/phone-20\d{2}\.\d+\.\d+-apk)\" rel=\"nofollow\">" -r "https://apkcombo.com\$1" | sort | uniq | sed 's/      //g')
+page_3=$(curl -s "https://apkcombo.com/reddit/com.reddit.frontpage/old-versions?page=3" | rg "<a class=\"ver-item\" href=\"(/reddit/com\.reddit\.frontpage/download/phone-20\d{2}\.\d+\.\d+-apk)\" rel=\"nofollow\">" -r "https://apkcombo.com\$1" | sort | uniq | sed 's/      //g')
+page_4=$(curl -s "https://apkcombo.com/reddit/com.reddit.frontpage/old-versions?page=4" | rg "<a class=\"ver-item\" href=\"(/reddit/com\.reddit\.frontpage/download/phone-20\d{2}\.\d+\.\d+-apk)\" rel=\"nofollow\">" -r "https://apkcombo.com\$1" | sort | uniq | sed 's/      //g')
+page_5=$(curl -s "https://apkcombo.com/reddit/com.reddit.frontpage/old-versions?page=5" | rg "<a class=\"ver-item\" href=\"(/reddit/com\.reddit\.frontpage/download/phone-20\d{2}\.\d+\.\d+-apk)\" rel=\"nofollow\">" -r "https://apkcombo.com\$1" | sort | uniq | sed 's/      //g')
 
 # Concatenate all pages
 versions="${page_1}"
@@ -63,7 +63,7 @@ android_count=$(echo "$versions" | wc -l)
 echo -e "Fetching \e[32m$android_count Android app versions...\e[0m"
 
 # Append to the source file
-echo "pub static ANDROID_APP_VERSION_LIST: &[&str; $android_count] = &[" >> "$filename"
+echo "pub const ANDROID_APP_VERSION_LIST: &[&str; $android_count] = &[" >> "$filename"
 
 num=0
 
@@ -89,7 +89,7 @@ ios_count=$(echo "$table" | wc -l)
 echo -e "Fetching \e[34m$ios_count iOS versions...\e[0m"
 
 # Append to the source file
-echo "pub static _IOS_OS_VERSION_LIST: &[&str; $ios_count] = &[" >> "$filename"
+echo "pub const _IOS_OS_VERSION_LIST: &[&str; $ios_count] = &[" >> "$filename"
 
 num=0
 

src/client.rs

@@ -1,35 +1,55 @@
+use arc_swap::ArcSwap;
 use cached::proc_macro::cached;
 use futures_lite::future::block_on;
 use futures_lite::{future::Boxed, FutureExt};
 use hyper::client::HttpConnector;
-use hyper::{body, body::Buf, client, header, Body, Client, Method, Request, Response, Uri};
+use hyper::header::HeaderValue;
+use hyper::{body, body::Buf, header, Body, Client, Method, Request, Response, Uri};
 use hyper_rustls::HttpsConnector;
 use libflate::gzip;
+use log::{debug, error, warn};
 use once_cell::sync::Lazy;
 use percent_encoding::{percent_encode, CONTROLS};
 use serde_json::Value;
 
+use std::sync::atomic::Ordering;
+use std::sync::atomic::{AtomicBool, AtomicU16};
 use std::{io, result::Result};
-use tokio::sync::RwLock;
 
 use crate::dbg_msg;
-use crate::oauth::{token_daemon, Oauth};
+use crate::oauth::{force_refresh_token, token_daemon, Oauth};
 use crate::server::RequestExt;
-use crate::utils::format_url;
+use crate::utils::{format_url, Post};
 
 const REDDIT_URL_BASE: &str = "https://oauth.reddit.com";
+const REDDIT_URL_BASE_HOST: &str = "oauth.reddit.com";
 
-pub static CLIENT: Lazy<Client<HttpsConnector<HttpConnector>>> = Lazy::new(|| {
-	let https = hyper_rustls::HttpsConnectorBuilder::new().with_native_roots().https_only().enable_http1().build();
-	client::Client::builder().build(https)
-});
+const REDDIT_SHORT_URL_BASE: &str = "https://redd.it";
+const REDDIT_SHORT_URL_BASE_HOST: &str = "redd.it";
 
-pub static OAUTH_CLIENT: Lazy<RwLock<Oauth>> = Lazy::new(|| {
+const ALTERNATIVE_REDDIT_URL_BASE: &str = "https://www.reddit.com";
+const ALTERNATIVE_REDDIT_URL_BASE_HOST: &str = "www.reddit.com";
+
+pub static HTTPS_CONNECTOR: Lazy<HttpsConnector<HttpConnector>> =
+	Lazy::new(|| hyper_rustls::HttpsConnectorBuilder::new().with_native_roots().https_only().enable_http2().build());
+
+pub static CLIENT: Lazy<Client<HttpsConnector<HttpConnector>>> = Lazy::new(|| Client::builder().build::<_, Body>(HTTPS_CONNECTOR.clone()));
+
+pub static OAUTH_CLIENT: Lazy<ArcSwap<Oauth>> = Lazy::new(|| {
 	let client = block_on(Oauth::new());
 	tokio::spawn(token_daemon());
-	RwLock::new(client)
+	ArcSwap::new(client.into())
 });
 
+pub static OAUTH_RATELIMIT_REMAINING: AtomicU16 = AtomicU16::new(99);
+
+pub static OAUTH_IS_ROLLING_OVER: AtomicBool = AtomicBool::new(false);
+
+const URL_PAIRS: [(&str, &str); 2] = [
+	(ALTERNATIVE_REDDIT_URL_BASE, ALTERNATIVE_REDDIT_URL_BASE_HOST),
+	(REDDIT_SHORT_URL_BASE, REDDIT_SHORT_URL_BASE_HOST),
+];
+
 /// Gets the canonical path for a resource on Reddit. This is accomplished by
 /// making a `HEAD` request to Reddit at the path given in `path`.
 ///
@@ -43,20 +63,42 @@ pub static OAUTH_CLIENT: Lazy<RwLock<Oauth>> = Lazy::new(|| {
 /// `Location` header. An `Err(String)` is returned if Reddit responds with a
 /// 429, or if we were unable to decode the value in the `Location` header.
 #[cached(size = 1024, time = 600, result = true)]
-pub async fn canonical_path(path: String) -> Result<Option<String>, String> {
-	let res = reddit_head(path.clone(), true).await?;
+#[async_recursion::async_recursion]
+pub async fn canonical_path(path: String, tries: i8) -> Result<Option<String>, String> {
+	if tries == 0 {
+		return Ok(None);
+	}
+
+	// for each URL pair, try the HEAD request
+	let res = {
+		// for url base and host in URL_PAIRS, try reddit_short_head(path.clone(), true, url_base, url_base_host) and if it succeeds, set res. else, res = None
+		let mut res = None;
+		for (url_base, url_base_host) in URL_PAIRS {
+			res = reddit_short_head(path.clone(), true, url_base, url_base_host).await.ok();
+			if let Some(res) = &res {
+				if !res.status().is_client_error() {
+					break;
+				}
+			}
+		}
+		res
+	};
+
+	let res = res.ok_or_else(|| "Unable to make HEAD request to Reddit.".to_string())?;
 	let status = res.status().as_u16();
+	let policy_error = res.headers().get(header::RETRY_AFTER).is_some();
 
 	match status {
-		429 => Err("Too many requests.".to_string()),
-
 		// If Reddit responds with a 2xx, then the path is already canonical.
 		200..=299 => Ok(Some(path)),
 
 		// If Reddit responds with a 301, then the path is redirected.
 		301 => match res.headers().get(header::LOCATION) {
 			Some(val) => {
-				let original = val.to_str().unwrap();
+				let Ok(original) = val.to_str() else {
+					return Err("Unable to decode Location header.".to_string());
+				};
+
 				// We need to strip the .json suffix from the original path.
 				// In addition, we want to remove share parameters.
 				// Cut it off here instead of letting it propagate all the way
@@ -69,7 +111,9 @@ pub async fn canonical_path(path: String) -> Result<Option<String>, String> {
 				// also remove all Reddit domain parts with format_url.
 				// Otherwise, it will literally redirect to Reddit.com.
 				let uri = format_url(stripped_uri);
-				Ok(Some(uri))
+
+				// Decrement tries and try again
+				canonical_path(uri, tries - 1).await
 			}
 			None => Ok(None),
 		},
@@ -78,6 +122,12 @@ pub async fn canonical_path(path: String) -> Result<Option<String>, String> {
 		// as above), return a None.
 		300..=399 => Ok(None),
 
+		// Rate limiting
+		429 => Err("Too many requests.".to_string()),
+
+		// Special condition rate limiting - https://github.com/redlib-org/redlib/issues/229
+		403 if policy_error => Err("Too many requests.".to_string()),
+
 		_ => Ok(
 			res
 				.headers()
@@ -88,12 +138,12 @@ pub async fn canonical_path(path: String) -> Result<Option<String>, String> {
 }
 
 pub async fn proxy(req: Request<Body>, format: &str) -> Result<Response<Body>, String> {
-	let mut url = format!("{}?{}", format, req.uri().query().unwrap_or_default());
+	let mut url = format!("{format}?{}", req.uri().query().unwrap_or_default());
 
 	// For each parameter in request
-	for (name, value) in req.params().iter() {
+	for (name, value) in &req.params() {
 		// Fill the parameter value in the url
-		url = url.replace(&format!("{{{}}}", name), value);
+		url = url.replace(&format!("{{{name}}}"), value);
 	}
 
 	stream(&url, &req).await
@@ -101,12 +151,12 @@ pub async fn proxy(req: Request<Body>, format: &str) -> Result<Response<Body>, S
 
 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())?;
+	let parsed_uri = url.parse::<Uri>().map_err(|_| "Couldn't parse URL".to_string())?;
 
 	// Build the hyper client from the HTTPS connector.
-	let client: client::Client<_, hyper::Body> = CLIENT.clone();
+	let client: &Lazy<Client<_, Body>> = &CLIENT;
 
-	let mut builder = Request::get(uri);
+	let mut builder = Request::get(parsed_uri);
 
 	// Copy useful headers from original request
 	for &key in &["Range", "If-Modified-Since", "Cache-Control"] {
@@ -144,57 +194,62 @@ async fn stream(url: &str, req: &Request<Body>) -> Result<Response<Body>, String
 /// Makes a GET request to Reddit at `path`. By default, this will honor HTTP
 /// 3xx codes Reddit returns and will automatically redirect.
 fn reddit_get(path: String, quarantine: bool) -> Boxed<Result<Response<Body>, String>> {
-	request(&Method::GET, path, true, quarantine)
+	request(&Method::GET, path, true, quarantine, REDDIT_URL_BASE, REDDIT_URL_BASE_HOST)
 }
 
-/// Makes a HEAD request to Reddit at `path`. This will not follow redirects.
-fn reddit_head(path: String, quarantine: bool) -> Boxed<Result<Response<Body>, String>> {
-	request(&Method::HEAD, path, false, quarantine)
+/// Makes a HEAD request to Reddit at `path, using the short URL base. This will not follow redirects.
+fn reddit_short_head(path: String, quarantine: bool, base_path: &'static str, host: &'static str) -> Boxed<Result<Response<Body>, String>> {
+	request(&Method::HEAD, path, false, quarantine, base_path, host)
 }
 
-/// Makes a request to Reddit. If `redirect` is `true`, request_with_redirect
+// /// Makes a HEAD request to Reddit at `path`. This will not follow redirects.
+// fn reddit_head(path: String, quarantine: bool) -> Boxed<Result<Response<Body>, String>> {
+// 	request(&Method::HEAD, path, false, quarantine, false)
+// }
+// Unused - reddit_head is only ever called in the context of a short URL
+
+/// Makes a request to Reddit. If `redirect` is `true`, `request_with_redirect`
 /// will recurse on the URL that Reddit provides in the Location HTTP header
 /// in its response.
-fn request(method: &'static Method, path: String, redirect: bool, quarantine: bool) -> Boxed<Result<Response<Body>, String>> {
+fn request(method: &'static Method, path: String, redirect: bool, quarantine: bool, base_path: &'static str, host: &'static str) -> Boxed<Result<Response<Body>, String>> {
 	// Build Reddit URL from path.
-	let url = format!("{}{}", REDDIT_URL_BASE, path);
+	let url = format!("{base_path}{path}");
 
 	// Construct the hyper client from the HTTPS connector.
-	let client: client::Client<_, hyper::Body> = CLIENT.clone();
+	let client: &Lazy<Client<_, Body>> = &CLIENT;
 
-	let (token, vendor_id, device_id, user_agent, loid) = {
-		let client = block_on(OAUTH_CLIENT.read());
-		(
-			client.token.clone(),
-			client.headers_map.get("Client-Vendor-Id").cloned().unwrap_or_default(),
-			client.headers_map.get("X-Reddit-Device-Id").cloned().unwrap_or_default(),
-			client.headers_map.get("User-Agent").cloned().unwrap_or_default(),
-			client.headers_map.get("x-reddit-loid").cloned().unwrap_or_default(),
-		)
-	};
 	// Build request to Reddit. When making a GET, request gzip compression.
 	// (Reddit doesn't do brotli yet.)
-	let builder = Request::builder()
-		.method(method)
-		.uri(&url)
-		.header("User-Agent", user_agent)
-		.header("Client-Vendor-Id", vendor_id)
-		.header("X-Reddit-Device-Id", device_id)
-		.header("x-reddit-loid", loid)
-		.header("Host", "oauth.reddit.com")
-		.header("Authorization", &format!("Bearer {}", token))
-		.header("Accept-Encoding", if method == Method::GET { "gzip" } else { "identity" })
-		.header("Accept-Language", "en-US,en;q=0.5")
-		.header("Connection", "keep-alive")
-		.header(
-			"Cookie",
+	let mut headers: Vec<(String, String)> = vec![
+		("Host".into(), host.into()),
+		("Accept-Encoding".into(), if method == Method::GET { "gzip".into() } else { "identity".into() }),
+		(
+			"Cookie".into(),
 			if quarantine {
-				"_options=%7B%22pref_quarantine_optin%22%3A%20true%2C%20%22pref_gated_sr_optin%22%3A%20true%7D"
+				"_options=%7B%22pref_quarantine_optin%22%3A%20true%2C%20%22pref_gated_sr_optin%22%3A%20true%7D".into()
 			} else {
-				""
+				"".into()
 			},
-		)
-		.body(Body::empty());
+		),
+	];
+
+	{
+		let client = OAUTH_CLIENT.load_full();
+		for (key, value) in client.headers_map.clone() {
+			headers.push((key, value));
+		}
+	}
+
+	// shuffle headers: https://github.com/redlib-org/redlib/issues/324
+	fastrand::shuffle(&mut headers);
+
+	let mut builder = Request::builder().method(method).uri(&url);
+
+	for (key, value) in headers {
+		builder = builder.header(key, value);
+	}
+
+	let builder = builder.body(Body::empty());
 
 	async move {
 		match builder {
@@ -206,12 +261,13 @@ fn request(method: &'static Method, path: String, redirect: bool, quarantine: bo
 						if !redirect {
 							return Ok(response);
 						};
-
+						let location_header = response.headers().get(header::LOCATION);
+						if location_header == Some(&HeaderValue::from_static(ALTERNATIVE_REDDIT_URL_BASE)) {
+							return Err("Reddit response was invalid".to_string());
+						}
 						return request(
 							method,
-							response
-								.headers()
-								.get(header::LOCATION)
+							location_header
 								.map(|val| {
 									// We need to make adjustments to the URI
 									// we get back from Reddit. Namely, we
@@ -224,13 +280,19 @@ fn request(method: &'static Method, path: String, redirect: bool, quarantine: bo
 									//     required.
 									//
 									//     2. Percent-encode the path.
-									let new_path = percent_encode(val.as_bytes(), CONTROLS).to_string().trim_start_matches(REDDIT_URL_BASE).to_string();
-									format!("{}{}raw_json=1", new_path, if new_path.contains('?') { "&" } else { "?" })
+									let new_path = percent_encode(val.as_bytes(), CONTROLS)
+										.to_string()
+										.trim_start_matches(REDDIT_URL_BASE)
+										.trim_start_matches(ALTERNATIVE_REDDIT_URL_BASE)
+										.to_string();
+									format!("{new_path}{}raw_json=1", if new_path.contains('?') { "&" } else { "?" })
 								})
 								.unwrap_or_default()
 								.to_string(),
 							true,
 							quarantine,
+							base_path,
+							host,
 						)
 						.await;
 					};
@@ -283,7 +345,7 @@ fn request(method: &'static Method, path: String, redirect: bool, quarantine: bo
 					}
 				}
 				Err(e) => {
-					dbg_msg!("{} {}: {}", method, path, e);
+					dbg_msg!("{method} {REDDIT_URL_BASE}{path}: {}", e);
 
 					Err(e.to_string())
 				}
@@ -298,59 +360,179 @@ fn request(method: &'static Method, path: String, redirect: bool, quarantine: bo
 #[cached(size = 100, time = 30, result = true)]
 pub async fn json(path: String, quarantine: bool) -> Result<Value, String> {
 	// Closure to quickly build errors
-	let err = |msg: &str, e: String| -> Result<Value, String> {
+	let err = |msg: &str, e: String, path: String| -> Result<Value, String> {
 		// eprintln!("{} - {}: {}", url, msg, e);
-		Err(format!("{}: {}", msg, e))
+		Err(format!("{msg}: {e} | {path}"))
 	};
 
+	// First, handle rolling over the OAUTH_CLIENT if need be.
+	let current_rate_limit = OAUTH_RATELIMIT_REMAINING.load(Ordering::SeqCst);
+	let is_rolling_over = OAUTH_IS_ROLLING_OVER.load(Ordering::SeqCst);
+	if current_rate_limit < 10 && !is_rolling_over {
+		warn!("Rate limit {current_rate_limit} is low. Spawning force_refresh_token()");
+		tokio::spawn(force_refresh_token());
+	}
+	OAUTH_RATELIMIT_REMAINING.fetch_sub(1, Ordering::SeqCst);
+
 	// Fetch the url...
 	match reddit_get(path.clone(), quarantine).await {
 		Ok(response) => {
 			let status = response.status();
 
+			let reset: Option<String> = if let (Some(remaining), Some(reset), Some(used)) = (
+				response.headers().get("x-ratelimit-remaining").and_then(|val| val.to_str().ok().map(|s| s.to_string())),
+				response.headers().get("x-ratelimit-reset").and_then(|val| val.to_str().ok().map(|s| s.to_string())),
+				response.headers().get("x-ratelimit-used").and_then(|val| val.to_str().ok().map(|s| s.to_string())),
+			) {
+				debug!(
+					"Ratelimit remaining: Header says {remaining}, we have {current_rate_limit}. Resets in {reset}. Rollover: {}. Ratelimit used: {used}",
+					if is_rolling_over { "yes" } else { "no" },
+				);
+
+				// If can parse remaining as a float, round to a u16 and save
+				if let Ok(val) = remaining.parse::<f32>() {
+					OAUTH_RATELIMIT_REMAINING.store(val.round() as u16, Ordering::SeqCst);
+				}
+
+				Some(reset)
+			} else {
+				None
+			};
+
 			// asynchronously aggregate the chunks of the body
 			match hyper::body::aggregate(response).await {
 				Ok(body) => {
+					let has_remaining = body.has_remaining();
+
+					if !has_remaining {
+						// Rate limited, so spawn a force_refresh_token()
+						tokio::spawn(force_refresh_token());
+						return match reset {
+							Some(val) => Err(format!(
+								"Reddit rate limit exceeded. Try refreshing in a few seconds.\
+								 Rate limit will reset in: {val}"
+							)),
+							None => Err("Reddit rate limit exceeded".to_string()),
+						};
+					}
+
 					// Parse the response from Reddit as JSON
 					match serde_json::from_reader(body.reader()) {
 						Ok(value) => {
 							let json: Value = value;
+
+							// If user is suspended
+							if let Some(data) = json.get("data") {
+								if let Some(is_suspended) = data.get("is_suspended").and_then(Value::as_bool) {
+									if is_suspended {
+										return Err("suspended".into());
+									}
+								}
+							}
+
 							// 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", REDDIT_URL_BASE, path);
-												"Error parsing reddit error"
-											})
-										})
-										.to_string(),
-								)
+								// OAuth token has expired; http status 401
+								if json["message"] == "Unauthorized" {
+									error!("Forcing a token refresh");
+									let () = force_refresh_token().await;
+									return Err("OAuth token has expired. Please refresh the page!".to_string());
+								}
+
+								// Handle quarantined
+								if json["reason"] == "quarantined" {
+									return Err("quarantined".into());
+								}
+								// Handle gated
+								if json["reason"] == "gated" {
+									return Err("gated".into());
+								}
+								// Handle private subs
+								if json["reason"] == "private" {
+									return Err("private".into());
+								}
+								// Handle banned subs
+								if json["reason"] == "banned" {
+									return Err("banned".into());
+								}
+
+								Err(format!("Reddit error {} \"{}\": {} | {path}", json["error"], json["reason"], json["message"]))
 							} else {
 								Ok(json)
 							}
 						}
 						Err(e) => {
+							error!("Got an invalid response from reddit {e}. Status code: {status}");
 							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("Failed to parse page JSON data", e.to_string(), path)
 							}
 						}
 					}
 				}
-				Err(e) => err("Failed receiving body from Reddit", e.to_string()),
+				Err(e) => err("Failed receiving body from Reddit", e.to_string(), path),
 			}
 		}
-		Err(e) => err("Couldn't send request to Reddit", e),
+		Err(e) => err("Couldn't send request to Reddit", e, path),
 	}
 }
 
+async fn self_check(sub: &str) -> Result<(), String> {
+	let query = format!("/r/{sub}/hot.json?&raw_json=1");
+
+	match Post::fetch(&query, true).await {
+		Ok(_) => Ok(()),
+		Err(e) => Err(e),
+	}
+}
+
+pub async fn rate_limit_check() -> Result<(), String> {
+	// First, check a subreddit.
+	self_check("reddit").await?;
+	// This will reduce the rate limit to 99. Assert this check.
+	if OAUTH_RATELIMIT_REMAINING.load(Ordering::SeqCst) != 99 {
+		return Err(format!("Rate limit check failed: expected 99, got {}", OAUTH_RATELIMIT_REMAINING.load(Ordering::SeqCst)));
+	}
+	// Now, we switch out the OAuth client.
+	// This checks for the IP rate limit association.
+	force_refresh_token().await;
+	// Now, check a new sub to break cache.
+	self_check("rust").await?;
+	// Again, assert the rate limit check.
+	if OAUTH_RATELIMIT_REMAINING.load(Ordering::SeqCst) != 99 {
+		return Err(format!("Rate limit check failed: expected 99, got {}", OAUTH_RATELIMIT_REMAINING.load(Ordering::SeqCst)));
+	}
+
+	Ok(())
+}
+
+#[cfg(test)]
+use {crate::config::get_setting, sealed_test::prelude::*};
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_rate_limit_check() {
+	rate_limit_check().await.unwrap();
+}
+
+#[test]
+#[sealed_test(env = [("REDLIB_DEFAULT_SUBSCRIPTIONS", "rust")])]
+fn test_default_subscriptions() {
+	tokio::runtime::Builder::new_multi_thread().enable_all().build().unwrap().block_on(async {
+		let subscriptions = get_setting("REDLIB_DEFAULT_SUBSCRIPTIONS");
+		assert!(subscriptions.is_some());
+
+		// check rate limit
+		rate_limit_check().await.unwrap();
+	});
+}
+
+#[cfg(test)]
+const POPULAR_URL: &str = "/r/popular/hot.json?&raw_json=1&geo_filter=GLOBAL";
+
 #[tokio::test(flavor = "multi_thread")]
 async fn test_localization_popular() {
-	let val = json("/r/popular/hot.json?&raw_json=1&geo_filter=GLOBAL".to_string(), false).await.unwrap();
+	let val = json(POPULAR_URL.to_string(), false).await.unwrap();
 	assert_eq!("GLOBAL", val["data"]["geo_filter"].as_str().unwrap());
 }
 
@@ -358,13 +540,28 @@ async fn test_localization_popular() {
 async fn test_obfuscated_share_link() {
 	let share_link = "/r/rust/s/kPgq8WNHRK".into();
 	// Correct link without share parameters
-	let canonical_link = "/r/rust/comments/18t5968/why_use_tuple_struct_over_standard_struct/kfbqlbc".into();
-	assert_eq!(canonical_path(share_link).await, Ok(Some(canonical_link)));
+	let canonical_link = "/r/rust/comments/18t5968/why_use_tuple_struct_over_standard_struct/kfbqlbc/".into();
+	assert_eq!(canonical_path(share_link, 3).await, Ok(Some(canonical_link)));
 }
 
 #[tokio::test(flavor = "multi_thread")]
-async fn test_share_link_strip_json() {
-	let link = "/17krzvz".into();
-	let canonical_link = "/r/nfl/comments/17krzvz/rapoport_sources_former_no_2_overall_pick/".into();
-	assert_eq!(canonical_path(link).await, Ok(Some(canonical_link)));
+async fn test_private_sub() {
+	let link = json("/r/suicide/about.json?raw_json=1".into(), true).await;
+	assert!(link.is_err());
+	assert_eq!(link, Err("private".into()));
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_banned_sub() {
+	let link = json("/r/aaa/about.json?raw_json=1".into(), true).await;
+	assert!(link.is_err());
+	assert_eq!(link, Err("banned".into()));
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_gated_sub() {
+	// quarantine to false to specifically catch when we _don't_ catch it
+	let link = json("/r/drugs/about.json?raw_json=1".into(), false).await;
+	assert!(link.is_err());
+	assert_eq!(link, Err("gated".into()));
 }

src/config.rs

@@ -9,15 +9,15 @@ use std::{env::var, fs::read_to_string};
 // first request) and contains the instance settings.
 pub static CONFIG: Lazy<Config> = Lazy::new(Config::load);
 
-// This serves as the frontend for the Pushshift API - on removed comments, this URL will
-// be the base of a link, to display removed content (on another site).
-pub const DEFAULT_PUSHSHIFT_FRONTEND: &str = "www.unddit.com";
+// This serves as the frontend for an archival API - on removed comments, this URL
+// will be the base of a link, to display removed content (on another site).
+pub const DEFAULT_PUSHSHIFT_FRONTEND: &str = "undelete.pullpush.io";
 
 /// Stores the configuration parsed from the environment variables and the
 /// config file. `Config::Default()` contains None for each setting.
 /// When adding more config settings, add it to `Config::load`,
 /// `get_setting_from_config`, both below, as well as
-/// instance_info::InstanceInfo.to_string(), README.md and app.json.
+/// `instance_info::InstanceInfo.to_string`(), README.md and app.json.
 #[derive(Default, Serialize, Deserialize, Clone, Debug)]
 pub struct Config {
 	#[serde(rename = "REDLIB_SFW_ONLY")]
@@ -28,6 +28,10 @@ pub struct Config {
 	#[serde(alias = "LIBREDDIT_DEFAULT_THEME")]
 	pub(crate) default_theme: Option<String>,
 
+	#[serde(rename = "REDLIB_DEFAULT_MASCOT")]
+	#[serde(alias = "LIBREDDIT_DEFAULT_MASCOT")]
+	pub(crate) default_mascot: Option<String>,
+
 	#[serde(rename = "REDLIB_DEFAULT_FRONT_PAGE")]
 	#[serde(alias = "LIBREDDIT_DEFAULT_FRONT_PAGE")]
 	pub(crate) default_front_page: Option<String>,
@@ -48,6 +52,10 @@ pub struct Config {
 	#[serde(alias = "LIBREDDIT_DEFAULT_POST_SORT")]
 	pub(crate) default_post_sort: Option<String>,
 
+	#[serde(rename = "REDLIB_DEFAULT_BLUR_SPOILER")]
+	#[serde(alias = "LIBREDDIT_DEFAULT_BLUR_SPOILER")]
+	pub(crate) default_blur_spoiler: Option<String>,
+
 	#[serde(rename = "REDLIB_DEFAULT_SHOW_NSFW")]
 	#[serde(alias = "LIBREDDIT_DEFAULT_SHOW_NSFW")]
 	pub(crate) default_show_nsfw: Option<String>,
@@ -60,6 +68,10 @@ pub struct Config {
 	#[serde(alias = "LIBREDDIT_DEFAULT_USE_HLS")]
 	pub(crate) default_use_hls: Option<String>,
 
+	#[serde(rename = "REDLIB_DEFAULT_FFMPEG_VIDEO_DOWNLOADS")]
+	#[serde(alias = "LIBREDDIT_DEFAULT_FFMPEG_VIDEO_DOWNLOADS")]
+	pub(crate) default_ffmpeg_video_downloads: Option<String>,
+
 	#[serde(rename = "REDLIB_DEFAULT_HIDE_HLS_NOTIFICATION")]
 	#[serde(alias = "LIBREDDIT_DEFAULT_HIDE_HLS_NOTIFICATION")]
 	pub(crate) default_hide_hls_notification: Option<String>,
@@ -68,6 +80,14 @@ pub struct Config {
 	#[serde(alias = "LIBREDDIT_DEFAULT_HIDE_AWARDS")]
 	pub(crate) default_hide_awards: Option<String>,
 
+	#[serde(rename = "REDLIB_DEFAULT_HIDE_SIDEBAR_AND_SUMMARY")]
+	#[serde(alias = "LIBREDDIT_DEFAULT_HIDE_SIDEBAR_AND_SUMMARY")]
+	pub(crate) default_hide_sidebar_and_summary: Option<String>,
+
+	#[serde(rename = "REDLIB_DEFAULT_HIDE_BANNER")]
+	#[serde(alias = "LIBREDDIT_DEFAULT_HIDE_BANNER")]
+	pub(crate) default_hide_banner: Option<String>,
+
 	#[serde(rename = "REDLIB_DEFAULT_HIDE_SCORE")]
 	#[serde(alias = "LIBREDDIT_DEFAULT_HIDE_SCORE")]
 	pub(crate) default_hide_score: Option<String>,
@@ -76,6 +96,14 @@ pub struct Config {
 	#[serde(alias = "LIBREDDIT_DEFAULT_SUBSCRIPTIONS")]
 	pub(crate) default_subscriptions: Option<String>,
 
+	#[serde(rename = "REDLIB_DEFAULT_FILTERS")]
+	#[serde(alias = "LIBREDDIT_DEFAULT_FILTERS")]
+	pub(crate) default_filters: Option<String>,
+
+	#[serde(rename = "REDLIB_DEFAULT_QUICKLIST")]
+	#[serde(alias = "LIBREDDIT_DEFAULT_QUICKLIST")]
+	pub(crate) default_quicklist: Option<String>,
+
 	#[serde(rename = "REDLIB_DEFAULT_DISABLE_VISIT_REDDIT_CONFIRMATION")]
 	#[serde(alias = "LIBREDDIT_DEFAULT_DISABLE_VISIT_REDDIT_CONFIRMATION")]
 	pub(crate) default_disable_visit_reddit_confirmation: Option<String>,
@@ -91,6 +119,15 @@ pub struct Config {
 	#[serde(rename = "REDLIB_PUSHSHIFT_FRONTEND")]
 	#[serde(alias = "LIBREDDIT_PUSHSHIFT_FRONTEND")]
 	pub(crate) pushshift: Option<String>,
+
+	#[serde(rename = "REDLIB_ENABLE_RSS")]
+	pub(crate) enable_rss: Option<String>,
+
+	#[serde(rename = "REDLIB_FULL_URL")]
+	pub(crate) full_url: Option<String>,
+
+	#[serde(rename = "REDLIB_DEFAULT_REMOVE_DEFAULT_FEEDS")]
+	pub(crate) default_remove_default_feeds: Option<String>,
 }
 
 impl Config {
@@ -103,7 +140,7 @@ impl Config {
 			new_file.ok().and_then(|new_file| toml::from_str::<Self>(&new_file).ok())
 		};
 
-		let config = load_config("redlib.toml").or(load_config("libreddit.toml")).unwrap_or_default();
+		let config = load_config("redlib.toml").or_else(|| load_config("libreddit.toml")).unwrap_or_default();
 
 		// This function defines the order of preference - first check for
 		// environment variables with "REDLIB", then check the legacy LIBREDDIT
@@ -112,27 +149,37 @@ impl Config {
 			// Return the first non-`None` value
 			// If all are `None`, return `None`
 			let legacy_key = key.replace("REDLIB_", "LIBREDDIT_");
-			var(key).ok().or(var(legacy_key).ok()).or(get_setting_from_config(key, &config))
+			var(key).ok().or_else(|| var(legacy_key).ok()).or_else(|| get_setting_from_config(key, &config))
 		};
 		Self {
 			sfw_only: parse("REDLIB_SFW_ONLY"),
 			default_theme: parse("REDLIB_DEFAULT_THEME"),
+			default_mascot: parse("REDLIB_DEFAULT_MASCOT"),
 			default_front_page: parse("REDLIB_DEFAULT_FRONT_PAGE"),
 			default_layout: parse("REDLIB_DEFAULT_LAYOUT"),
 			default_post_sort: parse("REDLIB_DEFAULT_POST_SORT"),
 			default_wide: parse("REDLIB_DEFAULT_WIDE"),
 			default_comment_sort: parse("REDLIB_DEFAULT_COMMENT_SORT"),
+			default_blur_spoiler: parse("REDLIB_DEFAULT_BLUR_SPOILER"),
 			default_show_nsfw: parse("REDLIB_DEFAULT_SHOW_NSFW"),
 			default_blur_nsfw: parse("REDLIB_DEFAULT_BLUR_NSFW"),
 			default_use_hls: parse("REDLIB_DEFAULT_USE_HLS"),
-			default_hide_hls_notification: parse("REDLIB_DEFAULT_HIDE_HLS"),
+			default_ffmpeg_video_downloads: parse("REDLIB_DEFAULT_FFMPEG_VIDEO_DOWNLOADS"),
+			default_hide_hls_notification: parse("REDLIB_DEFAULT_HIDE_HLS_NOTIFICATION"),
 			default_hide_awards: parse("REDLIB_DEFAULT_HIDE_AWARDS"),
+			default_hide_sidebar_and_summary: parse("REDLIB_DEFAULT_HIDE_SIDEBAR_AND_SUMMARY"),
+			default_hide_banner: parse("REDLIB_DEFAULT_HIDE_BANNER"),
 			default_hide_score: parse("REDLIB_DEFAULT_HIDE_SCORE"),
 			default_subscriptions: parse("REDLIB_DEFAULT_SUBSCRIPTIONS"),
+			default_filters: parse("REDLIB_DEFAULT_FILTERS"),
+			default_quicklist: parse("REDLIB_DEFAULT_QUICKLIST"),
 			default_disable_visit_reddit_confirmation: parse("REDLIB_DEFAULT_DISABLE_VISIT_REDDIT_CONFIRMATION"),
 			banner: parse("REDLIB_BANNER"),
 			robots_disable_indexing: parse("REDLIB_ROBOTS_DISABLE_INDEXING"),
 			pushshift: parse("REDLIB_PUSHSHIFT_FRONTEND"),
+			enable_rss: parse("REDLIB_ENABLE_RSS"),
+			full_url: parse("REDLIB_FULL_URL"),
+			default_remove_default_feeds: parse("REDLIB_DEFAULT_REMOVE_DEFAULT_FEEDS"),
 		}
 	}
 }
@@ -141,22 +188,32 @@ fn get_setting_from_config(name: &str, config: &Config) -> Option<String> {
 	match name {
 		"REDLIB_SFW_ONLY" => config.sfw_only.clone(),
 		"REDLIB_DEFAULT_THEME" => config.default_theme.clone(),
+		"REDLIB_DEFAULT_MASCOT" => config.default_mascot.clone(),
 		"REDLIB_DEFAULT_FRONT_PAGE" => config.default_front_page.clone(),
 		"REDLIB_DEFAULT_LAYOUT" => config.default_layout.clone(),
 		"REDLIB_DEFAULT_COMMENT_SORT" => config.default_comment_sort.clone(),
 		"REDLIB_DEFAULT_POST_SORT" => config.default_post_sort.clone(),
+		"REDLIB_DEFAULT_BLUR_SPOILER" => config.default_blur_spoiler.clone(),
 		"REDLIB_DEFAULT_SHOW_NSFW" => config.default_show_nsfw.clone(),
 		"REDLIB_DEFAULT_BLUR_NSFW" => config.default_blur_nsfw.clone(),
 		"REDLIB_DEFAULT_USE_HLS" => config.default_use_hls.clone(),
+		"REDLIB_DEFAULT_FFMPEG_VIDEO_DOWNLOADS" => config.default_ffmpeg_video_downloads.clone(),
 		"REDLIB_DEFAULT_HIDE_HLS_NOTIFICATION" => config.default_hide_hls_notification.clone(),
 		"REDLIB_DEFAULT_WIDE" => config.default_wide.clone(),
 		"REDLIB_DEFAULT_HIDE_AWARDS" => config.default_hide_awards.clone(),
+		"REDLIB_DEFAULT_HIDE_SIDEBAR_AND_SUMMARY" => config.default_hide_sidebar_and_summary.clone(),
+		"REDLIB_DEFAULT_HIDE_BANNER" => config.default_hide_banner.clone(),
 		"REDLIB_DEFAULT_HIDE_SCORE" => config.default_hide_score.clone(),
 		"REDLIB_DEFAULT_SUBSCRIPTIONS" => config.default_subscriptions.clone(),
+		"REDLIB_DEFAULT_FILTERS" => config.default_filters.clone(),
+		"REDLIB_DEFAULT_QUICKLIST" => config.default_quicklist.clone(),
 		"REDLIB_DEFAULT_DISABLE_VISIT_REDDIT_CONFIRMATION" => config.default_disable_visit_reddit_confirmation.clone(),
 		"REDLIB_BANNER" => config.banner.clone(),
 		"REDLIB_ROBOTS_DISABLE_INDEXING" => config.robots_disable_indexing.clone(),
 		"REDLIB_PUSHSHIFT_FRONTEND" => config.pushshift.clone(),
+		"REDLIB_ENABLE_RSS" => config.enable_rss.clone(),
+		"REDLIB_FULL_URL" => config.full_url.clone(),
+		"REDLIB_DEFAULT_REMOVE_DEFAULT_FEEDS" => config.default_remove_default_feeds.clone(),
 		_ => None,
 	}
 }
@@ -225,6 +282,18 @@ fn test_default_subscriptions() {
 	assert_eq!(get_setting("REDLIB_DEFAULT_SUBSCRIPTIONS"), Some("news+bestof".into()));
 }
 
+#[test]
+#[sealed_test(env = [("REDLIB_DEFAULT_FILTERS", "news+bestof")])]
+fn test_default_filters() {
+	assert_eq!(get_setting("REDLIB_DEFAULT_FILTERS"), Some("news+bestof".into()));
+}
+
+#[test]
+#[sealed_test(env = [("REDLIB_DEFAULT_QUICKLIST", "news+popular")])]
+fn test_default_quicklist() {
+	assert_eq!(get_setting("REDLIB_DEFAULT_QUICKLIST"), Some("news+popular".into()));
+}
+
 #[test]
 #[sealed_test]
 fn test_pushshift() {

src/duplicates.rs

@@ -5,21 +5,21 @@ use crate::server::RequestExt;
 use crate::subreddit::{can_access_quarantine, quarantine};
 use crate::utils::{error, filter_posts, get_filters, nsfw_landing, parse_post, template, Post, Preferences};
 
-use askama::Template;
 use hyper::{Body, Request, Response};
+use rinja::Template;
 use serde_json::Value;
 use std::borrow::ToOwned;
 use std::collections::HashSet;
 use std::vec::Vec;
 
-/// DuplicatesParams contains the parameters in the URL.
+/// `DuplicatesParams` contains the parameters in the URL.
 struct DuplicatesParams {
 	before: String,
 	after: String,
 	sort: String,
 }
 
-/// DuplicatesTemplate defines an Askama template for rendering duplicate
+/// `DuplicatesTemplate` defines an Askama template for rendering duplicate
 /// posts.
 #[derive(Template)]
 #[template(path = "duplicates.html")]
@@ -59,7 +59,7 @@ pub async fn item(req: Request<Body>) -> Result<Response<Body>, String> {
 
 	// Log the request in debugging mode
 	#[cfg(debug_assertions)]
-	dbg!(req.param("id").unwrap_or_default());
+	req.param("id").unwrap_or_default();
 
 	// Send the GET, and await JSON.
 	match json(path, quarantined).await {
@@ -151,7 +151,7 @@ pub async fn item(req: Request<Body>) -> Result<Response<Body>, String> {
 				}
 
 				if have_after {
-					before = "t3_".to_owned();
+					"t3_".clone_into(&mut before);
 					before.push_str(&duplicates[0].id);
 				}
 
@@ -161,7 +161,7 @@ pub async fn item(req: Request<Body>) -> Result<Response<Body>, String> {
 				if have_before {
 					// The next batch will need to start from one after the
 					// last post in the current batch.
-					after = "t3_".to_owned();
+					"t3_".clone_into(&mut after);
 					after.push_str(&duplicates[l - 1].id);
 
 					// Here is where things get terrible. Notice that we
@@ -182,14 +182,14 @@ pub async fn item(req: Request<Body>) -> Result<Response<Body>, String> {
 					match json(new_path, true).await {
 						Ok(response) => {
 							if !response[1]["data"]["children"].as_array().unwrap_or(&Vec::new()).is_empty() {
-								before = "t3_".to_owned();
+								"t3_".clone_into(&mut before);
 								before.push_str(&duplicates[0].id);
 							}
 						}
 						Err(msg) => {
 							// Abort entirely if we couldn't get the previous
 							// batch.
-							return error(req, msg).await;
+							return error(req, &msg).await;
 						}
 					}
 				} else {
@@ -197,7 +197,7 @@ pub async fn item(req: Request<Body>) -> Result<Response<Body>, String> {
 				}
 			}
 
-			template(DuplicatesTemplate {
+			Ok(template(&DuplicatesTemplate {
 				params: DuplicatesParams { before, after, sort },
 				post,
 				duplicates,
@@ -205,28 +205,28 @@ pub async fn item(req: Request<Body>) -> Result<Response<Body>, String> {
 				url: req_url,
 				num_posts_filtered,
 				all_posts_filtered,
-			})
+			}))
 		}
 
 		// Process error.
 		Err(msg) => {
 			if msg == "quarantined" || msg == "gated" {
 				let sub = req.param("sub").unwrap_or_default();
-				quarantine(req, sub, msg)
+				Ok(quarantine(&req, sub, &msg))
 			} else {
-				error(req, msg).await
+				error(req, &msg).await
 			}
 		}
 	}
 }
 
 // DUPLICATES
-async fn parse_duplicates(json: &serde_json::Value, filters: &HashSet<String>) -> (Vec<Post>, u64, bool) {
+async fn parse_duplicates(json: &Value, filters: &HashSet<String>) -> (Vec<Post>, u64, bool) {
 	let post_duplicates: &Vec<Value> = &json["data"]["children"].as_array().map_or(Vec::new(), ToOwned::to_owned);
 	let mut duplicates: Vec<Post> = Vec::new();
 
 	// Process each post and place them in the Vec<Post>.
-	for val in post_duplicates.iter() {
+	for val in post_duplicates {
 		let post: Post = parse_post(val).await;
 		duplicates.push(post);
 	}

src/instance_info.rs

@@ -3,10 +3,10 @@ use crate::{
 	server::RequestExt,
 	utils::{ErrorTemplate, Preferences},
 };
-use askama::Template;
 use build_html::{Container, Html, HtmlContainer, Table};
 use hyper::{http::Error, Body, Request, Response};
 use once_cell::sync::Lazy;
+use rinja::Template;
 use serde::{Deserialize, Serialize};
 use time::OffsetDateTime;
 
@@ -24,7 +24,7 @@ pub async fn instance_info(req: Request<Body>) -> Result<Response<Body>, String>
 		"yaml" | "yml" => info_yaml(),
 		"txt" => info_txt(),
 		"json" => info_json(),
-		"html" | "" => info_html(req),
+		"html" | "" => info_html(&req),
 		_ => {
 			let error = ErrorTemplate {
 				msg: "Error: Invalid info extension".into(),
@@ -68,13 +68,13 @@ fn info_txt() -> Result<Response<Body>, Error> {
 	Response::builder()
 		.status(200)
 		.header("content-type", "text/plain")
-		.body(Body::from(INSTANCE_INFO.to_string(StringType::Raw)))
+		.body(Body::from(INSTANCE_INFO.to_string(&StringType::Raw)))
 }
-fn info_html(req: Request<Body>) -> Result<Response<Body>, Error> {
+fn info_html(req: &Request<Body>) -> Result<Response<Body>, Error> {
 	let message = MessageTemplate {
 		title: String::from("Instance information"),
-		body: INSTANCE_INFO.to_string(StringType::Html),
-		prefs: Preferences::new(&req),
+		body: INSTANCE_INFO.to_string(&StringType::Html),
+		prefs: Preferences::new(req),
 		url: req.uri().to_string(),
 	}
 	.render()
@@ -85,7 +85,7 @@ fn info_html(req: Request<Body>) -> Result<Response<Body>, Error> {
 pub struct InstanceInfo {
 	package_name: String,
 	crate_version: String,
-	git_commit: String,
+	pub git_commit: String,
 	deploy_date: String,
 	compile_mode: String,
 	deploy_unix_ts: i64,
@@ -109,7 +109,7 @@ impl InstanceInfo {
 	}
 	fn to_table(&self) -> String {
 		let mut container = Container::default();
-		let convert = |o: &Option<String>| -> String { o.clone().unwrap_or("<span class=\"unset\"><i>Unset</i></span>".to_owned()) };
+		let convert = |o: &Option<String>| -> String { o.clone().unwrap_or_else(|| "<span class=\"unset\"><i>Unset</i></span>".to_owned()) };
 		if let Some(banner) = &self.config.banner {
 			container.add_header(3, "Instance banner");
 			container.add_raw("<br />");
@@ -126,6 +126,9 @@ impl InstanceInfo {
 				["Compile mode", &self.compile_mode],
 				["SFW only", &convert(&self.config.sfw_only)],
 				["Pushshift frontend", &convert(&self.config.pushshift)],
+				["RSS enabled", &convert(&self.config.enable_rss)],
+				["Full URL", &convert(&self.config.full_url)],
+				["Remove default feeds", &convert(&self.config.default_remove_default_feeds)],
 				//TODO: fallback to crate::config::DEFAULT_PUSHSHIFT_FRONTEND
 			])
 			.with_header_row(["Settings"]),
@@ -136,22 +139,27 @@ impl InstanceInfo {
 				["Hide awards", &convert(&self.config.default_hide_awards)],
 				["Hide score", &convert(&self.config.default_hide_score)],
 				["Theme", &convert(&self.config.default_theme)],
+				["Mascot", &convert(&self.config.default_mascot)],
 				["Front page", &convert(&self.config.default_front_page)],
 				["Layout", &convert(&self.config.default_layout)],
 				["Wide", &convert(&self.config.default_wide)],
 				["Comment sort", &convert(&self.config.default_comment_sort)],
 				["Post sort", &convert(&self.config.default_post_sort)],
+				["Blur Spoiler", &convert(&self.config.default_blur_spoiler)],
 				["Show NSFW", &convert(&self.config.default_show_nsfw)],
 				["Blur NSFW", &convert(&self.config.default_blur_nsfw)],
 				["Use HLS", &convert(&self.config.default_use_hls)],
+				["Use FFmpeg", &convert(&self.config.default_ffmpeg_video_downloads)],
 				["Hide HLS notification", &convert(&self.config.default_hide_hls_notification)],
 				["Subscriptions", &convert(&self.config.default_subscriptions)],
+				["Filters", &convert(&self.config.default_filters)],
+				["Quick Access Feeds", &convert(&self.config.default_quicklist)],
 			])
 			.with_header_row(["Default preferences"]),
 		);
 		container.to_html_string().replace("<th>", "<th colspan=\"2\">")
 	}
-	fn to_string(&self, string_type: StringType) -> String {
+	fn to_string(&self, string_type: &StringType) -> String {
 		match string_type {
 			StringType::Raw => {
 				format!(
@@ -163,21 +171,29 @@ impl InstanceInfo {
                 Compile mode: {}\n
 				SFW only: {:?}\n
 				Pushshift frontend: {:?}\n
+				RSS enabled: {:?}\n
+				Full URL: {:?}\n
+				Remove default feeds: {:?}\n
                 Config:\n
                     Banner: {:?}\n
                     Hide awards: {:?}\n
                     Hide score: {:?}\n
                     Default theme: {:?}\n
+                    Default mascot: {:?}\n
                     Default front page: {:?}\n
                     Default layout: {:?}\n
                     Default wide: {:?}\n
                     Default comment sort: {:?}\n
                     Default post sort: {:?}\n
+					Default blur Spoiler: {:?}\n
                     Default show NSFW: {:?}\n
                     Default blur NSFW: {:?}\n
                     Default use HLS: {:?}\n
+                    Default use FFmpeg: {:?}\n
                     Default hide HLS notification: {:?}\n
-                    Default subscriptions: {:?}\n",
+                    Default subscriptions: {:?}\n
+                    Default filters: {:?}\n
+					Default quicklist: {:?}\n",
 					self.package_name,
 					self.crate_version,
 					self.git_commit,
@@ -185,21 +201,29 @@ impl InstanceInfo {
 					self.deploy_unix_ts,
 					self.compile_mode,
 					self.config.sfw_only,
+					self.config.enable_rss,
+					self.config.full_url,
+					self.config.default_remove_default_feeds,
 					self.config.pushshift,
 					self.config.banner,
 					self.config.default_hide_awards,
 					self.config.default_hide_score,
 					self.config.default_theme,
+					self.config.default_mascot,
 					self.config.default_front_page,
 					self.config.default_layout,
 					self.config.default_wide,
 					self.config.default_comment_sort,
 					self.config.default_post_sort,
+					self.config.default_blur_spoiler,
 					self.config.default_show_nsfw,
 					self.config.default_blur_nsfw,
 					self.config.default_use_hls,
+					self.config.default_ffmpeg_video_downloads,
 					self.config.default_hide_hls_notification,
 					self.config.default_subscriptions,
+					self.config.default_filters,
+					self.config.default_quicklist,
 				)
 			}
 			StringType::Html => self.to_table(),

src/lib.rs

@@ -0,0 +1,13 @@
+pub mod client;
+pub mod config;
+pub mod duplicates;
+pub mod instance_info;
+pub mod oauth;
+pub mod oauth_resources;
+pub mod post;
+pub mod search;
+pub mod server;
+pub mod settings;
+pub mod subreddit;
+pub mod user;
+pub mod utils;

src/main.rs

@@ -2,35 +2,21 @@
 #![forbid(unsafe_code)]
 #![allow(clippy::cmp_owned)]
 
-// Reference local files
-mod config;
-mod duplicates;
-mod instance_info;
-mod oauth;
-mod oauth_resources;
-mod post;
-mod search;
-mod settings;
-mod subreddit;
-mod user;
-mod utils;
-
-// Import Crates
+use cached::proc_macro::cached;
 use clap::{Arg, ArgAction, Command};
+use std::str::FromStr;
 
 use futures_lite::FutureExt;
+use hyper::Uri;
 use hyper::{header::HeaderValue, Body, Request, Response};
-
-mod client;
-use client::{canonical_path, proxy};
-use log::info;
+use log::{info, warn};
 use once_cell::sync::Lazy;
-use server::RequestExt;
-use utils::{error, redirect, ThemeAssets};
+use redsunlib::client::{canonical_path, proxy, rate_limit_check, CLIENT};
+use redsunlib::server::{self, RequestExt};
+use redsunlib::utils::{error, redirect, MascotAssets, ThemeAssets};
+use redsunlib::{config, duplicates, headers, instance_info, post, search, settings, subreddit, user};
 
-use crate::client::OAUTH_CLIENT;
-
-mod server;
+use redsunlib::client::OAUTH_CLIENT;
 
 // Create Services
 
@@ -78,6 +64,28 @@ async fn font() -> Result<Response<Body>, String> {
 	)
 }
 
+async fn ffmpeg() -> Result<Response<Body>, String> {
+	Ok(
+		Response::builder()
+			.status(200)
+			.header("content-type", "application/wasm")
+			.header("Cache-Control", "public, max-age=1209600, s-maxage=86400")
+			.body(include_bytes!("../static/ffmpeg/ffmpeg-core.wasm").as_ref().into())
+			.unwrap_or_default(),
+	)
+}
+
+async fn opensearch() -> Result<Response<Body>, String> {
+	Ok(
+		Response::builder()
+			.status(200)
+			.header("content-type", "application/opensearchdescription+xml")
+			.header("Cache-Control", "public, max-age=1209600, s-maxage=86400")
+			.body(include_bytes!("../static/opensearch.xml").as_ref().into())
+			.unwrap_or_default(),
+	)
+}
+
 async fn resource(body: &str, content_type: &str, cache: bool) -> Result<Response<Body>, String> {
 	let mut res = Response::builder()
 		.status(200)
@@ -111,6 +119,19 @@ async fn style() -> Result<Response<Body>, String> {
 	)
 }
 
+/// Serve mascot
+async fn mascot_image(req: Request<Body>) -> Result<Response<Body>, String> {
+	let res = MascotAssets::get(&req.param("name").unwrap()).unwrap_or(MascotAssets::get("redsunlib.png").unwrap());
+	Ok(
+		Response::builder()
+			.status(200)
+			.header("content-type", "image/png")
+			.header("Cache-Control", "public, max-age=1209600, s-maxage=86400")
+			.body(res.data.into())
+			.unwrap_or_default(),
+	)
+}
+
 #[tokio::main]
 async fn main() {
 	// Load environment variables
@@ -122,6 +143,8 @@ async fn main() {
 	let matches = Command::new("Redlib")
 		.version(env!("CARGO_PKG_VERSION"))
 		.about("Private front-end for Reddit written in Rust ")
+		.arg(Arg::new("ipv4-only").short('4').long("ipv4-only").help("Listen on IPv4 only").num_args(0))
+		.arg(Arg::new("ipv6-only").short('6').long("ipv6-only").help("Listen on IPv6 only").num_args(0))
 		.arg(
 			Arg::new("redirect-https")
 				.short('r')
@@ -135,7 +158,7 @@ async fn main() {
 				.long("address")
 				.value_name("ADDRESS")
 				.help("Sets address to listen on")
-				.default_value("0.0.0.0")
+				.default_value("[::]")
 				.num_args(1),
 		)
 		.arg(
@@ -160,13 +183,36 @@ async fn main() {
 		)
 		.get_matches();
 
+	match rate_limit_check().await {
+		Ok(()) => {
+			info!("[✅] Rate limit check passed");
+		}
+		Err(e) => {
+			let mut message = format!("Rate limit check failed: {}", e);
+			message += "\nThis may cause issues with the rate limit.";
+			message += "\nPlease report this error with the above information.";
+			message += "\nhttps://github.com/redlib-org/redlib/issues/new?assignees=sigaloid&labels=bug&title=%F0%9F%90%9B+Bug+Report%3A+Rate+limit+mismatch";
+			warn!("{}", message);
+			eprintln!("{}", message);
+		}
+	}
+
 	let address = matches.get_one::<String>("address").unwrap();
 	let port = matches.get_one::<String>("port").unwrap();
 	let hsts = matches.get_one("hsts").map(|m: &String| m.as_str());
 
-	let listener = [address, ":", port].concat();
+	let ipv4_only = std::env::var("IPV4_ONLY").is_ok() || matches.get_flag("ipv4-only");
+	let ipv6_only = std::env::var("IPV6_ONLY").is_ok() || matches.get_flag("ipv6-only");
 
-	println!("Starting Redlib...");
+	let listener = if ipv4_only {
+		format!("0.0.0.0:{}", port)
+	} else if ipv6_only {
+		format!("[::]:{}", port)
+	} else {
+		[address, ":", port].concat()
+	};
+
+	println!("Starting Redsunlib...");
 
 	// Begin constructing a server
 	let mut app = server::Server::new();
@@ -189,11 +235,11 @@ async fn main() {
 		"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:;"
+		"Content-Security-Policy" => "default-src 'none'; font-src 'self'; script-src 'self' 'wasm-unsafe-eval' 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 'self' blob:;"
 	};
 
 	if let Some(expire_time) = hsts {
-		if let Ok(val) = HeaderValue::from_str(&format!("max-age={}", expire_time)) {
+		if let Ok(val) = HeaderValue::from_str(&format!("max-age={expire_time}")) {
 			app.default_headers.insert("Strict-Transport-Security", val);
 		}
 	}
@@ -223,12 +269,44 @@ async fn main() {
 	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("/opensearch.xml").get(|_| opensearch().boxed());
 	app
-		.at("/playHLSVideo.js")
-		.get(|_| resource(include_str!("../static/playHLSVideo.js"), "text/javascript", false).boxed());
+		.at("/videoUtils.js")
+		.get(|_| resource(include_str!("../static/videoUtils.js"), "text/javascript", false).boxed());
 	app
 		.at("/hls.min.js")
 		.get(|_| resource(include_str!("../static/hls.min.js"), "text/javascript", false).boxed());
+	app
+		.at("/highlighted.js")
+		.get(|_| resource(include_str!("../static/highlighted.js"), "text/javascript", false).boxed());
+	app
+		.at("/check_update.js")
+		.get(|_| resource(include_str!("../static/check_update.js"), "text/javascript", false).boxed());
+	app.at("/copy.js").get(|_| resource(include_str!("../static/copy.js"), "text/javascript", false).boxed());
+
+	app.at("/commits.json").get(|_| async move { proxy_commit_info().await }.boxed());
+	app.at("/instances.json").get(|_| async move { proxy_instances().await }.boxed());
+
+	// FFmpeg
+	app
+		.at("/ffmpeg/814.ffmpeg.js")
+		.get(|_| resource(include_str!("../static/ffmpeg/814.ffmpeg.js"), "text/javascript", false).boxed());
+	app
+		.at("/ffmpeg/814.ffmpeg.js.map")
+		.get(|_| resource(include_str!("../static/ffmpeg/814.ffmpeg.js.map"), "text/javascript", false).boxed());
+	app
+		.at("/ffmpeg/ffmpeg-core.js")
+		.get(|_| resource(include_str!("../static/ffmpeg/ffmpeg-core.js"), "text/javascript", false).boxed());
+	app.at("/ffmpeg/ffmpeg-core.wasm").get(|_| ffmpeg().boxed());
+	app
+		.at("/ffmpeg/ffmpeg-util.js")
+		.get(|_| resource(include_str!("../static/ffmpeg/ffmpeg-util.js"), "text/javascript", false).boxed());
+	app
+		.at("/ffmpeg/ffmpeg.js")
+		.get(|_| resource(include_str!("../static/ffmpeg/ffmpeg.js"), "text/javascript", false).boxed());
+	app
+		.at("/ffmpeg/ffmpeg.js.map")
+		.get(|_| resource(include_str!("../static/ffmpeg/ffmpeg.js.map"), "text/javascript", false).boxed());
 
 	// Proxy media through Redlib
 	app.at("/vid/:id/:size").get(|r| proxy(r, "https://v.redd.it/{id}/DASH_{size}").boxed());
@@ -236,6 +314,9 @@ async fn main() {
 	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("/emote/:subreddit_id/:filename")
+		.get(|r| proxy(r, "https://reddit-econ-prod-assets-permanent.s3.amazonaws.com/asset-manager/{subreddit_id}/{filename}").boxed());
 	app
 		.at("/preview/:loc/award_images/:fullname/:id")
 		.get(|r| proxy(r, "https://{loc}view.redd.it/award_images/{fullname}/{id}").boxed());
@@ -246,11 +327,12 @@ async fn main() {
 	// Browse user profile
 	app
 		.at("/u/:name")
-		.get(|r| async move { Ok(redirect(format!("/user/{}", r.param("name").unwrap_or_default()))) }.boxed());
+		.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/[deleted]").get(|req| error(req, "User has deleted their account").boxed());
+	app.at("/user/:name.rss").get(|r| user::rss(r).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());
@@ -260,8 +342,15 @@ async fn main() {
 	// 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/encoded-restore").post(|r| settings::encoded_restore(r).boxed()); NOTE: TODO (Well, TOFIX)
 	app.at("/settings/update").get(|r| settings::update(r).boxed());
 
+	// Mascots
+	app.at("/mascot/:name").get(|r| mascot_image(r).boxed());
+
+	// RSS Subscriptions
+	app.at("/r/:sub.rss").get(|r| subreddit::rss(r).boxed());
+
 	// Subreddit services
 	app
 		.at("/r/:sub")
@@ -270,12 +359,14 @@ async fn main() {
 
 	app
 		.at("/r/u_:name")
-		.get(|r| async move { Ok(redirect(format!("/user/{}", r.param("name").unwrap_or_default()))) }.boxed());
+		.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/subscribe").post(|r| subreddit::subscriptions_filters_quicklists(r).boxed());
+	app.at("/r/:sub/unsubscribe").post(|r| subreddit::subscriptions_filters_quicklists(r).boxed());
+	app.at("/r/:sub/filter").post(|r| subreddit::subscriptions_filters_quicklists(r).boxed());
+	app.at("/r/:sub/unfilter").post(|r| subreddit::subscriptions_filters_quicklists(r).boxed());
+	app.at("/r/:sub/quicklist").post(|r| subreddit::subscriptions_filters_quicklists(r).boxed());
+	app.at("/r/:sub/unquicklist").post(|r| subreddit::subscriptions_filters_quicklists(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());
@@ -295,10 +386,10 @@ async fn main() {
 
 	app
 		.at("/r/:sub/w")
-		.get(|r| async move { Ok(redirect(format!("/r/{}/wiki", r.param("sub").unwrap_or_default()))) }.boxed());
+		.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());
+		.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());
 
@@ -310,10 +401,10 @@ async fn main() {
 	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").get(|_| async { Ok(redirect("/wiki")) }.boxed());
 	app
 		.at("/w/*page")
-		.get(|r| async move { Ok(redirect(format!("/wiki/{}", r.param("page").unwrap_or_default()))) }.boxed());
+		.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());
 
@@ -321,7 +412,7 @@ async fn main() {
 	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("/about").get(|req| error(req, "About pages aren't added yet").boxed());
 
 	// Instance info page
 	app.at("/info").get(|r| instance_info::instance_info(r).boxed());
@@ -334,14 +425,14 @@ async fn main() {
 			let sub = req.param("sub").unwrap_or_default();
 			match req.param("id").as_deref() {
 				// Share link
-				Some(id) if (8..12).contains(&id.len()) => match canonical_path(format!("/r/{}/s/{}", sub, id)).await {
-					Ok(Some(path)) => Ok(redirect(path)),
+				Some(id) if (8..12).contains(&id.len()) => match canonical_path(format!("/r/{sub}/s/{id}"), 3).await {
+					Ok(Some(path)) => Ok(redirect(&path)),
 					Ok(None) => error(req, "Post ID is invalid. It may point to a post on a community that has been banned.").await,
-					Err(e) => error(req, e).await,
+					Err(e) => error(req, &e).await,
 				},
 
 				// Error message for unknown pages
-				_ => error(req, "Nothing here".to_string()).await,
+				_ => error(req, "Nothing here").await,
 			}
 		})
 	});
@@ -353,29 +444,67 @@ async fn main() {
 				Some("best" | "hot" | "new" | "top" | "rising" | "controversial") => subreddit::community(req).await,
 
 				// Short link for post
-				Some(id) if (5..8).contains(&id.len()) => match canonical_path(format!("/{}", id)).await {
+				Some(id) if (5..8).contains(&id.len()) => match canonical_path(format!("/comments/{id}"), 3).await {
 					Ok(path_opt) => match path_opt {
-						Some(path) => Ok(redirect(path)),
+						Some(path) => Ok(redirect(&path)),
 						None => error(req, "Post ID is invalid. It may point to a post on a community that has been banned.").await,
 					},
-					Err(e) => error(req, e).await,
+					Err(e) => error(req, &e).await,
 				},
 
 				// Error message for unknown pages
-				_ => error(req, "Nothing here".to_string()).await,
+				_ => error(req, "Nothing here").await,
 			}
 		})
 	});
 
 	// Default service in case no routes match
-	app.at("/*").get(|req| error(req, "Nothing here".to_string()).boxed());
+	app.at("/*").get(|req| error(req, "Nothing here").boxed());
 
-	println!("Running Redlib v{} on {}!", env!("CARGO_PKG_VERSION"), listener);
+	println!("Running Redsunlib v{} on {listener}!", env!("CARGO_PKG_VERSION"));
 
-	let server = app.listen(listener);
+	let server = app.listen(&listener);
 
 	// Run this server for... forever!
 	if let Err(e) = server.await {
-		eprintln!("Server error: {}", e);
+		eprintln!("Server error: {e}");
 	}
 }
+
+pub async fn proxy_commit_info() -> Result<Response<Body>, String> {
+	Ok(
+		Response::builder()
+			.status(200)
+			.header("content-type", "application/atom+xml")
+			.body(Body::from(fetch_commit_info().await))
+			.unwrap_or_default(),
+	)
+}
+
+#[cached(time = 600)]
+async fn fetch_commit_info() -> String {
+	let uri = Uri::from_str("https://git.stardust.wtf/api/v1/repos/iridium/redsunlib/commits?verification=false&stat=false").expect("Invalid URI");
+
+	let resp: Body = CLIENT.get(uri).await.expect("Failed to request git.stardust.wtf").into_body();
+
+	hyper::body::to_bytes(resp).await.expect("Failed to read body").iter().copied().map(|x| x as char).collect()
+}
+
+pub async fn proxy_instances() -> Result<Response<Body>, String> {
+	Ok(
+		Response::builder()
+			.status(200)
+			.header("content-type", "application/json")
+			.body(Body::from(fetch_instances().await))
+			.unwrap_or_default(),
+	)
+}
+
+#[cached(time = 600)]
+async fn fetch_instances() -> String {
+	let uri = Uri::from_str("https://raw.githubusercontent.com/redlib-org/redlib-instances/refs/heads/main/instances.json").expect("Invalid URI");
+
+	let resp: Body = CLIENT.get(uri).await.expect("Failed to request GitHub").into_body();
+
+	hyper::body::to_bytes(resp).await.expect("Failed to read body").iter().copied().map(|x| x as char).collect()
+}

src/oauth.rs

@@ -1,18 +1,22 @@
-use std::{collections::HashMap, time::Duration};
+use std::{collections::HashMap, sync::atomic::Ordering, time::Duration};
 
 use crate::{
-	client::{CLIENT, OAUTH_CLIENT},
+	client::{CLIENT, OAUTH_CLIENT, OAUTH_IS_ROLLING_OVER, OAUTH_RATELIMIT_REMAINING},
 	oauth_resources::ANDROID_APP_VERSION_LIST,
 };
 use base64::{engine::general_purpose, Engine as _};
 use hyper::{client, Body, Method, Request};
-use log::info;
+use log::{debug, error, info, trace};
 
 use serde_json::json;
+use tegen::tegen::TextGenerator;
+use tokio::time::{error::Elapsed, timeout};
 
-static REDDIT_ANDROID_OAUTH_CLIENT_ID: &str = "ohXpoqrZYub1kg";
+const REDDIT_ANDROID_OAUTH_CLIENT_ID: &str = "ohXpoqrZYub1kg";
 
-static AUTH_ENDPOINT: &str = "https://accounts.reddit.com";
+const AUTH_ENDPOINT: &str = "https://www.reddit.com";
+
+const OAUTH_TIMEOUT: Duration = Duration::from_secs(5);
 
 // Spoofed client for Android devices
 #[derive(Debug, Clone, Default)]
@@ -25,11 +29,38 @@ pub struct Oauth {
 }
 
 impl Oauth {
+	/// Create a new OAuth client
 	pub(crate) async fn new() -> Self {
-		let mut oauth = Self::default();
-		oauth.login().await;
-		oauth
+		// Call new_internal until it succeeds
+		loop {
+			let attempt = Self::new_with_timeout().await;
+			match attempt {
+				Ok(Ok(oauth)) => {
+					info!("[✅] Successfully created OAuth client");
+					return oauth;
+				}
+				Ok(Err(e)) => {
+					error!("Failed to create OAuth client: {}. Retrying in 5 seconds...", {
+						match e {
+							AuthError::Hyper(error) => error.to_string(),
+							AuthError::SerdeDeserialize(error) => error.to_string(),
+							AuthError::Field((value, error)) => format!("{error}\n{value}"),
+						}
+					});
+				}
+				Err(_) => {
+					error!("Failed to create OAuth client before timeout. Retrying in 5 seconds...");
+				}
+			}
+			tokio::time::sleep(OAUTH_TIMEOUT).await;
+		}
 	}
+
+	async fn new_with_timeout() -> Result<Result<Self, AuthError>, Elapsed> {
+		let mut oauth = Self::default();
+		timeout(OAUTH_TIMEOUT, oauth.login()).await.map(|result: Result<(), AuthError>| result.map(|_| oauth))
+	}
+
 	pub(crate) fn default() -> Self {
 		// Generate a device to spoof
 		let device = Device::new();
@@ -44,13 +75,13 @@ impl Oauth {
 			device,
 		}
 	}
-	async fn login(&mut self) -> Option<()> {
+	async fn login(&mut self) -> Result<(), AuthError> {
 		// Construct URL for OAuth token
-		let url = format!("{}/api/access_token", AUTH_ENDPOINT);
+		let url = format!("{AUTH_ENDPOINT}/auth/v2/oauth/access-token/loid");
 		let mut builder = Request::builder().method(Method::POST).uri(&url);
 
 		// Add headers from spoofed client
-		for (key, value) in self.initial_headers.iter() {
+		for (key, value) in &self.initial_headers {
 			builder = builder.header(key, value);
 		}
 		// Set up HTTP Basic Auth - basically just the const OAuth ID's with no password,
@@ -62,49 +93,80 @@ impl Oauth {
 
 		// Set JSON body. I couldn't tell you what this means. But that's what the client sends
 		let json = json!({
-				"scopes": ["*","email"]
+				"scopes": ["*","email", "pii"]
 		});
 		let body = Body::from(json.to_string());
 
 		// Build request
 		let request = builder.body(body).unwrap();
 
+		trace!("Sending token request...\n\n{request:?}");
+
 		// Send request
-		let client: client::Client<_, hyper::Body> = CLIENT.clone();
-		let resp = client.request(request).await.ok()?;
+		let client: &once_cell::sync::Lazy<client::Client<_, Body>> = &CLIENT;
+		let resp = client.request(request).await?;
+
+		trace!("Received response with status {} and length {:?}", resp.status(), resp.headers().get("content-length"));
+		trace!("OAuth headers: {:#?}", resp.headers());
 
 		// Parse headers - loid header _should_ be saved sent on subsequent token refreshes.
 		// Technically it's not needed, but it's easy for Reddit API to check for this.
 		// It's some kind of header that uniquely identifies the device.
+		// Not worried about the privacy implications, since this is randomly changed
+		// and really only as privacy-concerning as the OAuth token itself.
 		if let Some(header) = resp.headers().get("x-reddit-loid") {
-			self.headers_map.insert("x-reddit-loid".to_owned(), header.to_str().ok()?.to_string());
+			self.headers_map.insert("x-reddit-loid".to_owned(), header.to_str().unwrap().to_string());
 		}
 
 		// Same with x-reddit-session
 		if let Some(header) = resp.headers().get("x-reddit-session") {
-			self.headers_map.insert("x-reddit-session".to_owned(), header.to_str().ok()?.to_string());
+			self.headers_map.insert("x-reddit-session".to_owned(), header.to_str().unwrap().to_string());
 		}
 
+		trace!("Serializing response...");
+
 		// Serialize response
-		let body_bytes = hyper::body::to_bytes(resp.into_body()).await.ok()?;
-		let json: serde_json::Value = serde_json::from_slice(&body_bytes).ok()?;
+		let body_bytes = hyper::body::to_bytes(resp.into_body()).await?;
+		let json: serde_json::Value = serde_json::from_slice(&body_bytes)?;
+
+		trace!("Accessing relevant fields...");
 
 		// Save token and expiry
-		self.token = json.get("access_token")?.as_str()?.to_string();
-		self.expires_in = json.get("expires_in")?.as_u64()?;
+		self.token = json
+			.get("access_token")
+			.ok_or_else(|| AuthError::Field((json.clone(), "access_token")))?
+			.as_str()
+			.ok_or_else(|| AuthError::Field((json.clone(), "access_token: as_str")))?
+			.to_string();
+		self.expires_in = json
+			.get("expires_in")
+			.ok_or_else(|| AuthError::Field((json.clone(), "expires_in")))?
+			.as_u64()
+			.ok_or_else(|| AuthError::Field((json.clone(), "expires_in: as_u64")))?;
 		self.headers_map.insert("Authorization".to_owned(), format!("Bearer {}", self.token));
 
 		info!("[✅] Success - Retrieved token \"{}...\", expires in {}", &self.token[..32], self.expires_in);
 
-		Some(())
+		Ok(())
 	}
+}
 
-	async fn refresh(&mut self) -> Option<()> {
-		// Refresh is actually just a subsequent login with the same headers (without the old token
-		// or anything). This logic is handled in login, so we just call login again.
-		let refresh = self.login().await;
-		info!("Refreshing OAuth token... {}", if refresh.is_some() { "success" } else { "failed" });
-		refresh
+#[derive(Debug)]
+enum AuthError {
+	Hyper(hyper::Error),
+	SerdeDeserialize(serde_json::Error),
+	Field((serde_json::Value, &'static str)),
+}
+
+impl From<hyper::Error> for AuthError {
+	fn from(err: hyper::Error) -> Self {
+		AuthError::Hyper(err)
+	}
+}
+
+impl From<serde_json::Error> for AuthError {
+	fn from(err: serde_json::Error) -> Self {
+		AuthError::SerdeDeserialize(err)
 	}
 }
 
@@ -112,7 +174,7 @@ pub async fn token_daemon() {
 	// Monitor for refreshing token
 	loop {
 		// Get expiry time - be sure to not hold the read lock
-		let expires_in = { OAUTH_CLIENT.read().await.expires_in };
+		let expires_in = { OAUTH_CLIENT.load_full().expires_in };
 
 		// sleep for the expiry time minus 2 minutes
 		let duration = Duration::from_secs(expires_in - 120);
@@ -125,10 +187,24 @@ pub async fn token_daemon() {
 
 		// Refresh token - in its own scope
 		{
-			OAUTH_CLIENT.write().await.refresh().await;
+			force_refresh_token().await;
 		}
 	}
 }
+
+pub async fn force_refresh_token() {
+	if OAUTH_IS_ROLLING_OVER.compare_exchange(false, true, Ordering::SeqCst, Ordering::SeqCst).is_err() {
+		trace!("Skipping refresh token roll over, already in progress");
+		return;
+	}
+
+	debug!("Rolling over refresh token. Current rate limit: {}", OAUTH_RATELIMIT_REMAINING.load(Ordering::SeqCst));
+	let new_client = Oauth::new().await;
+	OAUTH_CLIENT.swap(new_client.into());
+	OAUTH_RATELIMIT_REMAINING.store(99, Ordering::SeqCst);
+	OAUTH_IS_ROLLING_OVER.store(false, Ordering::SeqCst);
+}
+
 #[derive(Debug, Clone, Default)]
 struct Device {
 	oauth_id: String,
@@ -147,11 +223,22 @@ impl Device {
 
 		let android_user_agent = format!("Reddit/{android_app_version}/Android {android_version}");
 
+		let qos = fastrand::u32(1000..=100_000);
+		let qos: f32 = qos as f32 / 1000.0;
+		let qos = format!("{:.3}", qos);
+
+		let codecs = TextGenerator::new().generate("available-codecs=video/avc, video/hevc{, video/x-vnd.on2.vp9|}");
+
 		// Android device headers
-		let headers = HashMap::from([
-			("Client-Vendor-Id".into(), uuid.clone()),
-			("X-Reddit-Device-Id".into(), uuid.clone()),
+		let headers: HashMap<String, String> = HashMap::from([
 			("User-Agent".into(), android_user_agent),
+			("x-reddit-retry".into(), "algo=no-retries".into()),
+			("x-reddit-compression".into(), "1".into()),
+			("x-reddit-qos".into(), qos),
+			("x-reddit-media-codecs".into(), codecs),
+			("Content-Type".into(), "application/json; charset=UTF-8".into()),
+			("client-vendor-id".into(), uuid.clone()),
+			("X-Reddit-Device-Id".into(), uuid.clone()),
 		]);
 
 		info!("[🔄] Spoofing Android client with headers: {headers:?}, uuid: \"{uuid}\", and OAuth ID \"{REDDIT_ANDROID_OAUTH_CLIENT_ID}\"");
@@ -174,21 +261,21 @@ fn choose<T: Copy>(list: &[T]) -> T {
 
 #[tokio::test(flavor = "multi_thread")]
 async fn test_oauth_client() {
-	assert!(!OAUTH_CLIENT.read().await.token.is_empty());
+	assert!(!OAUTH_CLIENT.load_full().token.is_empty());
 }
 
 #[tokio::test(flavor = "multi_thread")]
 async fn test_oauth_client_refresh() {
-	OAUTH_CLIENT.write().await.refresh().await.unwrap();
+	force_refresh_token().await;
 }
 #[tokio::test(flavor = "multi_thread")]
 async fn test_oauth_token_exists() {
-	assert!(!OAUTH_CLIENT.read().await.token.is_empty());
+	assert!(!OAUTH_CLIENT.load_full().token.is_empty());
 }
 
 #[tokio::test(flavor = "multi_thread")]
 async fn test_oauth_headers_len() {
-	assert!(OAUTH_CLIENT.read().await.headers_map.len() >= 3);
+	assert!(OAUTH_CLIENT.load_full().headers_map.len() >= 3);
 }
 
 #[test]

src/oauth_resources.rs

@@ -2,76 +2,73 @@
 // Rerun scripts/update_oauth_resources.sh to update this file
 // Please do not edit manually
 // Filled in with real app versions
-pub static _IOS_APP_VERSION_LIST: &[&str; 67] = &[
-	"Version 2020.0.0/Build 306960",
-	"Version 2020.10.0/Build 307041",
-	"Version 2020.10.1/Build 307047",
-	"Version 2020.1.0/Build 306966",
-	"Version 2020.11.0/Build 307049",
-	"Version 2020.11.1/Build 307063",
-	"Version 2020.12.0/Build 307070",
-	"Version 2020.13.0/Build 307072",
-	"Version 2020.13.1/Build 307075",
-	"Version 2020.14.0/Build 307077",
-	"Version 2020.14.1/Build 307080",
-	"Version 2020.15.0/Build 307084",
-	"Version 2020.16.0/Build 307090",
-	"Version 2020.17.0/Build 307093",
-	"Version 2020.19.0/Build 307137",
-	"Version 2020.20.0/Build 307156",
-	"Version 2020.20.1/Build 307159",
-	"Version 2020.2.0/Build 306969",
-	"Version 2020.21.0/Build 307162",
-	"Version 2020.21.1/Build 307165",
-	"Version 2020.22.0/Build 307177",
-	"Version 2020.22.1/Build 307181",
-	"Version 2020.23.0/Build 307183",
-	"Version 2020.24.0/Build 307189",
-	"Version 2020.25.0/Build 307198",
-	"Version 2020.26.0/Build 307205",
-	"Version 2020.26.1/Build 307213",
-	"Version 2020.27.0/Build 307229",
-	"Version 2020.28.0/Build 307233",
-	"Version 2020.29.0/Build 307235",
-	"Version 2020.30.0/Build 307238",
-	"Version 2020.3.0/Build 306971",
-	"Version 2020.31.0/Build 307240",
-	"Version 2020.31.1/Build 307246",
-	"Version 2020.32.0/Build 307250",
-	"Version 2020.33.0/Build 307252",
-	"Version 2020.34.0/Build 307260",
-	"Version 2020.35.0/Build 307262",
-	"Version 2020.36.0/Build 307265",
-	"Version 2020.37.0/Build 307272",
-	"Version 2020.38.0/Build 307286",
-	"Version 2020.39.0/Build 307306",
-	"Version 2020.4.0/Build 306978",
-	"Version 2020.5.0/Build 306993",
-	"Version 2020.5.1/Build 307005",
-	"Version 2020.6.0/Build 307007",
-	"Version 2020.7.0/Build 307012",
-	"Version 2020.8.0/Build 307014",
-	"Version 2020.8.1/Build 307017",
-	"Version 2020.9.0/Build 307035",
-	"Version 2020.9.1/Build 307039",
-	"Version 2023.18.0/Build 310494",
-	"Version 2023.19.0/Build 310507",
-	"Version 2023.20.0/Build 310535",
-	"Version 2023.21.0/Build 310560",
-	"Version 2023.22.0/Build 613580",
-	"Version 2023.23.0/Build 310613",
-	"Version 2023.23.1/Build 613639",
-	"Version 2023.24.0/Build 613663",
-	"Version 2023.25.0/Build 613739",
-	"Version 2023.26.0/Build 613749",
-	"Version 2023.27.0/Build 613771",
-	"Version 2023.28.0/Build 613803",
-	"Version 2023.28.1/Build 613809",
-	"Version 2023.29.0/Build 613825",
-	"Version 2023.30.0/Build 613849",
-	"Version 2023.31.0/Build 613864",
-];
-pub static ANDROID_APP_VERSION_LIST: &[&str; 150] = &[
+pub const _IOS_APP_VERSION_LIST: &[&str; 1] = &[""];
+pub const ANDROID_APP_VERSION_LIST: &[&str; 150] = &[
+	"Version 2024.22.1/Build 1652272",
+	"Version 2024.23.1/Build 1665606",
+	"Version 2024.24.1/Build 1682520",
+	"Version 2024.25.0/Build 1693595",
+	"Version 2024.25.2/Build 1700401",
+	"Version 2024.25.3/Build 1703490",
+	"Version 2024.26.0/Build 1710470",
+	"Version 2024.26.1/Build 1717435",
+	"Version 2024.28.0/Build 1737665",
+	"Version 2024.28.1/Build 1741165",
+	"Version 2024.30.0/Build 1770787",
+	"Version 2024.31.0/Build 1786202",
+	"Version 2024.32.0/Build 1809095",
+	"Version 2024.32.1/Build 1813258",
+	"Version 2024.33.0/Build 1819908",
+	"Version 2024.34.0/Build 1837909",
+	"Version 2024.35.0/Build 1861437",
+	"Version 2024.36.0/Build 1875012",
+	"Version 2024.37.0/Build 1888053",
+	"Version 2024.38.0/Build 1902791",
+	"Version 2024.39.0/Build 1916713",
+	"Version 2024.40.0/Build 1928580",
+	"Version 2024.41.0/Build 1941199",
+	"Version 2024.41.1/Build 1947805",
+	"Version 2024.42.0/Build 1952440",
+	"Version 2024.43.0/Build 1972250",
+	"Version 2024.44.0/Build 1988458",
+	"Version 2024.45.0/Build 2001943",
+	"Version 2024.46.0/Build 2012731",
+	"Version 2024.47.0/Build 2029755",
+	"Version 2023.48.0/Build 1319123",
+	"Version 2023.49.0/Build 1321715",
+	"Version 2023.49.1/Build 1322281",
+	"Version 2023.50.0/Build 1332338",
+	"Version 2023.50.1/Build 1345844",
+	"Version 2024.02.0/Build 1368985",
+	"Version 2024.03.0/Build 1379408",
+	"Version 2024.04.0/Build 1391236",
+	"Version 2024.05.0/Build 1403584",
+	"Version 2024.06.0/Build 1418489",
+	"Version 2024.07.0/Build 1429651",
+	"Version 2024.08.0/Build 1439531",
+	"Version 2024.10.0/Build 1470045",
+	"Version 2024.10.1/Build 1478645",
+	"Version 2024.11.0/Build 1480707",
+	"Version 2024.12.0/Build 1494694",
+	"Version 2024.13.0/Build 1505187",
+	"Version 2024.14.0/Build 1520556",
+	"Version 2024.15.0/Build 1536823",
+	"Version 2024.16.0/Build 1551366",
+	"Version 2024.17.0/Build 1568106",
+	"Version 2024.18.0/Build 1577901",
+	"Version 2024.18.1/Build 1585304",
+	"Version 2024.19.0/Build 1593346",
+	"Version 2024.20.0/Build 1612800",
+	"Version 2024.20.1/Build 1615586",
+	"Version 2024.20.2/Build 1624969",
+	"Version 2024.20.3/Build 1624970",
+	"Version 2024.21.0/Build 1631686",
+	"Version 2024.22.0/Build 1645257",
+	"Version 2023.21.0/Build 956283",
+	"Version 2023.22.0/Build 968223",
+	"Version 2023.23.0/Build 983896",
+	"Version 2023.24.0/Build 998541",
+	"Version 2023.25.0/Build 1014750",
 	"Version 2023.25.1/Build 1018737",
 	"Version 2023.26.0/Build 1019073",
 	"Version 2023.27.0/Build 1031923",
@@ -97,11 +94,11 @@ pub static ANDROID_APP_VERSION_LIST: &[&str; 150] = &[
 	"Version 2023.44.0/Build 1268622",
 	"Version 2023.45.0/Build 1281371",
 	"Version 2023.47.0/Build 1303604",
-	"Version 2023.48.0/Build 1319123",
-	"Version 2023.49.0/Build 1321715",
-	"Version 2023.49.1/Build 1322281",
-	"Version 2023.50.0/Build 1332338",
-	"Version 2023.50.1/Build 1345844",
+	"Version 2022.42.0/Build 638508",
+	"Version 2022.43.0/Build 648277",
+	"Version 2022.44.0/Build 664348",
+	"Version 2022.45.0/Build 677985",
+	"Version 2023.01.0/Build 709875",
 	"Version 2023.02.0/Build 717912",
 	"Version 2023.03.0/Build 729220",
 	"Version 2023.04.0/Build 744681",
@@ -127,11 +124,11 @@ pub static ANDROID_APP_VERSION_LIST: &[&str; 150] = &[
 	"Version 2023.19.0/Build 927681",
 	"Version 2023.20.0/Build 943980",
 	"Version 2023.20.1/Build 946732",
-	"Version 2023.21.0/Build 956283",
-	"Version 2023.22.0/Build 968223",
-	"Version 2023.23.0/Build 983896",
-	"Version 2023.24.0/Build 998541",
-	"Version 2023.25.0/Build 1014750",
+	"Version 2022.20.0/Build 487703",
+	"Version 2022.21.0/Build 492436",
+	"Version 2022.22.0/Build 498700",
+	"Version 2022.23.0/Build 502374",
+	"Version 2022.23.1/Build 506606",
 	"Version 2022.24.0/Build 510950",
 	"Version 2022.24.1/Build 513462",
 	"Version 2022.25.0/Build 515072",
@@ -157,79 +154,5 @@ pub static ANDROID_APP_VERSION_LIST: &[&str; 150] = &[
 	"Version 2022.40.0/Build 624782",
 	"Version 2022.41.0/Build 630468",
 	"Version 2022.41.1/Build 634168",
-	"Version 2022.42.0/Build 638508",
-	"Version 2022.43.0/Build 648277",
-	"Version 2022.44.0/Build 664348",
-	"Version 2022.45.0/Build 677985",
-	"Version 2023.01.0/Build 709875",
-	"Version 2021.45.0/Build 387663",
-	"Version 2021.46.0/Build 392043",
-	"Version 2021.47.0/Build 394342",
-	"Version 2022.10.0/Build 429896",
-	"Version 2022.1.0/Build 402829",
-	"Version 2022.11.0/Build 433004",
-	"Version 2022.12.0/Build 436848",
-	"Version 2022.13.0/Build 442084",
-	"Version 2022.13.1/Build 444621",
-	"Version 2022.14.1/Build 452742",
-	"Version 2022.15.0/Build 455453",
-	"Version 2022.16.0/Build 462377",
-	"Version 2022.17.0/Build 468480",
-	"Version 2022.18.0/Build 473740",
-	"Version 2022.19.1/Build 482464",
-	"Version 2022.20.0/Build 487703",
-	"Version 2022.2.0/Build 405543",
-	"Version 2022.21.0/Build 492436",
-	"Version 2022.22.0/Build 498700",
-	"Version 2022.23.0/Build 502374",
-	"Version 2022.23.1/Build 506606",
-	"Version 2022.3.0/Build 408637",
-	"Version 2022.4.0/Build 411368",
-	"Version 2022.5.0/Build 414731",
-	"Version 2022.6.0/Build 418391",
-	"Version 2022.6.1/Build 419585",
-	"Version 2022.6.2/Build 420562",
-	"Version 2022.7.0/Build 420849",
-	"Version 2022.8.0/Build 423906",
-	"Version 2022.9.0/Build 426592",
-	"Version 2021.17.0/Build 323213",
-	"Version 2021.18.0/Build 324849",
-	"Version 2021.19.0/Build 325762",
-	"Version 2021.20.0/Build 326964",
-	"Version 2021.21.0/Build 327703",
-	"Version 2021.21.1/Build 328461",
-	"Version 2021.22.0/Build 329696",
-	"Version 2021.23.0/Build 331631",
-	"Version 2021.24.0/Build 333951",
-	"Version 2021.25.0/Build 335451",
-	"Version 2021.26.0/Build 336739",
-	"Version 2021.27.0/Build 338857",
-	"Version 2021.28.0/Build 340747",
-	"Version 2021.29.0/Build 342342",
-	"Version 2021.30.0/Build 343820",
-	"Version 2021.31.0/Build 346485",
-	"Version 2021.32.0/Build 349507",
-	"Version 2021.33.0/Build 351843",
-	"Version 2021.34.0/Build 353911",
-	"Version 2021.35.0/Build 355878",
-	"Version 2021.36.0/Build 359254",
-	"Version 2021.36.1/Build 360572",
-	"Version 2021.37.0/Build 361905",
-	"Version 2021.38.0/Build 365032",
-	"Version 2021.39.0/Build 369068",
-	"Version 2021.39.1/Build 372418",
-	"Version 2021.41.0/Build 376052",
-	"Version 2021.42.0/Build 378193",
-	"Version 2021.43.0/Build 382019",
-	"Version 2021.44.0/Build 385129",
-];
-pub static _IOS_OS_VERSION_LIST: &[&str; 8] = &[
-	"Version 17.0.1 (Build 21A340)",
-	"Version 17.0.2 (Build 21A350)",
-	"Version 17.0.3 (Build 21A360)",
-	"Version 17.1 (Build 21B74)",
-	"Version 17.1.1 (Build 21B91)",
-	"Version 17.1.2 (Build 21B101)",
-	"Version 17.2 (Build 21C62)",
-	"Version 17.2.1 (Build 21C66)",
 ];
+pub const _IOS_OS_VERSION_LIST: &[&str; 1] = &[""];

src/post.rs

@@ -1,17 +1,19 @@
+#![allow(clippy::cmp_owned)]
+
 // CRATES
 use crate::client::json;
 use crate::config::get_setting;
 use crate::server::RequestExt;
 use crate::subreddit::{can_access_quarantine, quarantine};
 use crate::utils::{
-	error, format_num, get_filters, nsfw_landing, param, parse_post, rewrite_urls, setting, template, time, val, Author, Awards, Comment, Flair, FlairPart, Post, Preferences,
+	error, format_num, get_filters, nsfw_landing, param, parse_post, rewrite_emotes, setting, template, time, val, Author, Awards, Comment, Flair, FlairPart, Post, Preferences,
 };
 use hyper::{Body, Request, Response};
 
-use askama::Template;
 use once_cell::sync::Lazy;
 use regex::Regex;
-use std::collections::HashSet;
+use rinja::Template;
+use std::collections::{HashMap, HashSet};
 
 // STRUCTS
 #[derive(Template)]
@@ -27,7 +29,7 @@ struct PostTemplate {
 	comment_query: String,
 }
 
-static COMMENT_SEARCH_CAPTURE: Lazy<Regex> = Lazy::new(|| Regex::new(r#"\?q=(.*)&type=comment"#).unwrap());
+static COMMENT_SEARCH_CAPTURE: Lazy<Regex> = Lazy::new(|| Regex::new(r"\?q=(.*)&type=comment").unwrap());
 
 pub async fn item(req: Request<Body>) -> Result<Response<Body>, String> {
 	// Build Reddit API path
@@ -52,7 +54,7 @@ pub async fn item(req: Request<Body>) -> Result<Response<Body>, String> {
 
 	// Log the post ID being fetched in debug mode
 	#[cfg(debug_assertions)]
-	dbg!(req.param("id").unwrap_or_default());
+	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();
@@ -72,18 +74,22 @@ pub async fn item(req: Request<Body>) -> Result<Response<Body>, String> {
 				return Ok(nsfw_landing(req, req_url).await.unwrap_or_default());
 			}
 
-			let query = match COMMENT_SEARCH_CAPTURE.captures(&url) {
+			let query_body = match COMMENT_SEARCH_CAPTURE.captures(&url) {
 				Some(captures) => captures.get(1).unwrap().as_str().replace("%20", " ").replace('+', " "),
 				None => String::new(),
 			};
 
+			let query_string = format!("q={query_body}&type=comment");
+			let form = url::form_urlencoded::parse(query_string.as_bytes()).collect::<HashMap<_, _>>();
+			let query = form.get("q").unwrap().clone().to_string();
+
 			let comments = match query.as_str() {
 				"" => parse_comments(&response[1], &post.permalink, &post.author.name, highlighted_comment, &get_filters(&req), &req),
 				_ => query_comments(&response[1], &post.permalink, &post.author.name, highlighted_comment, &get_filters(&req), &query, &req),
 			};
 
 			// Use the Post and Comment structs to generate a website to show users
-			template(PostTemplate {
+			Ok(template(&PostTemplate {
 				comments,
 				post,
 				url_without_query: url.clone().trim_end_matches(&format!("?q={query}&type=comment")).to_string(),
@@ -92,15 +98,15 @@ pub async fn item(req: Request<Body>) -> Result<Response<Body>, String> {
 				single_thread,
 				url: req_url,
 				comment_query: query,
-			})
+			}))
 		}
 		// If the Reddit API returns an error, exit and send error page to user
 		Err(msg) => {
 			if msg == "quarantined" || msg == "gated" {
 				let sub = req.param("sub").unwrap_or_default();
-				quarantine(req, sub, msg)
+				Ok(quarantine(&req, sub, &msg))
 			} else {
-				error(req, msg).await
+				error(req, &msg).await
 			}
 		}
 	}
@@ -139,19 +145,19 @@ fn query_comments(
 	let comments = json["data"]["children"].as_array().map_or(Vec::new(), std::borrow::ToOwned::to_owned);
 	let mut results = Vec::new();
 
-	comments.into_iter().for_each(|comment| {
+	for comment in comments {
 		let data = &comment["data"];
 
 		// If this comment contains replies, handle those too
 		if data["replies"].is_object() {
-			results.append(&mut query_comments(&data["replies"], post_link, post_author, highlighted_comment, filters, query, req))
+			results.append(&mut query_comments(&data["replies"], post_link, post_author, highlighted_comment, filters, query, req));
 		}
 
 		let c = build_comment(&comment, data, Vec::new(), post_link, post_author, highlighted_comment, filters, req);
 		if c.body.to_lowercase().contains(&query.to_lowercase()) {
 			results.push(c);
 		}
-	});
+	}
 
 	results
 }
@@ -170,13 +176,11 @@ fn build_comment(
 
 	let body = if (val(comment, "author") == "[deleted]" && val(comment, "body") == "[removed]") || val(comment, "body") == "[ Removed by Reddit ]" {
 		format!(
-			"<div class=\"md\"><p>[removed] — <a href=\"https://{}{}{}\">view removed comment</a></p></div>",
-			get_setting("REDLIB_PUSHSHIFT_FRONTEND").unwrap_or(String::from(crate::config::DEFAULT_PUSHSHIFT_FRONTEND)),
-			post_link,
-			id
+			"<div class=\"md\"><p>[removed] — <a href=\"https://{}{post_link}{id}\">view removed comment</a></p></div>",
+			get_setting("REDLIB_PUSHSHIFT_FRONTEND").unwrap_or_else(|| String::from(crate::config::DEFAULT_PUSHSHIFT_FRONTEND)),
 		)
 	} else {
-		rewrite_urls(&val(comment, "body_html"))
+		rewrite_emotes(&data["media_metadata"], val(comment, "body_html"))
 	};
 	let kind = comment["kind"].as_str().unwrap_or_default().to_string();
 

src/scraper/main.rs

@@ -0,0 +1,132 @@
+use std::{collections::HashMap, fmt::Display, io::Write};
+
+use clap::{Parser, ValueEnum};
+use common_words_all::{get_top, Language, NgramSize};
+use redsunlib::utils::Post;
+
+#[derive(Parser)]
+#[command(name = "my_cli")]
+#[command(about = "A simple CLI example", long_about = None)]
+struct Cli {
+	#[arg(short = 's', long = "sub")]
+	sub: String,
+
+	#[arg(long = "sort")]
+	sort: SortOrder,
+
+	#[arg(short = 'f', long = "format", value_enum)]
+	format: Format,
+	#[arg(short = 'o', long = "output")]
+	output: Option<String>,
+}
+
+#[derive(Debug, Clone, ValueEnum)]
+enum SortOrder {
+	Hot,
+	Rising,
+	New,
+	Top,
+	Controversial,
+}
+
+impl Display for SortOrder {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+		match self {
+			SortOrder::Hot => write!(f, "hot"),
+			SortOrder::Rising => write!(f, "rising"),
+			SortOrder::New => write!(f, "new"),
+			SortOrder::Top => write!(f, "top"),
+			SortOrder::Controversial => write!(f, "controversial"),
+		}
+	}
+}
+
+#[derive(Debug, Clone, ValueEnum)]
+enum Format {
+	Json,
+}
+
+#[tokio::main]
+async fn main() {
+	pretty_env_logger::init();
+	let cli = Cli::parse();
+	let (sub, sort, format, output) = (cli.sub, cli.sort, cli.format, cli.output);
+	let initial = format!("/r/{sub}/{sort}.json?&raw_json=1");
+	let (posts, mut after) = Post::fetch(&initial, false).await.unwrap();
+	let mut hashmap = HashMap::new();
+	hashmap.extend(posts.into_iter().map(|post| (post.id.clone(), post)));
+	loop {
+		print!("\r");
+		let path = format!("/r/{sub}/{sort}.json?sort={sort}&t=&after={after}&raw_json=1");
+		let (new_posts, new_after) = Post::fetch(&path, false).await.unwrap();
+		let old_len = hashmap.len();
+		// convert to hashmap and extend hashmap
+		let new_posts = new_posts.into_iter().map(|post| (post.id.clone(), post)).collect::<HashMap<String, Post>>();
+		let len = new_posts.len();
+		hashmap.extend(new_posts);
+		if hashmap.len() - old_len < 3 {
+			break;
+		}
+
+		let x = hashmap.len() - old_len;
+		after = new_after;
+		// Print number of posts fetched
+		print!("Fetched {len} posts (+{x})",);
+		std::io::stdout().flush().unwrap();
+	}
+	println!("\n\n");
+	// additionally search if final count not reached
+
+	for word in get_top(Language::English, 10_000, NgramSize::One) {
+		let mut retrieved_posts_from_search = 0;
+		let initial = format!("/r/{sub}/search.json?q={word}&restrict_sr=on&include_over_18=on&raw_json=1&sort={sort}");
+		println!("Grabbing posts with word {word}.");
+		let (posts, mut after) = Post::fetch(&initial, false).await.unwrap();
+		hashmap.extend(posts.into_iter().map(|post| (post.id.clone(), post)));
+		'search: loop {
+			let path = format!("/r/{sub}/search.json?q={word}&restrict_sr=on&include_over_18=on&raw_json=1&sort={sort}&after={after}");
+			let (new_posts, new_after) = Post::fetch(&path, false).await.unwrap();
+			if new_posts.is_empty() || new_after.is_empty() {
+				println!("No more posts for word {word}");
+				break 'search;
+			}
+			retrieved_posts_from_search += new_posts.len();
+			let old_len = hashmap.len();
+			let new_posts = new_posts.into_iter().map(|post| (post.id.clone(), post)).collect::<HashMap<String, Post>>();
+			let len = new_posts.len();
+			hashmap.extend(new_posts);
+			let delta = hashmap.len() - old_len;
+			after = new_after;
+			// Print number of posts fetched
+			println!("Fetched {len} posts (+{delta})",);
+
+			if retrieved_posts_from_search > 1000 {
+				println!("Reached 1000 posts from search");
+				break 'search;
+			}
+		}
+		// Need to save incrementally. atomic save + move
+		let tmp_file = output.clone().unwrap_or_else(|| format!("{sub}.json.tmp"));
+		let perm_file = output.clone().unwrap_or_else(|| format!("{sub}.json"));
+		write_posts(&hashmap.values().collect(), tmp_file.clone());
+		// move file
+		std::fs::rename(tmp_file, perm_file).unwrap();
+	}
+
+	println!("\n\n");
+
+	println!("Size of hashmap: {}", hashmap.len());
+
+	let posts: Vec<&Post> = hashmap.values().collect();
+	match format {
+		Format::Json => {
+			let filename: String = output.unwrap_or_else(|| format!("{sub}.json"));
+			write_posts(&posts, filename);
+		}
+	}
+}
+
+fn write_posts(posts: &Vec<&Post>, filename: String) {
+	let json = serde_json::to_string(&posts).unwrap();
+	std::fs::write(filename, json).unwrap();
+}

src/search.rs

@@ -1,14 +1,16 @@
+#![allow(clippy::cmp_owned)]
+
 // CRATES
 use crate::utils::{self, catch_random, error, filter_posts, format_num, format_url, get_filters, param, redirect, setting, template, val, Post, Preferences};
 use crate::{
 	client::json,
+	server::RequestExt,
 	subreddit::{can_access_quarantine, quarantine},
-	RequestExt,
 };
-use askama::Template;
 use hyper::{Body, Request, Response};
 use once_cell::sync::Lazy;
 use regex::Regex;
+use rinja::Template;
 
 // STRUCTS
 struct SearchParams {
@@ -60,16 +62,25 @@ pub async fn find(req: Request<Body>) -> Result<Response<Body>, String> {
 	} else {
 		""
 	};
-	let path = format!("{}.json?{}{}&raw_json=1", req.uri().path(), req.uri().query().unwrap_or_default(), nsfw_results);
+	let uri_path = req.uri().path().replace("+", "%2B");
+	let path = format!("{}.json?{}{}&raw_json=1", uri_path, req.uri().query().unwrap_or_default(), nsfw_results);
 	let mut query = param(&path, "q").unwrap_or_default();
 	query = REDDIT_URL_MATCH.replace(&query, "").to_string();
 
 	if query.is_empty() {
-		return Ok(redirect("/".to_string()));
+		return Ok(redirect("/"));
 	}
 
-	if query.starts_with("r/") {
-		return Ok(redirect(format!("/{}", query)));
+	if query.starts_with("r/") || query.starts_with("user/") {
+		return Ok(redirect(&format!("/{query}")));
+	}
+
+	if query.starts_with("R/") {
+		return Ok(redirect(&format!("/r{}", &query[1..])));
+	}
+
+	if query.starts_with("u/") || query.starts_with("U/") {
+		return Ok(redirect(&format!("/user{}", &query[1..])));
 	}
 
 	let sub = req.param("sub").unwrap_or_default();
@@ -97,7 +108,7 @@ pub async fn find(req: Request<Body>) -> Result<Response<Body>, String> {
 
 	// If all requested subs are filtered, we don't need to fetch posts.
 	if sub.split('+').all(|s| filters.contains(s)) {
-		template(SearchTemplate {
+		Ok(template(&SearchTemplate {
 			posts: Vec::new(),
 			subreddits,
 			sub,
@@ -106,7 +117,7 @@ pub async fn find(req: Request<Body>) -> Result<Response<Body>, String> {
 				sort,
 				t: param(&path, "t").unwrap_or_default(),
 				before: param(&path, "after").unwrap_or_default(),
-				after: "".to_string(),
+				after: String::new(),
 				restrict_sr: param(&path, "restrict_sr").unwrap_or_default(),
 				typed,
 			},
@@ -116,14 +127,14 @@ pub async fn find(req: Request<Body>) -> Result<Response<Body>, String> {
 			all_posts_filtered: false,
 			all_posts_hidden_nsfw: false,
 			no_posts: false,
-		})
+		}))
 	} else {
 		match Post::fetch(&path, quarantined).await {
 			Ok((mut posts, after)) => {
 				let (_, all_posts_filtered) = filter_posts(&mut posts, &filters);
 				let no_posts = posts.is_empty();
 				let all_posts_hidden_nsfw = !no_posts && (posts.iter().all(|p| p.flags.nsfw) && setting(&req, "show_nsfw") != "on");
-				template(SearchTemplate {
+				Ok(template(&SearchTemplate {
 					posts,
 					subreddits,
 					sub,
@@ -142,14 +153,14 @@ pub async fn find(req: Request<Body>) -> Result<Response<Body>, String> {
 					all_posts_filtered,
 					all_posts_hidden_nsfw,
 					no_posts,
-				})
+				}))
 			}
 			Err(msg) => {
 				if msg == "quarantined" || msg == "gated" {
 					let sub = req.param("sub").unwrap_or_default();
-					quarantine(req, sub, msg)
+					Ok(quarantine(&req, sub, &msg))
 				} else {
-					error(req, msg).await
+					error(req, &msg).await
 				}
 			}
 		}
@@ -158,7 +169,7 @@ pub async fn find(req: Request<Body>) -> Result<Response<Body>, String> {
 
 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);
+	let subreddit_search_path = format!("/subreddits/search.json?q={}&limit={limit}", q.replace(' ', "+"));
 
 	// Send a request to the url
 	json(subreddit_search_path, false).await.unwrap_or_default()["data"]["children"]

src/server.rs

@@ -1,3 +1,6 @@
+#![allow(dead_code)]
+#![allow(clippy::cmp_owned)]
+
 use brotli::enc::{BrotliCompress, BrotliEncoderParams};
 use cached::proc_macro::cached;
 use cookie::Cookie;
@@ -15,13 +18,14 @@ use libflate::gzip;
 use route_recognizer::{Params, Router};
 use std::{
 	cmp::Ordering,
+	fmt::Display,
 	io,
 	pin::Pin,
 	result::Result,
 	str::{from_utf8, Split},
 	string::ToString,
 };
-use time::Duration;
+use time::OffsetDateTime;
 
 use crate::dbg_msg;
 
@@ -65,12 +69,12 @@ impl CompressionType {
 	}
 }
 
-impl ToString for CompressionType {
-	fn to_string(&self) -> String {
+impl Display for CompressionType {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
 		match self {
-			Self::Gzip => "gzip".to_string(),
-			Self::Brotli => "br".to_string(),
-			_ => String::new(),
+			Self::Gzip => write!(f, "gzip"),
+			Self::Brotli => write!(f, "br"),
+			Self::Passthrough => Ok(()),
 		}
 	}
 }
@@ -104,13 +108,13 @@ 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>;
+	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 cookies(&self) -> Vec<Cookie<'_>>;
+	fn insert_cookie(&mut self, cookie: Cookie<'_>);
 	fn remove_cookie(&mut self, name: String);
 }
 
@@ -131,7 +135,7 @@ impl RequestExt for Request<Body> {
 		self.extensions_mut().insert(params)
 	}
 
-	fn cookies(&self) -> Vec<Cookie> {
+	fn cookies(&self) -> Vec<Cookie<'_>> {
 		self.headers().get("Cookie").map_or(Vec::new(), |header| {
 			header
 				.to_str()
@@ -142,13 +146,13 @@ impl RequestExt for Request<Body> {
 		})
 	}
 
-	fn cookie(&self, name: &str) -> Option<Cookie> {
+	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> {
+	fn cookies(&self) -> Vec<Cookie<'_>> {
 		self.headers().get("Cookie").map_or(Vec::new(), |header| {
 			header
 				.to_str()
@@ -159,36 +163,40 @@ impl ResponseExt for Response<Body> {
 		})
 	}
 
-	fn insert_cookie(&mut self, cookie: Cookie) {
+	fn insert_cookie(&mut self, cookie: Cookie<'_>) {
 		if let Ok(val) = header::HeaderValue::from_str(&cookie.to_string()) {
 			self.headers_mut().append("Set-Cookie", val);
 		}
 	}
 
 	fn remove_cookie(&mut self, name: String) {
-		let mut cookie = Cookie::from(name);
-		cookie.set_path("/");
-		cookie.set_max_age(Duration::seconds(1));
-		if let Ok(val) = header::HeaderValue::from_str(&cookie.to_string()) {
+		let removal_cookie = Cookie::build(name).path("/").http_only(true).expires(OffsetDateTime::now_utc());
+		if let Ok(val) = header::HeaderValue::from_str(&removal_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 {
+	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)
+		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)
+		self.method(&Method::POST, dest)
+	}
+}
+
+impl Default for Server {
+	fn default() -> Self {
+		Self::new()
 	}
 }
 
@@ -200,14 +208,14 @@ impl Server {
 		}
 	}
 
-	pub fn at(&mut self, path: &str) -> Route {
+	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>> {
+	pub fn listen(self, addr: &str) -> 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();
@@ -230,8 +238,14 @@ impl Server {
 						path.pop();
 					}
 
+					// Replace HEAD with GET for routing
+					let (method, is_head) = match req.method() {
+						&Method::HEAD => (&Method::GET, true),
+						method => (method, false),
+					};
+
 					// Match the visited path with an added route
-					match router.recognize(&format!("/{}{}", req.method().as_str(), path)) {
+					match router.recognize(&format!("/{}{}", method.as_str(), path)) {
 						// If a route was configured for this path
 						Ok(found) => {
 							let mut parammed = req;
@@ -243,29 +257,44 @@ impl Server {
 								match func.await {
 									Ok(mut res) => {
 										res.headers_mut().extend(def_headers);
-										let _ = compress_response(&req_headers, &mut res).await;
+										if is_head {
+											*res.body_mut() = Body::empty();
+										} else {
+											let _ = compress_response(&req_headers, &mut res).await;
+										}
 
 										Ok(res)
 									}
-									Err(msg) => new_boilerplate(def_headers, req_headers, 500, Body::from(msg)).await,
+									Err(msg) => new_boilerplate(def_headers, req_headers, 500, if is_head { Body::empty() } else { Body::from(msg) }).await,
 								}
 							}
 							.boxed()
 						}
 						// If there was a routing error
-						Err(e) => new_boilerplate(def_headers, req_headers, 404, e.into()).boxed(),
+						Err(e) => new_boilerplate(def_headers, req_headers, 404, if is_head { Body::empty() } else { e.into() }).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));
+		let address = &addr.parse().unwrap_or_else(|_| panic!("Cannot parse {addr} as address (example format: 0.0.0.0:8080)"));
 
 		// 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 {
+			#[cfg(windows)]
 			// Wait for the CTRL+C signal
 			tokio::signal::ctrl_c().await.expect("Failed to install CTRL+C signal handler");
+
+			#[cfg(unix)]
+			{
+				// Wait for CTRL+C or SIGTERM signals
+				let mut signal_terminate = tokio::signal::unix::signal(tokio::signal::unix::SignalKind::terminate()).expect("Failed to install SIGTERM signal handler");
+				tokio::select! {
+					_ = tokio::signal::ctrl_c() => (),
+					_ = signal_terminate.recv() => ()
+				}
+			}
 		});
 
 		server.boxed()
@@ -376,7 +405,7 @@ fn determine_compressor(accept_encoding: String) -> Option<CompressionType> {
 
 		// The compressor and q-value (if the latter is defined)
 		// will be delimited by semicolons.
-		let mut spl: Split<char> = val.split(';');
+		let mut spl: Split<'_, char> = val.split(';');
 
 		// Get the compressor. For example, in
 		//   gzip;q=0.8
@@ -438,10 +467,10 @@ fn determine_compressor(accept_encoding: String) -> Option<CompressionType> {
 		};
 	}
 
-	if cur_candidate.q != f64::NEG_INFINITY {
-		Some(cur_candidate.alg)
-	} else {
+	if cur_candidate.q == f64::NEG_INFINITY {
 		None
+	} else {
+		Some(cur_candidate.alg)
 	}
 }
 
@@ -453,16 +482,16 @@ fn determine_compressor(accept_encoding: String) -> Option<CompressionType> {
 /// conditions are met:
 ///
 /// 1. the HTTP client requests a compression encoding in the Content-Encoding
-///    header (hence the need for the req_headers);
+///    header (hence the need for the `req_headers`);
 ///
 /// 2. the content encoding corresponds to a compression algorithm we support;
 ///
 /// 3. the Media type in the Content-Type response header is text with any
 ///    subtype (e.g. text/plain) or application/json.
 ///
-/// compress_response returns Ok on successful compression, or if not all three
+/// `compress_response` returns Ok on successful compression, or if not all three
 /// conditions above are met. It returns Err if there was a problem decoding
-/// any header in either req_headers or res, but res will remain intact.
+/// any header in either `req_headers` or res, but res will remain intact.
 ///
 /// This function logs errors to stderr, but only in debug mode. No information
 /// is logged in release builds.
@@ -601,7 +630,7 @@ fn compress_body(compressor: CompressionType, body_bytes: Vec<u8>) -> Result<Vec
 
 		// This arm is for any requested compressor for which we don't yet
 		// have an implementation.
-		_ => {
+		CompressionType::Passthrough => {
 			let msg = "unsupported compressor".to_string();
 			return Err(msg);
 		}
@@ -677,7 +706,7 @@ mod tests {
 
 			// Perform the compression.
 			if let Err(e) = block_on(compress_response(&req_headers, &mut res)) {
-				panic!("compress_response(&req_headers, &mut res) => Err(\"{}\")", e);
+				panic!("compress_response(&req_headers, &mut res) => Err(\"{e}\")");
 			};
 
 			// If the content was compressed, we expect the Content-Encoding
@@ -699,7 +728,7 @@ mod tests {
 			// the Response is the same as what with which we start.
 			let body_vec = match block_on(body::to_bytes(res.body_mut())) {
 				Ok(b) => b.to_vec(),
-				Err(e) => panic!("{}", e),
+				Err(e) => panic!("{e}"),
 			};
 
 			if expected_encoding == CompressionType::Passthrough {
@@ -715,17 +744,17 @@ mod tests {
 			let mut decoder: Box<dyn io::Read> = match expected_encoding {
 				CompressionType::Gzip => match gzip::Decoder::new(&mut body_cursor) {
 					Ok(dgz) => Box::new(dgz),
-					Err(e) => panic!("{}", e),
+					Err(e) => panic!("{e}"),
 				},
 
 				CompressionType::Brotli => Box::new(BrotliDecompressor::new(body_cursor, expected_lorem_ipsum.len())),
 
-				_ => panic!("no decompressor for {}", expected_encoding.to_string()),
+				_ => panic!("no decompressor for {}", expected_encoding),
 			};
 
 			let mut decompressed = Vec::<u8>::new();
 			if let Err(e) = io::copy(&mut decoder, &mut decompressed) {
-				panic!("{}", e);
+				panic!("{e}");
 			};
 
 			assert!(decompressed.eq(&expected_lorem_ipsum));

src/settings.rs

@@ -1,13 +1,18 @@
+#![allow(clippy::cmp_owned)]
+
 use std::collections::HashMap;
 
 // CRATES
 use crate::server::ResponseExt;
-use crate::utils::{redirect, template, Preferences};
-use askama::Template;
+use crate::subreddit::join_until_size_limit;
+use crate::utils::{deflate_decompress, redirect, template, Preferences};
 use cookie::Cookie;
 use futures_lite::StreamExt;
 use hyper::{Body, Request, Response};
+use rinja::Template;
 use time::{Duration, OffsetDateTime};
+use tokio::time::timeout;
+use url::form_urlencoded;
 
 // STRUCTS
 #[derive(Template)]
@@ -19,22 +24,30 @@ struct SettingsTemplate {
 
 // CONSTANTS
 
-const PREFS: [&str; 15] = [
+const PREFS: [&str; 23] = [
 	"theme",
+	"mascot",
+	"redsunlib_colorway",
 	"front_page",
 	"layout",
 	"wide",
 	"comment_sort",
 	"post_sort",
+	"blur_spoiler",
 	"show_nsfw",
 	"blur_nsfw",
 	"use_hls",
+	"ffmpeg_video_downloads",
 	"hide_hls_notification",
 	"autoplay_videos",
+	"hide_sidebar_and_summary",
+	"hide_banner",
 	"fixed_navbar",
 	"hide_awards",
 	"hide_score",
 	"disable_visit_reddit_confirmation",
+	"video_quality",
+	"remove_default_feeds",
 ];
 
 // FUNCTIONS
@@ -42,10 +55,10 @@ const PREFS: [&str; 15] = [
 // Retrieve cookies from request "Cookie" header
 pub async fn get(req: Request<Body>) -> Result<Response<Body>, String> {
 	let url = req.uri().to_string();
-	template(SettingsTemplate {
+	Ok(template(&SettingsTemplate {
 		prefs: Preferences::new(&req),
 		url,
-	})
+	}))
 }
 
 // Set cookies using response "Set-Cookie" header
@@ -54,7 +67,7 @@ pub async fn set(req: Request<Body>) -> Result<Response<Body>, String> {
 	let (parts, mut body) = req.into_parts();
 
 	// Grab existing cookies
-	let _cookies: Vec<Cookie> = parts
+	let _cookies: Vec<Cookie<'_>> = parts
 		.headers
 		.get_all("Cookie")
 		.iter()
@@ -73,14 +86,14 @@ pub async fn set(req: Request<Body>) -> Result<Response<Body>, String> {
 
 	let form = url::form_urlencoded::parse(&body_bytes).collect::<HashMap<_, _>>();
 
-	let mut response = redirect("/settings".to_string());
+	let mut response = redirect("/settings");
 
 	for &name in &PREFS {
 		match form.get(name) {
 			Some(value) => response.insert_cookie(
 				Cookie::build((name.to_owned(), value.clone()))
 					.path("/")
-					.http_only(true)
+					.http_only(name != "ffmpeg_video_downloads")
 					.expires(OffsetDateTime::now_utc() + Duration::weeks(52))
 					.into(),
 			),
@@ -96,7 +109,7 @@ fn set_cookies_method(req: Request<Body>, remove_cookies: bool) -> Response<Body
 	let (parts, _) = req.into_parts();
 
 	// Grab existing cookies
-	let _cookies: Vec<Cookie> = parts
+	let _cookies: Vec<Cookie<'_>> = parts
 		.headers
 		.get_all("Cookie")
 		.iter()
@@ -112,14 +125,14 @@ fn set_cookies_method(req: Request<Body>, remove_cookies: bool) -> Response<Body
 		None => "/".to_string(),
 	};
 
-	let mut response = redirect(path);
+	let mut response = redirect(&path);
 
-	for name in [PREFS.to_vec(), vec!["subscriptions", "filters"]].concat() {
+	for name in [PREFS.to_vec(), vec!["subscriptions", "filters", "quicklist"]].concat() {
 		match form.get(name) {
 			Some(value) => response.insert_cookie(
 				Cookie::build((name.to_owned(), value.clone()))
 					.path("/")
-					.http_only(true)
+					.http_only(name != "ffmpeg_video_downloads")
 					.expires(OffsetDateTime::now_utc() + Duration::weeks(52))
 					.into(),
 			),
@@ -131,6 +144,119 @@ fn set_cookies_method(req: Request<Body>, remove_cookies: bool) -> Response<Body
 		};
 	}
 
+	// Get subscriptions/filters to restore from query string
+	let subscriptions = form.get("subscriptions");
+	let filters = form.get("filters");
+
+	// We can't search through the cookies directly like in subreddit.rs, so instead we have to make a string out of the request's headers to search through
+	let cookies_string = parts
+		.headers
+		.get("cookie")
+		.map(|hv| hv.to_str().unwrap_or("").to_string()) // Return String
+		.unwrap_or_else(String::new); // Return an empty string if None
+
+	// If there are subscriptions to restore set them and delete any old subscriptions cookies, otherwise delete them all
+	if subscriptions.is_some() {
+		let sub_list: Vec<String> = subscriptions.expect("Subscriptions").split('+').map(str::to_string).collect();
+
+		// Start at 0 to keep track of what number we need to start deleting old subscription cookies from
+		let mut subscriptions_number_to_delete_from = 0;
+
+		// Starting at 0 so we handle the subscription cookie without a number first
+		for (subscriptions_number, list) in join_until_size_limit(&sub_list).into_iter().enumerate() {
+			let subscriptions_cookie = if subscriptions_number == 0 {
+				"subscriptions".to_string()
+			} else {
+				format!("subscriptions{}", subscriptions_number)
+			};
+
+			response.insert_cookie(
+				Cookie::build((subscriptions_cookie, list))
+					.path("/")
+					.http_only(true)
+					.expires(OffsetDateTime::now_utc() + Duration::weeks(52))
+					.into(),
+			);
+
+			subscriptions_number_to_delete_from += 1;
+		}
+
+		// While subscriptionsNUMBER= is in the string of cookies add a response removing that cookie
+		while cookies_string.contains(&format!("subscriptions{subscriptions_number_to_delete_from}=")) {
+			// Remove that subscriptions cookie
+			response.remove_cookie(format!("subscriptions{subscriptions_number_to_delete_from}"));
+
+			// Increment subscriptions cookie number
+			subscriptions_number_to_delete_from += 1;
+		}
+	} else {
+		// Remove unnumbered subscriptions cookie
+		response.remove_cookie("subscriptions".to_string());
+
+		// Starts at one to deal with the first numbered subscription cookie and onwards
+		let mut subscriptions_number_to_delete_from = 1;
+
+		// While subscriptionsNUMBER= is in the string of cookies add a response removing that cookie
+		while cookies_string.contains(&format!("subscriptions{subscriptions_number_to_delete_from}=")) {
+			// Remove that subscriptions cookie
+			response.remove_cookie(format!("subscriptions{subscriptions_number_to_delete_from}"));
+
+			// Increment subscriptions cookie number
+			subscriptions_number_to_delete_from += 1;
+		}
+	}
+
+	// If there are filters to restore set them and delete any old filters cookies, otherwise delete them all
+	if filters.is_some() {
+		let filters_list: Vec<String> = filters.expect("Filters").split('+').map(str::to_string).collect();
+
+		// Start at 0 to keep track of what number we need to start deleting old subscription cookies from
+		let mut filters_number_to_delete_from = 0;
+
+		// Starting at 0 so we handle the subscription cookie without a number first
+		for (filters_number, list) in join_until_size_limit(&filters_list).into_iter().enumerate() {
+			let filters_cookie = if filters_number == 0 {
+				"filters".to_string()
+			} else {
+				format!("filters{}", filters_number)
+			};
+
+			response.insert_cookie(
+				Cookie::build((filters_cookie, list))
+					.path("/")
+					.http_only(true)
+					.expires(OffsetDateTime::now_utc() + Duration::weeks(52))
+					.into(),
+			);
+
+			filters_number_to_delete_from += 1;
+		}
+
+		// While filtersNUMBER= is in the string of cookies add a response removing that cookie
+		while cookies_string.contains(&format!("filters{filters_number_to_delete_from}=")) {
+			// Remove that filters cookie
+			response.remove_cookie(format!("filters{filters_number_to_delete_from}"));
+
+			// Increment filters cookie number
+			filters_number_to_delete_from += 1;
+		}
+	} else {
+		// Remove unnumbered filters cookie
+		response.remove_cookie("filters".to_string());
+
+		// Starts at one to deal with the first numbered subscription cookie and onwards
+		let mut filters_number_to_delete_from = 1;
+
+		// While filtersNUMBER= is in the string of cookies add a response removing that cookie
+		while cookies_string.contains(&format!("filters{filters_number_to_delete_from}=")) {
+			// Remove that sfilters cookie
+			response.remove_cookie(format!("filters{filters_number_to_delete_from}"));
+
+			// Increment filters cookie number
+			filters_number_to_delete_from += 1;
+		}
+	}
+
 	response
 }
 
@@ -142,3 +268,35 @@ pub async fn restore(req: Request<Body>) -> Result<Response<Body>, String> {
 pub async fn update(req: Request<Body>) -> Result<Response<Body>, String> {
 	Ok(set_cookies_method(req, false))
 }
+
+pub async fn encoded_restore(req: Request<Body>) -> Result<Response<Body>, String> {
+	let body = hyper::body::to_bytes(req.into_body())
+		.await
+		.map_err(|e| format!("Failed to get bytes from request body: {}", e))?;
+
+	if body.len() > 1024 * 1024 {
+		return Err("Request body too large".to_string());
+	}
+
+	let encoded_prefs = form_urlencoded::parse(&body)
+		.find(|(key, _)| key == "encoded_prefs")
+		.map(|(_, value)| value)
+		.ok_or_else(|| "encoded_prefs parameter not found in request body".to_string())?;
+
+	let bytes = base2048::decode(&encoded_prefs).ok_or_else(|| "Failed to decode base2048 encoded preferences".to_string())?;
+
+	let out = timeout(std::time::Duration::from_secs(1), async { deflate_decompress(bytes) })
+		.await
+		.map_err(|e| format!("Failed to decompress bytes: {}", e))??;
+
+	let mut prefs: Preferences = timeout(std::time::Duration::from_secs(1), async { bincode::deserialize(&out) })
+		.await
+		.map_err(|e| format!("Failed to deserialize preferences: {}", e))?
+		.map_err(|e| format!("Failed to deserialize bytes into Preferences struct: {}", e))?;
+
+	prefs.available_themes = vec![];
+
+	let url = format!("/settings/restore/?{}", prefs.to_urlencoded()?);
+
+	Ok(redirect(&url))
+}

src/subreddit.rs

@@ -1,13 +1,23 @@
+#![allow(clippy::cmp_owned)]
+
+use crate::{config, utils};
 // CRATES
 use crate::utils::{
-	catch_random, error, filter_posts, format_num, format_url, get_filters, nsfw_landing, param, redirect, rewrite_urls, setting, template, val, Post, Preferences, Subreddit,
+	catch_random, error, filter_posts, format_num, format_url, get_filters, info, infobox, nsfw_landing, param, redirect, rewrite_urls, setting, template, val, Post, Preferences,
+	Subreddit,
 };
-use crate::{client::json, server::ResponseExt, RequestExt};
-use askama::Template;
+use crate::{client::json, server::RequestExt, server::ResponseExt};
 use cookie::Cookie;
+use htmlescape::decode_html;
 use hyper::{Body, Request, Response};
+use rinja::Template;
 
-use time::{Duration, OffsetDateTime};
+use chrono::DateTime;
+use once_cell::sync::Lazy;
+use regex::Regex;
+use time::{macros::format_description, Duration, OffsetDateTime};
+
+use log::trace;
 
 // STRUCTS
 #[derive(Template)]
@@ -50,12 +60,16 @@ struct WallTemplate {
 	url: String,
 }
 
+static GEO_FILTER_MATCH: Lazy<Regex> = Lazy::new(|| Regex::new(r"geo_filter=(?<region>\w+)").unwrap());
+
 // SERVICES
 pub async fn community(req: Request<Body>) -> Result<Response<Body>, String> {
 	// Build Reddit API path
 	let root = req.uri().path() == "/";
+	let query = req.uri().query().unwrap_or_default().to_string();
 	let subscribed = setting(&req, "subscriptions");
 	let front_page = setting(&req, "front_page");
+	let remove_default_feeds = setting(&req, "remove_default_feeds") == "on";
 	let post_sort = req.cookie("post_sort").map_or_else(|| "hot".to_string(), |c| c.value().to_string());
 	let sort = req.param("sort").unwrap_or_else(|| req.param("id").unwrap_or(post_sort));
 
@@ -68,6 +82,21 @@ pub async fn community(req: Request<Body>) -> Result<Response<Body>, String> {
 	} else {
 		front_page.clone()
 	});
+
+	if (sub_name == "popular" || sub_name == "all") && remove_default_feeds {
+		if subscribed.is_empty() {
+			return infobox(req, "Subscribe to some subreddits!","Default feeds disabled in settings").await;
+		} else {
+			// If there are subscribed subs, but we get here, then the problem is that front_page pref is set to something besides default.
+			// Tell user to go to settings and change front page to default.
+			return info(
+				req,
+				"You have subscribed to some subreddits, but your front page is not set to default. Visit settings and change front page to default.",
+			)
+			.await;
+		}
+	}
+
 	let quarantined = can_access_quarantine(&req, &sub_name) || root;
 
 	// Handle random subreddits
@@ -76,7 +105,7 @@ pub async fn community(req: Request<Body>) -> Result<Response<Body>, String> {
 	}
 
 	if req.param("sub").is_some() && sub_name.starts_with("u_") {
-		return Ok(redirect(["/user/", &sub_name[2..]].concat()));
+		return Ok(redirect(&["/user/", &sub_name[2..]].concat()));
 	}
 
 	// Request subreddit metadata
@@ -107,21 +136,25 @@ pub async fn community(req: Request<Body>) -> Result<Response<Body>, String> {
 
 	let mut params = String::from("&raw_json=1");
 	if sub_name == "popular" {
-		params.push_str("&geo_filter=GLOBAL");
+		let geo_filter = match GEO_FILTER_MATCH.captures(&query) {
+			Some(geo_filter) => geo_filter["region"].to_string(),
+			None => "GLOBAL".to_owned(),
+		};
+		params.push_str(&format!("&geo_filter={geo_filter}"));
 	}
 
-	let path = format!("/r/{sub_name}/{sort}.json?{}{params}", req.uri().query().unwrap_or_default());
+	let path = format!("/r/{}/{sort}.json?{}{params}", sub_name.replace('+', "%2B"), 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 {
+		Ok(template(&SubredditTemplate {
 			sub,
 			posts: Vec::new(),
 			sort: (sort, param(&path, "t").unwrap_or_default()),
-			ends: (param(&path, "after").unwrap_or_default(), "".to_string()),
+			ends: (param(&path, "after").unwrap_or_default(), String::new()),
 			prefs: Preferences::new(&req),
 			url,
 			redirect_url,
@@ -129,14 +162,18 @@ pub async fn community(req: Request<Body>) -> Result<Response<Body>, String> {
 			all_posts_filtered: false,
 			all_posts_hidden_nsfw: false,
 			no_posts: false,
-		})
+		}))
 	} else {
 		match Post::fetch(&path, quarantined).await {
 			Ok((mut posts, after)) => {
 				let (_, all_posts_filtered) = filter_posts(&mut posts, &filters);
 				let no_posts = posts.is_empty();
 				let all_posts_hidden_nsfw = !no_posts && (posts.iter().all(|p| p.flags.nsfw) && setting(&req, "show_nsfw") != "on");
-				template(SubredditTemplate {
+				if sort == "new" {
+					posts.sort_by(|a, b| b.created_ts.cmp(&a.created_ts));
+					posts.sort_by(|a, b| b.flags.stickied.cmp(&a.flags.stickied));
+				}
+				Ok(template(&SubredditTemplate {
 					sub,
 					posts,
 					sort: (sort, param(&path, "t").unwrap_or_default()),
@@ -148,40 +185,38 @@ pub async fn community(req: Request<Body>) -> Result<Response<Body>, String> {
 					all_posts_filtered,
 					all_posts_hidden_nsfw,
 					no_posts,
-				})
+				}))
 			}
 			Err(msg) => match msg.as_str() {
-				"quarantined" | "gated" => quarantine(req, sub_name, msg),
-				"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,
+				"quarantined" | "gated" => Ok(quarantine(&req, sub_name, &msg)),
+				"private" => error(req, &format!("r/{sub_name} is a private community")).await,
+				"banned" => error(req, &format!("r/{sub_name} has been banned from Reddit")).await,
+				_ => error(req, &msg).await,
 			},
 		}
 	}
 }
 
-pub fn quarantine(req: Request<Body>, sub: String, restriction: String) -> Result<Response<Body>, String> {
+pub fn quarantine(req: &Request<Body>, sub: String, restriction: &str) -> Response<Body> {
 	let wall = WallTemplate {
-		title: format!("r/{} is {}", sub, restriction),
+		title: format!("r/{sub} is {restriction}"),
 		msg: "Please click the button below to continue to this subreddit.".to_string(),
 		url: req.uri().to_string(),
 		sub,
-		prefs: Preferences::new(&req),
+		prefs: Preferences::new(req),
 	};
 
-	Ok(
-		Response::builder()
-			.status(403)
-			.header("content-type", "text/html")
-			.body(wall.render().unwrap_or_default().into())
-			.unwrap_or_default(),
-	)
+	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);
+	let mut response = redirect(&redir);
 	response.insert_cookie(
 		Cookie::build((&format!("allow_quaran_{}", subreddit.to_lowercase()), "true"))
 			.path("/")
@@ -197,8 +232,43 @@ pub fn can_access_quarantine(req: &Request<Body>, sub: &str) -> bool {
 	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> {
+// Join items in chunks of 4000 bytes in length for cookies
+pub fn join_until_size_limit<T: std::fmt::Display>(vec: &[T]) -> Vec<std::string::String> {
+	let mut result = Vec::new();
+	let mut list = String::new();
+	let mut current_size = 0;
+
+	for item in vec {
+		// Size in bytes
+		let item_size = item.to_string().len();
+		// Use 4000 bytes to leave us some headroom because the name and options of the cookie count towards the 4096 byte cap
+		if current_size + item_size > 4000 {
+			// If last item add a seperator on the end of the list so it's interpreted properly in tanden with the next cookie
+			list.push('+');
+
+			// Push current list to result vector
+			result.push(list);
+
+			// Reset the list variable so we can continue with only new items
+			list = String::new();
+		}
+		// Add separator if not the first item
+		if !list.is_empty() {
+			list.push('+');
+		}
+		// Add current item to list
+		list.push_str(&item.to_string());
+		current_size = list.len() + item_size;
+	}
+	// Make sure to push whatever the remaining subreddits are there into the result vector
+	result.push(list);
+
+	// Return resulting vector
+	result
+}
+
+// Sub, filter, unfilter, quicklist, unquicklist or unsub by setting subscription cookie using response "Set-Cookie" header
+pub async fn subscriptions_filters_quicklists(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();
 
@@ -206,9 +276,8 @@ pub async fn subscriptions_filters(req: Request<Body>) -> Result<Response<Body>,
 	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());
 		}
+		return Err("Can't subscribe to random subreddit!".to_string());
 	}
 
 	let query = req.uri().query().unwrap_or_default().to_string();
@@ -216,10 +285,11 @@ pub async fn subscriptions_filters(req: Request<Body>) -> Result<Response<Body>,
 	let preferences = Preferences::new(&req);
 	let mut sub_list = preferences.subscriptions;
 	let mut filters = preferences.filters;
+	let mut quicklist = preferences.quicklist;
 
 	// 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 posts = json(format!("/r/{sub}/hot.json?raw_json=1"), true).await;
 	let display_lookup: Vec<(String, &str)> = match &posts {
 		Ok(posts) => posts["data"]["children"]
 			.as_array()
@@ -247,7 +317,7 @@ pub async fn subscriptions_filters(req: Request<Body>) -> Result<Response<Body>,
 			display
 		} else {
 			// This subreddit display name isn't known, retrieve it
-			let path: String = format!("/r/{}/about.json?raw_json=1", part);
+			let path: String = format!("/r/{part}/about.json?raw_json=1");
 			display = json(path, true).await;
 			match &display {
 				Ok(display) => display["data"]["display_name"].as_str(),
@@ -277,41 +347,133 @@ pub async fn subscriptions_filters(req: Request<Body>) -> Result<Response<Body>,
 		} else if action.contains(&"unfilter".to_string()) {
 			// Remove sub name from filtered list
 			filters.retain(|s| s.to_lowercase() != part.to_lowercase());
+		} else if action.contains(&"quicklist".to_string()) && !quicklist.contains(&part.to_owned()) {
+			// Add each sub name to the filtered list
+			quicklist.push(part.to_owned());
+			// Reorder quicklist alphabetically
+			quicklist.sort_by_key(|a| a.to_lowercase());
+		} else if action.contains(&"unquicklist".to_string()) {
+			// Remove sub name from filtered list
+			quicklist.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)
+	let path = if let Some(redirect_path) = param(&format!("?{query}"), "redirect") {
+		format!("/{redirect_path}")
 	} else {
-		format!("/r/{}", sub)
+		format!("/r/{sub}")
 	};
 
-	let mut response = redirect(path);
+	let mut response = redirect(&path);
 
-	// Delete cookie if empty, else set
+	// If sub_list is empty remove all subscriptions cookies, otherwise update them and remove old ones
 	if sub_list.is_empty() {
+		// Remove subscriptions cookie
 		response.remove_cookie("subscriptions".to_string());
+
+		// Start with first numbered subscriptions cookie
+		let mut subscriptions_number = 1;
+
+		// While whatever subscriptionsNUMBER cookie we're looking at has a value
+		while req.cookie(&format!("subscriptions{}", subscriptions_number)).is_some() {
+			// Remove that subscriptions cookie
+			response.remove_cookie(format!("subscriptions{}", subscriptions_number));
+
+			// Increment subscriptions cookie number
+			subscriptions_number += 1;
+		}
 	} else {
-		response.insert_cookie(
-			Cookie::build(("subscriptions", sub_list.join("+")))
-				.path("/")
-				.http_only(true)
-				.expires(OffsetDateTime::now_utc() + Duration::weeks(52))
-				.into(),
-		);
+		// Start at 0 to keep track of what number we need to start deleting old subscription cookies from
+		let mut subscriptions_number_to_delete_from = 0;
+
+		// Starting at 0 so we handle the subscription cookie without a number first
+		for (subscriptions_number, list) in join_until_size_limit(&sub_list).into_iter().enumerate() {
+			let subscriptions_cookie = if subscriptions_number == 0 {
+				"subscriptions".to_string()
+			} else {
+				format!("subscriptions{}", subscriptions_number)
+			};
+
+			response.insert_cookie(
+				Cookie::build((subscriptions_cookie, list))
+					.path("/")
+					.http_only(true)
+					.expires(OffsetDateTime::now_utc() + Duration::weeks(52))
+					.into(),
+			);
+
+			subscriptions_number_to_delete_from += 1;
+		}
+
+		// While whatever subscriptionsNUMBER cookie we're looking at has a value
+		while req.cookie(&format!("subscriptions{}", subscriptions_number_to_delete_from)).is_some() {
+			// Remove that subscriptions cookie
+			response.remove_cookie(format!("subscriptions{}", subscriptions_number_to_delete_from));
+
+			// Increment subscriptions cookie number
+			subscriptions_number_to_delete_from += 1;
+		}
 	}
+
+	// If filters is empty remove all filters cookies, otherwise update them and remove old ones
 	if filters.is_empty() {
+		// Remove filters cookie
 		response.remove_cookie("filters".to_string());
+
+		// Start with first numbered filters cookie
+		let mut filters_number = 1;
+
+		// While whatever filtersNUMBER cookie we're looking at has a value
+		while req.cookie(&format!("filters{}", filters_number)).is_some() {
+			// Remove that filters cookie
+			response.remove_cookie(format!("filters{}", filters_number));
+
+			// Increment filters cookie number
+			filters_number += 1;
+		}
 	} else {
-		response.insert_cookie(
-			Cookie::build(("filters", filters.join("+")))
-				.path("/")
-				.http_only(true)
-				.expires(OffsetDateTime::now_utc() + Duration::weeks(52))
-				.into(),
-		);
+		// Start at 0 to keep track of what number we need to start deleting old filters cookies from
+		let mut filters_number_to_delete_from = 0;
+
+		for (filters_number, list) in join_until_size_limit(&filters).into_iter().enumerate() {
+			let filters_cookie = if filters_number == 0 {
+				"filters".to_string()
+			} else {
+				format!("filters{}", filters_number)
+			};
+
+			response.insert_cookie(
+				Cookie::build((filters_cookie, list))
+					.path("/")
+					.http_only(true)
+					.expires(OffsetDateTime::now_utc() + Duration::weeks(52))
+					.into(),
+			);
+
+			filters_number_to_delete_from += 1;
+		}
+
+		// While whatever filtersNUMBER cookie we're looking at has a value
+		while req.cookie(&format!("filters{}", filters_number_to_delete_from)).is_some() {
+			// Remove that filters cookie
+			response.remove_cookie(format!("filters{}", filters_number_to_delete_from));
+
+			// Increment filters cookie number
+			filters_number_to_delete_from += 1;
+		}
+		if quicklist.is_empty() {
+			response.remove_cookie("quicklist".to_string());
+		} else {
+			response.insert_cookie(
+				Cookie::build(("quicklist", quicklist.join("+")))
+					.path("/")
+					.http_only(true)
+					.expires(OffsetDateTime::now_utc() + Duration::weeks(52))
+					.into(),
+			);
+		}
 	}
 
 	Ok(response)
@@ -326,22 +488,22 @@ pub async fn wiki(req: Request<Body>) -> Result<Response<Body>, String> {
 	}
 
 	let page = req.param("page").unwrap_or_else(|| "index".to_string());
-	let path: String = format!("/r/{}/wiki/{}.json?raw_json=1", sub, page);
+	let path: String = format!("/r/{sub}/wiki/{page}.json?raw_json=1");
 	let url = req.uri().to_string();
 
 	match json(path, quarantined).await {
-		Ok(response) => template(WikiTemplate {
+		Ok(response) => Ok(template(&WikiTemplate {
 			sub,
 			wiki: rewrite_urls(response["data"]["content_html"].as_str().unwrap_or("<h3>Wiki not found</h3>")),
 			page,
 			prefs: Preferences::new(&req),
 			url,
-		}),
+		})),
 		Err(msg) => {
 			if msg == "quarantined" || msg == "gated" {
-				quarantine(req, sub, msg)
+				Ok(quarantine(&req, sub, &msg))
 			} else {
-				error(req, msg).await
+				error(req, &msg).await
 			}
 		}
 	}
@@ -357,13 +519,13 @@ pub async fn sidebar(req: Request<Body>) -> Result<Response<Body>, String> {
 	}
 
 	// Build the Reddit JSON API url
-	let path: String = format!("/r/{}/about.json?raw_json=1", sub);
+	let path: String = format!("/r/{sub}/about.json?raw_json=1");
 	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 {
+		Ok(response) => Ok(template(&WikiTemplate {
 			wiki: rewrite_urls(&val(&response, "description_html")),
 			// wiki: format!(
 			// 	"{}<hr><h1>Moderators</h1><br><ul>{}</ul>",
@@ -374,12 +536,12 @@ pub async fn sidebar(req: Request<Body>) -> Result<Response<Body>, String> {
 			page: "Sidebar".to_string(),
 			prefs: Preferences::new(&req),
 			url,
-		}),
+		})),
 		Err(msg) => {
 			if msg == "quarantined" || msg == "gated" {
-				quarantine(req, sub, msg)
+				Ok(quarantine(&req, sub, &msg))
 			} else {
-				error(req, msg).await
+				error(req, &msg).await
 			}
 		}
 	}
@@ -422,19 +584,29 @@ pub async fn sidebar(req: Request<Body>) -> Result<Response<Body>, String> {
 // SUBREDDIT
 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);
+	let path: String = format!("/r/{sub}/about.json?raw_json=1");
 
 	// Send a request to the url
 	let res = json(path, quarantined).await?;
 
+	trace!("Subreddit info from r/{} : {}", sub, res["data"]);
+
 	// 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;
 
+	// Grab creation date as unix timestamp
+	let created_unix = res["data"]["created"].as_f64().unwrap_or(0.0).round() as i64;
+	let created = OffsetDateTime::from_unix_timestamp(created_unix).unwrap_or(OffsetDateTime::UNIX_EPOCH);
+
 	// Fetch subreddit icon either from the community_icon or icon_img value
 	let community_icon: &str = res["data"]["community_icon"].as_str().unwrap_or_default();
 	let icon = if community_icon.is_empty() { val(&res, "icon_img") } else { community_icon.to_string() };
 
+	// Fetch subreddit banner either from the banner_background_image or banner_img value
+	let banner_background_image: &str = res["data"]["banner_background_image"].as_str().unwrap_or_default();
+	let banner = if banner_background_image.is_empty() { val(&res, "banner_img") } else { banner_background_image.to_string() };
+
 	Ok(Subreddit {
 		name: val(&res, "display_name"),
 		title: val(&res, "title"),
@@ -442,15 +614,81 @@ async fn subreddit(sub: &str, quarantined: bool) -> Result<Subreddit, String> {
 		info: rewrite_urls(&val(&res, "description_html")),
 		// moderators: moderators_list(sub, quarantined).await.unwrap_or_default(),
 		icon: format_url(&icon),
+		banner: format_url(&banner),
 		members: format_num(members),
 		active: format_num(active),
+		created: created.format(format_description!("[month repr:short] [day] '[year repr:last_two]")).unwrap_or_default(),
 		wiki: res["data"]["wiki_enabled"].as_bool().unwrap_or_default(),
 		nsfw: res["data"]["over18"].as_bool().unwrap_or_default(),
 	})
 }
 
+pub async fn rss(req: Request<Body>) -> Result<Response<Body>, String> {
+	if config::get_setting("REDLIB_ENABLE_RSS").is_none() {
+		return Ok(error(req, "RSS is disabled on this instance.").await.unwrap_or_default());
+	}
+
+	use hyper::header::CONTENT_TYPE;
+	use rss::{ChannelBuilder, Item};
+
+	// Get subreddit
+	let sub = req.param("sub").unwrap_or_default();
+	let post_sort = req.cookie("post_sort").map_or_else(|| "hot".to_string(), |c| c.value().to_string());
+	let sort = req.param("sort").unwrap_or_else(|| req.param("id").unwrap_or(post_sort));
+
+	// Get path
+	let path = format!("/r/{sub}/{sort}.json?{}", req.uri().query().unwrap_or_default());
+
+	// Get subreddit data
+	let subreddit = subreddit(&sub, false).await?;
+
+	// Get posts
+	let (posts, _) = Post::fetch(&path, false).await?;
+
+	// Build the RSS feed
+	let channel = ChannelBuilder::default()
+		.title(&subreddit.title)
+		.description(&subreddit.description)
+		.items(
+			posts
+				.into_iter()
+				.map(|post| Item {
+					title: Some(post.title.to_string()),
+					link: Some(format_url(&utils::get_post_url(&post))),
+					author: Some(post.author.name),
+					content: Some(rewrite_urls(&decode_html(&post.body).unwrap())),
+					pub_date: Some(DateTime::from_timestamp(post.created_ts as i64, 0).unwrap_or_default().to_rfc2822()),
+					description: Some(format!(
+						"<a href='{}{}'>Comments</a>",
+						config::get_setting("REDLIB_FULL_URL").unwrap_or_default(),
+						post.permalink
+					)),
+					..Default::default()
+				})
+				.collect::<Vec<_>>(),
+		)
+		.build();
+
+	// Serialize the feed to RSS
+	let body = channel.to_string().into_bytes();
+
+	// Create the HTTP response
+	let mut res = Response::new(Body::from(body));
+	res.headers_mut().insert(CONTENT_TYPE, hyper::header::HeaderValue::from_static("application/rss+xml"));
+
+	Ok(res)
+}
+
 #[tokio::test(flavor = "multi_thread")]
 async fn test_fetching_subreddit() {
 	let subreddit = subreddit("rust", false).await;
 	assert!(subreddit.is_ok());
 }
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_gated_and_quarantined() {
+	let quarantined = subreddit("edgy", true).await;
+	assert!(quarantined.is_ok());
+	let gated = subreddit("drugs", true).await;
+	assert!(gated.is_ok());
+}

src/user.rs

@@ -1,9 +1,15 @@
+#![allow(clippy::cmp_owned)]
+
 // CRATES
 use crate::client::json;
 use crate::server::RequestExt;
 use crate::utils::{error, filter_posts, format_url, get_filters, nsfw_landing, param, setting, template, Post, Preferences, User};
-use askama::Template;
+use crate::{config, utils};
+use chrono::DateTime;
+use htmlescape::decode_html;
 use hyper::{Body, Request, Response};
+use log::trace;
+use rinja::Template;
 use time::{macros::format_description, OffsetDateTime};
 
 // STRUCTS
@@ -35,9 +41,8 @@ pub async fn profile(req: Request<Body>) -> Result<Response<Body>, String> {
 
 	// Build the Reddit JSON API path
 	let path = format!(
-		"/user/{}/{}.json?{}&raw_json=1",
+		"/user/{}/{listing}.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()));
@@ -60,11 +65,11 @@ pub async fn profile(req: Request<Body>) -> Result<Response<Body>, String> {
 
 	let filters = get_filters(&req);
 	if filters.contains(&["u_", &username].concat()) {
-		template(UserTemplate {
+		Ok(template(&UserTemplate {
 			user,
 			posts: Vec::new(),
 			sort: (sort, param(&path, "t").unwrap_or_default()),
-			ends: (param(&path, "after").unwrap_or_default(), "".to_string()),
+			ends: (param(&path, "after").unwrap_or_default(), String::new()),
 			listing,
 			prefs: Preferences::new(&req),
 			url,
@@ -73,7 +78,7 @@ pub async fn profile(req: Request<Body>) -> Result<Response<Body>, String> {
 			all_posts_filtered: false,
 			all_posts_hidden_nsfw: false,
 			no_posts: false,
-		})
+		}))
 	} else {
 		// Request user posts/comments from Reddit
 		match Post::fetch(&path, false).await {
@@ -81,7 +86,7 @@ pub async fn profile(req: Request<Body>) -> Result<Response<Body>, String> {
 				let (_, all_posts_filtered) = filter_posts(&mut posts, &filters);
 				let no_posts = posts.is_empty();
 				let all_posts_hidden_nsfw = !no_posts && (posts.iter().all(|p| p.flags.nsfw) && setting(&req, "show_nsfw") != "on");
-				template(UserTemplate {
+				Ok(template(&UserTemplate {
 					user,
 					posts,
 					sort: (sort, param(&path, "t").unwrap_or_default()),
@@ -94,10 +99,10 @@ pub async fn profile(req: Request<Body>) -> Result<Response<Body>, String> {
 					all_posts_filtered,
 					all_posts_hidden_nsfw,
 					no_posts,
-				})
+				}))
 			}
 			// If there is an error show error page
-			Err(msg) => error(req, msg).await,
+			Err(msg) => error(req, &msg).await,
 		}
 	}
 }
@@ -105,10 +110,11 @@ pub async fn profile(req: Request<Body>) -> Result<Response<Body>, String> {
 // USER
 async fn user(name: &str) -> Result<User, String> {
 	// Build the Reddit JSON API path
-	let path: String = format!("/user/{}/about.json?raw_json=1", name);
+	let path: String = format!("/user/{name}/about.json?raw_json=1");
 
 	// Send a request to the url
 	json(path, false).await.map(|res| {
+		trace!("User info from r/{} : {}", name, res["data"]);
 		// Grab creation date as unix timestamp
 		let created_unix = res["data"]["created"].as_f64().unwrap_or(0.0).round() as i64;
 		let created = OffsetDateTime::from_unix_timestamp(created_unix).unwrap_or(OffsetDateTime::UNIX_EPOCH);
@@ -130,6 +136,57 @@ async fn user(name: &str) -> Result<User, String> {
 	})
 }
 
+pub async fn rss(req: Request<Body>) -> Result<Response<Body>, String> {
+	if config::get_setting("REDLIB_ENABLE_RSS").is_none() {
+		return Ok(error(req, "RSS is disabled on this instance.").await.unwrap_or_default());
+	}
+	use crate::utils::rewrite_urls;
+	use hyper::header::CONTENT_TYPE;
+	use rss::{ChannelBuilder, Item};
+
+	// Get user
+	let user_str = req.param("name").unwrap_or_default();
+
+	let listing = req.param("listing").unwrap_or_else(|| "overview".to_string());
+
+	// Get path
+	let path = format!("/user/{user_str}/{listing}.json?{}&raw_json=1", req.uri().query().unwrap_or_default(),);
+
+	// Get user
+	let user_obj = user(&user_str).await.unwrap_or_default();
+
+	// Get posts
+	let (posts, _) = Post::fetch(&path, false).await?;
+
+	// Build the RSS feed
+	let channel = ChannelBuilder::default()
+		.title(user_str)
+		.description(user_obj.description)
+		.items(
+			posts
+				.into_iter()
+				.map(|post| Item {
+					title: Some(post.title.to_string()),
+					link: Some(format_url(&utils::get_post_url(&post))),
+					author: Some(post.author.name),
+					pub_date: Some(DateTime::from_timestamp(post.created_ts as i64, 0).unwrap_or_default().to_rfc2822()),
+					content: Some(rewrite_urls(&decode_html(&post.body).unwrap())),
+					..Default::default()
+				})
+				.collect::<Vec<_>>(),
+		)
+		.build();
+
+	// Serialize the feed to RSS
+	let body = channel.to_string().into_bytes();
+
+	// Create the HTTP response
+	let mut res = Response::new(Body::from(body));
+	res.headers_mut().insert(CONTENT_TYPE, hyper::header::HeaderValue::from_static("application/rss+xml"));
+
+	Ok(res)
+}
+
 #[tokio::test(flavor = "multi_thread")]
 async fn test_fetching_user() {
 	let user = user("spez").await;

static/check_update.js

@@ -0,0 +1,55 @@
+async function checkInstanceUpdateStatus() {
+    try {
+        const response = await fetch('/commits.json');
+        const text = await response.text();
+        const entries = JSON.parse(text);
+        const localCommit = document.getElementById('git_commit').dataset.value;
+
+        let statusMessage = '';
+
+        if (entries.length > 0) {
+            const commitHashes = Array.from(entries).map(entry => {
+                return entry.sha
+            });
+
+            const commitIndex = commitHashes.indexOf(localCommit);
+
+            if (commitIndex === 0) {
+                statusMessage = '✅ Instance is up to date.';
+            } else if (commitIndex > 0) {
+                statusMessage = `⚠️ This instance is not up to date and is ${commitIndex} commits old. Test and confirm on an up-to-date instance before reporting.`;
+                document.getElementById('error-318').remove();
+            } else {
+                statusMessage = `⚠️ This instance is not up to date and is at least ${commitHashes.length} commits old. Test and confirm on an up-to-date instance before reporting.`;
+                document.getElementById('error-318').remove();
+            }
+        } else {
+            statusMessage = '⚠️ Unable to fetch commit information.';
+        }
+
+        document.getElementById('update-status').innerText = statusMessage;
+    } catch (error) {
+        console.error('Error fetching commits:', error);
+        document.getElementById('update-status').innerText = '⚠️ Error checking update status: ' + error;
+    }
+}
+
+async function checkOtherInstances() {
+    try {
+        const response = await fetch('/instances.json');
+        const data = await response.json();
+        const randomInstance = data.instances[Math.floor(Math.random() * data.instances.length)];
+        const instanceUrl = randomInstance.url;
+        // Set the href of the <a> tag to the instance URL with path included
+        document.getElementById('random-instance').href = instanceUrl + window.location.pathname;
+        //document.getElementById('random-instance').innerText = "Visit Random Instance";
+    } catch (error) {
+        console.error('Error fetching instances:', error);
+        document.getElementById('update-status').innerText = '⚠️ Error checking other instances: ' + error;
+    }
+}
+
+// Set the target URL when the page loads
+window.addEventListener('load', checkOtherInstances);
+
+checkInstanceUpdateStatus();

static/copy.js

@@ -0,0 +1,9 @@
+async function copy() {
+    await navigator.clipboard.writeText(document.getElementById('bincode_str').value);
+}
+
+async function set_listener() {
+    document.getElementById('copy').addEventListener('click', copy);
+}
+
+window.addEventListener('load', set_listener);

static/ffmpeg/814.ffmpeg.js

@@ -0,0 +1,2 @@
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.FFmpegWASM=t():e.FFmpegWASM=t()}(self,(()=>(()=>{var e={454:e=>{function t(e){return Promise.resolve().then((()=>{var t=new Error("Cannot find module '"+e+"'");throw t.code="MODULE_NOT_FOUND",t}))}t.keys=()=>[],t.resolve=t,t.id=454,e.exports=t}},t={};function r(a){var o=t[a];if(void 0!==o)return o.exports;var s=t[a]={exports:{}};return e[a](s,s.exports,r),s.exports}return r.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),(()=>{"use strict";var e;!function(e){e.LOAD="LOAD",e.EXEC="EXEC",e.WRITE_FILE="WRITE_FILE",e.READ_FILE="READ_FILE",e.DELETE_FILE="DELETE_FILE",e.RENAME="RENAME",e.CREATE_DIR="CREATE_DIR",e.LIST_DIR="LIST_DIR",e.DELETE_DIR="DELETE_DIR",e.ERROR="ERROR",e.DOWNLOAD="DOWNLOAD",e.PROGRESS="PROGRESS",e.LOG="LOG",e.MOUNT="MOUNT",e.UNMOUNT="UNMOUNT"}(e||(e={}));const t=new Error("unknown message type"),a=new Error("ffmpeg is not loaded, call `await ffmpeg.load()` first"),o=(new Error("called FFmpeg.terminate()"),new Error("failed to import ffmpeg-core.js"));let s;self.onmessage=async({data:{id:n,type:E,data:i}})=>{const c=[];let p;try{if(E!==e.LOAD&&!s)throw a;switch(E){case e.LOAD:p=await(async({coreURL:t="https://unpkg.com/@ffmpeg/core@0.12.1/dist/umd/ffmpeg-core.js",wasmURL:a,workerURL:n})=>{const E=!s,i=t,c=a||t.replace(/.js$/g,".wasm"),p=n||t.replace(/.js$/g,".worker.js");try{importScripts(i)}catch{if(self.createFFmpegCore=(await r(454)(i)).default,!self.createFFmpegCore)throw o}return s=await self.createFFmpegCore({mainScriptUrlOrBlob:`${i}#${btoa(JSON.stringify({wasmURL:c,workerURL:p}))}`}),s.setLogger((t=>self.postMessage({type:e.LOG,data:t}))),s.setProgress((t=>self.postMessage({type:e.PROGRESS,data:t}))),E})(i);break;case e.EXEC:p=(({args:e,timeout:t=-1})=>{s.setTimeout(t),s.exec(...e);const r=s.ret;return s.reset(),r})(i);break;case e.WRITE_FILE:p=(({path:e,data:t})=>(s.FS.writeFile(e,t),!0))(i);break;case e.READ_FILE:p=(({path:e,encoding:t})=>s.FS.readFile(e,{encoding:t}))(i);break;case e.DELETE_FILE:p=(({path:e})=>(s.FS.unlink(e),!0))(i);break;case e.RENAME:p=(({oldPath:e,newPath:t})=>(s.FS.rename(e,t),!0))(i);break;case e.CREATE_DIR:p=(({path:e})=>(s.FS.mkdir(e),!0))(i);break;case e.LIST_DIR:p=(({path:e})=>{const t=s.FS.readdir(e),r=[];for(const a of t){const t=s.FS.stat(`${e}/${a}`),o=s.FS.isDir(t.mode);r.push({name:a,isDir:o})}return r})(i);break;case e.DELETE_DIR:p=(({path:e})=>(s.FS.rmdir(e),!0))(i);break;case e.MOUNT:p=(({fsType:e,options:t,mountPoint:r})=>{let a=e,o=s.FS.filesystems[a];return!!o&&(s.FS.mount(o,t,r),!0)})(i);break;case e.UNMOUNT:p=(({mountPoint:e})=>(s.FS.unmount(e),!0))(i);break;default:throw t}}catch(t){return void self.postMessage({id:n,type:e.ERROR,data:t.toString()})}p instanceof Uint8Array&&c.push(p.buffer),self.postMessage({id:n,type:E,data:p},c)}})(),{}})()));
+//# sourceMappingURL=814.ffmpeg.js.map

static/ffmpeg/ffmpeg-util.js

@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.FFmpegUtil=t():e.FFmpegUtil=t()}(self,(()=>(()=>{"use strict";var e={591:(e,t)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.HeaderContentLength=void 0,t.HeaderContentLength="Content-Length"},431:(e,t)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.ERROR_INCOMPLETED_DOWNLOAD=t.ERROR_RESPONSE_BODY_READER=void 0,t.ERROR_RESPONSE_BODY_READER=new Error("failed to get response body reader"),t.ERROR_INCOMPLETED_DOWNLOAD=new Error("failed to complete download")},915:function(e,t,o){var r=this&&this.__awaiter||function(e,t,o,r){return new(o||(o=Promise))((function(n,i){function d(e){try{l(r.next(e))}catch(e){i(e)}}function a(e){try{l(r.throw(e))}catch(e){i(e)}}function l(e){var t;e.done?n(e.value):(t=e.value,t instanceof o?t:new o((function(e){e(t)}))).then(d,a)}l((r=r.apply(e,t||[])).next())}))};Object.defineProperty(t,"__esModule",{value:!0}),t.toBlobURL=t.downloadWithProgress=t.importScript=t.fetchFile=void 0;const n=o(431),i=o(591);t.fetchFile=e=>r(void 0,void 0,void 0,(function*(){let t;if("string"==typeof e)t=/data:_data\/([a-zA-Z]*);base64,([^"]*)/.test(e)?atob(e.split(",")[1]).split("").map((e=>e.charCodeAt(0))):yield(yield fetch(e)).arrayBuffer();else if(e instanceof URL)t=yield(yield fetch(e)).arrayBuffer();else{if(!(e instanceof File||e instanceof Blob))return new Uint8Array;t=yield(o=e,new Promise(((e,t)=>{const r=new FileReader;r.onload=()=>{const{result:t}=r;t instanceof ArrayBuffer?e(new Uint8Array(t)):e(new Uint8Array)},r.onerror=e=>{var o,r;t(Error(`File could not be read! Code=${(null===(r=null===(o=null==e?void 0:e.target)||void 0===o?void 0:o.error)||void 0===r?void 0:r.code)||-1}`))},r.readAsArrayBuffer(o)})))}var o;return new Uint8Array(t)})),t.importScript=e=>r(void 0,void 0,void 0,(function*(){return new Promise((t=>{const o=document.createElement("script"),r=()=>{o.removeEventListener("load",r),t()};o.src=e,o.type="text/javascript",o.addEventListener("load",r),document.getElementsByTagName("head")[0].appendChild(o)}))})),t.downloadWithProgress=(e,t)=>r(void 0,void 0,void 0,(function*(){var o;const r=yield fetch(e);let d;try{const a=parseInt(r.headers.get(i.HeaderContentLength)||"-1"),l=null===(o=r.body)||void 0===o?void 0:o.getReader();if(!l)throw n.ERROR_RESPONSE_BODY_READER;const c=[];let s=0;for(;;){const{done:o,value:r}=yield l.read(),i=r?r.length:0;if(o){if(-1!=a&&a!==s)throw n.ERROR_INCOMPLETED_DOWNLOAD;t&&t({url:e,total:a,received:s,delta:i,done:o});break}c.push(r),s+=i,t&&t({url:e,total:a,received:s,delta:i,done:o})}const f=new Uint8Array(s);let u=0;for(const e of c)f.set(e,u),u+=e.length;d=f.buffer}catch(o){console.log("failed to send download progress event: ",o),d=yield r.arrayBuffer(),t&&t({url:e,total:d.byteLength,received:d.byteLength,delta:0,done:!0})}return d})),t.toBlobURL=(e,o,n=!1,i)=>r(void 0,void 0,void 0,(function*(){const r=n?yield(0,t.downloadWithProgress)(e,i):yield(yield fetch(e)).arrayBuffer(),d=new Blob([r],{type:o});return URL.createObjectURL(d)}))}},t={};return function o(r){var n=t[r];if(void 0!==n)return n.exports;var i=t[r]={exports:{}};return e[r].call(i.exports,i,i.exports,o),i.exports}(915)})()));

static/ffmpeg/ffmpeg.js

@@ -0,0 +1,2 @@
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.FFmpegWASM=t():e.FFmpegWASM=t()}(self,(()=>(()=>{"use strict";var e={m:{},d:(t,s)=>{for(var r in s)e.o(s,r)&&!e.o(t,r)&&Object.defineProperty(t,r,{enumerable:!0,get:s[r]})},u:e=>e+".ffmpeg.js"};e.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),e.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),e.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},(()=>{var t;e.g.importScripts&&(t=e.g.location+"");var s=e.g.document;if(!t&&s&&(s.currentScript&&(t=s.currentScript.src),!t)){var r=s.getElementsByTagName("script");if(r.length)for(var a=r.length-1;a>-1&&!t;)t=r[a--].src}if(!t)throw new Error("Automatic publicPath is not supported in this browser");t=t.replace(/#.*$/,"").replace(/\?.*$/,"").replace(/\/[^\/]+$/,"/"),e.p=t})(),e.b=document.baseURI||self.location.href;var t,s={};e.r(s),e.d(s,{FFmpeg:()=>i}),function(e){e.LOAD="LOAD",e.EXEC="EXEC",e.WRITE_FILE="WRITE_FILE",e.READ_FILE="READ_FILE",e.DELETE_FILE="DELETE_FILE",e.RENAME="RENAME",e.CREATE_DIR="CREATE_DIR",e.LIST_DIR="LIST_DIR",e.DELETE_DIR="DELETE_DIR",e.ERROR="ERROR",e.DOWNLOAD="DOWNLOAD",e.PROGRESS="PROGRESS",e.LOG="LOG",e.MOUNT="MOUNT",e.UNMOUNT="UNMOUNT"}(t||(t={}));const r=(()=>{let e=0;return()=>e++})(),a=(new Error("unknown message type"),new Error("ffmpeg is not loaded, call `await ffmpeg.load()` first")),o=new Error("called FFmpeg.terminate()");new Error("failed to import ffmpeg-core.js");class i{#e=null;#t={};#s={};#r=[];#a=[];loaded=!1;#o=()=>{this.#e&&(this.#e.onmessage=({data:{id:e,type:s,data:r}})=>{switch(s){case t.LOAD:this.loaded=!0,this.#t[e](r);break;case t.MOUNT:case t.UNMOUNT:case t.EXEC:case t.WRITE_FILE:case t.READ_FILE:case t.DELETE_FILE:case t.RENAME:case t.CREATE_DIR:case t.LIST_DIR:case t.DELETE_DIR:this.#t[e](r);break;case t.LOG:this.#r.forEach((e=>e(r)));break;case t.PROGRESS:this.#a.forEach((e=>e(r)));break;case t.ERROR:this.#s[e](r)}delete this.#t[e],delete this.#s[e]})};#i=({type:e,data:t},s=[],o)=>this.#e?new Promise(((a,i)=>{const n=r();this.#e&&this.#e.postMessage({id:n,type:e,data:t},s),this.#t[n]=a,this.#s[n]=i,o?.addEventListener("abort",(()=>{i(new DOMException(`Message # ${n} was aborted`,"AbortError"))}),{once:!0})})):Promise.reject(a);on(e,t){"log"===e?this.#r.push(t):"progress"===e&&this.#a.push(t)}off(e,t){"log"===e?this.#r=this.#r.filter((e=>e!==t)):"progress"===e&&(this.#a=this.#a.filter((e=>e!==t)))}load=(s={},{signal:r}={})=>(this.#e||(this.#e=new Worker(new URL(e.p+e.u(814),e.b),{type:void 0}),this.#o()),this.#i({type:t.LOAD,data:s},void 0,r));exec=(e,s=-1,{signal:r}={})=>this.#i({type:t.EXEC,data:{args:e,timeout:s}},void 0,r);terminate=()=>{const e=Object.keys(this.#s);for(const t of e)this.#s[t](o),delete this.#s[t],delete this.#t[t];this.#e&&(this.#e.terminate(),this.#e=null,this.loaded=!1)};writeFile=(e,s,{signal:r}={})=>{const a=[];return s instanceof Uint8Array&&a.push(s.buffer),this.#i({type:t.WRITE_FILE,data:{path:e,data:s}},a,r)};mount=(e,s,r)=>this.#i({type:t.MOUNT,data:{fsType:e,options:s,mountPoint:r}},[]);unmount=e=>this.#i({type:t.UNMOUNT,data:{mountPoint:e}},[]);readFile=(e,s="binary",{signal:r}={})=>this.#i({type:t.READ_FILE,data:{path:e,encoding:s}},void 0,r);deleteFile=(e,{signal:s}={})=>this.#i({type:t.DELETE_FILE,data:{path:e}},void 0,s);rename=(e,s,{signal:r}={})=>this.#i({type:t.RENAME,data:{oldPath:e,newPath:s}},void 0,r);createDir=(e,{signal:s}={})=>this.#i({type:t.CREATE_DIR,data:{path:e}},void 0,s);listDir=(e,{signal:s}={})=>this.#i({type:t.LIST_DIR,data:{path:e}},void 0,s);deleteDir=(e,{signal:s}={})=>this.#i({type:t.DELETE_DIR,data:{path:e}},void 0,s)}return s})()));
+//# sourceMappingURL=ffmpeg.js.map

static/highlighted.js

@@ -0,0 +1 @@
+document.querySelector('#commentQueryForms').scrollIntoView();

static/logo.svg

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   viewBox="0 0 512 512"
+   id="svg2"
+   width="512"
+   height="512"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs id="defs2" />
+  <rect width="512" height="512" fill="#4c082a" />
+  <g
+     transform="matrix(0.75272,0,0,0.75272,-1.1596187,-0.37987125)"
+     id="g2">
+    <circle
+       fill="#1a1a1a"
+       id="circle1"
+       style="fill:#4c082a;fill-opacity:0"
+       r="340.10001"
+       cy="340.32001"
+       cx="341.10999" />
+    <path
+       d="m 320.64,126.73 v 300.8 h 92.264 V 219.61 h 75.803 v -92.83 h -75.803 v -0.0508 z"
+       fill="#f83240"
+       id="path1"
+       style="fill:#f83240;fill-opacity:1" />
+    <path
+       d="M 193.1,126.74 V 510.7 h 0.006 v 43.543 h 295.82 v -92.338 h -202.74 v -335.16 z"
+       fill="#f83240"
+       id="path2"
+       style="fill:#f83240;fill-opacity:1" />
+  </g>
+</svg>

static/opensearch.xml

@@ -3,9 +3,9 @@
   <ShortName>Search Redlib</ShortName>
   <Description>Search for whatever you want on Redlib, awesome Reddit frontend</Description>
   <InputEncoding>UTF-8</InputEncoding>
-  <Image width="32" height="32" type="image/x-icon">/favicon.ico</Image>
-  <Url type="text/html" template="/search">
+  <Image width="32" height="32" type="image/x-icon">https://localhost:8080/favicon.ico</Image>
+  <Url type="text/html" template="https://localhost:8080/search">
     <Param name="q" value="{searchTerms}"/>
   </Url>
-  <moz:SearchForm>/search</moz:SearchForm>
+  <moz:SearchForm>https://localhost:8080/search</moz:SearchForm>
 </OpenSearchDescription>

static/playHLSVideo.js

@@ -1,77 +0,0 @@
-// @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/themes/black.css

@@ -1,6 +1,6 @@
 /* Black theme setting */
 .black {
-	--accent: #009a9a;
+	--accent: #bb2b3b;
 	--green: #00a229;
 	--text: white;
 	--foreground: #0f0f0f;

static/themes/catppuccin.css

@@ -0,0 +1,17 @@
+/* Catppuccin theme setting */
+.catppuccin {
+  --accent: #b4befe; /* lavender */
+  --green: #a6e3a1; /* green */
+  --text: #cdd6f4; /* text */
+  --foreground: #181825; /* mantle */
+  --background: #1e1e2e; /* base */
+  --outside: #11111b; /* crust */
+  --post: #11111b; /* crust */
+  --panel-border: none;
+  --highlighted: #313244; /* surface0 */
+  --visited: #6c7086; /* overlay0 */
+  --shadow: 0 0 0 transparent;
+
+  --nsfw: #fab387; /* peach */
+  --admin: #eba0ac; /* maroon */
+}

static/themes/dark.css

@@ -1,6 +1,6 @@
 /* Dark theme setting */
 .dark{
-	--accent: aqua;
+	--accent: #d54455;
 	--green: #5cff85;
 	--text: white;
 	--foreground: #222;

static/themes/icebergDark.css

@@ -0,0 +1,14 @@
+/* icebergDark theme setting */
+.icebergDark {
+	--accent: #85a0c7;
+	--green: #b5bf82;
+	--text: #c6c8d1;
+	--foreground: #454d73;
+	--background: #161821;
+	--outside: #1f2233;
+	--post: #1f2233;
+	--panel-border: 1px solid #454d73;
+	--highlighted: #0f1117;
+	--visited: #0f1117;
+	--shadow: 0 1px 3px rgba(0, 0, 0, 0.5);
+}

static/themes/libredditBlack.css

@@ -0,0 +1,14 @@
+/* Libreddit black theme setting */
+.libredditBlack {
+	--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/libredditDark.css

@@ -0,0 +1,14 @@
+/* Libreddit dark theme setting */
+.libredditDark{
+	--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/libredditLight.css

@@ -0,0 +1,19 @@
+/* Libreddit light theme setting */
+.libredditLight {
+	--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);
+}
+
+html:has(> .libredditLight) {
+  /* Hint color theme to browser for scrollbar */
+  color-scheme: light;
+}

static/themes/light.css

@@ -1,6 +1,6 @@
 /* Light theme setting */
 .light {
-	--accent: #009a9a;
+	--accent: #bb2b3b;
 	--green: #00a229;
 	--text: black;
 	--foreground: #f5f5f5;

static/themes/midnightPurple.css

@@ -0,0 +1,14 @@
+/* midnightpurple theme setting */
+.midnightPurple{
+	--accent: #be6ede;
+	--green: #268F02;
+	--text: white;
+	--foreground: #222;
+	--background: #000000;
+	--outside: #1f1f1f;
+	--post: #000000;
+	--panel-border: 1px solid #4E1764;
+	--highlighted: #333;
+	--visited: #aaa;
+	--shadow: 0 1px 3px rgba(0, 0, 0, 0.5);
+}

static/videoUtils.js

@@ -0,0 +1,232 @@
+// @license http://www.gnu.org/licenses/agpl-3.0.html AGPL-3.0
+let ffmpeg = null;
+
+let loadingsvg = `<svg class="rotate" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><g fill="none" fill-rule="evenodd"><path d="m12.593 23.258l-.011.002l-.071.035l-.02.004l-.014-.004l-.071-.035q-.016-.005-.024.005l-.004.01l-.017.428l.005.02l.01.013l.104.074l.015.004l.012-.004l.104-.074l.012-.016l.004-.017l-.017-.427q-.004-.016-.017-.018m.265-.113l-.013.002l-.185.093l-.01.01l-.003.011l.018.43l.005.012l.008.007l.201.093q.019.005.029-.008l.004-.014l-.034-.614q-.005-.018-.02-.022m-.715.002a.02.02 0 0 0-.027.006l-.006.014l-.034.614q.001.018.017.024l.015-.002l.201-.093l.01-.008l.004-.011l.017-.43l-.003-.012l-.01-.01z"/><path fill="currentColor" d="M12 4.5a7.5 7.5 0 1 0 0 15a7.5 7.5 0 0 0 0-15M1.5 12C1.5 6.201 6.201 1.5 12 1.5S22.5 6.201 22.5 12S17.799 22.5 12 22.5S1.5 17.799 1.5 12" opacity="0.1"/><path fill="currentColor" d="M12 4.5a7.46 7.46 0 0 0-5.187 2.083a1.5 1.5 0 0 1-2.075-2.166A10.46 10.46 0 0 1 12 1.5a1.5 1.5 0 0 1 0 3"/></g></svg>`;
+let downloadsvg = `<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><g fill="none"><path d="m12.593 23.258l-.011.002l-.071.035l-.02.004l-.014-.004l-.071-.035q-.016-.005-.024.005l-.004.01l-.017.428l.005.02l.01.013l.104.074l.015.004l.012-.004l.104-.074l.012-.016l.004-.017l-.017-.427q-.004-.016-.017-.018m.265-.113l-.013.002l-.185.093l-.01.01l-.003.011l.018.43l.005.012l.008.007l.201.093q.019.005.029-.008l.004-.014l-.034-.614q-.005-.018-.02-.022m-.715.002a.02.02 0 0 0-.027.006l-.006.014l-.034.614q.001.018.017.024l.015-.002l.201-.093l.01-.008l.004-.011l.017-.43l-.003-.012l-.01-.01z"/><path fill="currentColor" d="M20 15a1 1 0 0 1 1 1v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4a1 1 0 1 1 2 0v4h14v-4a1 1 0 0 1 1-1M12 2a1 1 0 0 1 1 1v10.243l2.536-2.536a1 1 0 1 1 1.414 1.414l-4.066 4.066a1.25 1.25 0 0 1-1.768 0L7.05 12.121a1 1 0 1 1 1.414-1.414L11 13.243V3a1 1 0 0 1 1-1"/></g></svg>`;
+
+(function () {
+    if (Hls.isSupported()) {
+
+        var downloadsEnabled = document.cookie.split("; ").find((row) => row.startsWith("ffmpeg_video_downloads="))?.split("=")[1] == "on";
+
+        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) === "probably" && !downloadsEnabled) {
+                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;
+                    var availableLevels = hls.levels.map(function(level) {
+                        return {
+                            height: level.height,
+                            width: level.width,
+                            bitrate: level.bitrate,
+                        };
+                    });
+
+                    addQualitySelector(newVideo, hls, availableLevels);
+                    if (downloadsEnabled){ addVideoDownload(newVideo, hls); }
+                    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);
+                });
+            }
+
+            if (downloadsEnabled){
+                const { fetchFile } = FFmpegUtil;
+                const { FFmpeg } = FFmpegWASM;
+
+                function addVideoDownload(videoElement, hlsInstance) {
+                    var mediaStream = [];
+                    var downloadButton = document.createElement('button');
+                    downloadButton.classList.add('video-options','download');
+                    downloadButton.innerHTML = loadingsvg
+                    const mergeStreams = async () => {
+                        if (ffmpeg === null) {
+                          ffmpeg = new FFmpeg();
+                          await ffmpeg.load({
+                            coreURL: "/ffmpeg/ffmpeg-core.js",
+                          });
+                          ffmpeg.on("log", ({ message }) => {
+                            console.log(message); // This is quite noisy but i will include it
+                          })
+                          ffmpeg.on("progress", ({ progress, time }) => { // Progress TODO: show progress ring around button not just ⏳
+                            // console.log("ffmpeg prog:",progress * 100) 
+                          });
+                        }
+                        // Combine Video Audio Streams
+                        await ffmpeg.writeFile("video", await fetchFile(concatBlob(mediaStream['video'])));
+                        await ffmpeg.writeFile("audio", await fetchFile(concatBlob(mediaStream['audio'])));
+                        console.time('ffmpeg-exec');
+                        await ffmpeg.exec(['-i', "video", '-i', "audio",'-c:v', "copy", '-c:a', "aac",  'output.mp4']);
+                        console.timeEnd('ffmpeg-exec')
+    
+                        // Save
+                        const toSlug = (str) => {
+                            return str
+                              .normalize('NFD')
+                              .replace(/[\u0300-\u036f]/g, '')
+                              .replace(/[\W_]+/g, '-')
+                              .toLowerCase()
+                              .replace(/^-+|-+$/g, '');
+                        }
+    
+                        var filename = toSlug(videoElement.parentNode.parentNode.id || document.title)
+                        const data = await ffmpeg.readFile('output.mp4');
+                        saveAs(new Blob([data.buffer], {type: 'video/mp4'}),filename);
+                        return
+                    }
+                    function saveAs(blob, filename) { // Yeah ok...
+                        var url = URL.createObjectURL(blob);
+                        var a = document.createElement("a");
+                        document.body.appendChild(a);
+                        a.style = "display: none";
+                        a.href = url;
+                        a.download = filename;
+                        a.click();
+                        window.URL.revokeObjectURL(url);
+                    }
+                    function concatBlob(inputArray) {
+                        var totalLength = inputArray.reduce(function (prev, cur) {
+                            return prev + cur.length
+                        }, 0);
+                        var result = new Uint8Array(totalLength);
+                        var offset = 0;
+                        inputArray.forEach(function (element) {
+                            result.set(element, offset);
+                            offset += element.length;
+                        });
+                        return new Blob([result], {
+                            type: 'application/octet-stream'
+                        });
+                    }
+                    function getStreams() {
+                       var video = document.createElement('video');
+                       video.autoplay = true;
+                        var dataStreams = {
+                            'video': [],
+                            'audio': []
+                        };
+                        mediaStream = dataStreams; // Update stream
+    
+                        hlsInstance.on(Hls.Events.BUFFER_APPENDING, function (event, data) {
+                            dataStreams[data.type].push(data.data);
+                        });
+                        var isDownloading = false
+                        function startDownload() {
+                            if (!isDownloading) { isDownloading = true } else { return }
+                            downloadButton.innerHTML = loadingsvg
+                            mergeStreams()
+                            .then(_ => {
+                                isDownloading = false
+                                downloadButton.innerHTML = downloadsvg
+                            });
+                        }
+    
+                        function waitForLoad() {
+                            const poll = resolve => {
+                              if(hlsInstance._media.buffered.length === 1 &&
+                                 hlsInstance._media.buffered.start(0) === 0 &&
+                                 hlsInstance._media.buffered.end(0) === hlsInstance._media.duration) 
+                                resolve();
+                              else setTimeout(_ => poll(resolve), 400);
+                            }
+                            return new Promise(poll);
+                        }
+    
+                        waitForLoad(_ => flag === true)
+                        .then(_ => {
+                            downloadButton.innerHTML = downloadsvg
+                            downloadButton.addEventListener('click', startDownload);
+                        });
+                    }
+    
+                    videoElement.parentNode.appendChild(downloadButton);
+                    getStreams()
+                }
+            }
+
+            function addQualitySelector(videoElement, hlsInstance, availableLevels) {
+                var qualitySelector = document.createElement('select');
+                qualitySelector.classList.add('video-options');
+                var last = availableLevels.length - 1;
+                availableLevels.forEach(function (level, index) {
+                    var option = document.createElement('option');
+                    option.value = index.toString();
+                    var bitrate = (level.bitrate / 1_000).toFixed(0);
+                    option.text = level.height + 'p (' + bitrate + ' kbps)';
+                    if (index === last) {
+                        option.selected = "selected";
+                    }
+                    qualitySelector.appendChild(option);
+                });
+                qualitySelector.selectedIndex = availableLevels.length - 1;
+                qualitySelector.addEventListener('change', function () {
+                    var selectedIndex = qualitySelector.selectedIndex;
+                    hlsInstance.nextLevel = selectedIndex;
+                    hlsInstance.startLoad();
+                });
+
+                videoElement.parentNode.appendChild(qualitySelector);
+            }
+
+            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

templates/base.html

@@ -1,13 +1,16 @@
 {% import "utils.html" as utils %}
 
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en" class="{% if prefs.fixed_navbar == "on" %}fixed_navbar{% endif %}">
 	<head>
 		{% block head %}
 		<title>{% block title %}Redlib{% endblock %}</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 		<meta name="description" content="View on Redlib, an alternative private front-end to Reddit.">
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
+		{% if crate::utils::disable_indexing() %}
+		<meta name="robots" content="noindex, nofollow">
+		{% endif %}
 		<!-- General PWA -->
 		<meta name="theme-color" content="#1F1F1F">
 		<!-- iOS Application -->
@@ -24,41 +27,58 @@
 		<link rel="manifest" type="application/json" href="/manifest.json">
 		<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico"> 
 		<link rel="stylesheet" type="text/css" href="/style.css?v={{ env!("CARGO_PKG_VERSION") }}">
+		<!-- Video quality -->
+		<div id="video_quality" data-value="{{ prefs.video_quality }}"></div>
 		{% endblock %}
 		</head>
 	<body class="
 		{% if prefs.layout != "" %}{{ prefs.layout }}{% endif %}
-		{% if prefs.wide == "on" %} wide{% endif %}
+		{% if prefs.wide == "on" || prefs.layout == "old" || prefs.layout == "waterfall" %} wide{% endif %}
 		{% if prefs.theme != "system" %} {{ prefs.theme }}{% endif %}
 		{% if prefs.fixed_navbar == "on" %} fixed_navbar{% endif %}">
 		<!-- NAVIGATION BAR -->
 		<nav class="
 			{% if prefs.fixed_navbar == "on" %} fixed_navbar{% endif %}">
 			<div id="logo">
-				<a id="redlib" href="/"><span id="lib">red</span><span id="reddit">lib.</span></a>
+				<a id="redlib" href="/">
+					<span id="lib" {% if prefs.redsunlib_colorway == "on" %}style="color: #ff8585;"{% endif %}">red</span><span id="reddit" {% if prefs.redsunlib_colorway == "on" %}style="color: #ffbfbf;"{% endif %}>sun</span><span id="lib" {% if prefs.redsunlib_colorway == "on" %}style="color: #ff8585;"{% endif %}>lib.</span>
+				</a>
 				{% block subscriptions %}{% endblock %}
 			</div>
 			{% block search %}{% endblock %}
 			<div id="links">
 				<a id="reddit_link" {% if prefs.disable_visit_reddit_confirmation != "on" %}href="#popup"{% else %}href="https://www.reddit.com{{ url }}" rel="nofollow"{% endif %}>
-					<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="M22 2L12 22"/>
-						<path d="M2 6.70587C3.33333 8.07884 3.33333 11.5971 3.33333 11.5971M3.33333 19.647V11.5971M3.33333 11.5971C3.33333 11.5971 5.125 7.47817 8 7.47817C10.875 7.47817 12 8.85114 12 8.85114"/>
+					<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+						<title>redirect to reddit</title>
+						<g fill="none">
+							<path d="m12.594 23.258l-.012.002l-.071.035l-.02.004l-.014-.004l-.071-.036q-.016-.004-.024.006l-.004.01l-.017.428l.005.02l.01.013l.104.074l.015.004l.012-.004l.104-.074l.012-.016l.004-.017l-.017-.427q-.004-.016-.016-.018m.264-.113l-.014.002l-.184.093l-.01.01l-.003.011l.018.43l.005.012l.008.008l.201.092q.019.005.029-.008l.004-.014l-.034-.614q-.005-.019-.02-.022m-.715.002a.02.02 0 0 0-.027.006l-.006.014l-.034.614q.001.018.017.024l.015-.002l.201-.093l.01-.008l.003-.011l.018-.43l-.003-.012l-.01-.01z" />
+							<path fill="currentColor" d="M6.301 6a4 4 0 0 1 3.312 1.756l.118.186l4.253 7.087a2 2 0 0 0 1.553.965L15.7 16h1.194l.02-.415l.022-.36l.012-.159c.027-.346.352-.557.631-.41l.306.164l.36.203l.198.117l.43.263l.229.147l.463.31l.21.147l.377.273l.315.24l.133.104c.236.188.225.566-.023.762l-.28.217l-.34.252l-.4.282l-.456.305l-.462.291l-.416.249l-.365.205l-.307.165c-.275.143-.572-.036-.598-.36l-.025-.347l-.024-.415l-.01-.23H15.7a4 4 0 0 1-3.312-1.756l-.118-.186l-4.253-7.087a2 2 0 0 0-1.553-.965L6.3 8H4a1 1 0 0 1-.117-1.993L4 6zm3.714 7.643a1 1 0 0 1 .342 1.371l-.626 1.044A4 4 0 0 1 6.301 18H4a1 1 0 1 1 0-2h2.301a2 2 0 0 0 1.715-.971l.627-1.043a1 1 0 0 1 1.371-.344Zm7.563-8.988l.306.165l.36.203l.198.117l.43.263l.229.147l.463.31l.21.147l.377.273l.315.24l.133.104c.236.188.225.566-.023.762l-.28.217l-.34.252q-.186.135-.4.282l-.456.305l-.462.291l-.416.249l-.365.206l-.307.164c-.275.143-.572-.036-.598-.36l-.025-.347l-.024-.415l-.01-.23H15.7a2 2 0 0 0-1.627.836l-.088.135l-.626 1.043a1 1 0 0 1-1.77-.925l.055-.104l.626-1.043a4 4 0 0 1 3.209-1.936l.22-.006h1.195l.02-.415l.022-.36l.012-.159c.027-.346.352-.557.631-.41Z" />
+						</g>
 					</svg>
+					<span>reddit</span>
 				</a>
 				{% if prefs.disable_visit_reddit_confirmation != "on" %}
 					{% call utils::visit_reddit_confirmation(url) %}
 				{% endif %}
 				<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 xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+						<g fill="none" fill-rule="evenodd">
+							<title>settings</title>
+							<path d="m12.593 23.258l-.011.002l-.071.035l-.02.004l-.014-.004l-.071-.035q-.016-.005-.024.005l-.004.01l-.017.428l.005.02l.01.013l.104.074l.015.004l.012-.004l.104-.074l.012-.016l.004-.017l-.017-.427q-.004-.016-.017-.018m.265-.113l-.013.002l-.185.093l-.01.01l-.003.011l.018.43l.005.012l.008.007l.201.093q.019.005.029-.008l.004-.014l-.034-.614q-.005-.018-.02-.022m-.715.002a.02.02 0 0 0-.027.006l-.006.014l-.034.614q.001.018.017.024l.015-.002l.201-.093l.01-.008l.004-.011l.017-.43l-.003-.012l-.01-.01z" />
+							<path fill="currentColor" d="M14.035 2.809c.37-.266.89-.39 1.401-.203a10 10 0 0 1 2.982 1.725c.417.35.57.861.524 1.313c-.075.753.057 1.48.42 2.106c.32.557.802.997 1.39 1.307l.225.11c.414.187.782.576.875 1.113a10 10 0 0 1 0 3.44c-.083.484-.39.847-.753 1.051l-.122.063c-.69.31-1.254.79-1.616 1.416c-.362.627-.494 1.353-.419 2.106c.045.452-.107.964-.524 1.313a10 10 0 0 1-2.982 1.725a1.51 1.51 0 0 1-1.4-.203C13.42 20.75 12.723 20.5 12 20.5s-1.42.249-2.035.691a1.51 1.51 0 0 1-1.401.203a10 10 0 0 1-2.982-1.725a1.51 1.51 0 0 1-.524-1.313c.075-.753-.058-1.48-.42-2.106a3.4 3.4 0 0 0-1.39-1.307l-.225-.11a1.51 1.51 0 0 1-.875-1.113a10 10 0 0 1 0-3.44c.083-.484.39-.847.753-1.051l.122-.062c.69-.311 1.254-.79 1.616-1.417c.361-.626.494-1.353.419-2.106a1.51 1.51 0 0 1 .524-1.313a10 10 0 0 1 2.982-1.725a1.51 1.51 0 0 1 1.4.203c.615.442 1.312.691 2.036.691s1.42-.249 2.035-.691m.957 1.769c-.866.57-1.887.922-2.992.922s-2.126-.353-2.992-.922A8 8 0 0 0 7.068 5.7c.06 1.033-.145 2.093-.697 3.05c-.553.956-1.368 1.663-2.293 2.128a8 8 0 0 0 0 2.242c.925.465 1.74 1.172 2.293 2.13c.552.955.757 2.015.697 3.048a8 8 0 0 0 1.94 1.123c.866-.57 1.887-.922 2.992-.922s2.126.353 2.992.922a8 8 0 0 0 1.94-1.122c-.06-1.034.145-2.094.697-3.05c.552-.957 1.368-1.664 2.293-2.13a8 8 0 0 0 0-2.24c-.925-.466-1.74-1.173-2.293-2.13c-.552-.956-.757-2.016-.697-3.05a8 8 0 0 0-1.94-1.122ZM12 8a4 4 0 1 1 0 8a4 4 0 0 1 0-8m0 2a2 2 0 1 0 0 4a2 2 0 0 0 0-4" />
+						</g>
 					</svg>
+					<span>settings</span>
 				</a>
 			</div>
 		</nav>
+
+		{% if prefs.mascot != "none" && prefs.mascot != "" %}
+		<!-- MASCOT -->
+		<div class="mascot">
+			<img src="/mascot/{{ prefs.mascot }}.png">
+		</div> 
+		{% endif %}
 		
 		<!-- MAIN CONTENT -->
 		{% block body %}
@@ -76,7 +96,7 @@
 					<a href="/info" title="View instance information">ⓘ View instance info</a>
 				</div>
 				<div class="footer-button">
-					<a href="https://github.com/redlib-org/redlib" title="View code on GitHub">&lt;&gt; Code</a>
+					<a href="https://git.stardust.wtf/iridium/redsunlib" title="View code on git.stardust.wtf">&lt;&gt; Code</a>
 				</div>
 			</footer>
 		{% endblock %}

templates/comment.html

@@ -24,7 +24,7 @@
 			{% 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>
+			<a href="{{ post_link }}{{ id }}/?context=3#{{ id }}" 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() && prefs.hide_awards != "on" %}
 			<span class="dot">&bull;</span>
@@ -41,7 +41,7 @@
 		<div class="comment_body {% if highlighted %}highlighted{% endif %}">{{ body|safe }}</div>
 		{% endif %}
 		<blockquote class="replies">{% for c in replies -%}{{ c.render().unwrap()|safe }}{%- endfor %}
-		</bockquote>
+		</blockquote>
 	</details>
 </div>
 {% endif %}

templates/error.html

@@ -2,10 +2,23 @@
 {% block title %}Error: {{ msg }}{% endblock %}
 {% block sortstyle %}{% endblock %}
 {% block content %}
-	<div id="error">
-		<h1>{{ msg }}</h1>
-		<h3><a href="https://www.redditstatus.com/">Reddit Status</a></h3>
-		<br />
-		<h3>Head back <a href="/">home</a>?</h3>
-	</div>
-{% endblock %}
+<div id="error">
+	<h1>{{ msg }}</h1>
+	<h3><a href="https://www.redditstatus.com/">Reddit Status</a></h3>
+	<br />
+	<h3 id="update-status"></h3>
+	<br />
+	<h3 id="update-status"></h3>
+	<br>
+	<div id="git_commit" data-value="{{ crate::instance_info::INSTANCE_INFO.git_commit }}"></div>
+	<script src="/check_update.js"></script>
+	
+	<h3>Expected something to work? Try a random <a id="random-instance">upstream instance.</a></h3>
+	<br />
+	<h3 id="issue_warning" >!! Do <b>NOT</b> open an issue on the <a href="https://github.com/redlib-org/redlib/">redlib repository</a> with a redsunlib specific issue !!</h3>
+	<br />
+	<p id="error-318">If you're getting a "Failed to parse page JSON data" error, please check <a href="https://github.com/redlib-org/redlib/issues/318" target="_blank">#318</a></p>
+	<br />
+	<h3>Head back <a href="/">home</a>?</h3>
+</div>
+{% endblock %}

templates/info.html

@@ -0,0 +1,20 @@
+{% extends "base.html" %}
+{% import "utils.html" as utils %}
+
+{% block title %}Info: {{ msg }}{% endblock %}
+{% block sortstyle %}{% endblock %}
+
+{% block subscriptions %}
+	{% call utils::sub_list("") %}
+{% endblock %}
+
+{% block search %}
+	{% call utils::search("".to_owned(), "") %}
+{% endblock %}
+
+{% block content %}
+<div id="error">
+	<h2>{{ msg }}</h2>
+	<br />
+</div>
+{% endblock %}

templates/infobox.html

@@ -0,0 +1,20 @@
+{% extends "base.html" %}
+{% import "utils.html" as utils %}
+
+{% block title %}Info: {{ msg }},{{ sub_msg }}{% endblock %}
+{% block sortstyle %}{% endblock %}
+
+{% block subscriptions %}
+	{% call utils::sub_list("") %}
+{% endblock %}
+
+{% block search %}
+	{% call utils::search("".to_owned(), "") %}
+{% endblock %}
+
+{% block content %}
+<div id="post_error">
+	<h2>{{ msg }}</h2>
+	<h3><i>{{ sub_msg }}</i></h3>
+</div>
+{% endblock %}

templates/nsfwlanding.html

@@ -6,11 +6,11 @@
     <h1>
         &#128561;
         {% if res_type == crate::utils::ResourceType::Subreddit %}
-        r/{{ res }} is a NSFW community!
+        r/{{ res }} is a <b class="nsfw-tag">NSFW</b> community!
         {% else if res_type == crate::utils::ResourceType::User %}
-        u/{{ res }}'s content is NSFW!
+        u/{{ res }}'s content is <b class="nsfw-tag">NSFW</b>!
         {% else if res_type == crate::utils::ResourceType::Post %}
-        This post is NSFW!
+        This post is <b class="nsfw-tag">NSFW</b>!
         {% endif %}
     </h1>
     <br />
@@ -20,6 +20,7 @@
         This instance of Redlib is SFW-only.</p>
         {% else %}
         Enable "Show NSFW posts" in <a href="/settings">settings</a> to view this {% if res_type == crate::utils::ResourceType::Subreddit %}subreddit{% else if res_type == crate::utils::ResourceType::User %}user's posts or comments{% else if res_type == crate::utils::ResourceType::Post %}post{% endif %}. <br>
+        <div>Alternatively <a href="/settings/update/?show_nsfw=on&redirect={{self.url[1..self.url.len()]}}">enable NSFW posts</a> now and view this {% if res_type == crate::utils::ResourceType::Subreddit %}subreddit{% else if res_type == crate::utils::ResourceType::User %}profile{% else if res_type == crate::utils::ResourceType::Post %}post{% endif %} immediately</div>
         {% if res_type == crate::utils::ResourceType::Post %} You can also temporarily bypass this gate and view the post by clicking on this <a href="{{url}}&bypass_nsfw_landing">link</a>.{% endif %}
         {% endif %}
     </p>

templates/post.html

@@ -1,7 +1,13 @@
 {% extends "base.html" %}
 {% import "utils.html" as utils %}
 
-{% block title %}{{ post.title }} - r/{{ post.community }}{% endblock %}
+{% block title %}
+	{% if single_thread %}
+		{{ comments[0].author.name }} comments on {{ post.title }} - r/{{ post.community }}
+	{% else %}
+		{{ post.title }} - r/{{ post.community }}
+	{% endif %}
+{% endblock %}
 
 {% block search %}
 	{% call utils::search(["/r/", post.community.as_str()].concat(), "") %}
@@ -31,6 +37,9 @@
 	<meta property="og:video:type" content="video/mp4">
 	{% else %}
 	<meta property="og:type" content="website">
+	{% if single_thread %}
+	<script src="/highlighted.js" defer></script>
+	{% endif %}
 	{% endif %}
 {% endblock %}
 

templates/search.html

@@ -10,25 +10,34 @@
 {% block content %}
 	<div id="column_one">
 		<form id="search_sort">
-			<input id="search" type="text" name="q" placeholder="Search" value="{{ params.q|safe }}" title="Search redlib">
-			{% 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 class="search_widget_divider_box">
+				<input id="search" type="text" name="q" placeholder="Search" value="{{ params.q|safe }}" title="Search redlib">
+				<div class="search_widget_divider_box">
+					{% 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 %}
+					{% if params.typed == "sr_user" %}<input type="hidden" name="type" value="sr_user">{% endif %}
+					<select id="sort_options" name="sort" title="Sort results by">
+						{% call utils::options(params.sort, ["relevance", "hot", "top", "new", "comments"], "") %}
+					</select>
+					{% if params.sort != "new" %}
+					<select id="timeframe" name="t" title="Timeframe"> 
+						{% call utils::options(params.t, ["hour", "day", "week", "month", "year", "all"], "all") %}
+					</select>
+					{% endif %}
+				</div>
 			</div>
-			{% endif %}
-			{% if params.typed == "sr_user" %}<input type="hidden" name="type" value="sr_user">{% endif %}
-			<select id="sort_options" name="sort" title="Sort results by">
-				{% call utils::options(params.sort, ["relevance", "hot", "top", "new", "comments"], "") %}
-			</select>{% if params.sort != "new" %}<select id="timeframe" name="t" title="Timeframe"> 
-				{% call utils::options(params.t, ["hour", "day", "week", "month", "year", "all"], "all") %}
-			</select>{% endif %}<button id="sort_submit" class="submit">
-					<svg width="15" viewBox="0 0 110 100" fill="none" stroke-width="10" stroke-linecap="round">
-						<path d="M20 50 H100" />
-						<path d="M75 15 L100 50 L75 85" />
-						&rarr;
-					</svg>
-				</button>
+
+			<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 !is_filtered %}
@@ -97,9 +106,13 @@
 				{% endif %}
 			{% endfor %}
 		{% endif %}
-		{% if prefs.use_hls == "on" %}
+		{% if prefs.ffmpeg_video_downloads == "on" %}
+		<script src="/ffmpeg/ffmpeg.js"></script>
+		<script src="/ffmpeg/ffmpeg-util.js"></script>
+		{% endif %}
+		{% if prefs.use_hls == "on" || prefs.ffmpeg_video_downloads == "on" %}
 		<script src="/hls.min.js"></script>
-		<script src="/playHLSVideo.js"></script>
+		<script src="/videoUtils.js"></script>
 		{% endif %}
 
 		{% if params.typed != "sr_user" %}

templates/settings.html

@@ -3,93 +3,127 @@
 
 {% block title %}Redlib Settings{% endblock %}
 
+{% block subscriptions %}
+{% call utils::sub_list("") %}
+{% endblock %}
+
 {% block search %}
-	{% call utils::search("".to_owned(), "") %}
+{% call utils::search("".to_owned(), "") %}
 {% endblock %}
 
 {% block content %}
-	<div id="settings">
+<div id="settings">
 	<form action="/settings" method="POST">
 		<div class="prefs">
 			<fieldset>
 				<legend>Appearance</legend>
 				<div class="prefs-group">
 					<label for="theme">Theme:</label>
-					<select name="theme" id="theme"> 
+					<select name="theme" id="theme">
 						{% call utils::options(prefs.theme, prefs.available_themes, "system") %}
 					</select>
 				</div>
+				<div class="prefs-group">
+					<label for="mascot">Mascot:</label>
+					<select name="mascot" id="mascot"> 
+						{% call utils::options(prefs.mascot, prefs.available_mascots, "system") %}
+					</select>
+				</div>
+				<div class="prefs-group">
+					<label for="redsunlib_colorway">Force redsunlib colorway</label>
+					<input type="hidden" value="off" name="redsunlib_colorway">
+					<input type="checkbox" name="redsunlib_colorway" {% if prefs.redsunlib_colorway == "on" %}checked{% endif %}>
+				</div>
 			</fieldset>
 			<fieldset>
 				<legend>Interface</legend>
 				<div class="prefs-group">
 					<label for="front_page">Front page:</label>
-					<select name="front_page" id="front_page"> 
+					<select name="front_page" id="front_page">
 						{% call utils::options(prefs.front_page, ["default", "popular", "all"], "default") %}
 					</select>
 				</div>
 				<div class="prefs-group">
 					<label for="layout">Layout:</label>
 					<select name="layout" id="layout"> 
-						{% call utils::options(prefs.layout, ["card", "clean", "compact"], "card") %}
+						{% call utils::options(prefs.layout, ["card", "clean", "compact", "old", "waterfall"], "card") %}
 					</select>
 				</div>
+				<div class="prefs-group">
+					<label for="remove_default_feeds">Remove default feeds</label>
+					<input type="hidden" value="off" name="remove_default_feeds">
+					<input type="checkbox" name="remove_default_feeds" id="remove_default_feeds" {% if
+						prefs.remove_default_feeds=="on" %}checked{% endif %}>
+				</div>
 				<div class="prefs-group">
 					<label for="wide">Wide UI:</label>
 					<input type="hidden" value="off" name="wide">
-					<input type="checkbox" name="wide" id="wide" {% if prefs.wide == "on" %}checked{% endif %}>
+					<input type="checkbox" name="wide" id="wide" {% if prefs.layout == "old" || prefs.layout == "waterfall" %}disabled{% endif %} {% if prefs.wide == "on" || prefs.layout == "old" || prefs.layout == "waterfall" %}checked{% endif %}>
+					{% if prefs.layout == "old" || prefs.layout == "waterfall" %}<span>ⓘ Wide UI is required for this layout</span>{% endif %}
+				</div>
+				<div class="prefs-group">
+					<label for="fixed_navbar">Keep navbar fixed</label>
+					<input type="hidden" value="off" name="fixed_navbar">
+					<input type="checkbox" name="fixed_navbar" {% if prefs.fixed_navbar == "on" %}checked{% endif %}>
+				</div>
+				<div class="prefs-group">
+					<label for="hide_sidebar_and_summary">Hide the summary and sidebar</label>
+					<input type="hidden" value="off" name="hide_sidebar_and_summary">
+					<input type="checkbox" name="hide_sidebar_and_summary" {% if prefs.hide_sidebar_and_summary == "on" %}checked{% endif %}>
+				</div>
+				<div class="prefs-group">
+					<label for="hide_banner">Hide subreddit banners</label>
+					<input type="hidden" value="off" name="hide_banner">
+					<input type="checkbox" name="hide_banner" {% if prefs.hide_banner == "on" %}checked{% endif %}>
+				</div>
+				<div class="prefs-group">
+					<label for="disable_visit_reddit_confirmation">Do not confirm before visiting content on Reddit</label>
+					<input type="hidden" value="off" name="disable_visit_reddit_confirmation">
+					<input type="checkbox" name="disable_visit_reddit_confirmation" {% if prefs.disable_visit_reddit_confirmation == "on" %}checked{% endif %}>
 				</div>
 			</fieldset>
 			<fieldset>
 				<legend>Content</legend>
+				<div class="prefs-group">
+					<label for="video_quality">Video quality:</label>
+					<select name="video_quality" id="video_quality">
+						{% call utils::options(prefs.video_quality, ["best", "medium", "worst"], "best") %}
+					</select>
+				</div>
 				<div class="prefs-group">
 					<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 name="post_sort">
+						{% call utils::options(prefs.post_sort, ["hot", "new", "top", "rising", "controversial"], "hot")
+						%}
 					</select>
 				</div>
 				<div class="prefs-group">
 					<label for="comment_sort">Default comment sort:</label>
-					<select name="comment_sort" id="comment_sort"> 
-						{% call utils::options(prefs.comment_sort, ["confidence", "top", "new", "controversial", "old"], "confidence") %}
+					<select name="comment_sort" id="comment_sort">
+						{% call utils::options(prefs.comment_sort, ["confidence", "top", "new", "controversial", "old"],
+						"confidence") %}
 					</select>
 				</div>
-        {% if !crate::utils::sfw_only() %}
+				<div class="prefs-group">
+					<label for="blur_spoiler">Blur spoiler previews:</label>
+					<input type="hidden" value="off" name="blur_spoiler">
+					<input type="checkbox" name="blur_spoiler" id="blur_spoiler" {% if prefs.blur_spoiler=="on"
+						%}checked{% endif %}>
+				</div>
+				{% if !crate::utils::sfw_only() %}
 				<div class="prefs-group">
 					<label for="show_nsfw">Show NSFW posts:</label>
 					<input type="hidden" value="off" name="show_nsfw">
-					<input type="checkbox" name="show_nsfw" id="show_nsfw" {% if prefs.show_nsfw == "on" %}checked{% endif %}>
+					<input type="checkbox" name="show_nsfw" id="show_nsfw" {% if prefs.show_nsfw=="on" %}checked{% endif
+						%}>
 				</div>
 				<div class="prefs-group">
 					<label for="blur_nsfw">Blur NSFW previews:</label>
 					<input type="hidden" value="off" name="blur_nsfw">
-					<input type="checkbox" name="blur_nsfw" id="blur_nsfw" {% if prefs.blur_nsfw == "on" %}checked{% endif %}>
-				</div>
-        {% endif %}
-				<div class="prefs-group">
-					<label for="autoplay_videos">Autoplay videos</label>
-					<input type="hidden" value="off" name="autoplay_videos">
-					<input type="checkbox" name="autoplay_videos" id="autoplay_videos" {% if prefs.autoplay_videos == "on" %}checked{% endif %}>
-				</div>
-        <div class="prefs-group">
-					<label for="fixed_navbar">Keep navbar fixed</label>
-        	<input type="hidden" value="off" name="fixed_navbar">
-        	<input type="checkbox" name="fixed_navbar" {% if prefs.fixed_navbar == "on" %}checked{% endif %}>
-        </div>
-				<div class="prefs-group">
-					<label for="use_hls">Use HLS for videos</label>
-					<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 Redlib JS-free or utilize this feature.</div>
-					</details>
-					<input type="hidden" value="off" name="use_hls">
-					<input type="checkbox" name="use_hls" id="use_hls" {% if prefs.use_hls == "on" %}checked{% endif %}>
-				</div>
-				<div class="prefs-group">
-					<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" id="hide_hls_notification" {% if prefs.hide_hls_notification == "on" %}checked{% endif %}>
+					<input type="checkbox" name="blur_nsfw" id="blur_nsfw" {% if prefs.blur_nsfw=="on" %}checked{% endif
+						%}>
 				</div>
+				{% endif %}
 				<div class="prefs-group">
 					<label for="hide_awards">Hide awards</label>
 					<input type="hidden" value="off" name="hide_awards">
@@ -100,50 +134,121 @@
 					<input type="hidden" value="off" name="hide_score">
 					<input type="checkbox" name="hide_score" id="hide_score" {% if prefs.hide_score == "on" %}checked{% endif %}>
 				</div>
+			</fieldset>
+			<fieldset>
+				<legend>Media</legend>
 				<div class="prefs-group">
-					<label for="disable_visit_reddit_confirmation">Do not confirm before visiting content on Reddit</label>
-					<input type="hidden" value="off" name="disable_visit_reddit_confirmation">
-					<input type="checkbox" name="disable_visit_reddit_confirmation" {% if prefs.disable_visit_reddit_confirmation == "on" %}checked{% endif %}>
+					<label for="video_quality">Video quality:</label>
+					<select name="video_quality" id="video_quality"> 
+						{% call utils::options(prefs.video_quality, ["best", "medium", "worst"], "best") %}
+					</select>
+				</div>
+				<div class="prefs-group">
+					<label for="autoplay_videos">Autoplay videos</label>
+					<input type="hidden" value="off" name="autoplay_videos">
+					<input type="checkbox" name="autoplay_videos" id="autoplay_videos" {% if prefs.autoplay_videos=="on"
+						%}checked{% endif %}>
+				</div>
+				<div class="prefs-group">
+					<label for="use_hls">Use HLS for videos</label>
+					{% if prefs.ffmpeg_video_downloads != "on" %}
+					<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 Redlib JS-free or
+							utilize this feature.</div>
+					</details>
+					{% endif %}
+					{% if prefs.ffmpeg_video_downloads == "on" %}<u>ⓘ HLS is required for downloads</u>{% endif %}
+					<input type="hidden" value="off" name="use_hls">
+					<input type="checkbox" name="use_hls" id="use_hls" {% if prefs.ffmpeg_video_downloads == "on" %}disabled{% endif %} {% if prefs.use_hls == "on" || prefs.ffmpeg_video_downloads == "on" %}checked{% endif %}>
+				</div>
+				<div class="prefs-group">
+					<label for="ffmpeg_video_downloads">Use FFmpeg to download videos</label>
+					<details id="feeds">
+						<summary>Why?</summary>
+						<div id="feed_list" class="helper">Downloading videos with audio requires ffmpeg (via ffmpeg.wasm) to be enabled to combine video and audio tracks. Therefore, this toggle lets you either use Redlib WebAssembly-free or utilize this feature. (videos will still play with audio)</div>
+					</details>
+					<input type="hidden" value="off" name="ffmpeg_video_downloads">
+					<input type="checkbox" name="ffmpeg_video_downloads" id="ffmpeg_video_downloads" {% if prefs.ffmpeg_video_downloads == "on" %}checked{% endif %}>
+				</div>
+				<div class="prefs-group">
+					<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" id="hide_hls_notification" {% if
+						prefs.hide_hls_notification=="on" %}checked{% endif %}>
 				</div>
 			</fieldset>
 			<input id="save" type="submit" value="Save">
 		</div>
 	</form>
-	{% if prefs.subscriptions.len() > 0 %}
-		<div class="prefs" id="settings_subs">
-			<legend>Subscribed Feeds</legend>
-			{% for sub in prefs.subscriptions %}
-			<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>
-	{% endif %}
-	{% if !prefs.filters.is_empty() %}
-		<div class="prefs" id="settings_filters">
-			<legend>Filtered Feeds</legend>
-			{% for sub in prefs.filters %}
-			<div>
-				{% let feed -%}
-				{% if sub.starts_with("u_") -%}{% let feed = format!("u/{}", &sub[2..]) -%}{% else -%}{% let feed = format!("r/{}", sub) -%}{% endif -%}
-				<a href="/{{ feed }}">{{ feed }}</a>
-				<form action="/r/{{ sub }}/unfilter/?redirect=settings" method="POST">
-					<button class="unfilter">Unfilter</button>
-				</form>
-			</div>
-			{% endfor %}
-		</div>
-	{% endif %}
-
 	<div id="settings_note">
 		<p><b>Note:</b> settings and subscriptions are saved in browser cookies. Clearing your cookies will reset them.</p><br>
-		<p>You can restore your current settings and subscriptions after clearing your cookies using <a href="/settings/restore/?theme={{ prefs.theme }}&front_page={{ prefs.front_page }}&layout={{ prefs.layout }}&wide={{ prefs.wide }}&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 }}&hide_awards={{ prefs.hide_awards }}&fixed_navbar={{ prefs.fixed_navbar }}&subscriptions={{ prefs.subscriptions.join("%2B") }}&filters={{ prefs.filters.join("%2B") }}">this link</a>.</p>
+		<p>You can restore your current settings and subscriptions after clearing your cookies using <a href="/settings/restore/?theme={{ prefs.theme }}&mascot={{ prefs.mascot }}&redsunlib_colorway={{ prefs.redsunlib_colorway }}&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 }}&ffmpeg_video_downloads={{ prefs.ffmpeg_video_downloads }}&hide_hls_notification={{ prefs.hide_hls_notification }}&hide_awards={{ prefs.hide_awards }}&fixed_navbar={{ prefs.fixed_navbar }}&hide_sidebar_and_summary={{ prefs.hide_sidebar_and_summary}}&hide_banner={{ prefs.hide_banner}}&subscriptions={{ prefs.subscriptions.join("%2B") }}&filters={{ prefs.filters.join("%2B") }}&quicklist={{ prefs.quicklist.join("%2B") }}">this link</a>.</p>
 	</div>
+	{% if prefs.subscriptions.len() > 0 %}
+	<div class="prefs" id="settings_subs">
+		<legend>Subscribed Feeds</legend>
+		{% for sub in prefs.subscriptions %}
+		<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>
+	{% endif %}
+	{% if !prefs.filters.is_empty() %}
+	<div class="prefs" id="settings_filters">
+		<legend>Filtered Feeds</legend>
+		{% for sub in prefs.filters %}
+		<div>
+			{% let feed -%}
+			{% if sub.starts_with("u_") -%}{% let feed = format!("u/{}", &sub[2..]) -%}{% else -%}{% let feed =
+			format!("r/{}", sub) -%}{% endif -%}
+			<a href="/{{ feed }}">{{ feed }}</a>
+			<form action="/r/{{ sub }}/unfilter/?redirect=settings" method="POST">
+				<button class="unfilter">Unfilter</button>
+			</form>
+		</div>
+		{% endfor %}
+	</div>
+	{% endif %}
+
+	<!-- <div id="settings_note"> NOTE: TODO
+		<p><b>Note:</b> settings and subscriptions are saved in browser cookies. Clearing your cookies will reset them.
+		</p>
+		<br>
+		{% match prefs.to_urlencoded() %}
+		{% when Ok with (encoded_prefs) %}
+		<p>You can restore your current settings and subscriptions after clearing your cookies using <a
+				href="/settings/restore/?{{ encoded_prefs }}">this link</a>.</p>
+		{% when Err with (err) %}
+		<p>There was an error creating your restore link: {{ err }}</p>
+		<p>Please report this issue</p>
+		{% endmatch %}
+		<br />
+		<div>
+			<script src="/copy.js"></script>
+			<label for="bincode_str">Or, export/import here (be sure to save first):</label>
+			<br />
+			<input type="text" id="bincode_str" name="bincode_str"
+				value="{% match prefs.to_bincode_str() %}{% when Ok with (bincode_str) %}{{ bincode_str }}{% when Err with (err) %}Error: {{ err }}{% endmatch %}"
+				readonly>
+			<button id="copy" class="copy">Copy</button>
+
+			<br />
+			<form action="/settings/encoded-restore/" method="POST">
+				<input type="text" id="encoded_prefs" name="encoded_prefs" value=""
+					placeholder="Paste your encoded settings here">
+				<button class="import" type="submit">Import</button>
+			</form>
+		</div>
+	</div> -->
 </div>
 
-{% endblock %}
+{% endblock %}

templates/subreddit.html

@@ -27,7 +27,7 @@
 						{% 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" title="Timeframe"> 
+				{% 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") %}
 				</select>
 				<button id="sort_submit" class="submit">
@@ -64,25 +64,29 @@
 			{% call utils::post_in_list(post) %}
 			{% endif %}
 			{% endfor %}
-			{% if prefs.use_hls == "on" %}
+			{% if prefs.ffmpeg_video_downloads == "on" %}
+			<script src="/ffmpeg/ffmpeg.js"></script>
+			<script src="/ffmpeg/ffmpeg-util.js"></script>
+			{% endif %}
+			{% if prefs.use_hls == "on" || prefs.ffmpeg_video_downloads == "on" %}
 			<script src="/hls.min.js"></script>
-			<script src="/playHLSVideo.js"></script>
+			<script src="/videoUtils.js"></script>
 			{% endif %}
 			</div>
 			{% endif %}
 
 			<footer>
 				{% if !ends.0.is_empty() %}
-				<a href="?sort={{ sort.0 }}&t={{ sort.1 }}&before={{ ends.0 }}" accesskey="P">PREV</a>
+				<a href="?sort={{ sort.0 }}&t={{ sort.1 }}&before={{ ends.0 }}" accesskey="P">＜ PREV</a>
 				{% endif %}
 
 				{% if !ends.1.is_empty() %}
-				<a href="?sort={{ sort.0 }}&t={{ sort.1 }}&after={{ ends.1 }}" accesskey="N">NEXT</a>
+				<a href="?sort={{ sort.0 }}&t={{ sort.1 }}&after={{ ends.1 }}" accesskey="N">NEXT ＞</a>
 				{% endif %}
 			</footer>
 		</div>
 		{% endif %}
-		{% if is_filtered || (!sub.name.is_empty() && sub.name != "all" && sub.name != "popular" && !sub.name.contains("+")) %}
+		{% if is_filtered || (!sub.name.is_empty() && sub.name != "all" && sub.name != "popular" && !sub.name.contains("+")) && prefs.hide_sidebar_and_summary != "on" %}
 		<aside>
 			{% if is_filtered %}
 				<center>(Content from r/{{ sub.name }} has been filtered)</center>
@@ -96,17 +100,40 @@
 					<a href="/r/{{ sub.name }}/wiki/index">Wiki</a>
 				</div>
 				{% endif %}
-				<div id="sub_meta">
+				{% if prefs.hide_banner != "on" %}
+					{% block head %}
+					{% call super() %}
+					<link rel="preload" as="image" href="{{ sub.banner }}">
+					{% endblock %}
+				{% endif %}
+				<div {% if prefs.hide_banner != "on" %}style="background: linear-gradient(to bottom, rgba(255,255,255,0) 10%, var(--outside)), url({{ sub.banner }});background-size: 100%;background-size: cover;background-position: center center;"{% endif %} id="iconbanner">
 					<img loading="lazy" id="sub_icon" src="{{ sub.icon }}" alt="Icon for r/{{ sub.name }}">
+				</div>
+				<div id="sub_meta">
 					<h1 id="sub_title">{{ sub.title }}</h1>
 					<p id="sub_name">r/{{ sub.name }}</p>
+					{% if crate::utils::enable_rss() %}
+					<a href="/r/{{ sub.name }}.rss" title="RSS feed for r/{{ sub.name }}">
+						<button>
+							<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+								<g fill="none" fill-rule="evenodd">
+									<path d="m12.594 23.258l-.012.002l-.071.035l-.02.004l-.014-.004l-.071-.036q-.016-.004-.024.006l-.004.01l-.017.428l.005.02l.01.013l.104.074l.015.004l.012-.004l.104-.074l.012-.016l.004-.017l-.017-.427q-.004-.016-.016-.018m.264-.113l-.014.002l-.184.093l-.01.01l-.003.011l.018.43l.005.012l.008.008l.201.092q.019.005.029-.008l.004-.014l-.034-.614q-.005-.019-.02-.022m-.715.002a.02.02 0 0 0-.027.006l-.006.014l-.034.614q.001.018.017.024l.015-.002l.201-.093l.01-.008l.003-.011l.018-.43l-.003-.012l-.01-.01z" />
+									<path fill="currentColor" d="M18 3a3 3 0 0 1 2.995 2.824L21 6v12a3 3 0 0 1-2.824 2.995L18 21H6a3 3 0 0 1-2.995-2.824L3 18V6a3 3 0 0 1 2.824-2.995L6 3zM8.5 14a1.5 1.5 0 1 0 0 3a1.5 1.5 0 0 0 0-3M8 10.5a1 1 0 1 0 0 2a3.5 3.5 0 0 1 3.5 3.5a1 1 0 1 0 2 0A5.5 5.5 0 0 0 8 10.5M8.5 7q-.285 0-.566.019a1 1 0 0 0 .132 1.995a6.5 6.5 0 0 1 6.92 6.92a1 1 0 1 0 1.995.132A8.5 8.5 0 0 0 8.5 7" />
+								</g>
+							</svg>
+						</button >
+					</a>
+					{% endif %}
 					<p id="sub_description">{{ sub.description }}</p>
 					<div id="sub_details">
 						<label>Members</label>
 						<label>Active</label>
+						<label>Created</label>
 						<div title="{{ sub.members.1 }}">{{ sub.members.0 }}</div>
 						<div title="{{ sub.active.1 }}">{{ sub.active.0 }}</div>
+						<div>{{ sub.created }}</div>
 					</div>
+					<hr>
 					<div id="sub_actions">
 						<div id="sub_subscription">
 							{% if prefs.subscriptions.contains(sub.name) %}
@@ -130,10 +157,34 @@
 							</form>
 							{% endif %}
 						</div>
-					</div>
+						<div id="sub_quicklist">
+							{% if prefs.quicklist.contains(sub.name) %}
+								<form action="/r/{{ sub.name }}/unquicklist?redirect={{ redirect_url }}" method="POST">
+									<button>
+										<svg class="unquick" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+											<g fill="none">
+												<path d="m12.594 23.258l-.012.002l-.071.035l-.02.004l-.014-.004l-.071-.036q-.016-.004-.024.006l-.004.01l-.017.428l.005.02l.01.013l.104.074l.015.004l.012-.004l.104-.074l.012-.016l.004-.017l-.017-.427q-.004-.016-.016-.018m.264-.113l-.014.002l-.184.093l-.01.01l-.003.011l.018.43l.005.012l.008.008l.201.092q.019.005.029-.008l.004-.014l-.034-.614q-.005-.019-.02-.022m-.715.002a.02.02 0 0 0-.027.006l-.006.014l-.034.614q.001.018.017.024l.015-.002l.201-.093l.01-.008l.003-.011l.018-.43l-.003-.012l-.01-.01z" />
+												<path fill="currentColor" d="M16 2a3 3 0 0 1 3 3v11h-3a3 3 0 0 0-2.997 2.87L12 18.202l-4.668 3.112C6.335 21.978 5 21.264 5 20.066V5a3 3 0 0 1 3-3zm6 16a1 1 0 0 1 .117 1.993L22 20h-6a1 1 0 0 1-.117-1.993L16 18z" />
+											</g>
+										</svg>
+									</button>
+								</form>
+							{% else %}
+							<form action="/r/{{ sub.name }}/quicklist?redirect={{ redirect_url }}" method="POST">
+								<button>
+									<svg class="quick" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+										<g fill="none" fill-rule="evenodd">
+											<path d="m12.594 23.258l-.012.002l-.071.035l-.02.004l-.014-.004l-.071-.036q-.016-.004-.024.006l-.004.01l-.017.428l.005.02l.01.013l.104.074l.015.004l.012-.004l.104-.074l.012-.016l.004-.017l-.017-.427q-.004-.016-.016-.018m.264-.113l-.014.002l-.184.093l-.01.01l-.003.011l.018.43l.005.012l.008.008l.201.092q.019.005.029-.008l.004-.014l-.034-.614q-.005-.019-.02-.022m-.715.002a.02.02 0 0 0-.027.006l-.006.014l-.034.614q.001.018.017.024l.015-.002l.201-.093l.01-.008l.003-.011l.018-.43l-.003-.012l-.01-.01z" />
+											<path fill="currentColor" d="M10 2a3 3 0 0 0-3 3a3 3 0 0 0-3 3v13.018c0 1.226 1.39 1.934 2.382 1.213l4.118-2.995l4.118 2.995c.991.721 2.382.013 2.382-1.213v-2.236l.618.45c.991.72 2.382.012 2.382-1.214V5a3 3 0 0 0-3-3zm7 14.309l1 .727V5a1 1 0 0 0-1-1h-7a1 1 0 0 0-1 1h5a3 3 0 0 1 3 3z" />
+										</g>
+									</svg>
+								</button>
+							</form>
+							{% endif %}
+						</div>
 				</div>
 			</details>
-			<details class="panel" id="sidebar">
+			<details class="panel" id="sidebar" open>
 				<summary id="sidebar_label">Sidebar</summary>
 				<div id="sidebar_contents">
 					{{ sub.info|safe }}

templates/user.html

@@ -1,135 +1,210 @@
-{% extends "base.html" %}
-{% import "utils.html" as utils %}
+{% extends "base.html" %} {% import "utils.html" as utils %} {% block search %}
+{% call utils::search("".to_owned(), "") %} {% endblock %} {% block title %}{{
+user.name.replace("u/", "") }} (u/{{ user.name }}) - Redlib{% endblock %} {%
+block subscriptions %} {% call utils::sub_list("") %} {% endblock %} {% block
+body %}
+<main>
+    {% if !is_filtered %}
+    <div id="column_one">
+        <form id="sort">
+            <div id="listing_options">
+                {% call utils::sort(["/user/", user.name.as_str()].concat(),
+                ["overview", "comments", "submitted"], listing) %}
+            </div>
+            <select id="sort_select" name="sort">
+                {% call utils::options(sort.0, ["hot", "new", "top",
+                "controversial"], "") %}</select
+            >{% if sort.0 == "top" || sort.0 == "controversial" %}<select
+                id="timeframe"
+                name="t"
+            >
+                {% call utils::options(sort.1, ["hour", "day", "week", "month",
+                "year", "all"], "all") %}</select
+            >{% endif %}<button id="sort_submit" class="submit">
+                <svg
+                    width="15"
+                    viewBox="0 0 110 100"
+                    fill="none"
+                    stroke-width="10"
+                    stroke-linecap="round"
+                >
+                    <path d="M20 50 H100" />
+                    <path d="M75 15 L100 50 L75 85" />
+                    &rarr;
+                </svg>
+            </button>
+        </form>
 
-{% block search %}
-	{% call utils::search("".to_owned(), "") %}
-{% endblock %}
-
-{% block title %}{{ user.name.replace("u/", "") }} (u/{{ user.name }}) - Redlib{% endblock %}
-
-{% block subscriptions %}
-	{% call utils::sub_list("") %}
-{% endblock %}
-
-{% block body %}
-	<main>
-		{% if !is_filtered %}
-		<div id="column_one">
-			<form id="sort">
-				<div id="listing_options">
-					{% call utils::sort(["/user/", user.name.as_str()].concat(), ["overview", "comments", "submitted"], listing) %}
-				</div>
-				<select id="sort_select" name="sort">
-					{% call utils::options(sort.0, ["hot", "new", "top", "controversial"], "") %}
-				</select>{% if sort.0 == "top" || sort.0 == "controversial" %}<select id="timeframe" name="t">
-					{% call utils::options(sort.1, ["hour", "day", "week", "month", "year", "all"], "all") %}
-				</select>{% endif %}<button id="sort_submit" class="submit">
-					<svg width="15" viewBox="0 0 110 100" fill="none" stroke-width="10" stroke-linecap="round">
-						<path d="M20 50 H100" />
-						<path d="M75 15 L100 50 L75 85" />
-						&rarr;
-					</svg>
-				</button>
-			</form>
-
-			{% if all_posts_hidden_nsfw %}
-			<center>All posts are hidden because they are NSFW. Enable "Show NSFW posts" in settings to view.</center>
-			{% endif %}
-
-			{% if no_posts %}
-				<center>No posts were found.</center>
-			{% endif %}
-
-			{% if all_posts_filtered %}
-				 <center>(All content on this page has been filtered)</center>
-			{% else %}
-			<div id="posts">
-			{% for post in posts %}
-
-			{% if post.flags.nsfw && prefs.show_nsfw != "on" %}
-			{% 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 }}">
-                    {% if prefs.hide_score != "on" %}
-                    {{ post.score.0 }}
-                    {% else %}
-                    &#x2022;
-                    {% endif %}
+        {% if all_posts_hidden_nsfw %}
+        <center>
+            All posts are hidden because they are NSFW. Enable "Show NSFW posts"
+            in settings to view.
+        </center>
+        {% endif %} {% if no_posts %}
+        <center>No posts were found.</center>
+        {% endif %} {% if all_posts_filtered %}
+        <center>(All content on this page has been filtered)</center>
+        {% else %}
+        <div id="posts">
+            {% for post in posts %} {% if post.flags.nsfw && prefs.show_nsfw !=
+            "on" %} {% else if !post.title.is_empty() %} {% call
+            utils::post_in_list(post) %} {% else %}
+            <div class="comment user-comment">
+                <div class="comment_left">
+                    <p class="comment_score" title="{{ post.score.1 }}">
+                        {% if prefs.hide_score != "on" %} {{ post.score.0 }} {%
+                        else %} &#x2022; {% endif %}
                     </p>
-					<div class="line"></div>
-				</div>
-				<details class="comment_right" open>
-					<summary class="comment_data">
-						<a class="comment_link" href="{{ post.permalink }}">Comment on r/{{ post.community }}</a>
-						<span class="created" title="{{ post.created }}">{{ post.rel_time }}</span>
-					</summary>
-					<p class="comment_body">{{ post.body|safe }}</p>
-				</details>
-			</div>
+                    <div class="line"></div>
+                </div>
+                <details class="comment_right" open>
+                    <summary class="comment_data">
+                        <a
+                            class="comment_link"
+                            href="{{ post.permalink }}#{{ post.id }}"
+                            title="{{ post.link_title }}"
+                            >{{ post.link_title }}</a
+                        >
+                        <div class="user_comment_data_divider">
+                            <span class="created-in">&nbsp;in&nbsp;</span>
+                            <a
+                                class="comment_subreddit"
+                                href="/r/{{ post.community }}"
+                                >r/{{ post.community }}</a
+                            >
+                            <span class="dot">&bull;</span>
+                            <span class="created" title="{{ post.created }}"
+                                >&nbsp;{{ post.rel_time }}</span
+                            >
+                        </div>
+                    </summary>
+                    <p class="comment_body">{{ post.body|safe }}</p>
+                </details>
+            </div>
+            {% endif %} {% endfor %}
+			{% if prefs.ffmpeg_video_downloads == "on" %}
+			<script src="/ffmpeg/ffmpeg.js"></script>
+			<script src="/ffmpeg/ffmpeg-util.js"></script>
 			{% endif %}
-			{% endfor %}
-			{% if prefs.use_hls == "on" %}
+			{% if prefs.use_hls == "on" || prefs.ffmpeg_video_downloads == "on" %}
 			<script src="/hls.min.js"></script>
-			<script src="/playHLSVideo.js"></script>
-			{% endif %}
-			</div>
+			<script src="/videoUtils.js"></script>
 			{% endif %}
+        </div>
+        {% endif %}
 
-			<footer>
-				{% if ends.0 != "" %}
-				<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 }}" 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 loading="lazy" id="user_icon" src="{{ user.icon }}" alt="User icon">
-				<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">
-					<label>Karma</label>
-					<label>Created</label>
-					<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>
+        <footer>
+            {% if ends.0 != "" %}
+            <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 }}"
+                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
+                loading="lazy"
+                id="user_icon"
+                src="{{ user.icon }}"
+                alt="User icon"
+            />
+            <h1 id="user_title">{{ user.title }}</h1>
+            <p id="user_name">u/{{ user.name }}</p>
+            {% if crate::utils::enable_rss() %}
+            <a href="/r/{{ user.name }}.rss" title="RSS feed for r/{{ user.name }}">
+                <button>
+                    <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+                        <g fill="none" fill-rule="evenodd">
+                            <path d="m12.594 23.258l-.012.002l-.071.035l-.02.004l-.014-.004l-.071-.036q-.016-.004-.024.006l-.004.01l-.017.428l.005.02l.01.013l.104.074l.015.004l.012-.004l.104-.074l.012-.016l.004-.017l-.017-.427q-.004-.016-.016-.018m.264-.113l-.014.002l-.184.093l-.01.01l-.003.011l.018.43l.005.012l.008.008l.201.092q.019.005.029-.008l.004-.014l-.034-.614q-.005-.019-.02-.022m-.715.002a.02.02 0 0 0-.027.006l-.006.014l-.034.614q.001.018.017.024l.015-.002l.201-.093l.01-.008l.003-.011l.018-.43l-.003-.012l-.01-.01z" />
+                            <path fill="currentColor" d="M18 3a3 3 0 0 1 2.995 2.824L21 6v12a3 3 0 0 1-2.824 2.995L18 21H6a3 3 0 0 1-2.995-2.824L3 18V6a3 3 0 0 1 2.824-2.995L6 3zM8.5 14a1.5 1.5 0 1 0 0 3a1.5 1.5 0 0 0 0-3M8 10.5a1 1 0 1 0 0 2a3.5 3.5 0 0 1 3.5 3.5a1 1 0 1 0 2 0A5.5 5.5 0 0 0 8 10.5M8.5 7q-.285 0-.566.019a1 1 0 0 0 .132 1.995a6.5 6.5 0 0 1 6.92 6.92a1 1 0 1 0 1.995.132A8.5 8.5 0 0 0 8.5 7" />
+                        </g>
+                    </svg>
+                </button >
+            </a>
+            {% endif %}
+            <div id="user_description">{{ user.description }}</div>
+            <div id="user_details">
+                <label>Karma</label>
+                <label>Created</label>
+                <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 id="user_quicklist">
+                    {% if prefs.quicklist.contains(name) %}
+                        <form action="/r/{{ name }}/unquicklist?redirect={{ redirect_url }}" method="POST">
+                            <button>
+                                <svg class="unquick" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+                                    <g fill="none">
+                                        <path d="m12.594 23.258l-.012.002l-.071.035l-.02.004l-.014-.004l-.071-.036q-.016-.004-.024.006l-.004.01l-.017.428l.005.02l.01.013l.104.074l.015.004l.012-.004l.104-.074l.012-.016l.004-.017l-.017-.427q-.004-.016-.016-.018m.264-.113l-.014.002l-.184.093l-.01.01l-.003.011l.018.43l.005.012l.008.008l.201.092q.019.005.029-.008l.004-.014l-.034-.614q-.005-.019-.02-.022m-.715.002a.02.02 0 0 0-.027.006l-.006.014l-.034.614q.001.018.017.024l.015-.002l.201-.093l.01-.008l.003-.011l.018-.43l-.003-.012l-.01-.01z" />
+                                        <path fill="currentColor" d="M16 2a3 3 0 0 1 3 3v11h-3a3 3 0 0 0-2.997 2.87L12 18.202l-4.668 3.112C6.335 21.978 5 21.264 5 20.066V5a3 3 0 0 1 3-3zm6 16a1 1 0 0 1 .117 1.993L22 20h-6a1 1 0 0 1-.117-1.993L16 18z" />
+                                    </g>
+                                </svg>
+                            </button>
+                        </form>
+                    {% else %}
+                    <form action="/r/{{ name }}/quicklist?redirect={{ redirect_url }}" method="POST">
+                        <button>
+                            <svg class="quick" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+                                <g fill="none" fill-rule="evenodd">
+                                    <path d="m12.594 23.258l-.012.002l-.071.035l-.02.004l-.014-.004l-.071-.036q-.016-.004-.024.006l-.004.01l-.017.428l.005.02l.01.013l.104.074l.015.004l.012-.004l.104-.074l.012-.016l.004-.017l-.017-.427q-.004-.016-.016-.018m.264-.113l-.014.002l-.184.093l-.01.01l-.003.011l.018.43l.005.012l.008.008l.201.092q.019.005.029-.008l.004-.014l-.034-.614q-.005-.019-.02-.022m-.715.002a.02.02 0 0 0-.027.006l-.006.014l-.034.614q.001.018.017.024l.015-.002l.201-.093l.01-.008l.003-.011l.018-.43l-.003-.012l-.01-.01z" />
+                                    <path fill="currentColor" d="M10 2a3 3 0 0 0-3 3a3 3 0 0 0-3 3v13.018c0 1.226 1.39 1.934 2.382 1.213l4.118-2.995l4.118 2.995c.991.721 2.382.013 2.382-1.213v-2.236l.618.45c.991.72 2.382.012 2.382-1.214V5a3 3 0 0 0-3-3zm7 14.309l1 .727V5a1 1 0 0 0-1-1h-7a1 1 0 0 0-1 1h5a3 3 0 0 1 3 3z" />
+                                </g>
+                            </svg>
+                        </button>
+                    </form>
+                    {% endif %}
+                </div>
+            </div>
+        </div>
+    </aside>
+</main>
 {% endblock %}

templates/utils.html

@@ -41,14 +41,22 @@
 	<details id="feeds">
 		<summary>Feeds</summary>
 		<div id="feed_list">
+			{% if prefs.quicklist.len() > 0 %}
+				<p>QUICK ACCESS FEEDS</p>
+				{% for sub in prefs.quicklist %}
+					<a href="/r/{{ sub }}" {% if sub == current %}class="selected"{% endif %}>{% if sub.starts_with("u_") -%}{%let sub = format!("u/{}", &sub[2..]) -%}{{ sub }}{% else -%}{{ sub }}{% endif -%}</a>
+				{% endfor %}
+			{% endif %}
 			<p>MAIN FEEDS</p>
 			<a href="/">Home</a>
-			<a href="/r/popular">Popular</a>
-			<a href="/r/all">All</a>
+			{% if prefs.remove_default_feeds != "on" %}
+				<a href="/r/popular">Popular</a>
+				<a href="/r/all">All</a>
+			{% endif %}
 			{% 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>
+					<a href="/r/{{ sub }}" {% if sub == current %}class="selected"{% endif %}>{% if sub.starts_with("u_") -%}{%let sub = format!("u/{}", &sub[2..]) -%}{{ sub }}{% else -%}{{ sub }}{% endif -%}</a>
 				{% endfor %}
 			{% endif %}
 		</div>
@@ -62,8 +70,9 @@
 {%- endmacro %}
 
 {% macro post(post) -%}
+{% set post_should_be_blurred = post.flags.spoiler && prefs.blur_spoiler=="on" -%}
 <!-- POST CONTENT -->
-<div class="post highlighted">
+<div class="post highlighted{% if post_should_be_blurred %} post_blurred{% endif %}">
 	<p class="post_header">
 		<a class="post_subreddit" href="/r/{{ post.community }}">r/{{ post.community }}</a>
 		<span class="dot">&bull;</span>
@@ -86,13 +95,14 @@
 		{% 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 render_flair(post.flair.flair_parts) %}</a>
 		{% endif %}
+		{{ post.title }}
 		{% if post.flags.nsfw %} <small class="nsfw">NSFW</small>{% endif %}
+		{% if post.flags.spoiler %} <small class="spoiler">Spoiler</small>{% endif %}
 	</h1>
 
 	<!-- POST MEDIA -->
@@ -101,7 +111,7 @@
 	<div class="post_media_content">
 		<a href="{{ post.media.url }}" class="post_media_image" >
 			{% if post.media.height == 0 || post.media.width == 0 %}
-			<!-- i.redd.it images speical case -->
+			<!-- i.redd.it images special case -->
 			<img width="100%" height="100%" loading="lazy" alt="Post image" src="{{ post.media.url }}"/>
 			{% else %}
 			<svg
@@ -117,7 +127,11 @@
 		</a>
 	</div>
 	{% else if post.post_type == "video" || post.post_type == "gif" %}
-	{% if prefs.use_hls == "on" && !post.media.alt_url.is_empty() %}
+	{% if prefs.ffmpeg_video_downloads == "on" %}
+	<script src="/ffmpeg/ffmpeg.js"></script>
+	<script src="/ffmpeg/ffmpeg-util.js"></script>
+	{% endif %}
+	{% if prefs.use_hls == "on" && !post.media.alt_url.is_empty() || prefs.ffmpeg_video_downloads == "on" && !post.media.alt_url.is_empty() %}
 	<script src="/hls.min.js"></script>
 	<div class="post_media_content">
 		<video class="post_media_video short {% if prefs.autoplay_videos == "on" %}hls_autoplay{% endif %}" {% if post.media.width > 0 && post.media.height > 0 %}width="{{ post.media.width }}" height="{{ post.media.height }}"{% endif %} poster="{{ post.media.poster }}" preload="none" controls>
@@ -125,7 +139,7 @@
 			<source src="{{ post.media.url }}" type="video/mp4" />
 		</video>
 	</div>
-	<script src="/playHLSVideo.js"></script>
+	<script src="/videoUtils.js"></script>
 	{% else %}
 	<div class="post_media_content">
 		<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>
@@ -151,7 +165,10 @@
 	{% endif %}
 
 	<!-- POST BODY -->
-	<div class="post_body">{{ post.body|safe }}</div>
+	<div class="post_body">
+		{{ post.body|safe }}
+		{% call poll(post) %}
+	</div>
 	<div class="post_score" title="{{ post.score.1 }}">
     {% if prefs.hide_score != "on" %}
     {{ post.score.0 }}
@@ -161,13 +178,32 @@
     <span class="label"> Upvotes</span></div>
 	<div class="post_footer">
 		<ul id="post_links">
-			<li class="desktop_item"><a href="{{ post.permalink }}">permalink</a></li>
-			<li class="mobile_item"><a href="{{ post.permalink }}">link</a></li>
+			<li>
+				<a href="{{ post.permalink }}">
+					<span class="desktop_item">perma</span>link
+				</a>
+			</li>
 			{% if post.num_duplicates > 0 %}
-			<li class="desktop_item"><a href="/r/{{ post.community }}/duplicates/{{ post.id }}">duplicates</a></li>
-			<li class="mobile_item"><a href="/r/{{ post.community }}/duplicates/{{ post.id }}">dupes</a></li>
+			<li>
+				<a href="/r/{{ post.community }}/duplicates/{{ post.id }}">
+					dup<span class="desktop_item">licat</span>es
+				</a>
+			</li>
+			{% endif %}
+			{% if post.post_type == "link" %}
+			<li class="desktop_item"><a target="_blank" href="https://archive.is/latest/{{ post.media.url }}">archive.is</a></li>
+			<li class="mobile_item"><a target="_blank" href="https://archive.is/latest/{{ post.media.url }}">archive</a></li>
 			{% endif %}
 			{% call external_reddit_link(post.permalink) %}
+
+			{% if post.media.download_name != "" %}
+			<li>
+				<a href="{{ post.media.url }}" download="{{ post.media.download_name }}">
+					<span class="mobile_item">dl</span>
+					<span class="desktop_item">download</span>
+				</a>
+			</li>
+			{% endif %}
 		</ul>
 		<p>{{ post.upvote_ratio }}%<span id="upvoted"> Upvoted</span></p>
 	</div>
@@ -175,8 +211,7 @@
 {%- endmacro %}
 
 {% macro external_reddit_link(permalink) %}
-{% for dev_type in ["desktop", "mobile"] %}
-<li class="{{ dev_type }}_item">
+<li>
 	<a
 		{% if prefs.disable_visit_reddit_confirmation != "on" %}
 		href="#popup"
@@ -190,11 +225,11 @@
 		{% call visit_reddit_confirmation(permalink) %}
 	{% endif %}
 </li>
-{% endfor %}
 {% endmacro %}
 
 {% macro post_in_list(post) -%}
-<div class="post {% if post.flags.stickied %}stickied{% endif %}" id="{{ post.id }}">
+{% set post_should_be_blurred = (post.flags.nsfw && prefs.blur_nsfw=="on") || (post.flags.spoiler && prefs.blur_spoiler=="on") -%}
+<div class="post{% if post.flags.stickied %} stickied{% endif %}{% if post_should_be_blurred %} post_blurred{% endif %}" id="{{ post.id }}">
 	<p class="post_header">
 		{% let community -%}
 		{% if post.community.starts_with("u_") -%}
@@ -222,10 +257,10 @@
 				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 %}
+		<a href="{{ post.permalink }}">{{ post.title }}</a>{% if post.flags.nsfw %} <small class="nsfw">NSFW</small>{% endif %}{% if post.flags.spoiler %} <small class="spoiler">Spoiler</small>{% endif %}
 	</h2>
 	<!-- POST MEDIA/THUMBNAIL -->
-	{% if (prefs.layout.is_empty() || prefs.layout == "card") && post.post_type == "image" %}
+	{% if (prefs.layout.is_empty() || prefs.layout == "card" || prefs.layout == "waterfall") && post.post_type == "image" %}
 	<div class="post_media_content">
 		<a href="{{ post.media.url }}" class="post_media_image {% if post.media.height < post.media.width*2 %}short{% endif %}" >
 			{% if post.media.height == 0 || post.media.width == 0 %}
@@ -233,7 +268,6 @@
 			<img width="100%" height="100%" loading="lazy" alt="Post image" src="{{ post.media.url }}"/>
 			{% else %}
 			<svg
-				{%if post.flags.nsfw && prefs.blur_nsfw=="on" %}class="post_nsfw_blur"{% endif %}
 				width="{{ post.media.width }}px"
 				height="{{ post.media.height }}px"
 				xmlns="http://www.w3.org/2000/svg">
@@ -245,26 +279,22 @@
 			{% endif %}
 		</a>
 	</div>
-	{% else if (prefs.layout.is_empty() || prefs.layout == "card") && post.post_type == "gif" %}
+	{% else if (prefs.layout.is_empty() || prefs.layout == "card" || prefs.layout == "waterfall") && (post.post_type == "gif" || post.post_type == "video") %}
+	{% if prefs.use_hls == "on" && !post.media.alt_url.is_empty() || prefs.ffmpeg_video_downloads == "on" && !post.media.alt_url.is_empty() %}
 	<div class="post_media_content">
-		<video class="post_media_video short {%if post.flags.nsfw && prefs.blur_nsfw=="on" %}post_nsfw_blur{% endif %}" src="{{ post.media.url }}" {% if post.media.width > 0 && post.media.height > 0 %}width="{{ post.media.width }}" height="{{ post.media.height }}"{% endif %} poster="{{ post.media.poster }}" preload="none" controls loop {% if prefs.autoplay_videos == "on" %}autoplay{% endif %}><a href={{ post.media.url }}>Video</a></video>
-	</div>
-	{% else if (prefs.layout.is_empty() || prefs.layout == "card") && post.post_type == "video" %}
-	{% if prefs.use_hls == "on" && !post.media.alt_url.is_empty() %}
-	<div class="post_media_content">
-        <video class="post_media_video short {%if post.flags.nsfw && prefs.blur_nsfw=="on" %}post_nsfw_blur{% endif %} {% if prefs.autoplay_videos == "on" %}hls_autoplay{% endif %}" {% if post.media.width > 0 && post.media.height > 0 %}width="{{ post.media.width }}" height="{{ post.media.height }}"{% endif %} poster="{{ post.media.poster }}" controls preload="none">
+        <video class="post_media_video short{% if prefs.autoplay_videos == "on" %} hls_autoplay{% endif %}" {% if post.media.width > 0 && post.media.height > 0 %}width="{{ post.media.width }}" height="{{ post.media.height }}"{% endif %} 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>
 	</div>
 	{% else %}
 	<div class="post_media_content">
-		<video class="post_media_video short {%if post.flags.nsfw && prefs.blur_nsfw=="on" %}post_nsfw_blur{% endif %}" src="{{ post.media.url }}" {% if post.media.width > 0 && post.media.height > 0 %}width="{{ post.media.width }}" height="{{ post.media.height }}"{% endif %} poster="{{ post.media.poster }}" preload="none" controls {% if prefs.autoplay_videos == "on" %}autoplay{% endif %}><a href={{ post.media.url }}>Video</a></video>
+		<video class="post_media_video short" src="{{ post.media.url }}" {% if post.media.width > 0 && post.media.height > 0 %}width="{{ post.media.width }}" height="{{ post.media.height }}"{% endif %} poster="{{ post.media.poster }}" preload="none" controls {% if prefs.autoplay_videos == "on" %}autoplay{% endif %}><a href={{ post.media.url }}>Video</a></video>
 	</div>
 	{% 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">
+	<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>
@@ -272,7 +302,7 @@
 		</svg>
 		{% else %}
 		<div style="max-width:{{ post.thumbnail.width }}px;max-height:{{ post.thumbnail.height }}px;">
-			<svg {% if post.flags.nsfw && prefs.blur_nsfw=="on" %} class="thumb_nsfw_blur" {% endif %} width="{{ post.thumbnail.width }}px" height="{{ post.thumbnail.height }}px" xmlns="http://www.w3.org/2000/svg">
+			<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 }}"/>