Initial plan

2026-10-28 00:16:48 +09:00 · 2026-10-05 14:25:10 +00:00
175 changed files with 365 additions and 6044 deletions
@@ -21,7 +21,7 @@ jobs:
          persist-credentials: false

      - name: Set up Ruby
-        uses: ruby/setup-ruby@26e5b7d197ebf60545ee9667bcbace0be11ccaec # v1.334.0
+        uses: ruby/setup-ruby@a0102e0972be65f351c307e2d64b9314a57c8073 # v1.324.0
        with:
          ruby-version: .ruby-version
          bundler-cache: true
@@ -40,7 +40,7 @@ jobs:
          persist-credentials: false

      - name: Set up Ruby
-        uses: ruby/setup-ruby@26e5b7d197ebf60545ee9667bcbace0be11ccaec # v1.334.0
+        uses: ruby/setup-ruby@a0102e0972be65f351c307e2d64b9314a57c8073 # v1.324.0
        with:
          ruby-version: .ruby-version
          bundler-cache: true
@@ -48,29 +48,6 @@ jobs:
      - name: Lint code for consistent style
        run: bin/rubocop

-  herb:
-    name: Herb check
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    steps:
-      - name: Install packages
-        run: sudo apt-get update && sudo apt-get install --no-install-recommends -y libvips
-
-      - name: Checkout code
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-        with:
-          persist-credentials: false
-
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@26e5b7d197ebf60545ee9667bcbace0be11ccaec # v1.334.0
-        with:
-          ruby-version: .ruby-version
-          bundler-cache: true
-
-      - name: Check that every HTML template compiles through Herb
-        run: bin/rails herb:check
-
  lint-actions:
    name: GitHub Actions audit
    runs-on: ubuntu-latest
@@ -102,7 +79,7 @@ jobs:
        options: --health-cmd "redis-cli ping" --health-interval 10s --health-timeout 5s --health-retries 5
    steps:
      - name: Install packages
-        run: sudo apt-get update && sudo apt-get install --no-install-recommends -y libsqlite3-0 sqlite3 libvips curl ffmpeg
+        run: sudo apt-get update && sudo apt-get install --no-install-recommends -y libsqlite3-0 libvips curl ffmpeg

      - name: Checkout code
        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
@@ -110,7 +87,7 @@ jobs:
          persist-credentials: false

      - name: Set up Ruby
-        uses: ruby/setup-ruby@26e5b7d197ebf60545ee9667bcbace0be11ccaec # v1.334.0
+        uses: ruby/setup-ruby@a0102e0972be65f351c307e2d64b9314a57c8073 # v1.324.0
        env:
          REDIS_URL: redis://localhost:6379/0
        with:
@@ -120,9 +97,6 @@ jobs:
      - name: Run tests
        run: bin/rails db:setup test

-      - name: Test benchmark response validation
-        run: bundle exec ruby bench/test_http_client.rb
-
  test_system:
    runs-on: ubuntu-latest
    permissions:
@@ -135,7 +109,7 @@ jobs:
        options: --health-cmd "redis-cli ping" --health-interval 10s --health-timeout 5s --health-retries 5
    steps:
      - name: Install packages
-        run: sudo apt-get update && sudo apt-get install --no-install-recommends -y libsqlite3-0 sqlite3 libvips curl ffmpeg
+        run: sudo apt-get update && sudo apt-get install --no-install-recommends -y libsqlite3-0 libvips curl ffmpeg

      - name: Checkout code
        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
@@ -143,7 +117,7 @@ jobs:
          persist-credentials: false

      - name: Set up Ruby
-        uses: ruby/setup-ruby@26e5b7d197ebf60545ee9667bcbace0be11ccaec # v1.334.0
+        uses: ruby/setup-ruby@a0102e0972be65f351c307e2d64b9314a57c8073 # v1.324.0
        env:
          REDIS_URL: redis://localhost:6379/0
        with:
@@ -1 +1 @@
-4.0.9
+3.4.10
@@ -1,7 +1,7 @@
 # syntax = docker/dockerfile:1

 # Make sure it matches the Ruby version in .ruby-version and Gemfile
-ARG RUBY_VERSION=4.0.9
+ARG RUBY_VERSION=3.4.10
 FROM docker.io/library/ruby:$RUBY_VERSION-slim AS base

 # Rails app lives here
@@ -13,18 +13,6 @@ RUN apt-get update -qq && \
    ln -s /usr/lib/$(uname -m)-linux-gnu/libjemalloc.so.2 /usr/local/lib/libjemalloc.so && \
    rm -rf /var/lib/apt/lists /var/cache/apt/archive

-# Fail the build if either of these withdrawn roots is still where Ruby's OpenSSL looks for
-# trusted certificates
-RUN ruby -ropenssl -e ' \
-    file = ENV[OpenSSL::X509::DEFAULT_CERT_FILE_ENV] || OpenSSL::X509::DEFAULT_CERT_FILE; \
-    dir = ENV[OpenSSL::X509::DEFAULT_CERT_DIR_ENV] || OpenSSL::X509::DEFAULT_CERT_DIR; \
-    pems = [file, *Dir.glob(File.join(dir, "*"))].select { |path| File.file?(path) } \
-      .flat_map { |path| File.read(path).scan(/-----BEGIN CERTIFICATE-----.+?-----END CERTIFICATE-----/m) }; \
-    subjects = pems.map { |pem| OpenSSL::X509::Certificate.new(pem).subject.to_s }.uniq; \
-    abort "Only #{subjects.size} roots in #{file} and #{dir}" if subjects.size < 100; \
-    withdrawn = subjects.grep(%r{/CN=(emSign ECC Root CA - G3|AAA Certificate Services)\z}); \
-    abort "Withdrawn roots still trusted: #{withdrawn}" if withdrawn.any?'
-
 # Set production environment
 ENV RAILS_ENV="production" \
    BUNDLE_DEPLOYMENT="1" \
@@ -1,7 +1,7 @@
 # syntax = docker/dockerfile:1

 # Make sure it matches the Ruby version in .ruby-version and Gemfile
-ARG RUBY_VERSION=4.0.9
+ARG RUBY_VERSION=3.4.10
 FROM ruby:$RUBY_VERSION-slim as base

 # Install the tools we need
@@ -12,7 +12,7 @@ gem "sqlite3"
 gem "redis", "~> 5.4"

 # Deployment
-gem "puma", "~> 8.0"
+gem "puma", "~> 7.2", ">= 7.2.1"

 # Jobs
 gem "resque", "~> 2.7.0"
@@ -43,6 +43,7 @@ gem "rqrcode"
 gem "rails_autolink"
 gem "geared_pagination"
 gem "jbuilder"
+gem "net-http-persistent"
 gem "surfguard", github: "basecamp/surfguard" # The SSRF address policy behind RestrictedHTTP
 gem "kredis"
 gem "platform_agent"
@@ -23,16 +23,16 @@ GIT

 GIT
  remote: https://github.com/rails/propshaft.git
-  revision: dc979db89cd07c72ee4d11d415ae1cb4fd072623
+  revision: e49a9de659ff27462015e54dd832e86e762a6ddc
  specs:
-    propshaft (1.3.2)
+    propshaft (1.2.1)
      actionpack (>= 7.0.0)
      activesupport (>= 7.0.0)
      rack

 GIT
  remote: https://github.com/rails/rails.git
-  revision: e3d5c569d217c56c022b04acb127a8c24dbe9685
+  revision: 1a02651ac37fb64b4de2a2b73461d86acf9c98fb
  branch: main
  specs:
    actioncable (8.2.0.alpha)
@@ -63,10 +63,10 @@ GIT
      rack-session (>= 1.0.1)
      rack-test (>= 0.6.3)
      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.7)
+      rails-html-sanitizer (~> 1.6)
      useragent (~> 0.16)
    actiontext (8.2.0.alpha)
-      action_text-trix (~> 2.1.16)
+      action_text-trix (~> 2.1.15)
      actionpack (= 8.2.0.alpha)
      activerecord (= 8.2.0.alpha)
      activestorage (= 8.2.0.alpha)
@@ -77,12 +77,11 @@ GIT
      activesupport (= 8.2.0.alpha)
      builder (~> 3.1)
      erubi (~> 1.11)
-      herb (>= 0.10)
      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.7)
+      rails-html-sanitizer (~> 1.6)
    activejob (8.2.0.alpha)
      activesupport (= 8.2.0.alpha)
-      globalid (>= 1.4.0)
+      globalid (>= 0.3.6)
    activemodel (8.2.0.alpha)
      activesupport (= 8.2.0.alpha)
    activerecord (8.2.0.alpha)
@@ -94,7 +93,7 @@ GIT
      activejob (= 8.2.0.alpha)
      activerecord (= 8.2.0.alpha)
      activesupport (= 8.2.0.alpha)
-      marcel (~> 2.0)
+      marcel (~> 1.0)
    activesupport (8.2.0.alpha)
      base64
      bigdecimal
@@ -105,8 +104,6 @@ GIT
      json
      logger (>= 1.4.2)
      minitest (>= 5.1)
-      psych (>= 4)
-      ractor-dispatch (>= 0.3.0)
      securerandom (>= 0.3)
      tzinfo (~> 2.0, >= 2.0.5)
      uri (>= 0.13.1)
@@ -145,8 +142,8 @@ GEM
    base64 (0.3.0)
    bcrypt (3.1.22)
    benchmark (0.5.0)
-    bigdecimal (4.1.3)
-    brakeman (8.1.0)
+    bigdecimal (3.3.1)
+    brakeman (8.0.6)
      racc
    builder (3.3.0)
    bundler-audit (0.9.3)
@@ -162,20 +159,20 @@ GEM
      regexp_parser (>= 1.5, < 3.0)
      xpath (~> 3.2)
    chunky_png (1.4.0)
-    concurrent-ruby (1.3.8)
+    concurrent-ruby (1.3.7)
    connection_pool (2.5.5)
    crack (1.0.0)
      bigdecimal
      rexml
-    crass (1.0.8)
+    crass (1.0.7)
    date (3.5.1)
-    debug (1.11.1)
+    debug (1.11.0)
      irb (~> 1.10)
      reline (>= 0.3.8)
    drb (2.2.3)
-    erb (6.0.7)
+    erb (6.0.4)
    erubi (1.13.1)
-    faker (3.8.0)
+    faker (3.5.2)
      i18n (>= 1.8.11, < 2)
    ffi (1.17.2)
    ffi (1.17.2-aarch64-linux-gnu)
@@ -185,22 +182,17 @@ GEM
    geared_pagination (1.2.0)
      activesupport (>= 5.0)
      addressable (>= 2.5.0)
-    globalid (1.4.0)
+    globalid (1.3.0)
      activesupport (>= 6.1)
    hashdiff (1.2.0)
-    herb (0.11.0-aarch64-linux-gnu)
-    herb (0.11.0-arm64-darwin)
-    herb (0.11.0-x86_64-darwin)
-    herb (0.11.0-x86_64-linux-gnu)
-    i18n (1.15.2)
+    i18n (1.14.7)
      concurrent-ruby (~> 1.0)
    image_processing (1.14.0)
      mini_magick (>= 4.9.5, < 6)
      ruby-vips (>= 2.0.17, < 3)
-    io-console (0.9.4)
-    irb (1.18.0)
+    io-console (0.8.1)
+    irb (1.15.3)
      pp (>= 0.6.0)
-      prism (>= 1.3.0)
      rdoc (>= 4.0.0)
      reline (>= 0.4.2)
    jbuilder (2.14.1)
@@ -227,28 +219,28 @@ GEM
      net-imap
      net-pop
      net-smtp
-    marcel (2.1.0)
+    marcel (1.1.0)
    matrix (0.4.3)
    mini_magick (5.3.1)
      logger
    mini_mime (1.1.5)
-    minitest (6.0.6)
-      drb (~> 2.0)
-      prism (~> 1.5)
+    minitest (5.26.2)
    mocha (3.1.0)
      ruby2_keywords (>= 0.0.5)
    mono_logger (1.1.2)
    multi_json (1.17.0)
    mustermann (3.0.4)
      ruby2_keywords (~> 0.0.1)
-    net-imap (0.6.7)
+    net-http-persistent (4.0.6)
+      connection_pool (~> 2.2, >= 2.2.4)
+    net-imap (0.6.4.1)
      date
      net-protocol
    net-pop (0.1.2)
      net-protocol
-    net-protocol (0.4.0)
+    net-protocol (0.2.2)
      timeout
-    net-smtp (0.5.2)
+    net-smtp (0.5.1)
      net-protocol
    nio4r (2.7.5)
    nokogiri (1.19.4-aarch64-linux-gnu)
@@ -268,18 +260,18 @@ GEM
    platform_agent (1.0.1)
      activesupport (>= 5.2.0)
      useragent (~> 0.16.3)
-    pp (0.6.4)
+    pp (0.6.3)
      prettyprint
-    prettyprint (0.2.1)
-    prism (1.9.0)
-    psych (5.5.0)
+    prettyprint (0.2.0)
+    prism (1.4.0)
+    psych (5.2.6)
      date
      stringio
    public_suffix (6.0.2)
-    puma (8.0.2)
+    puma (7.2.1)
      nio4r (~> 2.0)
    racc (1.8.1)
-    rack (3.2.7)
+    rack (3.2.6)
    rack-protection (4.2.1)
      base64 (>= 0.1.0)
      logger (>= 1.6.0)
@@ -289,9 +281,8 @@ GEM
      rack (>= 3.0.0)
    rack-test (2.2.0)
      rack (>= 1.3)
-    rackup (2.3.1)
+    rackup (2.2.1)
      rack (>= 3)
-    ractor-dispatch (0.3.0)
    rails-dom-testing (2.3.0)
      activesupport (>= 5.0.0)
      minitest
@@ -304,24 +295,19 @@ GEM
      activesupport (> 3.1)
      railties (> 3.1)
    rainbow (3.1.1)
-    rake (13.4.2)
-    rbs (4.2.0)
-      logger
-      prism (>= 1.6.0)
-      tsort
-    rdoc (8.1.0)
+    rake (13.3.1)
+    rdoc (6.16.1)
      erb
-      prism (>= 1.6.0)
-      rbs (>= 4.0.0)
+      psych (>= 4.0.0)
      tsort
    redis (5.4.1)
      redis-client (>= 0.22.0)
-    redis-client (0.30.1)
+    redis-client (0.25.2)
      connection_pool
    redis-namespace (1.11.0)
      redis (>= 4)
    regexp_parser (2.11.2)
-    reline (0.7.0)
+    reline (0.6.3)
      io-console (~> 0.5)
    resque (2.7.0)
      mono_logger (~> 1)
@@ -336,29 +322,29 @@ GEM
      chunky_png (~> 1.0)
      rqrcode_core (~> 2.0)
    rqrcode_core (2.1.0)
-    rubocop (1.91.0)
-      json (>= 2.3)
+    rubocop (1.80.2)
+      json (~> 2.3)
      language_server-protocol (~> 3.17.0.2)
      lint_roller (~> 1.1.0)
-      parallel (>= 1.10)
+      parallel (~> 1.10)
      parser (>= 3.3.0.2)
      rainbow (>= 2.2.2, < 4.0)
      regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.49.0, < 2.0)
+      rubocop-ast (>= 1.46.0, < 2.0)
      ruby-progressbar (~> 1.7)
      unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.50.0)
+    rubocop-ast (1.46.0)
      parser (>= 3.3.7.2)
-      prism (~> 1.7)
-    rubocop-performance (1.27.0)
+      prism (~> 1.4)
+    rubocop-performance (1.25.0)
      lint_roller (~> 1.1)
-      rubocop (>= 1.89.0, < 2.0)
-      rubocop-ast (>= 1.47.1, < 2.0)
-    rubocop-rails (2.38.0)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
+    rubocop-rails (2.33.3)
      activesupport (>= 4.2.0)
      lint_roller (~> 1.1)
      rack (>= 1.1)
