Improve proxied mp4 caching

.github/workflows/build-docker.yml

@@ -7,105 +7,56 @@ on:
     branches:
       - master
 
-concurrency:
-  group: docker-publish-${{ github.ref }}
-  cancel-in-progress: true
-
-env:
-  IMAGE: zedeus/nitter
-
 jobs:
   tests:
     uses: ./.github/workflows/run-tests.yml
-    secrets: inherit
+  build-docker-amd64:
-
-  build:
     needs: [tests]
-    strategy:
+    runs-on: buildjet-2vcpu-ubuntu-2204
-      fail-fast: false
-      matrix:
-        include:
-          - runner: ubuntu-24.04
-            platform: linux/amd64
-          - runner: ubuntu-24.04-arm
-            platform: linux/arm64
-    runs-on: ${{ matrix.runner }}
     steps:
-      - name: Prepare platform name
+      - uses: actions/checkout@v3
-        run: echo "PLATFORM_PAIR=${platform//\//-}" >> "$GITHUB_ENV"
+        with:
-        env:
+          fetch-depth: 0
-          platform: ${{ matrix.platform }}
-
-      - uses: actions/checkout@v6
-
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        id: buildx
+        uses: docker/setup-buildx-action@v2
         with:
           version: latest
-
       - name: Login to DockerHub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-
+      - name: Build and push AMD64 Docker image
-      - name: Build and push by digest
+        uses: docker/build-push-action@v3
-        id: build
-        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./Dockerfile
-          platforms: ${{ matrix.platform }}
+          platforms: linux/amd64
-          outputs: type=image,name=${{ env.IMAGE }},push-by-digest=true,name-canonical=true,push=true
+          push: true
-          provenance: false
+          tags: zedeus/nitter:latest,zedeus/nitter:${{ github.sha }}
-          sbom: false
+  build-docker-arm64:
-
+    needs: [tests]
-      - name: Export digest
+    runs-on: buildjet-2vcpu-ubuntu-2204-arm
-        run: |
-          mkdir -p "${{ runner.temp }}/digests"
-          digest="${{ steps.build.outputs.digest }}"
-          touch "${{ runner.temp }}/digests/${digest#sha256:}"
-
-      - name: Upload digest
-        uses: actions/upload-artifact@v4
-        with:
-          name: digests-${{ env.PLATFORM_PAIR }}
-          path: ${{ runner.temp }}/digests/*
-          if-no-files-found: error
-          retention-days: 1
-
-  # Combine the per-arch digests into one multi-arch manifest so that
-  # `docker pull zedeus/nitter:latest` serves the right image on any CPU.
-  merge:
-    needs: [build]
-    runs-on: ubuntu-24.04
     steps:
-      - name: Download digests
+      - uses: actions/checkout@v3
-        uses: actions/download-artifact@v4
         with:
-          path: ${{ runner.temp }}/digests
+          fetch-depth: 0
-          pattern: digests-*
-          merge-multiple: true
-
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        id: buildx
+        uses: docker/setup-buildx-action@v2
         with:
           version: latest
-
       - name: Login to DockerHub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-
+      - name: Build and push ARM64 Docker image
-      - name: Create manifest list and push
+        uses: docker/build-push-action@v3
-        working-directory: ${{ runner.temp }}/digests
+        with:
-        run: |
+          context: .
-          docker buildx imagetools create \
+          file: ./Dockerfile.arm64
-            -t ${{ env.IMAGE }}:latest \
+          platforms: linux/arm64
-            -t ${{ env.IMAGE }}:latest-arm64 \
+          push: true
-            -t ${{ env.IMAGE }}:${{ github.sha }} \
+          tags: zedeus/nitter:latest-arm64,zedeus/nitter:${{ github.sha }}-arm64
-            $(printf '${{ env.IMAGE }}@sha256:%s ' *)
-
-      - name: Inspect image
-        run: docker buildx imagetools inspect ${{ env.IMAGE }}:${{ github.sha }}

.github/workflows/run-tests.yml

@@ -8,145 +8,38 @@ on:
       - master
   workflow_call:
 
-# Ensure that multiple runs on the same branch do not overlap.
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-defaults:
-  run:
-    shell: bash
-
 jobs:
-  build-test:
+  test:
-    name: Build and test
+    runs-on: ubuntu-latest
-    runs-on: ubuntu-24.04
-    strategy:
-      matrix:
-        nim: ["2.0.x", "2.2.x", "devel"]
     steps:
-      - name: Checkout Code
+      - uses: actions/checkout@v3
-        uses: actions/checkout@v6
+        with:
-
+          fetch-depth: 0
-      - name: Cache Nimble Dependencies
+      - name: Cache nimble
         id: cache-nimble
-        uses: actions/cache@v5
+        uses: actions/cache@v3
         with:
-          path: |
+          path: ~/.nimble
-            ~/.nimble/pkgcache
+          key: nimble-${{ hashFiles('*.nimble') }}
-            ~/.nimble/packages_official.json
+          restore-keys: "nimble-"
-          key: ${{ matrix.nim }}-nimble-v6-${{ hashFiles('*.nimble') }}
+      - uses: actions/setup-python@v4
-          restore-keys: |
-            ${{ matrix.nim }}-nimble-v6-
-
-      - name: Setup Nim
-        uses: jiro4989/setup-nim-action@v2
         with:
-          nim-version: ${{ matrix.nim }}
+          python-version: "3.10"
-          use-nightlies: true
+          cache: "pip"
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
+      - uses: jiro4989/setup-nim-action@v1
-
-      - name: Build Project
-        run: nimble build -Y
-
-      - name: Upload 2.2.x build artifact
-        if: matrix.nim == '2.2.x'
-        uses: actions/upload-artifact@v6
         with:
-          name: nitter-linux-nim-2.2.x-${{ github.sha }}
+          nim-version: "1.x"
-          path: |
+      - run: nimble build -d:release -Y
-            ./nitter
+      - run: pip install seleniumbase
-          if-no-files-found: error
+      - run: seleniumbase install chromedriver
-
+      - uses: supercharge/redis-github-action@1.5.0
-  integration-test:
+      - name: Prepare Nitter
-    needs: [build-test]
-    name: Integration test
-    runs-on: ubuntu-24.04
-    timeout-minutes: 30
-
-    services:
-      redis:
-        image: redis:7
-        ports:
-          - 6379:6379
-
-    steps:
-      - name: Install runtime deps
-        run: |
-          sudo apt-get install -y --no-install-recommends libsass-dev libpcre3
-
-      - name: Checkout code
-        uses: actions/checkout@v6
-
-      - name: Cache pipx (poetry)
-        uses: actions/cache@v5
-        with:
-          path: |
-            ~/.local/pipx
-            ~/.local/bin
-          key: pipx-poetry-${{ runner.os }}
-
-      - name: Install poetry
-        env:
-          PIPX_HOME: ~/.local/pipx
-          PIPX_BIN_DIR: ~/.local/bin
-        run: command -v poetry >/dev/null 2>&1 || pipx install poetry
-
-      - name: Setup Python (3.14) with Poetry cache
-        uses: actions/setup-python@v6
-        with:
-          python-version: "3.14"
-          cache: poetry
-          cache-dependency-path: tests/poetry.lock
-
-      - name: Install Python deps
-        working-directory: tests
-        run: poetry sync
-
-      - name: Cache Nimble Dependencies
-        uses: actions/cache@v5
-        with:
-          path: |
-            ~/.nimble/pkgcache
-            ~/.nimble/packages_official.json
-          key: 2.2.x-nimble-v6-${{ hashFiles('*.nimble') }}
-          restore-keys: |
-            2.2.x-nimble-v6-
-
-      - name: Setup Nim
-        uses: jiro4989/setup-nim-action@v2
-        with:
-          nim-version: 2.2.x
-          use-nightlies: true
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Install Nimble dependencies
-        run: nimble install -y --depsOnly
-
-      - name: Download 2.2.x build artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: nitter-linux-nim-2.2.x-${{ github.sha }}
-          path: .
-
-      - name: Make nitter binary executable
-        run: chmod +x ./nitter
-
-      - name: Prepare Nitter Environment
         run: |
+          sudo apt install libsass-dev -y
           cp nitter.example.conf nitter.conf
-          sed -i 's/enableDebug = false/enableDebug = true/g' nitter.conf
+          nimble md
-          sed -i 's/maxRetries = 1/maxRetries = 3/g' nitter.conf
+          nimble scss
-          sed -i 's/hostname = "nitter.net"/hostname = "localhost:8080"/g' nitter.conf
+      - name: Run tests
-
-          nim r tools/rendermd.nim
-          nim r tools/gencss.nim
-
-          echo '${{ secrets.SESSIONS }}' | head -n1
-          echo '${{ secrets.SESSIONS }}' > ./sessions.jsonl
-
-      - name: Run Tests
         run: |
           ./nitter &
-          cd tests
+          pytest -n4 tests
-          poetry run pytest -n2 --rs .

.gitignore

@@ -10,11 +10,4 @@ nitter
 /public/css/style.css
 /public/md/*.html
 nitter.conf
-guest_accounts.json*
-sessions.json*
 dump.rdb
-*.bak
-/tools/*.json*
-nimbledeps/
-nimble.paths
-nimble.develop

Dockerfile

@@ -1,4 +1,4 @@
-FROM nimlang/nim:2.2.6-alpine-regular as nim
+FROM nimlang/nim:1.6.10-alpine-regular as nim
 LABEL maintainer="setenforce@protonmail.com"
 
 RUN apk --no-cache add libsass-dev pcre
@@ -9,13 +9,13 @@ COPY nitter.nimble .
 RUN nimble install -y --depsOnly
 
 COPY . .
-RUN nimble build -d:danger -d:lto -d:strip --mm:refc \
+RUN nimble build -d:danger -d:lto -d:strip \
     && nimble scss \
     && nimble md
 
 FROM alpine:latest
 WORKDIR /src/
-RUN apk --no-cache add pcre ca-certificates openssl
+RUN apk --no-cache add pcre ca-certificates
 COPY --from=nim /src/nitter/nitter ./
 COPY --from=nim /src/nitter/nitter.example.conf ./nitter.conf
 COPY --from=nim /src/nitter/public ./public

Dockerfile.arm64

@@ -0,0 +1,23 @@
+FROM alpine:3.17 as nim
+LABEL maintainer="setenforce@protonmail.com"
+
+RUN apk --no-cache add gcc git libc-dev libsass-dev "nim=1.6.8-r0" nimble pcre
+
+WORKDIR /src/nitter
+
+COPY nitter.nimble .
+RUN nimble install -y --depsOnly
+
+COPY . .
+RUN nimble build -d:danger -d:lto -d:strip \
+    && nimble scss \
+    && nimble md
+
+FROM alpine:3.17
+WORKDIR /src/
+RUN apk --no-cache add ca-certificates pcre openssl1.1-compat
+COPY --from=nim /src/nitter/nitter ./
+COPY --from=nim /src/nitter/nitter.example.conf ./nitter.conf
+COPY --from=nim /src/nitter/public ./public
+EXPOSE 8080
+CMD ./nitter

README.md

@@ -1,36 +1,31 @@
 # Nitter
 
-> [!NOTE]
+[![Test Matrix](https://github.com/zedeus/nitter/workflows/Tests/badge.svg)](https://github.com/zedeus/nitter/actions/workflows/run-tests.yml)
-> On 24 August 2026 cease and desist letters were sent by X Corp. demanding a permanent takedown of Nitter instances and the project's repository.
+[![Test Matrix](https://github.com/zedeus/nitter/workflows/Docker/badge.svg)](https://github.com/zedeus/nitter/actions/workflows/build-docker.yml)
+[![License](https://img.shields.io/github/license/zedeus/nitter?style=flat)](#license)
 
 A free and open source alternative Twitter front-end focused on privacy and
 performance. \
-Inspired by the [Invidious](https://github.com/iv-org/invidious) project.
+Inspired by the [Invidious](https://github.com/iv-org/invidious)
-
+project.
-## Donations
-
-**Liberapay**: https://liberapay.com/zedeus<br>
-**Patreon**: https://patreon.com/nitter<br>
-**Ko-fi**: https://ko-fi.com/zedeus<br>
-**BTC**: bc1qpqpzjkcpgluhzf7x9yqe7jfe8gpfm5v08mdr55<br>
-**ETH**: 0x24a0DB59A923B588c7A5EBd0dBDFDD1bCe9c4460<br>
-**XMR**: 42hKayRoEAw4D6G6t8mQHPJHQcXqofjFuVfavqKeNMNUZfeJLJAcNU19i1bGdDvcdN6romiSscWGWJCczFLe9RFhM3d1zpL<br>
-**SOL**: FF5bheiD5AqPEdc3eyjymJ8AoMRF1hS78Ht6FiSZZF1t<br>
-**$Nitter**: 4fSxCKc91ELQYVdv3tmHW8R15KoALPwEngyoQe1Xpump<br>
-**ZEC**: u1vndfqtzyy6qkzhkapxelel7ams38wmfeccu3fdpy2wkuc4erxyjm8ncjhnyg747x6t0kf0faqhh2hxyplgaum08d2wnj4n7cyu9s6zhxkqw2aef4hgd4s6vh5hpqvfken98rg80kgtgn64ff70djy7s8f839z00hwhuzlcggvefhdlyszkvwy3c7yw623vw3rvar6q6evd3xcvveypt
-
-## Features
 
 - No JavaScript or ads
 - All requests go through the backend, client never talks to Twitter
 - Prevents Twitter from tracking your IP or JavaScript fingerprint
-- Uses Twitter's unofficial API (no developer account required)
+- Uses Twitter's unofficial API (no rate limits or developer account required)
 - Lightweight (for [@nim_lang](https://nitter.net/nim_lang), 60KB vs 784KB from twitter.com)
 - RSS feeds
 - Themes
 - Mobile support (responsive design)
 - AGPLv3 licensed, no proprietary instances permitted
 
+Liberapay: https://liberapay.com/zedeus \
+Patreon: https://patreon.com/nitter \
+BTC: bc1qp7q4qz0fgfvftm5hwz3vy284nue6jedt44kxya \
+ETH: 0x66d84bc3fd031b62857ad18c62f1ba072b011925 \
+LTC: ltc1qhsz5nxw6jw9rdtw9qssjeq2h8hqk2f85rdgpkr \
+XMR: 42hKayRoEAw4D6G6t8mQHPJHQcXqofjFuVfavqKeNMNUZfeJLJAcNU19i1bGdDvcdN6romiSscWGWJCczFLe9RFhM3d1zpL
+
 ## Roadmap
 
 - Embeds
@@ -47,13 +42,12 @@ maintained by the community.
 
 ## Why?
 
-It's impossible to use Twitter without JavaScript enabled, and as of 2024 you
+It's impossible to use Twitter without JavaScript enabled. For privacy-minded
-need to sign up. For privacy-minded folks, preventing JavaScript analytics and
+folks, preventing JavaScript analytics and IP-based tracking is important, but
-IP-based tracking is important, but apart from using a VPN and uBlock/uMatrix,
+apart from using a VPN and uBlock/uMatrix, it's impossible. Despite being behind
-it's impossible. Despite being behind a VPN and using heavy-duty adblockers,
+a VPN and using heavy-duty adblockers, you can get accurately tracked with your
-you can get accurately tracked with your [browser's
+[browser's fingerprint](https://restoreprivacy.com/browser-fingerprinting/),
-fingerprint](https://restoreprivacy.com/browser-fingerprinting/), [no
+[no JavaScript required](https://noscriptfingerprint.com/). This all became
-JavaScript required](https://noscriptfingerprint.com/). This all became
 particularly important after Twitter [removed the
 ability](https://www.eff.org/deeplinks/2020/04/twitter-removes-privacy-option-and-shows-why-we-need-strong-privacy-laws)
 for users to control whether their data gets sent to advertisers.
@@ -77,21 +71,19 @@ Twitter account.
 
 - libpcre
 - libsass
-- redis/valkey
+- redis
 
 To compile Nitter you need a Nim installation, see
-[nim-lang.org](https://nim-lang.org/install.html) for details. It is possible
+[nim-lang.org](https://nim-lang.org/install.html) for details. It is possible to
-to install it system-wide or in the user directory you create below.
+install it system-wide or in the user directory you create below.
 
 To compile the scss files, you need to install `libsass`. On Ubuntu and Debian,
 you can use `libsass-dev`.
 
-Redis is required for caching and in the future for account info. As of 2024
+Redis is required for caching and in the future for account info. It should be
-Redis is no longer open source, so using the fork Valkey is recommended. It
+available on most distros as `redis` or `redis-server` (Ubuntu/Debian).
-should be available on most distros as `redis` or `redis-server`
+Running it with the default config is fine, Nitter's default config is set to
-(Ubuntu/Debian), or `valkey`/`valkey-server`. Running it with the default
+use the default Redis port and localhost.
-config is fine, Nitter's default config is set to use the default port and
-localhost.
 
 Here's how to create a `nitter` user, clone the repo, and build the project
 along with the scss and md files.
@@ -101,9 +93,9 @@ along with the scss and md files.
 # su nitter
 $ git clone https://github.com/zedeus/nitter
 $ cd nitter
-$ nimble -l build -d:danger --mm:refc
+$ nimble build -d:release
-$ nimble -l scss
+$ nimble scss
-$ nimble -l md
+$ nimble md
 $ cp nitter.example.conf nitter.conf
 ```
 
@@ -120,23 +112,12 @@ performance reasons.
 
 Page for the Docker image: https://hub.docker.com/r/zedeus/nitter
 
-#### NOTE: The published image is multi-arch — `zedeus/nitter:latest` runs natively on both `amd64` and `arm64`.
+#### NOTE: For ARM64 support, please use the separate ARM64 docker image: [`zedeus/nitter:latest-arm64`](https://hub.docker.com/r/zedeus/nitter/tags).
 
 To run Nitter with Docker, you'll need to install and run Redis separately
 before you can run the container. See below for how to also run Redis using
 Docker.
 
-First create your config file. The Docker commands mount it into the container,
-so it has to exist on the host beforehand. If you've cloned the repo:
-
-```bash
-cp nitter.example.conf nitter.conf
-```
-
-If you're using the prebuilt image without a local clone, download
-[`nitter.example.conf`](https://raw.githubusercontent.com/zedeus/nitter/master/nitter.example.conf)
-and save it as `nitter.conf` instead.
-
 To build and run Nitter in Docker:
 
 ```bash
@@ -144,6 +125,8 @@ docker build -t nitter:latest .
 docker run -v $(pwd)/nitter.conf:/src/nitter.conf -d --network host nitter:latest
 ```
 
+Note: For ARM64, use this Dockerfile: [`Dockerfile.arm64`](https://github.com/zedeus/nitter/blob/master/Dockerfile.arm64).
+
 A prebuilt Docker image is provided as well:
 
 ```bash
@@ -157,11 +140,8 @@ Change `redisHost` from `localhost` to `nitter-redis` in `nitter.conf`, then run
 docker-compose up -d
 ```
 
-Note the Docker commands mount `nitter.conf` (and `sessions.jsonl` for
+Note the Docker commands expect a `nitter.conf` file in the directory you run
-docker-compose) from the directory you run them in. If a mounted file doesn't
+them.
-exist, Docker silently creates a directory in its place and the container fails
-with `not a directory: Are you trying to mount a directory onto a file`. Remove
-that directory and create the file as shown above.
 
 ### systemd
 
@@ -206,5 +186,3 @@ lines). If you're running the Docker image, you can do this:
 
 Feel free to join our [Matrix channel](https://matrix.to/#/#nitter:matrix.org).
 You can email me at zedeus@pm.me if you wish to contact me personally.
-
-For legal inquiries, contact legal@poast.org

config.nims

@@ -7,11 +7,12 @@
 
 # disable annoying warnings
 warning("GcUnsafe2", off)
-warning("HoleEnumConv", off)
 hint("XDeclaredButNotUsed", off)
 hint("XCannotRaiseY", off)
 hint("User", off)
-# begin Nimble config (version 2)
+
-when withDir(thisDir(), system.fileExists("nimble.paths")):
+const
-  include "nimble.paths"
+  nimVersion = (major: NimMajor, minor: NimMinor, patch: NimPatch)
-# end Nimble config
+
+when nimVersion >= (1, 6, 0):
+  warning("HoleEnumConv", off)

docker-compose.yml

@@ -1,3 +1,5 @@
+version: "3"
+
 services:
 
   nitter:
@@ -7,7 +9,6 @@ services:
       - "127.0.0.1:8080:8080" # Replace with "8080:8080" if you don't use a reverse proxy
     volumes:
       - ./nitter.conf:/src/nitter.conf:Z,ro
-      - ./sessions.jsonl:/src/sessions.jsonl:Z,ro # Run get_sessions.py to get the credentials
     depends_on:
       - nitter-redis
     restart: unless-stopped

nitter.example.conf

@@ -1,42 +1,37 @@
 [Server]
-hostname = "nitter.net"      # for generating links, change this to your own domain/ip
+hostname = "nitter.net"  # for generating links, change this to your own domain/ip
 title = "nitter"
 address = "0.0.0.0"
 port = 8080
-https = false                # disable to enable cookies when not using https
+https = false  # disable to enable cookies when not using https
 httpMaxConnections = 100
 staticDir = "./public"
 
 [Cache]
-listMinutes = 240            # how long to cache list info (not the tweets, so keep it high)
+listMinutes = 240  # how long to cache list info (not the tweets, so keep it high)
-rssMinutes = 10              # how long to cache rss queries
+rssMinutes = 10  # how long to cache rss queries
-redisHost = "localhost"      # Change to "nitter-redis" if using docker-compose
+redisHost = "localhost"  # Change to "nitter-redis" if using docker-compose
 redisPort = 6379
 redisPassword = ""
-redisConnections = 20        # minimum open connections in pool
+redisConnections = 20  # minimum open connections in pool
 redisMaxConnections = 30
 # new connections are opened when none are available, but if the pool size
 # goes above this, they're closed when released. don't worry about this unless
 # you receive tons of requests per second
 
 [Config]
-hmacKey = "secretkey"        # CHANGE THIS to a unique random value (e.g. `openssl rand -hex 32`); signs media urls
+hmacKey = "secretkey"  # random key for cryptographic signing of video urls
-base64Media = false          # use base64 encoding for proxied media urls
+base64Media = false  # use base64 encoding for proxied media urls
-enableRSS = true             # master switch, set to false to disable all RSS feeds
+enableRSS = true  # set this to false to disable RSS feeds
-enableRSSUserTweets = true   # /@user/rss
+enableDebug = false  # enable request logs and debug endpoints (/.tokens)
-enableRSSUserReplies = true  # /@user/with_replies/rss
+proxy = ""  # http/https url, SOCKS proxies are not supported
-enableRSSUserMedia = true    # /@user/media/rss
-enableRSSUserArticles = true # /@user/articles/rss
-enableRSSSearch = true       # /search/rss and /@user/search/rss
-enableRSSList = true         # list RSS feeds
-enableDebug = false          # enable request logs and debug endpoints (/.sessions)
-proxy = ""                   # http/https url, SOCKS proxies are not supported
 proxyAuth = ""
-apiProxy = ""                # nitter-proxy host, e.g. localhost:7000
+tokenCount = 10
-disableTid = false           # enable this if cookie-based auth is failing
+# minimum amount of usable tokens. tokens are used to authorize API requests,
-maxConcurrentReqs = 2        # max requests at a time per session to avoid race conditions
+# but they expire after ~1 hour, and have a limit of 500 requests per endpoint.
-maxRetries = 1               # max number of retries on rate limit errors
+# the limits reset every 15 minutes, and the pool is filled up so there's
-retryDelayMs = 150           # delay in ms between retries
+# always at least `tokenCount` usable tokens. only increase this if you receive
+# major bursts all the time and don't have a rate limiting setup via e.g. nginx
 
 # Change default preferences here, see src/prefs_impl.nim for a complete list
 [Preferences]

nitter.nimble

@@ -10,24 +10,25 @@ bin           = @["nitter"]
 
 # Dependencies
 
-requires "nim >= 2.0.0"
+requires "nim >= 1.4.8"
-requires "jester == 0.6.0"
+requires "jester#baca3f"
-requires "karax == 1.5.0"
+requires "karax#5cf360c"
-requires "sass == 0.2.0"
+requires "sass#7dfdd03"
-requires "nimcrypto == 0.7.3"
+requires "nimcrypto#4014ef9"
-requires "markdown == 0.8.8"
+requires "markdown#158efe3"
 requires "packedjson#9e6fbb6"
-requires "supersnappy == 2.1.4"
+requires "supersnappy#6c94198"
-requires "redpool == 0.2.2"
+requires "redpool#8b7c1db"
-requires "zippy == 0.10.19"
+requires "https://github.com/zedeus/redis#d0a0e6f"
-requires "flatty == 0.4.0"
+requires "zippy#ca5989a"
-requires "jsony == 1.1.6"
+requires "flatty#e668085"
-requires "oauth == 0.11"
+requires "jsony#ea811be"
+
 
 # Tasks
 
 task scss, "Generate css":
-  exec "nim r --hint[Processing]:off tools/gencss"
+  exec "nimble c --hint[Processing]:off -d:danger -r tools/gencss"
 
 task md, "Render md":
-  exec "nim r --hint[Processing]:off tools/rendermd"
+  exec "nimble c --hint[Processing]:off -d:danger -r tools/rendermd"

public/css/fontello.css

@@ -1,18 +1,16 @@
 @font-face {
-  font-family: "fontello";
+  font-family: 'fontello';
-  src: url("/fonts/fontello.eot?59696369");
+  src: url('/fonts/fontello.eot?21002321');
-  src:
+  src: url('/fonts/fontello.eot?21002321#iefix') format('embedded-opentype'),
-    url("/fonts/fontello.eot?59696369#iefix") format("embedded-opentype"),
+       url('/fonts/fontello.woff2?21002321') format('woff2'),
-    url("/fonts/fontello.woff2?59696369") format("woff2"),
+       url('/fonts/fontello.woff?21002321') format('woff'),
-    url("/fonts/fontello.woff?59696369") format("woff"),
+       url('/fonts/fontello.ttf?21002321') format('truetype'),
-    url("/fonts/fontello.ttf?59696369") format("truetype"),
+       url('/fonts/fontello.svg?21002321#fontello') format('svg');
-    url("/fonts/fontello.svg?59696369#fontello") format("svg");
   font-weight: normal;
   font-style: normal;
 }
 
-[class^="icon-"]:before,
+ [class^="icon-"]:before, [class*=" icon-"]:before {
-[class*=" icon-"]:before {
   font-family: "fontello";
   font-style: normal;
   font-weight: normal;
@@ -21,7 +19,6 @@
   display: inline-block;
   text-decoration: inherit;
   width: 1em;
-  margin-right: 0.2em;
   text-align: center;
 
   /* For safety - reset parent styles, that can break glyph codes*/
@@ -36,118 +33,21 @@
   -moz-osx-font-smoothing: grayscale;
 }
  
-.icon-group:before {
+.icon-heart:before { content: '\2665'; } /* '♥' */
-  content: "\e0c3";
+.icon-quote:before { content: '\275e'; } /* '❞' */
-}
+.icon-comment:before { content: '\e802'; } /* '' */
-
+.icon-ok:before { content: '\e803'; } /* '' */
-/* '' */
+.icon-play:before { content: '\e804'; } /* '' */
-.icon-views:before {
+.icon-link:before { content: '\e805'; } /* '' */
-  content: "\e800";
+.icon-calendar:before { content: '\e806'; } /* '' */
-}
+.icon-location:before { content: '\e807'; } /* '' */
-
+.icon-picture:before { content: '\e809'; } /* '' */
-/* '' */
+.icon-lock:before { content: '\e80a'; } /* '' */
-.icon-heart:before {
+.icon-down:before { content: '\e80b'; } /* '' */
-  content: "\e801";
+.icon-retweet:before { content: '\e80d'; } /* '' */
-}
+.icon-search:before { content: '\e80e'; } /* '' */
-
+.icon-pin:before { content: '\e80f'; } /* '' */
-/* '' */
+.icon-cog:before { content: '\e812'; } /* '' */
-.icon-quote:before {
+.icon-rss-feed:before { content: '\e813'; } /* '' */
-  content: "\e802";
+.icon-info:before { content: '\f128'; } /* '' */
-}
+.icon-bird:before { content: '\f309'; } /* '' */
-
-/* '' */
-.icon-comment:before {
-  content: "\e803";
-}
-
-/* '' */
-.icon-play:before {
-  content: "\e805";
-}
-
-/* '' */
-.icon-link:before {
-  content: "\e806";
-}
-
-/* '' */
-.icon-calendar:before {
-  content: "\e807";
-}
-
-/* '' */
-.icon-location:before {
-  content: "\e808";
-}
-
-/* '' */
-.icon-picture:before {
-  content: "\e809";
-}
-
-/* '' */
-.icon-lock:before {
-  content: "\e80a";
-}
-
-/* '' */
-.icon-down:before {
-  content: "\e80b";
-}
-
-/* '' */
-.icon-retweet:before {
-  content: "\e80c";
-}
-
-/* '' */
-.icon-search:before {
-  content: "\e80d";
-}
-
-/* '' */
-.icon-pin:before {
-  content: "\e80e";
-}
-
-/* '' */
-.icon-cog:before {
-  content: "\e80f";
-}
-
-/* '' */
-.icon-rss:before {
-  content: "\e810";
-}
-
-/* '' */
-.icon-ok:before {
-  content: "\e811";
-}
-
-/* '' */
-.icon-attention-circled:before {
-  content: "\e812";
-}
-
-/* '' */
-.icon-download-alt:before {
-  content: "\e813";
-}
-
-/* '' */
-.icon-circle:before {
-  content: "\f111";
-}
-
-/* '' */
-.icon-info:before {
-  content: "\f128";
-}
-
-/* '' */
-.icon-bird:before {
-  content: "\f309";
-}
-
-/* '' */

public/fonts/LICENSE.txt

@@ -1,15 +1,6 @@
 Font license info
 
 
-## Modern Pictograms
-
-   Copyright (c) 2012 by John Caserta. All rights reserved.
-
-   Author:    John Caserta
-   License:   SIL (http://scripts.sil.org/OFL)
-   Homepage:  http://thedesignoffice.org/project/modern-pictograms/
-
-
 ## Entypo
 
    Copyright (C) 2012 by Daniel Bruce
@@ -46,3 +37,12 @@ Font license info
    Homepage:  http://aristeides.com/
 
 
+## Modern Pictograms
+
+   Copyright (c) 2012 by John Caserta. All rights reserved.
+
+   Author:    John Caserta
+   License:   SIL (http://scripts.sil.org/OFL)
+   Homepage:  http://thedesignoffice.org/project/modern-pictograms/
+
+

public/fonts/fontello.svg

@@ -1,28 +1,26 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg">
-<metadata>Copyright (C) 2026 by original authors @ fontello.com</metadata>
+<metadata>Copyright (C) 2020 by original authors @ fontello.com</metadata>
 <defs>
 <font id="fontello" horiz-adv-x="1000" >
 <font-face font-family="fontello" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" />
 <missing-glyph horiz-adv-x="1000" />
-<glyph glyph-name="group" unicode="&#xe0c3;" d="M0 106l0 134q0 26 18 32l171 80q-66 39-68 131 0 56 35 103 37 41 90 43 31 0 63-19-49-125 23-237-12-11-25-19l-114-55q-48-23-52-84l0-143-114 0q-25 0-27 34z m193-59l0 168q0 27 22 37l152 70 57 28q-37 23-60 66t-22 94q0 76 46 130t110 54 109-54 45-130q0-105-78-158l61-30 146-70q24-10 24-37l0-168q-2-37-37-41l-541 0q-14 2-24 14t-10 27z m473 330q68 106 22 231 31 19 66 21 49 0 90-43 35-41 35-103 0-82-65-131l168-80q18-10 18-32l0-134q0-32-27-34l-118 0 0 143q0 57-50 84l-110 53q-15 8-29 25z" horiz-adv-x="1000" />
+<glyph glyph-name="heart" unicode="&#x2665;" d="M790 644q70-64 70-156t-70-158l-360-330-360 330q-70 66-70 158t70 156q62 58 151 58t153-58l56-52 58 52q62 58 150 58t152-58z" horiz-adv-x="860" />
 
-<glyph glyph-name="views" unicode="&#xe800;" d="M180 516l0-538-180 0 0 538 180 0z m250-138l0-400-180 0 0 400 180 0z m250 344l0-744-180 0 0 744 180 0z" horiz-adv-x="680" />
+<glyph glyph-name="quote" unicode="&#x275e;" d="M18 685l335 0 0-334q0-140-98-238t-237-97l0 111q92 0 158 65t65 159l-223 0 0 334z m558 0l335 0 0-334q0-140-98-238t-237-97l0 111q92 0 158 65t65 159l-223 0 0 334z" horiz-adv-x="928" />
 
-<glyph glyph-name="heart" unicode="&#xe801;" d="M790 644q70-64 70-156t-70-158l-360-330-360 330q-70 66-70 158t70 156q62 58 151 58t153-58l56-52 58 52q62 58 150 58t152-58z" horiz-adv-x="860" />
+<glyph glyph-name="comment" unicode="&#xe802;" d="M1000 350q0-97-67-179t-182-130-251-48q-39 0-81 4-110-97-257-135-27-8-63-12-10-1-17 5t-10 16v1q-2 2 0 6t1 6 2 5l4 5t4 5 4 5q4 5 17 19t20 22 17 22 18 28 15 33 15 42q-88 50-138 123t-51 157q0 73 40 139t106 114 160 76 194 28q136 0 251-48t182-130 67-179z" horiz-adv-x="1000" />
 
-<glyph glyph-name="quote" unicode="&#xe802;" d="M18 685l335 0 0-334q0-140-98-238t-237-97l0 111q92 0 158 65t65 159l-223 0 0 334z m558 0l335 0 0-334q0-140-98-238t-237-97l0 111q92 0 158 65t65 159l-223 0 0 334z" horiz-adv-x="928" />
+<glyph glyph-name="ok" unicode="&#xe803;" d="M0 260l162 162 166-164 508 510 164-164-510-510-162-162-162 164z" horiz-adv-x="1000" />
 
-<glyph glyph-name="comment" unicode="&#xe803;" d="M1000 350q0-97-67-179t-182-130-251-48q-39 0-81 4-110-97-257-135-27-8-63-12-10-1-17 5t-10 16v1q-2 2 0 6t1 6 2 5l4 5t4 5 4 5q4 5 17 19t20 22 17 22 18 28 15 33 15 42q-88 50-138 123t-51 157q0 73 40 139t106 114 160 76 194 28q136 0 251-48t182-130 67-179z" horiz-adv-x="1000" />
+<glyph glyph-name="play" unicode="&#xe804;" d="M772 333l-741-412q-13-7-22-2t-9 20v822q0 14 9 20t22-2l741-412q13-7 13-17t-13-17z" horiz-adv-x="785.7" />
 
-<glyph glyph-name="play" unicode="&#xe805;" d="M772 333l-741-412q-13-7-22-2t-9 20v822q0 14 9 20t22-2l741-412q13-7 13-17t-13-17z" horiz-adv-x="785.7" />
+<glyph glyph-name="link" unicode="&#xe805;" d="M294 116q14 14 34 14t36-14q32-34 0-70l-42-40q-56-56-132-56-78 0-134 56t-56 132q0 78 56 134l148 148q70 68 144 77t128-43q16-16 16-36t-16-36q-36-32-70 0-50 48-132-34l-148-146q-26-26-26-64t26-62q26-26 63-26t63 26z m450 574q56-56 56-132 0-78-56-134l-158-158q-74-72-150-72-62 0-112 50-14 14-14 34t14 36q14 14 35 14t35-14q50-48 122 24l158 156q28 28 28 64 0 38-28 62-24 26-56 31t-60-21l-50-50q-16-14-36-14t-34 14q-34 34 0 70l50 50q54 54 127 51t129-61z" horiz-adv-x="800" />
 
-<glyph glyph-name="link" unicode="&#xe806;" d="M294 116q14 14 34 14t36-14q32-34 0-70l-42-40q-56-56-132-56-78 0-134 56t-56 132q0 78 56 134l148 148q70 68 144 77t128-43q16-16 16-36t-16-36q-36-32-70 0-50 48-132-34l-148-146q-26-26-26-64t26-62q26-26 63-26t63 26z m450 574q56-56 56-132 0-78-56-134l-158-158q-74-72-150-72-62 0-112 50-14 14-14 34t14 36q14 14 35 14t35-14q50-48 122 24l158 156q28 28 28 64 0 38-28 62-24 26-56 31t-60-21l-50-50q-16-14-36-14t-34 14q-34 34 0 70l50 50q54 54 127 51t129-61z" horiz-adv-x="800" />
+<glyph glyph-name="calendar" unicode="&#xe806;" d="M800 700q42 0 71-29t29-71l0-600q0-40-29-70t-71-30l-700 0q-40 0-70 30t-30 70l0 600q0 42 30 71t70 29l46 0 0-100 160 0 0 100 290 0 0-100 160 0 0 100 44 0z m0-700l0 400-700 0 0-400 700 0z m-540 800l0-170-70 0 0 170 70 0z m450 0l0-170-70 0 0 170 70 0z" horiz-adv-x="900" />
 
-<glyph glyph-name="calendar" unicode="&#xe807;" d="M800 700q42 0 71-29t29-71l0-600q0-40-29-70t-71-30l-700 0q-40 0-70 30t-30 70l0 600q0 42 30 71t70 29l46 0 0-100 160 0 0 100 290 0 0-100 160 0 0 100 44 0z m0-700l0 400-700 0 0-400 700 0z m-540 800l0-170-70 0 0 170 70 0z m450 0l0-170-70 0 0 170 70 0z" horiz-adv-x="900" />
+<glyph glyph-name="location" unicode="&#xe807;" d="M250 750q104 0 177-73t73-177q0-106-62-243t-126-223l-62-84q-10 12-27 35t-60 89-76 130-60 147-27 149q0 104 73 177t177 73z m0-388q56 0 96 40t40 96-40 95-96 39-95-39-39-95 39-96 95-40z" horiz-adv-x="500" />
-
-<glyph glyph-name="location" unicode="&#xe808;" d="M250 750q104 0 177-73t73-177q0-106-62-243t-126-223l-62-84q-10 12-27 35t-60 89-76 130-60 147-27 149q0 104 73 177t177 73z m0-388q56 0 96 40t40 96-40 95-96 39-95-39-39-95 39-96 95-40z" horiz-adv-x="500" />
 
 <glyph glyph-name="picture" unicode="&#xe809;" d="M357 529q0-45-31-76t-76-32-76 32-31 76 31 76 76 31 76-31 31-76z m572-215v-250h-786v107l178 179 90-89 285 285z m53 393h-893q-7 0-12-5t-6-13v-678q0-7 6-13t12-5h893q7 0 13 5t5 13v678q0 8-5 13t-13 5z m89-18v-678q0-37-26-63t-63-27h-893q-36 0-63 27t-26 63v678q0 37 26 63t63 27h893q37 0 63-27t26-63z" horiz-adv-x="1071.4" />
 
@@ -30,23 +28,15 @@
 
 <glyph glyph-name="down" unicode="&#xe80b;" d="M939 399l-414-413q-10-11-25-11t-25 11l-414 413q-11 11-11 26t11 25l93 92q10 11 25 11t25-11l296-296 296 296q11 11 25 11t26-11l92-92q11-11 11-25t-11-26z" horiz-adv-x="1000" />
 
-<glyph glyph-name="retweet" unicode="&#xe80c;" d="M714 11q0-7-5-13t-13-5h-535q-5 0-8 1t-5 4-3 4-2 7 0 6v335h-107q-15 0-25 11t-11 25q0 13 8 23l179 214q11 12 27 12t28-12l178-214q9-10 9-23 0-15-11-25t-25-11h-107v-214h321q9 0 14-6l89-108q4-5 4-11z m357 232q0-13-8-23l-178-214q-12-13-28-13t-27 13l-179 214q-8 10-8 23 0 14 11 25t25 11h107v214h-322q-9 0-14 7l-89 107q-4 5-4 11 0 7 5 12t13 6h536q4 0 7-1t5-4 3-5 2-6 1-7v-334h107q14 0 25-11t10-25z" horiz-adv-x="1071.4" />
+<glyph glyph-name="retweet" unicode="&#xe80d;" d="M714 11q0-7-5-13t-13-5h-535q-5 0-8 1t-5 4-3 4-2 7 0 6v335h-107q-15 0-25 11t-11 25q0 13 8 23l179 214q11 12 27 12t28-12l178-214q9-10 9-23 0-15-11-25t-25-11h-107v-214h321q9 0 14-6l89-108q4-5 4-11z m357 232q0-13-8-23l-178-214q-12-13-28-13t-27 13l-179 214q-8 10-8 23 0 14 11 25t25 11h107v214h-322q-9 0-14 7l-89 107q-4 5-4 11 0 7 5 12t13 6h536q4 0 7-1t5-4 3-5 2-6 1-7v-334h107q14 0 25-11t10-25z" horiz-adv-x="1071.4" />
 
-<glyph glyph-name="search" unicode="&#xe80d;" d="M772 78q30-34 6-62l-46-46q-36-32-68 0l-190 190q-74-42-156-42-128 0-223 95t-95 223 90 219 218 91 224-95 96-223q0-88-46-162z m-678 358q0-88 68-156t156-68 151 63 63 153q0 88-68 155t-156 67-151-63-63-151z" horiz-adv-x="789" />
+<glyph glyph-name="search" unicode="&#xe80e;" d="M772 78q30-34 6-62l-46-46q-36-32-68 0l-190 190q-74-42-156-42-128 0-223 95t-95 223 90 219 218 91 224-95 96-223q0-88-46-162z m-678 358q0-88 68-156t156-68 151 63 63 153q0 88-68 155t-156 67-151-63-63-151z" horiz-adv-x="789" />
 
-<glyph glyph-name="pin" unicode="&#xe80e;" d="M268 368v250q0 8-5 13t-13 5-13-5-5-13v-250q0-8 5-13t13-5 13 5 5 13z m375-197q0-14-11-25t-25-10h-239l-29-270q-1-7-6-11t-11-5h-1q-15 0-17 15l-43 271h-225q-15 0-25 10t-11 25q0 69 44 124t99 55v286q-29 0-50 21t-22 50 22 50 50 22h357q29 0 50-22t21-50-21-50-50-21v-286q55 0 99-55t44-124z" horiz-adv-x="642.9" />
+<glyph glyph-name="pin" unicode="&#xe80f;" d="M268 368v250q0 8-5 13t-13 5-13-5-5-13v-250q0-8 5-13t13-5 13 5 5 13z m375-197q0-14-11-25t-25-10h-239l-29-270q-1-7-6-11t-11-5h-1q-15 0-17 15l-43 271h-225q-15 0-25 10t-11 25q0 69 44 124t99 55v286q-29 0-50 21t-22 50 22 50 50 22h357q29 0 50-22t21-50-21-50-50-21v-286q55 0 99-55t44-124z" horiz-adv-x="642.9" />
 
-<glyph glyph-name="cog" unicode="&#xe80f;" d="M911 295l-133-56q-8-22-12-31l55-133-79-79-135 53q-9-4-31-12l-55-134-112 0-56 133q-11 4-33 13l-132-55-78 79 53 134q-1 3-4 9t-6 12-4 11l-131 55 0 112 131 56 14 33-54 132 78 79 133-54q22 9 33 13l55 132 112 0 56-132q14-5 31-13l133 55 80-79-54-135q6-12 12-30l133-56 0-112z m-447-111q69 0 118 48t49 118-49 119-118 50-119-50-49-119 49-118 119-48z" horiz-adv-x="928" />
+<glyph glyph-name="cog" unicode="&#xe812;" d="M911 295l-133-56q-8-22-12-31l55-133-79-79-135 53q-9-4-31-12l-55-134-112 0-56 133q-11 4-33 13l-132-55-78 79 53 134q-1 3-4 9t-6 12-4 11l-131 55 0 112 131 56 14 33-54 132 78 79 133-54q22 9 33 13l55 132 112 0 56-132q14-5 31-13l133 55 80-79-54-135q6-12 12-30l133-56 0-112z m-447-111q69 0 118 48t49 118-49 119-118 50-119-50-49-119 49-118 119-48z" horiz-adv-x="928" />
 
-<glyph glyph-name="rss" unicode="&#xe810;" d="M184 93c0-51-43-91-93-91s-91 40-91 91c0 50 41 91 91 91s93-41 93-91z m261-85l-125 0c0 174-140 323-315 323l0 118c231 0 440-163 440-441z m259 0l-136 0c0 300-262 561-563 561l0 129c370 0 699-281 699-690z" horiz-adv-x="704" />
+<glyph glyph-name="rss-feed" unicode="&#xe813;" d="M184 93c0-51-43-91-93-91s-91 40-91 91c0 50 41 91 91 91s93-41 93-91z m261-85l-125 0c0 174-140 323-315 323l0 118c231 0 440-163 440-441z m259 0l-136 0c0 300-262 561-563 561l0 129c370 0 699-281 699-690z" horiz-adv-x="704" />
-
-<glyph glyph-name="ok" unicode="&#xe811;" d="M933 534q0-22-16-38l-404-404-76-76q-16-15-38-15t-38 15l-76 76-202 202q-15 16-15 38t15 38l76 76q16 16 38 16t38-16l164-165 366 367q16 16 38 16t38-16l76-76q16-15 16-38z" horiz-adv-x="1000" />
-
-<glyph glyph-name="attention-circled" unicode="&#xe812;" d="M429 779q116 0 215-58t156-156 57-215-57-215-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58z m71-696v106q0 8-5 13t-12 5h-107q-8 0-13-5t-6-13v-106q0-8 6-13t13-6h107q7 0 12 6t5 13z m-1 192l10 346q0 7-6 10-5 5-13 5h-123q-8 0-13-5-6-3-6-10l10-346q0-6 5-10t14-4h103q8 0 13 4t6 10z" horiz-adv-x="857.1" />
-
-<glyph glyph-name="download-alt" unicode="&#xe813;" d="M0-150l0 135 1000 0 0-135-1000 0z m88 586l228 0 0 414 370 0 0-414 228 0-414-385z" horiz-adv-x="1000" />
-
-<glyph glyph-name="circle" unicode="&#xf111;" d="M857 350q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" />
 
 <glyph glyph-name="info" unicode="&#xf128;" d="M393 149v-134q0-9-7-15t-15-7h-134q-9 0-16 7t-7 15v134q0 9 7 16t16 6h134q9 0 15-6t7-16z m176 335q0-30-8-56t-20-43-31-33-32-25-34-19q-23-13-38-37t-15-37q0-10-7-18t-16-9h-134q-8 0-14 11t-6 20v26q0 46 37 87t79 60q33 16 47 32t14 42q0 24-26 41t-60 18q-36 0-60-16-20-14-60-64-7-9-17-9-7 0-14 4l-91 70q-8 6-9 14t3 16q89 148 259 148 45 0 90-17t81-46 59-72 23-88z" horiz-adv-x="571.4" />
 

public/js/embedResize.js

@@ -1,34 +0,0 @@
-(function () {
-  var embed = document.querySelector(".embed-wrapper, .embed-video");
-  if (!embed) return;
-
-  var video = embed.querySelector("video");
-  if (video) {
-    video.onplay = function () {
-      embed.classList.add("video-playing");
-    };
-    video.onpause = video.onended = function () {
-      embed.classList.remove("video-playing");
-    };
-  }
-
-  var lastHeight = 0;
-
-  function sendHeight() {
-    var h = embed.offsetHeight;
-    if (h !== lastHeight && h > 0) {
-      lastHeight = h;
-      window.parent.postMessage(["resizeIframe", { h: h }], "*");
-    }
-  }
-
-  // MessageChannel height request (used by oEmbed)
-  window.addEventListener("message", function (e) {
-    if (e.source === window.parent && e.ports && e.ports[0]) {
-      e.ports[0].postMessage(embed.offsetHeight);
-    }
-  });
-
-  window.addEventListener("load", sendHeight);
-  new ResizeObserver(sendHeight).observe(embed);
-})();

public/js/hlsPlayback.js

@@ -1,30 +1,25 @@
 // @license http://www.gnu.org/licenses/agpl-3.0.html AGPL-3.0
 // SPDX-License-Identifier: AGPL-3.0-only
-function playMedia(overlay, tagName) {
+function playVideo(overlay) {
-    const media = overlay.parentElement.querySelector(tagName);
+    const video = overlay.parentElement.querySelector('video');
-    const url = media.getAttribute("data-url");
+    const url = video.getAttribute("data-url");
-    const startTime = parseFloat(media.getAttribute("data-start") || "0");
+    video.setAttribute("controls", "");
-    media.setAttribute("controls", "");
     overlay.style.display = "none";
 
     if (Hls.isSupported()) {
         var hls = new Hls({autoStartLoad: false});
         hls.loadSource(url);
-        hls.attachMedia(media);
+        hls.attachMedia(video);
         hls.on(Hls.Events.MANIFEST_PARSED, function () {
             hls.loadLevel = hls.levels.length - 1;
-            hls.startLoad(startTime);
+            hls.startLoad();
-            media.play();
+            video.play();
         });
-    } else if (media.canPlayType('application/vnd.apple.mpegurl')) {
+    } else if (video.canPlayType('application/vnd.apple.mpegurl')) {
-        media.src = url;
+        video.src = url;
-        media.addEventListener('canplay', function() {
+        video.addEventListener('canplay', function() {
-            if (startTime > 0) media.currentTime = startTime;
+            video.play();
-            media.play();
         });
     }
 }
-
-function playVideo(overlay) { playMedia(overlay, 'video'); }
-function playAudio(overlay) { playMedia(overlay, 'audio'); }
 // @license-end

public/js/infiniteScroll.js

@@ -1,225 +1,66 @@
 // @license http://www.gnu.org/licenses/agpl-3.0.html AGPL-3.0
 // SPDX-License-Identifier: AGPL-3.0-only
-
 function insertBeforeLast(node, elem) {
-  node.insertBefore(elem, node.childNodes[node.childNodes.length - 2]);
+    node.insertBefore(elem, node.childNodes[node.childNodes.length - 2]);
 }
 
 function getLoadMore(doc) {
-  return doc.querySelector(".show-more:not(.timeline-item)");
+    return doc.querySelector('.show-more:not(.timeline-item)');
 }
 
-function getHrefs(selector) {
+function isDuplicate(item, itemClass) {
-  return new Set([...document.querySelectorAll(selector)].map(el => el.getAttribute("href")));
+    const tweet = item.querySelector(".tweet-link");
+    if (tweet == null) return false;
+    const href = tweet.getAttribute("href");
+    return document.querySelector(itemClass + " .tweet-link[href='" + href + "']") != null;
 }
 
-function getTweetId(item) {
+window.onload = function() {
-  const m = item.querySelector(".tweet-link")?.getAttribute("href")?.match(/\/status\/(\d+)/);
+    const url = window.location.pathname;
-  return m ? m[1] : "";
+    const isTweet = url.indexOf("/status/") !== -1;
-}
+    const containerClass = isTweet ? ".replies" : ".timeline";
+    const itemClass = containerClass + ' > div:not(.top-ref)';
 
-function isDuplicate(item, hrefs) {
+    var html = document.querySelector("html");
-  return hrefs.has(item.querySelector(".tweet-link")?.getAttribute("href"));
+    var container = document.querySelector(containerClass);
-}
+    var loading = false;
 
-const GAP = 10;
+    window.addEventListener('scroll', function() {
+        if (loading) return;
+        if (html.scrollTop + html.clientHeight >= html.scrollHeight - 3000) {
+            loading = true;
+            var loadMore = getLoadMore(document);
+            if (loadMore == null) return;
 
-class Masonry {
+            loadMore.children[0].text = "Loading...";
-  constructor(container) {
-    this.container = container;
-    const colSizes = {
-      small:  w => Math.max(130, w * 0.11),
-      medium: w => Math.max(190, Math.min(350, w * 0.22)),
-      large:  w => Math.max(350, Math.min(480, w * 0.22)),
-    };
-    const size = container.dataset.colSize || "medium";
-    this._targetWidth = colSizes[size] || colSizes.medium;
-    this.colHeights = [];
-    this.colCounts = [];
-    this.colCount = 0;
-    this._lastWidth = 0;
-    this._colWidthCache = 0;
-    this._items = [];
-    this._revealTimer = null;
-    this.container.classList.add("masonry-active");
 
-    let resizeTimer;
+            var url = new URL(loadMore.children[0].href);
-    window.addEventListener("resize", () => {
+            url.searchParams.append('scroll', 'true');
-      clearTimeout(resizeTimer);
-      resizeTimer = setTimeout(() => this._rebuild(), 50);
-    });
 
-    // Re-sync positions whenever images finish loading and items grow taller.
+            fetch(url.toString()).then(function (response) {
-    // Must be set up before _rebuild() so initial items get observed on first pass.
+                return response.text();
-    let syncTimer;
+            }).then(function (html) {
-    this._observer = window.ResizeObserver ? new ResizeObserver(() => {
+                var parser = new DOMParser();
-      clearTimeout(syncTimer);
+                var doc = parser.parseFromString(html, 'text/html');
-      syncTimer = setTimeout(() => this.syncHeights(), 100);
+                loadMore.remove();
-    }) : null;
 
-    this._rebuild();
+                for (var item of doc.querySelectorAll(itemClass)) {
-  }
+                    if (item.className == "timeline-item show-more") continue;
+                    if (isDuplicate(item, itemClass)) continue;
+                    if (isTweet) container.appendChild(item);
+                    else insertBeforeLast(container, item);
+                }
 
-  // Reveal all items and gallery siblings (show-more, top-ref). Idempotent.
+                loading = false;
-  _revealAll() {
+                const newLoadMore = getLoadMore(doc);
-    clearTimeout(this._revealTimer);
+                if (newLoadMore == null) return;
-    for (const item of this._items) item.classList.add("masonry-visible");
+                if (isTweet) container.appendChild(newLoadMore);
-    for (const el of this.container.parentElement.querySelectorAll(":scope > .show-more, :scope > .top-ref, :scope > .timeline-footer"))
+                else insertBeforeLast(container, newLoadMore);
-      el.classList.add("masonry-visible");
+            }).catch(function (err) {
-  }
+                console.warn('Something went wrong.', err);
-
+                loading = true;
-  // Height-primary, count-as-tiebreaker: handles both tall tweets and unloaded images.
+            });
-  _pickCol() {
-    return this.colHeights.reduce((min, h, i) => {
-      const m = this.colHeights[min];
-      return (h < m || (h === m && this.colCounts[i] < this.colCounts[min])) ? i : min;
-    }, 0);
-  }
-
-  // Position items using current column state. Updates colHeights, colCounts, container height.
-  _position(items, heights, colWidth) {
-    for (let i = 0; i < items.length; i++) {
-      const col = this._pickCol();
-      items[i].style.left = `${col * (colWidth + GAP)}px`;
-      items[i].style.top = `${this.colHeights[col]}px`;
-      this.colHeights[col] += heights[i] + GAP;
-      this.colCounts[col]++;
-    }
-    this.container.style.height = `${Math.max(0, ...this.colHeights)}px`;
-  }
-
-  // Full reset and re-place all items.
-  _place(items, heights, n, colWidth) {
-    this.colHeights = new Array(n).fill(0);
-    this.colCounts = new Array(n).fill(0);
-    this.colCount = n;
-    this._position(items, heights, colWidth);
-  }
-
-  _rebuild() {
-    const w = this.container.clientWidth;
-    const n = Math.max(1, Math.floor(w / this._targetWidth(w)));
-    if (n === this.colCount && w === this._lastWidth) return;
-
-    const isFirst = this.colCount === 0;
-
-    if (isFirst) {
-      this._items = [...this.container.querySelectorAll(".timeline-item")];
-    }
-
-    // Sort newest-first by tweet ID (snowflake IDs exceed Number precision, compare as strings).
-    this._items.sort((a, b) => {
-      const idA = getTweetId(a), idB = getTweetId(b);
-      if (idA.length !== idB.length) return idB.length - idA.length;
-      return idB < idA ? -1 : idB > idA ? 1 : 0;
-    });
-
-    // Pre-set widths BEFORE reading heights so measurements reflect the new column width.
-    const colWidth = this._colWidthCache = Math.floor((w - GAP * (n - 1)) / n);
-    for (const item of this._items) item.style.width = `${colWidth}px`;
-
-    this._place(this._items, this._items.map(item => item.offsetHeight), n, colWidth);
-    this._lastWidth = w;
-
-    if (isFirst) {
-      if (this._observer) this._items.forEach(item => this._observer.observe(item));
-      // Reveal immediately if all images are cached, else wait for syncHeights.
-      const hasUnloaded = this._items.some(item =>
-        [...item.querySelectorAll("img")].some(img => !img.complete));
-      if (hasUnloaded) {
-        this._revealTimer = setTimeout(() => this._revealAll(), 1000);
-      } else {
-        this._revealAll();
-      }
-    }
-  }
-
-  // Re-read actual heights and re-place all items. Fixes drift after images load.
-  syncHeights() {
-    this._place(this._items, this._items.map(item => item.offsetHeight), this.colCount, this._colWidthCache);
-    this._revealAll();
-  }
-
-  // Batch-add items in three phases to avoid O(N) reflows:
-  //   1. writes: set widths, append all — no reads, no reflows
-  //   2. one read: batch offsetHeight
-  //   3. writes: assign columns, set left/top
-  addAll(newItems) {
-    if (!newItems.length) return;
-    const colWidth = this._colWidthCache;
-
-    for (const item of newItems) {
-      item.style.width = `${colWidth}px`;
-      this.container.appendChild(item);
-    }
-
-    this._position(newItems, newItems.map(item => item.offsetHeight), colWidth);
-    this._items.push(...newItems);
-
-    if (this._observer) newItems.forEach(item => this._observer.observe(item));
-  }
-}
-
-document.addEventListener("DOMContentLoaded", function () {
-  const isTweet = location.pathname.includes("/status/");
-  const containerClass = isTweet ? ".replies" : ".timeline";
-  const itemClass = containerClass + " > div:not(.top-ref)";
-  const html = document.documentElement;
-  const container = document.querySelector(containerClass);
-  const masonryEl = container?.querySelector(".gallery-masonry");
-  const masonry = masonryEl ? new Masonry(masonryEl) : null;
-  let loading = false;
-
-  function handleScroll(failed) {
-    if (loading || html.scrollTop + html.clientHeight < html.scrollHeight - 3000) return;
-
-    const loadMore = getLoadMore(document);
-    if (!loadMore) return;
-    loading = true;
-    loadMore.children[0].text = "Loading...";
-
-    const url = new URL(loadMore.children[0].href);
-    url.searchParams.append("scroll", "true");
-
-    fetch(url)
-      .then(r => {
-        if (r.status > 299) throw new Error("error");
-        return r.text();
-      })
-      .then(responseText => {
-        const doc = new DOMParser().parseFromString(responseText, "text/html");
-        loadMore.remove();
-
-        if (masonry) {
-          masonry.syncHeights();
-          const newMasonry = doc.querySelector(".gallery-masonry");
-          if (newMasonry) {
-            const knownHrefs = getHrefs(".gallery-masonry .tweet-link");
-            masonry.addAll([...newMasonry.querySelectorAll(".timeline-item")].filter(item => !isDuplicate(item, knownHrefs)));
-          }
-        } else {
-          const knownHrefs = getHrefs(`${itemClass} .tweet-link`);
-          for (const item of doc.querySelectorAll(itemClass)) {
-            if (item.className === "timeline-item show-more" || isDuplicate(item, knownHrefs)) continue;
-            isTweet ? container.appendChild(item) : insertBeforeLast(container, item);
-          }
         }
-
+    });
-        loading = false;
+};
-        const newLoadMore = getLoadMore(doc);
-        if (newLoadMore) {
-          isTweet ? container.appendChild(newLoadMore) : insertBeforeLast(container, newLoadMore);
-          if (masonry) newLoadMore.classList.add("masonry-visible");
-        }
-      })
-      .catch(err => {
-        console.warn("Something went wrong.", err);
-        if (failed > 3) { loadMore.children[0].text = "Error"; return; }
-        loading = false;
-        handleScroll((failed || 0) + 1);
-      });
-  }
-
-  window.addEventListener("scroll", () => handleScroll());
-});
 // @license-end

public/js/widgets.js

@@ -1,221 +0,0 @@
-/**
- * Drop-in replacement for Twitter's widgets.js
- * Redirects twitter-tweet blockquotes to Nitter embeds
- */
-(function () {
-  "use strict";
-
-  if (window.__nitterWidgets) return;
-  window.__nitterWidgets = true;
-
-  var NITTER = new URL(document.currentScript.src).origin;
-
-  var TWEET_RE = /(?:twitter\.com|x\.com)\/([^\/]+)\/status\/(\d+)/i;
-  var SELECTOR = "blockquote.twitter-tweet, blockquote.twitter-video";
-
-  var readyCallbacks = [];
-  var eventCallbacks = {};
-  var isReady = false;
-
-  function safeCall(fn, arg) {
-    try {
-      fn(arg);
-    } catch (e) { }
-  }
-
-  function fireEvent(name, data) {
-    (eventCallbacks[name] || []).forEach(function (cb) {
-      safeCall(cb, data);
-    });
-  }
-
-  function parseTweetUrl(url) {
-    if (!url) return null;
-    var m = TWEET_RE.exec(url);
-    if (m) return { user: m[1], id: m[2] };
-    m = url.match(/(\d{15,})/);
-    return m ? { user: null, id: m[1] } : null;
-  }
-
-  function createIframe(tweet, opts) {
-    var url;
-    if (opts.videoOnly) {
-      url = NITTER + "/i/videos/tweet/" + tweet.id;
-    } else {
-      var path = tweet.user ? "/" + tweet.user : "/i";
-      url = NITTER + path + "/status/" + tweet.id + "/embed";
-      if (opts.theme) {
-        var theme =
-          opts.theme === "dark"
-            ? "nitter"
-            : opts.theme === "light"
-              ? "twitter"
-              : opts.theme;
-        url += "?theme=" + encodeURIComponent(theme);
-      }
-    }
-
-    var iframe = document.createElement("iframe");
-    iframe.src = url;
-    iframe.className = "nitter-embed-frame";
-    iframe.loading = "lazy";
-    iframe.setAttribute("allowtransparency", "true");
-    iframe.setAttribute("frameborder", "0");
-    iframe.setAttribute("scrolling", "no");
-    if (opts.videoOnly) iframe.setAttribute("allowfullscreen", "true");
-
-    var width = opts.width || 550;
-    var margin =
-      opts.align === "center"
-        ? "10px auto"
-        : opts.align === "right"
-          ? "10px 0 10px auto"
-          : "10px 0";
-    iframe.style.cssText =
-      "width:100%;max-width:" +
-      width +
-      "px;height:300px;" +
-      "border:none;display:block;margin:" +
-      margin;
-
-    iframe.addEventListener("load", function () {
-      fireEvent("rendered", { target: iframe });
-    });
-
-    return iframe;
-  }
-
-  function processBlockquote(bq) {
-    if (bq.dataset.nitterProcessed) return false;
-    bq.dataset.nitterProcessed = "true";
-
-    var tweet = null;
-    var links = bq.querySelectorAll("a[href]");
-    for (var i = 0; i < links.length && !tweet; i++) {
-      tweet = parseTweetUrl(links[i].href);
-    }
-    if (!tweet) return false;
-
-    var d = bq.dataset;
-    var iframe = createIframe(tweet, {
-      width: d.mediaMaxWidth || d.width,
-      align: d.align,
-      theme: d.theme,
-      videoOnly: d.mediaMaxWidth !== undefined,
-    });
-
-    bq.style.display = "none";
-    bq.parentNode.insertBefore(iframe, bq.nextSibling);
-    return true;
-  }
-
-  function processEmbeds(root) {
-    var bqs = (root || document).querySelectorAll(
-      SELECTOR + ":not([data-nitter-processed])",
-    );
-    for (var i = 0; i < bqs.length; i++) processBlockquote(bqs[i]);
-  }
-
-  function handleResize(e) {
-    if (!Array.isArray(e.data) || e.data[0] !== "resizeIframe") return;
-    var h = e.data[1] && e.data[1].h;
-    if (!h || h <= 0 || h > 10000) return; // Cap at 10000px for sanity
-
-    var frames = document.querySelectorAll("iframe.nitter-embed-frame");
-    for (var i = 0; i < frames.length; i++) {
-      if (frames[i].contentWindow === e.source) {
-        frames[i].style.height = h + "px";
-        return;
-      }
-    }
-  }
-
-  function observeDOM() {
-    if (!window.MutationObserver || !document.body) return;
-
-    function matches(el) {
-      return el.matches(SELECTOR) || el.querySelector(SELECTOR);
-    }
-
-    new MutationObserver(function (muts) {
-      var found = muts.some(function (mut) {
-        return Array.prototype.some.call(mut.addedNodes, function (n) {
-          return n.nodeType === 1 && matches(n);
-        });
-      });
-      if (found) processEmbeds();
-    }).observe(document.body, { childList: true, subtree: true });
-  }
-
-  function embedTweet(id, container, opts) {
-    if (!container) return Promise.reject("No container");
-    var iframe = createIframe({ id: id, user: null }, opts || {});
-    container.appendChild(iframe);
-    return Promise.resolve(iframe);
-  }
-
-  var prevTwttr = window.twttr;
-  window.twttr = {
-    widgets: {
-      load: processEmbeds,
-      createTweet: embedTweet,
-      createTweetEmbed: embedTweet,
-      createVideo: embedTweet,
-      loaded: true,
-    },
-    events: {
-      bind: function (name, cb) {
-        if (typeof cb !== "function") return;
-        if (!eventCallbacks[name]) eventCallbacks[name] = [];
-        eventCallbacks[name].push(cb);
-      },
-      unbind: function (name, cb) {
-        if (!eventCallbacks[name]) return;
-        eventCallbacks[name] = cb
-          ? eventCallbacks[name].filter(function (f) {
-            return f !== cb;
-          })
-          : [];
-      },
-    },
-    ready: function (cb) {
-      if (typeof cb !== "function") return;
-      if (isReady) cb(window.twttr);
-      else readyCallbacks.push(cb);
-    },
-    _e: [],
-  };
-
-  // Process callbacks queued before load (twttr._e pattern)
-  if (prevTwttr && prevTwttr._e) {
-    prevTwttr._e.forEach(function (cb) {
-      safeCall(cb);
-    });
-  }
-
-  // Remove any Twitter scripts that snuck through
-  document
-    .querySelectorAll(
-      'script[src*="platform.twitter.com"], script[src*="platform.x.com"]',
-    )
-    .forEach(function (s) {
-      s.remove();
-    });
-
-  function init() {
-    window.addEventListener("message", handleResize);
-    processEmbeds();
-    observeDOM();
-    isReady = true;
-    readyCallbacks.forEach(function (cb) {
-      safeCall(cb, window.twttr);
-    });
-    readyCallbacks = [];
-  }
-
-  if (document.readyState === "loading") {
-    document.addEventListener("DOMContentLoaded", init);
-  } else {
-    init();
-  }
-})();

public/md/about.md

@@ -4,15 +4,15 @@ Nitter is a free and open source alternative Twitter front-end focused on
 privacy and performance. The source is available on GitHub at
 <https://github.com/zedeus/nitter>
 
-- No JavaScript or ads
+* No JavaScript or ads
-- All requests go through the backend, client never talks to Twitter
+* All requests go through the backend, client never talks to Twitter
-- Prevents Twitter from tracking your IP or JavaScript fingerprint
+* Prevents Twitter from tracking your IP or JavaScript fingerprint
-- Uses Twitter's unofficial API (no developer account required)
+* Uses Twitter's unofficial API (no rate limits or developer account required)
-- Lightweight (for [@nim_lang](/nim_lang), 60KB vs 784KB from twitter.com)
+* Lightweight (for [@nim_lang](/nim_lang), 60KB vs 784KB from twitter.com)
-- RSS feeds
+* RSS feeds
-- Themes
+* Themes
-- Mobile support (responsive design)
+* Mobile support (responsive design)
-- AGPLv3 licensed, no proprietary instances permitted
+* AGPLv3 licensed, no proprietary instances permitted
 
 Nitter's GitHub wiki contains
 [instances](https://github.com/zedeus/nitter/wiki/Instances) and
@@ -21,13 +21,12 @@ maintained by the community.
 
 ## Why use Nitter?
 
-It's impossible to use Twitter without JavaScript enabled, and as of 2024 you
+It's impossible to use Twitter without JavaScript enabled. For privacy-minded
-need to sign up. For privacy-minded folks, preventing JavaScript analytics and
+folks, preventing JavaScript analytics and IP-based tracking is important, but
-IP-based tracking is important, but apart from using a VPN and uBlock/uMatrix,
+apart from using a VPN and uBlock/uMatrix, it's impossible. Despite being behind
-it's impossible. Despite being behind a VPN and using heavy-duty adblockers,
+a VPN and using heavy-duty adblockers, you can get accurately tracked with your
-you can get accurately tracked with your [browser's
+[browser's fingerprint](https://restoreprivacy.com/browser-fingerprinting/),
-fingerprint](https://restoreprivacy.com/browser-fingerprinting/), [no
+[no JavaScript required](https://noscriptfingerprint.com/). This all became
-JavaScript required](https://noscriptfingerprint.com/). This all became
 particularly important after Twitter [removed the
 ability](https://www.eff.org/deeplinks/2020/04/twitter-removes-privacy-option-and-shows-why-we-need-strong-privacy-laws)
 for users to control whether their data gets sent to advertisers.
@@ -43,13 +42,12 @@ Twitter account.
 
 ## Donating
 
-Liberapay: https://liberapay.com/zedeus \
+Liberapay: <https://liberapay.com/zedeus> \
-Patreon: https://patreon.com/nitter \
+Patreon: <https://patreon.com/nitter> \
-BTC: bc1qpqpzjkcpgluhzf7x9yqe7jfe8gpfm5v08mdr55 \
+BTC: bc1qp7q4qz0fgfvftm5hwz3vy284nue6jedt44kxya \
-ETH: 0x24a0DB59A923B588c7A5EBd0dBDFDD1bCe9c4460 \
+ETH: 0x66d84bc3fd031b62857ad18c62f1ba072b011925 \
-XMR: 42hKayRoEAw4D6G6t8mQHPJHQcXqofjFuVfavqKeNMNUZfeJLJAcNU19i1bGdDvcdN6romiSscWGWJCczFLe9RFhM3d1zpL \
+LTC: ltc1qhsz5nxw6jw9rdtw9qssjeq2h8hqk2f85rdgpkr \
-SOL: ANsyGNXFo6osuFwr1YnUqif2RdoYRhc27WdyQNmmETSW \
+XMR: 42hKayRoEAw4D6G6t8mQHPJHQcXqofjFuVfavqKeNMNUZfeJLJAcNU19i1bGdDvcdN6romiSscWGWJCczFLe9RFhM3d1zpL
-ZEC: u1vndfqtzyy6qkzhkapxelel7ams38wmfeccu3fdpy2wkuc4erxyjm8ncjhnyg747x6t0kf0faqhh2hxyplgaum08d2wnj4n7cyu9s6zhxkqw2aef4hgd4s6vh5hpqvfken98rg80kgtgn64ff70djy7s8f839z00hwhuzlcggvefhdlyszkvwy3c7yw623vw3rvar6q6evd3xcvveypt
 
 ## Contact
 

src/api.nim

@@ -1,198 +1,58 @@
 # SPDX-License-Identifier: AGPL-3.0-only
-import asyncdispatch, httpclient, strutils, sequtils, sugar
+import asyncdispatch, httpclient, uri, strutils, sequtils, sugar
 import packedjson
-import types, query, formatters, consts, apiutils, parser, utils
+import types, query, formatters, consts, apiutils, parser
-import experimental/parser
+import experimental/parser as newParser
-
-# Helper to generate params object for GraphQL requests
-proc genParams(variables: string; fieldToggles = ""): seq[(string, string)] =
-  result.add ("variables", variables)
-  result.add ("features", gqlFeatures)
-  if fieldToggles.len > 0:
-    result.add ("fieldToggles", fieldToggles)
-
-proc apiUrl(endpoint, variables: string; fieldToggles = ""; skipTid = false): ApiUrl =
-  return ApiUrl(endpoint: endpoint, params: genParams(variables, fieldToggles), skipTid: skipTid)
-
-proc apiReq(endpoint, variables: string; fieldToggles = ""; skipTid = false): ApiReq =
-  let url = apiUrl(endpoint, variables, fieldToggles, skipTid)
-  return ApiReq(cookie: url, oauth: url)
-
-proc cursorParam(after: string): string =
-  ## JSON-escape the user-supplied cursor so it cannot break out of the GraphQL
-  ## variables object (same input-validation class as the #1411 media SSRF).
-  if after.len > 0: "\"cursor\":" & $(%after) & "," else: ""
-
-proc mediaUrl(id, cursor: string): ApiReq =
-  result = ApiReq(
-    cookie: apiUrl(graphUserMedia, userMediaVars % [id, cursor, "100"]),
-    oauth: apiUrl(graphUserMediaV2, restIdVars % [id, cursor, "100"])
-  )
-
-proc userTweetsUrl(id: string; cursor: string): ApiReq =
-  return apiReq(graphUserTweetsV2, restIdVars % [id, cursor, "20"], userTweetsFieldToggles)
-
-proc userTweetsAndRepliesUrl(id: string; cursor: string): ApiReq =
-  result = ApiReq(
-    cookie: apiUrl(graphUserTweetsAndReplies, userTweetsAndRepliesVars % [id, cursor], userTweetsFieldToggles),
-    oauth: apiUrl(graphUserTweetsAndRepliesV2, restIdVars % [id, cursor, "20"], userTweetsFieldToggles, skipTid=true)
-  )
-
-proc userArticlesUrl(id: string; cursor: string): ApiReq =
-  result = ApiReq(
-    cookie: apiUrl(graphUserArticles, userArticlesVars % [id, cursor], userTweetsFieldToggles),
-    oauth: apiUrl(graphUserArticlesV2, restIdVars % [id, cursor, "20"], userTweetsFieldToggles)
-  )
-
-proc tweetDetailUrl(id, cursor: string; mode = Relevance): ApiReq =
-  return apiReq(graphTweet, tweetVars % [id, cursor, $mode])
-  # let cookieVars = tweetDetailVars % [id, cursor]
-  # result = ApiReq(
-  #   cookie: apiUrl(graphTweetDetail, cookieVars, tweetDetailFieldToggles),
-  #   oauth: apiUrl(graphTweet, tweetVars % [id, cursor])
-  # )
-
-proc userUrl(username: string): ApiReq =
-  let cookieVars = $(%*{"screen_name": username, "withGrokTranslatedBio": false})
-  result = ApiReq(
-    cookie: apiUrl(graphUser, cookieVars, tweetDetailFieldToggles),
-    oauth: apiUrl(graphUserV2, $(%*{"screen_name": username}))
-  )
 
 proc getGraphUser*(username: string): Future[User] {.async.} =
   if username.len == 0: return
-  let js = await fetchRaw(userUrl(username))
+  let
+    variables = %*{"screen_name": username}
+    params = {"variables": $variables, "features": gqlFeatures}
+    js = await fetchRaw(graphUser ? params, Api.userScreenName)
   result = parseGraphUser(js)
 
 proc getGraphUserById*(id: string): Future[User] {.async.} =
   if id.len == 0 or id.any(c => not c.isDigit): return
   let
-    url = apiReq(graphUserById, userByRestIdVars % id)
+    variables = %*{"userId": id}
-    js = await fetchRaw(url)
+    params = {"variables": $variables, "features": gqlFeatures}
+    js = await fetchRaw(graphUserById ? params, Api.userRestId)
   result = parseGraphUser(js)
 
-proc getAboutAccount*(username: string): Future[AccountInfo] {.async.} =
+proc getGraphUserTweets*(id: string; kind: TimelineKind; after=""): Future[Timeline] {.async.} =
-  if username.len == 0: return
-  let
-    url = apiReq(graphAboutAccount, $(%*{"screenName": username}))
-    js = await fetch(url)
-  result = parseAboutAccount(js)
-
-proc restReq(endpoint: string; params: seq[(string, string)] = @[]): ApiReq =
-  let url = ApiUrl(endpoint: endpoint, params: params)
-  ApiReq(cookie: url, oauth: url)
-
-proc getBroadcastInfo*(id: string): Future[Broadcast] {.async.} =
   if id.len == 0: return
   let
-    req = apiReq(graphBroadcast, $(%*{"id": id}))
+    cursor = if after.len > 0: "\"cursor\":\"$1\"," % after else: ""
-    js = await fetch(req)
+    variables = userTweetsVariables % [id, cursor]
-  result = parseBroadcastInfo(js)
+    params = {"variables": variables, "features": gqlFeatures}
-
+    (url, apiId) = case kind
-proc fetchBroadcastStream*(mediaKey: string): Future[string] {.async.} =
+                   of TimelineKind.tweets: (graphUserTweets, Api.userTweets)
-  if mediaKey.len == 0: return
+                   of TimelineKind.replies: (graphUserTweetsAndReplies, Api.userTweetsAndReplies)
-  let
+                   of TimelineKind.media: (graphUserMedia, Api.userMedia)
-    streamReq = restReq(restLiveStream & mediaKey)
+    js = await fetch(url ? params, apiId)
-    streamJs = await fetch(streamReq)
+  result = parseGraphTimeline(js, "user", after)
-  result = streamJs{"source", "noRedirectPlaybackUrl"}.getStr(
-    streamJs{"source", "location"}.getStr)
-
-proc getAudioSpace*(id: string): Future[AudioSpace] {.async.} =
-  if id.len == 0: return
-  let
-    variables = %*{
-      "id": id,
-      "isMetatagsQuery": false,
-      "withReplays": true,
-      "withListeners": true
-    }
-    req = apiReq(graphAudioSpace, $variables)
-    js = await fetch(req)
-  result = parseAudioSpace(js)
-
-proc getGraphUserTweets*(id: string; kind: TimelineKind; after=""): Future[Profile] {.async.} =
-  if id.len == 0: return
-  let
-    cursor = cursorParam(after)
-    url = case kind
-      of TimelineKind.tweets: userTweetsUrl(id, cursor)
-      of TimelineKind.replies: userTweetsAndRepliesUrl(id, cursor)
-      of TimelineKind.media: mediaUrl(id, cursor)
-      of TimelineKind.articles: userArticlesUrl(id, cursor)
-    js = await fetch(url)
-  result = parseGraphTimeline(js, after)
-
-proc getGraphCommunity*(id: string): Future[Community] {.async.} =
-  if id.len == 0: return
-  let
-    url = apiReq(graphCommunity, $(%*{"communityId": id}))
-    js = await fetch(url)
-  result = parseGraphCommunity(js)
-
-proc getGraphCommunityTweets*(id: string; rankingMode: string; after=""): Future[Timeline] {.async.} =
-  if id.len == 0: return
-  let
-    cursor = cursorParam(after)
-    url = apiReq(graphCommunityTweets, communityTweetsVars % [id, cursor, rankingMode])
-    js = await fetch(url)
-  result = parseGraphCommunityTimeline(js, after)
-
-proc getGraphCommunityMedia*(id: string; after=""): Future[Timeline] {.async.} =
-  if id.len == 0: return
-  let
-    cursor = cursorParam(after)
-    url = apiReq(graphCommunityMedia, communityMediaVars % [id, cursor])
-    js = await fetch(url)
-  result = parseGraphCommunityTimeline(js, after)
-
-proc communitySliceReq(endpoint, variables: string): ApiReq =
-  let url = ApiUrl(endpoint: endpoint, params: @[("variables", variables)])
-  ApiReq(cookie: url, oauth: url)
-
-proc getGraphCommunityMembers*(id: string; after=""): Future[Result[User]] {.async.} =
-  if id.len == 0: return
-  let
-    cursor = if after.len > 0: $(%after) else: "null"
-    url = communitySliceReq(graphCommunityMembers, communityMembersVars % [id, cursor])
-    js = await fetch(url)
-  result = parseGraphCommunityMembers(js, after)
-
-proc getGraphCommunityModerators*(id: string): Future[Result[User]] {.async.} =
-  if id.len == 0: return
-  let
-    url = communitySliceReq(graphCommunityModerators, communityMembersVars % [id, "null"])
-    js = await fetch(url)
-  result = parseGraphCommunityMembers(js)
-
-proc getGraphCommunityHashtags*(id, hashtag: string; after=""): Future[Timeline] {.async.} =
-  if id.len == 0 or hashtag.len == 0: return
-  let
-    safeTag = multiReplace(hashtag, ("\"", ""), ("\\", ""))
-    cursor = cursorParam(after)
-    url = apiReq(graphCommunityHashtags, communityHashtagsVars % [id, cursor, safeTag])
-    js = await fetch(url)
-  result = parseGraphCommunityTimeline(js, after)
 
 proc getGraphListTweets*(id: string; after=""): Future[Timeline] {.async.} =
   if id.len == 0: return
   let
-    cursor = cursorParam(after)
+    cursor = if after.len > 0: "\"cursor\":\"$1\"," % after else: ""
-    url = apiReq(graphListTweets, restIdVars % [id, cursor, "20"])
+    variables = listTweetsVariables % [id, cursor]
-    js = await fetch(url)
+    params = {"variables": variables, "features": gqlFeatures}
-  result = parseGraphTimeline(js, after).tweets
+    js = await fetch(graphListTweets ? params, Api.listTweets)
+  result = parseGraphTimeline(js, "list", after)
 
 proc getGraphListBySlug*(name, list: string): Future[List] {.async.} =
   let
     variables = %*{"screenName": name, "listSlug": list}
-    url = apiReq(graphListBySlug, $variables)
+    params = {"variables": $variables, "features": gqlFeatures}
-    js = await fetch(url)
+  result = parseGraphList(await fetch(graphListBySlug ? params, Api.listBySlug))
-  result = parseGraphList(js)
 
 proc getGraphList*(id: string): Future[List] {.async.} =
   let
-    url = apiReq(graphListById, $(%*{"listId": id}))
+    variables = %*{"listId": id}
-    js = await fetch(url)
+    params = {"variables": $variables, "features": gqlFeatures}
-  result = parseGraphList(js)
+  result = parseGraphList(await fetch(graphListById ? params, Api.list))
 
 proc getGraphListMembers*(list: List; after=""): Future[Result[User]] {.async.} =
   if list.id.len == 0: return
@@ -206,160 +66,80 @@ proc getGraphListMembers*(list: List; after=""): Future[Result[User]] {.async.}
     }
   if after.len > 0:
     variables["cursor"] = % after
-  let 
+  let url = graphListMembers ? {"variables": $variables, "features": gqlFeatures}
-    url = apiReq(graphListMembers, $variables)
+  result = parseGraphListMembers(await fetchRaw(url, Api.listMembers), after)
-    js = await fetchRaw(url)
-  result = parseGraphListMembers(js, after)
-
-proc getGraphUserConnections(userId: string; endpoint: string; kind: QueryKind;
-                              after=""): Future[Result[User]] {.async.} =
-  if userId.len == 0: return
-  var variables = %*{
-    "userId": userId,
-    "count": 20,
-    "includePromotedContent": false,
-    "withGrokTranslatedBio": true
-  }
-  if after.len > 0:
-    variables["cursor"] = %after
-  let
-    url = apiReq(endpoint, $variables)
-    js = await fetchRaw(url)
-  result = parseGraphFollowers(js, after, kind)
-
-proc getGraphFollowers*(userId: string; after=""): Future[Result[User]] {.async.} =
-  result = await getGraphUserConnections(userId, graphFollowers, followers, after)
-
-proc getGraphFollowing*(userId: string; after=""): Future[Result[User]] {.async.} =
-  result = await getGraphUserConnections(userId, graphFollowing, following, after)
 
 proc getGraphTweetResult*(id: string): Future[Tweet] {.async.} =
   if id.len == 0: return
   let
-    url = apiReq(graphTweetResult, $(%*{"rest_id": id}))
+    variables = tweetResultVariables % id
-    js = await fetch(url)
+    params = {"variables": variables, "features": gqlFeatures}
+    js = await fetch(graphTweetResult ? params, Api.tweetResult)
   result = parseGraphTweetResult(js)
 
-proc getTweetByRestId*(id: string): Future[Tweet] {.async.} =
+proc getGraphTweet(id: string; after=""): Future[Conversation] {.async.} =
   if id.len == 0: return
   let
-    url = apiReq(graphTweetResultByRestId, tweetByRestIdVars % id, articleFieldToggles)
+    cursor = if after.len > 0: "\"cursor\":\"$1\"," % after else: ""
-    js = await fetch(url)
+    variables = tweetVariables % [id, cursor]
-  result = parseTweetByRestId(js)
+    params = {"variables": variables, "features": gqlFeatures}
-
+    js = await fetch(graphTweet ? params, Api.tweetDetail)
-proc getGraphTweet(id: string; after=""; mode = Relevance): Future[Conversation] {.async.} =
-  if id.len == 0: return
-  let
-    cursor = cursorParam(after)
-    js = await fetch(tweetDetailUrl(id, cursor, mode))
   result = parseGraphConversation(js, id)
 
-proc getReplies*(id, after: string; mode = Relevance): Future[Result[Chain]] {.async.} =
+proc getReplies*(id, after: string): Future[Result[Chain]] {.async.} =
-  result = (await getGraphTweet(id, after, mode)).replies
+  result = (await getGraphTweet(id, after)).replies
   result.beginning = after.len == 0
 
-proc getTweet*(id: string; after=""; mode = Relevance): Future[Conversation] {.async.} =
+proc getTweet*(id: string; after=""): Future[Conversation] {.async.} =
-  result = await getGraphTweet(id, mode=mode)
+  result = await getGraphTweet(id)
   if after.len > 0:
-    result.replies = await getReplies(id, after, mode)
+    result.replies = await getReplies(id, after)
 
-proc getGraphEditHistory*(id: string): Future[EditHistory] {.async.} =
+proc getGraphSearch*(query: Query; after=""): Future[Result[Tweet]] {.async.} =
-  if id.len == 0: return
+  let q = genQueryParam(query)
-  let
-    url = apiReq(graphTweetEditHistory, tweetEditHistoryVars % id)
-    js = await fetch(url)
-  result = parseGraphEditHistory(js, id)
-
-proc getGraphTweetSearch*(query: Query; after=""): Future[Timeline] {.async.} =
-  # workaround for #1372
-  let maxId =
-    if not after.startsWith("maxid:"): ""
-    else: validateNumber(after[6..^1])
-
-  let q = genQueryParam(query, maxId)
   if q.len == 0 or q == emptyQuery:
-    return Timeline(query: query, beginning: true)
+    return Result[Tweet](query: query, beginning: true)
-
-  let product =
-    case query.kind
-    of top: "Top"
-    # profile media feeds (RSS, multi-user timelines) must stay chronological
-    of media: (if query.fromUser.len == 0: "Media" else: "Latest")
-    else: "Latest"
 
   var
     variables = %*{
       "rawQuery": q,
       "count": 20,
-      "querySource": "typed_query",
+      "product": "Latest",
-      "product": product,
+      "withDownvotePerspective": false,
-      "withGrokTranslatedBio":true,
+      "withReactionsMetadata": false,
-      "withQuickPromoteEligibilityTweetFields":false
+      "withReactionsPerspective": false
-    }
-
-  if after.len > 0 and maxId.len == 0:
-    variables["cursor"] = % after
-  let
-    url = apiReq(graphSearchTimeline, $variables)
-    js = await fetch(url)
-  result = parseGraphSearch[Tweets](js, after)
-  result.query = query
-
-  # when no more items are available the API just returns the last page in
-  # full. this detects that and clears the page instead.
-  let prefix = min(64, min(after.len, result.bottom.len))
-  if prefix > 0 and maxId.len == 0 and
-     after[0..<prefix] == result.bottom[0..<prefix]:
-    result.content.setLen(0)
-
-proc getGraphProductSearch[T](query: Query; product: string;
-                              after=""): Future[Result[T]] {.async.} =
-  if query.text.len == 0:
-    return Result[T](query: query, beginning: true)
-
-  var
-    variables = %*{
-      "rawQuery": query.text,
-      "count": 20,
-      "querySource": "typed_query",
-      "product": product,
-      "withGrokTranslatedBio":true,
-      "withQuickPromoteEligibilityTweetFields":false
     }
   if after.len > 0:
     variables["cursor"] = % after
-
+  let url = graphSearchTimeline ? {"variables": $variables, "features": gqlFeatures}
-  let
+  result = parseGraphSearch(await fetch(url, Api.search), after)
-    url = apiReq(graphSearchTimeline, $variables)
-    js = await fetch(url)
-  result = parseGraphSearch[T](js, after)
   result.query = query
 
-proc getGraphUserSearch*(query: Query; after=""): Future[Result[User]] =
+proc getUserSearch*(query: Query; page="1"): Future[Result[User]] {.async.} =
-  getGraphProductSearch[User](query, "People", after)
+  if query.text.len == 0:
+    return Result[User](query: query, beginning: true)
 
-proc getGraphListSearch*(query: Query; after=""): Future[Result[ListSearchResult]] =
+  var url = userSearch ? {
-  getGraphProductSearch[ListSearchResult](query, "Lists", after)
+    "q": query.text,
+    "skip_status": "1",
+    "count": "20",
+    "page": page
+  }
 
-proc getPhotoRail*(id: string): Future[PhotoRail] {.async.} =
+  result = parseUsers(await fetchRaw(url, Api.userSearch))
-  if id.len == 0: return
+  result.query = query
-  let js = await fetch(mediaUrl(id, ""))
+  if page.len == 0:
-  result = parseGraphPhotoRail(js)
+    result.bottom = "2"
+  elif page.allCharsInSet(Digits):
+    result.bottom = $(parseInt(page) + 1)
 
-proc getGraphArticle*(id: string): Future[Article] {.async.} =
+proc getPhotoRail*(name: string): Future[PhotoRail] {.async.} =
-  if id.len == 0: return
+  if name.len == 0: return
   let
-    url = apiReq(graphTweetResultByRestId, articleVars % id, articleFieldToggles)
+    ps = genParams({"screen_name": name, "trim_user": "true"},
-    json = await fetchRaw(url)
+                    count="18", ext=false)
-  result = parseGraphArticle(json)
+    url = photoRail ? ps
-
+  result = parsePhotoRail(await fetch(url, Api.timeline))
-proc getGraphTweetResults*(ids: seq[string]): Future[seq[Tweet]] {.async.} =
-  if ids.len == 0: return
-  let
-    idsJson = "[" & ids.mapIt("\"" & it & "\"").join(",") & "]"
-    url = apiReq(graphTweetResultsByRestIds, articleBatchVars % idsJson, articleFieldToggles)
-    js = await fetch(url)
-  result = parseGraphTweetResults(js)
 
 proc resolve*(url: string; prefs: Prefs): Future[string] {.async.} =
   let client = newAsyncHttpClient(maxRedirects=0)

src/apiutils.nim

@@ -1,146 +1,68 @@
 # SPDX-License-Identifier: AGPL-3.0-only
-import httpclient, asyncdispatch, options, strutils, uri, times, math, tables
+import httpclient, asyncdispatch, options, strutils, uri
-import jsony, packedjson, zippy, oauth/oauth1
+import jsony, packedjson, zippy
-import types, auth, consts, parserutils, http_pool, tid
+import types, tokens, consts, parserutils, http_pool
 import experimental/types/common
 
 const
   rlRemaining = "x-rate-limit-remaining"
   rlReset = "x-rate-limit-reset"
-  rlLimit = "x-rate-limit-limit"
-  npCache = "x-np-cache"
-  errorsToSkip = {null, doesntExist, tweetNotFound, timeout, unauthorized, badRequest}
 
-proc isCloudflareHtml*(body: string): bool =
+var pool: HttpPool
-  ## Detect Cloudflare HTML error pages returned instead of JSON
-  if body.len < 14 or body[0] != '<': return false
-  body[0 ..< 14].toLowerAscii() == "<!doctype html" and "Cloudflare" in body
 
-proc cfTitle*(body: string): string =
+proc genParams*(pars: openArray[(string, string)] = @[]; cursor="";
-  ## Extract <title> from Cloudflare HTML for log diagnostics
+                count="20"; ext=true): seq[(string, string)] =
-  let start = body.find("<title>")
+  result = timelineParams
-  if start < 0: return "unknown"
+  for p in pars:
-  let contentStart = start + 7
+    result &= p
-  let stop = body.find("</title>", contentStart)
+  if ext:
-  if stop < 0: return "unknown"
+    result &= ("ext", "mediaStats")
-  body[contentStart ..< stop].splitWhitespace().join(" ")
+    result &= ("include_ext_alt_text", "1")
+    result &= ("include_ext_media_availability", "1")
+  if count.len > 0:
+    result &= ("count", count)
+  if cursor.len > 0:
+    # The raw cursor often has plus signs, which sometimes get turned into spaces,
+    # so we need to turn them back into a plus
+    if " " in cursor:
+      result &= ("cursor", cursor.replace(" ", "+"))
+    else:
+      result &= ("cursor", cursor)
 
-var
+proc genHeaders*(token: Token = nil): HttpHeaders =
-  pool: HttpPool
-  disableTid: bool
-  apiProxy: string
-  maxRetries: int
-  retryDelayMs: int
-
-proc setDisableTid*(disable: bool) =
-  disableTid = disable
-
-proc setMaxRetries*(n: int) =
-  maxRetries = n
-
-proc setRetryDelayMs*(ms: int) =
-  retryDelayMs = ms
-
-proc setApiProxy*(url: string) =
-  apiProxy = ""
-  if url.len > 0:
-    apiProxy = url.strip(chars={'/'}) & "/"
-    if "http" notin apiProxy:
-      apiProxy = "http://" & apiProxy
-
-proc toUrl*(req: ApiReq; sessionKind: SessionKind): Uri =
-  let url = case sessionKind
-    of oauth:  req.oauth
-    of cookie: req.cookie
-  let base = case sessionKind
-    of oauth:  "https://api.x.com"
-    of cookie: "https://x.com/i/api"
-  let prefix = if url.endpoint.startsWith("1.1/"): "" else: "graphql/"
-  parseUri(base) / (prefix & url.endpoint) ? url.params
-
-proc getOauthHeader(url, oauthToken, oauthTokenSecret: string): string =
-  let
-    encodedUrl = url.replace(",", "%2C").replace("+", "%20")
-    params = OAuth1Parameters(
-      consumerKey: consumerKey,
-      signatureMethod: "HMAC-SHA1",
-      timestamp: $int(round(epochTime())),
-      nonce: "0",
-      isIncludeVersionToHeader: true,
-      token: oauthToken
-    )
-    signature = getSignature(HttpGet, encodedUrl, "", params, consumerSecret, oauthTokenSecret)
-
-  params.signature = percentEncode(signature)
-
-  return getOauth1RequestHeader(params)["authorization"]
-
-proc getCookieHeader(authToken, ct0: string): string =
-  "auth_token=" & authToken & "; ct0=" & ct0
-
-proc genHeaders*(session: Session, url: Uri, skipTid: bool): Future[HttpHeaders] {.async.} =
   result = newHttpHeaders({
-    "accept": "*/*",
+    "connection": "keep-alive",
+    "authorization": auth,
+    "content-type": "application/json",
+    "x-guest-token": if token == nil: "" else: token.tok,
+    "x-twitter-active-user": "yes",
+    "authority": "api.twitter.com",
     "accept-encoding": "gzip",
     "accept-language": "en-US,en;q=0.9",
-    "content-type": "application/json",
+    "accept": "*/*",
-    "origin": "https://x.com",
+    "DNT": "1"
-    "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36",
+  })
-    "x-twitter-active-user": "yes",
-    "x-twitter-client-language": "en",
-    "priority": "u=1, i"
-  }, titleCase=true)
 
-  case session.kind
+template updateToken() =
-  of SessionKind.oauth:
+  if resp.headers.hasKey(rlRemaining):
-    result["authorization"] = getOauthHeader($url, session.oauthToken, session.oauthSecret)
+    let
-  of SessionKind.cookie:
+      remaining = parseInt(resp.headers[rlRemaining])
-    result["x-twitter-auth-type"] = "OAuth2Session"
+      reset = parseInt(resp.headers[rlReset])
-    result["x-csrf-token"] = session.ct0
+    token.setRateLimit(api, remaining, reset)
-    result["cookie"] = getCookieHeader(session.authToken, session.ct0)
-    result["referer"] = "https://x.com/"
-    result["sec-ch-ua"] = """"Google Chrome";v="142", "Chromium";v="142", "Not A(Brand";v="24""""
-    result["sec-ch-ua-mobile"] = "?0"
-    result["sec-ch-ua-platform"] = "Windows"
-    result["sec-fetch-dest"] = "empty"
-    result["sec-fetch-mode"] = "cors"
-    result["sec-fetch-site"] = "same-origin"
-    if disableTid or skipTid or "/1.1/" in url.path:
-      result["authorization"] = bearerToken2
-    else:
-      result["authorization"] = bearerToken
-      result["x-client-transaction-id"] = await genTid(url.path)
-
-proc getAndValidateSession*(req: ApiReq): Future[Session] {.async.} =
-  result = await getSession(req)
-  case result.kind
-  of SessionKind.oauth:
-    if result.oauthToken.len == 0:
-      echo "[sessions] Empty oauth token, session: ", result.pretty
-      raise rateLimitError()
-  of SessionKind.cookie:
-    if result.authToken.len == 0 or result.ct0.len == 0:
-      echo "[sessions] Empty cookie credentials, session: ", result.pretty
-      raise rateLimitError()
 
 template fetchImpl(result, fetchBody) {.dirty.} =
   once:
     pool = HttpPool()
 
+  var token = await getToken(api)
+  if token.tok.len == 0:
+    raise rateLimitError()
+
   try:
     var resp: AsyncResponse
-    let skipTid = case session.kind
+    pool.use(genHeaders(token)):
-      of oauth: req.oauth.skipTid
-      of cookie: req.cookie.skipTid
-    let headers = await genHeaders(session, url, skipTid)
-
-    pool.use(headers):
       template getContent =
-        # TODO: this is a temporary simple implementation
+        resp = await c.get($url)
-        if apiProxy.len > 0 and "/1.1/" notin url.path:
-          resp = await c.get(($url).replace("https://", apiProxy))
-        else:
-          resp = await c.get($url)
         result = await resp.body
 
       getContent()
@@ -149,110 +71,57 @@ template fetchImpl(result, fetchBody) {.dirty.} =
         badClient = true
         raise newException(BadClientError, "Bad client")
 
-      if resp.status == $Http404 and result.len == 0:
-        echo "[sessions] transient 404 (empty body), retrying: ", url.path, ", session: ", session.pretty
-        raise rateLimitError()
-
-    let cacheStatus = resp.headers.getOrDefault(npCache)
-    if cacheStatus notin ["HIT", "STALE"] and resp.headers.hasKey(rlRemaining):
-      let
-        remaining = parseInt(resp.headers[rlRemaining])
-        reset = parseInt(resp.headers[rlReset])
-        limit = parseInt(resp.headers[rlLimit])
-      session.setRateLimit(req, remaining, reset, limit)
-
     if result.len > 0:
       if resp.headers.getOrDefault("content-encoding") == "gzip":
         result = uncompress(result, dfGzip)
-
+      else:
-      if isCloudflareHtml(result):
+        echo "non-gzip body, url: ", url, ", body: ", result
-        echo "[cloudflare] ", resp.status, " (", cfTitle(result), "), API: ", url.path, ", session: ", session.pretty
-        raise rateLimitError()
-
-      if result.startsWith("{\"errors"):
-        let errors = result.fromJson(Errors)
-        if errors notin errorsToSkip:
-          echo "Fetch error, API: ", url.path, ", errors: ", errors, ", session: ", session.pretty
-          if errors in {expiredToken, badToken, locked}:
-            invalidate(session)
-            raise rateLimitError()
-          elif errors in {rateLimited}:
-            # rate limit hit, resets after 24 hours
-            setLimited(session, req)
-            raise rateLimitError()
-      elif result.startsWith("429 Too Many Requests"):
-        echo "[sessions] 429 error, API: ", url.path, ", session: ", session.pretty
-        raise rateLimitError()
 
     fetchBody
 
+    release(token, used=true)
+
     if resp.status == $Http400:
-      echo "ERROR 400, ", url.path, ": ", result, ", session: ", session.pretty
       raise newException(InternalError, $url)
   except InternalError as e:
     raise e
   except BadClientError as e:
-    raise e
+    release(token, used=true)
-  except OSError as e:
     raise e
   except Exception as e:
-    let s = session.pretty
+    echo "error: ", e.name, ", msg: ", e.msg, ", token: ", token[], ", url: ", url
-    echo "error: ", e.name, ", msg: ", e.msg, ", session: ", s, ", url: ", url
+    if "length" notin e.msg and "descriptor" notin e.msg:
-    raise rateLimitError()
+      release(token, invalid=true)
-  finally:
-    release(session)
-
-template retry(bod) {.dirty.} =
-  var session: Session
-  var retrySuccess = false
-  for i in 0 ..< maxRetries:
-    try:
-      session = nil
-      bod
-      retrySuccess = true
-      break
-    except RateLimitError:
-      let api = if session.isNil: req.cookie.endpoint
-                else: req.endpoint(session)
-      if session.isNil:
-        echo "[sessions] Rate limited, retrying ", api,
-             " request (", i, "/", maxRetries, ")..."
-      else:
-        echo "[sessions] Rate limited, retrying ", api,
-             " request (", i, "/", maxRetries, ")..., session: ", session.pretty
-      session = nil
-      if retryDelayMs > 0:
-        await sleepAsync(retryDelayMs)
-  if not retrySuccess:
     raise rateLimitError()
 
-proc fetch*(req: ApiReq): Future[JsonNode] {.async.} =
+proc fetch*(url: Uri; api: Api): Future[JsonNode] {.async.} =
-  retry:
+  var body: string
-    var body: string
+  fetchImpl body:
-    session = await getAndValidateSession(req)
+    if body.startsWith('{') or body.startsWith('['):
+      result = parseJson(body)
+    else:
+      echo resp.status, ": ", body, " --- url: ", url
+      result = newJNull()
 
-    let url = req.toUrl(session.kind)
+    updateToken()
 
-    fetchImpl body:
+    let error = result.getError
-      if body.startsWith('{') or body.startsWith('['):
+    if error in {invalidToken, badToken}:
-        result = parseJson(body)
+      echo "fetch error: ", result.getError
-      else:
+      release(token, invalid=true)
-        echo resp.status, ": ", body, " --- url: ", url, ", session: ", session.pretty
+      raise rateLimitError()
-        result = newJNull()
 
-      let error = result.getError
+proc fetchRaw*(url: Uri; api: Api): Future[string] {.async.} =
-      if error != null and error notin errorsToSkip:
+  fetchImpl result:
-        echo "Fetch error, API: ", url.path, ", error: ", error, ", session: ", session.pretty
+    if not (result.startsWith('{') or result.startsWith('[')):
-        if error in {expiredToken, badToken, locked}:
+      echo resp.status, ": ", result, " --- url: ", url
-          invalidate(session)
+      result.setLen(0)
-          raise rateLimitError()
 
-proc fetchRaw*(req: ApiReq): Future[string] {.async.} =
+    updateToken()
-  retry:
-    session = await getAndValidateSession(req)
-    let url = req.toUrl(session.kind)
 
-    fetchImpl result:
+    if result.startsWith("{\"errors"):
-      if not (result.startsWith('{') or result.startsWith('[')):
+      let errors = result.fromJson(Errors)
-        echo resp.status, ": ", result, " --- url: ", url, ", session: ", session.pretty
+      if errors in {invalidToken, badToken}:
-        result.setLen(0)
+        echo "fetch error: ", errors
+        release(token, invalid=true)
+        raise rateLimitError()

src/auth.nim

@@ -1,228 +0,0 @@
-#SPDX-License-Identifier: AGPL-3.0-only
-import std/[asyncdispatch, times, json, random, strutils, tables, packedsets, os]
-import types, consts
-import experimental/parser/session
-
-const hourInSeconds = 60 * 60
-
-var
-  sessionPool: seq[Session]
-  enableLogging = false
-  # max requests at a time per session to avoid race conditions
-  maxConcurrentReqs = 2
-
-proc setMaxConcurrentReqs*(reqs: int) =
-  if reqs > 0:
-    maxConcurrentReqs = reqs
-
-template log(str: varargs[string, `$`]) =
-  echo "[sessions] ", str.join("")
-
-proc endpoint*(req: ApiReq; session: Session): string =
-  case session.kind
-  of oauth: req.oauth.endpoint
-  of cookie: req.cookie.endpoint
-
-proc pretty*(session: Session): string =
-  if session.isNil:
-    return "<null>"
-
-  if session.id > 0 and session.username.len > 0:
-    result = $session.id & " (" & session.username & ")"
-  elif session.username.len > 0:
-    result = session.username
-  elif session.id > 0:
-    result = $session.id
-  else:
-    result = "<unknown>"
-  result = $session.kind & " " & result
-
-proc snowflakeToEpoch(flake: int64): int64 =
-  int64(((flake shr 22) + 1288834974657) div 1000)
-
-proc getSessionPoolHealth*(): JsonNode =
-  let now = epochTime().int
-
-  var
-    totalReqs = 0
-    limited: PackedSet[int64]
-    reqsPerApi: Table[string, int]
-    oldest = now.int64
-    newest = 0'i64
-    average = 0'i64
-    oauthTotal, cookieTotal = 0
-    oauthLimited, cookieLimited = 0
-
-  for session in sessionPool:
-    let created = snowflakeToEpoch(session.id)
-    if created > newest:
-      newest = created
-    if created < oldest:
-      oldest = created
-    average += created
-
-    case session.kind
-    of oauth: inc oauthTotal
-    of cookie: inc cookieTotal
-
-    if session.limited:
-      limited.incl session.id
-      case session.kind
-      of oauth: inc oauthLimited
-      of cookie: inc cookieLimited
-
-    for api in session.apis.keys:
-      let
-        apiStatus = session.apis[api]
-        reqs = apiStatus.limit - apiStatus.remaining
-
-      # no requests made with this session and endpoint since the limit reset
-      if apiStatus.reset < now:
-        continue
-
-      reqsPerApi.mgetOrPut($api, 0).inc reqs
-      totalReqs.inc reqs
-
-  if sessionPool.len > 0:
-    average = average div sessionPool.len
-  else:
-    oldest = 0
-    average = 0
-
-  return %*{
-    "sessions": %*{
-      "total": sessionPool.len,
-      "limited": limited.card,
-      "oauth": %*{"total": oauthTotal, "limited": oauthLimited},
-      "cookie": %*{"total": cookieTotal, "limited": cookieLimited},
-      "oldest": $fromUnix(oldest),
-      "newest": $fromUnix(newest),
-      "average": $fromUnix(average)
-    },
-    "requests": %*{
-      "total": totalReqs,
-      "apis": reqsPerApi
-    }
-  }
-
-proc getSessionPoolDebug*(): JsonNode =
-  let now = epochTime().int
-  var list = newJObject()
-
-  for session in sessionPool:
-    let sessionJson = %*{
-      "kind": $session.kind,
-      "apis": newJObject(),
-      "pending": session.pending,
-    }
-
-    if session.limited:
-      sessionJson["limited"] = %true
-
-    for api in session.apis.keys:
-      let
-        apiStatus = session.apis[api]
-        obj = %*{}
-
-      if apiStatus.reset > now.int:
-        obj["remaining"] = %apiStatus.remaining
-        obj["reset"] = %apiStatus.reset
-
-      if "remaining" notin obj:
-        continue
-
-      sessionJson{"apis", $api} = obj
-      list[$session.id] = sessionJson
-
-  return %list
-
-proc rateLimitError*(): ref RateLimitError =
-  newException(RateLimitError, "rate limited")
-
-proc noSessionsError*(): ref NoSessionsError =
-  newException(NoSessionsError, "no sessions available")
-
-proc isLimited(session: Session; req: ApiReq): bool =
-  if session.isNil:
-    return true
-
-  let api = req.endpoint(session)
-  if session.limited and api != graphUserTweetsV2:
-    if (epochTime().int - session.limitedAt) > hourInSeconds:
-      session.limited = false
-      log "resetting limit: ", session.pretty
-      return false
-    else:
-      return true
-
-  if api in session.apis:
-    let limit = session.apis[api]
-    return limit.remaining <= 10 and limit.reset > epochTime().int
-  else:
-    return false
-
-proc isReady(session: Session; req: ApiReq): bool =
-  not (session.isNil or session.pending > maxConcurrentReqs or session.isLimited(req))
-
-proc invalidate*(session: var Session) =
-  if session.isNil: return
-  log "invalidating: ", session.pretty
-
-  # TODO: This isn't sufficient, but it works for now
-  let idx = sessionPool.find(session)
-  if idx > -1: sessionPool.delete(idx)
-  session = nil
-
-proc release*(session: Session) =
-  if session.isNil: return
-  dec session.pending
-
-proc getSession*(req: ApiReq): Future[Session] {.async.} =
-  for i in 0 ..< sessionPool.len:
-    if result.isReady(req): break
-    result = sessionPool.sample()
-
-  if not result.isNil and result.isReady(req):
-    inc result.pending
-  else:
-    if result.isNil:
-      log "no sessions available for API: ", req.cookie.endpoint
-    else:
-      log "no sessions available for API: ", req.endpoint(result), ", last tried: ", result.pretty
-    raise noSessionsError()
-
-proc setLimited*(session: Session; req: ApiReq) =
-  let api = req.endpoint(session)
-  session.limited = true
-  session.limitedAt = epochTime().int
-  log "rate limited by api: ", api, ", reqs left: ", session.apis[api].remaining, ", ", session.pretty
-
-proc setRateLimit*(session: Session; req: ApiReq; remaining, reset, limit: int) =
-  # avoid undefined behavior in race conditions
-  let api = req.endpoint(session)
-  if api in session.apis:
-    let rateLimit = session.apis[api]
-    if rateLimit.reset >= reset and rateLimit.remaining < remaining:
-      return
-    if rateLimit.reset == reset and rateLimit.remaining >= remaining:
-      session.apis[api].remaining = remaining
-      return
-
-  session.apis[api] = RateLimit(limit: limit, remaining: remaining, reset: reset)
-
-proc initSessionPool*(cfg: Config; path: string) =
-  enableLogging = cfg.enableDebug
-
-  if path.endsWith(".json"):
-    log "ERROR: .json is not supported, the file must be a valid JSONL file ending in .jsonl"
-    quit 1
-
-  if not fileExists(path):
-    log "ERROR: ", path, " not found. This file is required to authenticate API requests."
-    quit 1
-
-  log "parsing JSONL account sessions file: ", path
-  for line in path.lines:
-    sessionPool.add parseSession(line)
-
-  log "successfully added ", sessionPool.len, " valid account sessions"

src/config.nim

@@ -13,8 +13,6 @@ proc get*[T](config: parseCfg.Config; section, key: string; default: T): T =
 proc getConfig*(path: string): (Config, parseCfg.Config) =
   var cfg = loadConfig(path)
 
-  let masterRss = cfg.get("Config", "enableRSS", true)
-
   let conf = Config(
     # Server
     address: cfg.get("Server", "address", "0.0.0.0"),
@@ -39,20 +37,10 @@ proc getConfig*(path: string): (Config, parseCfg.Config) =
     hmacKey: cfg.get("Config", "hmacKey", "secretkey"),
     base64Media: cfg.get("Config", "base64Media", false),
     minTokens: cfg.get("Config", "tokenCount", 10),
-    enableRSSUserTweets: masterRss and cfg.get("Config", "enableRSSUserTweets", true),
+    enableRss: cfg.get("Config", "enableRSS", true),
-    enableRSSUserReplies: masterRss and cfg.get("Config", "enableRSSUserReplies", true),
-    enableRSSUserMedia: masterRss and cfg.get("Config", "enableRSSUserMedia", true),
-    enableRSSUserArticles: masterRss and cfg.get("Config", "enableRSSUserArticles", true),
-    enableRSSSearch: masterRss and cfg.get("Config", "enableRSSSearch", true),
-    enableRSSList: masterRss and cfg.get("Config", "enableRSSList", true),
     enableDebug: cfg.get("Config", "enableDebug", false),
     proxy: cfg.get("Config", "proxy", ""),
-    proxyAuth: cfg.get("Config", "proxyAuth", ""),
+    proxyAuth: cfg.get("Config", "proxyAuth", "")
-    apiProxy: cfg.get("Config", "apiProxy", ""),
-    disableTid: cfg.get("Config", "disableTid", false),
-    maxConcurrentReqs: cfg.get("Config", "maxConcurrentReqs", 2),
-    maxRetries: cfg.get("Config", "maxRetries", 1),
-    retryDelayMs: cfg.get("Config", "retryDelayMs", 150)
   )
 
   return (conf, cfg)

src/consts.nim

@@ -1,219 +1,121 @@
 # SPDX-License-Identifier: AGPL-3.0-only
-import strutils
+import uri, sequtils, strutils
 
 const
-  consumerKey* = "3nVuSoBZnx6U4vzUxf5w"
+  auth* = "Bearer AAAAAAAAAAAAAAAAAAAAANRILgAAAAAAnNwIzUejRCOuH5E6I8xnZz4puTs%3D1Zv7ttfk8LF81IUq16cHjhLTvJu4FA33AGWWjCpTnA"
-  consumerSecret* = "Bcs59EFbbsdF6Sl9Ng71smgStWEGwXXKSjYvPVt7qys"
-  bearerToken* = "Bearer AAAAAAAAAAAAAAAAAAAAANRILgAAAAAAnNwIzUejRCOuH5E6I8xnZz4puTs%3D1Zv7ttfk8LF81IUq16cHjhLTvJu4FA33AGWWjCpTnA"
-  bearerToken2* = "Bearer AAAAAAAAAAAAAAAAAAAAAFXzAwAAAAAAMHCxpeSDG1gLNLghVe8d74hl6k4%3DRUMF4xAQLsbeBhTSRrCiQpJtxoGWeyHrDb5te2jpGskWDFW82F"
 
-  graphUser* = "Gb-d6r0vxPOADdG62OEBpQ/UserByScreenName"
+  api = parseUri("https://api.twitter.com")
-  graphUserV2* = "-ZzAG_Bckx16LMbEvHC3lg/UserResultByScreenNameQuery"
+  activate* = $(api / "1.1/guest/activate.json")
-  graphUserById* = "xvmVfRLmnr1alc5f2dib0Q/UserByRestId"
-  graphUserTweetsV2* = "LE3eTyeqhBh2g-fX85O2eQ/UserWithProfileTweetsQueryV2"
-  graphUserTweetsAndRepliesV2* = "AcYHjc_YAx-9_rKWdMsKvA/UserWithProfileTweetsAndRepliesQueryV2"
-  graphUserTweets* = "SXVCYB8XHSS25nzIljNtZA/UserTweets"
-  graphUserTweetsAndReplies* = "qUpkZU6eN8MbtQb7rC_pYg/UserTweetsAndReplies"
-  graphUserMedia* = "VyudDWQnr9vJNw7GasFz2g/UserMedia"
-  graphUserMediaV2* = "WK111rbR0vM0ZX4lyZCYjw/MediaTimelineV2"
-  graphUserArticles* = "ZmMjUyrTpwYfTGAdylEyMw/UserArticlesTweets"
-  graphUserArticlesV2* = "PsGixN38UZz2RheyayNB5Q/UserProfileArticlesTimelineQuery"
-  graphTweet* = "OZMbEnEa96AN8Pq6HyTWdw/ConversationTimeline"
-  graphTweetDetail* = "XMOz5h24KAZ86qKffKTLdQ/TweetDetail"
-  graphTweetResult* = "xYOrBQoTlfKJJPsX76MZEw/TweetResultByIdQuery"
-  graphTweetEditHistory* = "1izbuOcH_QpuMcyCxOXkAg/TweetEditHistory"
-  graphSearchTimeline* = "hyPfJYJ_XAtDYoslQc-Rgg/SearchTimeline"
 
-  graphListById* = "niz0TtOxL2zIcbq6_NQiNw/ListByRestId"
+  photoRail* = api / "1.1/statuses/media_timeline.json"
-  graphListBySlug* = "RqkWNDQpOntlxNtJa4RIoQ/ListBySlug"
+  userSearch* = api / "1.1/users/search.json"
-  graphListMembers* = "8rYmkvWQe9jRRZdy_-vkGA/ListMembers"
-  graphListTweets* = "0QJtcuMzVywHGAWD6Dtjlw/ListTimeline"
-  graphAboutAccount* = "TzOG2twZEfhr9KmClvVVqA/AboutAccountQuery"
 
-  graphCommunity* = "-ElI1vg3dYbttVMhBhGdLw/CommunityQuery"
+  graphql = api / "graphql"
-  graphCommunityTweets* = "EwftYyqQemkckQ0wzGM6uw/CommunityTweetsTimeline"
+  graphUser* = graphql / "pVrmNaXcxPjisIvKtLDMEA/UserByScreenName"
-  graphCommunityMedia* = "ESJtwnI_apuGesbJncpc0Q/CommunityMediaTimeline"
+  graphUserById* = graphql / "1YAM811Q8Ry4XyPpJclURQ/UserByRestId"
-  graphCommunityMembers* = "woAp_YdzAdqnWDrqLTNpAw/membersSliceTimeline_Query"
+  graphUserTweets* = graphql / "WzJjibAcDa-oCjCcLOotcg/UserTweets"
-  graphCommunityModerators* = "0oYT9GRiWUhrz5xoqFE9uw/moderatorsSliceTimeline_Query"
+  graphUserTweetsAndReplies* = graphql / "fn9oRltM1N4thkh5CVusPg/UserTweetsAndReplies"
-  graphCommunityHashtags* = "D5EqomOIWeJnSkMhL-FLew/CommunityHashtagsTimeline"
+  graphUserMedia* = graphql / "qQoeS7szGavsi8-ehD2AWg/UserMedia"
+  graphTweet* = graphql / "miKSMGb2R1SewIJv2-ablQ/TweetDetail"
+  graphTweetResult* = graphql / "0kc0a_7TTr3dvweZlMslsQ/TweetResultByRestId"
+  graphSearchTimeline* = graphql / "gkjsKepM6gl_HmFWoWKfgg/SearchTimeline"
+  graphListById* = graphql / "iTpgCtbdxrsJfyx0cFjHqg/ListByRestId"
+  graphListBySlug* = graphql / "-kmqNvm5Y-cVrfvBy6docg/ListBySlug"
+  graphListMembers* = graphql / "P4NpVZDqUD_7MEM84L-8nw/ListMembers"
+  graphListTweets* = graphql / "jZntL0oVJSdjhmPcdbw_eA/ListLatestTweetsTimeline"
 
-  graphTweetResultByRestId* = "GZsN2Pc4knAoit6pXa4HSA/TweetResultByRestId"
+  timelineParams* = {
-  graphTweetResultsByRestIds* = "Pho4sg8jLcrVlMeclMayrg/TweetResultsByRestIds"
+    "include_profile_interstitial_type": "0",
-
+    "include_blocking": "0",
-  graphBroadcast* = "RG6wSogandh6WPIzxW9aag/BroadcastQuery"
+    "include_blocked_by": "0",
-  graphAudioSpace* = "Bh0L6azTQoMs9rJKeCF4wQ/AudioSpaceById"
+    "include_followed_by": "0",
-  restLiveStream* = "1.1/live_video_stream/status/"
+    "include_want_retweets": "0",
-
+    "include_mute_edge": "0",
-  graphFollowers* = "JNyQdTISpzCkj_1fqxDvFg/Followers"
+    "include_can_dm": "0",
-  graphFollowing* = "qGZZDF3mp91q7X22s3HxpA/Following"
+    "include_can_media_tag": "1",
+    "include_ext_is_blue_verified": "1",
+    "skip_status": "1",
+    "cards_platform": "Web-12",
+    "include_cards": "1",
+    "include_composer_source": "0",
+    "include_reply_count": "1",
+    "tweet_mode": "extended",
+    "include_entities": "1",
+    "include_user_entities": "1",
+    "include_ext_media_color": "0",
+    "send_error_codes": "1",
+    "simple_quoted_tweet": "1",
+    "include_quote_count": "1"
+  }.toSeq
 
   gqlFeatures* = """{
-  "rweb_video_screen_enabled": false,
+  "blue_business_profile_image_shape_enabled": false,
-  "rweb_cashtags_enabled": true,
-  "profile_label_improvements_pcf_label_in_post_enabled": true,
-  "responsive_web_profile_redirect_enabled": false,
-  "rweb_tipjar_consumption_enabled": false,
-  "verified_phone_label_enabled": false,
   "creator_subscriptions_tweet_preview_api_enabled": true,
-  "responsive_web_graphql_timeline_navigation_enabled": true,
+  "freedom_of_speech_not_reach_fetch_enabled": false,
-  "responsive_web_graphql_skip_user_profile_image_extensions_enabled": false,
+  "graphql_is_translatable_rweb_tweet_is_translatable_enabled": false,
-  "premium_content_api_read_enabled": false,
+  "highlights_tweets_tab_ui_enabled": false,
-  "communities_web_enable_tweet_community_results_fetch": true,
+  "interactive_text_enabled": false,
-  "c9s_tweet_anatomy_moderator_badge_enabled": true,
-  "c9s_list_members_action_api_enabled": false,
-  "c9s_superc9s_indication_enabled": false,
-  "responsive_web_grok_analyze_button_fetch_trends_enabled": false,
-  "responsive_web_grok_analyze_post_followups_enabled": true,
-  "rweb_cashtags_composer_attachment_enabled": true,
-  "responsive_web_jetfuel_frame": true,
-  "responsive_web_grok_share_attachment_enabled": true,
-  "responsive_web_grok_annotations_enabled": true,
-  "articles_preview_enabled": true,
-  "responsive_web_edit_tweet_api_enabled": true,
-  "rweb_conversational_replies_downvote_enabled": false,
-  "graphql_is_translatable_rweb_tweet_is_translatable_enabled": true,
-  "view_counts_everywhere_api_enabled": true,
   "longform_notetweets_consumption_enabled": true,
-  "responsive_web_twitter_article_tweet_consumption_enabled": true,
-  "content_disclosure_indicator_enabled": true,
-  "content_disclosure_ai_generated_indicator_enabled": true,
-  "responsive_web_grok_show_grok_translated_post": true,
-  "responsive_web_grok_analysis_button_from_backend": true,
-  "post_ctas_fetch_enabled": true,
-  "freedom_of_speech_not_reach_fetch_enabled": true,
-  "standardized_nudges_misinfo": true,
-  "tweet_with_visibility_results_prefer_gql_limited_actions_policy_enabled": true,
-  "longform_notetweets_rich_text_read_enabled": true,
   "longform_notetweets_inline_media_enabled": false,
-  "responsive_web_grok_image_annotation_enabled": true,
+  "longform_notetweets_richtext_consumption_enabled": true,
-  "responsive_web_grok_imagine_annotation_enabled": true,
+  "longform_notetweets_rich_text_read_enabled": false,
-  "responsive_web_grok_community_note_auto_translation_is_enabled": true,
+  "responsive_web_edit_tweet_api_enabled": false,
-  "responsive_web_enhance_cards_enabled": false
+  "responsive_web_enhance_cards_enabled": false,
+  "responsive_web_graphql_exclude_directive_enabled": true,
+  "responsive_web_graphql_skip_user_profile_image_extensions_enabled": false,
+  "responsive_web_graphql_timeline_navigation_enabled": false,
+  "responsive_web_text_conversations_enabled": false,
+  "responsive_web_twitter_blue_verified_badge_is_enabled": true,
+  "rweb_lists_timeline_redesign_enabled": true,
+  "spaces_2022_h2_clipping": true,
+  "spaces_2022_h2_spaces_communities": true,
+  "standardized_nudges_misinfo": false,
+  "tweet_awards_web_tipping_enabled": false,
+  "tweet_with_visibility_results_prefer_gql_limited_actions_policy_enabled": false,
+  "tweetypie_unmention_optimization_enabled": false,
+  "verified_phone_label_enabled": false,
+  "vibe_api_enabled": false,
+  "view_counts_everywhere_api_enabled": false
 }""".replace(" ", "").replace("\n", "")
 
-  tweetVars* = """{
+  tweetVariables* = """{
-  "postId": "$1",
-  $2
-  "ranking_mode": "$3",
-  "includeHasBirdwatchNotes": false,
-  "includePromotedContent": false,
-  "withBirdwatchNotes": true,
-  "withVoice": false,
-  "withV2Timeline": true
-}""".replace(" ", "").replace("\n", "")
-
-  tweetDetailVars* = """{
   "focalTweetId": "$1",
   $2
-  "referrer": "profile",
-  "with_rux_injections": false,
-  "rankingMode": "Relevance",
-  "includePromotedContent": true,
-  "withCommunity": true,
-  "withQuickPromoteEligibilityTweetFields": true,
-  "withBirdwatchNotes": true,
-  "withVoice": true
-}""".replace(" ", "").replace("\n", "")
-
-  tweetEditHistoryVars* = """{
-  "tweetId": "$1",
-  "withQuickPromoteEligibilityTweetFields": true
-}""".replace(" ", "").replace("\n", "")
-
-  restIdVars* = """{
-  "rest_id": "$1", $2
-  "count": $3
-}""".replace(" ", "").replace("\n", "")
-
-  userMediaVars* = """{
-  "userId": "$1", $2
-  "count": $3,
-  "includePromotedContent": false,
-  "withClientEventToken": false,
   "withBirdwatchNotes": false,
-  "withVoice": true
-}""".replace(" ", "").replace("\n", "")
-
-  userTweetsVars* = """{
-  "userId": "$1", $2
-  "count": 20,
   "includePromotedContent": false,
-  "withQuickPromoteEligibilityTweetFields": true,
+  "withDownvotePerspective": false,
-  "withVoice": true
+  "withReactionsMetadata": false,
-}""".replace(" ", "").replace("\n", "")
+  "withReactionsPerspective": false,
+  "withVoice": false
+}"""
 
-  userTweetsAndRepliesVars* = """{
+  tweetResultVariables* = """{
-  "userId": "$1", $2
-  "count": 20,
-  "includePromotedContent": false,
-  "withCommunity": true,
-  "withVoice": true
-}""".replace(" ", "").replace("\n", "")
-
-  userArticlesVars* = """{
-  "userId": "$1", $2
-  "count": 20,
-  "includePromotedContent": false,
-  "withVoice": true
-}""".replace(" ", "").replace("\n", "")
-
-  articleVars* = """{
   "tweetId": "$1",
   "includePromotedContent": false,
-  "withBirdwatchNotes": true,
+  "withDownvotePerspective": false,
-  "withVoice": true,
+  "withReactionsMetadata": false,
-  "withCommunity": true
+  "withReactionsPerspective": false,
-}""".replace(" ", "").replace("\n", "")
-
-  articleBatchVars* = """{
-  "tweetIds": $1,
-  "includePromotedContent": false,
-  "withBirdwatchNotes": true,
-  "withVoice": true,
-  "withCommunity": true
-}""".replace(" ", "").replace("\n", "")
-
-  articleFieldToggles* = """{"withArticleRichContentState":true,"withArticlePlainText":false,"withArticleSummaryText":true,"withArticleVoiceOver":true}"""
-
-  tweetByRestIdVars* = """{
-  "tweetId": "$1",
-  "includePromotedContent": false,
-  "withBirdwatchNotes": false,
   "withVoice": false,
   "withCommunity": false
-}""".replace(" ", "").replace("\n", "")
+}"""
 
-  userByRestIdVars* = """{
+  userTweetsVariables* = """{
-  "userId": "$1",
+  "userId": "$1", $2
-  "withSafetyModeUserFields": true
-}""".replace(" ", "").replace("\n", "")
-
-  communityTweetsVars* = """{
-  "communityId": "$1", $2
   "count": 20,
-  "displayLocation": "Community",
+  "includePromotedContent": false,
-  "rankingMode": "$3",
+  "withDownvotePerspective": false,
-  "withCommunity": true
+  "withReactionsMetadata": false,
-}""".replace(" ", "").replace("\n", "")
+  "withReactionsPerspective": false,
+  "withVoice": false,
+  "withV2Timeline": true
+}"""
 
-  communityMediaVars* = """{
+  listTweetsVariables* = """{
-  "communityId": "$1", $2
+  "listId": "$1", $2
   "count": 20,
-  "withCommunity": true
+  "includePromotedContent": false,
-}""".replace(" ", "").replace("\n", "")
+  "withDownvotePerspective": false,
-
+  "withReactionsMetadata": false,
-  communityMembersVars* = """{
+  "withReactionsPerspective": false,
-  "communityId": "$1",
+  "withVoice": false
-  "cursor": $2
+}"""
-}""".replace(" ", "").replace("\n", "")
-
-  communityHashtagsVars* = """{
-  "communityId": "$1", $2
-  "count": 20,
-  "hashtags": ["$3"],
-  "withCommunity": true
-}""".replace(" ", "").replace("\n", "")
-
-  userFieldToggles = """{"withPayments":false,"withAuxiliaryUserLabels":true}"""
-  userTweetsFieldToggles* = """{"withArticleRichContentState":true,"withArticlePlainText":false}"""
-  tweetDetailFieldToggles* = """{"withArticleRichContentState":true,"withArticlePlainText":false,"withGrokAnalyze":false,"withDisallowedReplyControls":false}"""

src/experimental/parser.nim

@@ -1,2 +1,2 @@
-import parser/[user, graphql, article]
+import parser/[user, graphql]
-export user, graphql, article
+export user, graphql

src/experimental/parser/article.nim

@@ -1,88 +0,0 @@
-# SPDX-License-Identifier: AGPL-3.0-only
-import std/[strutils, tables, times, options]
-import jsony
-import utils, graphql, ../types/article
-from ../../types import Article, ArticleParagraph, ArticleEntity, ArticleMedia,
-                        User, TweetStats
-
-proc parseGraphArticle*(json: string): Article =
-  if json.len == 0 or json[0] != '{':
-    return
-
-  var raw: GraphArticle
-  try:
-    raw = json.fromJson(GraphArticle)
-  except CatchableError:
-    return
-
-  let
-    tweet = raw.data.tweetResult.result
-    article = tweet.article.articleResults.result
-
-  if article.title.len == 0:
-    return
-
-  let publishedAt = article.metadata.firstPublishedAtSecs
-  var articleTime: DateTime
-  if publishedAt > 0:
-    articleTime = publishedAt.int64.fromUnix.utc
-  elif tweet.legacy.createdAt.len > 0:
-    articleTime = parseTwitterDate(tweet.legacy.createdAt)
-
-  result = Article(
-    title: article.title,
-    coverImage: getImageUrl(article.coverMedia.mediaInfo.originalImgUrl),
-    time: articleTime,
-    user: parseUserResult(tweet.core.userResults.result),
-  )
-
-  result.stats = TweetStats(
-    replies: tweet.legacy.replyCount,
-    retweets: tweet.legacy.retweetCount,
-    likes: tweet.legacy.favoriteCount,
-  )
-  if tweet.views.count.len > 0:
-    try: result.stats.views = parseInt(tweet.views.count)
-    except ValueError: discard
-
-  for blk in article.contentState.blocks:
-    result.paragraphs.add ArticleParagraph(
-      text: blk.text,
-      kind: blk.blockKind,
-      inlineStyles: blk.inlineStyleRanges,
-      entityRanges: blk.entityRanges,
-    )
-
-  for entry in article.contentState.entityMap:
-    let key = try: parseInt(entry.key) except ValueError: continue
-    var entity = ArticleEntity(kind: entry.value.entityKind)
-    case entity.kind
-    of "LINK": entity.url = entry.value.data.url
-    of "MEDIA":
-      for mi in entry.value.data.mediaItems:
-        entity.mediaIds.add mi.mediaId
-      entity.caption = entry.value.data.caption
-    of "TWEET": entity.tweetId = entry.value.data.tweetId
-    of "MARKDOWN": entity.markdown = entry.value.data.markdown
-    else: discard
-    result.entities[key] = entity
-
-  for me in article.mediaEntities:
-    let typeName = me.mediaInfo.typeName
-    var media = ArticleMedia(kind: typeName)
-    if me.mediaInfo.videoInfo.isSome:
-      let variants = me.mediaInfo.videoInfo.get.variants
-      case typeName
-      of "ApiGif":
-        if variants.len > 0:
-          media.url = variants[0].url
-      of "ApiVideo":
-        var bestBitrate = -1
-        for v in variants:
-          if v.bitrate > bestBitrate:
-            bestBitrate = v.bitrate
-            media.url = v.url
-      else: discard
-    elif typeName == "ApiImage":
-      media.url = getImageUrl(me.mediaInfo.originalImgUrl)
-    result.media[me.mediaId] = media

src/experimental/parser/graphql.nim

@@ -1,73 +1,17 @@
-import options, strutils
+import options
 import jsony
-import user, utils, ../types/[graphuser, graphlistmembers, graphfollowers]
+import user, ../types/[graphuser, graphlistmembers]
-from ../../types import User, VerifiedType, Result, Query, QueryKind
+from ../../types import User, Result, Query, QueryKind
-
-proc parseUserResult*(userResult: UserResult): User =
-  result = userResult.legacy
-
-  if result.verifiedType == none and userResult.isBlueVerified:
-    result.verifiedType = blue
-
-  if result.username.len == 0 and userResult.core.screenName.len > 0:
-    # Modern UserByRestId/UserByScreenName shape: `legacy` is empty and the data
-    # lives in typed sub-objects (core/relationship_counts/tweet_counts/etc.).
-    result.id = userResult.restId
-    result.username = userResult.core.screenName
-    result.fullname = userResult.core.name
-    result.userPic = userResult.avatar.imageUrl.replace("_normal", "")
-
-    if userResult.banner.imageUrl.len > 0:
-      result.banner = userResult.banner.imageUrl & "/1500x500"
-
-    if userResult.privacy.isSome:
-      result.protected = userResult.privacy.get.protected
-
-    if userResult.location.isSome:
-      result.location = userResult.location.get.location
-
-    if userResult.core.createdAt.len > 0:
-      result.joinDate = parseTwitterDate(userResult.core.createdAt)
-
-    if userResult.verification.isSome:
-      let v = userResult.verification.get
-      if v.verifiedType != VerifiedType.none:
-        result.verifiedType = v.verifiedType
-
-    if userResult.relationshipCounts.isSome:
-      let rc = userResult.relationshipCounts.get
-      result.followers = rc.followers
-      result.following = rc.following
-
-    if userResult.tweetCounts.isSome:
-      let tc = userResult.tweetCounts.get
-      result.tweets = tc.tweets
-      result.media = tc.mediaTweets
-
-    if userResult.actionCounts.isSome:
-      result.likes = userResult.actionCounts.get.favoritesCount
-
-    if userResult.profileBio.isSome:
-      let bio = userResult.profileBio.get
-      result.bio = bio.description
-      result.expandUserEntities(bio.entities)
 
 proc parseGraphUser*(json: string): User =
-  if json.len == 0 or json[0] != '{':
+  let raw = json.fromJson(GraphUser)
-    return
 
-  let 
+  if raw.data.user.result.reason.get("") == "Suspended":
-    raw = json.fromJson(GraphUser)
-    userResult = 
-      if raw.data.userResult.isSome: raw.data.userResult.get.result
-      elif raw.data.user.isSome: raw.data.user.get.result
-      else: UserResult()
-
-  if userResult.unavailableReason.get("") == "Suspended" or
-     userResult.reason.get("") == "Suspended":
     return User(suspended: true)
 
-  result = parseUserResult(userResult)
+  result = toUser raw.data.user.result.legacy
+  result.id = raw.data.user.result.restId
+  result.verified = result.verified or raw.data.user.result.isBlueVerified
 
 proc parseGraphListMembers*(json, cursor: string): Result[User] =
   result = Result[User](
@@ -83,29 +27,7 @@ proc parseGraphListMembers*(json, cursor: string): Result[User] =
         of TimelineTimelineItem:
           let userResult = entry.content.itemContent.userResults.result
           if userResult.restId.len > 0:
-            result.content.add parseUserResult(userResult)
+            result.content.add toUser userResult.legacy
-        of TimelineTimelineCursor:
-          if entry.content.cursorType == "Bottom":
-            result.bottom = entry.content.value
-
-proc parseGraphFollowers*(json, cursor: string; kind: QueryKind): Result[User] =
-  result = Result[User](
-    beginning: cursor.len == 0,
-    query: Query(kind: kind)
-  )
-
-  if json.len == 0 or json[0] != '{':
-    return
-
-  let raw = json.fromJson(GraphFollowers)
-  for instruction in raw.data.user.result.timeline.timeline.instructions:
-    if instruction.kind == "TimelineAddEntries":
-      for entry in instruction.entries:
-        case entry.content.entryType
-        of TimelineTimelineItem:
-          let userResult = entry.content.itemContent.userResults.result
-          if userResult.restId.len > 0:
-            result.content.add parseUserResult(userResult)
         of TimelineTimelineCursor:
           if entry.content.cursorType == "Bottom":
             result.bottom = entry.content.value

src/experimental/parser/session.nim

@@ -1,30 +0,0 @@
-import std/strutils
-import jsony
-import ../types/session
-from ../../types import Session, SessionKind
-
-proc parseSession*(raw: string): Session =
-  let session = raw.fromJson(RawSession)
-  let kind = if session.kind == "": "oauth" else: session.kind
-
-  case kind
-  of "oauth":
-    let id = session.oauthToken[0 ..< session.oauthToken.find('-')]
-    result = Session(
-      kind: SessionKind.oauth,
-      id: parseBiggestInt(id),
-      username: session.username,
-      oauthToken: session.oauthToken,
-      oauthSecret: session.oauthTokenSecret
-    )
-  of "cookie":
-    let id = if session.id.len > 0: parseBiggestInt(session.id) else: 0
-    result = Session(
-      kind: SessionKind.cookie,
-      id: id,
-      username: session.username,
-      authToken: session.authToken,
-      ct0: session.ct0
-    )
-  else:
-    raise newException(ValueError, "Unknown session kind: " & kind)

src/experimental/parser/slices.nim

@@ -54,7 +54,7 @@ proc replacedWith*(runes: seq[Rune]; repls: openArray[ReplaceSlice];
       let
         name = $runes[rep.slice.a.succ .. rep.slice.b]
         symbol = $runes[rep.slice.a]
-      result.add a(symbol & name, href = "/search?f=tweets&q=%23" & name)
+      result.add a(symbol & name, href = "/search?q=%23" & name)
     of rkMention:
       result.add a($runes[rep.slice], href = rep.url, title = rep.display)
     of rkUrl:

src/experimental/parser/tid.nim

@@ -1,8 +0,0 @@
-import jsony
-import ../types/tid
-export TidPair
-
-proc parseTidPairs*(raw: string): seq[TidPair] =
-  result = raw.fromJson(seq[TidPair])
-  if result.len == 0:
-    raise newException(ValueError, "Parsing pairs failed: " & raw)

src/experimental/parser/unifiedcard.nim

@@ -1,7 +1,6 @@
 import std/[options, tables, strutils, strformat, sugar]
 import jsony
-import user, ../types/unifiedcard
+import ../types/unifiedcard
-import ../../formatters
 from ../../types import Card, CardKind, Video
 from ../../utils import twimg, https
 
@@ -28,14 +27,6 @@ proc parseMediaDetails(data: ComponentData; card: UnifiedCard; result: var Card)
   result.text = data.topicDetail.title
   result.dest = "Topic"
 
-proc parseJobDetails(data: ComponentData; card: UnifiedCard; result: var Card) =
-  data.destination.parseDestination(card, result)
-
-  result.kind = CardKind.jobDetails
-  result.title = data.title
-  result.text = data.shortDescriptionText
-  result.dest = &"@{data.profileUser.username} · {data.location}"
-
 proc parseAppDetails(data: ComponentData; card: UnifiedCard; result: var Card) =
   let app = card.appStoreData[data.appId][0]
 
@@ -78,18 +69,6 @@ proc parseMedia(component: Component; card: UnifiedCard; result: var Card) =
   of model3d:
     result.title = "Unsupported 3D model ad"
 
-proc parseGrokShare(data: ComponentData; card: UnifiedCard; result: var Card) =
-  result.kind = summaryLarge
-
-  data.destination.parseDestination(card, result)
-  result.dest = "Answer by Grok"
-
-  for msg in data.conversationPreview:
-    if msg.sender == "USER":
-      result.title = msg.message.shorten(70)
-    elif msg.sender == "AGENT":
-      result.text = msg.message.shorten(500)
-
 proc parseUnifiedCard*(json: string): Card =
   let card = json.fromJson(UnifiedCard)
 
@@ -105,10 +84,6 @@ proc parseUnifiedCard*(json: string): Card =
       component.parseMedia(card, result)
     of buttonGroup:
       discard
-    of grokShare:
-      component.data.parseGrokShare(card, result)
-    of ComponentType.jobDetails:
-      component.data.parseJobDetails(card, result)
     of ComponentType.hidden:
       result.kind = CardKind.hidden
     of ComponentType.unknown:

src/experimental/parser/user.nim

@@ -9,10 +9,12 @@ let
   unReplace = "$1<a href=\"/$2\">@$2</a>"
 
   htRegex = nre.re"""(*U)(^|[^\w-_.?])([#＃$])([\w_]*+)(?!</a>|">|#)"""
-  htReplace = "$1<a href=\"/search?f=tweets&q=%23$3\">$2$3</a>"
+  htReplace = "$1<a href=\"/search?q=%23$3\">$2$3</a>"
 
-proc expandUserEntities*(user: var User; ent: Entities) =
+proc expandUserEntities(user: var User; raw: RawUser) =
-  let orig = user.bio.toRunes
+  let
+    orig = user.bio.toRunes
+    ent = raw.entities
 
   if ent.url.urls.len > 0:
     user.website = ent.url.urls[0].expandedUrl
@@ -54,21 +56,32 @@ proc toUser*(raw: RawUser): User =
     tweets: raw.statusesCount,
     likes: raw.favouritesCount,
     media: raw.mediaCount,
-    verifiedType: raw.verifiedType,
+    verified: raw.verified,
     protected: raw.protected,
+    joinDate: parseTwitterDate(raw.createdAt),
     banner: getBanner(raw),
     userPic: getImageUrl(raw.profileImageUrlHttps).replace("_normal", "")
   )
 
-  if raw.createdAt.len > 0:
-    result.joinDate = parseTwitterDate(raw.createdAt)
-
   if raw.pinnedTweetIdsStr.len > 0:
     result.pinnedTweet = parseBiggestInt(raw.pinnedTweetIdsStr[0])
 
-  result.expandUserEntities(raw.entities)
+  result.expandUserEntities(raw)
 
-proc parseHook*(s: string; i: var int; v: var User) =
+proc parseUser*(json: string; username=""): User =
-  var u: RawUser
+  handleErrors:
-  parseHook(s, i, u)
+    case error.code
-  v = toUser u
+    of suspended: return User(username: username, suspended: true)
+    of userNotFound: return
+    else: echo "[error - parseUser]: ", error
+
+  result = toUser json.fromJson(RawUser)
+
+proc parseUsers*(json: string; after=""): Result[User] =
+  result = Result[User](beginning: after.len == 0)
+
+  # starting with '{' means it's an error
+  if json[0] == '[':
+    let raw = json.fromJson(seq[RawUser])
+    for user in raw:
+      result.content.add user.toUser

src/experimental/types/article.nim

@@ -1,79 +0,0 @@
-import std/options
-import graphuser
-from ../../types import ArticleStyle, ArticleEntityRange
-
-type
-  GraphArticle* = object
-    data*: tuple[tweetResult: tuple[result: TweetResultNode]]
-
-  TweetResultNode* = object
-    article*: tuple[articleResults: tuple[result: ArticleResultNode]]
-    legacy*: TweetLegacy
-    core*: tuple[userResults: UserData]
-    views*: tuple[count: string]
-
-  TweetLegacy* = object
-    createdAt*: string
-    replyCount*: int
-    retweetCount*: int
-    favoriteCount*: int
-
-  ArticleResultNode* = object
-    title*: string
-    coverMedia*: tuple[mediaInfo: MediaInfoNode]
-    contentState*: ContentState
-    metadata*: tuple[firstPublishedAtSecs: int]
-    mediaEntities*: seq[RawMediaEntity]
-
-  ContentState* = object
-    blocks*: seq[ContentBlock]
-    entityMap*: seq[EntityMapEntry]
-
-  ContentBlock* = object
-    text*: string
-    blockKind*: string
-    inlineStyleRanges*: seq[ArticleStyle]
-    entityRanges*: seq[ArticleEntityRange]
-
-  EntityMapEntry* = object
-    key*: string
-    value*: EntityMapValue
-
-  EntityMapValue* = object
-    entityKind*: string
-    data*: EntityDataNode
-
-  EntityDataNode* = object
-    url*: string
-    mediaItems*: seq[tuple[mediaId: string]]
-    tweetId*: string
-    markdown*: string
-    caption*: string
-
-  RawMediaEntity* = object
-    mediaId*: string
-    mediaInfo*: MediaInfoNode
-
-  MediaInfoNode* = object
-    typeName*: string
-    originalImgUrl*: string
-    videoInfo*: Option[VideoInfoNode]
-
-  VideoInfoNode* = object
-    variants*: seq[VideoVariant]
-
-  VideoVariant* = object
-    url*: string
-    bitrate*: int
-
-proc renameHook*(v: var ContentBlock; fieldName: var string) =
-  if fieldName == "type":
-    fieldName = "blockKind"
-
-proc renameHook*(v: var EntityMapValue; fieldName: var string) =
-  if fieldName == "type":
-    fieldName = "entityKind"
-
-proc renameHook*(v: var MediaInfoNode; fieldName: var string) =
-  if fieldName == "__typename":
-    fieldName = "typeName"

src/experimental/types/graphfollowers.nim

@@ -1,17 +0,0 @@
-# SPDX-License-Identifier: AGPL-3.0-only
-import graphlistmembers
-
-type
-  GraphFollowers* = object
-    data*: tuple[user: UserWrapper]
-
-  UserWrapper = object
-    result*: UserResultWrapper
-
-  UserResultWrapper = object
-    timeline*: tuple[timeline: graphlistmembers.Timeline]
-
-# Hook to normalize snake_case field from API to camelCase used by shared types
-proc renameHook*(v: var Content; fieldName: var string) =
-  if fieldName == "user_results":
-    fieldName = "userResults"

src/experimental/types/graphlistmembers.nim

@@ -7,10 +7,10 @@ type
   List = object
     membersTimeline*: tuple[timeline: Timeline]
 
-  Timeline* = object
+  Timeline = object
     instructions*: seq[Instruction]
 
-  Instruction* = object
+  Instruction = object
     kind*: string
     entries*: seq[tuple[content: Content]]
 
@@ -18,7 +18,7 @@ type
     TimelineTimelineItem
     TimelineTimelineCursor
 
-  Content* = object
+  Content = object
     case entryType*: ContentEntryType
     of TimelineTimelineItem:
       itemContent*: tuple[userResults: UserData]

src/experimental/types/graphuser.nim

@@ -1,67 +1,15 @@
-import options, strutils
+import options
-from ../../types import User, VerifiedType
+import user
-import user as userType  # Entities, for modern profile_bio parsing
 
 type
   GraphUser* = object
-    data*: tuple[userResult: Option[UserData], user: Option[UserData]]
+    data*: tuple[user: UserData]
 
   UserData* = object
     result*: UserResult
 
-  UserCore* = object
+  UserResult = object
-    name*: string
+    legacy*: RawUser
-    screenName*: string
-    createdAt*: string
-
-  UserBio* = object
-    description*: string
-    entities*: Entities
-
-  UserAvatar* = object
-    imageUrl*: string
-
-  Verification* = object
-    verifiedType*: VerifiedType
-
-  Location* = object
-    location*: string
-
-  Privacy* = object
-    protected*: bool
-
-  # Modern UserByRestId/UserByScreenName shape moves the counts out of `legacy`
-  # into these typed sub-objects.
-  RelationshipCounts* = object
-    followers*: int
-    following*: int
-
-  TweetCounts* = object
-    tweets*: int
-    mediaTweets*: int
-
-  ActionCounts* = object
-    favoritesCount*: int
-
-  UserResult* = object
-    legacy*: User
     restId*: string
     isBlueVerified*: bool
-    core*: UserCore
-    avatar*: UserAvatar
-    banner*: UserAvatar
-    unavailableReason*: Option[string]
     reason*: Option[string]
-    privacy*: Option[Privacy]
-    profileBio*: Option[UserBio]
-    verification*: Option[Verification]
-    location*: Option[Location]
-    relationshipCounts*: Option[RelationshipCounts]
-    tweetCounts*: Option[TweetCounts]
-    actionCounts*: Option[ActionCounts]
-
-proc enumHook*(s: string; v: var VerifiedType) =
-  v = try:
-    parseEnum[VerifiedType](s)
-  except:
-    VerifiedType.none

src/experimental/types/session.nim

@@ -1,9 +0,0 @@
-type
-  RawSession* = object
-    kind*: string
-    id*: string
-    username*: string
-    oauthToken*: string
-    oauthTokenSecret*: string
-    authToken*: string
-    ct0*: string

src/experimental/types/tid.nim

@@ -1,4 +0,0 @@
-type
-  TidPair* = object
-    animationKey*: string
-    verification*: string

src/experimental/types/timeline.nim

@@ -0,0 +1,23 @@
+import std/tables
+import user
+
+type
+  Search* = object
+    globalObjects*: GlobalObjects
+    timeline*: Timeline
+
+  GlobalObjects = object
+    users*: Table[string, RawUser]
+
+  Timeline = object
+    instructions*: seq[Instructions]
+
+  Instructions = object
+    addEntries*: tuple[entries: seq[Entry]]
+
+  Entry = object
+    entryId*: string
+    content*: tuple[operation: Operation]
+
+  Operation = object
+    cursor*: tuple[value, cursorType: string]

src/experimental/types/unifiedcard.nim

@@ -1,10 +1,7 @@
-import std/[options, tables, times]
+import options, tables
-import jsony
+from ../../types import VideoType, VideoVariant
-from ../../types import VideoType, VideoVariant, User
 
 type
-  Text* = distinct string
-
   UnifiedCard* = object
     componentObjects*: Table[string, Component]
     destinationObjects*: Table[string, Destination]
@@ -16,13 +13,11 @@ type
     media
     swipeableMedia
     buttonGroup
-    jobDetails
     appStoreDetails
     twitterListDetails
     communityDetails
     mediaWithDetailsHorizontal
     hidden
-    grokShare
     unknown
 
   Component* = object
@@ -34,16 +29,12 @@ type
     appId*: string
     mediaId*: string
     destination*: string
-    location*: string
     title*: Text
     subtitle*: Text
     name*: Text
     memberCount*: int
     mediaList*: seq[MediaItem]
     topicDetail*: tuple[title: Text]
-    profileUser*: User
-    shortDescriptionText*: string
-    conversationPreview*: seq[GrokConversation]
 
   MediaItem* = object
     id*: string
@@ -78,13 +69,12 @@ type
     title*: Text
     category*: Text
 
-  GrokConversation* = object
+  Text = object
-    message*: string
+    content: string
-    sender*: string
 
   TypeField = Component | Destination | MediaEntity | AppStoreData
 
-converter fromText*(text: Text): string = string(text)
+converter fromText*(text: Text): string = text.content
 
 proc renameHook*(v: var TypeField; fieldName: var string) =
   if fieldName == "type":
@@ -96,13 +86,11 @@ proc enumHook*(s: string; v: var ComponentType) =
       of "media": media
       of "swipeable_media": swipeableMedia
       of "button_group": buttonGroup
-      of "job_details": jobDetails
       of "app_store_details": appStoreDetails
       of "twitter_list_details": twitterListDetails
       of "community_details": communityDetails
       of "media_with_details_horizontal": mediaWithDetailsHorizontal
       of "commerce_drop_details": hidden
-      of "grok_share": grokShare
       else: echo "ERROR: Unknown enum value (ComponentType): ", s; unknown
 
 proc enumHook*(s: string; v: var AppType) =
@@ -118,18 +106,3 @@ proc enumHook*(s: string; v: var MediaType) =
       of "photo": photo
       of "model3d": model3d
       else: echo "ERROR: Unknown enum value (MediaType): ", s; photo
-
-proc parseHook*(s: string; i: var int; v: var DateTime) =
-  var str: string
-  parseHook(s, i, str)
-  v = parse(str, "yyyy-MM-dd hh:mm:ss")
-
-proc parseHook*(s: string; i: var int; v: var Text) =
-  if s[i] == '"':
-    var str: string
-    parseHook(s, i, str)
-    v = Text(str)
-  else:
-    var t: tuple[content: string]
-    parseHook(s, i, t)
-    v = Text(t.content)

src/experimental/types/user.nim

@@ -1,6 +1,5 @@
 import options
 import common
-from ../../types import VerifiedType
 
 type
   RawUser* = object
@@ -16,7 +15,7 @@ type
     favouritesCount*: int
     statusesCount*: int
     mediaCount*: int
-    verifiedType*: VerifiedType
+    verified*: bool
     protected*: bool
     profileLinkColor*: string
     profileBannerUrl*: string

src/formatters.nim

@@ -1,18 +1,16 @@
 # SPDX-License-Identifier: AGPL-3.0-only
-import strutils, strformat, times, uri, tables, xmltree, htmlparser, htmlgen, math
+import strutils, strformat, times, uri, tables, xmltree, htmlparser, htmlgen
 import std/[enumerate, re]
 import types, utils, query
 
 const
   cards = "cards.twitter.com/cards"
   tco = "https://t.co"
-  twitter = parseUri("https://x.com")
+  twitter = parseUri("https://twitter.com")
 
 let
   twRegex = re"(?<=(?<!\S)https:\/\/|(?<=\s))(www\.|mobile\.)?twitter\.com"
   twLinkRegex = re"""<a href="https:\/\/twitter.com([^"]+)">twitter\.com(\S+)</a>"""
-  xRegex = re"(?<=(?<!\S)https:\/\/|(?<=\s))(www\.|mobile\.)?x\.com"
-  xLinkRegex = re"""<a href="https:\/\/x.com([^"]+)">x\.com(\S+)</a>"""
 
   ytRegex = re(r"([A-z.]+\.)?youtu(be\.com|\.be)", {reStudy, reIgnoreCase})
 
@@ -33,14 +31,11 @@ proc getUrlPrefix*(cfg: Config): string =
   if cfg.useHttps: https & cfg.hostname
   else: "http://" & cfg.hostname
 
-proc shorten*(text: string; length=28): string =
+proc shortLink*(text: string; length=28): string =
-  result = text
+  result = text.replace(wwwRegex, "")
   if result.len > length:
     result = result[0 ..< length] & "…"
     
-proc shortLink*(text: string; length=28): string =
-  result = text.replace(wwwRegex, "").shorten(length)
-    
 proc stripHtml*(text: string; shorten=false): string =
   var html = parseHtml(text)
   for el in html.findAll("a"):
@@ -59,28 +54,19 @@ proc replaceUrls*(body: string; prefs: Prefs; absolute=""): string =
   result = body
 
   if prefs.replaceYouTube.len > 0 and "youtu" in result:
-    let youtubeHost = strip(prefs.replaceYouTube, chars={'/'})
+    result = result.replace(ytRegex, prefs.replaceYouTube)
-    result = result.replace(ytRegex, youtubeHost)
 
-  if prefs.replaceTwitter.len > 0:
+  if prefs.replaceTwitter.len > 0 and ("twitter.com" in body or tco in body):
-    let twitterHost = strip(prefs.replaceTwitter, chars={'/'})
+    result = result.replace(tco, https & prefs.replaceTwitter & "/t.co")
-    if tco in result:
+    result = result.replace(cards, prefs.replaceTwitter & "/cards")
-      result = result.replace(tco, https & twitterHost & "/t.co")
+    result = result.replace(twRegex, prefs.replaceTwitter)
-    if "x.com" in result:
+    result = result.replacef(twLinkRegex, a(
-      result = result.replace(xRegex, twitterHost)
+      prefs.replaceTwitter & "$2", href = https & prefs.replaceTwitter & "$1"))
-      result = result.replacef(xLinkRegex, a(
-        twitterHost & "$2", href = https & twitterHost & "$1"))
-    if "twitter.com" in result:
-      result = result.replace(cards, twitterHost & "/cards")
-      result = result.replace(twRegex, twitterHost)
-      result = result.replacef(twLinkRegex, a(
-        twitterHost & "$2", href = https & twitterHost & "$1"))
 
   if prefs.replaceReddit.len > 0 and ("reddit.com" in result or "redd.it" in result):
-    let redditHost = strip(prefs.replaceReddit, chars={'/'})
+    result = result.replace(rdShortRegex, prefs.replaceReddit & "/comments/")
-    result = result.replace(rdShortRegex, redditHost & "/comments/")
+    result = result.replace(rdRegex, prefs.replaceReddit)
-    result = result.replace(rdRegex, redditHost)
+    if prefs.replaceReddit in result and "/gallery/" in result:
-    if redditHost in result and "/gallery/" in result:
       result = result.replace("/gallery/", "/comments/")
 
   if absolute.len > 0 and "href" in result:
@@ -91,31 +77,15 @@ proc getM3u8Url*(content: string): string =
   if re.find(content, m3u8Regex, matches) != -1:
     result = matches[0]
 
-proc proxifyVideo*(manifest: string; proxy: bool; manifestUrl = ""): string =
+proc proxifyVideo*(manifest: string; proxy: bool): string =
-  let (baseUrl, basePath) =
-    if manifestUrl.len > 0:
-      let
-        u = parseUri(manifestUrl)
-        origin = u.scheme & "://" & u.hostname
-        idx = manifestUrl.rfind('/')
-        dirPath = if idx > 8: manifestUrl[0 .. idx] else: ""
-      (origin, dirPath)
-    else:
-      ("https://video.twimg.com", "")
   var replacements: seq[(string, string)]
   for line in manifest.splitLines:
     let url =
       if line.startsWith("#EXT-X-MAP:URI"): line[16 .. ^2]
-      elif line.startsWith("#EXT-X-MEDIA") and "URI=" in line:
-        line[line.find("URI=") + 5 .. -1 + line.find("\"", start= 5 + line.find("URI="))]
       else: line
-    let resolved =
+    if url.startsWith('/'):
-      if url.startsWith('/'): baseUrl & url
+      let path = "https://video.twimg.com" & url
-      elif basePath.len > 0 and url.len > 0 and not url.startsWith('#') and
+      replacements.add (url, if proxy: path.getVidUrl else: path)
-           not url.startsWith("http") and ('.' in url): basePath & url
-      else: ""
-    if resolved.len > 0:
-      replacements.add (url, if proxy: resolved.getVidUrl else: resolved)
   return manifest.multiReplace(replacements)
 
 proc getUserPic*(userPic: string; style=""): string =
@@ -140,30 +110,25 @@ proc pageDesc*(user: User): string =
     "The latest tweets from " & user.fullname
 
 proc getJoinDate*(user: User): string =
-  if user.joinDate.year == 0: return ""
   user.joinDate.format("'Joined' MMMM YYYY")
 
 proc getJoinDateFull*(user: User): string =
-  if user.joinDate.year == 0: return ""
   user.joinDate.format("h:mm tt - d MMM YYYY")
 
 proc getTime*(tweet: Tweet): string =
-  if tweet.time.year == 0: return ""
   tweet.time.format("MMM d', 'YYYY' · 'h:mm tt' UTC'")
 
 proc getRfc822Time*(tweet: Tweet): string =
-  if tweet.time.year == 0: return ""
   tweet.time.format("ddd', 'dd MMM yyyy HH:mm:ss 'GMT'")
 
-proc getShortTime*(time: DateTime): string =
+proc getShortTime*(tweet: Tweet): string =
-  if time.year == 0: return ""
   let now = now()
-  let since = now - time
+  let since = now - tweet.time
 
-  if now.year != time.year:
+  if now.year != tweet.time.year:
-    result = time.format("d MMM yyyy")
+    result = tweet.time.format("d MMM yyyy")
   elif since.inDays >= 1:
-    result = time.format("MMM d")
+    result = tweet.time.format("MMM d")
   elif since.inHours >= 1:
     result = $since.inHours & "h"
   elif since.inMinutes >= 1:
@@ -173,33 +138,13 @@ proc getShortTime*(time: DateTime): string =
   else:
     result = "now"
 
-proc getShortTime*(tweet: Tweet): string =
-  getShortTime(tweet.time)
-
-proc getDuration*(ms: int): string =
-  let
-    sec = int(round(ms / 1000))
-    min = floorDiv(sec, 60)
-    hour = floorDiv(min, 60)
-  if hour > 0:
-    &"{hour}:{min mod 60:02}:{sec mod 60:02}"
-  else:
-    &"{min mod 60}:{sec mod 60:02}"
-
-proc getDuration*(video: Video): string =
-  getDuration(video.durationMs)
-
-proc getLink*(id: int64; username="i"; focus=true): string =
-  var username = username
-  if username.len == 0:
-    username = "i"
-  result = &"/{username}/status/{id}"
-  if focus: result &= "#m"
-
 proc getLink*(tweet: Tweet; focus=true): string =
   if tweet.id == 0: return
   var username = tweet.user.username
-  return getLink(tweet.id, username, focus)
+  if username.len == 0:
+    username = "i"
+  result = &"/{username}/status/{tweet.id}"
+  if focus: result &= "#m"
 
 proc getTwitterLink*(path: string; params: Table[string, string]): string =
   var
@@ -227,7 +172,7 @@ proc getTwitterLink*(path: string; params: Table[string, string]): string =
 proc getLocation*(u: User | Tweet): (string, string) =
   if "://" in u.location: return (u.location, "")
   let loc = u.location.split(":")
-  let url = if loc.len > 1: "/search?f=tweets&q=place:" & loc[1] else: ""
+  let url = if loc.len > 1: "/search?q=place:" & loc[1] else: ""
   (loc[0], url)
 
 proc getSuspended*(username: string): string =

src/http_pool.nim

@@ -27,7 +27,7 @@ proc release*(pool: HttpPool; client: AsyncHttpClient; badClient=false) =
 
 proc acquire*(pool: HttpPool; heads: HttpHeaders): AsyncHttpClient =
   if pool.conns.len == 0:
-    result = newAsyncHttpClient(userAgent="", headers=heads, proxy=proxy)
+    result = newAsyncHttpClient(headers=heads, proxy=proxy)
   else:
     result = pool.conns.pop()
     result.headers = heads
@@ -39,8 +39,11 @@ template use*(pool: HttpPool; heads: HttpHeaders; body: untyped): untyped =
 
   try:
     body
-  except BadClientError, ProtocolError:
+  except ProtocolError:
-    # Twitter returned 503 or closed the connection, we need a new client
+    # Twitter closed the connection, retry
+    body
+  except BadClientError:
+    # Twitter returned 503, we need a new client
     pool.release(c, true)
     badClient = false
     c = pool.acquire(heads)

src/nitter.nim

@@ -2,26 +2,21 @@
 import asyncdispatch, strformat, logging
 from net import Port
 from htmlgen import a
-from os import getEnv, normalizedPath
+from os import getEnv
 
 import jester
 
-import types, config, prefs, formatters, redis_cache, http_pool, auth, apiutils
+import types, config, prefs, formatters, redis_cache, http_pool, tokens
 import views/[general, about]
 import routes/[
-  preferences, timeline, status, media, search, rss, list, community, debug,
+  preferences, timeline, status, media, search, rss, list, debug,
-  unsupported, embed, resolver, broadcast, space, article, router_utils]
+  unsupported, embed, resolver, router_utils]
 
 const instancesUrl = "https://github.com/zedeus/nitter/wiki/Instances"
 const issuesUrl = "https://github.com/zedeus/nitter/issues"
 
-let
+let configPath = getEnv("NITTER_CONF_FILE", "./nitter.conf")
-  configPath = getEnv("NITTER_CONF_FILE", "./nitter.conf")
+let (cfg, fullCfg) = getConfig(configPath)
-  (cfg, fullCfg) = getConfig(configPath)
-
-  sessionsPath = getEnv("NITTER_SESSIONS_FILE", "./sessions.jsonl")
-
-initSessionPool(cfg, sessionsPath)
 
 if not cfg.enableDebug:
   # Silence Jester's query warning
@@ -34,62 +29,41 @@ stdout.flushFile
 updateDefaultPrefs(fullCfg)
 setCacheTimes(cfg)
 setHmacKey(cfg.hmacKey)
-if cfg.hmacKey.len == 0 or cfg.hmacKey == "secretkey":
-  stderr.write "WARNING: insecure default 'hmacKey' in nitter.conf; " &
-    "set a unique random value to stop media URL signatures being forgeable.\n"
-  stderr.flushFile
 setProxyEncoding(cfg.base64Media)
 setMaxHttpConns(cfg.httpMaxConns)
 setHttpProxy(cfg.proxy, cfg.proxyAuth)
-setApiProxy(cfg.apiProxy)
-setDisableTid(cfg.disableTid)
-setMaxConcurrentReqs(cfg.maxConcurrentReqs)
-setMaxRetries(cfg.maxRetries)
-setRetryDelayMs(cfg.retryDelayMs)
 initAboutPage(cfg.staticDir)
 
 waitFor initRedisPool(cfg)
 stdout.write &"Connected to Redis at {cfg.redisHost}:{cfg.redisPort}\n"
 stdout.flushFile
 
-createArticleRouter(cfg)
+asyncCheck initTokenPool(cfg)
+
 createUnsupportedRouter(cfg)
 createResolverRouter(cfg)
 createPrefRouter(cfg)
 createTimelineRouter(cfg)
 createListRouter(cfg)
-createCommunityRouter(cfg)
 createStatusRouter(cfg)
 createSearchRouter(cfg)
 createMediaRouter(cfg)
 createEmbedRouter(cfg)
 createRssRouter(cfg)
-createBroadcastRouter(cfg)
-createSpaceRouter(cfg)
 createDebugRouter(cfg)
 
 settings:
   port = Port(cfg.port)
-  staticDir = normalizedPath(cfg.staticDir)
+  staticDir = cfg.staticDir
   bindAddr = cfg.address
   reusePort = true
-  maxBody = 64 * 1024
 
 routes:
-  before:
-    # Reject malformed paths
-    if request.path.len == 0 or request.path[0] != '/':
-      halt Http400
-
-    # skip all file URLs (except Twitter widget compatibility)
-    cond "." notin request.path or request.path == "/embed/Tweet.html"
-    applyUrlPrefs()
-
   get "/":
-    resp renderMain(renderSearch(), request, cfg, requestPrefs())
+    resp renderMain(renderSearch(), request, cfg, themePrefs())
 
   get "/about":
-    resp renderMain(renderAbout(), request, cfg, requestPrefs())
+    resp renderMain(renderAbout(), request, cfg, themePrefs())
 
   get "/explore":
     redirect("/about")
@@ -100,7 +74,7 @@ routes:
   get "/i/redirect":
     let url = decodeUrl(@"url")
     if url.len == 0: resp Http404
-    redirect(replaceUrls(url, requestPrefs()))
+    redirect(replaceUrls(url, cookiePrefs()))
 
   error Http404:
     resp Http404, showError("Page not found", cfg)
@@ -113,30 +87,21 @@ routes:
 
   error BadClientError:
     echo error.exc.name, ": ", error.exc.msg
-    resp Http500, showError("Network error occurred, please try again.", cfg)
+    resp Http500, showError("Network error occured, please try again.", cfg)
 
   error RateLimitError:
     const link = a("another instance", href = instancesUrl)
     resp Http429, showError(
       &"Instance has been rate limited.<br>Use {link} or try again later.", cfg)
 
-  error NoSessionsError:
-    const link = a("another instance", href = instancesUrl)
-    resp Http429, showError(
-      &"Instance has no auth tokens, or is fully rate limited.<br>Use {link} or try again later.", cfg)
-
-  extend articleRoute, ""
   extend rss, ""
   extend status, ""
   extend search, ""
   extend timeline, ""
   extend media, ""
   extend list, ""
-  extend community, ""
   extend preferences, ""
   extend resolver, ""
   extend embed, ""
-  extend broadcastRoute, ""
-  extend spaceRoute, ""
   extend debug, ""
   extend unsupported, ""

src/parserutils.nim

@@ -1,23 +1,15 @@
 # SPDX-License-Identifier: AGPL-3.0-only
-import std/[times, macros, htmlgen, options, algorithm, re]
+import std/[strutils, times, macros, htmlgen, options, algorithm, re]
-import std/strutils except escape
 import std/unicode except strip
-from xmltree import escape
 import packedjson
 import types, utils, formatters
 
-const
-  unicodeOpen = "\uFFFA"
-  unicodeClose = "\uFFFB"
-  xmlOpen = escape("<")
-  xmlClose = escape(">")
-
 let
   unRegex = re"(^|[^A-z0-9-_./?])@([A-z0-9_]{1,15})"
   unReplace = "$1<a href=\"/$2\">@$2</a>"
 
   htRegex = re"(^|[^\w-_./?])([#$]|＃)([\w_]+)"
-  htReplace = "$1<a href=\"/search?f=tweets&q=%23$3\">$2$3</a>"
+  htReplace = "$1<a href=\"/search?q=%23$3\">$2$3</a>"
 
 type
   ReplaceSliceKind = enum
@@ -36,12 +28,6 @@ template `?`*(js: JsonNode): untyped =
   if j.isNull: return
   j
 
-template select*(a, b: JsonNode): untyped =
-  if a.notNull: a else: b
-
-template select*(a, b, c: JsonNode): untyped =
-  if a.notNull: a elif b.notNull: b else: c
-
 template with*(ident, value, body): untyped =
   if true:
     let ident {.inject.} = value
@@ -59,19 +45,6 @@ template getError*(js: JsonNode): Error =
   if js.kind != JArray or js.len == 0: null
   else: Error(js[0]{"code"}.getInt)
 
-proc getTweetResult*(js: JsonNode; root="content"): JsonNode =
-  select(
-    js{root, "content", "tweet_results", "result"},
-    js{root, "itemContent", "tweet_results", "result"},
-    js{root, "content", "tweetResult", "result"}
-  )
-
-template getTypeName*(js: JsonNode): string =
-  js{"__typename"}.getStr(js{"type"}.getStr)
-
-template getEntryId*(e: JsonNode): string =
-  e{"entryId"}.getStr(e{"entry_id"}.getStr)
-
 template parseTime(time: string; f: static string; flen: int): DateTime =
   if time.len != flen: return
   parse(time, f, utc())
@@ -82,32 +55,29 @@ proc getDateTime*(js: JsonNode): DateTime =
 proc getTime*(js: JsonNode): DateTime =
   parseTime(js.getStr, "ddd MMM dd hh:mm:ss \'+0000\' yyyy", 30)
 
-proc getTimeFromMs*(js: JsonNode): DateTime =
+proc getId*(id: string): string {.inline.} =
-  let ms = js.getInt(0)
-  if ms == 0: return
-  let seconds = ms div 1000
-  return fromUnix(seconds).utc()
-
-proc getTimeFromMsStr*(js: JsonNode): DateTime =
-  var ms: int64
-  try: ms = parseBiggestInt(js.getStr("0"))
-  except ValueError: return
-  if ms == 0: return
-  let seconds = ms div 1000
-  return fromUnix(seconds).utc()
-
-proc getId*(id: string): int64 {.inline.} =
   let start = id.rfind("-")
-  try:
+  if start < 0: return id
-    parseBiggestInt(if start < 0: id else: id[start + 1 ..< id.len])
+  id[start + 1 ..< id.len]
-  except ValueError: 0'i64
 
 proc getId*(js: JsonNode): int64 {.inline.} =
   case js.kind
-  of JString: return js.getStr("0").getId
+  of JString: return parseBiggestInt(js.getStr("0"))
   of JInt: return js.getBiggestInt()
   else: return 0
 
+proc getEntryId*(js: JsonNode): string {.inline.} =
+  let entry = js{"entryId"}.getStr
+  if entry.len == 0: return
+
+  if "tweet" in entry or "sq-I-t" in entry:
+    return entry.getId
+  elif "tombstone" in entry:
+    return js{"content", "item", "content", "tombstone", "tweet", "id"}.getStr
+  else:
+    echo "unknown entry: ", entry
+    return
+
 template getStrVal*(js: JsonNode; default=""): string =
   js{"string_value"}.getStr(default)
 
@@ -119,9 +89,6 @@ proc getImageStr*(js: JsonNode): string =
 template getImageVal*(js: JsonNode): string =
   js{"image_value", "url"}.getImageStr
 
-template getExpandedUrl*(js: JsonNode; fallback=""): string =
-  js{"expanded_url"}.getStr(js{"url"}.getStr(fallback))
-
 proc getCardUrl*(js: JsonNode; kind: CardKind): string =
   result = js{"website_url"}.getStrVal
   if kind == promoVideoConvo:
@@ -185,16 +152,12 @@ proc extractSlice(js: JsonNode): Slice[int] =
   result = js["indices"][0].getInt ..< js["indices"][1].getInt
 
 proc extractUrls(result: var seq[ReplaceSlice]; js: JsonNode;
-                 textLen: int; hideTwitter = false;
+                 textLen: int; hideTwitter = false) =
-                 hideArticle = false) =
   let
-    url = js.getExpandedUrl
+    url = js["expanded_url"].getStr
     slice = js.extractSlice
 
-  if hideArticle and url.isTwitterUrl and "/article/" in url:
+  if hideTwitter and slice.b.succ >= textLen and url.isTwitterUrl:
-    if slice.a < textLen:
-      result.add ReplaceSlice(kind: rkRemove, slice: slice)
-  elif hideTwitter and slice.b.succ >= textLen and url.isTwitterUrl:
     if slice.a < textLen:
       result.add ReplaceSlice(kind: rkRemove, slice: slice)
   else:
@@ -206,41 +169,28 @@ proc extractHashtags(result: var seq[ReplaceSlice]; js: JsonNode) =
 
 proc replacedWith(runes: seq[Rune]; repls: openArray[ReplaceSlice];
                   textSlice: Slice[int]): string =
-  let
-    runeLen = runes.len
-    safeStart = max(0, textSlice.a)
-    safeEnd = min(runeLen, textSlice.b)
-
-  var validRepls: seq[ReplaceSlice]
-  for rep in repls:
-    if rep.slice.a >= 0 and rep.slice.b >= 0 and rep.slice.b < runeLen and rep.slice.a <= rep.slice.b:
-      validRepls.add rep
-
   template extractLowerBound(i: int; idx): int =
-    if i > 0: min(validRepls[idx].slice.b.succ, runeLen) else: safeStart
+    if i > 0: repls[idx].slice.b.succ else: textSlice.a
 
   result = newStringOfCap(runes.len)
 
-  for i, rep in validRepls:
+  for i, rep in repls:
-    let lower = extractLowerBound(i, i - 1)
+    result.add $runes[extractLowerBound(i, i - 1) ..< rep.slice.a]
-    if lower < rep.slice.a:
-      result.add $runes[lower ..< rep.slice.a]
     case rep.kind
     of rkHashtag:
-      if rep.slice.a.succ <= rep.slice.b:
+      let
-        let
+        name = $runes[rep.slice.a.succ .. rep.slice.b]
-          name = $runes[rep.slice.a.succ .. rep.slice.b]
+        symbol = $runes[rep.slice.a]
-          symbol = $runes[rep.slice.a]
+      result.add a(symbol & name, href = "/search?q=%23" & name)
-        result.add a(symbol & name, href = "/search?f=tweets&q=%23" & name)
     of rkMention:
-      result.add a($runes[rep.slice], href = rep.url, title = escape(rep.display))
+      result.add a($runes[rep.slice], href = rep.url, title = rep.display)
     of rkUrl:
-      result.add a(escape(rep.display), href = rep.url)
+      result.add a(rep.display, href = rep.url)
     of rkRemove:
       discard
 
-  let rest = extractLowerBound(validRepls.len, ^1) ..< safeEnd
+  let rest = extractLowerBound(repls.len, ^1) ..< textSlice.b
-  if rest.a >= 0 and rest.a <= rest.b and rest.b <= runeLen:
+  if rest.a <= rest.b:
     result.add $runes[rest]
 
 proc deduplicate(s: var seq[ReplaceSlice]) =
@@ -265,7 +215,7 @@ proc expandUserEntities*(user: var User; js: JsonNode) =
     ent = ? js{"entities"}
 
   with urls, ent{"url", "urls"}:
-    user.website = urls[0].getExpandedUrl
+    user.website = urls[0]{"expanded_url"}.getStr
 
   var replacements = newSeq[ReplaceSlice]()
 
@@ -281,7 +231,7 @@ proc expandUserEntities*(user: var User; js: JsonNode) =
                      .replacef(htRegex, htReplace)
 
 proc expandTextEntities(tweet: Tweet; entities: JsonNode; text: string; textSlice: Slice[int];
-                        replyTo=""; hasRedundantLink=false; hasArticle=false) =
+                        replyTo=""; hasQuote=false) =
   let hasCard = tweet.card.isSome
 
   var replacements = newSeq[ReplaceSlice]()
@@ -292,11 +242,10 @@ proc expandTextEntities(tweet: Tweet; entities: JsonNode; text: string; textSlic
       if urlStr.len == 0 or urlStr notin text:
         continue
 
-      replacements.extractUrls(u, textSlice.b, hideTwitter = hasRedundantLink,
+      replacements.extractUrls(u, textSlice.b, hideTwitter = hasQuote)
-                               hideArticle = hasArticle)
 
       if hasCard and u{"url"}.getStr == get(tweet.card).url:
-        get(tweet.card).url = u.getExpandedUrl
+        get(tweet.card).url = u{"expanded_url"}.getStr
 
   with media, entities{"media"}:
     for m in media:
@@ -330,13 +279,12 @@ proc expandTextEntities(tweet: Tweet; entities: JsonNode; text: string; textSlic
 
   tweet.text = text.toRunes.replacedWith(replacements, textSlice).strip(leading=false)
 
-proc expandTweetEntities*(tweet: Tweet; js: JsonNode; hasArticle=false) =
+proc expandTweetEntities*(tweet: Tweet; js: JsonNode) =
   let
     entities = ? js{"entities"}
+    hasQuote = js{"is_quote_status"}.getBool
     textRange = js{"display_text_range"}
     textSlice = textRange{0}.getInt .. textRange{1}.getInt
-    hasQuote = js{"is_quote_status"}.getBool
-    hasJobCard = tweet.card.isSome and get(tweet.card).kind == jobDetails
 
   var replyTo = ""
   if tweet.replyId != 0:
@@ -344,100 +292,12 @@ proc expandTweetEntities*(tweet: Tweet; js: JsonNode; hasArticle=false) =
       replyTo = reply.getStr
       tweet.reply.add replyTo
 
-  tweet.expandTextEntities(entities, tweet.text, textSlice, replyTo,
+  tweet.expandTextEntities(entities, tweet.text, textSlice, replyTo, hasQuote)
-                           hasQuote or hasJobCard, hasArticle)
-
-proc expandTextEntitiesV2(tweet: Tweet; js: JsonNode; text: string; textSlice: Slice[int];
-                          hasRedundantLink=false; hasArticle=false) =
-  let hasCard = tweet.card.isSome
-
-  var replacements = newSeq[ReplaceSlice]()
-
-  with urls, js{"url_entities"}:
-    for u in urls:
-      let urlStr = u["url"].getStr
-      if urlStr.len == 0 or urlStr notin text:
-        continue
-
-      replacements.extractUrls(u, textSlice.b, hideTwitter = hasRedundantLink,
-                               hideArticle = hasArticle)
-
-      if hasCard and u{"url"}.getStr == get(tweet.card).url:
-        get(tweet.card).url = u.getExpandedUrl
-
-  with hashtags, js{"details", "hashtag_entities"}:
-    for hashtag in hashtags:
-      replacements.extractHashtags(hashtag)
-
-  with cashtags, js{"details", "cashtag_entities"}:
-    for cashtag in cashtags:
-      replacements.extractHashtags(cashtag)
-
-  with mentions, js{"mention_entities"}:
-    for mention in mentions:
-      let
-        name = mention{"screen_name"}.getStr
-        slice = mention.extractSlice
-        idx = tweet.reply.find(name)
-
-      if slice.a >= textSlice.a:
-        replacements.add ReplaceSlice(kind: rkMention, slice: slice,
-          url: "/" & name, display: mention["name"].getStr)
-      elif idx == -1 and tweet.replyId != 0:
-        tweet.reply.add name
-
-  replacements.deduplicate
-  replacements.sort(cmp)
-
-  tweet.text = text.toRunes.replacedWith(replacements, textSlice).strip(leading=false)
-
-proc expandTweetEntitiesV2*(tweet: Tweet; js: JsonNode; hasArticle=false) =
-  let
-    textRange = js{"details", "display_text_range"}
-    textSlice = textRange{0}.getInt .. textRange{1}.getInt
-    hasQuote = "quoted_tweet_results" in js
-    hasJobCard = tweet.card.isSome and get(tweet.card).kind == jobDetails
-    hasAttribution = tweet.attribution.isSome
-
-  tweet.expandTextEntitiesV2(js, tweet.text, textSlice,
-                             hasQuote or hasJobCard or hasAttribution,
-                             hasArticle)
 
 proc expandNoteTweetEntities*(tweet: Tweet; js: JsonNode) =
   let
     entities = ? js{"entity_set"}
-    text = js{"text"}.getStr.multiReplace(("<", unicodeOpen), (">", unicodeClose))
+    text = js{"text"}.getStr
     textSlice = 0..text.runeLen
-    hasAttribution = tweet.attribution.isSome
 
-  tweet.expandTextEntities(entities, text, textSlice, hasRedundantLink=hasAttribution)
+  tweet.expandTextEntities(entities, text, textSlice)
-
-  tweet.text = tweet.text.multiReplace((unicodeOpen, xmlOpen), (unicodeClose, xmlClose))
-
-proc expandBirdwatchEntities*(text: string; entities: JsonNode): string =
-  let runes = text.toRunes
-  var replacements: seq[ReplaceSlice]
-
-  for entity in entities:
-    let
-      fromIdx = entity{"from_index"}.getInt
-      toIdx = entity{"to_index"}.getInt
-      url = entity{"ref", "url"}.getStr
-    if url.len > 0:
-      replacements.add ReplaceSlice(
-        kind: rkUrl,
-        slice: fromIdx ..< toIdx,
-        url: url,
-        display: $runes[fromIdx ..< min(toIdx, runes.len)]
-      )
-
-  replacements.sort(cmp)
-  result = runes.replacedWith(replacements, 0 ..< runes.len)
-
-proc extractGalleryPhoto*(t: Tweet): GalleryPhoto =
-  let url =
-    if t.media.len > 0: t.media[0].getThumb
-    elif t.card.isSome: get(t.card).image
-    else: ""
-
-  result = GalleryPhoto(url: url, tweetId: $t.id)

src/prefs.nim

@@ -1,22 +1,22 @@
 # SPDX-License-Identifier: AGPL-3.0-only
-import tables, strutils
+import tables
 import types, prefs_impl
 from config import get
 from parsecfg import nil
 
-export genUpdatePrefs, genResetPrefs, genApplyPrefs
+export genUpdatePrefs, genResetPrefs
 
 var defaultPrefs*: Prefs
 
 proc updateDefaultPrefs*(cfg: parsecfg.Config) =
   genDefaultPrefs()
 
-proc getPrefs*(cookies, params: Table[string, string]): Prefs =
+proc getPrefs*(cookies: Table[string, string]): Prefs =
   result = defaultPrefs
-  genParsePrefs(cookies)
+  genCookiePrefs(cookies)
-  genParsePrefs(params)
 
-proc encodePrefs*(prefs: Prefs): string =
+template getPref*(cookies: Table[string, string], pref): untyped =
-  var encPairs: seq[string]
+  bind genCookiePref
-  genEncodePrefs(prefs)
+  var res = defaultPrefs.`pref`
-  encPairs.join(",")
+  genCookiePref(cookies, pref, res)
+  res

src/prefs_impl.nim

@@ -60,9 +60,6 @@ genPrefs:
     stickyProfile(checkbox, true):
       "Make profile sidebar stick to top"
 
-    stickyNav(checkbox, true):
-      "Keep navbar fixed to top"
-
     bidiSupport(checkbox, false):
       "Support bidirectional text (makes clicking on tweets harder)"
 
@@ -78,18 +75,12 @@ genPrefs:
     hideReplies(checkbox, false):
       "Hide tweet replies"
 
-    hideRelated(checkbox, true):
-      "Hide related tweets under replies"
-
-    hideCommunityNotes(checkbox, false):
-      "Hide community notes"
-
     squareAvatars(checkbox, false):
       "Square profile pictures"
 
   Media:
     mp4Playback(checkbox, true):
-      "Enable mp4 video playback (only for gifs)"
+      "Enable mp4 video playback"
 
     hlsPlayback(checkbox, false):
       "Enable HLS video streaming (requires JavaScript)"
@@ -103,17 +94,6 @@ genPrefs:
     autoplayGifs(checkbox, true):
       "Autoplay gifs"
 
-    compactGallery(checkbox, false):
-      "Compact media gallery (no profile info or text)"
-
-    gallerySize(select, "Medium"):
-      "Gallery column size"
-      options: @["Small", "Medium", "Large"]
-
-    mediaView(select, "Timeline"):
-      "Default media view"
-      options: @["Timeline", "Grid", "Gallery"]
-
   "Link replacements (blank to disable)":
     replaceTwitter(input, ""):
       "Twitter -> Nitter"
@@ -147,7 +127,7 @@ macro genDefaultPrefs*(): untyped =
     result.add quote do:
       defaultPrefs.`ident` = cfg.get("Preferences", `name`, `default`)
 
-macro genParsePrefs*(prefs): untyped =
+macro genCookiePrefs*(cookies): untyped =
   result = nnkStmtList.newTree()
   for pref in allPrefs():
     let
@@ -157,17 +137,37 @@ macro genParsePrefs*(prefs): untyped =
       options = pref.options
 
     result.add quote do:
-      if `name` in `prefs`:
+      if `name` in `cookies`:
         when `kind` == input or `name` == "theme":
-          result.`ident` = `prefs`[`name`]
+          result.`ident` = `cookies`[`name`]
         elif `kind` == checkbox:
-          result.`ident` = `prefs`[`name`] == "on" or 
+          result.`ident` = `cookies`[`name`] == "on"
-                           `prefs`[`name`] == "true" or
-                           `prefs`[`name`] == "1"
         else:
-          let value = `prefs`[`name`]
+          let value = `cookies`[`name`]
           if value in `options`: result.`ident` = value
 
+macro genCookiePref*(cookies, prefName, res): untyped =
+  result = nnkStmtList.newTree()
+  for pref in allPrefs():
+    let ident = ident(pref.name)
+    if ident != prefName:
+      continue
+
+    let
+      name = pref.name
+      kind = newLit(pref.kind)
+      options = pref.options
+
+    result.add quote do:
+      if `name` in `cookies`:
+        when `kind` == input or `name` == "theme":
+          `res` = `cookies`[`name`]
+        elif `kind` == checkbox:
+          `res` = `cookies`[`name`] == "on"
+        else:
+          let value = `cookies`[`name`]
+          if value in `options`: `res` = value
+
 macro genUpdatePrefs*(): untyped =
   result = nnkStmtList.newTree()
   let req = ident("request")
@@ -202,36 +202,6 @@ macro genResetPrefs*(): untyped =
     result.add quote do:
       savePref(`name`, "", `req`, expire=true)
 
-macro genEncodePrefs*(prefs): untyped =
-  result = nnkStmtList.newTree()
-  for pref in allPrefs():
-    let
-      name = newLit(pref.name)
-      ident = ident(pref.name)
-      kind = newLit(pref.kind)
-      defaultIdent = nnkDotExpr.newTree(ident("defaultPrefs"), ident(pref.name))
-
-    result.add quote do:
-      when `kind` == checkbox:
-        if `prefs`.`ident` != `defaultIdent`:
-          if `prefs`.`ident`:
-            encPairs.add `name` & "=on"
-          else:
-            encPairs.add `name` & "="
-      else:
-        if `prefs`.`ident` != `defaultIdent`:
-          encPairs.add `name` & "=" & `prefs`.`ident`
-
-macro genApplyPrefs*(params, req): untyped =
-  result = nnkStmtList.newTree()
-  for pref in allPrefs():
-    let name = newLit(pref.name)
-    result.add quote do:
-      if `name` in `params`:
-        savePref(`name`, `params`[`name`], `req`)
-      else:
-        savePref(`name`, "", `req`, expire=true)
-
 macro genPrefsType*(): untyped =
   let name = nnkPostfix.newTree(ident("*"), ident("Prefs"))
   result = quote do:

src/query.nim

@@ -1,14 +1,15 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 import strutils, strformat, sequtils, tables, uri
 
-import types, utils
+import types
 
 const
   validFilters* = @[
     "media", "images", "twimg", "videos",
-    "native_video", "consumer_video", "spaces",
+    "native_video", "consumer_video", "pro_video",
     "links", "news", "quote", "mentions",
-    "replies", "retweets", "nativeretweets"
+    "replies", "retweets", "nativeretweets",
+    "verified", "safe"
   ]
 
   emptyQuery* = "include:nativeretweets"
@@ -20,43 +21,32 @@ template `@`(param: string): untyped =
 proc initQuery*(pms: Table[string, string]; name=""): Query =
   result = Query(
     kind: parseEnum[QueryKind](@"f", tweets),
-    view: @"view",
     text: @"q",
     filters: validFilters.filterIt("f-" & it in pms),
     excludes: validFilters.filterIt("e-" & it in pms),
     since: @"since",
     until: @"until",
-    minLikes: validateNumber(@"min_faves")
+    near: @"near"
   )
 
-  # articles is an internal tab kind, not a valid search filter
-  if result.kind == QueryKind.articles:
-    result.kind = tweets
-
   if name.len > 0:
     result.fromUser = name.split(",")
 
 proc getMediaQuery*(name: string): Query =
   Query(
-    kind: QueryKind.media,
+    kind: media,
     filters: @["twimg", "native_video"],
     fromUser: @[name],
     sep: "OR"
   )
 
-proc getArticlesQuery*(name: string): Query =
-  Query(
-    kind: QueryKind.articles,
-    fromUser: @[name]
-  )
-
 proc getReplyQuery*(name: string): Query =
   Query(
     kind: replies,
     fromUser: @[name]
   )
 
-proc genQueryParam*(query: Query; maxId=""): string =
+proc genQueryParam*(query: Query): string =
   var
     filters: seq[string]
     param: string
@@ -65,20 +55,15 @@ proc genQueryParam*(query: Query; maxId=""): string =
     return query.text
 
   for i, user in query.fromUser:
-    if i == 0:
+    param &= &"from:{user} "
-      param = "("
-
-    param &= &"from:{user}"
     if i < query.fromUser.high:
-      param &= " OR "
+      param &= "OR "
-    else:
-      param &= ")"
 
-  if query.fromUser.len > 0 and query.kind in {posts, QueryKind.media}:
+  if query.fromUser.len > 0 and query.kind in {posts, media}:
-    param &= " (filter:self_threads OR -filter:replies)"
+    param &= "filter:self_threads OR-filter:replies "
 
   if "nativeretweets" notin query.excludes:
-    param &= " include:nativeretweets"
+    param &= "include:nativeretweets "
 
   for f in query.filters:
     filters.add "filter:" & f
@@ -88,51 +73,38 @@ proc genQueryParam*(query: Query; maxId=""): string =
   for i in query.includes:
     filters.add "include:" & i
 
-  if filters.len > 0:
+  result = strip(param & filters.join(&" {query.sep} "))
-    result = strip(param & " (" & filters.join(&" {query.sep} ") & ")")
-  else:
-    result = strip(param)
-
   if query.since.len > 0:
     result &= " since:" & query.since
-  if query.until.len > 0 and maxId.len == 0:
+  if query.until.len > 0:
     result &= " until:" & query.until
-  if query.minLikes.len > 0:
+  if query.near.len > 0:
-    result &= " min_faves:" & query.minLikes
+    result &= &" near:\"{query.near}\" within:15mi"
   if query.text.len > 0:
     if result.len > 0:
       result &= " " & query.text
     else:
       result = query.text
 
-  if result.len > 0 and maxId.len > 0:
-    result &= " max_id:" & maxId
-
 proc genQueryUrl*(query: Query): string =
-  var params: seq[string]
+  if query.kind notin {tweets, users}: return
 
-  if query.view.len > 0:
+  var params = @[&"f={query.kind}"]
-    params.add "view=" & encodeUrl(query.view)
+  if query.text.len > 0:
+    params.add "q=" & encodeUrl(query.text)
+  for f in query.filters:
+    params.add &"f-{f}=on"
+  for e in query.excludes:
+    params.add &"e-{e}=on"
+  for i in query.includes.filterIt(it != "nativeretweets"):
+    params.add &"i-{i}=on"
 
-  # media doubles as the profile media tab, where f isn't part of the URL scheme
+  if query.since.len > 0:
-  if query.kind in {tweets, users, lists, top} or
+    params.add "since=" & query.since
-     (query.kind == QueryKind.media and query.fromUser.len == 0):
+  if query.until.len > 0:
-    params.add &"f={query.kind}"
+    params.add "until=" & query.until
-    if query.text.len > 0:
+  if query.near.len > 0:
-      params.add "q=" & encodeUrl(query.text)
+    params.add "near=" & query.near
-    for f in query.filters:
-      params.add &"f-{f}=on"
-    for e in query.excludes:
-      params.add &"e-{e}=on"
-    for i in query.includes.filterIt(it != "nativeretweets"):
-      params.add &"i-{i}=on"
-
-    if query.since.len > 0:
-      params.add "since=" & query.since
-    if query.until.len > 0:
-      params.add "until=" & query.until
-    if query.minLikes.len > 0:
-      params.add "min_faves=" & query.minLikes
 
   if params.len > 0:
     result &= params.join("&")

src/redis_cache.nim

@@ -52,7 +52,6 @@ proc initRedisPool*(cfg: Config) {.async.} =
     await migrate("profileDates", "p:*")
     await migrate("profileStats", "p:*")
     await migrate("userType", "p:*")
-    await migrate("verifiedType", "p:*")
 
     pool.withAcquire(r):
       # optimize memory usage for user ID buckets
@@ -86,7 +85,7 @@ proc cache*(data: List) {.async.} =
   await setEx(data.listKey, listCacheTime, compress(toFlatty(data)))
 
 proc cache*(data: PhotoRail; name: string) {.async.} =
-  await setEx("pr2:" & toLower(name), baseCacheTime * 2, compress(toFlatty(data)))
+  await setEx("pr:" & toLower(name), baseCacheTime, compress(toFlatty(data)))
 
 proc cache*(data: User) {.async.} =
   if data.username.len == 0: return
@@ -144,94 +143,28 @@ proc getCachedUsername*(userId: string): Future[string] {.async.} =
   else:
     let user = await getGraphUserById(userId)
     result = user.username
-    if result.len > 0:
+    await setEx(key, baseCacheTime, result)
-      await setEx(key, baseCacheTime, result)
+    if result.len > 0 and user.id.len > 0:
-      if user.id.len > 0:
+      await all(cacheUserId(result, user.id), cache(user))
-        await all(cacheUserId(result, user.id), cache(user))
 
-# proc getCachedTweet*(id: int64): Future[Tweet] {.async.} =
+proc getCachedTweet*(id: int64): Future[Tweet] {.async.} =
-#   if id == 0: return
+  if id == 0: return
-#   let tweet = await get(id.tweetKey)
+  let tweet = await get(id.tweetKey)
-#   if tweet != redisNil:
+  if tweet != redisNil:
-#     tweet.deserialize(Tweet)
+    tweet.deserialize(Tweet)
-#   else:
-#     result = await getGraphTweetResult($id)
-#     if not result.isNil:
-#       await cache(result)
-
-proc cache*(data: Broadcast) {.async.} =
-  if data.id.len == 0: return
-  await setEx("bc:" & data.id, baseCacheTime, compress(toFlatty(data)))
-
-proc getCachedBroadcast*(id: string): Future[Broadcast] {.async.} =
-  if id.len == 0: return
-  let cached = await get("bc:" & id)
-  if cached != redisNil:
-    cached.deserialize(Broadcast)
   else:
-    result = await getBroadcastInfo(id)
+    result = await getGraphTweetResult($id)
-    await cache(result)
+    if not result.isNil:
-  result.m3u8Url = await fetchBroadcastStream(result.mediaKey)
+      await cache(result)
 
-proc cache*(data: AudioSpace) {.async.} =
+proc getCachedPhotoRail*(name: string): Future[PhotoRail] {.async.} =
-  if data.id.len == 0: return
+  if name.len == 0: return
-  let ttl = if data.state == "RUNNING": baseCacheTime div 6 else: baseCacheTime
+  let rail = await get("pr:" & toLower(name))
-  await setEx("sp:" & data.id, ttl, compress(toFlatty(data)))
-
-proc getCachedAudioSpace*(id: string): Future[AudioSpace] {.async.} =
-  if id.len == 0: return
-  let cached = await get("sp:" & id)
-  if cached != redisNil:
-    cached.deserialize(AudioSpace)
-  else:
-    result = await getAudioSpace(id)
-    await cache(result)
-  result.m3u8Url = await fetchBroadcastStream(result.mediaKey)
-
-proc cache*(data: AccountInfo; name: string) {.async.} =
-  await setEx("ai:" & toLower(name), baseCacheTime * 24, compress(toFlatty(data)))
-
-proc getCachedAccountInfo*(username: string; fetch=true): Future[AccountInfo] {.async.} =
-  if username.len == 0: return
-  let name = toLower(username)
-  let cached = await get("ai:" & name)
-  if cached != redisNil:
-    cached.deserialize(AccountInfo)
-  elif fetch:
-    result = await getAboutAccount(username)
-    await cache(result, name)
-
-proc getCachedPhotoRail*(id: string): Future[PhotoRail] {.async.} =
-  if id.len == 0: return
-  let rail = await get("pr2:" & toLower(id))
   if rail != redisNil:
     rail.deserialize(PhotoRail)
   else:
-    result = await getPhotoRail(id)
+    result = await getPhotoRail(name)
-    await cache(result, id)
+    await cache(result, name)
-
-proc cache*(data: Community) {.async.} =
-  if data.id.len == 0: return
-  await setEx("cm:" & data.id, listCacheTime, compress(toFlatty(data)))
-
-proc getCachedCommunity*(id: string): Future[Community] {.async.} =
-  if id.len == 0: return
-  let cached = await get("cm:" & id)
-  if cached != redisNil:
-    cached.deserialize(Community)
-  else:
-    result = await getGraphCommunity(id)
-    await cache(result)
-
-proc getCachedCommunityModerators*(id: string): Future[seq[User]] {.async.} =
-  if id.len == 0: return
-  let cached = await get("cmm:" & id)
-  if cached != redisNil:
-    cached.deserialize(seq[User])
-  else:
-    let mods = await getGraphCommunityModerators(id)
-    result = mods.content
-    await setEx("cmm:" & id, listCacheTime, compress(toFlatty(result)))
 
 proc getCachedList*(username=""; slug=""; id=""): Future[List] {.async.} =
   let list = if id.len == 0: redisNil

src/routes/article.nim

@@ -1,48 +0,0 @@
-# SPDX-License-Identifier: AGPL-3.0-only
-import asyncdispatch, tables, strutils
-import jester, karax/vdom
-import ".."/[types, api]
-import ../views/[article, general]
-import router_utils
-
-export api, article, vdom, general, router_utils
-
-proc createArticleRouter*(cfg: Config) =
-  router articleRoute:
-    get "/i/article/@id":
-      cond @"id".allCharsInSet(Digits)
-
-      let article = await getGraphArticle(@"id")
-      if article == nil:
-        resp Http404, showError("Article not found", cfg)
-
-      var tweetIds: seq[string]
-      for e in article.entities.values:
-        if e.kind == "TWEET":
-          tweetIds.add e.tweetId
-
-      var tweets = initTable[int64, Tweet]()
-      if tweetIds.len > 0:
-        try:
-          for t in await getGraphTweetResults(tweetIds):
-            tweets[t.id] = t
-        except CatchableError:
-          discard
-
-      let
-        prefs = requestPrefs()
-        path = getPath()
-        html = renderArticle(article, tweets, path, prefs, @"id")
-        twitterUrl = "https://x.com/" & article.user.username & "/article/" & @"id"
-      resp renderMain(html, request, cfg, prefs, titleText=article.title,
-                      twitterLink=twitterUrl)
-
-    get "/@name/article/@id/?":
-      cond '.' notin @"name"
-      cond @"id".allCharsInSet(Digits)
-      redirect("/i/article/" & @"id")
-
-    get "/@name/status/@id/article":
-      cond '.' notin @"name"
-      cond @"id".allCharsInSet(Digits)
-      redirect("/i/article/" & @"id")

src/routes/broadcast.nim

@@ -1,44 +0,0 @@
-# SPDX-License-Identifier: AGPL-3.0-only
-import asyncdispatch, strutils
-import jester
-
-import router_utils
-import ".."/[types, formatters, redis_cache]
-import ../views/[general, broadcast]
-import media
-
-export broadcast
-
-proc createBroadcastRouter*(cfg: Config) =
-  router broadcastRoute:
-    get "/i/broadcasts/@id":
-      cond @"id".allCharsInSet({'a'..'z', 'A'..'Z', '0'..'9'})
-      var bc: Broadcast
-      try:
-        bc = await getCachedBroadcast(@"id")
-      except:
-        discard
-
-      if bc.id.len == 0:
-        resp Http404, showError("Broadcast not found", cfg)
-
-      let prefs = requestPrefs()
-      resp renderMain(renderBroadcast(bc, prefs, request.path), request, cfg, prefs,
-                      bc.title, ogTitle=bc.title)
-
-    get "/i/broadcasts/@id/stream":
-      cond @"id".allCharsInSet({'a'..'z', 'A'..'Z', '0'..'9'})
-      var bc: Broadcast
-      try:
-        bc = await getCachedBroadcast(@"id")
-      except:
-        discard
-
-      if bc.m3u8Url.len == 0:
-        resp Http404
-
-      let manifest = await safeFetch(bc.m3u8Url)
-      if manifest.len == 0:
-        resp Http502
-
-      resp proxifyVideo(manifest, requestPrefs().proxyVideos, bc.m3u8Url), m3u8Mime

src/routes/community.nim

@@ -1,89 +0,0 @@
-# SPDX-License-Identifier: AGPL-3.0-only
-import strformat
-
-import jester
-
-import router_utils
-import ".."/[types, redis_cache, api]
-import ../views/[general, timeline, community]
-
-export community
-
-template respCommunity*(cmty: Community; title: string; nav, vnode: typed) =
-  if cmty.id.len == 0 or cmty.name.len == 0:
-    resp Http404, showError(&"""Community "{@"id"}" not found""", cfg)
-
-  let html = renderCommunity(vnode, nav, cmty)
-  resp renderMain(html, request, cfg, prefs, titleText=title, banner=cmty.banner)
-
-proc createCommunityRouter*(cfg: Config) =
-  router community:
-    get "/i/communities/@id/?":
-      cond '.' notin @"id"
-      let
-        prefs = requestPrefs()
-        cmty = await getCachedCommunity(@"id")
-        tl = await getGraphCommunityTweets(cmty.id, "Relevance", getCursor())
-      respCommunity(cmty, cmty.name,
-                     renderCommunityTabs(QueryKind.posts, cmty),
-                     renderTimelineTweets(tl, prefs, request.path))
-
-    get "/i/communities/@id/latest":
-      cond '.' notin @"id"
-      let
-        prefs = requestPrefs()
-        cmty = await getCachedCommunity(@"id")
-        tl = await getGraphCommunityTweets(cmty.id, "Recency", getCursor())
-      respCommunity(cmty, cmty.name & " - Latest",
-                     renderCommunityTabs(QueryKind.replies, cmty),
-                     renderTimelineTweets(tl, prefs, request.path))
-
-    get "/i/communities/@id/media":
-      cond '.' notin @"id"
-      let
-        prefs = requestPrefs()
-        cmty = await getCachedCommunity(@"id")
-        tl = await getGraphCommunityMedia(cmty.id, getCursor())
-      respCommunity(cmty, cmty.name & " - Media",
-                     renderCommunityTabs(QueryKind.media, cmty),
-                     renderTimelineTweets(tl, prefs, request.path))
-
-    get "/i/communities/@id/about":
-      cond '.' notin @"id"
-      let
-        prefs = requestPrefs()
-        cmty = await getCachedCommunity(@"id")
-        mods = await getCachedCommunityModerators(cmty.id)
-      respCommunity(cmty, cmty.name & " - About",
-                     renderCommunityTabs(QueryKind.userList, cmty),
-                     renderCommunityAbout(cmty, mods))
-
-    get "/i/communities/@id/members":
-      cond '.' notin @"id"
-      let
-        prefs = requestPrefs()
-        cmty = await getCachedCommunity(@"id")
-        members = await getGraphCommunityMembers(cmty.id, getCursor())
-      respCommunity(cmty, cmty.name & " - Members",
-                     renderMemberTabs(cmty, false),
-                     renderTimelineUsers(members, prefs, request.path))
-
-    get "/i/communities/@id/moderators":
-      cond '.' notin @"id"
-      let
-        prefs = requestPrefs()
-        cmty = await getCachedCommunity(@"id")
-        mods = await getCachedCommunityModerators(cmty.id)
-      respCommunity(cmty, cmty.name & " - Moderators",
-                     renderMemberTabs(cmty, true),
-                     renderTimelineUsers(Result[User](content: mods), prefs, request.path))
-
-    get "/i/communities/@id/hashtag/@tag":
-      cond '.' notin @"id"
-      let
-        prefs = requestPrefs()
-        cmty = await getCachedCommunity(@"id")
-        tl = await getGraphCommunityHashtags(cmty.id, @"tag", getCursor())
-      respCommunity(cmty, cmty.name & " - #" & @"tag",
-                     renderHashtagHeader(cmty, @"tag"),
-                     renderTimelineTweets(tl, prefs, request.path))

src/routes/debug.nim

@@ -1,13 +1,10 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 import jester
 import router_utils
-import ".."/[auth, types]
+import ".."/[tokens, types]
 
 proc createDebugRouter*(cfg: Config) =
   router debug:
-    get "/.health":
+    get "/.tokens":
-      respJson getSessionPoolHealth()
-
-    get "/.sessions":
       cond cfg.enableDebug
-      respJson getSessionPoolDebug()
+      respJson getPoolJson()

src/routes/embed.nim

@@ -1,81 +1,31 @@
 # SPDX-License-Identifier: AGPL-3.0-only
-import asyncdispatch, strutils, strformat, json
+import asyncdispatch, strutils, strformat, options
 import jester, karax/vdom
-import ".."/[types, api, formatters]
+import ".."/[types, api]
 import ../views/[embed, tweet, general]
-include "../views/oembed.nimf"
 import router_utils
 
 export api, embed, vdom, tweet, general, router_utils
 
-proc parseTweetPath(path: string): tuple[username, id: string] =
-  let parts = path.split('/')
-  if parts.len >= 3 and parts[1] in ["status", "statuses"]:
-    let tweetId = parts[2].split('?')[0].split('#')[0]
-    if tweetId.len > 0 and tweetId.allCharsInSet(Digits):
-      return (parts[0], tweetId)
-  return ("", "")
-
-proc parseTweetUrl*(url: string; cfg: Config): tuple[username, id: string] =
-  var path = url
-  if path.startsWith("https://"):
-    path = path[8..^1]
-  elif path.startsWith("http://"):
-    path = path[7..^1]
-
-  const twitterPrefixes = ["twitter.com/", "x.com/", "mobile.twitter.com/",
-                           "www.twitter.com/", "www.x.com/"]
-
-  for prefix in twitterPrefixes:
-    if path.startsWith(prefix):
-      return parseTweetPath(path[prefix.len..^1])
-
-  let nitterPrefix = cfg.hostname & "/"
-  if path.startsWith(nitterPrefix):
-    return parseTweetPath(path[nitterPrefix.len..^1])
-
-  # Fall back: strip any hostname and try to parse as a tweet path.
-  # Handles requests where the URL's host differs from cfg.hostname
-  # (e.g. localhost in dev/CI, or a reverse proxy with a different domain).
-  let slashPos = path.find('/')
-  if slashPos > 0:
-    let afterHost = path[slashPos + 1..^1]
-    let parsed = parseTweetPath(afterHost)
-    if parsed.username.len > 0:
-      return parsed
-
-  return ("", "")
-
 proc createEmbedRouter*(cfg: Config) =
   router embed:
     get "/i/videos/tweet/@id":
-      let
+      let convo = await getTweet(@"id")
-        id = @"id"
+      if convo == nil or convo.tweet == nil or convo.tweet.video.isNone:
-        tweet = await getTweetByRestId(id)
+        resp Http404
-        prefs = requestPrefs()
 
-      if tweet == nil:
+      resp renderVideoEmbed(convo.tweet, cfg, request)
-        resp renderErrorEmbed("Tweet not found", prefs, cfg, request, tweetId=id)
-
-      if not tweet.hasVideos:
-        resp renderErrorEmbed("No video in tweet", prefs, cfg, request,
-                              tweetId=id, username=tweet.user.username)
-
-      resp renderVideoEmbed(tweet, cfg, request)
 
     get "/@user/status/@id/embed":
       let
-        id = @"id"
+        convo = await getTweet(@"id")
-        user = @"user"
+        prefs = cookiePrefs()
-        tweet = await getTweetByRestId(id)
-        prefs = requestPrefs()
         path = getPath()
 
-      if tweet == nil:
+      if convo == nil or convo.tweet == nil:
-        resp renderErrorEmbed("Tweet not found", prefs, cfg, request,
+        resp Http404
-                              tweetId=id, username=user)
 
-      resp renderTweetEmbed(tweet, path, prefs, cfg, request)
+      resp renderTweetEmbed(convo.tweet, path, prefs, cfg, request)
 
     get "/embed/Tweet.html":
       let id = @"id"
@@ -84,57 +34,3 @@ proc createEmbedRouter*(cfg: Config) =
         redirect(&"/i/status/{id}/embed")
       else:
         resp Http404
-
-    get "/api/oembed":
-      responseHeaders().get.add(("Access-Control-Allow-Origin", "*"))
-
-      let
-        url = @"url"
-        format = @"format"
-
-      if format.len > 0 and format != "json":
-        resp Http501, "Only JSON format is supported"
-
-      if url.len == 0:
-        resp Http400, "Missing url parameter"
-
-      let (username, tweetId) = parseTweetUrl(url, cfg)
-      if username.len == 0 or tweetId.len == 0:
-        resp Http400, "Invalid tweet URL"
-
-      let tweet = await getTweetByRestId(tweetId)
-      if tweet == nil:
-        resp Http404
-
-      let
-        maxwidthParam = @"maxwidth"
-        maxwidth = if maxwidthParam.len > 0:
-                     try: clamp(parseInt(maxwidthParam), 220, 550)
-                     except ValueError: 550
-                   else: 550
-        embedUrl = getUrlPrefix(cfg) & "/" & tweet.user.username & "/status/" & tweetId & "/embed"
-        authorUrl = getUrlPrefix(cfg) & "/" & tweet.user.username
-        title = stripHtml(tweet.text)
-
-      var response = %*{
-        "version": "1.0",
-        "type": "rich",
-        "provider_name": cfg.title,
-        "provider_url": getUrlPrefix(cfg),
-        "title": title,
-        "author_name": tweet.user.fullname,
-        "author_url": authorUrl,
-        "url": embedUrl,
-        "width": maxwidth,
-        "height": newJNull(),
-        "cache_age": "3153600000",
-        "html": renderOembedIframe(embedUrl, maxwidth)
-      }
-
-      if tweet.media.len > 0:
-        let thumbUrl = getUrlPrefix(cfg) & getPicUrl(tweet.media[0].getThumb)
-        response["thumbnail_url"] = %thumbUrl
-        response["thumbnail_width"] = %maxwidth
-        response["thumbnail_height"] = %maxwidth
-
-      respJson response

src/routes/list.nim

@@ -13,7 +13,7 @@ template respList*(list, timeline, title, vnode: typed) =
 
   let
     html = renderList(vnode, timeline.query, list)
-    rss = if cfg.enableRSSList: &"""/i/lists/{@"id"}/rss""" else: ""
+    rss = &"""/i/lists/{@"id"}/rss"""
 
   resp renderMain(html, request, cfg, prefs, titleText=title, rss=rss, banner=list.banner)
 
@@ -36,7 +36,7 @@ proc createListRouter*(cfg: Config) =
     get "/i/lists/@id/?":
       cond '.' notin @"id"
       let
-        prefs = requestPrefs()
+        prefs = cookiePrefs()
         list = await getCachedList(id=(@"id"))
         timeline = await getGraphListTweets(list.id, getCursor())
         vnode = renderTimelineTweets(timeline, prefs, request.path)
@@ -45,7 +45,7 @@ proc createListRouter*(cfg: Config) =
     get "/i/lists/@id/members":
       cond '.' notin @"id"
       let
-        prefs = requestPrefs()
+        prefs = cookiePrefs()
         list = await getCachedList(id=(@"id"))
         members = await getGraphListMembers(list, getCursor())
       respList(list, members, list.title, renderTimelineUsers(members, prefs, request.path))

src/routes/media.nim

@@ -1,7 +1,6 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 import uri, strutils, httpclient, os, hashes, base64, re
 import asynchttpserver, asyncstreams, asyncfile, asyncnet
-import asyncdispatch
 
 import jester
 
@@ -13,101 +12,93 @@ export httpclient, os, strutils, asyncstreams, base64, re
 
 const
   m3u8Mime* = "application/vnd.apple.mpegurl"
-  maxAge* = "max-age=604800"
+  mp4Mime* = "video/mp4"
+  maxAge* = "public, max-age=604800, must-revalidate"
 
 proc safeFetch*(url: string): Future[string] {.async.} =
-  # maxRedirects=0: the caller already validated the host, so never follow a
+  let client = newAsyncHttpClient()
-  # redirect off the allowlisted host (would re-open the #1411 SSRF).
-  let client = newAsyncHttpClient(maxRedirects = 0)
   try: result = await client.getContent(url)
   except: discard
   finally: client.close()
 
-template respond*(req: asynchttpserver.Request; headers) =
+template respond*(req: asynchttpserver.Request; code: HttpCode;
-  var msg = "HTTP/1.1 200 OK\c\L"
+                  headers: seq[(string, string)]) =
-  for k, v in headers:
+  var msg = "HTTP/1.1 " & $code & "\c\L"
+  for (k, v) in headers:
     msg.add(k & ": " & v & "\c\L")
 
   msg.add "\c\L"
-  yield req.client.send(msg)
+  yield req.client.send(msg, flags={})
+
+proc getContentLength(res: AsyncResponse): string =
+  result = "0"
+  if res.headers.hasKey("content-length"):
+    result = $res.contentLength
+  elif res.headers.hasKey("content-range"):
+    result = res.headers["content-range"]
+    result = result[result.find('/') + 1 .. ^1]
+    if result == "*":
+      result.setLen(0)
 
 proc proxyMedia*(req: jester.Request; url: string): Future[HttpCode] {.async.} =
   result = Http200
-  let request = req.getNativeReq()
-  var fetchUrl = url
 
-  for attempt in 0 .. 2:
+  let
-    let client = newAsyncHttpClient(maxRedirects = 0)
+    request = req.getNativeReq()
-    var shouldRetry = false
+    hashed = $hash(url)
-    try:
-      let resFut = client.get(fetchUrl)
-      let completed = await withTimeout(resFut, 5000)
-      if not completed:
-        if attempt < 2:
-          echo "[media] Retry $1/2, timeout after 5s, url: $2" % [$(attempt + 1), fetchUrl]
-          shouldRetry = true
-        else:
-          echo "[media] Proxying timeout after 5s, url: $1" % [fetchUrl]
-          return Http504
-      else:
-        let res = resFut.read()
-        if res.status != "200 OK":
-          if res.status == "404 Not Found":
-            return Http404
-          if res.status.startsWith("30") and res.headers.hasKey("location"):
-            let location = res.headers["location", 0]
-            if isTwitterUrl(location):
-              fetchUrl = location
-              shouldRetry = true
-              continue
-            else:
-              return Http403
-          if attempt < 2:
-            echo "[media] Retry $1/2, status: $2, url: $3" % [$(attempt + 1), res.status, fetchUrl]
-            shouldRetry = true
-          else:
-            echo "[media] Proxying failed, status: $1, url: $2" % [res.status, fetchUrl]
-            return Http404
-        else:
-          let hashed = $hash(url)
-          if request.headers.getOrDefault("If-None-Match") == hashed:
-            return Http304
 
-          let contentLength =
+  if request.headers.getOrDefault("If-None-Match") == hashed:
-            if res.headers.hasKey("content-length"):
+    return Http304
-              res.headers["content-length", 0]
-            else:
-              ""
 
-          let headers = newHttpHeaders({
+  let c = newAsyncHttpClient(headers=newHttpHeaders({
-            "content-type": res.headers["content-type", 0],
+    "accept": "*/*",
-            "content-length": contentLength,
+    "range": $req.headers.getOrDefault("range")
-            "cache-control": maxAge,
+  }))
-            "etag": hashed
-          })
 
-          respond(request, headers)
+  try:
+    var res = await c.get(url)
+    if not res.status.startsWith("20"):
+      return Http404
 
-          var (hasValue, data) = (true, "")
+    var headers = @{
-          while hasValue:
+      "accept-ranges": "bytes",
-            (hasValue, data) = await res.bodyStream.read()
+      "content-type": $res.headers.getOrDefault("content-type"),
-            if hasValue:
+      "cache-control": maxAge,
-              await request.client.send(data)
+      "age": $res.headers.getOrDefault("age"),
-          data.setLen 0
+      "date": $res.headers.getOrDefault("date"),
-          return Http200
+      "last-modified": $res.headers.getOrDefault("last-modified")
-    except CatchableError:
+    }
-      if attempt < 2:
-        echo "[media] Retry $1/2, error: $2, url: $3" % [$(attempt + 1), getCurrentExceptionMsg(), fetchUrl]
-        shouldRetry = true
-      else:
-        echo "[media] Proxying exception, error: $1, url: $2" % [getCurrentExceptionMsg(), fetchUrl]
-        result = Http404
-    finally:
-      client.close()
-    if not shouldRetry:
-      break
 
-template check*(code): untyped =
+    var tries = 0
+    while tries <= 10 and res.headers.hasKey("transfer-encoding"):
+      await sleepAsync(100 + tries * 200)
+      res = await c.get(url)
+      tries.inc
+
+    let contentLength = res.getContentLength
+    if contentLength.len > 0:
+      headers.add ("content-length", contentLength)
+
+    if res.headers.hasKey("content-range"):
+      headers.add ("content-range", $res.headers.getOrDefault("content-range"))
+      respond(request, Http206, headers)
+    else:
+      respond(request, Http200, headers)
+
+    var (hasValue, data) = (true, "")
+    while hasValue:
+      (hasValue, data) = await res.bodyStream.read()
+      if hasValue:
+        await request.client.send(data, flags={})
+    data.setLen 0
+  except OSError: discard
+  except ProtocolError, HttpRequestError:
+    result = Http404
+  finally:
+    c.close()
+
+template check*(c): untyped =
+  let code = c
   if code != Http200:
     resp code
   else:
@@ -121,11 +112,12 @@ proc decoded*(req: jester.Request; index: int): string =
   if based: decode(encoded)
   else: decodeUrl(encoded)
 
-proc normalizeImgUrl*(url: var string) =
+proc getPicUrl*(req: jester.Request): string =
-  if not url.startsWith("http"):
+  result = decoded(req, 1)
-    if "twimg.com" notin url:
+  if "twimg.com" notin result:
-      url.insert(twimg)
+    result.insert(twimg)
-    url.insert(https)
+  if not result.startsWith(https):
+    result.insert(https)
 
 proc createMediaRouter*(cfg: Config) =
   router media:
@@ -133,38 +125,24 @@ proc createMediaRouter*(cfg: Config) =
       resp Http404
 
     get re"^\/pic\/orig\/(enc)?\/?(.+)":
-      var url = decoded(request, 1)
+      let url = getPicUrl(request)
-      cond "/amplify_video/" notin url
+      cond isTwitterUrl(parseUri(url)) == true
-      normalizeImgUrl(url)
+      check await proxyMedia(request, url & "?name=orig")
-      url.add("?name=orig")
-
-      let uri = parseUri(url)
-      cond isTwitterUrl(uri) == true
-
-      let code = await proxyMedia(request, url)
-      check code
 
     get re"^\/pic\/(enc)?\/?(.+)":
-      var url = decoded(request, 1)
+      let url = getPicUrl(request)
-      cond "/amplify_video/" notin url
+      cond isTwitterUrl(parseUri(url)) == true
-      normalizeImgUrl(url)
+      check await proxyMedia(request, url)
-
-      let uri = parseUri(url)
-      cond isTwitterUrl(uri) == true
-
-      let code = await proxyMedia(request, url)
-      check code
 
     get re"^\/video\/(enc)?\/?(.+)\/(.+)$":
       let url = decoded(request, 2)
-      cond isTwitterUrl(url)
+      cond "http" in url
 
       if getHmac(url) != request.matches[1]:
-        resp Http403, showError("Failed to verify signature", cfg)
+        resp showError("Failed to verify signature", cfg)
 
-      if ".mp4" in url or ".ts" in url or ".m4s" in url or ".aac" in url:
+      if ".mp4" in url or ".ts" in url or ".m4s" in url:
-        let code = await proxyMedia(request, url)
+        check await proxyMedia(request, url)
-        check code
 
       var content: string
       if ".vmap" in url:
@@ -176,6 +154,6 @@ proc createMediaRouter*(cfg: Config) =
 
       if ".m3u8" in url:
         let vid = await safeFetch(url)
-        content = proxifyVideo(vid, requestPrefs().proxyVideos, url)
+        content = proxifyVideo(vid, cookiePref(proxyVideos))
 
       resp content, m3u8Mime

src/routes/preferences.nim

@@ -19,10 +19,8 @@ proc createPrefRouter*(cfg: Config) =
   router preferences:
     get "/settings":
       let
-        prefs = requestPrefs()
+        prefs = cookiePrefs()
-        prefsCode = encodePrefs(prefs)
+        html = renderPreferences(prefs, refPath(), findThemes(cfg.staticDir))
-        prefsUrl = getUrlPrefix(cfg) & "/?prefs=" & prefsCode
-        html = renderPreferences(prefs, refPath(), findThemes(cfg.staticDir), prefsUrl)
       resp renderMain(html, request, cfg, prefs, "Preferences")
 
     get "/settings/@i?":
@@ -40,6 +38,3 @@ proc createPrefRouter*(cfg: Config) =
       savePref("hlsPlayback", "on", request)
       redirect(refPath())
 
-    post "/enablemp4":
-      savePref("mp4Playback", "on", request)
-      redirect(refPath())

src/routes/resolver.nim

@@ -18,8 +18,8 @@ proc createResolverRouter*(cfg: Config) =
   router resolver:
     get "/cards/@card/@id":
       let url = "https://cards.twitter.com/cards/$1/$2" % [@"card", @"id"]
-      respResolved(await resolve(url, requestPrefs()), "card")
+      respResolved(await resolve(url, cookiePrefs()), "card")
 
     get "/t.co/@url":
       let url = "https://t.co/" & @"url"
-      respResolved(await resolve(url, requestPrefs()), "t.co")
+      respResolved(await resolve(url, cookiePrefs()), "t.co")

src/routes/router_utils.nim

@@ -4,19 +4,26 @@ from jester import Request, cookies
 
 import ../views/general
 import ".."/[utils, prefs, types]
-export utils, prefs, types, uri, json
+export utils, prefs, types, uri
 
 template savePref*(pref, value: string; req: Request; expire=false) =
   if not expire or pref in cookies(req):
-    let sameSite = if cfg.useHttps: None else: Lax
     setCookie(pref, value, daysForward(when expire: -10 else: 360),
-              httpOnly=true, secure=cfg.useHttps, sameSite=sameSite, path="/")
+              httpOnly=true, secure=cfg.useHttps, sameSite=None)
 
-template requestPrefs*(): untyped {.dirty.} =
+template cookiePrefs*(): untyped {.dirty.} =
-  getPrefs(cookies(request), params(request))
+  getPrefs(cookies(request))
+
+template cookiePref*(pref): untyped {.dirty.} =
+  getPref(cookies(request), pref)
+
+template themePrefs*(): Prefs =
+  var res = defaultPrefs
+  res.theme = cookiePref(theme)
+  res
 
 template showError*(error: string; cfg: Config): string =
-  renderMain(renderError(error), request, cfg, requestPrefs(), "Error")
+  renderMain(renderError(error), request, cfg, themePrefs(), "Error")
 
 template getPath*(): untyped {.dirty.} =
   $(parseUri(request.path) ? filterParams(request.params))
@@ -36,28 +43,5 @@ template getCursor*(req: Request): string =
 proc getNames*(name: string): seq[string] =
   name.strip(chars={'/'}).split(",").filterIt(it.len > 0)
 
-template applyUrlPrefs*() {.dirty.} =
-  if @"prefs".len > 0:
-    var prefParams = initTable[string, string]()
-    for pair in @"prefs".split(','):
-      let kv = pair.split('=', maxsplit=1)
-      if kv.len == 2:
-        prefParams[kv[0]] = kv[1]
-      elif kv.len == 1 and kv[0].len > 0:
-        prefParams[kv[0]] = ""
-    genApplyPrefs(prefParams, request)
-
-    # Rebuild URL without prefs param
-    var params: seq[(string, string)]
-    for k, v in request.params:
-      if k != "prefs":
-        params.add (k, v)
-
-    if params.len > 0:
-      let cleanUrl = request.getNativeReq.url ? params
-      redirect($cleanUrl)
-    else:
-      redirect(request.path)
-
 template respJson*(node: JsonNode) =
   resp $node, "application/json"

src/routes/rss.nim

@@ -15,7 +15,7 @@ proc redisKey*(page, name, cursor: string): string =
   if cursor.len > 0:
     result &= ":" & cursor
 
-proc timelineRss*(req: Request; cfg: Config; query: Query; prefs: Prefs): Future[Rss] {.async.} =
+proc timelineRss*(req: Request; cfg: Config; query: Query): Future[Rss] {.async.} =
   var profile: Profile
   let
     name = req.params.getOrDefault("name")
@@ -23,23 +23,25 @@ proc timelineRss*(req: Request; cfg: Config; query: Query; prefs: Prefs): Future
     names = getNames(name)
 
   if names.len == 1:
-    profile = await fetchProfile(after, query, skipRail=true)
+    profile = await fetchProfile(after, query, skipRail=true, skipPinned=true)
   else:
     var q = query
     q.fromUser = names
-    profile.tweets = await getGraphTweetSearch(q, after)
+    profile = Profile(
-    # this is kinda dumb
+      tweets: await getGraphSearch(q, after),
-    profile.user = User(
+      # this is kinda dumb
-      username: name,
+      user: User(
-      fullname: names.join(" | "),
+        username: name,
-      userpic: "https://abs.twimg.com/sticky/default_profile_images/default_profile.png"
+        fullname: names.join(" | "),
+        userpic: "https://abs.twimg.com/sticky/default_profile_images/default_profile.png"
+      )
     )
 
   if profile.user.suspended:
     return Rss(feed: profile.user.username, cursor: "suspended")
 
   if profile.user.fullname.len > 0:
-    let rss = renderTimelineRss(profile, cfg, prefs, multi=(names.len > 1))
+    let rss = renderTimelineRss(profile, cfg, multi=(names.len > 1))
     return Rss(feed: rss, cursor: profile.tweets.bottom)
 
 template respRss*(rss, page) =
@@ -60,15 +62,12 @@ template respRss*(rss, page) =
 proc createRssRouter*(cfg: Config) =
   router rss:
     get "/search/rss":
-      if not cfg.enableRSSSearch:
+      cond cfg.enableRss
-        resp Http403, showError("RSS feed is disabled", cfg)
       if @"q".len > 200:
         resp Http400, showError("Search input too long.", cfg)
 
-      let
+      let query = initQuery(params(request))
-        prefs = requestPrefs()
+      if query.kind != tweets:
-        query = initQuery(params(request))
-      if query.kind notin {QueryKind.tweets, QueryKind.top, QueryKind.media}:
         resp Http400, showError("Only Tweet searches are allowed for RSS feeds.", cfg)
 
       let
@@ -79,19 +78,17 @@ proc createRssRouter*(cfg: Config) =
       if rss.cursor.len > 0:
         respRss(rss, "Search")
 
-      let tweets = await getGraphTweetSearch(query, cursor)
+      let tweets = await getGraphSearch(query, cursor)
       rss.cursor = tweets.bottom
-      rss.feed = renderSearchRss(tweets.content, query.text, genQueryUrl(query), cfg, prefs)
+      rss.feed = renderSearchRss(tweets.content, query.text, genQueryUrl(query), cfg)
 
       await cacheRss(key, rss)
       respRss(rss, "Search")
 
     get "/@name/rss":
+      cond cfg.enableRss
       cond '.' notin @"name"
-      if not cfg.enableRSSUserTweets:
-        resp Http403, showError("RSS feed is disabled", cfg)
       let
-        prefs = requestPrefs()
         name = @"name"
         key = redisKey("twitter", name, getCursor())
 
@@ -99,23 +96,24 @@ proc createRssRouter*(cfg: Config) =
       if rss.cursor.len > 0:
         respRss(rss, "User")
 
-      rss = await timelineRss(request, cfg, Query(fromUser: @[name]), prefs)
+      rss = await timelineRss(request, cfg, Query(fromUser: @[name]))
 
       await cacheRss(key, rss)
       respRss(rss, "User")
 
     get "/@name/@tab/rss":
+      cond cfg.enableRss
       cond '.' notin @"name"
-      cond @"tab" in ["with_replies", "media", "search", "articles"]
+      cond @"tab" in ["with_replies", "media", "search"]
-      # articles can't be approximated by search, so multi-user is unsupported
-      cond not (@"tab" == "articles" and ',' in @"name")
-      if not cfg.tabRssEnabled(@"tab"):
-        resp Http403, showError("RSS feed is disabled", cfg)
       let
-        prefs = requestPrefs()
         name = @"name"
         tab = @"tab"
-        query = request.getQuery(tab, name, prefs)
+        query =
+          case tab
+          of "with_replies": getReplyQuery(name)
+          of "media": getMediaQuery(name)
+          of "search": initQuery(params(request), name=name)
+          else: Query(fromUser: @[name])
 
       let searchKey = if tab != "search": ""
                       else: ":" & $hash(genQueryUrl(query))
@@ -126,15 +124,14 @@ proc createRssRouter*(cfg: Config) =
       if rss.cursor.len > 0:
         respRss(rss, "User")
 
-      rss = await timelineRss(request, cfg, query, prefs)
+      rss = await timelineRss(request, cfg, query)
 
       await cacheRss(key, rss)
       respRss(rss, "User")
 
     get "/@name/lists/@slug/rss":
+      cond cfg.enableRss
       cond @"name" != "i"
-      if not cfg.enableRSSList:
-        resp Http403, showError("RSS feed is disabled", cfg)
       let
         slug = decodeUrl(@"slug")
         list = await getCachedList(@"name", slug)
@@ -150,10 +147,8 @@ proc createRssRouter*(cfg: Config) =
         redirect(url)
 
     get "/i/lists/@id/rss":
-      if not cfg.enableRSSList:
+      cond cfg.enableRss
-        resp Http403, showError("RSS feed is disabled", cfg)
       let
-        prefs = requestPrefs()
         id = @"id"
         cursor = getCursor()
         key = redisKey("lists", id, cursor)
@@ -166,7 +161,7 @@ proc createRssRouter*(cfg: Config) =
         list = await getCachedList(id=id)
         timeline = await getGraphListTweets(list.id, cursor)
       rss.cursor = timeline.bottom
-      rss.feed = renderListRss(timeline.content, list, cfg, prefs)
+      rss.feed = renderListRss(timeline.content, list, cfg)
 
       await cacheRss(key, rss)
       respRss(rss, "List")

src/routes/search.nim

@@ -19,50 +19,33 @@ proc createSearchRouter*(cfg: Config) =
         resp Http400, showError("Search input too long.", cfg)
 
       let
-        prefs = requestPrefs()
+        prefs = cookiePrefs()
+        query = initQuery(params(request))
         title = "Search" & (if q.len > 0: " (" & q & ")" else: "")
 
-      var query = initQuery(params(request))
-      # x.com URL compat: f=user and f=list map to our kind names
-      # (f=live already falls back to tweets/Latest; f=media matches natively)
-      if @"f" == "user":
-        query.kind = users
-      elif @"f" == "list":
-        query.kind = lists
-
-      # media searches support view modes, defaulting like /user/media
-      if query.kind == QueryKind.media and
-         query.view notin ["timeline", "grid", "gallery"]:
-        query.view = prefs.mediaView.toLowerAscii
-
       case query.kind
       of users:
         if "," in q:
           redirect("/" & q)
         var users: Result[User]
         try:
-          users = await getGraphUserSearch(query, getCursor())
+          users = await getUserSearch(query, getCursor())
         except InternalError:
           users = Result[User](beginning: true, query: query)
         resp renderMain(renderUserSearch(users, prefs), request, cfg, prefs, title)
-      of tweets, top, QueryKind.media:
+      of tweets:
         let
-          tweets = await getGraphTweetSearch(query, getCursor())
+          tweets = await getGraphSearch(query, getCursor())
-          rss = if cfg.enableRSSSearch: "/search/rss?" & genQueryUrl(query) else: ""
+          rss = "/search/rss?" & genQueryUrl(query)
         resp renderMain(renderTweetSearch(tweets, prefs, getPath()),
                         request, cfg, prefs, title, rss=rss)
-      of lists:
-        let listResults = await getGraphListSearch(query, getCursor())
-        resp renderMain(renderListSearch(listResults, prefs, getPath()),
-                        request, cfg, prefs, title)
       else:
         resp Http404, showError("Invalid search", cfg)
 
     get "/hashtag/@hash":
-      redirect("/search?f=tweets&q=" & encodeUrl("#" & @"hash"))
+      redirect("/search?q=" & encodeUrl("#" & @"hash"))
 
     get "/opensearch":
-      let
+      let url = getUrlPrefix(cfg) & "/search?q="
-        url = getUrlPrefix(cfg) & "/search?f=tweets&q="
+      resp Http200, {"Content-Type": "application/opensearchdescription+xml"},
-        headers = {"Content-Type": "application/opensearchdescription+xml"}
+                     generateOpenSearchXML(cfg.title, cfg.hostname, url)
-      resp Http200, headers, generateOpenSearchXML(cfg.title, cfg.hostname, url)

src/routes/space.nim

@@ -1,36 +0,0 @@
-# SPDX-License-Identifier: AGPL-3.0-only
-import asyncdispatch, strutils
-import jester
-
-import router_utils
-import ".."/[types, formatters, redis_cache]
-import ../views/[general, space]
-import media
-
-export space
-
-proc createSpaceRouter*(cfg: Config) =
-  router spaceRoute:
-    get "/i/spaces/@id":
-      cond @"id".allCharsInSet({'a'..'z', 'A'..'Z', '0'..'9'})
-      let sp = await getCachedAudioSpace(@"id")
-
-      if sp.id.len == 0:
-        resp Http404, showError("Space not found", cfg)
-
-      let prefs = requestPrefs()
-      resp renderMain(renderSpace(sp, prefs, request.path), request, cfg, prefs,
-                      sp.title, ogTitle=sp.title)
-
-    get "/i/spaces/@id/stream":
-      cond @"id".allCharsInSet({'a'..'z', 'A'..'Z', '0'..'9'})
-      let sp = await getCachedAudioSpace(@"id")
-
-      if sp.m3u8Url.len == 0:
-        resp Http404
-
-      let manifest = await safeFetch(sp.m3u8Url)
-      if manifest.len == 0:
-        resp Http502
-
-      resp proxifyVideo(manifest, requestPrefs().proxyVideos, sp.m3u8Url), m3u8Mime

src/routes/status.nim

@@ -21,18 +21,18 @@ proc createStatusRouter*(cfg: Config) =
       if id.len > 19 or id.any(c => not c.isDigit):
         resp Http404, showError("Invalid tweet ID", cfg)
 
-      let
+      let prefs = cookiePrefs()
-        prefs = requestPrefs()
-        sort = parseEnum[RankingMode](@"sort".toLowerAscii.capitalizeAscii, Relevance)
 
       # used for the infinite scroll feature
       if @"scroll".len > 0:
-        let replies = await getReplies(id, getCursor(), sort)
+        let replies = await getReplies(id, getCursor())
         if replies.content.len == 0:
-          resp Http204
+          resp Http404, ""
-        resp $renderReplies(replies, prefs, getPath(), sort=sort)
+        resp $renderReplies(replies, prefs, getPath())
 
-      let conv = await getTweet(id, getCursor(), sort)
+      let conv = await getTweet(id, getCursor())
+      if conv == nil:
+        echo "nil conv"
 
       if conv == nil or conv.tweet == nil or conv.tweet.id == 0:
         var error = "Tweet not found"
@@ -46,19 +46,15 @@ proc createStatusRouter*(cfg: Config) =
         desc = conv.tweet.text
 
       var
-        images = conv.tweet.getPhotos.mapIt(it.url)
+        images = conv.tweet.photos
         video = ""
 
-      let
+      if conv.tweet.video.isSome():
-        firstMediaKind = if conv.tweet.media.len > 0: conv.tweet.media[0].kind
+        images = @[get(conv.tweet.video).thumb]
-                         else: photoMedia
-
-      if firstMediaKind == videoMedia:
-        images = @[conv.tweet.media[0].getThumb]
         video = getVideoEmbed(cfg, conv.tweet.id)
-      elif firstMediaKind == gifMedia:
+      elif conv.tweet.gif.isSome():
-        images = @[conv.tweet.media[0].getThumb]
+        images = @[get(conv.tweet.gif).thumb]
-        video = getPicUrl(conv.tweet.media[0].gif.url)
+        video = getPicUrl(get(conv.tweet.gif).url)
       elif conv.tweet.card.isSome():
         let card = conv.tweet.card.get()
         if card.image.len > 0:
@@ -66,33 +62,9 @@ proc createStatusRouter*(cfg: Config) =
         elif card.video.isSome():
           images = @[card.video.get().thumb]
 
-      let
+      let html = renderConversation(conv, prefs, getPath() & "#m")
-        tweetUrl = getUrlPrefix(cfg) & "/" & conv.tweet.user.username & "/status/" & $conv.tweet.id
-        oembedUrl = getUrlPrefix(cfg) & "/api/oembed?url=" & encodeUrl(tweetUrl)
-
-      let html = renderConversation(conv, prefs, getPath() & "#m", sort)
       resp renderMain(html, request, cfg, prefs, title, desc, ogTitle,
-                      images=images, video=video, oembed=oembedUrl)
+                      images=images, video=video)
-
-    get "/@name/status/@id/history/?":
-      cond '.' notin @"name"
-      let id = @"id"
-
-      if id.len > 19 or id.any(c => not c.isDigit):
-        resp Http404, showError("Invalid tweet ID", cfg)
-
-      let edits = await getGraphEditHistory(id)
-      if edits.latest == nil or edits.latest.id == 0:
-        resp Http404, showError("Tweet history not found", cfg)
-
-      let
-        prefs = requestPrefs()
-        title = "History for " & pageTitle(edits.latest)
-        ogTitle = "Edit History for " & pageTitle(edits.latest.user)
-        desc = edits.latest.text
-
-      let html = renderEditHistory(edits, prefs, getPath())
-      resp renderMain(html, request, cfg, prefs, title, desc, ogTitle)
 
     get "/@name/@s/@id/@m/?@i?":
       cond @"s" in ["status", "statuses"]

src/routes/timeline.nim

@@ -4,39 +4,20 @@ import jester, karax/vdom
 
 import router_utils
 import ".."/[types, redis_cache, formatters, query, api]
-import ../views/[general, profile, timeline, status, search, about_account]
+import ../views/[general, profile, timeline, status, search]
 
 export vdom
 export uri, sequtils
 export router_utils
 export redis_cache, formatters, query, api
-export profile, timeline, status, about_account
+export profile, timeline, status
 
-proc tabRssEnabled*(cfg: Config; tab: string): bool =
+proc getQuery*(request: Request; tab, name: string): Query =
   case tab
-  of "": cfg.enableRSSUserTweets
+  of "with_replies": getReplyQuery(name)
-  of "with_replies": cfg.enableRSSUserReplies
+  of "media": getMediaQuery(name)
-  of "media": cfg.enableRSSUserMedia
+  of "search": initQuery(params(request), name=name)
-  of "articles": cfg.enableRSSUserArticles
+  else: Query(fromUser: @[name])
-  of "search": cfg.enableRSSSearch
-  else: false
-
-proc getQuery*(request: Request; tab, name: string; prefs: Prefs): Query =
-  let view = request.params.getOrDefault("view")
-  case tab
-  of "with_replies":
-    result = getReplyQuery(name)
-  of "articles":
-    result = getArticlesQuery(name)
-  of "media":
-    result = getMediaQuery(name)
-    result.view =
-      if view in ["timeline", "grid", "gallery"]: view
-      else: prefs.mediaView.toLowerAscii
-  of "search":
-    result = initQuery(params(request), name=name)
-  else:
-    result = Query(fromUser: @[name])
 
 template skipIf[T](cond: bool; default; body: Future[T]): Future[T] =
   if cond:
@@ -46,7 +27,8 @@ template skipIf[T](cond: bool; default; body: Future[T]): Future[T] =
   else:
     body
 
-proc fetchProfile*(after: string; query: Query; skipRail=false): Future[Profile] {.async.} =
+proc fetchProfile*(after: string; query: Query; skipRail=false;
+                   skipPinned=false): Future[Profile] {.async.} =
   let
     name = query.fromUser[0]
     userId = await getUserId(name)
@@ -63,24 +45,37 @@ proc fetchProfile*(after: string; query: Query; skipRail=false): Future[Profile]
     after.setLen 0
 
   let
+    timeline =
+      case query.kind
+      of posts: getGraphUserTweets(userId, TimelineKind.tweets, after)
+      of replies: getGraphUserTweets(userId, TimelineKind.replies, after)
+      of media: getGraphUserTweets(userId, TimelineKind.media, after)
+      else: getGraphSearch(query, after)
+
     rail =
-      skipIf(skipRail or query.kind == QueryKind.media, @[]):
+      skipIf(skipRail or query.kind == media, @[]):
-        getCachedPhotoRail(userId)
+        getCachedPhotoRail(name)
 
-    user = getCachedUser(name)
+    user = await getCachedUser(name)
-    info = getCachedAccountInfo(name, fetch=false)
 
-  result =
+  var pinned: Option[Tweet]
-    case query.kind
+  if not skipPinned and user.pinnedTweet > 0 and
-    of posts: await getGraphUserTweets(userId, TimelineKind.tweets, after)
+     after.len == 0 and query.kind in {posts, replies}:
-    of replies: await getGraphUserTweets(userId, TimelineKind.replies, after)
+    let tweet = await getCachedTweet(user.pinnedTweet)
-    of media: await getGraphUserTweets(userId, TimelineKind.media, after)
+    if not tweet.isNil:
-    of QueryKind.articles: await getGraphUserTweets(userId, TimelineKind.articles, after)
+      tweet.pinned = true
-    else: Profile(tweets: await getGraphTweetSearch(query, after))
+      tweet.user = user
+      pinned = some tweet
 
-  result.user = await user
+  result = Profile(
-  result.photoRail = await rail
+    user: user,
-  result.accountInfo = await info
+    pinned: pinned,
+    tweets: await timeline,
+    photoRail: await rail
+  )
+
+  if result.user.protected or result.user.suspended:
+    return
 
   result.tweets.query = query
 
@@ -88,11 +83,11 @@ proc showTimeline*(request: Request; query: Query; cfg: Config; prefs: Prefs;
                    rss, after: string): Future[string] {.async.} =
   if query.fromUser.len != 1:
     let
-      timeline = await getGraphTweetSearch(query, after)
+      timeline = await getGraphSearch(query, after)
       html = renderTweetSearch(timeline, prefs, getPath())
     return renderMain(html, request, cfg, prefs, "Multi", rss=rss)
 
-  var profile = await fetchProfile(after, query)
+  var profile = await fetchProfile(after, query, skipPinned=prefs.hidePins)
   template u: untyped = profile.user
 
   if u.suspended:
@@ -127,81 +122,24 @@ proc createTimelineRouter*(cfg: Config) =
     get "/intent/user":
       respUserId()
 
-    get "/intent/follow/?":
-      let username = request.params.getOrDefault("screen_name")
-      if username.len == 0:
-        resp Http400, showError("Missing screen_name parameter", cfg)
-      redirect("/" & username)
-
-    get "/@name/about/?":
-      cond @"name".allCharsInSet({'a'..'z', 'A'..'Z', '0'..'9', '_'})
-      let
-        prefs = requestPrefs()
-        name = @"name"
-        info = await getCachedAccountInfo(name)
-      if info.suspended:
-        resp showError(getSuspended(name), cfg)
-      if info.username.len == 0:
-        resp Http404, showError("User \"" & name & "\" not found", cfg)
-      let aboutHtml = renderAboutAccount(info)
-      resp renderMain(aboutHtml, request, cfg, prefs,
-                      "About @" & info.username)
-
-    get "/@name/@kind/?":
-      cond @"kind" in ["followers", "following"]
-      cond '.' notin @"name"
-      cond @"name".allCharsInSet({'a'..'z', 'A'..'Z', '0'..'9', '_'})
-      let
-        prefs = requestPrefs()
-        name = @"name"
-        userId = await getUserId(name)
-
-      if userId.len == 0:
-        resp Http404, showError("User \"" & name & "\" not found", cfg)
-      if userId == "suspended":
-        resp showError(getSuspended(name), cfg)
-
-      let
-        cursor = getCursor()
-        isFollowers = @"kind" == "followers"
-        user = await getCachedUser(name)
-        results = if isFollowers: await getGraphFollowers(userId, cursor)
-                  else: await getGraphFollowing(userId, cursor)
-
-      if user.protected:
-        resp renderMain(renderProtected(user.username), request, cfg, prefs,
-                        "Protected account @" & name)
-
-      let
-        tab = if isFollowers: "Followers" else: "Following"
-        title = (if isFollowers: "People following @" else: "People followed by @") & name
-        html = renderUserList(user, results, prefs, request.path, tab)
-
-      resp renderMain(html, request, cfg, prefs, title,
-                      images = @[user.getUserPic("_400x400")])
-
     get "/@name/?@tab?/?":
       cond '.' notin @"name"
       cond @"name" notin ["pic", "gif", "video", "search", "settings", "login", "intent", "i"]
-      cond @"name".allCharsInSet({'a'..'z', 'A'..'Z', '0'..'9', '_', ','})
+      cond @"tab" in ["with_replies", "media", "search", ""]
-      cond @"tab" in ["with_replies", "media", "search", "articles", ""]
-      # articles can't be approximated by search, so multi-user is unsupported
-      cond not (@"tab" == "articles" and ',' in @"name")
       let
-        prefs = requestPrefs()
+        prefs = cookiePrefs()
         after = getCursor()
         names = getNames(@"name")
 
-      var query = request.getQuery(@"tab", @"name", prefs)
+      var query = request.getQuery(@"tab", @"name")
       if names.len != 1:
         query.fromUser = names
 
       # used for the infinite scroll feature
       if @"scroll".len > 0:
         if query.fromUser.len != 1:
-          var timeline = await getGraphTweetSearch(query, after)
+          var timeline = await getGraphSearch(query, after)
-          if timeline.content.len == 0: 
+          if timeline.content.len == 0: resp Http404
-            resp Http204
           timeline.beginning = true
           resp $renderTweetSearch(timeline, prefs, getPath())
         else:
@@ -211,9 +149,7 @@ proc createTimelineRouter*(cfg: Config) =
           resp $renderTimelineTweets(profile.tweets, prefs, getPath())
 
       let rss =
-        if not cfg.tabRssEnabled(@"tab"): 
+        if @"tab".len == 0:
-          ""
-        elif @"tab".len == 0:
           "/$1/rss" % @"name"
         elif @"tab" == "search":
           "/$1/search/rss?$2" % [@"name", genQueryUrl(query)]

src/routes/unsupported.nim

@@ -10,14 +10,14 @@ export feature
 proc createUnsupportedRouter*(cfg: Config) =
   router unsupported:
     template feature {.dirty.} =
-      resp renderMain(renderFeature(), request, cfg, requestPrefs())
+      resp renderMain(renderFeature(), request, cfg, themePrefs())
 
     get "/about/feature": feature()
     get "/login/?@i?": feature()
     get "/@name/lists/?": feature()
 
     get "/intent/?@i?": 
-      cond @"i" notin ["user", "follow"]
+      cond @"i" notin ["user"]
       feature()
 
     get "/i/@i?/?@j?":

src/sass/_article.scss

@@ -1,278 +0,0 @@
-.article-page {
-  max-width: 700px;
-  margin: 0 auto 20px;
-  background-color: var(--bg_panel);
-
-  > .top-ref {
-    padding-top: 20px;
-  }
-
-  .article-cover {
-    width: 100%;
-    display: block;
-  }
-
-  .article-body {
-    padding: 20px;
-
-    > :last-child {
-      margin-bottom: 0;
-    }
-
-    .article-title {
-      display: block;
-      font-size: 2rem;
-      line-height: 1.3;
-      margin: 0 0 10px;
-      color: var(--fg_color);
-    }
-
-    .article-author {
-      margin-bottom: 12px;
-      padding-bottom: 10px;
-      border-bottom: 1px solid var(--border_grey);
-      font-size: 14px;
-
-      .article-author-row {
-        display: flex;
-        align-items: center;
-        gap: 8px;
-      }
-
-      .article-avatar {
-        display: flex;
-      }
-
-      .avatar {
-        width: 40px;
-        height: 40px;
-      }
-
-      .article-author-name {
-        display: flex;
-        align-items: center;
-        margin-bottom: 2px;
-
-        .fullname {
-          font-size: 15px;
-        }
-
-        .verified-icon {
-          margin-left: 2px;
-        }
-      }
-
-      .article-author-meta {
-        display: flex;
-        align-items: center;
-      }
-
-      .fullname {
-        font-weight: 700;
-        color: var(--fg_color);
-        max-width: unset;
-        text-overflow: unset;
-        overflow: visible;
-        white-space: normal;
-      }
-
-      .username,
-      .article-date-sep,
-      .article-date {
-        color: var(--fg_dark);
-      }
-
-      .username {
-        margin-left: 0;
-      }
-
-      .article-date-sep {
-        margin: 0 4px;
-      }
-
-      .article-date {
-        text-decoration: none;
-
-        &:hover {
-          text-decoration: underline;
-        }
-      }
-
-      .tweet-stats {
-        margin-top: 6px;
-
-        .tweet-stat {
-          padding-top: 0;
-        }
-      }
-    }
-
-    > h1 {
-      display: block;
-      font-size: 1.8rem;
-      margin: 25px 0 15px;
-    }
-
-    > h2 {
-      font-size: 1.4rem;
-      font-weight: bold;
-      margin: 20px 0 12px;
-    }
-
-    > h3 {
-      font-size: 1.2rem;
-      font-weight: bold;
-      margin: 18px 0 10px;
-    }
-
-    > p {
-      font-size: 16px;
-      line-height: 1.7;
-      margin: 16px 0;
-      word-wrap: break-word;
-    }
-
-    .blockquote-attribution {
-      display: block;
-      margin-top: 0.5em;
-    }
-
-    > blockquote {
-      border-left: 3px solid var(--accent);
-      padding-left: 16px;
-      margin: 16px 0;
-      color: var(--fg_faded);
-      font-size: 16px;
-      line-height: 1.7;
-    }
-
-    > pre {
-      background-color: var(--bg_elements);
-      padding: 12px 16px;
-      border-radius: 6px;
-      overflow-x: auto;
-      margin: 16px 0;
-
-      code {
-        font-family: monospace;
-        font-size: 14px;
-        color: var(--fg_color);
-      }
-    }
-
-    code {
-      background-color: var(--bg_elements);
-      padding: 2px 5px;
-      border-radius: 3px;
-      font-family: monospace;
-      font-size: 0.9em;
-    }
-
-    > ul,
-    > ol {
-      margin: 16px 0;
-      padding-left: 2em;
-
-      li {
-        font-size: 16px;
-        line-height: 1.7;
-        margin: 6px 0;
-      }
-    }
-
-    .article-media {
-      text-align: center;
-      margin: 20px 0;
-
-      img,
-      video {
-        max-width: 100%;
-        border-radius: 12px;
-      }
-
-      .article-media-caption {
-        color: var(--fg_faded);
-        font-size: 0.875rem;
-        margin-top: 6px;
-      }
-    }
-
-    > a,
-    > p a,
-    > h1 a,
-    > h2 a,
-    > h3 a,
-    > blockquote a,
-    > ul a,
-    > ol a {
-      color: var(--accent);
-      text-decoration: none;
-
-      &:hover {
-        text-decoration: underline;
-      }
-    }
-
-    .article-divider {
-      border: none;
-      border-top: 1px solid var(--border_grey);
-      margin: 30px 0;
-    }
-
-    .timeline-item {
-      margin: 20px 0;
-      border: 1px solid var(--border_grey);
-      border-radius: 12px;
-      overflow: hidden;
-    }
-  }
-}
-
-.conversation .article-page {
-  max-width: 100%;
-  margin-bottom: 0;
-}
-
-.article-card {
-  .card-image-container {
-    position: relative;
-  }
-
-  .card-image img {
-    height: auto;
-  }
-
-  .article-card-badge {
-    position: absolute;
-    bottom: 8px;
-    left: 8px;
-    background: rgba(0, 0, 0, 0.75);
-    color: #fff;
-    font-size: 13px;
-    font-weight: 700;
-    padding: 2px 8px;
-    border-radius: 4px;
-  }
-}
-
-.quote .article-card {
-  margin: 0;
-
-  .card-container {
-    border: none;
-    border-radius: 0;
-    border-top: solid 1px var(--dark_grey);
-  }
-}
-
-@media (max-width: 700px) {
-  .article-page {
-    .article-body {
-      padding: 12px 15px 25px;
-
-      .article-title {
-        font-size: 1.6rem;
-      }
-    }
-  }
-}

src/sass/_broadcast.scss

@@ -1,75 +0,0 @@
-.broadcast-page {
-  max-width: 800px;
-  width: 100%;
-  margin: 20px auto 0;
-}
-
-.broadcast-panel {
-  background-color: var(--bg_panel);
-  border: 1px solid var(--border_grey);
-  border-radius: 8px;
-  overflow: hidden;
-}
-
-.broadcast-player {
-  position: relative;
-  background: black;
-
-  video,
-  img {
-    display: block;
-    width: 100%;
-  }
-}
-
-.broadcast-info {
-  padding: 14px 16px;
-}
-
-.broadcast-title {
-  font-size: 18px;
-  font-weight: bold;
-  margin: 0 0 12px;
-}
-
-.broadcast-user-row {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
-
-.broadcast-user {
-  display: flex;
-  align-items: center;
-  gap: 10px;
-  color: var(--fg_color);
-
-  img {
-    width: 40px;
-    height: 40px;
-    border-radius: 50%;
-  }
-}
-
-.broadcast-username {
-  color: var(--fg_dark);
-}
-
-.broadcast-meta {
-  color: var(--fg_faded);
-  font-size: 14px;
-  display: flex;
-  flex-direction: column;
-  align-items: flex-end;
-  flex-shrink: 0;
-  line-height: 1.5em;
-}
-
-.broadcast-live {
-  background: #e0245e;
-  color: white;
-  padding: 1px 6px;
-  border-radius: 3px;
-  font-weight: bold;
-  font-size: 12px;
-}

src/sass/_space.scss

@@ -1,149 +0,0 @@
-.space-page {
-  max-width: 800px;
-  width: 100%;
-  margin: 20px auto 0;
-}
-
-.space-panel {
-  background-color: var(--bg_panel);
-  border: 1px solid var(--border_grey);
-  border-radius: 8px;
-  overflow: hidden;
-}
-
-.space-player {
-  position: relative;
-  background: linear-gradient(135deg, #7b2a8c 0%, #9b3ab1 100%);
-  min-height: 140px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-
-  audio {
-    width: 100%;
-    padding: 15px;
-    box-sizing: border-box;
-
-    &:not([controls]) {
-      display: none;
-    }
-  }
-
-  .video-overlay {
-    background-color: transparent;
-  }
-}
-
-.space-live {
-  background: #e0245e;
-  color: white;
-  padding: 3px 8px;
-  border-radius: 4px;
-  font-weight: bold;
-  font-size: 12px;
-  text-transform: uppercase;
-  position: absolute;
-  top: 8px;
-  right: 8px;
-}
-
-.space-info {
-  padding: 16px;
-}
-
-.space-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: flex-start;
-  gap: 12px;
-  margin-bottom: 16px;
-}
-
-.space-title {
-  font-size: 18px;
-  font-weight: bold;
-  margin: 0;
-  line-height: 1.3;
-  flex: 1;
-}
-
-.space-meta {
-  display: flex;
-  flex-direction: column;
-  align-items: flex-end;
-  gap: 4px;
-  flex-shrink: 0;
-  font-size: 14px;
-  color: var(--fg_faded);
-}
-
-.listener-count {
-  color: var(--fg_color);
-}
-
-.space-state {
-  color: var(--fg_dark);
-}
-
-.space-participants {
-  border-top: 1px solid var(--border_grey);
-  padding-top: 12px;
-}
-
-.space-participant {
-  margin-bottom: 10px;
-
-  a {
-    display: flex;
-    align-items: center;
-    gap: 10px;
-    color: var(--fg_color);
-    padding: 6px 0;
-  }
-
-  img {
-    width: 40px;
-    height: 40px;
-    border-radius: 50%;
-    flex-shrink: 0;
-  }
-}
-
-.participant-info {
-  min-width: 0;
-}
-
-.participant-name {
-  display: flex;
-  align-items: center;
-  gap: 4px;
-
-  strong {
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
-
-  .verified-icon {
-    margin-bottom: 0;
-    position: relative;
-    top: -2px;
-  }
-}
-
-.host-badge {
-  background: var(--accent);
-  color: white;
-  padding: 2px 7px;
-  border-radius: 3px;
-  font-size: 11px;
-  font-weight: 600;
-  line-height: 1;
-  position: relative;
-  top: 1px;
-}
-
-.participant-username {
-  color: var(--fg_dark);
-  font-size: 13px;
-}

src/sass/general.scss

@@ -1,40 +1,39 @@
-@import "_variables";
+@import '_variables';
-@import "_mixins";
+@import '_mixins';
 
 .panel-container {
-  margin: auto;
+    margin: auto;
-  font-size: 130%;
+    font-size: 130%;
 }
 
 .error-panel {
-  @include center-panel(var(--error_red));
+    @include center-panel(var(--error_red));
-  text-align: center;
+    text-align: center;
 }
 
 .search-bar > form {
-  @include center-panel(var(--darkest_grey));
+    @include center-panel(var(--darkest_grey));
 
-  button {
+    button {
-    background: var(--bg_elements);
+        background: var(--bg_elements);
-    color: var(--fg_color);
+        color: var(--fg_color);
-    border: 0;
+        border: 0;
-    border-radius: 3px;
+        border-radius: 3px;
-    cursor: pointer;
+        cursor: pointer;
-    font-weight: bold;
+        font-weight: bold;
-    width: 30px;
+        width: 30px;
-    height: 30px;
+        height: 30px;
-    padding: 0px 5px 1px 8px;
+    }
-  }
 
-  input {
+    input {
-    font-size: 16px;
+        font-size: 16px;
-    width: 100%;
+        width: 100%;
-    background: var(--bg_elements);
+        background: var(--bg_elements);
-    color: var(--fg_color);
+        color: var(--fg_color);
-    border: 0;
+        border: 0;
-    border-radius: 4px;
+        border-radius: 4px;
-    padding: 4px;
+        padding: 4px;
-    margin-right: 8px;
+        margin-right: 8px;
-    height: unset;
+        height: unset;
-  }
+    }
 }

src/sass/include/_mixins.css

@@ -66,7 +66,18 @@
         }
 
         #search-panel-toggle:checked ~ .search-panel {
-            max-height: 380px !important;
+            @if $rows == 6 {
+                max-height: 200px !important;
+            }
+            @if $rows == 5 {
+                max-height: 300px !important;
+            }
+            @if $rows == 4 {
+                max-height: 300px !important;
+            }
+            @if $rows == 3 {
+                max-height: 365px !important;
+            }
         }
     }
 }

src/sass/include/_variables.scss

@@ -1,43 +1,44 @@
 // colors
-$bg_color: #0f0f0f;
+$bg_color: #0F0F0F;
-$fg_color: #f8f8f2;
+$fg_color: #F8F8F2;
-$fg_faded: #f8f8f2cf;
+$fg_faded: #F8F8F2CF;
-$fg_dark: #ff6c60;
+$fg_dark: #FF6C60;
-$fg_nav: #ff6c60;
+$fg_nav: #FF6C60;
 
 $bg_panel: #161616;
 $bg_elements: #121212;
-$bg_overlays: #1f1f1f;
+$bg_overlays: #1F1F1F;
-$bg_hover: #1a1a1a;
+$bg_hover: #1A1A1A;
 
 $grey: #888889;
 $dark_grey: #404040;
 $darker_grey: #282828;
 $darkest_grey: #222222;
-$border_grey: #3e3e35;
+$border_grey: #3E3E35;
 
-$accent: #ff6c60;
+$accent: #FF6C60;
-$accent_light: #ffaca0;
+$accent_light: #FFACA0;
-$accent_dark: #8a3731;
+$accent_dark: #8A3731;
-$accent_border: #ff6c6091;
+$accent_border: #FF6C6091;
 
-$play_button: #d8574d;
+$play_button: #D8574D;
-$play_button_hover: #ff6c60;
+$play_button_hover: #FF6C60;
 
-$more_replies_dots: #ad433b;
+$more_replies_dots: #AD433B;
-$error_red: #420a05;
+$error_red: #420A05;
 
-$verified_blue: #1da1f2;
+$verified_blue: #1DA1F2;
-$verified_business: #fac82b;
-$verified_government: #c1b6a4;
 $icon_text: $fg_color;
 
 $tab: $fg_color;
 $tab_selected: $accent;
 
-$shadow: rgba(0, 0, 0, 0.6);
+$shadow: rgba(0,0,0,.6);
-$shadow_dark: rgba(0, 0, 0, 0.2);
+$shadow_dark: rgba(0,0,0,.2);
 
 //fonts
-$font_0: sans-serif;
+$font_0: Helvetica Neue;
-$font_1: fontello;
+$font_1: Helvetica;
+$font_2: Arial;
+$font_3: sans-serif;
+$font_4: fontello;

src/sass/index.scss

@@ -1,220 +1,165 @@
-@import "_variables";
+@import '_variables';
 
-@import "tweet/_base";
+@import 'tweet/_base';
-@import "profile/_base";
+@import 'profile/_base';
-@import "general";
+@import 'general';
-@import "navbar";
+@import 'navbar';
-@import "inputs";
+@import 'inputs';
-@import "timeline";
+@import 'timeline';
-@import "search";
+@import 'search';
-@import "broadcast";
-@import "space";
-@import "_article";
 
 body {
-  // colors
+    // colors
-  --bg_color: #{$bg_color};
+    --bg_color: #{$bg_color};
-  --fg_color: #{$fg_color};
+    --fg_color: #{$fg_color};
-  --fg_faded: #{$fg_faded};
+    --fg_faded: #{$fg_faded};
-  --fg_dark: #{$fg_dark};
+    --fg_dark: #{$fg_dark};
-  --fg_nav: #{$fg_nav};
+    --fg_nav: #{$fg_nav};
 
-  --bg_panel: #{$bg_panel};
+    --bg_panel: #{$bg_panel};
-  --bg_elements: #{$bg_elements};
+    --bg_elements: #{$bg_elements};
-  --bg_overlays: #{$bg_overlays};
+    --bg_overlays: #{$bg_overlays};
-  --bg_hover: #{$bg_hover};
+    --bg_hover: #{$bg_hover};
 
-  --grey: #{$grey};
+    --grey: #{$grey};
-  --dark_grey: #{$dark_grey};
+    --dark_grey: #{$dark_grey};
-  --darker_grey: #{$darker_grey};
+    --darker_grey: #{$darker_grey};
-  --darkest_grey: #{$darkest_grey};
+    --darkest_grey: #{$darkest_grey};
-  --border_grey: #{$border_grey};
+    --border_grey: #{$border_grey};
 
-  --accent: #{$accent};
+    --accent: #{$accent};
-  --accent_light: #{$accent_light};
+    --accent_light: #{$accent_light};
-  --accent_dark: #{$accent_dark};
+    --accent_dark: #{$accent_dark};
-  --accent_border: #{$accent_border};
+    --accent_border: #{$accent_border};
 
-  --play_button: #{$play_button};
+    --play_button: #{$play_button};
-  --play_button_hover: #{$play_button_hover};
+    --play_button_hover: #{$play_button_hover};
 
-  --more_replies_dots: #{$more_replies_dots};
+    --more_replies_dots: #{$more_replies_dots};
-  --error_red: #{$error_red};
+    --error_red: #{$error_red};
 
-  --verified_blue: #{$verified_blue};
+    --verified_blue: #{$verified_blue};
-  --verified_business: #{$verified_business};
+    --icon_text: #{$icon_text};
-  --verified_government: #{$verified_government};
-  --icon_text: #{$icon_text};
 
-  --tab: #{$fg_color};
+    --tab: #{$fg_color};
-  --tab_selected: #{$accent};
+    --tab_selected: #{$accent};
 
-  --profile_stat: #{$fg_color};
+    --profile_stat: #{$fg_color};
 
-  background-color: var(--bg_color);
+    background-color: var(--bg_color);
-  color: var(--fg_color);
+    color: var(--fg_color);
-  font-family: $font_0, $font_1;
+    font-family: $font_0, $font_1, $font_2, $font_3;
-  font-size: 15px;
+    font-size: 14px;
-  line-height: 1.3;
+    line-height: 1.3;
-  margin: 0;
+    margin: 0;
 }
 
 * {
-  outline: unset;
+    outline: unset;
-  margin: 0;
+    margin: 0;
-  text-decoration: none;
+    text-decoration: none;
-}
-
-img {
-  dynamic-range-limit: standard;
 }
 
 h1 {
-  display: inline;
+    display: inline;
 }
 
-h2,
+h2, h3 {
-h3 {
+    font-weight: normal;
-  font-weight: normal;
 }
 
 p {
-  margin: 14px 0;
+    margin: 14px 0;
 }
 
 a {
-  color: var(--accent);
+    color: var(--accent);
 
-  &:hover {
+    &:hover {
-    text-decoration: underline;
+        text-decoration: underline;
-  }
+    }
 }
 
 fieldset {
-  border: 0;
+    border: 0;
-  padding: 0;
+    padding: 0;
-  margin-top: -0.6em;
+    margin-top: -0.6em;
 }
 
 legend {
-  width: 100%;
+    width: 100%;
-  padding: 0.6em 0 0.3em 0;
+    padding: .6em 0 .3em 0;
-  border: 0;
+    border: 0;
-  font-size: 16px;
+    font-size: 16px;
-  font-weight: 600;
+    font-weight: 600;
-  border-bottom: 1px solid var(--border_grey);
+    border-bottom: 1px solid var(--border_grey);
-  margin-bottom: 8px;
+    margin-bottom: 8px;
 }
 
-.preferences {
+.preferences .note {
-  .note {
     border-top: 1px solid var(--border_grey);
     border-bottom: 1px solid var(--border_grey);
     padding: 6px 0 8px 0;
     margin-bottom: 8px;
     margin-top: 16px;
-  }
-
-  .bookmark-note {
-    margin: 0;
-    margin-bottom: 10px;
-  }
 }
 
 ul {
-  padding-left: 1.3em;
+    padding-left: 1.3em;
 }
 
 .container {
-  display: flex;
+    display: flex;
-  flex-wrap: wrap;
+    flex-wrap: wrap;
-  box-sizing: border-box;
+    box-sizing: border-box;
-  margin: auto;
+    padding-top: 50px;
-  min-height: 100vh;
+    margin: auto;
-}
+    min-height: 100vh;
-
-body.fixed-nav .container {
-  padding-top: 50px;
 }
 
 .icon-container {
-  display: inline;
+    display: inline;
 }
 
 .overlay-panel {
-  max-width: 600px;
+    max-width: 600px;
-  width: 100%;
+    width: 100%;
-  margin: 0 auto;
+    margin: 0 auto;
-  margin-top: 10px;
+    margin-top: 10px;
-  background-color: var(--bg_overlays);
+    background-color: var(--bg_overlays);
-  padding: 10px 15px;
+    padding: 10px 15px;
-  align-self: start;
+    align-self: start;
 
-  ul {
+    ul {
-    margin-bottom: 14px;
+        margin-bottom: 14px;
-  }
+    }
 
-  p {
+    p {
-    word-break: break-word;
+        word-break: break-word;
-  }
+    }
 }
 
 .verified-icon {
-  display: inline-block;
+    color: var(--icon_text);
-  position: relative;
+    background-color: var(--verified_blue);
-  width: 14px;
+    border-radius: 50%;
-  height: 14px;
+    flex-shrink: 0;
-  margin-bottom: 2px;
+    margin: 2px 0 3px 3px;
-
+    padding-top: 2px;
-  .verified-icon-circle {
+    height: 12px;
-    position: absolute;
+    width: 14px;
-    font-size: 15px;
+    font-size: 8px;
-  }
+    display: inline-block;
-
+    text-align: center;
-  .verified-icon-check {
+    vertical-align: middle;
-    position: absolute;
-    font-size: 9px;
-    margin: 5px 3px;
-  }
-
-  &.blue {
-    .verified-icon-circle {
-      color: var(--verified_blue);
-    }
-
-    .verified-icon-check {
-      color: var(--icon_text);
-    }
-  }
-
-  &.business {
-    .verified-icon-circle {
-      color: var(--verified_business);
-    }
-
-    .verified-icon-check {
-      color: var(--bg_panel);
-    }
-  }
-
-  &.government {
-    .verified-icon-circle {
-      color: var(--verified_government);
-    }
-
-    .verified-icon-check {
-      color: var(--bg_panel);
-    }
-  }
 }
 
-@media (max-width: 600px) {
+@media(max-width: 600px) {
-  .preferences-container {
+    .preferences-container {
-    max-width: 95vw;
+        max-width: 95vw;
-  }
+    }
 
-  .nav-item,
+    .nav-item, .nav-item .icon-container {
-  .nav-item .icon-container {
+        font-size: 16px;
-    font-size: 16px;
+    }
-  }
 }

src/sass/inputs.scss

@@ -1,216 +1,185 @@
-@import "_variables";
+@import '_variables';
-@import "_mixins";
+@import '_mixins';
 
 button {
-  @include input-colors;
+    @include input-colors;
-  background-color: var(--bg_elements);
+    background-color: var(--bg_elements);
-  color: var(--fg_color);
+    color: var(--fg_color);
-  border: 1px solid var(--accent_border);
+    border: 1px solid var(--accent_border);
-  padding: 3px 6px;
+    padding: 3px 6px;
-  font-size: 14px;
+    font-size: 14px;
-  cursor: pointer;
+    cursor: pointer;
-  float: right;
+    float: right;
 }
 
 input[type="text"],
 input[type="date"],
-input[type="number"],
 select {
-  @include input-colors;
+    @include input-colors;
-  background-color: var(--bg_elements);
+    background-color: var(--bg_elements);
-  padding: 1px 4px;
+    padding: 1px 4px;
-  color: var(--fg_color);
+    color: var(--fg_color);
-  border: 1px solid var(--accent_border);
+    border: 1px solid var(--accent_border);
-  border-radius: 0;
+    border-radius: 0;
-  font-size: 14px;
+    font-size: 14px;
 }
 
-input[type="number"] {
+input[type="text"] {
-  -moz-appearance: textfield;
+    height: 16px;
-}
-
-input[type="text"],
-input[type="number"] {
-  height: 16px;
 }
 
 select {
-  height: 20px;
+    height: 20px;
-  padding: 0 2px;
+    padding: 0 2px;
-  line-height: 1;
+    line-height: 1;
 }
 
 input[type="date"]::-webkit-inner-spin-button {
-  display: none;
+    display: none;
-}
-
-input[type="number"] {
-  -moz-appearance: textfield;
-}
-
-input[type="number"]::-webkit-inner-spin-button,
-input[type="number"]::-webkit-outer-spin-button {
-  display: none;
-  -webkit-appearance: none;
-  margin: 0;
 }
 
 input[type="date"]::-webkit-clear-button {
-  margin-left: 17px;
+    margin-left: 17px;
-  filter: grayscale(100%);
+    filter: grayscale(100%);
-  filter: hue-rotate(120deg);
+    filter: hue-rotate(120deg);
 }
 
 input::-webkit-calendar-picker-indicator {
-  opacity: 0;
+    opacity: 0;
 }
 
 input::-webkit-datetime-edit-day-field:focus,
 input::-webkit-datetime-edit-month-field:focus,
 input::-webkit-datetime-edit-year-field:focus {
-  background-color: var(--accent);
+    background-color: var(--accent);
-  color: var(--fg_color);
+    color: var(--fg_color);
-  outline: none;
+    outline: none;
 }
 
 .date-range {
-  .date-input {
+    .date-input {
-    display: inline-block;
+        display: inline-block;
-    position: relative;
+        position: relative;
-  }
+    }
 
-  .icon-container {
+    .icon-container {
-    pointer-events: none;
+        pointer-events: none;
-    position: absolute;
+        position: absolute;
-    top: 2px;
+        top: 2px;
-    right: 5px;
+        right: 5px;
-  }
+    }
 
-  .search-title {
+    .search-title {
-    margin: 0 2px;
+        margin: 0 2px;
-  }
+    }
 }
 
 .icon-button button {
-  color: var(--accent);
+    color: var(--accent);
-  text-decoration: none;
+    text-decoration: none;
-  background: none;
+    background: none;
-  border: none;
+    border: none;
-  float: none;
+    float: none;
-  padding: unset;
+    padding: unset;
-  padding-left: 4px;
+    padding-left: 4px;
 
-  &:hover {
+    &:hover {
-    color: var(--accent_light);
+        color: var(--accent_light);
-  }
+    }
 }
 
 .checkbox {
-  position: absolute;
-  top: 1px;
-  right: 0;
-  height: 17px;
-  width: 17px;
-  background-color: var(--bg_elements);
-  border: 1px solid var(--accent_border);
-
-  &:after {
-    content: "";
     position: absolute;
-    display: none;
+    top: 1px;
-  }
+    right: 0;
+    height: 17px;
+    width: 17px;
+    background-color: var(--bg_elements);
+    border: 1px solid var(--accent_border);
+
+    &:after {
+        content: "";
+        position: absolute;
+        display: none;
+    }
 }
 
 .checkbox-container {
-  display: block;
+    display: block;
-  position: relative;
+    position: relative;
-  margin-bottom: 5px;
+    margin-bottom: 5px;
-  cursor: pointer;
-  user-select: none;
-  padding-right: 22px;
-
-  input {
-    position: absolute;
-    opacity: 0;
     cursor: pointer;
-    height: 0;
+    user-select: none;
-    width: 0;
+    padding-right: 22px;
 
-    &:checked ~ .checkbox:after {
+    input {
-      display: block;
+        position: absolute;
+        opacity: 0;
+        cursor: pointer;
+        height: 0;
+        width: 0;
+
+        &:checked ~ .checkbox:after {
+            display: block;
+        }
     }
-  }
 
-  &:hover input ~ .checkbox {
+    &:hover input ~ .checkbox {
-    border-color: var(--accent);
+        border-color: var(--accent);
-  }
+    }
 
-  &:active input ~ .checkbox {
+    &:active input ~ .checkbox {
-    border-color: var(--accent_light);
+        border-color: var(--accent_light);
-  }
+    }
 
-  .checkbox:after {
+    .checkbox:after {
-    left: 2px;
+        left: 2px;
-    bottom: 0;
+        bottom: 0;
-    font-size: 13px;
+        font-size: 13px;
-    font-family: $font_1;
+        font-family: $font_4;
-    content: "\e811";
+        content: '\e803';
-  }
+    }
 }
 
 .pref-group {
-  display: inline;
+    display: inline;
 }
 
 .preferences {
-  button {
+    button {
-    margin: 6px 0 3px 0;
+        margin: 6px 0 3px 0;
-  }
+    }
 
-  label {
+    label {
-    padding-right: 150px;
+        padding-right: 150px;
-  }
+    }
 
-  select {
+    select {
-    position: absolute;
+        position: absolute;
-    top: 0;
+        top: 0;
-    right: 0;
+        right: 0;
-    display: block;
+        display: block;
-    -moz-appearance: none;
+        -moz-appearance: none;
-    -webkit-appearance: none;
+        -webkit-appearance: none;
-    appearance: none;
+        appearance: none;
-    min-width: 100px;
+    }
-  }
 
-  input[type="text"],
+    input[type="text"] {
-  input[type="number"] {
+        position: absolute;
-    position: absolute;
+        right: 0;
-    right: 0;
+        max-width: 140px;
-    max-width: 140px;
+    }
-  }
 
-  .pref-group {
+    .pref-group {
-    display: block;
+        display: block;
-  }
+    }
 
-  .pref-input {
+    .pref-input {
-    position: relative;
+        position: relative;
-    margin-bottom: 6px;
+        margin-bottom: 6px;
-  }
+    }
 
-  .pref-reset {
+    .pref-reset {
-    float: left;
+        float: left;
-  }
+    }
-
-  .prefs-code {
-    background-color: var(--bg_elements);
-    border: 1px solid var(--accent_border);
-    color: var(--fg_color);
-    font-size: 13px;
-    padding: 6px 8px;
-    margin: 4px 0;
-    word-break: break-all;
-    white-space: pre-wrap;
-    user-select: all;
-  }
 }

src/sass/navbar.scss

@@ -1,90 +1,88 @@
-@import "_variables";
+@import '_variables';
 
 nav {
-  display: flex;
+    display: flex;
-  align-items: center;
+    align-items: center;
-  background-color: var(--bg_overlays);
-  box-shadow: 0 0 4px $shadow;
-  padding: 0;
-  width: 100%;
-  height: 50px;
-  z-index: 1000;
-  font-size: 16px;
-
-  a,
-  .icon-button button {
-    color: var(--fg_nav);
-  }
-
-  body.fixed-nav & {
     position: fixed;
-  }
+    background-color: var(--bg_overlays);
+    box-shadow: 0 0 4px $shadow;
+    padding: 0;
+    width: 100%;
+    height: 50px;
+    z-index: 1000;
+    font-size: 16px;
+
+    a, .icon-button button {
+        color: var(--fg_nav);
+    }
 }
 
 .inner-nav {
-  margin: auto;
+    margin: auto;
-  box-sizing: border-box;
+    box-sizing: border-box;
-  padding: 0 10px;
+    padding: 0 10px;
-  display: flex;
+    display: flex;
-  align-items: center;
+    align-items: center;
-  flex-basis: 920px;
+    flex-basis: 920px;
-  height: 50px;
+    height: 50px;
 }
 
 .site-name {
-  font-size: 15px;
+    font-size: 15px;
-  font-weight: 600;
+    font-weight: 600;
-  line-height: 1;
+    line-height: 1;
 
-  &:hover {
+    &:hover {
-    color: var(--accent_light);
+        color: var(--accent_light);
-    text-decoration: unset;
+        text-decoration: unset;
-  }
+    }
 }
 
 .site-logo {
-  display: block;
+    display: block;
-  width: 35px;
+    width: 35px;
-  height: 35px;
+    height: 35px;
 }
 
 .nav-item {
-  display: flex;
+    display: flex;
-  flex: 1;
+    flex: 1;
-  line-height: 50px;
+    line-height: 50px;
-  height: 50px;
+    height: 50px;
-  overflow: hidden;
+    overflow: hidden;
-  flex-wrap: wrap;
+    flex-wrap: wrap;
-  align-items: center;
+    align-items: center;
 
-  &.right {
+    &.right {
-    text-align: right;
+        text-align: right;
-    justify-content: flex-end;
+        justify-content: flex-end;
-  }
+    }
 
-  &.right a:hover {
+    &.right a {
-    color: var(--accent_light);
+        padding-left: 4px;
-    text-decoration: unset;
+
-  }
+        &:hover {
+            color: var(--accent_light);
+            text-decoration: unset;
+        }
+    }
 }
 
 .lp {
-  height: 14px;
+    height: 14px;
-  display: inline-block;
+    margin-top: 2px;
-  position: relative;
+    display: block;
-  top: 2px;
+    fill: var(--fg_nav);
-  fill: var(--fg_nav);
 
-  &:hover {
+    &:hover {
-    fill: var(--accent_light);
+        fill: var(--accent_light);
-  }
+    }
 }
 
-.icon-info {
+.icon-info:before {
-  margin: 0 -3px;
+    margin: 0 -3px;
 }
 
 .icon-cog {
-  font-size: 15px;
+    font-size: 15px;
-  padding-left: 0 !important;
 }

src/sass/profile/_base.scss

@@ -1,118 +1,83 @@
-@import "_variables";
+@import '_variables';
-@import "_mixins";
+@import '_mixins';
 
-@import "card";
+@import 'card';
-@import "about-account";
+@import 'photo-rail';
-@import "photo-rail";
-@import "community";
 
 .profile-tabs {
-  @include panel(auto, 900px);
+    @include panel(auto, 900px);
 
-  .timeline-container {
+    .timeline-container {
-    float: right;
+        float: right;
-    width: 68% !important;
+        width: 68% !important;
-    max-width: unset;
+        max-width: unset;
-  }
+    }
 }
 
 .profile-banner {
-  margin-bottom: 4px;
+    margin-bottom: 4px;
-  background-color: var(--bg_panel);
+    background-color: var(--bg_panel);
 
-  a {
+    a {
-    display: block;
+        display: block;
-    position: relative;
+        position: relative;
-    padding: 33.34% 0 0 0;
+        padding: 33.34% 0 0 0;
-  }
+    }
 
-  img {
+    img {
-    max-width: 100%;
+        max-width: 100%;
-    position: absolute;
+        position: absolute;
-    top: 0;
+        top: 0;
-  }
+    }
 }
 
 .profile-tab {
-  padding: 0 4px 0 0;
+    padding: 0 4px 0 0;
-  box-sizing: border-box;
+    box-sizing: border-box;
-  display: inline-block;
+    display: inline-block;
-  font-size: 14px;
+    font-size: 14px;
-  text-align: left;
+    text-align: left;
-  vertical-align: top;
+    vertical-align: top;
-  max-width: 32%;
+    max-width: 32%;
-  top: 0;
-
-  body.fixed-nav & {
     top: 50px;
-  }
 }
 
 .profile-result {
-  min-height: 54px;
+    min-height: 54px;
 
-  .username {
+    .username {
-    margin: 0 !important;
+        margin: 0 !important;
-  }
+    }
 
-  .tweet-header {
+    .tweet-header {
-    margin-bottom: unset;
+        margin-bottom: unset;
-  }
+    }
 }
 
-.profile-tabs.media-only {
+@media(max-width: 700px) {
-  max-width: none;
+    .profile-tabs {
-  width: 100%;
+        width: 100vw;
+        max-width: 600px;
 
-  .timeline-container {
+        .timeline-container {
-    float: none;
+            width: 100% !important;
-    width: 100% !important;
-    max-width: none;
-    padding: 0 10px;
-    box-sizing: border-box;
-  }
 
-  .timeline-container > .tab {
+            .tab-item wide {
-    max-width: 900px;
+                flex-grow: 1.4;
-    margin-left: auto;
+            }
-    margin-right: auto;
+        }
-  }
-}
-
-@media (max-width: 700px) {
-  .profile-tabs {
-    width: 100vw;
-    max-width: 600px;
-
-    .timeline-container {
-      width: 100% !important;
-
-      .tab-item wide {
-        flex-grow: 1.4;
-      }
     }
-  }
 
-  .profile-tabs.media-only {
+    .profile-tab {
-    width: 100%;
+        width: 100%;
-    max-width: none;
+        max-width: unset;
-
+        position: initial !important;
-    .timeline-container {
+        padding: 0;
-      width: 100vw !important;
-      padding: 0;
     }
-  }
-
-  .profile-tab {
-    width: 100%;
-    max-width: unset;
-    position: initial !important;
-    padding: 0;
-  }
 }
 
 @media (min-height: 900px) {
-  .profile-tab.sticky {
+    .profile-tab.sticky {
-    position: sticky;
+        position: sticky;
-  }
+    }
 }

src/sass/profile/_community.scss

@@ -1,203 +0,0 @@
-.community-header {
-  padding: 12px 15px;
-  border-bottom: 1px solid var(--border_grey);
-  background-color: var(--bg_panel);
-
-  .community-name {
-    font-size: 22px;
-    margin-bottom: 6px;
-
-    a {
-      color: inherit;
-    }
-  }
-
-  .community-category {
-    display: inline-block;
-    background-color: var(--bg_elements);
-    border: 1px solid var(--border_grey);
-    border-radius: 16px;
-    padding: 2px 12px;
-    font-size: 13px;
-    color: var(--fg_faded);
-    margin-bottom: 8px;
-  }
-
-  .community-description {
-    color: var(--fg_faded);
-    margin-bottom: 8px;
-    line-height: 1.4;
-  }
-
-  .community-member-count {
-    font-weight: bold;
-    color: inherit;
-  }
-
-  .community-stats {
-    color: var(--grey);
-    font-size: 14px;
-  }
-}
-
-.community-about {
-  padding: 16px 15px 15px;
-  background-color: var(--bg_panel);
-
-  h2 {
-    font-size: 18px;
-    margin: 0 0 12px;
-  }
-
-  .community-info {
-    border-bottom: 1px solid var(--border_grey);
-    padding-bottom: 12px;
-  }
-
-  .community-info-item {
-    display: flex;
-    gap: 10px;
-    padding: 8px 0;
-    align-items: center;
-
-    .verified-icon {
-      margin-left: 2px;
-    }
-
-    > .icon-container {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      font-size: 16px;
-      color: var(--grey);
-      flex-shrink: 0;
-      width: 26px;
-      height: 26px;
-    }
-
-    strong {
-      color: var(--fg_color);
-    }
-
-    a {
-      color: var(--accent);
-    }
-  }
-
-  .community-rules {
-    border-bottom: 1px solid var(--border_grey);
-    padding: 16px 0 12px;
-  }
-
-  .community-rules-intro {
-    color: var(--fg_faded);
-    font-size: 14px;
-    margin: 0 0 12px;
-  }
-
-  .community-rule {
-    display: flex;
-    gap: 10px;
-    padding: 10px 0;
-    align-items: flex-start;
-
-    .community-rule-number {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      min-width: 26px;
-      height: 26px;
-      border-radius: 50%;
-      background-color: var(--accent);
-      color: var(--fg_color);
-      font-weight: bold;
-      font-size: 13px;
-      flex-shrink: 0;
-    }
-
-    .community-rule-content p {
-      margin: 4px 0 0;
-      color: var(--fg_faded);
-      font-size: 14px;
-    }
-  }
-
-  .community-moderators {
-    padding-top: 16px;
-
-    h2 {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-    }
-
-    .community-mods-link {
-      font-size: 14px;
-      font-weight: normal;
-      color: var(--accent);
-    }
-  }
-
-  .community-moderator {
-    display: flex;
-    gap: 10px;
-    padding: 8px 0;
-    align-items: center;
-
-    .community-mod-avatar {
-      width: 40px;
-      height: 40px;
-      border-radius: 50%;
-    }
-
-    .community-mod-info {
-      display: flex;
-      flex-direction: column;
-    }
-
-    .community-mod-name {
-      display: flex;
-      align-items: center;
-      font-weight: bold;
-      color: var(--fg_color);
-
-      .verified-icon {
-        margin-left: 2px;
-      }
-    }
-
-    .community-mod-username {
-      color: var(--fg_faded);
-      font-size: 14px;
-    }
-  }
-}
-
-.community-tags {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 8px;
-  padding: 10px 15px;
-  border-bottom: 1px solid var(--border_grey);
-
-  .community-tag {
-    display: inline-block;
-    background-color: var(--bg_elements);
-    border: 1px solid var(--border_grey);
-    border-radius: 16px;
-    padding: 4px 12px;
-    font-size: 13px;
-    color: var(--accent);
-  }
-}
-
-.community-hashtag-header {
-  padding: 12px 15px;
-  border-bottom: 1px solid var(--border_grey);
-
-  .community-hashtag-title {
-    font-size: 20px;
-    color: var(--accent);
-    margin: 0;
-  }
-}

src/sass/profile/about-account.scss

@@ -1,71 +0,0 @@
-@import '_variables';
-
-.about-account {
-    max-width: 500px;
-    width: 100%;
-    margin: 20px auto 0;
-    align-self: flex-start;
-    background: var(--bg_panel);
-    border-radius: 4px;
-    padding: 12px 20px 20px;
-}
-
-.about-account-header {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    margin-bottom: 16px;
-    padding-bottom: 14px;
-    border-bottom: 1px solid var(--border_grey);
-}
-
-.about-account-avatar img {
-    width: 72px;
-    height: 72px;
-    border-radius: 50%;
-    margin-bottom: 4px;
-}
-
-.about-account-name {
-    @include breakable;
-    font-weight: bold;
-}
-
-.about-account-body {
-    display: flex;
-    flex-direction: column;
-    gap: 14px;
-}
-
-.about-account-at {
-    font-size: 18px;
-    font-weight: bold;
-}
-
-.about-account-row {
-    display: flex;
-    align-items: center;
-    gap: 10px;
-
-    > span:first-child {
-        color: var(--fg_faded);
-        flex-shrink: 0;
-    }
-
-    > div {
-        display: flex;
-        flex-direction: column;
-    }
-}
-
-.about-account-label {
-    color: var(--fg_faded);
-    font-size: 13px;
-}
-
-@media(max-width: 700px) {
-    .about-account {
-        max-width: none;
-        margin: 10px;
-    }
-}

src/sass/profile/card.scss

@@ -115,7 +115,7 @@
     }
 
     .profile-card-tabs-name {
-        flex-shrink: 100;
+        @include breakable;
     }
 
     .profile-card-avatar {

src/sass/search.scss

@@ -1,194 +1,120 @@
-@import "_variables";
+@import '_variables';
-@import "_mixins";
+@import '_mixins';
 
 .search-title {
-  font-weight: bold;
+    font-weight: bold;
-  display: inline-block;
+    display: inline-block;
-  margin-top: 4px;
+    margin-top: 4px;
 }
 
 .search-field {
-  display: flex;
-  flex-wrap: wrap;
-
-  button {
-    margin: 0 2px 0 0;
-    padding: 0px 1px 1px 4px;
-    height: 23px;
     display: flex;
-    align-items: center;
+    flex-wrap: wrap;
-  }
 
-  .pref-input {
+    button {
-    margin: 0 4px 0 0;
+        margin: 0 2px 0 0;
-    flex-grow: 1;
+        height: 23px;
-    height: 23px;
+    }
-  }
 
-  input[type="text"],
+    .pref-input {
-  input[type="number"] {
+        margin: 0 4px 0 0;
-    height: calc(100% - 4px);
+        flex-grow: 1;
-    width: calc(100% - 8px);
+        height: 23px;
-  }
+    }
 
-  > label {
+    input[type="text"] {
-    display: inline;
+        height: calc(100% - 4px);
-    background-color: var(--bg_elements);
+        width: calc(100% - 8px);
-    color: var(--fg_color);
+    }
-    border: 1px solid var(--accent_border);
-    padding: 1px 1px 2px 4px;
-    font-size: 14px;
-    cursor: pointer;
-    margin-bottom: 2px;
 
-    @include input-colors;
+    > label {
-  }
+        display: inline;
+        background-color: var(--bg_elements);
+        color: var(--fg_color);
+        border: 1px solid var(--accent_border);
+        padding: 1px 6px 2px 6px;
+        font-size: 14px;
+        cursor: pointer;
+        margin-bottom: 2px;
 
-  @include create-toggle(search-panel, 380px);
+        @include input-colors;
+    }
+
+    @include create-toggle(search-panel, 200px);
 }
 
 .search-panel {
-  width: 100%;
+    width: 100%;
-  max-height: 0;
+    max-height: 0;
-  overflow: hidden;
+    overflow: hidden;
-  transition: max-height 0.4s;
+    transition: max-height 0.4s;
 
-  flex-grow: 1;
+    flex-grow: 1;
-  font-weight: initial;
+    font-weight: initial;
-  text-align: left;
+    text-align: left;
 
-  .checkbox-container {
+    > div {
-    display: inline;
+        line-height: 1.7em;
-    padding-right: unset;
+    }
-    margin-bottom: 5px;
-    margin-left: 23px;
-  }
 
-  .checkbox {
+    .checkbox-container {
-    right: unset;
+        display: inline;
-    left: -22px;
+        padding-right: unset;
-    line-height: 1.6em;
+        margin-bottom: unset;
-  }
+        margin-left: 23px;
+    }
 
-  .checkbox-container .checkbox:after {
+    .checkbox {
-    top: -4px;
+        right: unset;
-  }
+        left: -22px;
+    }
+
+    .checkbox-container .checkbox:after {
+        top: -4px;
+    }
 }
 
 .search-row {
-  display: flex;
+    display: flex;
-  flex-wrap: wrap;
+    flex-wrap: wrap;
-  line-height: unset;
+    line-height: unset;
 
-  > div {
+    > div {
-    flex-grow: 1;
+        flex-grow: 1;
-    flex-shrink: 1;
+        flex-shrink: 1;
-  }
+    }
-
-  input {
-    height: 21px;
-  }
-
-  .pref-input {
-    display: block;
-    padding-bottom: 5px;
 
     input {
-      height: 21px;
+        height: 21px;
-      margin-top: 1px;
+    }
+
+    .pref-input {
+        display: block;
+        padding-bottom: 5px;
+
+        input {
+            height: 21px;
+            margin-top: 1px;
+        }
     }
-  }
 }
 
 .search-toggles {
-  flex-grow: 1;
+    flex-grow: 1;
-  display: grid;
+    display: grid;
-  grid-template-columns: repeat(5, auto);
+    grid-template-columns: repeat(6, auto);
-  grid-column-gap: 10px;
+    grid-column-gap: 10px;
-}
-
-.list-result {
-  display: flex;
-  align-items: flex-start;
-
-  .list-result-banner {
-    flex-shrink: 0;
-    width: 56px;
-    height: 56px;
-    margin-right: 10px;
-    border-radius: 8px;
-    overflow: hidden;
-    background-color: var(--darker_grey);
-    // stay above the tweet-link overlay's hover background
-    z-index: 1;
-
-    img {
-      width: 100%;
-      height: 100%;
-      object-fit: cover;
-    }
-  }
-
-  .list-result-body {
-    min-width: 0;
-    pointer-events: none;
-    z-index: 1;
-
-    a {
-      pointer-events: all;
-    }
-  }
-
-  .list-result-title {
-    align-items: baseline;
-  }
-
-  .list-members {
-    flex-shrink: 0;
-    margin-left: 0.3em;
-    color: var(--fg_faded);
-  }
-
-  .list-result-context {
-    display: flex;
-    align-items: center;
-    flex-wrap: wrap;
-    margin-top: 2px;
-    color: var(--fg_faded);
-
-    a {
-      color: var(--fg_dark);
-    }
-
-    a.fullname {
-      color: var(--fg_color);
-    }
-
-    .list-facepile {
-      width: 20px;
-      height: 20px;
-      border-radius: 50%;
-      margin-right: 4px;
-    }
-  }
-
-  .list-result-description {
-    margin-top: 2px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    pointer-events: all;
-  }
 }
 
 .profile-tabs {
-  @include search-resize(820px, 5);
+    @include search-resize(820px, 5);
-  @include search-resize(715px, 4);
+    @include search-resize(725px, 4);
-  @include search-resize(700px, 5);
+    @include search-resize(600px, 6);
-  @include search-resize(485px, 4);
+    @include search-resize(560px, 5);
-  @include search-resize(410px, 3);
+    @include search-resize(480px, 4);
+    @include search-resize(410px, 3);
 }
 
-@include search-resize(700px, 5);
+@include search-resize(560px, 5);
-@include search-resize(485px, 4);
+@include search-resize(480px, 4);
 @include search-resize(410px, 3);

src/sass/timeline.scss

@@ -1,505 +1,162 @@
-@import "_variables";
+@import '_variables';
 
 .timeline-container {
-  @include panel(100%, 600px);
+    @include panel(100%, 600px);
 }
 
-.timeline-container.media-only {
+.timeline {
-  max-width: none;
+    background-color: var(--bg_panel);
-  width: 100%;
-  padding: 0 10px;
-  box-sizing: border-box;
 
-  > .tab,
+    > div:not(:first-child) {
-  > .timeline-header {
+        border-top: 1px solid var(--border_grey);
-    max-width: 900px;
+    }
-    margin-left: auto;
-    margin-right: auto;
-  }
-}
-
-@media (max-width: 700px) {
-  .timeline-container.media-only {
-    padding: 0;
-  }
-}
-
-.timeline > div:not(:first-child) {
-  border-top: 1px solid var(--border_grey);
 }
 
 .timeline-header {
-  width: 100%;
+    width: 100%;
-  background-color: var(--bg_panel);
+    background-color: var(--bg_panel);
-  text-align: center;
+    text-align: center;
-  padding: 8px;
+    padding: 8px;
-  display: block;
+    display: block;
-  font-weight: bold;
+    font-weight: bold;
-  margin-bottom: 4px;
+    margin-bottom: 5px;
-  box-sizing: border-box;
+    box-sizing: border-box;
 
-  button {
+    button {
-    float: unset;
+        float: unset;
-  }
+    }
 }
 
 .timeline-banner img {
-  width: 100%;
+    width: 100%;
 }
 
 .timeline-description {
-  font-weight: normal;
+    font-weight: normal;
 }
 
 .tab {
-  align-items: center;
+    align-items: center;
-  display: flex;
+    display: flex;
-  flex-wrap: wrap;
+    flex-wrap: wrap;
-  list-style: none;
+    list-style: none;
-  margin: 0 0 4px 0;
+    margin: 0 0 5px 0;
-  background-color: var(--bg_panel);
+    background-color: var(--bg_panel);
-  padding: 0;
+    padding: 0;
 }
 
 .tab-item {
-  flex: 1 1 0;
+    flex: 1 1 0;
-  text-align: center;
+    text-align: center;
-  margin-top: 0;
+    margin-top: 0;
 
-  a {
+    a {
-    border-bottom: 0.1rem solid transparent;
+        border-bottom: .1rem solid transparent;
-    color: var(--tab);
+        color: var(--tab);
-    display: block;
+        display: block;
-    padding: 8px 0;
+        padding: 8px 0;
-    text-decoration: none;
+        text-decoration: none;
-    font-weight: bold;
+        font-weight: bold;
 
-    &:hover {
+        &:hover {
-      text-decoration: none;
+            text-decoration: none;
+        }
+
+        &.active {
+            border-bottom-color: var(--tab_selected);
+            color: var(--tab_selected);
+        }
     }
 
-    &.active {
+    &.active a {
-      border-bottom-color: var(--tab_selected);
+        border-bottom-color: var(--tab_selected);
-      color: var(--tab_selected);
+        color: var(--tab_selected);
     }
-  }
 
-  &.active a {
+    &.wide {
-    border-bottom-color: var(--tab_selected);
+        flex-grow: 1.2;
-    color: var(--tab_selected);
+        flex-basis: 50px;
-  }
+    }
-
-  &.wide {
-    flex-grow: 1.2;
-    flex-basis: 50px;
-  }
 }
 
 .timeline-footer {
-  background-color: var(--bg_panel);
+    background-color: var(--bg_panel);
-  padding: 6px 0;
+    padding: 6px 0;
 }
 
 .timeline-protected {
-  text-align: center;
+    text-align: center;
 
-  p {
+    p {
-    margin: 8px 0;
+        margin: 8px 0;
-  }
+    }
 
-  h2 {
+    h2 {
-    color: var(--accent);
+        color: var(--accent);
-    font-size: 20px;
+        font-size: 20px;
-    font-weight: 600;
+        font-weight: 600;
-  }
+    }
 }
 
 .timeline-none {
-  color: var(--accent);
+    color: var(--accent);
-  font-size: 20px;
+    font-size: 20px;
-  font-weight: 600;
+    font-weight: 600;
-  text-align: center;
+    text-align: center;
 }
 
 .timeline-end {
-  background-color: var(--bg_panel);
+    background-color: var(--bg_panel);
-  color: var(--accent);
+    color: var(--accent);
-  font-size: 16px;
+    font-size: 16px;
-  font-weight: 600;
+    font-weight: 600;
-  text-align: center;
+    text-align: center;
 }
 
 .show-more {
-  background-color: var(--bg_panel);
+    background-color: var(--bg_panel);
-  text-align: center;
+    text-align: center;
-  padding: 0.75em 0;
+    padding: .75em 0;
-  display: block !important;
+    display: block !important;
 
-  a {
+    a {
-    background-color: var(--darkest_grey);
+        background-color: var(--darkest_grey);
-    display: inline-block;
+        display: inline-block;
-    height: 2em;
+        height: 2em;
-    padding: 0 2em;
+        padding: 0 2em;
-    line-height: 2em;
+        line-height: 2em;
 
-    &:hover {
+        &:hover {
-      background-color: var(--darker_grey);
+            background-color: var(--darker_grey);
+        }
     }
-  }
 }
 
 .top-ref {
-  background-color: var(--bg_color);
+    background-color: var(--bg_color);
-  border-top: none !important;
+    border-top: none !important;
 
-  .icon-down {
+    .icon-down {
-    font-size: 20px;
+        font-size: 20px;
-    display: flex;
+        display: flex;
-    justify-content: center;
+        justify-content: center;
-    text-decoration: none;
+        text-decoration: none;
 
-    &:hover {
+        &:hover {
-      color: var(--accent_light);
+            color: var(--accent_light);
+        }
+
+        &::before {
+            transform: rotate(180deg) translateY(-1px);
+        }
     }
-
-    &::before {
-      transform: rotate(180deg) translateY(-1px);
-    }
-  }
 }
 
 .timeline-item {
-  overflow-wrap: break-word;
+    overflow-wrap: break-word;
-  border-left-width: 0;
+    border-left-width: 0;
-  min-width: 0;
+    min-width: 0;
-  padding: 0.75em;
+    padding: .75em;
-  display: flex;
+    display: flex;
-  position: relative;
-  background-color: var(--bg_panel);
-}
-
-.timeline.media-grid-view,
-.timeline.media-gallery-view {
-  > div:not(:first-child) {
-    border-top: none;
-  }
-
-  .timeline-item::before {
-    display: none;
-  }
-}
-
-.timeline.media-grid-view,
-.timeline.media-gallery-view .gallery-masonry.compact {
-  .tweet-header,
-  .replying-to,
-  .retweet-header,
-  .pinned,
-  .tweet-stats,
-  .attribution,
-  .poll,
-  .quote,
-  .community-note,
-  .media-tag-block,
-  .tweet-content,
-  .card-content {
-    display: none;
-  }
-
-  .card {
-    margin: unset;
-
-    .card-container {
-      border: unset;
-      border-radius: unset;
-
-      .card-image-container {
-        width: 100%;
-        min-height: 100%;
-      }
-
-      .card-content-container {
-        display: none;
-      }
-    }
-  }
-}
-
-.timeline.media-grid-view {
-  display: grid;
-  gap: 4px;
-  grid-template-columns: repeat(3, minmax(0, 1fr));
-
-  > div:not(:first-child) {
-    margin-top: 0;
-  }
-
-  .timeline-item {
-    padding: 0;
-  }
-
-  .tweet-link {
-    z-index: 1000;
-
-    &:hover {
-      background-color: unset;
-    }
-  }
-
-  > .show-more,
-  > .top-ref,
-  > .timeline-footer,
-  > .timeline-header {
-    grid-column: 1 / -1;
-  }
-
-  .tweet-body {
-    height: 100%;
-    margin-left: 0;
-    padding: 0;
     position: relative;
-    aspect-ratio: 1/1;
-  }
-
-  .gallery-row + .gallery-row {
-    margin-top: 0.25em !important;
-  }
-
-  .attachments {
-    background-color: var(--darkest_grey);
-    border-radius: 0;
-    margin: 0;
-    max-height: none;
-  }
-
-  .attachments,
-  .gallery-row,
-  .still-image {
-    height: 100%;
-    width: 100%;
-  }
-
-  .still-image img,
-  .attachment > video,
-  .attachment > img {
-    object-fit: cover;
-    height: 100%;
-    width: 100%;
-  }
-
-  .attachment {
-    display: flex;
-    align-items: center;
-  }
-
-  .gallery-video {
-    height: 100%;
-  }
-
-  .media-gif {
-    display: flex;
-  }
-
-  .timeline-item:hover {
-    opacity: 0.85;
-  }
-
-  .alt-text {
-    display: none;
-  }
-}
-
-.timeline.media-gallery-view {
-  .gallery-masonry {
-    margin: 10px 0;
-    column-gap: 10px;
-    column-width: unquote("clamp(190px, 22vw, 350px)");
-
-    &[data-col-size="small"] {
-      column-width: unquote("max(130px, 11vw)");
-    }
-
-    &[data-col-size="large"] {
-      column-width: unquote("clamp(350px, 22vw, 480px)");
-    }
-
-    &.masonry-active {
-      column-width: unset;
-      column-gap: unset;
-      position: relative;
-
-      .timeline-item {
-        animation: none;
-        position: absolute;
-        box-sizing: border-box;
-        margin-bottom: 0;
-      }
-    }
-
-    &.compact {
-      .tweet-body {
-        padding: 0;
-
-        > .attachments {
-          margin: 0;
-        }
-      }
-
-      .card-image-container img {
-        max-height: unset;
-      }
-    }
-  }
-
-  @keyframes masonry-init {
-    to {
-      opacity: 1;
-      pointer-events: auto;
-    }
-  }
-
-  // Start hidden. CSS animation reveals after a delay as a no-JS fallback.
-  // With JS, masonry-active cancels the animation and masonry-visible reveals.
-  .gallery-masonry .timeline-item,
-  > .show-more,
-  > .top-ref,
-  > .timeline-footer {
-    opacity: 0;
-    pointer-events: none;
-    animation: masonry-init 0.2s 0.3s forwards;
-  }
-
-  .gallery-masonry.masonry-active .timeline-item.masonry-visible,
-  > .show-more.masonry-visible,
-  > .top-ref.masonry-visible,
-  > .timeline-footer.masonry-visible {
-    opacity: 1;
-    pointer-events: auto;
-    transition: opacity 0.15s ease;
-    animation: none;
-  }
-
-  .timeline-item {
-    margin-bottom: 10px;
-    break-inside: avoid;
-    flex-direction: column;
-    padding: 0;
-  }
-
-  > .show-more,
-  > .top-ref,
-  > .timeline-footer,
-  > .timeline-header {
-    margin-left: auto;
-    margin-right: auto;
-    max-width: 900px;
-  }
-
-  > .show-more {
-    padding: 0;
-    margin-top: 8px;
-    background-color: unset;
-  }
-
-  .tweet-content {
-    margin: 3px 0;
-  }
-
-  .tweet-body {
-    display: flex;
-    flex-direction: column;
-    height: 100%;
-    margin-left: 0;
-    padding: 10px;
-
-    > .attachments {
-      align-self: stretch;
-      border-radius: 0;
-      margin: -10px -10px 10px;
-      max-height: none;
-      order: -1;
-      width: auto;
-      background-color: var(--bg_elements);
-
-      .gallery-row {
-        max-height: none;
-        max-width: none;
-        align-items: center;
-      }
-
-      .still-image img,
-      .attachment > video,
-      .attachment > img {
-        max-height: none;
-        width: 100%;
-      }
-
-      .attachment:last-child {
-        max-height: none;
-      }
-
-      .card-container {
-        border: unset;
-        border-radius: unset;
-      }
-    }
-
-    .tweet-stat {
-      padding-top: unset;
-    }
-
-    .quote {
-      margin-bottom: 5px;
-      margin-top: 5px;
-    }
-
-    .replying-to {
-      margin: 0;
-    }
-  }
-
-  .tweet-header {
-    align-items: flex-start;
-    display: flex;
-    gap: 0.75em;
-    margin-bottom: 0;
-
-    .tweet-avatar {
-      img {
-        float: none;
-        height: 42px;
-        margin: 0;
-        width: 42px;
-      }
-    }
-
-    .tweet-name-row {
-      flex: 1;
-    }
-
-    .fullname-and-username {
-      flex-wrap: wrap;
-    }
-
-    .fullname {
-      max-width: calc(100% - 18px);
-    }
-
-    .verified-icon {
-      margin-left: 4px;
-      margin-top: 1px;
-    }
-
-    .username {
-      display: block;
-      flex-basis: 100%;
-      margin-left: 0;
-    }
-  }
-}
-
-@media (max-width: 520px) {
-  .timeline.media-gallery-view {
-    padding: 8px 0;
-  }
 }

src/sass/tweet/_base.scss

@@ -1,284 +1,240 @@
-@import "_variables";
+@import '_variables';
-@import "_mixins";
+@import '_mixins';
-@import "thread";
+@import 'thread';
-@import "media";
+@import 'media';
-@import "video";
+@import 'video';
-@import "embed";
+@import 'embed';
-@import "card";
+@import 'card';
-@import "poll";
+@import 'poll';
-@import "quote";
+@import 'quote';
 
 .tweet-body {
-  flex: 1;
+    flex: 1;
-  min-width: 0;
+    min-width: 0;
-  margin-left: 58px;
+    margin-left: 58px;
-  pointer-events: none;
+    pointer-events: none;
-  z-index: 1;
+    z-index: 1;
 }
 
 .tweet-content {
-  line-height: 1.3em;
+    font-family: $font_3;
-  pointer-events: all;
+    line-height: 1.3em;
-  display: inline;
+    pointer-events: all;
+    display: inline;
 }
 
 .tweet-bidi {
-  display: block !important;
+    display: block !important;
 }
 
 .tweet-header {
-  padding: 0;
+    padding: 0;
-  vertical-align: bottom;
+    vertical-align: bottom;
-  flex-basis: 100%;
+    flex-basis: 100%;
-  margin-bottom: 0.2em;
+    margin-bottom: .2em;
 
-  a {
+    a {
-    display: inline-block;
+        display: inline-block;
-    word-break: break-all;
+        word-break: break-all;
-    max-width: 100%;
+        max-width: 100%;
-    pointer-events: all;
+        pointer-events: all;
-  }
+    }
 }
 
 .tweet-name-row {
-  padding: 0;
+    padding: 0;
-  display: flex;
+    display: flex;
-  justify-content: space-between;
+    justify-content: space-between;
-
-  .verified-icon {
-    margin-left: 2px;
-  }
 }
 
 .fullname-and-username {
-  display: flex;
+    display: flex;
-  min-width: 0;
+    min-width: 0;
 }
 
 .fullname {
-  @include ellipsis;
+    @include ellipsis;
-  flex-shrink: 2;
+    flex-shrink: 2;
-  max-width: 80%;
+    max-width: 80%;
-  font-size: 14px;
+    font-size: 14px;
-  font-weight: 700;
+    font-weight: 700;
-  color: var(--fg_color);
+    color: var(--fg_color);
 }
 
 .username {
-  @include ellipsis;
+    @include ellipsis;
-  min-width: 1.6em;
+    min-width: 1.6em;
-  margin-left: 0.4em;
+    margin-left: .4em;
-  word-wrap: normal;
+    word-wrap: normal;
 }
 
 .tweet-date {
-  display: flex;
+    display: flex;
-  flex-shrink: 0;
+    flex-shrink: 0;
-  margin-left: 4px;
+    margin-left: 4px;
 }
 
-.tweet-date a,
+.tweet-date a, .username, .show-more a {
-.username,
+    color: var(--fg_dark);
-.show-more a {
-  color: var(--fg_dark);
 }
 
 .tweet-published {
-  margin-top: 6px;
+    margin: 0;
-  margin-bottom: 0px;
+    margin-top: 5px;
-  color: var(--grey);
+    color: var(--grey);
+    pointer-events: all;
 }
 
 .tweet-avatar {
-  display: contents !important;
+    display: contents !important;
 
-  img {
+    img {
-    float: left;
+        float: left;
-    margin-top: 3px;
+        margin-top: 3px;
-    margin-left: -58px;
+        margin-left: -58px;
-    width: 48px;
+        width: 48px;
-    height: 48px;
+        height: 48px;
-  }
+    }
 }
 
 .avatar {
-  &.round {
+    &.round {
-    border-radius: 50%;
+        border-radius: 50%;
-    user-select: none;
+        -webkit-user-select: none;
-    -webkit-user-select: none;
+    }
-  }
     
-  &.mini {
+    &.mini {
-    position: unset;
+        position: unset;
-    margin-right: 5px;
+        margin-right: 5px;
-    margin-top: -1px;
+        margin-top: -1px;
-    width: 20px;
+        width: 20px;
-    height: 20px;
+        height: 20px;
-  }
+    }
+}
+
+.tweet-embed {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    height: 100%;
+    background-color: var(--bg_panel);
+
+    .tweet-content { 
+        font-size: 18px;
+    }
+    
+    .tweet-body {
+        display: flex;
+        flex-direction: column;
+        max-height: calc(100vh - 0.75em * 2);
+    }
+
+    .card-image img {
+        height: auto;
+    }
+    
+    .avatar {
+        position: absolute;
+    }
 }
 
 .attribution {
-  display: flex;
+    display: flex;
-  pointer-events: all;
+    pointer-events: all;
-  margin: 5px 0;
+    margin: 5px 0;
 
-  strong {
+    strong {
-    color: var(--fg_color);
+        color: var(--fg_color);
-  }
+    }
 }
 
 .media-tag-block {
-  padding-top: 5px;
+    padding-top: 5px;
-  pointer-events: all;
+    pointer-events: all;
-  color: var(--fg_faded);
-
-  .icon-container {
-    padding-right: 2px;
-  }
-
-  .media-tag,
-  .icon-container {
     color: var(--fg_faded);
-  }
+
+    .icon-container {
+        padding-right: 2px;
+    }
+
+    .media-tag, .icon-container {
+        color: var(--fg_faded);
+    }
 }
 
 .timeline-container .media-tag-block {
-  font-size: 13px;
+    font-size: 13px;
 }
 
 .tweet-geo {
-  color: var(--fg_faded);
+    color: var(--fg_faded);
 }
 
 .replying-to {
-  color: var(--fg_faded);
+    color: var(--fg_faded);
-  margin: -2px 0 4px;
+    margin: -2px 0 4px;
 
-  a {
+    a {
-    pointer-events: all;
+        pointer-events: all;
-  }
+    }
 }
 
-.retweet-header,
+.retweet-header, .pinned, .tweet-stats {
-.pinned,
+    align-content: center;
-.tweet-stats {
+    color: var(--grey);
-  align-content: center;
+    display: flex;
-  color: var(--grey);
+    flex-shrink: 0;
-  display: flex;
+    flex-wrap: wrap;
-  flex-shrink: 0;
+    font-size: 14px;
-  flex-wrap: wrap;
+    font-weight: 600;
-  font-size: 14px;
+    line-height: 22px;
-  font-weight: 600;
-  line-height: 22px;
 
-  span {
+    span {
-    @include ellipsis;
+        @include ellipsis;
-  }
+    }
 }
 
 .retweet-header {
-  margin-top: -5px !important;
+    margin-top: -5px !important;
 }
 
 .tweet-stats {
-  margin-bottom: -3px;
+    margin-bottom: -3px;
-  user-select: none;
+    -webkit-user-select: none;
-  -webkit-user-select: none;
 }
 
 .tweet-stat {
-  padding-top: 5px;
+    padding-top: 5px;
-  min-width: 1em;
+    min-width: 1em;
-  margin-right: 0.8em;
+    margin-right: 0.8em;
 }
 
 .show-thread {
-  display: block;
+    display: block;
-  pointer-events: all;
+    pointer-events: all;
-  padding-top: 2px;
+    padding-top: 2px;
 }
 
 .unavailable-box {
-  width: 100%;
+    width: 100%;
-  height: 100%;
+    height: 100%;
-  padding: 12px;
+    padding: 12px;
-  border: solid 1px var(--dark_grey);
+    border: solid 1px var(--dark_grey);
-  box-sizing: border-box;
+    box-sizing: border-box;
-  border-radius: 10px;
+    border-radius: 10px;
-  background-color: var(--bg_color);
+    background-color: var(--bg_color);
-  z-index: 2;
+    z-index: 2;
 }
 
 .tweet-link {
-  height: 100%;
+    height: 100%;
-  width: 100%;
+    width: 100%;
-  left: 0;
+    left: 0;
-  top: 0;
+    top: 0;
-  position: absolute;
+    position: absolute;
-  user-select: none;
+    -webkit-user-select: none;
-  -webkit-user-select: none;
 
-  &:hover {
+    &:hover {
-    background-color: var(--bg_hover);
+        background-color: var(--bg_hover);
-  }
+    }
-}
-
-.latest-post-version {
-  border-bottom: 1px solid var(--dark_grey);
-  border-top: 1px solid var(--dark_grey);
-  padding: 01ch 0px;
-  margin: 1ch 0px;
-  color: var(--grey);
-
-  a {
-    pointer-events: all;
-  }
-}
-
-.community-note {
-  background-color: var(--bg_elements);
-  margin-top: 10px;
-  border: solid 1px var(--dark_grey);
-  border-radius: 10px;
-  overflow: hidden;
-  pointer-events: all;
-
-  &:hover {
-    background-color: var(--bg_panel);
-    border-color: var(--grey);
-  }
-}
-
-.community-note-header {
-  background-color: var(--bg_hover);
-  font-weight: 700;
-  padding: 8px 10px;
-  padding-top: 6px;
-  display: flex;
-  align-items: center;
-  gap: 2px;
-
-  .icon-container {
-    flex-shrink: 0;
-    color: var(--accent);
-  }
-}
-
-.community-note-text {
-  white-space: pre-line;
-  padding: 10px 10px;
-  padding-top: 6px;
-}
-
-.disclosures {
-  display: flex;
-  flex-direction: column;
-  color: var(--grey);
-  font-size: 14px;
-  margin-top: 4px;
-  margin-bottom: -2px;
-
-  .icon-attention-circled {
-    margin-right: -3px;
-  }
 }

src/sass/tweet/card.scss

@@ -1,119 +1,118 @@
-@import "_variables";
+@import '_variables';
-@import "_mixins";
+@import '_mixins';
 
 .card {
-  margin: 5px 0;
+    margin: 5px 0;
-  pointer-events: all;
+    pointer-events: all;
-  max-height: unset;
+    max-height: unset;
 }
 
 .card-container {
-  border: solid 1px var(--dark_grey);
+    border-radius: 10px;
-  border-radius: 10px;
+    border-width: 1px;
-  background-color: var(--bg_elements);
+    border-style: solid;
-  overflow: hidden;
+    border-color: var(--dark_grey);
-  color: inherit;
+    background-color: var(--bg_elements);
-  display: flex;
+    overflow: hidden;
-  flex-direction: row;
+    color: inherit;
-  text-decoration: none !important;
+    display: flex;
+    flex-direction: row;
+    text-decoration: none !important;
 
-  &:hover {
+    &:hover {
-    border-color: var(--grey);
+        border-color: var(--grey);
-  }
+    }
 
-  .attachments {
+    .attachments {
-    margin: 0;
+        margin: 0;
-    border-radius: 0;
+        border-radius: 0;
-  }
+    }
 }
 
 .card-content {
-  padding: 0.5em;
+    padding: 0.5em;
 }
 
 .card-title {
-  @include ellipsis;
+    @include ellipsis;
-  white-space: unset;
+    white-space: unset;
-  font-weight: bold;
+    font-weight: bold;
-  font-size: 1.1em;
+    font-size: 1.1em;
 }
 
 .card-description {
-  margin: 0.3em 0;
+    margin: 0.3em 0;
-  white-space: pre-wrap;
 }
 
 .card-destination {
-  @include ellipsis;
+    @include ellipsis;
-  color: var(--grey);
+    color: var(--grey);
-  display: block;
+    display: block;
 }
 
 .card-content-container {
-  color: unset;
+    color: unset;
-  overflow: auto;
+    overflow: auto;
-
+    &:hover {
-  &:hover {
+        text-decoration: none;
-    text-decoration: none;
+    }
-  }
 }
 
 .card-image-container {
-  width: 98px;
+    width: 98px;
-  flex-shrink: 0;
+    flex-shrink: 0;
-  position: relative;
+    position: relative;
-  overflow: hidden;
+    overflow: hidden;
-
+    &:before {
-  &:before {
+        content: "";
-    content: "";
+        display: block;
-    display: block;
+        padding-top: 100%;
-    padding-top: 100%;
+    }
-  }
 }
 
 .card-image {
-  position: absolute;
+    position: absolute;
-  top: 0;
+    top: 0;
-  left: 0;
+    left: 0;
-  bottom: 0;
+    bottom: 0;
-  right: 0;
+    right: 0;
-  background-color: var(--bg_overlays);
+    background-color: var(--bg_overlays);
 
-  img {
+    img {
-    width: 100%;
+        width: 100%;
-    height: 100%;
+        height: 100%;
-    max-height: 400px;
+        max-height: 400px;
-    display: block;
+        display: block;
-    object-fit: cover;
+        object-fit: cover;
-  }
+    }
 }
 
 .card-overlay {
-  @include play-button;
+    @include play-button;
-  opacity: 0.8;
+    opacity: 0.8;
-  display: flex;
+    display: flex;
-  justify-content: center;
+    justify-content: center;
-  align-items: center;
+    align-items: center;
 }
 
 .large {
-  .card-container {
+    .card-container {
-    display: block;
+        display: block;
-  }
-
-  .card-image-container {
-    width: unset;
-
-    &:before {
-      display: none;
     }
-  }
 
-  .card-image {
+    .card-image-container {
-    position: unset;
+        width: unset;
-    border-style: solid;
+
-    border-color: var(--dark_grey);
+        &:before {
-    border-width: 0;
+            display: none;
-    border-bottom-width: 1px;
+        }
-  }
+    }
+
+    .card-image {
+        position: unset;
+        border-style: solid;
+        border-color: var(--dark_grey);
+        border-width: 0;
+        border-bottom-width: 1px;
+    }
 }

src/sass/tweet/embed.scss

@@ -1,159 +1,17 @@
-@import "_variables";
+@import '_variables';
-@import "_mixins";
+@import '_mixins';
 
-// Embed page: transparent background, no scrollbars
-html:has(body > .embed-wrapper),
-html:has(body > .embed-video) {
-  background: transparent;
-  overflow: hidden;
-
-  body {
-    background: transparent;
-    overflow: hidden;
-  }
-}
-
-// Tweet embed wrapper
-.embed-wrapper {
-  box-sizing: border-box;
-  border: 1px solid var(--border_grey);
-  border-radius: 12px;
-  overflow: hidden;
-
-  .embed-footer {
-    display: block;
-    padding: 12px 16px;
-    border-top: 1px solid var(--border_grey);
-    background: var(--bg_panel);
-    color: var(--accent);
-    font-size: 14px;
-    font-weight: 500;
-    text-align: center;
-    text-decoration: none;
-    transition: background-color 0.15s;
-
-    &:hover {
-      background: var(--bg_hover);
-    }
-  }
-}
-
-// Tweet embed content
-.tweet-embed {
-  position: relative;
-  background-color: var(--bg_panel);
-  transition: background-color 0.15s;
-
-  &:hover {
-    background-color: var(--bg_hover);
-  }
-
-  .timeline-item {
-    pointer-events: none;
-    background-color: transparent;
-  }
-
-  .tweet-link:hover {
-    background-color: transparent;
-  }
-
-  .tweet-content {
-    font-size: 18px;
-  }
-
-  .avatar:not(.mini) {
-    position: absolute;
-  }
-
-  // Cap media height in embeds
-  .still-image img,
-  .quote-media-container img,
-  .quote-media-container video {
-    max-height: 600px;
-  }
-
-  &.error-embed {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    min-height: 120px;
-    padding: 20px;
-
-    .error-panel {
-      margin: 0;
-    }
-  }
-}
-
-// Video-only embed
 .embed-video {
-  position: relative;
+    .gallery-video {
-  min-height: 300px;
+        width: 100%;
-  background-color: black;
+        height: 100%;
-  border: 1px solid var(--border_grey);
+        position: absolute;
-
+        background-color: black;
-  .attachments {
+        top: 0%;
-    margin: 0;
+        left: 0%;
-    border-radius: 0;
-    max-height: 560px;
-    background-color: unset;
-  }
-
-  .card {
-    margin: 0;
-  }
-
-  .gallery-video {
-    width: 100%;
-  }
-
-  .gallery-video>.attachment {
-    max-height: 560px;
-    width: 100%;
-  }
-
-  video {
-    width: 100%;
-    height: auto;
-    max-height: 560px;
-    object-fit: contain;
-  }
-
-  .video-download {
-    display: none;
-  }
-
-  .video-overlay-link {
-    position: absolute;
-    top: 12px;
-    right: 12px;
-    padding: 6px 12px;
-    background: rgba(30, 30, 30, 0.75);
-    backdrop-filter: blur(4px);
-    color: #fff;
-    font-size: 13px;
-    font-weight: 700;
-    text-decoration: none;
-    border-radius: 9999px;
-    border: 1px solid transparent;
-    transition:
-      background 0.15s,
-      opacity 0.15s;
-    z-index: 10;
-
-    &:hover {
-      background: rgba(60, 60, 60, 0.9);
     }
-  }
 
-  // Hide button while playing, show on hover or when paused
+    .video-container {
-  &.video-playing .video-overlay-link {
+        max-height: unset;
-    opacity: 0;
+    }
-    pointer-events: none;
-  }
-
-  &.video-playing:hover .video-overlay-link {
-    opacity: 1;
-    pointer-events: auto;
-  }
 }

src/sass/tweet/media.scss

@@ -1,168 +1,119 @@
-@import "_variables";
+@import '_variables';
 
 .gallery-row {
-  display: flex;
+    display: flex;
-  flex-direction: row;
+    flex-direction: row;
-  flex-wrap: nowrap;
+    flex-wrap: nowrap;
-  overflow: hidden;
+    align-items: center;
-  flex-grow: 1;
+    overflow: hidden;
-  max-height: 379.5px;
+    flex-grow: 1;
-  max-width: 533px;
+    max-height: 379.5px;
-  pointer-events: all;
+    max-width: 533px;
-
+    pointer-events: all;
-  &.mixed-row {
-    .attachment {
-      min-width: 0;
-      min-height: 0;
-      flex: 1 1 0;
-      max-height: 379.5px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      background-color: #101010;
-    }
-
-    .still-image,
-    .still-image img,
-    .attachment > video,
-    .attachment > img {
-      width: 100%;
-      height: 100%;
-      max-width: none;
-      max-height: none;
-    }
 
     .still-image {
-      display: flex;
+        width: 100%;
-      align-self: stretch;
+        display: flex;
     }
-
-    .still-image img {
-      flex-basis: auto;
-      flex-grow: 0;
-      object-fit: cover;
-    }
-
-    .attachment > video,
-    .attachment > img {
-      object-fit: cover;
-    }
-
-    .attachment > video {
-      object-fit: contain;
-    }
-  }
 }
 
 .attachments {
-  margin-top: 0.35em;
+    margin-top: .35em;
-  display: flex;
+    display: flex;
-  flex-direction: row;
+    flex-direction: row;
-  width: 100%;
+    width: 100%;
-  max-height: 600px;
+    max-height: 600px;
-  border-radius: 7px;
+    border-radius: 7px;
-  overflow: hidden;
+    overflow: hidden;
-  flex-flow: column;
+    flex-flow: column;
-  background-color: var(--bg_color);
+    background-color: var(--bg_color);
-  align-items: center;
+    align-items: center;
-  pointer-events: all;
+    pointer-events: all;
+
+    .image-attachment {
+        width: 100%;
+    }
 }
 
 .attachment {
-  position: relative;
+    position: relative;
-  line-height: 0;
+    line-height: 0;
-  overflow: hidden;
+    overflow: hidden;
-  margin: 0 0.25em 0 0;
+    margin: 0 .25em 0 0;
-  flex-grow: 1;
+    flex-grow: 1;
-  box-sizing: border-box;
+    box-sizing: border-box;
-  min-width: 2em;
+    min-width: 2em;
 
-  &:last-child {
+    &:last-child {
-    margin: 0;
+        margin: 0;
+        max-height: 530px;
+    }
+}
+
+.gallery-gif video {
     max-height: 530px;
-  }
+    background-color: #101010;
-}
-
-.media-gif {
-  display: table;
-  background-color: unset;
-  width: unset;
-  max-height: unset;
-}
-
-.media-gif video,
-.media-gif img {
-  width: 100%;
-  height: 100%;
-  max-height: 530px;
-  background-color: #101010;
 }
 
 .still-image {
-  max-height: 379.5px;
-  max-width: 533px;
-
-  img {
-    object-fit: cover;
-    max-width: 100%;
     max-height: 379.5px;
-    flex-basis: 300px;
+    max-width: 533px;
-    flex-grow: 1;
+    justify-content: center;
-  }
+
+    img {
+        object-fit: cover;
+        max-width: 100%;
+        max-height: 379.5px;
+        flex-basis: 300px;
+        flex-grow: 1;
+    }
 }
 
-.alt-text {
+.image {
-  margin: 0px;
+    display: inline-block;
-  padding: 11px 7px;
-  box-sizing: border-box;
-  position: absolute;
-  bottom: 10px;
-  left: 10px;
-  width: 2.98em;
-  max-height: 25px;
-  white-space: pre;
-  overflow: hidden;
-  border-radius: 10px;
-  color: var(--fg_color);
-  font-size: 12px;
-  font-weight: bold;
-  background: rgba(0, 0, 0, 0.5);
-  backdrop-filter: blur(12px);
 }
 
-.alt-text:hover {
+// .single-image {
-  padding: 7px;
+//     display: inline-block;
-  width: Min(230px, calc(100% - 10px * 2));
+//     width: 100%;
-  max-height: calc(100% - 10px);
+//     max-height: 600px;
-  line-height: 1.2em;
+
-  white-space: pre-wrap;
+//     .attachments {
-  transition-duration: 0.4s;
+//         width: unset;
-  transition-property: max-height;
+//         max-height: unset;
-}
+//         display: inherit;
+//     }
+// }
 
 .overlay-circle {
-  border-radius: 50%;
+    border-radius: 50%;
-  background-color: var(--dark_grey);
+    background-color: var(--dark_grey);
-  width: 40px;
+    width: 40px;
-  height: 40px;
+    height: 40px;
-  align-items: center;
+    align-items: center;
-  display: flex;
+    display: flex;
-  border-width: 5px;
+    border-width: 5px;
-  border-color: var(--play_button);
+    border-color: var(--play_button);
-  border-style: solid;
+    border-style: solid;
 }
 
 .overlay-triangle {
-  width: 0;
+    width: 0;
-  height: 0;
+    height: 0;
-  border-style: solid;
+    border-style: solid;
-  border-width: 12px 0 12px 17px;
+    border-width: 12px 0 12px 17px;
-  border-color: transparent transparent transparent var(--play_button);
+    border-color: transparent transparent transparent var(--play_button);
-  margin-left: 14px;
+    margin-left: 14px;
+}
+
+.media-gif {
+    display: table;
+    background-color: unset;
+    width: unset;
 }
 
 .media-body {
-  flex: 1;
+    flex: 1;
-  padding: 0;
+    padding: 0;
-  white-space: pre-wrap;
+    white-space: pre-wrap;
 }

src/sass/tweet/poll.scss

@@ -1,42 +1,42 @@
-@import "_variables";
+@import '_variables';
 
 .poll-meter {
-  overflow: hidden;
+    overflow: hidden;
-  position: relative;
+    position: relative;
-  margin: 6px 0;
+    margin: 6px 0;
-  height: 26px;
+    height: 26px;
-  background: var(--bg_color);
+    background: var(--bg_color);
-  border-radius: 5px;
+    border-radius: 5px;
-  display: flex;
+    display: flex;
-  align-items: center;
+    align-items: center;
 }
 
 .poll-choice-bar {
-  height: 100%;
+    height: 100%;
-  position: absolute;
+    position: absolute;
-  background: var(--dark_grey);
+    background: var(--dark_grey);
 }
 
 .poll-choice-value {
-  position: relative;
+    position: relative;
-  font-weight: bold;
+    font-weight: bold;
-  margin-left: 5px;
+    margin-left: 5px;
-  margin-right: 6px;
+    margin-right: 6px;
-  min-width: 30px;
+    min-width: 30px;
-  text-align: right;
+    text-align: right;
-  pointer-events: all;
+    pointer-events: all;
 }
 
 .poll-choice-option {
-  position: relative;
+    position: relative;
-  pointer-events: all;
+    pointer-events: all;
 }
 
 .poll-info {
-  color: var(--grey);
+    color: var(--grey);
-  pointer-events: all;
+    pointer-events: all;
 }
 
 .leader .poll-choice-bar {
-  background: var(--accent_dark);
+    background: var(--accent_dark);
 }

src/sass/tweet/quote.scss

@@ -1,121 +1,94 @@
-@import "_variables";
+@import '_variables';
 
 .quote {
-  margin-top: 10px;
+    margin-top: 10px;
-  border: solid 1px var(--dark_grey);
+    border: solid 1px var(--dark_grey);
-  border-radius: 10px;
+    border-radius: 10px;
-  background-color: var(--bg_elements);
+    background-color: var(--bg_elements);
-  overflow: hidden;
-  pointer-events: all;
-  position: relative;
-  width: 100%;
-
-  &:hover {
-    border-color: var(--grey);
-  }
-
-  &.unavailable:hover {
-    border-color: var(--dark_grey);
-  }
-
-  .tweet-name-row {
-    padding: 8px 10px 6px 10px;
-  }
-
-  .quote-text {
     overflow: hidden;
-    white-space: pre-wrap;
+    pointer-events: all;
-    word-wrap: break-word;
+    position: relative;
-    padding: 10px;
+    width: 100%;
-    padding-top: 0;
-  }
-
-  .show-thread {
-    padding: 0px 10px 6px 10px;
-    margin-top: -6px;
-  }
-
-  .quote-latest {
-    padding: 0px 10px 6px 10px;
-    color: var(--grey);
-  }
-
-  .replying-to {
-    padding: 0px 10px;
-    padding-bottom: 4px;
-    margin: unset;
-  }
-
-  .community-note {
-    background-color: var(--bg_panel);
-    border: unset;
-    border-top: solid 1px var(--dark_grey);
-    border-radius: unset;
-    margin-top: 0;
 
     &:hover {
-      border-top-color: var(--grey);
+        border-color: var(--grey);
     }
 
-    .community-note-header {
+    &.unavailable:hover {
-      background-color: var(--bg_panel);
+        border-color: var(--dark_grey);
-      padding-bottom: 0;
+    }
+
+    .tweet-name-row {
+        padding: 6px 8px;
+        margin-top: 1px;
+    }
+
+    .quote-text {
+        overflow: hidden;
+        white-space: pre-wrap;
+        word-wrap: break-word;
+        padding: 0px 8px 8px 8px;
+    }
+
+    .show-thread {
+        padding: 0px 8px 6px 8px;
+        margin-top: -6px;
+    }
+
+    .replying-to {
+        padding: 0px 8px;
+        margin: unset;
     }
-  }
 }
 
 .unavailable-quote {
-  padding: 12px;
+    padding: 12px;
-  display: block;
 }
 
 .quote-link {
-  width: 100%;
+    width: 100%;
-  height: 100%;
+    height: 100%;
-  left: 0;
+    left: 0;
-  top: 0;
+    top: 0;
-  position: absolute;
+    position: absolute;
 }
 
 .quote-media-container {
-  max-height: 300px;
-  display: flex;
-
-  .card {
-    margin: unset;
-  }
-
-  .attachments {
-    border-radius: 0;
-  }
-
-  .media-gif {
-    width: 100%;
-    display: flex;
-    justify-content: center;
-  }
-
-  .media-gif > .attachment {
-    display: flex;
-    justify-content: center;
-    background-color: var(--bg_color);
-
-    video,
-    img {
-      height: unset;
-      width: unset;
-      max-height: 100%;
-      max-width: 100%;
-    }
-  }
-
-  .gallery-row .attachment,
-  .gallery-row .attachment > video,
-  .gallery-row .attachment > img {
     max-height: 300px;
-  }
+    display: flex;
 
-  .still-image img {
+    .card {
-    max-height: 250px;
+        margin: unset;
-  }
+    }
+
+    .attachments {
+        border-radius: 0;
+    }
+
+    .media-gif {
+        width: 100%;
+        display: flex;
+        justify-content: center;
+    }
+
+    .gallery-gif .attachment {
+        display: flex;
+        justify-content: center;
+        background-color: var(--bg_color);
+
+        video {
+            height: unset;
+            width: unset;
+            max-height: 100%;
+            max-width: 100%;
+        }
+    }
+
+    .gallery-video, .gallery-gif {
+        max-height: 300px;
+    }
+
+    .still-image img {
+        max-height: 250px
+    }
 }

src/sass/tweet/thread.scss

@@ -1,196 +1,112 @@
-@import "_variables";
+@import '_variables';
-@import "_mixins";
+@import '_mixins';
 
-.conversation,
+.conversation {
-.edit-history {
+    @include panel(100%, 600px);
-  @include panel(100%, 600px);
 
-  .show-more {
+    .show-more {
-    margin-bottom: 10px;
+        margin-bottom: 10px;
-  }
+    }
 }
 
-.main-thread,
+.main-thread {
-.latest-edit {
+    margin-bottom: 20px;
-  margin-bottom: 20px;
+    background-color: var(--bg_panel);
 }
 
-.reply {
+.main-tweet, .replies {
-  margin-bottom: 10px;
-}
-
-.reply-sort {
-  display: flex;
-  align-items: center;
-  flex-wrap: wrap;
-  gap: 2px 14px;
-  margin-bottom: 10px;
-  padding: 8px 12px;
-  background-color: var(--bg_panel);
-  font-size: 14px;
-}
-
-.reply-sort-label {
-  color: var(--fg_faded);
-  margin-right: 2px;
-}
-
-.reply-sort-option {
-  color: var(--tab);
-  font-weight: bold;
-  text-decoration: none;
-  border-bottom: 0.1rem solid transparent;
-
-  &:hover {
-    color: var(--fg_color);
-    text-decoration: none;
-  }
-
-  &.active {
-    color: var(--tab_selected);
-    border-bottom-color: var(--tab_selected);
-  }
-}
-
-.main-tweet,
-.replies,
-.edit-history > div {
-  body.fixed-nav & {
     padding-top: 50px;
     margin-top: -50px;
-  }
-}
-
-.edit-history-header {
-  padding: 10px;
-  margin-bottom: 5px;
-  font-size: 16px;
-  font-weight: bold;
-  background-color: var(--bg_panel);
-}
-
-.tweet-edit {
-  margin-bottom: 5px;
 }
 
 .main-tweet .tweet-content {
-  font-size: 18px;
+    font-size: 18px;
 }
 
-@media (max-width: 600px) {
+@media(max-width: 600px) {
-  .main-tweet .tweet-content {
+    .main-tweet .tweet-content {
-    font-size: 16px;
+        font-size: 16px;
-  }
+    }
+}
+
+.reply {
+    background-color: var(--bg_panel);
+    margin-bottom: 10px;
 }
 
 .thread-line {
-  .timeline-item::before,
+    .timeline-item::before,
-  &.timeline-item::before {
+    &.timeline-item::before {
-    background: var(--accent_dark);
+        background: var(--accent_dark);
-    content: "";
+        content: '';
-    position: relative;
+        position: relative;
-    min-width: 3px;
+        min-width: 3px;
-    width: 3px;
+        width: 3px;
-    left: 26px;
+        left: 26px;
-    border-radius: 2px;
+        border-radius: 2px;
-    margin-left: -3px;
+        margin-left: -3px;
-    margin-bottom: 37px;
+        margin-bottom: 37px;
-    top: 56px;
+        top: 56px;
-    z-index: 1;
+        z-index: 1;
-    pointer-events: none;
+        pointer-events: none;
-  }
+    }
 
-  .with-header:not(:first-child)::after {
+    .with-header:not(:first-child)::after {
-    background: var(--accent_dark);
+        background: var(--accent_dark);
-    content: "";
+        content: '';
-    position: relative;
+        position: relative;
-    float: left;
+        float: left;
-    min-width: 3px;
+        min-width: 3px;
-    width: 3px;
+        width: 3px;
-    right: calc(100% - 26px);
+        right: calc(100% - 26px);
-    border-radius: 2px;
+        border-radius: 2px;
-    margin-left: -3px;
+        margin-left: -3px;
-    margin-bottom: 37px;
+        margin-bottom: 37px;
-    bottom: 10px;
+        bottom: 10px;
-    height: 30px;
+        height: 30px;
-    z-index: 1;
+        z-index: 1;
-    pointer-events: none;
+        pointer-events: none;
-  }
+    }
 
-  .unavailable::before {
+    .unavailable::before {
-    top: 48px;
+        top: 48px;
-    margin-bottom: 28px;
+        margin-bottom: 28px;
-  }
+    }
 
-  .more-replies::before {
+    .more-replies::before {
-    content: "...";
+        content: '...';
-    background: unset;
+        background: unset;
-    color: var(--more_replies_dots);
+        color: var(--more_replies_dots);
-    font-weight: bold;
+        font-weight: bold;
-    font-size: 20px;
+        font-size: 20px;
-    line-height: 0.25em;
+        line-height: 0.25em;
-    left: 1.2em;
+        left: 1.2em;
-    width: 5px;
+        width: 5px;
-    top: 2px;
+        top: 2px;
-    margin-bottom: 0;
+        margin-bottom: 0;
-    margin-left: -2.5px;
+        margin-left: -2.5px;
-  }
+    }
 
-  .earlier-replies {
+    .earlier-replies {
-    padding-bottom: 0;
+        padding-bottom: 0;
-    margin-bottom: -5px;
+        margin-bottom: -5px;
-  }
+    }
 }
 
 .timeline-item.thread-last::before {
-  background: unset;
+    background: unset;
-  min-width: unset;
+    min-width: unset;
-  width: 0;
+    width: 0;
-  margin: 0;
+    margin: 0;
 }
 
 .more-replies {
-  padding-top: 0.3em !important;
+    padding-top: 0.3em !important;
 }
 
 .more-replies-text {
-  @include ellipsis;
+    @include ellipsis;
-  display: block;
+    display: block;
-  margin-left: 58px;
+    margin-left: 58px;
-  padding: 7px 0;
+    padding: 7px 0;
-}
-
-.timeline-item.thread.more-replies-thread {
-  padding: 0 0.75em;
-
-  &::before {
-    top: 40px;
-    margin-bottom: 31px;
-  }
-
-  .more-replies {
-    display: flex;
-    padding-top: unset !important;
-    margin-top: 8px;
-
-    &::before {
-      display: inline-block;
-      position: relative;
-      top: -1px;
-      line-height: 0.4em;
-    }
-
-    .more-replies-text {
-      display: inline;
-    }
-  }
-}
-
-.related-header {
-  padding: 8px 12px;
-  margin-top: 10px;
-  background-color: var(--bg_panel);
-  color: var(--fg_faded);
-  font-size: 14px;
-  border-bottom: 1px solid var(--border_grey);
 }

src/sass/tweet/video.scss

@@ -1,111 +1,66 @@
-@import "_variables";
+@import '_variables';
-@import "_mixins";
+@import '_mixins';
 
 video {
-  height: 100%;
+    max-height: 100%;
-  width: 100%;
+    width: 100%;
 }
 
 .gallery-video {
-  display: flex;
+    display: flex;
-  overflow: hidden;
+    overflow: hidden;
+}
 
-  &.card-container {
+.gallery-video.card-container {
     flex-direction: column;
-    width: 100%;
+}
-  }
 
-  > .attachment {
+.video-container {
-    min-height: 80px;
-    min-width: 200px;
     max-height: 530px;
     margin: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
 
     img {
-      max-height: 100%;
+        max-height: 100%;
-      max-width: 100%;
+        max-width: 100%;
     }
-  }
-}
-
-.video-download {
-  position: absolute;
-  top: 8px;
-  right: 8px;
-  z-index: 2;
-  color: var(--accent);
-  text-decoration: none;
-  opacity: 0;
-  transition: opacity 0.2s;
-  filter: drop-shadow(0 1px 2px rgba(0, 0, 0, 0.7));
-
-  .icon-container {
-    margin: 0;
-  }
-
-  .icon-download-alt {
-    font-size: 18px;
-  }
-}
-
-.attachment:hover .video-download {
-  opacity: 1;
-
-  &:hover {
-    color: var(--fg_color);
-  }
-}
-
-@media (hover: none) {
-  .video-download {
-    opacity: 1;
-  }
 }
 
 .video-overlay {
-  @include play-button;
+    @include play-button;
-  background-color: $shadow;
+    background-color: $shadow;
 
-  p {
+    p {
-    position: relative;
+        position: relative;
-    z-index: 0;
+        z-index: 0;
-    text-align: center;
+        text-align: center;
-    top: calc(50% - 20px);
+        top: calc(50% - 20px);
-    font-size: 20px;
+        font-size: 20px;
-    line-height: 1.3;
+        line-height: 1.3;
-    margin: 0 20px;
+        margin: 0 20px;
-  }
+    }
 
-  .overlay-circle {
+    div {
-    position: relative;
+        position: relative;
-    z-index: 0;
+        z-index: 0;
-    top: calc(50% - 20px);
+        top: calc(50% - 20px);
-    margin: 0 auto;
+        margin: 0 auto;
-    width: 40px;
+        width: 40px;
-    height: 40px;
+        height: 40px;
-  }
+    }
 
-  .overlay-duration {
+    form {
-    position: absolute;
+        width: 100%;
-    bottom: 8px;
+        height: 100%;
-    left: 8px;
+        align-items: center;
-    background-color: #0000007a;
+        justify-content: center;
-    line-height: 1em;
+        display: flex;
-    padding: 4px 6px 4px 6px;
+    }
-    border-radius: 5px;
-    font-weight: bold;
-  }
 
-  form {
+    button {
-    width: 100%;
+        padding: 5px 8px;
-    height: 100%;
+        font-size: 16px;
-    align-items: center;
+    }
-    justify-content: center;
-    display: flex;
-  }
-
-  button {
-    padding: 5px 8px;
-    font-size: 16px;
-  }
 }

src/tid.nim

@@ -1,64 +0,0 @@
-import std/[asyncdispatch, base64, httpclient, random, strutils, sequtils, times]
-import nimcrypto
-import experimental/parser/tid
-
-randomize()
-
-const defaultKeyword = "obfiowerehiring";
-const pairsUrl =
-  "https://raw.githubusercontent.com/fa0311/x-client-transaction-id-pair-dict/refs/heads/main/pair.json";
-
-var
-  cachedPairs: seq[TidPair] = @[]
-  lastCached = 0
-  # refresh every hour
-  ttlSec = 60 * 60
-
-proc getPair(): Future[TidPair] {.async.} =
-  if cachedPairs.len == 0 or int(epochTime()) - lastCached > ttlSec:
-    let client = newAsyncHttpClient()
-    defer: client.close()
-
-    let resp = await client.get(pairsUrl)
-    if resp.status == $Http200:
-      cachedPairs = parseTidPairs(await resp.body)
-      lastCached = int(epochTime())
-
-  if cachedPairs.len == 0:
-    raise newException(ValueError, "Failed to fetch x-client-transaction-id pairs")
-
-  return sample(cachedPairs)
-
-proc encodeSha256(text: string): array[32, byte] =
-  let
-    data = cast[ptr byte](addr text[0])
-    dataLen = uint(len(text))
-    digest = sha256.digest(data, dataLen)
-  return digest.data
-
-proc encodeBase64[T](data: T): string =
-  return encode(data).replace("=", "")
-
-proc decodeBase64(data: string): seq[byte] =
-  return cast[seq[byte]](decode(data))
-
-proc genTid*(path: string): Future[string] {.async.} =
-  let 
-    pair = await getPair()
-
-    timeNow = int(epochTime() - 1682924400)
-    timeNowBytes = @[
-      byte(timeNow and 0xff),
-      byte((timeNow shr 8) and 0xff),
-      byte((timeNow shr 16) and 0xff),
-      byte((timeNow shr 24) and 0xff)
-    ]
-
-    data = "GET!" & path & "!" & $timeNow & defaultKeyword & pair.animationKey
-    hashBytes = encodeSha256(data)
-    keyBytes = decodeBase64(pair.verification)
-    bytesArr = keyBytes & timeNowBytes & hashBytes[0 ..< 16] & @[3'u8]
-    randomNum = byte(rand(256))
-    tid = @[randomNum] & bytesArr.mapIt(it xor randomNum)
-
-  return encodeBase64(tid)

src/tokens.nim

@@ -0,0 +1,164 @@
+# SPDX-License-Identifier: AGPL-3.0-only
+import asyncdispatch, httpclient, times, sequtils, json, random
+import strutils, tables
+import types, consts
+
+const
+  maxConcurrentReqs = 5  # max requests at a time per token, to avoid race conditions
+  maxLastUse = 1.hours   # if a token is unused for 60 minutes, it expires
+  maxAge = 2.hours + 55.minutes  # tokens expire after 3 hours
+  failDelay = initDuration(minutes=30)
+
+var
+  tokenPool: seq[Token]
+  lastFailed: Time
+  enableLogging = false
+
+let headers = newHttpHeaders({"authorization": auth})
+
+template log(str) =
+  if enableLogging: echo "[tokens] ", str
+
+proc getPoolJson*(): JsonNode =
+  var
+    list = newJObject()
+    totalReqs = 0
+    totalPending = 0
+    reqsPerApi: Table[string, int]
+
+  for token in tokenPool:
+    totalPending.inc(token.pending)
+    list[token.tok] = %*{
+      "apis": newJObject(),
+      "pending": token.pending,
+      "init": $token.init,
+      "lastUse": $token.lastUse
+    }
+
+    for api in token.apis.keys:
+      list[token.tok]["apis"][$api] = %token.apis[api]
+
+      let
+        maxReqs =
+          case api
+          of Api.timeline: 187
+          of Api.listMembers, Api.listBySlug, Api.list, Api.listTweets,
+             Api.userTweets, Api.userTweetsAndReplies, Api.userMedia,
+             Api.userRestId, Api.userScreenName,
+             Api.tweetDetail, Api.tweetResult, Api.search: 500
+          of Api.userSearch: 900
+        reqs = maxReqs - token.apis[api].remaining
+
+      reqsPerApi[$api] = reqsPerApi.getOrDefault($api, 0) + reqs
+      totalReqs.inc(reqs)
+
+  return %*{
+    "amount": tokenPool.len,
+    "requests": totalReqs,
+    "pending": totalPending,
+    "apis": reqsPerApi,
+    "tokens": list
+  }
+
+proc rateLimitError*(): ref RateLimitError =
+  newException(RateLimitError, "rate limited")
+
+proc fetchToken(): Future[Token] {.async.} =
+  if getTime() - lastFailed < failDelay:
+    raise rateLimitError()
+
+  let client = newAsyncHttpClient(headers=headers)
+
+  try:
+    let
+      resp = await client.postContent(activate)
+      tokNode = parseJson(resp)["guest_token"]
+      tok = tokNode.getStr($(tokNode.getInt))
+      time = getTime()
+
+    return Token(tok: tok, init: time, lastUse: time)
+  except Exception as e:
+    echo "[tokens] fetching token failed: ", e.msg
+    if "Try again" notin e.msg:
+      echo "[tokens] fetching tokens paused, resuming in 30 minutes"
+      lastFailed = getTime()
+  finally:
+    client.close()
+
+proc expired(token: Token): bool =
+  let time = getTime()
+  token.init < time - maxAge or token.lastUse < time - maxLastUse
+
+proc isLimited(token: Token; api: Api): bool =
+  if token.isNil or token.expired:
+    return true
+
+  if api in token.apis:
+    let limit = token.apis[api]
+    return (limit.remaining <= 10 and limit.reset > epochTime().int)
+  else:
+    return false
+
+proc isReady(token: Token; api: Api): bool =
+  not (token.isNil or token.pending > maxConcurrentReqs or token.isLimited(api))
+
+proc release*(token: Token; used=false; invalid=false) =
+  if token.isNil: return
+  if invalid or token.expired:
+    if invalid: log "discarding invalid token"
+    elif token.expired: log "discarding expired token"
+
+    let idx = tokenPool.find(token)
+    if idx > -1: tokenPool.delete(idx)
+  elif used:
+    dec token.pending
+    token.lastUse = getTime()
+
+proc getToken*(api: Api): Future[Token] {.async.} =
+  for i in 0 ..< tokenPool.len:
+    if result.isReady(api): break
+    release(result)
+    result = tokenPool.sample()
+
+  if not result.isReady(api):
+    release(result)
+    result = await fetchToken()
+    log "added new token to pool"
+    tokenPool.add result
+
+  if not result.isNil:
+    inc result.pending
+  else:
+    raise rateLimitError()
+
+proc setRateLimit*(token: Token; api: Api; remaining, reset: int) =
+  # avoid undefined behavior in race conditions
+  if api in token.apis:
+    let limit = token.apis[api]
+    if limit.reset >= reset and limit.remaining < remaining:
+      return
+
+  token.apis[api] = RateLimit(remaining: remaining, reset: reset)
+
+proc poolTokens*(amount: int) {.async.} =
+  var futs: seq[Future[Token]]
+  for i in 0 ..< amount:
+    futs.add fetchToken()
+
+  for token in futs:
+    var newToken: Token
+
+    try: newToken = await token
+    except: discard
+
+    if not newToken.isNil:
+      log "added new token to pool"
+      tokenPool.add newToken
+
+proc initTokenPool*(cfg: Config) {.async.} =
+  enableLogging = cfg.enableDebug
+
+  while true:
+    if tokenPool.countIt(not it.isLimited(Api.timeline)) < cfg.minTokens:
+      await poolTokens(min(4, cfg.minTokens - tokenPool.len))
+    await sleepAsync(2000)

src/types.nim

@@ -6,78 +6,62 @@ genPrefsType()
 
 type
   RateLimitError* = object of CatchableError
-  NoSessionsError* = object of CatchableError
   InternalError* = object of CatchableError
   BadClientError* = object of CatchableError
 
   TimelineKind* {.pure.} = enum
-    tweets, replies, media, articles
+    tweets
+    replies
+    media
 
-  ApiUrl* = object
+  Api* {.pure.} = enum
-    endpoint*: string
+    tweetDetail
-    params*: seq[(string, string)]
+    tweetResult
-    skipTid*: bool
+    timeline
-
+    search
-  ApiReq* = object
+    userSearch
-    oauth*: ApiUrl
+    list
-    cookie*: ApiUrl
+    listBySlug
+    listMembers
+    listTweets
+    userRestId
+    userScreenName
+    userTweets
+    userTweetsAndReplies
+    userMedia
 
   RateLimit* = object
-    limit*: int
     remaining*: int
     reset*: int
 
-  SessionKind* = enum
+  Token* = ref object
-    oauth
+    tok*: string
-    cookie
+    init*: Time
-
+    lastUse*: Time
-  Session* = ref object
-    id*: int64
-    username*: string
     pending*: int
-    limited*: bool
+    apis*: Table[Api, RateLimit]
-    limitedAt*: int
-    apis*: Table[string, RateLimit]
-    case kind*: SessionKind
-    of oauth:
-      oauthToken*: string
-      oauthSecret*: string
-    of cookie:
-      authToken*: string
-      ct0*: string
 
   Error* = enum
     null = 0
     noUserMatches = 17
     protectedUser = 22
     missingParams = 25
-    timeout = 29
     couldntAuth = 32
     doesntExist = 34
-    unauthorized = 37
     invalidParam = 47
     userNotFound = 50
     suspended = 63
     rateLimited = 88
-    expiredToken = 89
+    invalidToken = 89
     listIdOrSlug = 112
-    timelineUnavailable = 131
     tweetNotFound = 144
     tweetNotAuthorized = 179
     forbidden = 200
-    badRequest = 214
     badToken = 239
-    locked = 326
     noCsrf = 353
     tweetUnavailable = 421
     tweetCensored = 422
 
-  VerifiedType* = enum
-    none = "None"
-    blue = "Blue"
-    business = "Business"
-    government = "Government"
-
   User* = object
     id*: string
     username*: string
@@ -93,64 +77,11 @@ type
     tweets*: int
     likes*: int
     media*: int
-    verifiedType*: VerifiedType
+    verified*: bool
     protected*: bool
     suspended*: bool
     joinDate*: DateTime
 
-  AccountInfo* = object
-    username*: string
-    fullname*: string
-    userPic*: string
-    joinDate*: DateTime
-    verifiedType*: VerifiedType
-    suspended*: bool
-    basedIn*: string
-    source*: string
-    usernameChanges*: int
-    lastUsernameChange*: DateTime
-    affiliateUsername*: string
-    affiliateLabel*: string
-    isIdentityVerified*: bool
-    verifiedSince*: DateTime
-    overrideVerifiedYear*: int
-
-  Broadcast* = object
-    id*: string
-    title*: string
-    state*: string
-    thumb*: string
-    mediaKey*: string
-    m3u8Url*: string
-    totalWatched*: int
-    startTime*: DateTime
-    endTime*: DateTime
-    replayStart*: int
-    availableForReplay*: bool
-    user*: User
-
-  SpaceParticipant* = object
-    userId*: string
-    username*: string
-    displayName*: string
-    avatarUrl*: string
-    isVerified*: bool
-
-  AudioSpace* = object
-    id*: string
-    title*: string
-    state*: string
-    mediaKey*: string
-    m3u8Url*: string
-    totalLiveListeners*: int
-    totalReplayWatched*: int
-    startTime*: DateTime
-    endTime*: DateTime
-    availableForReplay*: bool
-    creator*: User
-    admins*: seq[SpaceParticipant]
-    speakers*: seq[SpaceParticipant]
-
   VideoType* = enum
     m3u8 = "application/x-mpegURL"
     mp4 = "video/mp4"
@@ -166,6 +97,7 @@ type
     durationMs*: int
     url*: string
     thumb*: string
+    views*: string
     available*: bool
     reason*: string
     title*: string
@@ -174,15 +106,10 @@ type
     variants*: seq[VideoVariant]
 
   QueryKind* = enum
-    posts, replies, media, users, tweets, userList, followers, following, lists, top,
+    posts, replies, media, users, tweets, userList
-    articles
-
-  RankingMode* = enum
-    Relevance, Recency, Likes
 
   Query* = object
     kind*: QueryKind
-    view*: string
     text*: string
     filters*: seq[string]
     includes*: seq[string]
@@ -190,33 +117,12 @@ type
     fromUser*: seq[string]
     since*: string
     until*: string
-    minLikes*: string
+    near*: string
     sep*: string
 
   Gif* = object
     url*: string
     thumb*: string
-    altText*: string
-
-  Photo* = object
-    url*: string
-    altText*: string
-
-  MediaKind* = enum
-    photoMedia
-    videoMedia
-    gifMedia
-
-  Media* = object
-    case kind*: MediaKind
-    of photoMedia:
-      photo*: Photo
-    of videoMedia:
-      video*: Video
-    of gifMedia:
-      gif*: Gif
-
-  MediaEntities* = seq[Media]
 
   GalleryPhoto* = object
     url*: string
@@ -225,44 +131,6 @@ type
 
   PhotoRail* = seq[GalleryPhoto]
 
-  Article* = ref object
-    title*: string
-    coverImage*: string
-    user*: User
-    time*: DateTime
-    stats*: TweetStats
-    paragraphs*: seq[ArticleParagraph]
-    entities*: Table[int, ArticleEntity]
-    media*: Table[string, ArticleMedia]
-
-  ArticleParagraph* = object
-    text*: string
-    kind*: string
-    inlineStyles*: seq[ArticleStyle]
-    entityRanges*: seq[ArticleEntityRange]
-
-  ArticleStyle* = object
-    offset*: int
-    length*: int
-    style*: string
-
-  ArticleEntityRange* = object
-    offset*: int
-    length*: int
-    key*: int
-
-  ArticleEntity* = object
-    kind*: string
-    url*: string
-    mediaIds*: seq[string]
-    tweetId*: string
-    markdown*: string
-    caption*: string
-
-  ArticleMedia* = object
-    kind*: string
-    url*: string
-
   Poll* = object
     options*: seq[string]
     values*: seq[int]
@@ -293,7 +161,6 @@ type
     imageDirectMessage = "image_direct_message"
     audiospace = "audiospace"
     newsletterPublication = "newsletter_publication"
-    jobDetails = "job_details"
     hidden
     unknown
     
@@ -310,13 +177,7 @@ type
     replies*: int
     retweets*: int
     likes*: int
-    views*: int
+    quotes*: int
-
-  ArticlePreview* = object
-    title*: string
-    previewText*: string
-    coverImage*: string
-    tweetId*: int64
 
   Tweet* = ref object
     id*: int64
@@ -336,19 +197,13 @@ type
     stats*: TweetStats
     retweet*: Option[Tweet]
     attribution*: Option[User]
-    attributionLink*: string
     mediaTags*: seq[User]
     quote*: Option[Tweet]
     card*: Option[Card]
     poll*: Option[Poll]
-    media*: MediaEntities
+    gif*: Option[Gif]
-    history*: seq[int64]
+    video*: Option[Video]
-    note*: string
+    photos*: seq[string]
-    isAd*: bool
-    isAI*: bool
-    articlePreview*: Option[ArticlePreview]
-
-  Tweets* = seq[Tweet]
 
   Result*[T] = object
     content*: seq[T]
@@ -357,10 +212,9 @@ type
     query*: Query
 
   Chain* = object
-    content*: Tweets
+    content*: seq[Tweet]
     hasMore*: bool
     cursor*: string
-    related*: bool
 
   Conversation* = ref object
     tweet*: Tweet
@@ -368,18 +222,13 @@ type
     after*: Chain
     replies*: Result[Chain]
 
-  EditHistory* = object
+  Timeline* = Result[Tweet]
-    latest*: Tweet
-    history*: Tweets
-
-  Timeline* = Result[Tweets]
 
   Profile* = object
     user*: User
     photoRail*: PhotoRail
     pinned*: Option[Tweet]
     tweets*: Timeline
-    accountInfo*: AccountInfo
 
   List* = object
     id*: string
@@ -390,29 +239,6 @@ type
     members*: int
     banner*: string
 
-  ListSearchResult* = object
-    list*: List
-    owner*: User
-    followersContext*: string
-    facepiles*: seq[string]
-
-  CommunityRule* = object
-    name*: string
-    description*: string
-
-  Community* = object
-    id*: string
-    name*: string
-    description*: string
-    memberCount*: int
-    banner*: string
-    creator*: User
-    category*: string
-    joinPolicy*: string
-    createdAt*: DateTime
-    rules*: seq[CommunityRule]
-    hashtags*: seq[string]
-
   GlobalObjects* = ref object
     tweets*: Table[string, Tweet]
     users*: Table[string, User]
@@ -429,20 +255,10 @@ type
     hmacKey*: string
     base64Media*: bool
     minTokens*: int
-    enableRSSUserTweets*: bool
+    enableRss*: bool
-    enableRSSUserReplies*: bool
-    enableRSSUserMedia*: bool
-    enableRSSUserArticles*: bool
-    enableRSSSearch*: bool
-    enableRSSList*: bool
     enableDebug*: bool
     proxy*: string
     proxyAuth*: string
-    apiProxy*: string
-    disableTid*: bool
-    maxConcurrentReqs*: int
-    maxRetries*: int
-    retryDelayMs*: int
 
     rssCacheTime*: int
     listCacheTime*: int
@@ -458,27 +274,3 @@ type
 
 proc contains*(thread: Chain; tweet: Tweet): bool =
   thread.content.anyIt(it.id == tweet.id)
-
-proc add*(timeline: var seq[Tweets]; tweet: Tweet) =
-  timeline.add @[tweet]
-
-proc getPhotos*(tweet: Tweet): seq[Photo] =
-  tweet.media.filterIt(it.kind == photoMedia).mapIt(it.photo)
-
-proc getVideos*(tweet: Tweet): seq[Video] =
-  tweet.media.filterIt(it.kind == videoMedia).mapIt(it.video)
-
-proc hasPhotos*(tweet: Tweet): bool =
-  tweet.media.anyIt(it.kind == photoMedia)
-
-proc hasVideos*(tweet: Tweet): bool =
-  tweet.media.anyIt(it.kind == videoMedia)
-
-proc hasGifs*(tweet: Tweet): bool =
-  tweet.media.anyIt(it.kind == gifMedia)
-
-proc getThumb*(media: Media): string =
-  case media.kind
-  of photoMedia: media.photo.url
-  of videoMedia: media.video.thumb
-  of gifMedia: media.gif.thumb

src/utils.nim

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: AGPL-3.0-only
-import sequtils, strutils, strformat, uri, tables, base64
+import strutils, strformat, uri, tables, base64
 import nimcrypto
+import types
 
 var
   hmacKey: string
@@ -9,17 +10,14 @@ var
 const
   https* = "https://"
   twimg* = "pbs.twimg.com/"
-  nitterParams* = ["name", "tab", "id", "list", "referer", "scroll", "prefs"]
+  nitterParams = ["name", "tab", "id", "list", "referer", "scroll"]
   twitterDomains = @[
     "twitter.com",
     "pic.twitter.com",
     "twimg.com",
     "abs.twimg.com",
     "pbs.twimg.com",
-    "video.twimg.com",
+    "video.twimg.com"
-    "x.com",
-    "pscp.tv",
-    "video.pscp.tv"
   ]
 
 proc setHmacKey*(key: string) =
@@ -31,6 +29,20 @@ proc setProxyEncoding*(state: bool) =
 proc getHmac*(data: string): string =
   ($hmac(sha256, hmacKey, data))[0 .. 12]
 
+proc getBestMp4VidVariant(video: Video): VideoVariant =
+  for v in video.variants:
+    if v.bitrate >= result.bitrate:
+      result = v
+
+proc getVidVariant*(video: Video; playbackType: VideoType): VideoVariant =
+  case playbackType
+  of mp4:
+    return video.getBestMp4VidVariant
+  of m3u8, vmap:
+    for variant in video.variants:
+      if variant.contentType == playbackType:
+        return variant
+
 proc getVidUrl*(link: string): string =
   if link.len == 0: return
   let sig = getHmac(link)
@@ -40,14 +52,12 @@ proc getVidUrl*(link: string): string =
     &"/video/{sig}/{encodeUrl(link)}"
 
 proc getPicUrl*(link: string): string =
-  if link.len == 0: return
   if base64Media:
     &"/pic/enc/{encode(link, safe=true)}"
   else:
     &"/pic/{encodeUrl(link)}"
 
 proc getOrigPicUrl*(link: string): string =
-  if link.len == 0: return
   if base64Media:
     &"/pic/orig/enc/{encode(link, safe=true)}"
   else:
@@ -59,13 +69,7 @@ proc filterParams*(params: Table): seq[(string, string)] =
       result.add p
 
 proc isTwitterUrl*(uri: Uri): bool =
-  uri.scheme in ["http", "https"] and
+  uri.hostname in twitterDomains
-    (uri.hostname in twitterDomains or uri.hostname.endsWith(".video.pscp.tv"))
 
 proc isTwitterUrl*(url: string): bool =
-  isTwitterUrl(parseUri(url))
+  parseUri(url).hostname in twitterDomains
-
-proc validateNumber*(value: string): string =
-  if value.anyIt(not it.isDigit):
-    return ""
-  return value

src/views/about_account.nim

@@ -1,93 +0,0 @@
-# SPDX-License-Identifier: AGPL-3.0-only
-import strutils, strformat, times
-import karax/[karaxdsl, vdom]
-
-import renderutils
-import ".."/[types, formatters]
-
-proc renderAboutAccount*(info: AccountInfo): VNode =
-  let user = User(
-    username: info.username,
-    fullname: info.fullname,
-    userPic: info.userPic,
-    verifiedType: info.verifiedType
-  )
-
-  buildHtml(tdiv(class="about-account")):
-    tdiv(class="about-account-header"):
-      a(class="about-account-avatar", href=(&"/{info.username}")):
-        genImg(getUserPic(info.userPic, "_200x200"))
-      tdiv(class="about-account-name"):
-        linkUser(user, class="profile-card-fullname")
-        verifiedIcon(user)
-      linkUser(user, class="profile-card-username")
-
-    tdiv(class="about-account-body"):
-      tdiv(class="about-account-row"):
-        span: icon "calendar"
-        tdiv:
-          span(class="about-account-label"): text "Date joined"
-          span(class="about-account-value"):
-            text info.joinDate.format("MMMM YYYY")
-
-      if info.basedIn.len > 0:
-        tdiv(class="about-account-row"):
-          span: icon "location"
-          tdiv:
-            span(class="about-account-label"): text "Account based in"
-            span(class="about-account-value"): text info.basedIn
-
-      if info.verifiedType != VerifiedType.none:
-        if info.overrideVerifiedYear != 0:
-          tdiv(class="about-account-row"):
-            span: icon "ok"
-            tdiv:
-              span(class="about-account-label"): text "Verified"
-              span(class="about-account-value"):
-                let year = abs(info.overrideVerifiedYear)
-                let era = if info.overrideVerifiedYear < 0: " BCE" else: ""
-                text "Since " & $year & era
-        elif info.verifiedSince.year > 0:
-          tdiv(class="about-account-row"):
-            span: icon "ok"
-            tdiv:
-              span(class="about-account-label"): text "Verified"
-              span(class="about-account-value"):
-                text "Since " & info.verifiedSince.format("MMMM YYYY")
-
-        if info.isIdentityVerified:
-          tdiv(class="about-account-row"):
-            span: icon "ok"
-            tdiv:
-              span(class="about-account-label"): text "ID Verified"
-              span(class="about-account-value"): text "Yes"
-
-      if info.affiliateUsername.len > 0:
-        tdiv(class="about-account-row"):
-          span: icon "group"
-          tdiv:
-            span(class="about-account-label"): text "An affiliate of"
-            span(class="about-account-value"):
-              a(href=(&"/{info.affiliateUsername}")):
-                if info.affiliateLabel.len > 0:
-                  text info.affiliateLabel & " (@" & info.affiliateUsername & ")"
-                else:
-                  text "@" & info.affiliateUsername
-
-      if info.usernameChanges > 0:
-        tdiv(class="about-account-row"):
-          span(class="about-account-at"): text "@"
-          tdiv:
-            span(class="about-account-label"):
-              text $info.usernameChanges & " username change"
-              if info.usernameChanges > 1: text "s"
-            if info.lastUsernameChange.year > 0:
-              span(class="about-account-value"):
-                text "Last on " & info.lastUsernameChange.format("MMMM YYYY")
-
-      if info.source.len > 0:
-        tdiv(class="about-account-row"):
-          span: icon "link"
-          tdiv:
-            span(class="about-account-label"): text "Connected via"
-            span(class="about-account-value"): text info.source

src/views/article.nim

@@ -1,248 +0,0 @@
-# SPDX-License-Identifier: AGPL-3.0-only
-import strutils, strformat, tables, unicode, bitops, uri
-import karax/[karaxdsl, vdom]
-
-import renderutils, tweet, timeline
-import ".."/[types, utils, formatters]
-
-proc renderAtomicParagraph(paragraph: ArticleParagraph; article: Article;
-                           tweets: Table[int64, Tweet]; path: string;
-                           prefs: Prefs): VNode =
-  if paragraph.entityRanges.len == 0:
-    return text ""
-
-  let er = paragraph.entityRanges[0]
-  if er.key notin article.entities:
-    return text ""
-
-  let entity = article.entities[er.key]
-
-  case entity.kind
-  of "MEDIA":
-    buildHtml(tdiv(class="article-media")):
-      for id in entity.mediaIds:
-        let media = article.media.getOrDefault(id)
-        if media.url.len == 0:
-          continue
-        case media.kind
-        of "ApiGif":
-          video(src=getVidUrl(media.url), controls="", autoplay="", loop="",
-                muted="")
-        of "ApiVideo":
-          video(src=getVidUrl(media.url), controls="")
-        else:
-          a(href=getOrigPicUrl(media.url), target="_blank"):
-            img(src=getSmallPic(media.url), alt=entity.caption, loading="lazy")
-      if entity.caption.len > 0:
-        p(class="article-media-caption"): text entity.caption
-  of "TWEET":
-    let tweet = tweets.getOrDefault(
-      try: parseBiggestInt(entity.tweetId)
-      except ValueError: 0, nil)
-    if tweet != nil:
-      renderTweet(tweet, prefs, path)
-    else:
-      text ""
-  of "MARKDOWN":
-    var content = entity.markdown
-    if content.startsWith("```"):
-      let firstNl = content.find('\n')
-      if firstNl >= 0: content = content[firstNl + 1 .. ^1]
-      if content.endsWith("```"): content = content[0 .. ^4]
-      content = content.strip
-    buildHtml(pre()):
-      code(): text content
-  of "DIVIDER":
-    buildHtml(hr(class="article-divider"))
-  else:
-    text ""
-
-proc wrapStyle(node: VNode; style: int): VNode =
-  result = node
-  if style.testBit(4): result = buildHtml(code()): result
-  if style.testBit(0): result = buildHtml(strong()): result
-  if style.testBit(1): result = buildHtml(em()): result
-  if style.testBit(2): result = buildHtml(del()): result
-  if style.testBit(3): result = buildHtml(underlined()): result
-
-proc addContent(target: VNode; content: string; style = 0) =
-  var first = true
-  for line in content.split('\n'):
-    if not first:
-      target.add VNode(kind: VNodeKind.br)
-    first = false
-    var pos = 0
-    while pos < line.len:
-      let atPos = line.find('@', pos)
-      if atPos == -1:
-        target.add wrapStyle(text line[pos .. ^1], style)
-        break
-      if atPos > 0 and line[atPos - 1] in Letters + Digits + {'_'}:
-        target.add wrapStyle(text line[pos .. atPos], style)
-        pos = atPos + 1
-        continue
-      var j = atPos + 1
-      while j < line.len and j - atPos - 1 < 15 and
-            line[j] in Letters + Digits + {'_'}:
-        inc j
-      if j == atPos + 1:
-        target.add wrapStyle(text line[pos .. atPos], style)
-        pos = atPos + 1
-        continue
-      if atPos > pos:
-        target.add wrapStyle(text line[pos ..< atPos], style)
-      let username = line[atPos + 1 ..< j]
-      let link = a.newVNode()
-      link.setAttr("href", "/" & username)
-      link.add wrapStyle(text ("@" & username), style)
-      target.add link
-      pos = j
-
-proc applyInlineStyles(target: VNode; runes: seq[Rune]; start, length: int;
-                       styles: seq[ArticleStyle]) =
-  if styles.len == 0:
-    target.addContent($runes[start ..< start + length])
-    return
-
-  var
-    lastStyle = 0
-    lastStart = start
-  let endPos = start + length
-
-  for i in start ..< endPos:
-    var style = 0
-    for sr in styles:
-      let
-        sStart = sr.offset
-        sEnd = sStart + sr.length
-      if sStart <= i and sEnd > i:
-        case sr.style
-        of "Bold": style.setBit(0)
-        of "Italic": style.setBit(1)
-        of "Strikethrough": style.setBit(2)
-        of "Underline": style.setBit(3)
-        of "Code": style.setBit(4)
-        else: discard
-
-    if style != lastStyle:
-      if i > lastStart:
-        addContent(target, $runes[lastStart ..< i], lastStyle)
-      lastStyle = style
-      lastStart = i
-
-  if lastStart < endPos:
-    addContent(target, $runes[lastStart ..< endPos], lastStyle)
-
-proc renderTextParagraph(paragraph: ArticleParagraph; article: Article): VNode =
-  let text = paragraph.text
-
-  result = case paragraph.kind
-    of "header-one": h1.newVNode()
-    of "header-two": h2.newVNode()
-    of "header-three": h3.newVNode()
-    of "ordered-list-item", "unordered-list-item": li.newVNode()
-    of "blockquote": VNode(kind: VNodeKind.blockquote)
-    of "code-block":
-      let pre = pre.newVNode()
-      let code = code.newVNode()
-      code.add text text
-      pre.add code
-      return pre
-    else: p.newVNode()
-
-  let
-    runes = text.toRunes
-    textLen = runes.len
-  var last = 0
-  for er in paragraph.entityRanges:
-    if er.offset > last:
-      applyInlineStyles(result, runes, last, er.offset - last,
-                        paragraph.inlineStyles)
-
-    last = er.offset + er.length
-
-    var target = result
-    if er.key in article.entities:
-      let entity = article.entities[er.key]
-      if entity.kind == "LINK":
-        let parsed = parseUri(entity.url)
-        if parsed.scheme in ["http", "https"]:
-          target = a.newVNode()
-          if parsed.isTwitterUrl:
-            target.setAttr("href", parsed.path)
-          else:
-            target.setAttr("href", entity.url)
-
-    applyInlineStyles(target, runes, er.offset, er.length,
-                      paragraph.inlineStyles)
-    if target != result:
-      result.add target
-
-  if last < textLen:
-    applyInlineStyles(result, runes, last, textLen - last,
-                      paragraph.inlineStyles)
-
-  if paragraph.kind == "blockquote" and result.len > 0:
-    let lastChild = result[result.len - 1]
-    if lastChild.kind == VNodeKind.strong and lastChild.len > 0 and
-       lastChild[0].kind == VNodeKind.text:
-      lastChild.setAttr("class", "blockquote-attribution")
-
-proc renderArticle*(article: Article; tweets: Table[int64, Tweet];
-                    path: string; prefs: Prefs; tweetId=""): VNode =
-  let author = article.user
-
-  let main = buildHtml(article(class="article-body")):
-    h1(class="article-title"): text article.title
-
-    tdiv(class="article-author"):
-      tdiv(class="article-author-row"):
-        a(class="article-avatar", href=("/" & author.username)):
-          genImg(author.getUserPic("_bigger"), class=prefs.getAvatarClass)
-        tdiv(class="article-author-info"):
-          tdiv(class="article-author-name"):
-            linkUser(author, class="fullname")
-            verifiedIcon(author)
-          tdiv(class="article-author-meta"):
-            linkUser(author, class="username")
-            span(class="article-date-sep"): text " · "
-            a(class="article-date",
-              href=("/" & author.username & "/status/" & tweetId)):
-              text article.time.getShortTime
-      if not prefs.hideTweetStats:
-        renderStats(article.stats)
-
-  var listKind = ""
-  var list: VNode = nil
-
-  for paragraph in article.paragraphs:
-    let isListItem = paragraph.kind in [
-      "ordered-list-item", "unordered-list-item"]
-
-    if not isListItem and list != nil:
-      main.add list
-      list = nil
-      listKind = ""
-
-    if paragraph.kind == "atomic":
-      main.add renderAtomicParagraph(paragraph, article, tweets, path, prefs)
-    elif isListItem:
-      if paragraph.kind != listKind:
-        if list != nil:
-          main.add list
-        list = if paragraph.kind == "ordered-list-item": ol.newVNode()
-               else: ul.newVNode()
-        listKind = paragraph.kind
-      list.add renderTextParagraph(paragraph, article)
-    else:
-      main.add renderTextParagraph(paragraph, article)
-
-  if list != nil:
-    main.add list
-
-  buildHtml(tdiv(class="article-page")):
-    if article.coverImage.len > 0:
-      a(href=getOrigPicUrl(article.coverImage), target="_blank"):
-        img(class="article-cover", src=getSmallPic(article.coverImage), alt="")
-    main
-    renderToTop()