-      rubocop (>= 1.89.0, < 2.0)
+      rubocop (>= 1.75.0, < 2.0)
      rubocop-ast (>= 1.44.0, < 2.0)
    rubocop-rails-omakase (1.1.0)
      rubocop (>= 1.72)
@@ -369,9 +355,9 @@ GEM
      ffi (~> 1.12)
      logger
    ruby2_keywords (0.0.5)
-    rubyzip (3.7.0)
+    rubyzip (3.4.0)
    securerandom (0.4.1)
-    selenium-webdriver (4.49.0)
+    selenium-webdriver (4.35.0)
      base64 (~> 0.2)
      logger (~> 1.4)
      rexml (~> 3.2, >= 3.2.5)
@@ -390,14 +376,14 @@ GEM
      rack-protection (= 4.2.1)
      rack-session (>= 2.0.0, < 3)
      tilt (~> 2.0)
-    sqlite3 (2.10.2-aarch64-linux-gnu)
-    sqlite3 (2.10.2-arm64-darwin)
-    sqlite3 (2.10.2-x86_64-darwin)
-    sqlite3 (2.10.2-x86_64-linux-gnu)
+    sqlite3 (2.9.6-aarch64-linux-gnu)
+    sqlite3 (2.9.6-arm64-darwin)
+    sqlite3 (2.9.6-x86_64-darwin)
+    sqlite3 (2.9.6-x86_64-linux-gnu)
    stimulus-rails (1.3.4)
      railties (>= 6.0.0)
-    stringio (3.2.0)
-    thor (1.5.0)
+    stringio (3.1.8)
+    thor (1.4.0)
    thruster (0.1.23-aarch64-linux)
    thruster (0.1.23-arm64-darwin)
    thruster (0.1.23-x86_64-darwin)
@@ -426,7 +412,7 @@ GEM
    websocket-extensions (0.1.5)
    xpath (3.2.0)
      nokogiri (~> 1.8)
-    zeitwerk (2.8.3)
+    zeitwerk (2.7.3)

 PLATFORMS
  aarch64-linux
@@ -449,10 +435,11 @@ DEPENDENCIES
  kredis
  lexxy (~> 0.9.24)
  mocha
+  net-http-persistent
  ostruct
  platform_agent
  propshaft!
-  puma (~> 8.0)
+  puma (~> 7.2, >= 7.2.1)
  rails!
  rails_autolink
  redis (~> 5.4)
@@ -49,31 +49,20 @@ If you'd rather run the Docker image yourself, you can read more about that in t
 > that people have someone to contact if they need help with their account. If that bothers you, put in any
 > email address you want and create yourself a new admin account.

-Authenticated room, message, sidebar and search pages use a bounded 64 MiB cache per worker.
-Set `CAMPFIRE_RESPONSE_CACHE_MB=0` to disable it. Every request still checks authentication
-and room access; commits from any SQLite writer invalidate complete cached HTML and gzip bodies.
-Native HTML, JSON and stream fragments have a separate 64 MiB memory limit per worker;
-shared rate limits retain their existing store.
-
 ## Other implementations

-Campfire also has implementations in Django, Laravel, Express, Elixir, Go, Rust and C:
+Campfire also has implementations in Django, Laravel, Express, Elixir, Go and Rust:

-| HTTP workload (requests/sec) | Rails | [Django](https://github.com/basecamp/once-campfire-django) | [Laravel](https://github.com/basecamp/once-campfire-laravel) | [Express](https://github.com/basecamp/once-campfire-express) | [Elixir](https://github.com/basecamp/once-campfire-elixir) | [Go](https://github.com/basecamp/once-campfire-go) | [Rust](https://github.com/basecamp/once-campfire-rust) | [C](https://github.com/basecamp/once-campfire-c) |
-|---|---:|---:|---:|---:|---:|---:|---:|---:|
-| Room page | 4,101 | 1,507 | 3,872 | 42,636 | 5,350 | 53,060 | 106,494 | 137,524 |
-| Messages page | 4,115 | 1,596 | 3,995 | 74,362 | 5,712 | 54,800 | 102,697 | 144,642 |
-| Sidebar | 4,333 | 1,873 | 4,493 | 94,329 | 5,949 | 59,144 | 120,294 | 152,002 |
-| Search | 4,282 | 1,862 | 4,172 | 84,665 | 5,848 | 60,509 | 121,378 | 149,487 |
-| Post a message | 330 | 262 | 794 | 2,155 | 1,278 | 9,021 | 8,037 | 7,530 |
-| Backend KLOC | 5.5 | 5.3 | 4.1 | 6.8 | 11.6 | 23.2 | 30.7 | 94.8 |
+| HTTP workload (requests/sec) | Rails | [Django](https://github.com/basecamp/once-campfire-django) | [Laravel](https://github.com/basecamp/once-campfire-laravel) | [Express](https://github.com/basecamp/once-campfire-express) | [Elixir](https://github.com/basecamp/once-campfire-elixir) | [Go](https://github.com/basecamp/once-campfire-go) | [Rust](https://github.com/basecamp/once-campfire-rust) |
+|---|---:|---:|---:|---:|---:|---:|---:|
+| Room page | 241 | 170 | 164 | 559 | 722 | 3,860 | 36,260 |
+| Messages page | 413 | 196 | 175 | 777 | 1,053 | 5,573 | 40,872 |
+| Sidebar | 552 | 615 | 715 | 4,125 | 1,275 | 19,753 | 34,672 |
+| Search | 435 | 315 | 305 | 1,294 | 1,156 | 7,053 | 33,299 |
+| Post a message | 273 | 154 | 137 | 256 | 801 | 4,767 | 6,896 |

-KLOC counts backend code plus executable code in templates; excludes plain HTML, frontend, tests, dependencies and generated files.
-
-[Shared verification](https://github.com/basecamp/once-campfire-verification) · [Detailed results](https://github.com/basecamp/once-campfire-verification/blob/main/docs/performance-review.md).
-
-Measured with 16 concurrent clients on an AMD Ryzen AI MAX+ 395 with 32 GB RAM,
-with four hardware cores allocated to each app.
+Measured with 16 concurrent clients on an AMD Ryzen AI MAX+ 395,
+with four hardware threads allocated to each app.

 ## Development

@@ -83,7 +72,3 @@ Please see our [development guide](docs/development.md) for how to get Campfire
 ## Security

 See [SECURITY.md](SECURITY.md) for how to report a vulnerability and a description of our trust model.
-
-Browser writes use Rails’ `Sec-Fetch-Site` header-only protection and `Origin` check.
-HTTPS requires browser metadata; plain HTTP retains the missing-header fallback.
-Forms contain no CSRF tokens. Existing cookies, bot APIs and signed uploads remain compatible.
@@ -2,42 +2,19 @@ module ApplicationCable
  class Connection < ActionCable::Connection::Base
    include Authentication::SessionLookup

-    SESSION_CHECK_INTERVAL = 1.minute
-
    identified_by :current_user

    def connect
      self.current_user = find_verified_user
-      @session_checked_at = Time.now
-    end
-
-    # Signing out or changing the password ends sessions and then disconnects their connections, but a connection can
-    # miss that: one that found its session just before isn't listening yet. So on the server's heartbeat, which
-    # reaches every open connection, each one looks its session up again now and then, and closes once it's gone. A
-    # rejected connection has no session, and stays registered until its socket closes.
-    def beat
-      super
-      check_session if @session_checked_at&.before?(SESSION_CHECK_INTERVAL.ago)
    end

    private
      def find_verified_user
-        if @verified_session = find_session_by_cookie
-          @verified_session.user
+        if verified_session = find_session_by_cookie
+          verified_session.user
        else
          reject_unauthorized_connection
        end
      end
-
-      def check_session
-        @session_checked_at = Time.now
-        perform_work -> { close_unless_session_remains }, :call
-      end
-
-      def close_unless_session_remains
-        unless Session.exists?(@verified_session.id)
-          close reason: ActionCable::INTERNAL[:disconnect_reasons][:unauthorized]
-        end
-      end
  end
 end
@@ -22,6 +22,6 @@ class PresenceChannel < RoomChannel
    end

    def broadcast_read_room
-      ActionCable.server.broadcast "user_#{current_user.id}_reads", { room_id: membership.room_id, at: Time.current.to_f }
+      ActionCable.server.broadcast "user_#{current_user.id}_reads", { room_id: membership.room_id }
    end
 end
@@ -2,7 +2,7 @@ class Accounts::UsersController < ApplicationController
  before_action :ensure_can_administer, :set_user, only: %i[ update destroy ]

  def index
-    set_page_and_extract_portion_from User.visible_to(Current.user).ordered.member, per_page: 500
+    set_page_and_extract_portion_from User.active.ordered.without_bots, per_page: 500
  end

  def update
@@ -3,9 +3,9 @@ class AccountsController < ApplicationController
  before_action :set_account

  def edit
-    users = User.visible_to(Current.user).ordered
-    @administrators = users.administrator
-    set_page_and_extract_portion_from users.member, per_page: 500
+    users = account_users.ordered.without_bots
+    @administrators, @members = users.partition(&:administrator?)
+    set_page_and_extract_portion_from users, per_page: 500
  end

  def update
@@ -21,4 +21,12 @@ class AccountsController < ApplicationController
    def account_params
      params.require(:account).permit(:name, :logo, settings: {})
    end
+
+    def account_users
+      if Current.user.can_administer?
+        User.where(status: [ :active, :banned ])
+      else
+        User.active
+      end
+    end
 end
@@ -1,4 +1,4 @@
 class ApplicationController < ActionController::Base
-  include AllowBrowser, Authentication, Authorization, BlockBannedRequests, SetCurrentRequest, SetPlatform, TrackedRoomVisit, VersionHeaders, CachedResponses, InlineScriptHashes
+  include AllowBrowser, Authentication, Authorization, BlockBannedRequests, SetCurrentRequest, SetPlatform, TrackedRoomVisit, VersionHeaders
  include Turbo::Streams::Broadcasts, Turbo::Streams::StreamName
 end
@@ -7,7 +7,7 @@ module Authentication
    before_action :deny_bots
    helper_method :signed_in?

-    protect_from_forgery using: :header_only, with: :exception, unless: -> { authenticated_by.bot_key? }
+    protect_from_forgery with: :exception, unless: -> { authenticated_by.bot_key? }
  end

  class_methods do
@@ -57,7 +57,7 @@ module Authentication
    end

    def start_new_session_for(user)
-      user.sessions.create!(user_agent: request.user_agent, ip_address: request.remote_ip).tap do |session|
+      user.sessions.start!(user_agent: request.user_agent, ip_address: request.remote_ip).tap do |session|
        authenticated_as session
      end
    end
@@ -1,12 +1,7 @@
 module Authentication::SessionLookup
  def find_session_by_cookie
    if token = cookies.signed[:session_token]
-      version = @response_cache_version if @response_cache_version && (request.get? || request.head?)
-      session, user = RecordCache.fetch([ "session", Digest::SHA256.hexdigest(token.to_s) ], version) do
-        session = Session.find_by(token: token)
-        [ session, session&.user ]
-      end
-      session&.tap { |record| record.user = user }
+      Session.find_by(token: token)
    end
  end
 end
@@ -1,118 +0,0 @@
-require "zlib"
-
-module CachedResponses
-  extend ActiveSupport::Concern
-
-  CACHE_HEADERS = %w[ content-type content-encoding cache-control etag last-modified vary ].freeze
-
-  included do
-    prepend_before_action :capture_response_cache_version
-  end
-
-  def perform_caching
-    return false unless super && @response_cache_version.present? && !FragmentCache.transaction_open?
-
-    # Check again after authentication, before the first native fragment lookup.
-    # Later renders retain this immutable namespace and cannot poison a new epoch.
-    unless defined?(@fragment_cache_snapshot_valid)
-      @fragment_cache_snapshot_valid = @response_cache_version == ResponseCache.instance.version
-    end
-    @fragment_cache_snapshot_valid
-  end
-
-  # Keep the class store (including shared rate limits) and Rails.cache unchanged.
-  def cache_store
-    FragmentCache.store
-  end
-
-  def combined_fragment_cache_key(key)
-    @fragment_cache_context ||= [
-      request.base_url, request.script_name, request.format.to_s, I18n.locale,
-      Current.user&.id, (Digest::SHA256.hexdigest(Current.session.token) if Current.session)
-    ].freeze
-    version = @response_cache_version unless Array(key).flatten.any? { |part| part.is_a?(FragmentCache::ContentKey) }
-    super([ version, @fragment_cache_context, key ])
-  end
-
-  private
-    def read_record_cache_version
-      @response_cache_version if request.get? || request.head?
-    end
-
-    def capture_response_cache_version
-      # Capture for native HTML/JSON/stream renders too, even with page reuse off.
-      # Detached renderers do not run callbacks and therefore render uncached.
-      @response_cache_version = ResponseCache.instance.version
-    end
-
-    # Register after room authorization, but before presentation queries.
-    def cache_read_response
-      if cacheable_read_request?
-        encoding = Rack::Utils.select_best_encoding(%w[ gzip identity ], Rack::Utils.q_values(request.headers["Accept-Encoding"]))
-        return yield unless encoding
-
-        key = response_cache_key(encoding)
-        return yield if key.bytesize > ResponseCache::MAX_KEY_BYTES
-
-        entry = ResponseCache.instance.read(key, @response_cache_version)
-        rendered = false
-        unless entry
-          ResponseCache.instance.synchronize_render(key, @response_cache_version) do
-            entry = ResponseCache.instance.read(key, @response_cache_version)
-            if !entry && ResponseCache.instance.version == @response_cache_version
-              original_session = session.to_hash.deep_dup
-              yield
-              rendered = true
-              entry = cache_completed_response(key, original_session, encoding)
-            end
-          end
-        end
-
-        if entry
-          response.headers.merge!(entry[:headers])
-          response.headers.delete("Content-Length")
-          self.response_body = entry[:body]
-        elsif !rendered
-          # A queued request retains its pre-auth snapshot. If it has expired,
-          # render outside the stripe instead of blocking the next generation.
-          yield
-        end
-      else
-        yield
-      end
-    end
-
-    def cache_completed_response(key, original_session, encoding)
-      if response.status == 200 && response.media_type == "text/html" && session.to_hash == original_session && !response.headers["Content-Encoding"]
-        body = encoding == "gzip" ? Zlib.gzip(response.body) : response.body
-        unless body.empty? || response.headers["ETag"] || response.headers["Last-Modified"]
-          # Match Rack::ETag once, rather than hashing the same bytes on each hit.
-          response.headers["ETag"] = %(W/"#{Digest::SHA256.hexdigest(body).byteslice(0, 32)}")
-        end
-        response.headers["Content-Encoding"] = "gzip" if encoding == "gzip"
-        response.headers["Vary"] = (response.headers["Vary"].to_s.split(/,\s*/) | [ "Accept-Encoding" ]).join(", ")
-        headers = response.headers.slice(*CACHE_HEADERS).to_h.freeze
-        entry = { body: body.freeze, headers: headers }.freeze
-        ResponseCache.instance.write(key, @response_cache_version, entry)
-        entry
-      end
-    end
-
-    def cacheable_read_request?
-      ResponseCache.instance.budget.positive? && @response_cache_version && request.get? && request.format.html? && Current.session &&
-        !authenticated_by.bot_key? && flash.empty? &&
-        !request.headers["If-None-Match"] && !request.headers["If-Modified-Since"] &&
-        !Rails.application.config.content_security_policy_nonce_generator &&
-        !FragmentCache.transaction_open?
-    end
-
-    def response_cache_key(encoding)
-      ActiveSupport::JSON.encode([
-        controller_path, request.fullpath, request.base_url, request.user_agent, encoding,
-        request.headers["Accept"], request.headers["Turbo-Frame"], I18n.locale,
-        # Old token-bearing installation cookies remain valid without affecting HTML.
-        Current.user.id, Current.session.token, session.to_hash.except("_csrf_token"),
-        cookies.to_h.except("_campfire_session", "session_token")
-      ])
-    end
-end
@@ -1,69 +0,0 @@
-# Allows the scripts the importmap helper emits and nothing else: the inline
-# importmap and its entry-point module by content hash, and the asset
-# directory its URLs point into. Not the whole origin, because uploads are
-# served from this origin too. The hashes change only when the importmap does
-# (a deploy), so cached HTML stays valid, unlike a per-request nonce.
-module InlineScriptHashes
-  extend ActiveSupport::Concern
-
-  ENTRY_POINT_SCRIPT = %(import "application")
-
-  included do
-    # With the policy turned off there's nothing to add to, so leave the
-    # request without one rather than starting an empty policy
-    content_security_policy if: -> { request.content_security_policy } do |policy|
-      if sources = policy.directives["script-src"]
-        importmap = Rails.application.importmap.to_json(resolver: helpers)
-        policy.directives["script-src"] = (sources - [ "'self'" ]) | script_sources(importmap)
-        policy.worker_src "#{request.host_with_port}#{service_worker_path(format: :js)}"
-      end
-    end
-  end
-
-  mattr_accessor :last_script_sources
-
-  private
-    # Parsing the importmap and resolving each of its URLs costs about a
-    # millisecond a page, yet the answer changes only with the importmap and
-    # the host the page is served from. Keep the last one: a single entry, so
-    # a request with a made-up Host header can't grow it.
-    def script_sources(importmap)
-      key = [ importmap, request.base_url, request.host_with_port, config.relative_url_root ]
-      cached_key, sources = InlineScriptHashes.last_script_sources
-
-      if cached_key == key
-        sources
-      else
-        (script_locations(importmap) | script_hashes(importmap, ENTRY_POINT_SCRIPT)).freeze.tap do |sources|
-          InlineScriptHashes.last_script_sources = [ key, sources ].freeze
-        end
-      end
-    end
-
-    # The importmap is resolved by Rails' asset helpers, so its URLs already
-    # carry any relative root and asset host, however the host is written:
-    # with or without a scheme, protocol-relative, a %d set, or a proc. Each
-    # is allowed up to its asset directory, the last one in its path, since an
-    # asset host's own path may contain one too; a URL outside it is allowed
-    # exactly.
-    #
-    # This origin's own sources leave out the scheme, so they match the page's
-    # scheme even behind a proxy that terminates TLS without saying so.
-    #
-    # A path only limits the first request: browsers check just the origin
-    # after a redirect. Nothing under the asset directory redirects.
-    def script_locations(importmap)
-      assets = File.join(config.relative_url_root.to_s, Rails.application.config.assets.prefix, "")
-
-      JSON.parse(importmap)["imports"].values.map do |url|
-        url = URI.join(request.base_url, url)
-        origin = url.origin == request.base_url ? request.host_with_port : url.origin
-        directory = url.path[0, url.path.rindex(assets) + assets.length] if url.path.include?(assets)
-        "#{origin}#{directory || url.path}"
-      end.uniq
-    end
-
-    def script_hashes(*scripts)
-      scripts.map { |script| "'sha256-#{Digest::SHA256.base64digest(script)}'" }
-    end
-end
@@ -7,10 +7,7 @@ module RoomScoped

  private
    def set_room
-      @membership, @room = RecordCache.fetch([ "membership", Current.user.id, params[:room_id] ], read_record_cache_version) do
-        membership = Current.user.memberships.find_by!(room_id: params[:room_id])
-        [ membership, membership.room ]
-      end
-      @membership.room = @room
+      @membership = Current.user.memberships.find_by!(room_id: params[:room_id])
+      @room = @membership.room
    end
 end
@@ -8,6 +8,6 @@ module SetCurrentRequest
  end

  def default_url_options
-    { host: Current.request_host, port: Current.request&.optional_port, protocol: Current.request_protocol }.compact_blank
+    { host: Current.request_host, protocol: Current.request_protocol }.compact_blank
  end
 end
@@ -36,7 +36,7 @@ class Messages::BoostsController < ApplicationController

    def broadcast_create
      @boost.broadcast_append_to @boost.message.room, :messages,
-        target: helpers.dom_id(@boost.message, :boosts), partial: "messages/boosts/boost", attributes: { maintain_scroll: true }
+        target: "boosts_message_#{@boost.message.client_message_id}", partial: "messages/boosts/boost", attributes: { maintain_scroll: true }
    end

    def broadcast_remove
@@ -37,7 +37,7 @@ class Messages::ByBotsController < MessagesController
    end

    def set_pagination_headers
-      headers["X-Total-Count"] = @room.messages_count.to_s
+      headers["X-Total-Count"] = @room.messages.count.to_s

      if next_page = next_page_params
        headers["Link"] = %(<#{room_bot_messages_url(@room, params[:bot_key], **next_page)}>; rel="next")
@@ -4,7 +4,6 @@ class MessagesController < ApplicationController
  before_action :set_room, except: :create
  before_action :set_message, only: %i[ show edit update destroy ]
  before_action :ensure_can_administer, only: %i[ edit update destroy ]
-  around_action :cache_read_response, only: :index

  layout false, only: :index

@@ -12,13 +11,7 @@ class MessagesController < ApplicationController
    @messages = find_paged_messages

    if @messages.any?
-      body = render_to_string(:index)
-      # Creator, body and boost edits can change HTML without touching messages.
-      fresh_when etag: Digest::SHA256.hexdigest(body), template: false
-      unless performed?
-        response.content_type = "text/html"
-        self.response_body = body
-      end
+      fresh_when @messages
    else
      head :no_content
    end
@@ -28,9 +21,7 @@ class MessagesController < ApplicationController
    set_room
    @message = @room.messages.create_with_attachment!(message_params)

-    # Both deliveries contain the same token-free, viewer-independent markup.
-    @message_html = render_to_string partial: "messages/message", formats: :html, locals: { message: @message }
-    @message.broadcast_create(html: @message_html)
+    @message.broadcast_create
    deliver_webhooks_to_bots
  rescue ActiveRecord::RecordNotFound
    render action: :room_not_found
@@ -7,7 +7,5 @@ class QrCodeController < ApplicationController

    expires_in 1.year, public: true
    render plain: qr_code, content_type: "image/svg+xml"
-  rescue ArgumentError, RQRCodeCore::QRCodeRunTimeError
-    head :bad_request
  end
 end
@@ -2,7 +2,6 @@ class RoomsController < ApplicationController
  before_action :set_room, only: %i[ show destroy ]
  before_action :ensure_can_administer, only: %i[ destroy ]
  before_action :remember_last_room_visited, only: :show
-  around_action :cache_read_response, only: :show

  def index
    redirect_to room_url(Current.user.rooms.last)
@@ -13,7 +12,7 @@ class RoomsController < ApplicationController
  end

  def destroy
-    @room.destroy_later
+    @room.destroy

    broadcast_remove_room
    redirect_to root_url
@@ -21,10 +20,7 @@ class RoomsController < ApplicationController

  private
    def set_room
-      room = RecordCache.fetch([ "room", self.class.name, Current.user.id, params[:room_id] || params[:id] ], read_record_cache_version) do
-        [ room_scope.find_by(id: params[:room_id] || params[:id]) ]
-      end.first
-      if room
+      if room = room_scope.find_by(id: params[:room_id] || params[:id])
        @room = room
      else
        redirect_to root_url, alert: "Room not found or inaccessible"
@@ -1,5 +1,4 @@
 class SearchesController < ApplicationController
-  around_action :cache_read_response, only: :index
  before_action :set_messages

  def index
@@ -21,7 +20,7 @@ class SearchesController < ApplicationController
  private
    def set_messages
      if query.present?
-        @messages = Message.search_reachable(Current.user, query)
+        @messages = Current.user.reachable_messages.search(query).with_presentation.last_page_of(100)
      else
        @messages = Message.none
      end
@@ -11,7 +11,5 @@ class Sessions::TransfersController < ApplicationController
    else
      head :bad_request
    end
-  rescue ActiveRecord::RecordInvalid
-    head :bad_request
  end
 end
@@ -14,8 +14,6 @@ class SessionsController < ApplicationController
    else
      render_rejection :unauthorized
    end
-  rescue ActiveRecord::RecordInvalid
-    render_rejection :unauthorized
  end

  def destroy
@@ -1,9 +1,8 @@
 class UnfurlLinksController < ApplicationController
-  # The pasted link decides which hosts an unfurl looks up and fetches from, and how quickly they answer.
-  DEADLINE = 10.seconds
-
  def create
-    if opengraph = unfurl(url_param)
+    opengraph = Opengraph::Metadata.from_url(url_param)
+
+    if opengraph.valid?
      render json: opengraph
    else
      head :no_content
@@ -14,14 +13,4 @@ class UnfurlLinksController < ApplicationController
    def url_param
      params.require(:url)
    end
-
-    # One deadline for everything the link leads to: DNS lookups, redirects, the page, the image check.
-    def unfurl(url)
-      Timeout.timeout(DEADLINE) do
-        Opengraph::Metadata.from_url(url).then { |opengraph| opengraph if opengraph.valid? }
-      end
-    rescue Timeout::Error
-      Rails.logger.warn "Gave up unfurling #{url} after #{DEADLINE.inspect}"
-      nil
-    end
 end
@@ -1,26 +1,14 @@
 class Users::ProfilesController < ApplicationController
  before_action :set_user

-  # Limited like signing in, so the current password can't be guessed here instead.
-  rate_limit to: 10, within: 3.minutes, only: :update, if: :answering_password_challenge?,
-    with: -> { redirect_to user_profile_url, alert: "Too many attempts. Try again in a few minutes." }
-
  def show
    @direct_memberships, @shared_memberships =
      Current.user.memberships.with_ordered_room.partition { |m| m.room.direct? }
  end

  def update
-    if @user.update user_params
-      start_new_session_for @user if @user.saved_change_to_password_digest?
-
-      redirect_to user_profile_url, notice: update_notice
-    else
-      redirect_to user_profile_url, alert: update_alert
-    end
-  rescue ActiveRecord::RecordInvalid
-    # The password changed again before this browser's new session could start, and that change signed it out.
-    redirect_to new_session_url
+    @user.update user_params
+    redirect_to user_profile_url, notice: update_notice
  end

  private
@@ -28,35 +16,11 @@ class Users::ProfilesController < ApplicationController
      @user = Current.user
    end

-    # Always with the challenge, so the model checks it whenever the save would change the password, however the
-    # request spelled the new one.
    def user_params
      params.require(:user).permit(:name, :avatar, :email_address, :password, :bio).compact
-        .merge(password_challenge: password_challenge)
-    end
-
-    # Only a string is a challenge, so the rate limit counts exactly what the model checks.
-    def password_challenge
-      challenge = params.dig(:user, :password_challenge)
-      challenge.is_a?(String) ? challenge : ""
-    end
-
-    # Guessing the current password means sending one, so this is what the rate limit counts.
-    def answering_password_challenge?
-      !password_challenge.empty?
    end

    def update_notice
      params[:user][:avatar] ? "It may take up to 30 minutes to change everywhere." : "✓"
    end
-
-    def update_alert
-      if !@user.errors.include?(:password_challenge)
-        @user.errors.full_messages.to_sentence
-      elsif password_challenge.empty?
-        "Enter your current password to change it."
-      else
-        "That isn't your current password."
-      end
-    end
 end
@@ -5,14 +5,17 @@ class Users::PushSubscriptionsController < ApplicationController
  end

  def create
-    subscription = @push_subscriptions.find_or_initialize_by(push_subscription_params)
-    subscription.user_agent = request.user_agent if subscription.new_record?
-
-    # Existing endpoints must pass current validations too
-    if subscription.valid?
-      head register_while_signed_in(subscription) ? :ok : :unauthorized
+    if subscription = @push_subscriptions.find_by(push_subscription_params)
+      # Existing endpoints must pass current validations
+      if subscription.valid?
+        subscription.touch
+        head :ok
+      else
+        head :unprocessable_entity
+      end
    else
-      head :unprocessable_entity
+      subscription = @push_subscriptions.create push_subscription_params.merge(user_agent: request.user_agent)
+      head subscription.persisted? ? :ok : :unprocessable_entity
    end
  end

@@ -26,24 +29,6 @@ class Users::PushSubscriptionsController < ApplicationController
      @push_subscriptions = Current.user.push_subscriptions
    end

-    # A password change ends every session and subscription. A request that authenticated just before it mustn't
-    # put one back, so the session is checked under the same write lock as the save, and the endpoint is looked up
-    # again there, past the query cache, so two tabs posting at once register it once. Validation, which resolves
-    # the endpoint's address, runs before taking the lock.
-    def register_while_signed_in(subscription)
-      Push::Subscription.uncached do
-        Push::Subscription.transaction do
-          if Session.exists?(Current.session.id)
-            if existing = @push_subscriptions.find_by(push_subscription_params)
-              existing.touch
-            else
-              subscription.save!(validate: false)
-            end
-          end
-        end
-      end
-    end
-
    def push_subscription_params
      params.require(:push_subscription).permit(:endpoint, :p256dh_key, :auth_key)
    end
@@ -1,11 +1,9 @@
 class Users::SidebarsController < ApplicationController
  DIRECT_PLACEHOLDERS = 20
-  around_action :cache_read_response, only: :show

  def show
-    visible_memberships = Current.user.memberships.visible
-    @direct_memberships = visible_memberships.with_direct_rooms
-    @other_memberships  = visible_memberships.with_ordered_room.without_direct_rooms
+    @direct_memberships, @other_memberships = Current.user.memberships.visible.with_ordered_room.partition { |membership| membership.room.direct? }
+    @direct_memberships = @direct_memberships.sort_by { |membership| membership.room.updated_at }.reverse

    @direct_placeholder_users = find_direct_placeholder_users
  end
@@ -36,11 +36,6 @@ module ApplicationHelper
  end

  private
-    # Header-only forgery protection needs no secret in forms or cached HTML.
-    def token_tag(*)
-      ""
-    end
-
    def admin_body_class
      "admin" if Current.user&.can_administer?
    end
@@ -5,7 +5,7 @@ module ContentFilters
  #
  #   * SanitizeTags strips disallowed markup from the message body
  #   * Action Text sanitizes the rendered content (lib/rails_ext/action_text_allowed_tags.rb)
-  #   * the final html is re-sanitized before its text is linked (MessagesHelper#auto_link_text)
+  #   * auto_link re-sanitizes the final html (MessagesHelper#message_presentation)
  EDITOR_FORMATTING_TAGS = %w[ s u mark table thead tbody tfoot tr th td ]
  EDITOR_FORMATTING_ATTRIBUTES = %w[ data-language ]

@@ -17,16 +17,11 @@ class Messages::AttachmentPresentation
    attr_reader :message, :context
    delegate :tag, :link_to, :broadcast_image_tag, :rails_blob_path, :url_for, to: :context

-    # Previews are made when the message is posted, within limits. One that wasn't, because the file was too large or
-    # the preview failed, isn't attempted again from here: its URL would make it on every view.
    def render_preview
-      case
-      when message.attachment.video?
+      if message.attachment.video?
        video_preview_tag
-      when message.attachment.representation(:thumb).processed?
-        lightboxed_image_preview_tag
      else
-        render_link
+        lightboxed_image_preview_tag
      end
    end

@@ -35,17 +30,11 @@ class Messages::AttachmentPresentation

      inline_media_dimension_constraints(width, height) do
        tag.video \
-          src: rails_blob_path(message.attachment), poster: video_poster_url,
+          src: rails_blob_path(message.attachment), poster: url_for(message.attachment.preview(format: :webp, resize_to_limit: [ Message::THUMBNAIL_MAX_WIDTH, Message::THUMBNAIL_MAX_HEIGHT ])),
          controls: true, preload: :none, width: "100%", height: "100%", class: "message__attachment"
      end
    end

-    # A preview is processed once the frame is drawn, but the poster is a variant of that frame, which can fail on its own.
-    def video_poster_url
-      poster = message.attachment.preview(:poster)
-      url_for(poster) if poster.processed? && poster.image.variant(poster.variation).processed?
-    end
-
    def lightboxed_image_preview_tag
      width, height = preview_dimensions

@@ -1,12 +1,9 @@
 module MessagesHelper
-  # Rendered text is re-sanitized before linking. Rails' default safe list
-  # lacks the formatting the rich text editor produces
+  # auto_link re-sanitizes with Rails' default safe list, which lacks the
+  # formatting the rich text editor produces
  AUTO_LINK_ALLOWED_TAGS = Rails::HTML5::SafeListSanitizer.allowed_tags + ContentFilters::EDITOR_FORMATTING_TAGS
  AUTO_LINK_ALLOWED_ATTRIBUTES = Rails::HTML5::SafeListSanitizer.allowed_attributes + ContentFilters::EDITOR_FORMATTING_ATTRIBUTES

-  # Text auto_link could turn into a link: a URL has a scheme or www., an email address an @
-  LINKABLE_TEXT = /:|@|www\./i
-
  def message_area_tag(room, &)
    tag.div id: "message-area", class: "message-area", contents: true, data: {
      controller: "messages presence drop-target",
@@ -39,7 +36,6 @@ module MessagesHelper
        controller: "reply",
        user_id: message.creator_id,
        message_id: message.id,
-        client_message_id: message.client_message_id,
        message_timestamp: message_timestamp_milliseconds,
        message_updated_at: message.updated_at.to_fs(:epoch),
        sort_value: message_timestamp_milliseconds,
@@ -66,7 +62,8 @@ module MessagesHelper
    when "sound"
      message_sound_presentation(message)
    else
-      text_message_presentation(message.body.body)
+      auto_link h(ContentFilters::TextMessagePresentationFilters.apply(message.body.body)),
+        html: { target: "_blank" }, sanitize_options: { tags: AUTO_LINK_ALLOWED_TAGS, attributes: AUTO_LINK_ALLOWED_ATTRIBUTES }
    end
  rescue Exception => e
    Sentry.capture_exception(e, extra: { message: message })
@@ -75,65 +72,7 @@ module MessagesHelper
    ""
  end

-  # These controls contain URLs and static markup, but no viewer or token state.
-  # Keep them across database commits; attachment controls still render afresh.
-  def cache_message_actions(message, &block)
-    return capture(&block) unless controller.perform_caching && !message.attachment?
-
-    key = fragment_name_with_digest([
-      "message-actions-v1", request.base_url, request.script_name, I18n.locale, message.id, message.room_id
-    ], nil)
-    FragmentCache.store.fetch(key) { capture(&block) }
-  end
-
-  def message_fragment_cache_key(message)
-    return message unless controller.perform_caching &&
-      %i[room creator rich_text_body boosts attachment_attachment].all? { |name| message.association(name).loaded? }
-
-    room = message.room
-    body = message.body.body
-    return message if room.direct? || message.attachment? || !body || body.to_html.include?("<action-text-attachment") ||
-      message.boosts.any? { |boost| !boost.association(:booster).loaded? }
-
-    # Collection caching preloads these rows before deriving keys. Read their
-    # actual content: foreign SQL writers need not touch Rails timestamps.
-    dependencies = [ message.attributes, room.attributes.slice("id", "type", "name"), message.creator.attributes,
-      body.to_html, message.boosts.sort_by(&:created_at).map { |boost| [ boost.attributes, boost.booster.attributes ] } ]
-    FragmentCache::ContentKey.new(Digest::SHA256.hexdigest(ActiveSupport::JSON.encode(dependencies)))
-  end
-
  private
-    def text_message_presentation(body)
-      render = -> { auto_link_text h(ContentFilters::TextMessagePresentationFilters.apply(body)) }
-
-      # Embedded attachments render database-backed metadata and signed URLs.
-      # Plain text HTML depends only on its content, even after a foreign edit.
-      html = body.to_html
-      if controller.perform_caching && !html.include?("<action-text-attachment") && html.bytesize <= ResponseCache::MAX_ENTRY_BYTES
-        FragmentCache.store.fetch([ "text-presentation-v2", I18n.locale, Digest::SHA256.hexdigest(html) ]) { render.call }
-      else
-        render.call
-      end
-    end
-
-    # auto_link finds URLs and email addresses with regular expressions, which
-    # can't tell an attribute value from text. Hand it one text node at a time,
-    # escaped as the serializer writes text, so a link can only land between tags.
-    def auto_link_text(html)
-      fragment = Nokogiri::HTML5.fragment(sanitize(html, tags: AUTO_LINK_ALLOWED_TAGS, attributes: AUTO_LINK_ALLOWED_ATTRIBUTES))
-
-      fragment.xpath(".//text()[not(ancestor::a)]").each do |node|
-        if node.text.match?(LINKABLE_TEXT)
-          text = node.to_html
-          linked = auto_link(text, html: { target: "_blank" })
-          node.replace Nokogiri::HTML5.fragment(linked) unless linked == text
-        end
-      end
-
-      # A <pre> starting with a newline needs an extra one written out to survive the next parse
-      fragment.to_html(preserve_newline: true).html_safe
-    end
-
    def messages_actions
      "turbo:before-stream-render@document->messages#beforeStreamRender keydown.up@document->messages#editMyLastMessage"
    end
@@ -2,7 +2,6 @@ module TranslationsHelper
  TRANSLATIONS = {
    email_address:  { "🇺🇸": "Enter your email address", "🇪🇸": "Introduce tu correo electrónico", "🇫🇷": "Entrez votre adresse courriel", "🇮🇳": "अपना ईमेल पता दर्ज करें", "🇩🇪": "Geben Sie Ihre E-Mail-Adresse ein", "🇧🇷": "Insira seu endereço de email", "🇯🇵": "メールアドレスを入力してください" },
    password: { "🇺🇸": "Enter your password", "🇪🇸": "Introduce tu contraseña", "🇫🇷": "Saisissez votre mot de passe", "🇮🇳": "अपना पासवर्ड दर्ज करें", "🇩🇪": "Geben Sie Ihr Passwort ein", "🇧🇷": "Insira sua senha", "🇯🇵": "パスワードを入力してください" },
-    current_password: { "🇺🇸": "Enter your current password", "🇪🇸": "Introduce tu contraseña actual", "🇫🇷": "Saisissez votre mot de passe actuel", "🇮🇳": "अपना वर्तमान पासवर्ड दर्ज करें", "🇩🇪": "Geben Sie Ihr aktuelles Passwort ein", "🇧🇷": "Insira sua senha atual", "🇯🇵": "現在のパスワードを入力してください" },
    update_password: { "🇺🇸": "Change password", "🇪🇸": "Cambiar contraseña", "🇫🇷": "Changer le mot de passe", "🇮🇳": "पासवर्ड बदलें", "🇩🇪": "Passwort ändern", "🇧🇷": "Alterar senha", "🇯🇵": "パスワードを変更" },
    user_name: { "🇺🇸": "Enter your name", "🇪🇸": "Introduce tu nombre", "🇫🇷": "Entrez votre nom", "🇮🇳": "अपना नाम दर्ज करें", "🇩🇪": "Geben Sie Ihren Namen ein", "🇧🇷": "Insira seu nome", "🇯🇵": "お名前を入力してください" },
    account_name: { "🇺🇸": "Name this account", "🇪🇸": "Nombre de esta cuenta", "🇫🇷": "Nommez ce compte", "🇮🇳": "इस खाते का नाम दें", "🇩🇪": "Benennen Sie dieses Konto", "🇧🇷": "Dê um nome a essa conta", "🇯🇵": "アカウントに名前を付ける" },
@@ -1,7 +0,0 @@
-module Users::PushSubscriptionsHelper
-  # Names the session without revealing its token, so the browser can tell when it's in a new one. The creation
-  # time keeps an id reused by a new database from looking like the same session.
-  def push_subscription_session_marker
-    Digest::SHA256.hexdigest("push-subscription-session-#{Current.session.id}-#{Current.session.created_at.to_f}") if Current.session
-  end
-end
@@ -46,7 +46,6 @@ export default class extends Controller {
  }

  messageTargetConnected(target) {
-    this.#reconcilePendingMessage(target)
    this.#formatter.format(target, ThreadStyle.thread)
  }

@@ -126,25 +125,6 @@ export default class extends Controller {

  // Internal

-  // The composer inserts a pending message client-side using the client_message_id
-  // as its DOM id. The server broadcast now renders the real message with a DOM id
-  // derived from the record's primary key, so it no longer replaces the pending
-  // element by id. Reconcile by matching the server message's client_message_id and
-  // dropping our own pending placeholder. Only elements flagged data-pending-message
-  // (client-side placeholders, never broadcast) are removed, so a message another
-  // member posted reusing this client_message_id can never displace a real one.
-  #reconcilePendingMessage(target) {
-    const clientMessageId = target.dataset.clientMessageId
-
-    if (target.dataset.messageId && clientMessageId) {
-      const selector = `[data-pending-message][data-client-message-id="${CSS.escape(clientMessageId)}"]`
-
-      this.messagesTarget.querySelectorAll(selector).forEach((pending) => {
-        if (pending !== target) pending.remove()
-      })
-    }
-  }
-
  async #ensureUpToDate() {
    if (!this.#paginator.upToDate) {
      await this.#paginator.resetToLastPage()
@@ -106,8 +106,7 @@ export default class extends Controller {

  async #syncPushSubscription(subscription) {
    const response = await post(this.subscriptionsUrlValue, { body: this.#extractJsonPayloadAsString(subscription), responseKind: "turbo-stream" })
-    // Only a refused endpoint is for good. A session signed out mid-request posts it again after signing in.
-    if (response.unprocessableEntity) subscription.unsubscribe()
+    if (!response.ok) subscription.unsubscribe()
  }

  async #requestPermissionAndSubscribe(registration) {
@@ -1,32 +0,0 @@
-import { Controller } from "@hotwired/stimulus"
-import { post } from "@rails/request.js"
-
-const SYNCED_SESSION_KEY = "push-subscription-synced-session"
-
-// A password change removes the account's push subscriptions, the one this browser holds included. Post it again
-// once per session, so a browser that's still signed in keeps getting notifications. A failure here leaves the
-// browser's own subscription alone: the next session tries again.
-export default class extends Controller {
-  static values = { url: String, session: String }
-
-  async connect() {
-    if (this.#allowed && this.sessionValue && localStorage.getItem(SYNCED_SESSION_KEY) !== this.sessionValue) {
-      const registration = await navigator.serviceWorker.getRegistration(window.location.origin)
-      const subscription = await registration?.pushManager?.getSubscription()
-
-      if (Notification.permission === "granted" && subscription) {
-        await post(this.urlValue, { body: this.#payload(subscription), responseKind: "turbo-stream" })
-        localStorage.setItem(SYNCED_SESSION_KEY, this.sessionValue)
-      }
-    }
-  }
-
-  get #allowed() {
-    return navigator.serviceWorker && window.Notification
-  }
-
-  #payload(subscription) {
-    const { endpoint, keys: { p256dh, auth } } = subscription.toJSON()
-    return JSON.stringify({ push_subscription: { endpoint, p256dh_key: p256dh, auth_key: auth } })
-  }
-}
@@ -16,7 +16,7 @@ export default class extends Controller {
    })
  }

-  #read = ({ room_id, at }) => {
-    this.dispatch("read", { detail: { roomId: room_id, at } })
+  #read = ({ room_id }) => {
+    this.dispatch("read", { detail: { roomId: room_id } })
  }
 }
@@ -28,7 +28,7 @@ export default class extends Controller {
  }

  #stripMentionAttachments(node) {
-    node.querySelectorAll(".mention").forEach(mention => mention.replaceWith(mention.textContent.trim()))
+    node.querySelectorAll(".mention").forEach(mention => mention.outerHTML = mention.textContent.trim())
    return node
  }

@@ -7,13 +7,8 @@ export default class extends Controller {
  static classes = [ "unread" ]

  #disconnected = true
-  #connection = 0
-  #discardDirectEditor = false
-  #readAt = new Map()

  async connect() {
-    this.element.addEventListener("turbo:click", this.#directNavigation)
-    this.element.addEventListener("turbo:before-frame-render", this.#preserveDirectEditor)
    this.channel ??= await cable.subscribeTo({ channel: "UnreadRoomsChannel" }, {
      connected: this.#channelConnected.bind(this),
      disconnected: this.#channelDisconnected.bind(this),
@@ -22,11 +17,7 @@ export default class extends Controller {
  }

  disconnect() {
-    this.element.removeEventListener("turbo:click", this.#directNavigation)
-    this.element.removeEventListener("turbo:before-frame-render", this.#preserveDirectEditor)
-    this.#discardDirectEditor = false
    ignoringBriefDisconnects(this.element, () => {
-      this.#channelDisconnected()
      this.channel?.unsubscribe()
      this.channel = null
    })
@@ -36,58 +27,19 @@ export default class extends Controller {
    this.read({ detail: { roomId: Current.room.id } })
  }

-  read({ detail: { roomId, at } }) {
+  read({ detail: { roomId } }) {
    const room = this.#findRoomTarget(roomId)

-    if (at) {
-      this.#readAt.set(Number(roomId), Math.max(Number(at), this.#readAt.get(Number(roomId)) ?? 0))
-    }
-
    if (room) {
      room.classList.remove(this.unreadClass)
      this.dispatch("read", { detail: { targetId: roomId } })
    }
  }

-  // Preserve the live picker through background refreshes, but allow deliberate navigation.
-  #directNavigation = event => {
-    if (event.target.closest("a")?.dataset.turboFrame === this.element.id) {
-      this.#discardDirectEditor = true
-    }
-  }
-
-  #preserveDirectEditor = event => {
-    if (event.target !== this.element) return
-    const discard = this.#discardDirectEditor
-    this.#discardDirectEditor = false
-    if (discard) return
-
-    const current = this.element.querySelector("#direct_rooms_control")
-    const incoming = event.detail.newFrame.querySelector("#direct_rooms_control")
-    if (!current?.querySelector('[data-autocomplete-target="input"]') || !incoming) return
-
-    // Turbo's Bardo moves the actual element, keeping input, selections and controllers.
-    const controls = [ current, incoming ].map(element => [ element, element.hasAttribute("data-turbo-permanent") ])
-    for (const [ element ] of controls) element.setAttribute("data-turbo-permanent", "")
-    const render = event.detail.render
-    event.detail.render = (...args) => {
-      try {
-        return render(...args)
-      } finally {
-        for (const [ element, permanent ] of controls) element.toggleAttribute("data-turbo-permanent", permanent)
-      }
-    }
-  }
-
-  async #channelConnected() {
+  #channelConnected() {
    if (this.#disconnected) {
      this.#disconnected = false
-      const connection = ++this.#connection
-      // Reloading an unfinished frame aborts its response body reader.
-      await this.element.loaded
-      if (this.element.isConnected && !this.#disconnected && connection === this.#connection) {
-        this.element.reload()
-      }
+      this.element.reload()
    }
  }

@@ -95,11 +47,11 @@ export default class extends Controller {
    this.#disconnected = true
  }

-  #unread({ roomId, at }) {
+  #unread({ roomId }) {
    const unreadRoom = this.#findRoomTarget(roomId)

    if (unreadRoom) {
-      if (Current.room.id != roomId && !this.#readSince(roomId, at)) {
+      if (Current.room.id != roomId) {
        unreadRoom.classList.add(this.unreadClass)
      }

@@ -107,12 +59,6 @@ export default class extends Controller {
    }
  }

-  // Notices fan out one member at a time, so one can arrive after the member has already
-  // read the room in another tab. It still reorders the room, but doesn't mark it unread.
-  #readSince(roomId, at) {
-    return Number(at) <= this.#readAt.get(Number(roomId))
-  }
-
  #findRoomTarget(roomId) {
    return this.roomTargets.find(roomTarget => roomTarget.dataset.roomId == roomId)
  }
@@ -13,6 +13,7 @@ export default class FileUploader {

    const req = new XMLHttpRequest()
    req.open("POST", this.url)
+    req.setRequestHeader("X-CSRF-Token", document.querySelector("meta[name=csrf-token]").content)
    req.upload.addEventListener("progress", this.#uploadProgress.bind(this))

    const result = new Promise((resolve, reject) => {
@@ -1,5 +0,0 @@
-class Message::BroadcastUnreadRoomJob < ApplicationJob
-  def perform(message)
-    message.broadcast_unread_room
-  end
-end
@@ -1,8 +0,0 @@
-class Room::DestroyJob < ApplicationJob
-  discard_on ActiveJob::DeserializationError
-
-  def perform(room, former_member_ids)
-    room.reset_remote_connections_of(former_member_ids)
-    room.destroy_one_message_at_a_time
-  end
-end
@@ -1,20 +0,0 @@
-# Native view caches share one byte budget across every database generation.
-class FragmentCache
-  # Only callers that fingerprint every rendered dependency may omit the epoch.
-  ContentKey = Data.define(:digest) do
-    def cache_key
-      digest
-    end
-  end
-
-  STORE = ActiveSupport::Cache::MemoryStore.new(size: 64.megabytes)
-  private_constant :STORE
-
-  def self.store
-    STORE
-  end
-
-  def self.transaction_open?
-    ActiveRecord::Base.connection_pool.with_connection(&:transaction_open?)
-  end
-end
@@ -9,8 +9,7 @@ class Membership < ApplicationRecord
  enum :involvement, %w[ invisible nothing mentions everything ].index_by(&:itself), prefix: :involved_in

  scope :with_ordered_room, -> { includes(:room).joins(:room).order("LOWER(rooms.name)") }
-  scope :with_direct_rooms, -> { includes(:room).joins(:room).merge(Room.directs).order(rooms: { updated_at: :desc }) }
-  scope :without_direct_rooms, -> { joins(:room).merge(Room.without_directs) }
+  scope :without_direct_rooms, -> { joins(:room).where.not(room: { type: "Rooms::Direct" }) }

  scope :visible, -> { where.not(involvement: :invisible) }
  scope :unread,  -> { where.not(unread_at: nil) }
@@ -9,9 +9,7 @@ class Message < ApplicationRecord
  has_rich_text :body

  before_create -> { self.client_message_id ||= Random.uuid } # Bots don't care
-  # Run after Action Text and Active Storage autosave, while creation is still atomic.
-  after_save :record_creation, if: :previously_new_record?
-  after_create_commit -> { room.push_later(self) }
+  after_create_commit -> { room.receive(self) }

  scope :ordered, -> { order(:created_at) }
  scope :with_creator, -> { preload(creator: :avatar_attachment) }
@@ -23,15 +21,11 @@ class Message < ApplicationRecord
  scope :with_presentation, -> { with_creator.with_attachment_details.with_boosts.preload(:room) }

  def plain_text_body
-    content = body.body
-    text = if content && content.fragment.find_all(ActionText::Attachment.tag_name).empty?
-      # ActionText::Content#to_plain_text duplicates the fragment to replace
-      # attachments. Without them, reuse its native Fragment conversion instead.
-      content.fragment.to_plain_text.dup
-    else
-      body.to_plain_text
-    end
-    text.presence || attachment&.filename&.to_s || ""
+    body.to_plain_text.presence || attachment&.filename&.to_s || ""
+  end
+
+  def to_key
+    [ client_message_id ]
  end

  def content_type
@@ -47,10 +41,4 @@ class Message < ApplicationRecord
      Sound.find_by_name match[:name]
    end
  end
-
-  private
-    def record_creation
-      create_in_index
-      room.unread_memberships(self)
-    end
 end
@@ -4,14 +4,9 @@ module Message::Attachment
  THUMBNAIL_MAX_WIDTH = 1200
  THUMBNAIL_MAX_HEIGHT = 800

-  # Decoding a picture, or a video's frame, costs in proportion to its pixels, however small the file. The largest
-  # phone photos have 200 million.
-  THUMBNAIL_MAX_PIXELS = 250_000_000
-
  included do
    has_one_attached :attachment do |attachable|
      attachable.variant :thumb, resize_to_limit: [ THUMBNAIL_MAX_WIDTH, THUMBNAIL_MAX_HEIGHT ]
-      attachable.variant :poster, format: :webp, resize_to_limit: [ THUMBNAIL_MAX_WIDTH, THUMBNAIL_MAX_HEIGHT ]
    end
  end

@@ -35,25 +30,12 @@ module Message::Attachment
      attachment&.analyze
    end

-    # A file that ffmpeg or libvips can't decode is still the message: post it without a preview.
    def process_attachment_thumbnail
-      return if too_many_pixels_to_preview?
-
      case
      when attachment.video?
-        attachment.preview(:poster).processed
+        attachment.preview(format: :webp).processed
      when attachment.representable?
        attachment.representation(:thumb).processed
      end
-    rescue ActiveStorage::PreviewError, Vips::Error => error
-      Rails.logger.warn "Posted #{attachment.filename} without a preview: #{error.class}: #{error.message.lines.first&.chomp}"
-    end
-
-    # Without a size, the analyzer couldn't read the file's header, and the previewer wouldn't either.
-    def too_many_pixels_to_preview?
-      if attachment.image? || attachment.video?
-        width, height = attachment.metadata.values_at(:width, :height)
-        width.nil? || height.nil? || width * height > THUMBNAIL_MAX_PIXELS
-      end
    end
 end
@@ -1,29 +1,21 @@
 module Message::Broadcasts
-  def broadcast_create(html: nil)
-    broadcast_append_to room, :messages, target: [ room, :messages ], **(html ? { html: html } : {})
-    broadcast_unread_room_later
+  def broadcast_create
+    broadcast_append_to room, :messages, target: [ room, :messages ]
+    broadcast_unread_room
  end

  def broadcast_remove
    broadcast_remove_to room, :messages
  end

-  # Fanned out to the room's members rather than published on one global stream, so
-  # that the timing of activity in a room only reaches people who are in it. Of those,
-  # only the ones who still have it unread or are in it now: by the time this runs,
-  # someone may have opened the room and moved on, and would see it marked unread again.
-  def broadcast_unread_room
-    payload = ActiveSupport::JSON.encode(roomId: room.id, at: created_at.to_f)
-
-    room.memberships.unread.or(room.memberships.connected).pluck(:user_id).each do |user_id|
-      ActionCable.server.broadcast UnreadRoomsChannel.stream_name_for(user_id), payload, coder: nil
-    end
-  end
-
  private
-    # The fanout is one publish per member, which in a big room takes far longer than the
-    # rest of posting a message, so it runs in a job rather than while the poster waits.
-    def broadcast_unread_room_later
-      Message::BroadcastUnreadRoomJob.perform_later(self)
+    # Fanned out to the room's members rather than published on one global stream, so
+    # that the timing of activity in a room only reaches people who are in it.
+    def broadcast_unread_room
+      payload = ActiveSupport::JSON.encode(roomId: room.id)
+
+      room.memberships.pluck(:user_id).each do |user_id|
+        ActionCable.server.broadcast UnreadRoomsChannel.stream_name_for(user_id), payload, coder: nil
+      end
    end
 end
@@ -2,8 +2,7 @@ module Message::Mentionee
  extend ActiveSupport::Concern

  def mentionees
-    ids = mentioned_users.map(&:id)
-    ids.empty? ? User.none : room.users.where(id: ids)
+    room.users.where(id: mentioned_users.map(&:id))
  end

  private
@@ -36,10 +36,7 @@ module Message::Pagination
    scope :page_after, ->(message) { after(message).first_page }

    scope :page_created_since, ->(time) { where("created_at > ?", time).first_page }
-    # Sorting on +created_at, which no index covers, has SQLite find the few messages updated since
-    # through (room_id, updated_at) and sort just those, instead of walking the whole room by
-    # (room_id, created_at) looking for them.
-    scope :page_updated_since, ->(time) { Page.load(where("updated_at > ?", time).reorder(Arel.sql("+messages.created_at")), :last, PAGE_SIZE) }
+    scope :page_updated_since, ->(time) { where("updated_at > ?", time).last_page }
  end

  class_methods do
@@ -52,7 +49,7 @@ module Message::Pagination
    end

    def paged?
-      offset(PAGE_SIZE).exists?
+      count > PAGE_SIZE
    end
  end
 end
@@ -2,8 +2,8 @@ module Message::Searchable
  extend ActiveSupport::Concern

  included do
-    before_update        -> { @attachment_replaced = attachment_changes.key?("attachment") }
-    after_update_commit  :update_in_index, if: :indexed_text_changed?
+    after_create_commit  :create_in_index
+    after_update_commit  :update_in_index
    after_destroy_commit :remove_from_index

    scope :search, ->(query) { joins("join message_search_index idx on messages.id = idx.rowid").where("idx.body match ?", match_terms(query)).ordered }
@@ -17,43 +17,11 @@ module Message::Searchable
    end
  end

-  class_methods do
-    def search_reachable(user, query, size: 100)
-      relation = user.reachable_messages.search(query).with_presentation
-      probe = connection.select_rows(sanitize_sql([ <<~SQL, user.id, match_terms(query) ]))
-        SELECT m.id, mm.user_id IS NOT NULL FROM message_search_index idx
-        JOIN messages m ON m.id = idx.rowid
-        LEFT JOIN memberships mm ON mm.room_id = m.room_id AND mm.user_id = ?
-        WHERE idx.body MATCH ? ORDER BY idx.rowid DESC LIMIT 1000
-      SQL
-      ids = probe.filter_map { |id, reachable| id if reachable == 1 }.first(size)
-
-      # A scoped fallback preserves older reachable hits behind a large private history.
-      if ids.size < size && probe.size == 1000
-        relation.last_page_of_matches(size)
-      else
-        Message::Pagination::Page.load(relation.where(id: ids).reorder(:id), :last, size)
-      end
-    end
-
-    # Orders by the index's rowid, which is the message id, so SQLite walks the full-text index
-    # newest first and stops at the page. Ordering by created_at sorted every match before paging.
-    def last_page_of_matches(size)
-      Message::Pagination::Page.load(reorder("idx.rowid"), :last, size)
-    end
-  end
-
  private
    def create_in_index
      execute_sql_with_binds "insert into message_search_index(rowid, body) values (?, ?)", id, plain_text_body
    end

-    # Boosts touch their message too: rewrite the index only when the body was saved or the attachment replaced.
-    # Active Storage clears attachment_changes in its own after_commit, before this one runs.
-    def indexed_text_changed?
-      association(:rich_text_body).target&.saved_change_to_body? || @attachment_replaced
-    end
-
    def update_in_index
      execute_sql_with_binds "update message_search_index set body = ? where rowid = ?", plain_text_body, id
    end
@@ -5,7 +5,6 @@ class Opengraph::Fetch
  ALLOWED_DOCUMENT_CONTENT_TYPE = "text/html"
  MAX_BODY_SIZE = 5.megabytes
  MAX_REDIRECTS = 10
-  TIMEOUT = 7.seconds # to connect (TLS included), and for each read and write, as Webhook does

  class TooManyRedirectsError < StandardError; end
  class RedirectDeniedError < StandardError; end
@@ -23,14 +22,9 @@ class Opengraph::Fetch
  end

  private
-    # The nil proxy address ignores http_proxy: a proxy would look the host up again, and the connection
-    # would no longer go to the checked IP.
-    #
-    # The timeouts bound each operation. A host can still send its headers or body a byte at a time,
-    # in as many reads as it likes: UnfurlLinksController puts the whole unfurl under one deadline.
    def request(url, request_class, ip:)
      MAX_REDIRECTS.times do
-        Net::HTTP.start(url.host, url.port, nil, ipaddr: ip, use_ssl: url.scheme == "https", **timeouts) do |http|
+        Net::HTTP.start(url.host, url.port, ipaddr: ip, use_ssl: url.scheme == "https") do |http|
          http.request request_class.new(url) do |response|
            if response.is_a?(Net::HTTPRedirection)
              url, ip = resolve_redirect(response["location"])
@@ -44,11 +38,6 @@ class Opengraph::Fetch
      raise TooManyRedirectsError
    end

-    # Without max_retries: 0, Net::HTTP sends a GET or HEAD that timed out a second time.
-    def timeouts
-      { open_timeout: TIMEOUT, read_timeout: TIMEOUT, write_timeout: TIMEOUT, max_retries: 0 }
-    end
-
    def resolve_redirect(location)
      url = URI.parse(location)
      raise RedirectDeniedError unless url.is_a?(URI::HTTP)
@@ -14,9 +14,9 @@ class Push::Subscription < ApplicationRecord
  validates :endpoint, presence: true
  validate :validate_endpoint_url

-  def notification(badge: user.memberships.unread.count, **params)
+  def notification(**params)
    # Defer DNS lookup to the delivery worker to prevent rebinding
-    WebPush::Notification.new(**params, badge: badge, endpoint: endpoint, endpoint_ip_resolver: method(:resolved_endpoint_ip), p256dh_key: p256dh_key, auth_key: auth_key)
+    WebPush::Notification.new(**params, badge: user.memberships.unread.count, endpoint: endpoint, endpoint_ip_resolver: method(:resolved_endpoint_ip), p256dh_key: p256dh_key, auth_key: auth_key)
  end

  # Validate at point of use, not just when saved.
@@ -1,24 +0,0 @@
-# Rebuild request-local models from bounded, immutable database snapshots.
-# The observer must still see the captured epoch after lookup and admission.
-class RecordCache
-  def self.fetch(key, version)
-    return yield unless version && ResponseCache.instance.budget.positive? && !FragmentCache.transaction_open?
-
-    key = ActiveSupport::Cache.expand_cache_key([ "record-snapshot-v1", version, key ])
-    return yield if key.bytesize > ResponseCache::MAX_KEY_BYTES
-
-    if snapshot = FragmentCache.store.read(key)
-      if ResponseCache.instance.version == version
-        return ActiveSupport::JSON.decode(snapshot).map { |name, attributes| name.constantize.instantiate(attributes) }
-      end
-    end
-
-    records = yield
-    if records.all? { |record| record&.persisted? && !record.changed? } && ResponseCache.instance.version == version
-      # Raw database values retain timestamp precision and native enum binding.
-      snapshot = ActiveSupport::JSON.encode(records.map { |record| [ record.class.name, record.attributes_before_type_cast ] })
-      FragmentCache.store.write(key, snapshot) if snapshot.bytesize <= ResponseCache::MAX_ENTRY_BYTES
-    end
-    records
-  end
-end
@@ -1,98 +0,0 @@
-require "sqlite3"
-
-# A read-only observer sees commits from every writer, including other runtimes.
-# PRAGMA data_version can only be compared on the same persistent connection.
-class ResponseCache
-  MAX_ENTRY_BYTES = 1.megabyte
-  MAX_KEY_BYTES = 2.kilobytes
-
-  def self.instance
-    INSTANCE
-  end
-
-  def initialize
-    @mutex = Mutex.new
-    @entries = {}
-    @bytes = 0
-    @render_locks = Array.new(16) { Mutex.new }
-  end
-
-  def budget
-    [ ENV.fetch("CAMPFIRE_RESPONSE_CACHE_MB", "64").to_i, 0 ].max.megabytes
-  end
-
-  def version
-    @mutex.synchronize { current_version }
-  rescue SQLite3::Exception
-    clear
-    nil
-  end
-
-  def read(key, version)
-    @mutex.synchronize do
-      @entries[key]&.first if current_version == version
-    end
-  rescue SQLite3::Exception
-    clear
-    nil
-  end
-
-  # Collapse cold renders without retaining a mutex for every viewer or URL.
-  # Rendering must never hold the observer/entry mutex: controllers read it too.
-  def synchronize_render(key, version, &block)
-    @render_locks[[ key, version ].hash % @render_locks.length].synchronize(&block)
-  end
-
-  def write(key, version, entry)
-    size = key.bytesize + entry[:body].bytesize + entry[:headers].sum { |name, value| name.bytesize + value.bytesize } + 256
-    return if key.bytesize > MAX_KEY_BYTES || size > [ budget, MAX_ENTRY_BYTES ].min
-
-    @mutex.synchronize do
-      return unless current_version == version
-      return if @entries.key?(key)
-
-      while @entries.any? && @bytes + size > budget
-        _, (_, removed_size) = @entries.shift
-        @bytes -= removed_size
-      end
-      @entries[key] = [ entry, size ]
-      @bytes += size
-    end
-  rescue SQLite3::Exception
-    clear
-  end
-
-  def clear
-    @mutex.synchronize do
-      @entries.clear
-      @bytes = 0
-      @observer&.close
-      @observer = @database = @version = nil
-    end
-  end
-
-  private
-    def current_version
-      database = File.expand_path(ActiveRecord::Base.connection_db_config.database)
-      if @database != database || !@observer
-        @entries.clear
-        @bytes = 0
-        @observer&.close
-        @observer = nil
-        @observer = SQLite3::Database.new(database, readonly: true)
-        @database = database
-        @namespace = SecureRandom.hex(16)
-        @version = nil
-      end
-
-      version = @observer.get_first_value("PRAGMA data_version")
-      if @version != version
-        @entries.clear
-        @bytes = 0
-        @version = version
-      end
-      [ @database, @namespace, @version ]
-    end
-
-  INSTANCE = new
-end
@@ -45,52 +45,11 @@ class Room < ApplicationRecord
    end
  end

-  # Takes the room away from its members at once, and leaves its messages to Room::DestroyJob. Destroying them in
-  # the room's own transaction held the database's write lock, and stopped every other write, until the last one.
-  # An open room is closed first, so that no one who joins the account before the job runs is let in.
-  def destroy_later
-    room = open? ? becomes!(Rooms::Closed) : self
-
-    former_member_ids = transaction do
-      room.save!
-      room.memberships.pluck(:user_id).tap { room.memberships.delete_all }
-    end
-
-    Room::DestroyJob.perform_later(room, former_member_ids)
-  end
-
-  # Deleting the memberships skips the reset that revoking one does, so the former members get it here, all at once,
-  # before the messages go: their connections stop receiving the room's streams. It's done in the job, not the
-  # request, because it costs a Redis round trip per member.
-  def reset_remote_connections_of(user_ids)
-    User.where(id: user_ids).find_each(&:reset_remote_connections)
-  end
-
-  # Each message is destroyed in its own transaction, so other writes get through in between. Any message posted
-  # meanwhile goes with the room.
-  def destroy_one_message_at_a_time
-    messages.find_each(&:destroy)
-    destroy
-  end
-
  def receive(message)
    unread_memberships(message)
    push_later(message)
  end

-  # Rewriting every member on every message is most of what posting to a large room writes,
-  # so members who are unread already stay as they are. Directs keep touching them all: a
-  # direct's sidebar row is cached by membership and shows the room's recency.
-  def unread_memberships(message)
-    recipients = memberships.visible.disconnected.where.not(user: message.creator)
-    recipients = recipients.where(unread_at: nil) unless direct?
-    recipients.update_all(unread_at: message.created_at, updated_at: Time.current)
-  end
-
-  def push_later(message)
-    Room::PushMessageJob.perform_later(self, message)
-  end
-
  def open?
    is_a?(Rooms::Open)
  end
@@ -116,4 +75,12 @@ class Room < ApplicationRecord
        errors.add :type, "can't be changed for a direct room"
      end
    end
+
+    def unread_memberships(message)
+      memberships.visible.disconnected.where.not(user: message.creator).update_all(unread_at: message.created_at, updated_at: Time.current)
+    end
+
+    def push_later(message)
+      Room::PushMessageJob.perform_later(self, message)
+    end
 end
@@ -6,9 +6,9 @@ class Room::MessagePusher
  end

  def push
-    subscriptions = push_subscriptions_for_users_involved_in_everything.or(push_subscriptions_for_mentionable_users(message.mentionees))
-    if subscriptions.exists?
-      Rails.configuration.x.web_push_pool.queue(build_payload, subscriptions)
+    build_payload.tap do |payload|
+      push_to_users_involved_in_everything(payload)
+      push_to_users_involved_in_mentions(payload)
    end
  end

@@ -37,6 +37,14 @@ class Room::MessagePusher
      }
    end

+    def push_to_users_involved_in_everything(payload)
+      enqueue_payload_for_delivery payload, push_subscriptions_for_users_involved_in_everything
+    end
+
+    def push_to_users_involved_in_mentions(payload)
+      enqueue_payload_for_delivery payload, push_subscriptions_for_mentionable_users(message.mentionees)
+    end
+
    def push_subscriptions_for_users_involved_in_everything
      relevant_subscriptions.merge(Membership.involved_in_everything)
    end
@@ -45,12 +53,13 @@ class Room::MessagePusher
      relevant_subscriptions.merge(Membership.involved_in_mentions).where(user_id: mentionees.ids)
    end

-    # Banning keeps the user's subscriptions, so that unbanning brings their notifications back,
-    # but nobody who can't sign in should be sent what's said in their rooms meanwhile.
    def relevant_subscriptions
      Push::Subscription
        .joins(user: :memberships)
-        .merge(User.active)
-        .merge(Membership.visible.disconnected.where(room: room).where.not(user_id: message.creator_id))
+        .merge(Membership.visible.disconnected.where(room: room).where.not(user: message.creator))
+    end
+
+    def enqueue_payload_for_delivery(payload, subscriptions)
+      Rails.configuration.x.web_push_pool.queue(payload, subscriptions)
    end
 end
@@ -1,99 +0,0 @@
-# Keeps rooms.messages_count correct for ordinary SQLite writes — Rails, bulk SQL,
-# and foreign connections — without ActiveRecord counter_cache callbacks that
-# those paths skip (and that would double-count if combined with triggers).
-# Foreign REPLACE writes require PRAGMA recursive_triggers=ON so SQLite also
-# fires the delete trigger. Migrations rebuilding messages must call ensure!
-# before reading counters inside that migration; database tasks repair afterwards.
-class Room::MessagesCount
-  INSERT_TRIGGER = "messages_ai_rooms_messages_count"
-  DELETE_TRIGGER = "messages_ad_rooms_messages_count"
-  UPDATE_TRIGGER = "messages_au_rooms_messages_count"
-  TRIGGERS = [ INSERT_TRIGGER, DELETE_TRIGGER, UPDATE_TRIGGER ].freeze
-
-  class << self
-    def install!(connection = ActiveRecord::Base.connection)
-      with_immediate_write(connection) do
-        replace_triggers!(connection)
-      end
-    end
-
-    def uninstall!(connection = ActiveRecord::Base.connection)
-      TRIGGERS.each do |name|
-        connection.execute("DROP TRIGGER IF EXISTS #{name}")
-      end
-    end
-
-    def backfill!(connection = ActiveRecord::Base.connection)
-      connection.execute <<~SQL
-        UPDATE rooms SET messages_count = (
-          SELECT COUNT(*) FROM messages WHERE messages.room_id = rooms.id
-        )
-      SQL
-    end
-
-    # schema.rb does not dump SQLite triggers; reinstall after schema:load.
-    # Repair rechecks, rebuilds counts, and installs triggers in one write txn
-    # so concurrent writers and concurrent boot repairs cannot observe a gap.
-    def ensure!(connection = ActiveRecord::Base.connection)
-      return unless connection.adapter_name.match?(/sqlite/i)
-      return unless connection.data_source_exists?(:rooms)
-      return unless connection.column_exists?(:rooms, :messages_count)
-      return if triggers_installed?(connection)
-
-      with_immediate_write(connection) do
-        next if triggers_installed?(connection)
-
-        uninstall!(connection)
-        backfill!(connection)
-        create_triggers!(connection)
-      end
-    end
-
-    def trigger_installed?(connection, name)
-      connection.select_value(
-        "SELECT 1 FROM sqlite_master WHERE type = 'trigger' AND name = #{connection.quote(name)}"
-      ).present?
-    end
-
-    def triggers_installed?(connection = ActiveRecord::Base.connection)
-      TRIGGERS.all? { |name| trigger_installed?(connection, name) }
-    end
-
-    private
-      def with_immediate_write(connection)
-        if connection.transaction_open?
-          yield
-        else
-          connection.raw_connection.transaction(:immediate) { yield }
-        end
-      end
-
-      def replace_triggers!(connection)
-        uninstall!(connection)
-        create_triggers!(connection)
-      end
-
-      def create_triggers!(connection)
-        connection.execute <<~SQL
-          CREATE TRIGGER #{INSERT_TRIGGER} AFTER INSERT ON messages
-          BEGIN
-            UPDATE rooms SET messages_count = messages_count + 1 WHERE id = NEW.room_id;
-          END
-        SQL
-        connection.execute <<~SQL
-          CREATE TRIGGER #{DELETE_TRIGGER} AFTER DELETE ON messages
-          BEGIN
-            UPDATE rooms SET messages_count = messages_count - 1 WHERE id = OLD.room_id;
-          END
-        SQL
-        connection.execute <<~SQL
-          CREATE TRIGGER #{UPDATE_TRIGGER} AFTER UPDATE OF room_id ON messages
-          WHEN OLD.room_id IS NOT NEW.room_id
-          BEGIN
-            UPDATE rooms SET messages_count = messages_count - 1 WHERE id = OLD.room_id;
-            UPDATE rooms SET messages_count = messages_count + 1 WHERE id = NEW.room_id;
-          END
-        SQL
-      end
-  end
-end
@@ -7,15 +7,12 @@ class Rooms::Direct < Room
    end

    private
-      # Among the first user's rooms, the one whose members are exactly these users: as many
-      # memberships as users, and all of them theirs.
+      # FIXME: Find a more performant algorithm that won't be a problem on accounts with 10K+ direct rooms,
+      # which could be to store the membership id list as a hash on the room, and use that for lookup.
      def find_for(users)
-        user_ids = users.pluck(:id).uniq
-
-        where(id: Membership.where(user_id: user_ids.first).select(:room_id))
-          .joins(:memberships).group(:id)
-          .having("COUNT(*) = :size AND COUNT(CASE WHEN memberships.user_id IN (:user_ids) THEN 1 END) = :size", size: user_ids.size, user_ids: user_ids)
-          .first
+        all.joins(:users).detect do |room|
+          Set.new(room.user_ids) == Set.new(users.pluck(:id))
+        end
      end
  end

@@ -7,22 +7,13 @@ class Session < ApplicationRecord

  before_create { self.last_active_at ||= Time.now }

-  validate :user_password_unchanged, on: :create
+  def self.start!(user_agent:, ip_address:)
+    create! user_agent: user_agent, ip_address: ip_address
+  end

  def resume(user_agent:, ip_address:)
    if last_active_at.before?(ACTIVITY_REFRESH_RATE.ago)
      update! user_agent: user_agent, ip_address: ip_address, last_active_at: Time.now
    end
  end
-
-  private
-    # A password change ends every session, so one can't start on a password checked before the change. Validated in
-    # the save's transaction, which holds the database's write lock from the start, so a change commits either before
-    # this check, and fails it, or after the insert, and ends this session with the others. Read past the query cache,
-    # and compared here rather than in the query, which logs its values.
-    def user_password_unchanged
-      unless User.uncached { User.where(id: user_id).pick(:password_digest) } == user.password_digest
-        errors.add :user, :invalid
-      end
-    end
 end
@@ -18,10 +18,8 @@ class User < ApplicationRecord
  enum :status, %i[ active deactivated banned ], default: :active

  has_secure_password validations: false
-  validate :password_challenge_matches, if: :will_save_change_to_password_digest?, unless: -> { password_challenge.nil? }

  after_create_commit :grant_membership_to_open_rooms
-  after_update :sign_out_all_sessions, if: :saved_change_to_password_digest?

  scope :ordered, -> { order("LOWER(name)") }
  scope :filtered_by, ->(query) { where("name like ?", "%#{query}%") }
@@ -52,43 +50,8 @@ class User < ApplicationRecord
  end

  private
-    # The profile always sets password_challenge, and it's checked whenever the save would change the password; scripts
-    # that reset one don't set it.
-    def password_challenge_matches
-      unless password_digest_was.present? && BCrypt::Password.new(password_digest_was).is_password?(password_challenge)
-        errors.add :password_challenge, :invalid
-      end
-    end
-
-    # A new password is how someone shuts out whoever else got into their account, so it ends every session, copies
-    # of the changing browser's cookie included, and every push subscription; browsers still signed in post theirs
-    # again. Connections close once that commits, registered on the transaction because a later save in it would
-    # replace the saved change an after_commit condition reads.
-    def sign_out_all_sessions
-      sessions.delete_all
-      push_subscriptions.delete_all
-      self.class.current_transaction.after_commit { disconnect_signed_out_sessions }
-    end
-
-    # The password is saved by now, so a realtime service that can't be reached mustn't fail the change.
-    def disconnect_signed_out_sessions
-      reset_remote_connections
-    rescue => error
-      Rails.logger.warn "Could not disconnect remote connections after a password change: #{error.class}"
-    end
-
-    # One statement, which SQLite runs under the write lock, so no room is closed between reading the open ones and
-    # inserting. A room that Room#destroy_later closes is either closed before, and skipped, or after, and takes this
-    # membership away with the others. A room that granted itself to every user when it was created is skipped too,
-    # as insert_all did.
    def grant_membership_to_open_rooms
-      now = Time.current
-
-      Membership.connection.execute Membership.sanitize_sql([ <<~SQL, id, now, now ])
-        insert into memberships (room_id, user_id, created_at, updated_at)
-        select id, ?, ?, ? from rooms where type = 'Rooms::Open'
-        on conflict do nothing
-      SQL
+      Membership.insert_all(Rooms::Open.pluck(:id).collect { |room_id| { room_id: room_id, user_id: id } })
    end

    def deactived_email_address
@@ -1,11 +1,6 @@
 module User::Bannable
  extend ActiveSupport::Concern

-  included do
-    # Administrators still see banned users, so they can lift the ban.
-    scope :visible_to, ->(user) { user.can_administer? ? where(status: %i[ active banned ]) : active }
-  end
-
  def ban
    transaction do
      create_bans_from_sessions
@@ -11,11 +11,6 @@ module User::Mentionable
    "users/mention"
  end

-  # How a mention appears inside the editor, matching the prompt's editor template.
-  def to_editor_content_attachment_partial_path
-    "users/mention"
-  end
-
  def attachable_plain_text_representation(caption)
    "@#{name}"
  end
@@ -3,20 +3,13 @@ module User::Transferable

  TRANSFER_LINK_EXPIRY_DURATION = 4.hours

-  included do
-    # Bound to the password, so changing it also ends sign-in links made before.
-    generates_token_for :transfer, expires_in: TRANSFER_LINK_EXPIRY_DURATION do
-      password_salt&.last(10)
-    end
-  end
-
  class_methods do
    def find_by_transfer_id(id)
-      find_by_token_for(:transfer, id)
+      find_signed(id, purpose: :transfer)
    end
  end

  def transfer_id
-    generate_token_for(:transfer)
+    signed_id(purpose: :transfer, expires_in: TRANSFER_LINK_EXPIRY_DURATION)
  end
 end
@@ -63,7 +63,7 @@ class Webhook < ApplicationRecord
    end

    def extract_attachment_from(response)
-      if response.code == "200" && response.content_type && mime_type = Mime::Type.lookup(response.content_type)
+      if response.content_type && mime_type = Mime::Type.lookup(response.content_type)
        ActiveStorage::Blob.create_and_upload! \
          io: StringIO.new(response.body), filename: "attachment.#{mime_type.symbol}", content_type: mime_type.to_s
      end
@@ -76,9 +76,10 @@
        <% end %>

        <label class="switch">
-          <%= tag.input type: "checkbox", class: "switch__input",
-                checked: Current.account.settings.restrict_room_creation_to_administrators?,
-                data: { action: "change->form#submit" } %>
+          <input type="checkbox"
+                class="switch__input"
+                <%= "checked" if Current.account.settings.restrict_room_creation_to_administrators? %>
+                data-action="change->form#submit">
          <span class="switch__btn round"></span>
          <span class="for-screen-reader">
            Must be admin to create new rooms
@@ -101,11 +102,11 @@
      <turbo-frame id="account_users">
        <%= render partial: "accounts/users/user", collection: @administrators, as: :user %>

-        <% if @administrators.any? && @page.records.any? %>
+        <% if @administrators.any? && @members.any? %>
          <hr class="separator full-width" style="--border-style: solid">
        <% end %>

-        <%= render partial: "accounts/users/user", collection: @page.records, as: :user %>
+        <%= render partial: "accounts/users/user", collection: @members, as: :user %>
        <%= render "accounts/users/next_page_container", page: @page.next_param unless @page.last? %>
      </turbo-frame>
    </menu>
@@ -1,13 +0,0 @@
-<%# Files are posted as a message's own attachment, which gets its preview when it's posted; the composer adds none to
-    the rich text. One that's there anyway is shown by its name, with no preview: Action Text's partial links to a URL
-    that makes one on view, and nothing else in the app would make it. %>
-<figure class="attachment attachment--file attachment--<%= blob.filename.extension %>">
-  <figcaption class="attachment__caption">
-    <% if caption = blob.try(:caption) %>
-      <%= caption %>
-    <% else %>
-      <span class="attachment__name"><%= blob.filename %></span>
-      <span class="attachment__size"><%= number_to_human_size blob.byte_size %></span>
-    <% end %>
-  </figcaption>
-</figure>
@@ -9,6 +9,7 @@
    <meta name="theme-color" content="#ffffff" media="(prefers-color-scheme: light)">
    <meta name="theme-color" content="#000000" media="(prefers-color-scheme: dark)">
    <meta name="apple-mobile-web-app-capable" content="yes">
+    <%= csrf_meta_tags %>
    <%= csp_meta_tag %>
    <%= current_user_meta_tags %>
    <%= script_aware_action_cable_meta_tag %>
@@ -39,9 +40,9 @@
      <div class="flash" data-controller="element-removal" data-action="animationend->element-removal#remove">
        <div class="flash__inner shadow" style="<%= "--flash-background: var(--color-negative)" if flash[:alert] %>">
          <% if flash[:alert] %>
-            <%= image_tag "alert.svg", aria: { hidden: true }, size: 24, class: "colorize--white" %>
+            <%= image_tag "alert.svg", aria: { hidden: true }, size: 24, class: "colorize--white" %></span>
          <% else %>
-            <%= image_tag "check.svg", aria: { hidden: true }, size: 24, class: "colorize--white" %>
+            <%= image_tag "check.svg", aria: { hidden: true }, size: 24, class: "colorize--white" %></span>
          <% end %>
        </div>
        <span class="for-screen-reader" role="alert" aria-atomic="true"><%= notice %></span>
@@ -62,11 +63,6 @@

    <%= render "layouts/lightbox" %>

-    <% if Current.session %>
-      <%= tag.div hidden: true, data: { controller: "push-subscription-sync",
-            push_subscription_sync_url_value: user_push_subscriptions_path, push_subscription_sync_session_value: push_subscription_session_marker } %>
-    <% end %>
-
    <a href="https://once.com" id="app-logo" target="_blank" aria-label="Once software from 37signals home page">
      <%= image_tag "campfire-icon.png", alt: "Campfire logo", width: 256, height: 216 %>
    </a>
@@ -1,6 +1,5 @@
 <%# Be sure to check/update messages/_template.html.erb when changing this file %>

-<%= cache_message_actions(message) do %>
 <div class="message__actions" data-controller="soft-keyboard">
  <%= tag.details class: "position-relative",
      data: { controller: "popup", action: "keydown.esc->popup#close toggle->popup#toggle click@document->popup#closeOnClickOutside", popup_orientation_top_class: "popup-orientation-top" } do %>
@@ -11,16 +10,14 @@

    <div class="message__actions-menu border shadow" data-popup-target="menu">
      <div class="quick-boosts">
-        <% boost_path = message_boosts_path(message) %>
-        <% boost_frame = dom_id(message, :boosting) %>
        <% EmojiHelper::REACTIONS.each do |character, title| %>
-          <form data-turbo-frame="<%= boost_frame %>" data-action="popup#close" action="<%= boost_path %>" accept-charset="UTF-8" method="post">
+          <%= form_with model: [ message, Boost.new ], data: { turbo_frame: dom_id(message, :boosting), action: "popup#close"} do |form| %>
            <%= hidden_field_tag "boost[content]", character %>
-            <button name="button" type="submit" title="<%= title %>" class="btn message__action-btn" data-emoji="<%= character %>">
+            <%= form.button type: "submit", title: title, class: "btn message__action-btn", data: { emoji: character } do %>
              <figure class="margin-none boost-character"><%= character %></figure>
              <span class="for-screen-reader"><%= title %></span>
-            </button>
-          </form>
+            <% end %>
+          <% end %>
        <% end %>

        <%= link_to new_message_boost_path(message),
@@ -32,7 +29,7 @@
      </div>

      <div class="flex flex-wrap border-top margin-block-start-half pad-block-start-half message__actions-grid">
-        <% if message.attachment? %>
+        <% if message.content_type.attachment? %>
          <%= link_to rails_blob_path(message.attachment, disposition: "attachment", only_path: true), class: "btn message__action-btn center full-width hide-in-ios-pwa", title: "Download", aria: { label: "Download" } do %>
            <%= image_tag "download.svg", class: "colorize--black", size: 20, aria: { hidden: "true" } %>
          <% end %>
@@ -59,4 +56,3 @@
    </div>
  <% end %>
 </div>
-<% end %>
@@ -1,7 +1,7 @@
 <%# Be sure to check/update messages/_template.html.erb when changing this file %>

 <%# Bump this version when the message presentation filters change what they emit. Editing this line changes the template digest, which busts BOTH this fragment cache and the collection cache that keys on this partial's digest (helper Ruby changes alone don't). %>
-<% cache [ message_fragment_cache_key(message), "presentation-v8" ] do %>
+<% cache [ message, "presentation-v3" ] do %>
  <%= message_tag message do %>
    <h2 class="message__day-separator"><%= local_datetime_tag message.created_at, style: :date %></h2>

@@ -2,8 +2,6 @@
  <div class="message message--me $messageClasses$"
      id="message_$clientMessageId$"
      data-format-message-target="message"
-      data-pending-message="true"
-      data-client-message-id="$clientMessageId$"
      data-user-id="<%= Current.user.id %>"
      data-message-timestamp="$messageTimestamp$"
      data-messages-target="message">
@@ -1,18 +1,20 @@
-<div id="<%= dom_id(boost) %>"
-    class="boost boost-item flex-inline postion--relative max-width align-center fill-white gap"
-    data-controller="boost-delete" data-boost-delete-perform-class="boost--deleting" data-boost-delete-reveal-class="expanded" data-boost-delete-booster-id-value="<%= boost.booster.id %>">
-  <figure class="avatar boost__avatar flex-item-no-shrink">
-    <%= avatar_tag boost.booster, aria: { label: "#{boost.booster.name} boosted #{boost.content}" } %>
-  </figure>
+<% cache boost do %>
+  <div id="<%= dom_id(boost) %>"
+      class="boost boost-item flex-inline postion--relative max-width align-center fill-white gap"
+      data-controller="boost-delete" data-boost-delete-perform-class="boost--deleting" data-boost-delete-reveal-class="expanded" data-boost-delete-booster-id-value="<%= boost.booster.id %>">
+    <figure class="avatar boost__avatar flex-item-no-shrink">
+      <%= avatar_tag boost.booster, aria: { label: "#{boost.booster.name} boosted #{boost.content}" } %>
+    </figure>

-  <%= tag.span boost.content, role: "button",
-        class: [ "txt-small", { "txt-medium": boost.content.all_emoji? } ],
-        data: { action: "click->boost-delete#reveal keydown.enter->boost-delete#reveal:prevent", boost_delete_target: "content" } %>
+    <%= tag.span boost.content, role: "button",
+          class: [ "txt-small", { "txt-medium": boost.content.all_emoji? } ],
+          data: { action: "click->boost-delete#reveal keydown.enter->boost-delete#reveal:prevent", boost_delete_target: "content" } %>

-  <%= button_to message_boost_path(boost.message, boost), method: :delete, data: { action: "boost-delete#perform", boost_delete_target: "button" },
-        class: "btn btn--negative flex-item-justify-end boost__delete" do %>
-    <%= image_tag "minus.svg", size: 20, aria: { hidden: "true" } %>
-    <span class="for-screen-reader">Delete this boost</span>
-  <% end %>
-</div>
-<span id="delete_boost_accessible_label" class="for-screen-reader">Press enter to delete this boost</span>
+    <%= button_to message_boost_path(boost.message, boost), method: :delete, data: { action: "boost-delete#perform", boost_delete_target: "button" },
+          class: "btn btn--negative flex-item-justify-end boost__delete" do %>
+      <%= image_tag "minus.svg", size: 20, aria: { hidden: "true" } %>
+      <span class="for-screen-reader">Delete this boost</span>
+    <% end %>
+  </div>
+  <span id="delete_boost_accessible_label" class="for-screen-reader">Press enter to delete this boost</span>
+<% end %>
@@ -2,7 +2,7 @@
  <div class="boosts flex flex-wrap align-center gap full-width" style="--column-gap: 0.4ch; --row-gap: 0"
      data-controller="turbo-streaming" data-action="turbo:submit-start->turbo-streaming#unsubscribe">
    <div class="flex-inline flex-wrap gap" id="<%= dom_id(message, :boosts) %>" data-turbo-streaming-target="container">
-      <%= render partial: "messages/boosts/boost", collection: message.boosts.loaded? ? message.boosts.sort_by(&:created_at) : message.boosts.ordered.includes(:booster) %>
+      <%= render partial: "messages/boosts/boost", collection: message.boosts.ordered, cached: true %>
    </div>

    <%= turbo_frame_tag message, :new_boost do %>
@@ -1 +1 @@
-<%= turbo_stream.append dom_id(@message.room, :messages), @message_html %>
+<%= turbo_stream.append dom_id(@message.room, :messages), @message %>
@@ -1 +1 @@
-<%= render partial: "messages/message", collection: @messages, cached: ->(message) { message_fragment_cache_key(message) } %>
+<%= render partial: "messages/message", collection: @messages, cached: true %>
@@ -6,8 +6,8 @@
      <%= image_tag "disclosure.svg", aria: { hidden: "true" }, size: 10, class: "disclosure" %>
    </summary>

-    <% case %>
-      <% when platform.firefox? && platform.android? %>
+    <% case
+      when platform.firefox? && platform.android? %>
        <ol>
          <li>Tap <em><%= image_tag "lock.svg", alt: "the View site information button", size: 20 %></em> in the address bar.</li>
          <li>Tap <em>Notification</em> to change to <em>Allowed</em>.</li>
@@ -6,10 +6,10 @@
      <%= image_tag "disclosure.svg", aria: { hidden: "true" }, size: 10, class: "disclosure" %>
    </summary>

-    <% case %>
-      <% when platform.edge? %>
+    <% case
+      when platform.edge? %>
        <ol>
-          <li>Click <em><%= image_tag "external/install-edge.svg", alt: "the app available - install Campfire chat button", size: 16 %></em>in the address bar.</li>
+          <li>Click <em><%= image_tag "install-edge.svg", alt: "the app available - install Campfire chat button", size: 16 %></em>in the address bar.</li>
          <li>Click <em>Install</em>.</li>
        </ol>
      <% when platform.chrome? && platform.android? %>
@@ -5,8 +5,8 @@
    <%= image_tag "disclosure.svg", aria: { hidden: "true" }, size: 10, class: "disclosure" %>
  </summary>

-  <% case %>
-    <% when platform.firefox? && platform.android? %>
+  <% case
+    when platform.firefox? && platform.android? %>
      <ol>
        <li>Tap the <em><%= image_tag "menu-dots-vertical.svg", alt: "More options", size: 16 %></em> menu button.</li>
        <li>Tap <em>Settings</em>.</li>
@@ -1,5 +1,5 @@
 <%= turbo_stream.append dom_id(@room, :messages) do %>
-  <%= render partial: "messages/message", collection: @new_messages, cached: ->(message) { message_fragment_cache_key(message) } %>
+  <%= render partial: "messages/message", collection: @new_messages, cached: true %>
 <% end if @new_messages.any? %>

 <% @updated_messages.each do |message| %>
@@ -14,7 +14,7 @@

  <%= messages_tag(@room) do %>
    <%= render "rooms/show/invitation", room: @room %>
-    <%= render partial: "messages/message", collection: @messages, cached: ->(message) { message_fragment_cache_key(message) } %>
+    <%= render partial: "messages/message", collection: @messages, cached: true %>
  <% end %>

  <%= turbo_stream_from @room, :messages, channel: "RoomMessagesChannel" %>
@@ -54,7 +54,7 @@
  </div>

  <%= search_results_tag do %>
-    <%= render partial: "messages/message", collection: @messages, cached: ->(message) { message_fragment_cache_key(message) } %>
+    <%= render partial: "messages/message", collection: @messages, cached: true %>
  <% end %>
 </div>

@@ -1,2 +1 @@
-<%= auto_submit_form_with method: :put do %>
-<% end %>
+<%= auto_submit_form_with method: :put %>
@@ -69,16 +69,6 @@
        </label>
      </div>

-      <div class="flex align-center gap">
-        <%= translation_button(:current_password) %>
-
-        <label class="flex align-center gap flex-item-grow input input--actor">
-          <%= form.password_field :password_challenge, class: "input txt-large", autocomplete: "current-password",
-                placeholder: "Current password", required: false, maxlength: 72 %>
-          <%= image_tag "password.svg", aria: { hidden: "true" }, size: 24, class: "colorize--black" %>
-        </label>
-      </div>
-
      <div class="flex align-center gap">
        <%= translation_button(:update_password) %>

@@ -22,6 +22,5 @@ CSRF disabling. Unread fanout excludes adapter I/O.
 The HTTP driver uses production Puma/Redis with one worker and five threads. Ruby threads
 each maintain a keep-alive connection, request uncompressed responses, and consume the
 whole body. Login uses normal CSRF protection; all warmup and measured responses must be
-HTTP 200 without transport errors, complete HTML, exact independently seeded message windows
-and the visible sidebar rooms; this applies to every warmup and measured response. Measurements exclude Thruster, TLS and gzip. Client
+HTTP 200 without transport errors. Measurements exclude Thruster, TLS and gzip. Client
 CPU, JIT warmup and GC can affect throughput; repeat runs and check client saturation.
@@ -3,7 +3,6 @@
 require "socket"
 require_relative "support"
 require_relative "http_client"
-require_relative "response_contract"

 include BenchmarkSupport
 options = parse_options("Compare HTTP throughput with Ruby keep-alive clients; every response must be HTTP 200.",
@@ -59,10 +58,9 @@ begin
      cookie = client.login(labels)
      results = {}
      paths.each do |name, path|
-        contract = BenchmarkResponseContract.new(name, File.join(data, "storage/db/production.sqlite3"), labels)
-        client.measure(path, cookie, concurrency: 1, duration: 3, contract: contract)
+        client.measure(path, cookie, concurrency: 1, duration: 3)
        concurrencies.each do |concurrency|
-          results["#{name}_#{concurrency}"] = client.measure(path, cookie, concurrency: concurrency, duration: options[:duration], contract: contract)
+          results["#{name}_#{concurrency}"] = client.measure(path, cookie, concurrency: concurrency, duration: options[:duration])
        end
      end
      write_json(File.join(options[:output], "#{side}-#{iteration + 1}.json"), results)
@@ -33,12 +33,12 @@ class BenchmarkHTTPClient
    cookie_header(cookies)
  end

-  def measure(path, cookie, concurrency:, duration:, contract:)
+  def measure(path, cookie, concurrency:, duration:)
    start = clock
    deadline = start + duration
    workers = Array.new(concurrency) do
      Thread.new do
-        result = { latencies: [], statuses: Hash.new(0), bytes: 0, errors: 0, invalid_responses: 0 }
+        result = { latencies: [], statuses: Hash.new(0), bytes: 0, errors: 0 }
        while clock < deadline
          begin
            connection.start do |http|
@@ -48,7 +48,6 @@ class BenchmarkHTTPClient
                result[:latencies] << (clock - requested) * 1000
                result[:statuses][response.code] += 1
                result[:bytes] += response.body.bytesize
-                result[:invalid_responses] += 1 unless contract.valid?(response)
              end
            end
          rescue IOError, SystemCallError, Timeout::Error, SocketError, Net::HTTPBadResponse
@@ -65,10 +64,9 @@ class BenchmarkHTTPClient
    statuses = Hash.new(0)
    samples.each { |sample| sample[:statuses].each { |status, count| statuses[status] += count } }
    errors = samples.sum { |sample| sample[:errors] }
-    invalid = samples.sum { |sample| sample[:invalid_responses] }
-    raise "#{path}: HTTP statuses #{statuses}, #{errors} transport errors, #{invalid} invalid bodies" unless errors.zero? && invalid.zero? && statuses.keys == [ "200" ]
+    raise "#{path}: HTTP statuses #{statuses}, #{errors} transport errors" unless errors.zero? && statuses.keys == [ "200" ]
    { path: path, conc: concurrency, gzip: false, secs: elapsed, rps: latencies.size / elapsed,
-      ok: latencies.size, statuses: statuses, errors: errors, invalid_responses: invalid, validation: "route-contract-v1",
+      ok: latencies.size, statuses: statuses, errors: errors,
      avg_bytes: samples.sum { |sample| sample[:bytes] } / latencies.size,
      latency_ms: { p50: percentile(latencies, 0.50), p95: percentile(latencies, 0.95), p99: percentile(latencies, 0.99) } }
  end
@@ -1,43 +0,0 @@
-require "json"
-require "open3"
-require "cgi"
-
-# Independent seed SQL determines the required result window before any response is sampled.
-class BenchmarkResponseContract
-  def initialize(kind, database, labels)
-    @kind = kind
-    room = Integer(labels.fetch("rooms.watercooler"))
-    user = labels.fetch("emails.david").gsub("'", "''")
-    @ids = case kind
-    when "room"
-      query(database, "SELECT id FROM messages WHERE room_id=#{room} ORDER BY created_at DESC LIMIT 40").reverse.map { |row| row.fetch("id") }
-    when "messages"
-      before = Integer(labels.fetch("messages.busy_060"))
-      query(database, "SELECT id FROM messages WHERE room_id=#{room} AND created_at<(SELECT created_at FROM messages WHERE id=#{before}) ORDER BY created_at DESC LIMIT 40").reverse.map { |row| row.fetch("id") }
-    when "search"
-      query(database, "SELECT m.id FROM message_search_index idx JOIN messages m ON m.id=idx.rowid JOIN memberships mm ON mm.room_id=m.room_id JOIN users u ON u.id=mm.user_id WHERE u.email_address='#{user}' AND idx.body MATCH 'coffee' ORDER BY m.id DESC LIMIT 100").reverse.map { |row| row.fetch("id") }
-    when "sidebar"
-      @names = query(database, "SELECT r.name FROM rooms r JOIN memberships mm ON mm.room_id=r.id JOIN users u ON u.id=mm.user_id WHERE u.email_address='#{user}' AND r.type='Rooms::Open' AND mm.involvement<>'invisible'").map { |row| CGI.escapeHTML(row.fetch("name")) }
-      nil
-    else
-      raise "Unknown route contract #{kind}"
-    end
-  end
-
-  def valid?(response)
-    body = response.body.to_s
-    return false unless response.code == "200" && response["content-type"].to_s.split(";").first == "text/html" &&
-      [ nil, "identity" ].include?(response["content-encoding"]) && !body.empty? && body.dup.force_encoding("UTF-8").valid_encoding?
-    return false if @kind != "messages" && !(body.lstrip.start_with?("<!DOCTYPE html>") && body.rstrip.end_with?("</html>"))
-    return false if @ids && body.scan(/data-message-id="(\d+)"/).flatten.map(&:to_i) != @ids
-    return false if @names && (!body.include?("shared_rooms") || @names.any? { |name| !body.include?(name) })
-    true
-  end
-
-  private
-    def query(database, sql)
-      output, errors, status = Open3.capture3("sqlite3", "-readonly", "-json", database, sql)
-      raise "Cannot read benchmark seed: #{errors}" unless status.success?
-      JSON.parse(output)
-    end
-end
@@ -1,71 +0,0 @@
-require "minitest/autorun"
-require "fileutils"
-require "socket"
-require "sqlite3"
-require "tmpdir"
-require_relative "http_client"
-require_relative "response_contract"
-
-class BenchmarkHTTPClientTest < Minitest::Test
-  def setup
-    @directory = Dir.mktmpdir("campfire-benchmark-test")
-    database = File.join(@directory, "seed.sqlite3")
-    SQLite3::Database.new(database).tap do |db|
-      db.execute("CREATE TABLE messages (id INTEGER PRIMARY KEY, room_id INTEGER, created_at TEXT)")
-      db.execute("INSERT INTO messages VALUES (42, 1, '2026-10-01'), (43, 1, '2026-10-02')")
-      db.close
-    end
-    @contract = BenchmarkResponseContract.new("room", database, "rooms.watercooler" => 1, "emails.david" => "david@example.com")
-    @body = '<!DOCTYPE html><html><article data-message-id="42">coffee</article><article data-message-id="43">meeting</article></html>'
-  end
-
-  def teardown
-    FileUtils.remove_entry(@directory)
-  end
-
-  def test_seeded_contract_rejects_error_pages_truncation_wrong_windows_and_encoding
-    assert @contract.valid?(response(@body))
-    refute @contract.valid?(response("Something went wrong"))
-    refute @contract.valid?(response(@body.delete_suffix("</html>")))
-    refute @contract.valid?(response(@body.sub('data-message-id="42"', 'data-message-id="99"')))
-    refute @contract.valid?(response(@body, "text/plain"))
-    refute @contract.valid?(response(@body + "\xFF".b))
-    refute @contract.valid?(response(@body, "text/html", "500"))
-  end
-
-  def test_intermittent_200_error_page_rejects_the_loaded_run
-    server = TCPServer.new("127.0.0.1", 0)
-    worker = Thread.new do
-      loop do
-        socket = server.accept
-        count = 0
-        while socket.gets
-          while (line = socket.gets) && line != "\r\n"
-          end
-          body = count % 8 == 0 ? "Something went wrong" : @body
-          count += 1
-          socket.write("HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nContent-Length: #{body.bytesize}\r\n\r\n#{body}")
-        end
-        socket.close
-      end
-    rescue IOError, SystemCallError
-      nil
-    end
-    client = BenchmarkHTTPClient.new("http://127.0.0.1:#{server.addr[1]}")
-    error = assert_raises(RuntimeError) { client.measure("/rooms/1", "", concurrency: 1, duration: 0.1, contract: @contract) }
-    assert_match(/HTTP statuses \{"200"\s*=>\s*\d+\}, 0 transport errors, [1-9]\d* invalid bodies/, error.message)
-  ensure
-    server&.close
-    worker&.kill
-    worker&.join
-  end
-
-  private
-    def response(body, type = "text/html", status = "200")
-      Net::HTTPResponse.new("1.1", status, "OK").tap do |result|
-        result["content-type"] = type
-        result.instance_variable_set(:@body, body)
-        result.instance_variable_set(:@read, true)
-      end
-    end
-end
@@ -9,11 +9,6 @@ default: &default
  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 10 } %>
  timeout: 5000
  default_transaction_mode: immediate
-  # Checkpoint on a background connection instead (SqliteWalCheckpoint).
-  # Non-test processes start a contender; forking servers stop before fork and
-  # start again in the child so the flock is never inherited.
-  pragmas:
-    wal_autocheckpoint: 0

 development:
  primary:
@@ -80,5 +80,5 @@ Rails.application.configure do
  config.action_controller.raise_on_missing_callback_actions = true

  # Visit /rails/locks to see the locks
-  config.middleware.insert_before ActionDispatch::Executor, ActionDispatch::DebugLocks
+  config.middleware.insert_before Rack::Sendfile, ActionDispatch::DebugLocks
 end
@@ -1,20 +1,5 @@
-require "rails_ext/time_limited_video_previewer"
-
 ActiveSupport.on_load(:active_storage_blob) do
  ActiveStorage::DiskController.after_action only: :show do
    response.set_header("Cache-Control", "max-age=3600, public")
  end
 end
-
-Rails.application.configure do
-  # Rails' filter takes the second of the frames it selects (the first one, keyframes, scene changes), so a video
-  # with a single keyframe and no scene change is decoded to its end. Selecting any frame from 5 seconds on stops
-  # it there.
-  config.active_storage.video_preview_arguments =
-    "-vf 'select=eq(n\\,0)+eq(key\\,1)+gt(scene\\,0.015)+gte(t\\,5),loop=loop=-1:size=2,trim=start_frame=1'" \
-    " -frames:v 1 -f image2"
-
-  config.active_storage.previewers = config.active_storage.previewers.map do |previewer|
-    previewer == ActiveStorage::Previewer::VideoPreviewer ? TimeLimitedVideoPreviewer : previewer
-  end
-end
@@ -7,7 +7,6 @@
 # can read the public login page. Require a valid Campfire session before an
 # anonymous caller can allocate a Blob or persist bytes to disk.
 Rails.application.config.to_prepare do
-  ActiveStorage::BaseController.forgery_protection_verification_strategy = :header_only
  ActiveStorage::DirectUploadsController.include ActiveStorageAuthentication
  ActiveStorage::DirectUploadsController.before_action :require_active_storage_authentication

@@ -1,21 +1,25 @@
-# Enforcing baseline policy. Application pages narrow script-src from this
-# origin to its asset directory, since uploads are served from this origin
-# too, and allow the two inline scripts the importmap helper emits by hash
-# (InlineScriptHashes). There is no per-request nonce, so rendered HTML stays
-# cacheable. 'self' remains for responses outside ApplicationController, none
-# of which render user content.
+# Be sure to restart your server when you modify this file.
+
+# Define an application-wide content security policy.
+# See the Securing Rails Applications Guide for more information:
+# https://guides.rubyonrails.org/security.html#content-security-policy-header
+
+# Rails.application.configure do
+#   config.content_security_policy do |policy|
+#     policy.default_src :self, :https
+#     policy.font_src    :self, :https, :data
+#     policy.img_src     :self, :https, :data
+#     policy.object_src  :none
+#     policy.script_src  :self, :https
+#     policy.style_src   :self, :https
+#     # Specify URI for violation reports
+#     # policy.report_uri "/csp-violation-report-endpoint"
+#   end
 #
-# Nothing else is restricted: images, media, fonts, styles (including an
-# account's custom styles) and connections behave as before.
+#   # Generate session nonces for permitted importmap and inline scripts
+#   config.content_security_policy_nonce_generator = ->(request) { request.session.id.to_s }
+#   config.content_security_policy_nonce_directives = %w(script-src)
 #
-# DISABLE_CONTENT_SECURITY_POLICY=true is the escape hatch for an install whose
-# proxy or customization injects scripts the policy would block.
-unless ENV["DISABLE_CONTENT_SECURITY_POLICY"] == "true"
-  Rails.application.configure do
-    config.content_security_policy do |policy|
-      policy.script_src :self
-      policy.object_src :none
-      policy.base_uri   :self
-    end
-  end
-end
+#   # Report violations without enforcing the policy.
+#   # config.content_security_policy_report_only = true
+# end
@@ -1,24 +0,0 @@
-require "jbuilder/jbuilder_template"
-
-# Jbuilder 2.14.1 uses Rails.cache directly; use the same bounded store as ERB
-# while retaining its native keys and controller instrumentation.
-module BoundedJbuilderFragments
-  private
-    def _read_fragment_cache(key, options = nil)
-      @context.controller.instrument_fragment_cache :read_fragment, key do
-        @context.controller.cache_store.read(key, options)
-      end
-    end
-
-    def _write_fragment_cache(key, options = nil)
-      @context.controller.instrument_fragment_cache :write_fragment, key do
-        yield.tap { |value| @context.controller.cache_store.write(key, value, options) }
-      end
-    end
-end
-
-JbuilderTemplate.prepend(BoundedJbuilderFragments)
-
-Rails.application.config.to_prepare do
-  ActionView::PartialRenderer.collection_cache = FragmentCache.store
-end
@@ -1,5 +0,0 @@
-# schema.rb cannot dump SQLite triggers. Cover existing DBs that lost them.
-Rails.application.config.after_initialize do
-  Room::MessagesCount.ensure!
-rescue ActiveRecord::NoDatabaseError, ActiveRecord::ConnectionNotEstablished
-end
@@ -6,11 +6,3 @@ if Rails.env.production? && ENV["SKIP_TELEMETRY"].blank?
    config.release = ENV["GIT_REVISION"]
  end
 end
-
-# sentry-rails declares its Action Cable handle_open and handle_close wrappers private,
-# but Rails 8.2 calls them from outside the connection, so every /cable connection fails.
-# Remove once sentry-rails ships getsentry/sentry-ruby#2972 (issue #2975).
-ActiveSupport.on_load(:action_cable_connection) do
-  require "sentry/rails/action_cable"
-  Sentry::Rails::ActionCableExtensions::Connection.send(:public, :handle_open, :handle_close)
-end
@@ -1,4 +1,4 @@
 Rails.application.config.session_store :cookie_store,
  key: "_campfire_session",
-  # Preserve the existing installation's persistent browser-session cookie.
+  # Persist session cookie as permament so re-opened browser windows maintain a CSRF token
  expire_after: 20.years
@@ -1,8 +0,0 @@
-# Loaded from lib/rails_ext (autoload_lib ignore list) so reloads do not orphan
-# the contender thread. Non-test processes start here; Puma/Resque stop before
-# fork and start again in the child.
-require Rails.root.join("lib/rails_ext/sqlite_wal_checkpoint")
-
-Rails.application.config.after_initialize do
-  SqliteWalCheckpoint.start unless Rails.env.test?
-end
@@ -1 +1 @@
 .0.9
 .4.10