Initial plan

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

      - name: Set up Ruby
-        uses: ruby/setup-ruby@14594264cd68ce8a2345dd349bc3d138a4ef85c8 # v1.327.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@14594264cd68ce8a2345dd349bc3d138a4ef85c8 # v1.327.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@a0102e0972be65f351c307e2d64b9314a57c8073 # v1.324.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@14594264cd68ce8a2345dd349bc3d138a4ef85c8 # v1.327.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@14594264cd68ce8a2345dd349bc3d138a4ef85c8 # v1.327.0
+        uses: ruby/setup-ruby@a0102e0972be65f351c307e2d64b9314a57c8073 # v1.324.0
        env:
          REDIS_URL: redis://localhost:6379/0
        with:
@@ -1 +1 @@
-4.0.7
+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.7
+ARG RUBY_VERSION=3.4.10
 FROM docker.io/library/ruby:$RUBY_VERSION-slim AS base

 # Rails app lives here
@@ -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.7
+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,7 +142,7 @@ GEM
    base64 (0.3.0)
    bcrypt (3.1.22)
    benchmark (0.5.0)
-    bigdecimal (4.1.3)
+    bigdecimal (3.3.1)
    brakeman (8.0.6)
      racc
    builder (3.3.0)
@@ -162,7 +159,7 @@ 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
@@ -173,9 +170,9 @@ GEM
      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.0)
-    prism (1.9.0)
-    psych (5.5.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,21 +355,20 @@ 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)
      rubyzip (>= 1.2.2, < 4.0)
      websocket (~> 1.0)
-    sentry-rails (7.1.0)
-      railties (>= 5.2.0)
-      sentry-ruby (~> 7.1.0)
-    sentry-ruby (7.1.0)
+    sentry-rails (5.26.0)
+      railties (>= 5.0)
+      sentry-ruby (~> 5.26.0)
+    sentry-ruby (5.26.0)
      bigdecimal
      concurrent-ruby (~> 1.0, >= 1.0.2)
-      logger
    sinatra (4.2.1)
      logger (>= 1.6.0)
      mustermann (~> 3.0)
@@ -397,8 +382,8 @@ GEM
    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)
@@ -427,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
@@ -450,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.
@@ -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
+  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
@@ -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
@@ -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
@@ -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,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
@@ -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

@@ -36,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,
@@ -63,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 })
@@ -72,50 +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 = -> do
-        auto_link h(ContentFilters::TextMessagePresentationFilters.apply(body)),
-          html: { target: "_blank" }, sanitize_options: { tags: AUTO_LINK_ALLOWED_TAGS, attributes: AUTO_LINK_ALLOWED_ATTRIBUTES }
-      end
-
-      # 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-v1", I18n.locale, Digest::SHA256.hexdigest(html) ]) { render.call }
-      else
-        render.call
-      end
-    end
-
    def messages_actions
      "turbo:before-stream-render@document->messages#beforeStreamRender keydown.up@document->messages#editMyLastMessage"
    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()
@@ -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 } })
  }
 }
@@ -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

@@ -50,18 +50,8 @@ class User < ApplicationRecord
  end

  private
-    # 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
@@ -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>
@@ -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-v7" ] 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 %>
@@ -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,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,2 +1,2 @@
 # Used to match JavaScripts (new Date).getTime() for sorting
-ActiveSupport::TimeFormats.register(:epoch, ->(time) { (time.to_f * 1000).to_i })
+Time::DATE_FORMATS[:epoch] = ->(time) { (time.to_f * 1000).to_i }
@@ -1,5 +1,4 @@
 require "web-push"
-require "web_push/connections"
 require "web_push/pool"
 require "web_push/notification"

@@ -18,31 +17,43 @@ end

 module WebPush::PersistentRequest
  def perform
-    # Pin the connection to the public IP resolved (and guarded) by
-    # Push::Subscription so delivery can't be rebound to a private address
-    # between resolution and connect. There is no unpinned path: a delivery
-    # without a resolved IP is not sent.
-    endpoint_ip = @options[:endpoint_ip] or raise ArgumentError, "Push deliveries must be pinned to a resolved endpoint IP"
-
-    # The explicit nil proxy address disables proxy discovery from
-    # http_proxy/https_proxy. An egress proxy would open the TCP connection
-    # itself and re-resolve the endpoint host, so http.ipaddr would no longer
-    # pin the destination and the DNS-rebinding guarantee would be lost.
-    # Push delivery to public vendor endpoints goes direct.
-    http = Net::HTTP.new(uri.host, uri.port, nil)
-    http.ipaddr = endpoint_ip
-    http.use_ssl = true
-    http.ssl_timeout = @options[:ssl_timeout] unless @options[:ssl_timeout].nil?
-    http.open_timeout = @options[:open_timeout] unless @options[:open_timeout].nil?
-    http.read_timeout = @options[:read_timeout] unless @options[:read_timeout].nil?
+    if endpoint_ip = @options[:endpoint_ip]
+      # Pin the connection to the public IP resolved (and guarded) by
+      # Push::Subscription so delivery can't be rebound to a private address
+      # between resolution and connect. Bypasses the shared persistent pool,
+      # which would re-resolve the host itself.
+      #
+      # The explicit nil proxy address disables proxy discovery from
+      # http_proxy/https_proxy. An egress proxy would open the TCP connection
+      # itself and re-resolve the endpoint host, so http.ipaddr would no longer
+      # pin the destination and the DNS-rebinding guarantee would be lost. This
+      # path is already committed to a direct connection (it bypasses the pool);
+      # push delivery to public vendor endpoints goes direct.
+      http = Net::HTTP.new(uri.host, uri.port, nil)
+      http.ipaddr = endpoint_ip
+      http.use_ssl = true
+      http.ssl_timeout = @options[:ssl_timeout] unless @options[:ssl_timeout].nil?
+      http.open_timeout = @options[:open_timeout] unless @options[:open_timeout].nil?
+      http.read_timeout = @options[:read_timeout] unless @options[:read_timeout].nil?
+    elsif @options[:connection]
+      http = @options[:connection]
+    else
+      http = Net::HTTP.new(uri.host, uri.port, *proxy_options)
+      http.use_ssl = true
+      http.ssl_timeout = @options[:ssl_timeout] unless @options[:ssl_timeout].nil?
+      http.open_timeout = @options[:open_timeout] unless @options[:open_timeout].nil?
+      http.read_timeout = @options[:read_timeout] unless @options[:read_timeout].nil?
+    end

    req = Net::HTTP::Post.new(uri.request_uri, headers)
    req.body = body

-    # WebPush::Connections reuses an open connection only for this same host
-    # and pinned IP, so the guarantee holds for every request it sends.
-    resp = @options[:connection] ? @options[:connection].request(http, req) : http.request(req)
-    verify_response(resp)
+    if http.is_a?(Net::HTTP::Persistent)
+      response = http.request uri, req
+    else
+      resp = http.request(req)
+      verify_response(resp)
+    end

    resp
  end
@@ -50,12 +50,6 @@ plugin :tmp_restart
 # Reset all membership connections
 Membership.disconnect_all

-# Initializer starts a contender in this process. Stop before fork so workers
-# do not inherit the flock; each worker starts its own contender. Single-process
-# mode never forks, so the initializer's contender keeps running.
-before_fork { SqliteWalCheckpoint.stop }
-before_worker_boot { SqliteWalCheckpoint.start }
-
 Signal.trap :SIGPROF do
  Thread.list.each do |t|
    puts t
@@ -1,5 +1,5 @@
 class AddRoomIdAndCreatedAtIndexToMessages < ActiveRecord::Migration[8.2]
  def change
-    add_index :messages, %i[ room_id created_at ], if_not_exists: true
+    add_index :messages, %i[ room_id created_at ]
  end
 end
@@ -1,5 +0,0 @@
-class AddRoomIdAndUpdatedAtIndexToMessages < ActiveRecord::Migration[8.2]
-  def change
-    add_index :messages, %i[ room_id updated_at ], if_not_exists: true
-  end
-end
@@ -1,15 +0,0 @@
-class AddMessagesCountToRooms < ActiveRecord::Migration[8.2]
-  def up
-    add_column :rooms, :messages_count, :integer, null: false, default: 0
-
-    # Backfill before installing triggers so the COUNT rewrite does not race with
-    # concurrent inserts, and so we never rely on Rails callbacks for the tally.
-    Room::MessagesCount.backfill!(connection)
-    Room::MessagesCount.install!(connection)
-  end
-
-  def down
-    Room::MessagesCount.uninstall!(connection)
-    remove_column :rooms, :messages_count
-  end
-end
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.

-ActiveRecord::Schema[8.2].define(version: 2026_10_07_190000) do
+ActiveRecord::Schema[8.2].define(version: 2026_10_04_225000) do
  create_table "accounts", force: :cascade do |t|
    t.datetime "created_at", null: false
    t.text "custom_styles"
@@ -102,7 +102,6 @@ ActiveRecord::Schema[8.2].define(version: 2026_10_07_190000) do
    t.datetime "updated_at", null: false
    t.index ["creator_id"], name: "index_messages_on_creator_id"
    t.index ["room_id", "created_at"], name: "index_messages_on_room_id_and_created_at"
-    t.index ["room_id", "updated_at"], name: "index_messages_on_room_id_and_updated_at"
    t.index ["room_id"], name: "index_messages_on_room_id"
  end

@@ -124,7 +123,6 @@ ActiveRecord::Schema[8.2].define(version: 2026_10_07_190000) do
    t.string "name"
    t.string "type", null: false
    t.datetime "updated_at", null: false
-    t.integer "messages_count", default: 0, null: false
  end

  create_table "searches", force: :cascade do |t|
@@ -184,4 +182,3 @@ ActiveRecord::Schema[8.2].define(version: 2026_10_07_190000) do
  # Note that virtual tables may not work with other database engines. Be careful if changing database.
  create_virtual_table "message_search_index", "fts5", ["body", "tokenize=porter"]
 end
-
@@ -1,187 +0,0 @@
-# SQLite's default WAL auto-checkpoint (~1,000 pages) runs inside the committing
-# writer and fsyncs during the request. database.yml sets wal_autocheckpoint=0;
-# this module copies pages off the request thread with PASSIVE checkpoints.
-#
-# Every non-test process starts a contender. Callers that fork (Puma, Resque pool)
-# must stop before fork and start again in the child so the flock is never shared
-# across an inherited file descriptor.
-module SqliteWalCheckpoint
-  INTERVAL = 0.25
-  MAX_BACKOFF = 30.0
-  STOP_TIMEOUT = 5.0
-  LOCK_PATH = Rails.root.join("tmp/pids/sqlite_wal_checkpoint.lock")
-  LIFECYCLE_MUTEX = Mutex.new
-  private_constant :LIFECYCLE_MUTEX
-
-  class StopTimeout < StandardError; end
-
-  class << self
-    attr_writer :lock_path, :database_path_override
-
-    def start(interval: INTERVAL, enabled: !Rails.env.test?)
-      return unless enabled
-
-      LIFECYCLE_MUTEX.synchronize do
-        if @thread&.alive?
-          raise StopTimeout, "SQLite WAL checkpointer is still stopping" if @wakeup.closed?
-
-          return @thread
-        end
-
-        @wakeup = Thread::Queue.new
-        install_exit_checkpoint
-        @thread = Thread.new(@wakeup) { |wakeup| run(interval, wakeup) }
-        @thread.report_on_exception = false
-        @thread
-      end
-    end
-
-    # Signal the contender to exit and wait until it has released the flock and
-    # closed its SQLite connection. before_fork must not return while those are open.
-    def stop(timeout: STOP_TIMEOUT)
-      LIFECYCLE_MUTEX.synchronize do
-        return unless @thread
-
-        @wakeup.close
-        unless @thread.join(timeout)
-          # Never let a caller fork with live SQLite or flock ownership.
-          raise StopTimeout, "SQLite WAL checkpointer did not stop within #{timeout}s"
-        end
-        @thread = @wakeup = nil
-      end
-    end
-
-    def checkpoint
-      with_database { |database| checkpoint_on(database) }
-    end
-
-    # One leadership attempt for tests: acquire the lock, checkpoint once, release.
-    def tick
-      return :no_database unless database_path
-      lock = acquire_lock
-      return :busy unless lock
-
-      begin
-        result = checkpoint
-        result.nil? ? :no_database : :checkpointed
-      ensure
-        release_lock(lock)
-      end
-    end
-
-    def lock_path
-      @lock_path || LOCK_PATH
-    end
-
-    def reset!
-      stop
-      @lock_path = nil
-      @database_path_override = nil
-    end
-
-    private
-      def run(interval, wakeup)
-        Thread.current.name = "sqlite-wal-checkpoint"
-        backoff = interval
-
-        until wakeup.closed?
-          begin
-            path = database_path
-            unless path && File.exist?(path)
-              wait(wakeup, interval)
-              next
-            end
-
-            lock = acquire_lock
-            unless lock
-              wait(wakeup, interval)
-              next
-            end
-
-            begin
-              ran = false
-              with_database do |database|
-                ran = true
-                until wakeup.closed?
-                  checkpoint_on(database)
-                  backoff = interval
-                  wait(wakeup, interval)
-                end
-              end
-            ensure
-              release_lock(lock)
-            end
-
-            # with_database no-ops if the file vanished between the exist? check
-            # and open; sleep so we do not spin on the lock file.
-            wait(wakeup, interval) unless ran || wakeup.closed?
-          rescue => error
-            Rails.logger.warn "SQLite WAL checkpoint failed: #{error.class}: #{error.message}"
-            wait(wakeup, backoff)
-            backoff = [ backoff * 2, MAX_BACKOFF ].min
-          end
-        end
-      end
-
-      def wait(wakeup, timeout)
-        wakeup.pop(timeout: timeout)
-      end
-
-      def checkpoint_on(database)
-        database.execute("PRAGMA wal_checkpoint(PASSIVE)").first
-      end
-
-      def with_database
-        path = database_path
-        return unless path && File.exist?(path)
-
-        result = nil
-        SQLite3::Database.new(path) do |database|
-          # Bounds busy-handler retries, not PASSIVE checkpoint I/O.
-          database.busy_handler_timeout = 1_000
-          result = yield database
-        end
-        result
-      end
-
-      def database_path
-        return @database_path_override if @database_path_override
-
-        config = ActiveRecord::Base.connection_db_config
-        return unless config.adapter.to_s == "sqlite3"
-
-        ActiveRecord::ConnectionAdapters::SQLite3Adapter.resolve_path(config.database)
-      end
-
-      def acquire_lock
-        FileUtils.mkdir_p(File.dirname(lock_path))
-        file = File.open(lock_path, File::RDWR | File::CREAT, 0644)
-        if file.flock(File::LOCK_EX | File::LOCK_NB)
-          file
-        else
-          file.close
-          nil
-        end
-      rescue
-        file&.close
-        raise
-      end
-
-      def release_lock(file)
-        return unless file
-
-        file.flock(File::LOCK_UN)
-      ensure
-        file&.close
-      end
-
-      # Best-effort PASSIVE for short-lived console/rake writers that exit before
-      # the contender acquires the flock. Does not touch lock ownership.
-      def install_exit_checkpoint
-        return if @exit_checkpoint_installed
-
-        @exit_checkpoint_installed = true
-        at_exit { checkpoint rescue nil }
-      end
-  end
-end
@@ -1,27 +0,0 @@
-# Rails waits for ffmpeg however long it takes, and a video's preview is drawn inside the request that posts it.
-# This previewer gives ffmpeg a wall-clock limit, kills it past that, and reports a failed preview, so the message
-# is posted without one.
-class TimeLimitedVideoPreviewer < ActiveStorage::Previewer::VideoPreviewer
-  TIME_LIMIT = 10 # seconds
-
-  private
-    def capture(*argv, to:)
-      to.binmode
-
-      open_tempfile do |err|
-        IO.popen(argv, in: IO::NULL, err: err) do |out|
-          Timeout.timeout(TIME_LIMIT) { IO.copy_stream(out, to) }
-        rescue Timeout::Error
-          Process.kill :KILL, out.pid
-          raise ActiveStorage::PreviewError, "#{argv.first} took longer than #{TIME_LIMIT} seconds"
-        end
-        err.rewind
-
-        unless $?.success?
-          raise ActiveStorage::PreviewError, "#{argv.first} failed (status #{$?.exitstatus}): #{err.read.to_s.chomp}"
-        end
-      end
-
-      to.rewind
-    end
-end
@@ -4,13 +4,9 @@ end

 task "resque:pool:setup" do
  ActiveRecord::Base.connection.disconnect!
-  # Initializer may have started a contender in the pool master; drop it before
-  # workers fork so they do not inherit the flock.
-  SqliteWalCheckpoint.stop

  Resque::Pool.after_prefork do |job|
    ActiveRecord::Base.establish_connection
    Resque.redis.client.close
-    SqliteWalCheckpoint.start
  end
 end
@@ -1,29 +0,0 @@
-# Repair the database selected by each schema-load or migration operation.
-# db:prepare calls DatabaseTasks directly, bypassing Rake enhancements;
-# method hooks also run on every invocation.
-module RoomMessagesCountDatabaseTasks
-  def load_schema(...)
-    super.tap { repair_room_messages_count }
-  end
-
-  def migrate(...)
-    super.tap { repair_room_messages_count }
-  end
-
-  private
-    def repair_room_messages_count
-      migration_connection_pool.with_connection do |connection|
-        Room::MessagesCount.ensure!(connection)
-      end
-    end
-end
-
-ActiveRecord::Tasks::DatabaseTasks.singleton_class.prepend(RoomMessagesCountDatabaseTasks)
-
-namespace :room_messages_count do
-  task ensure: :environment do
-    ActiveRecord::Base.connection_pool.with_connection do |connection|
-      Room::MessagesCount.ensure!(connection)
-    end
-  end
-end
@@ -1,120 +0,0 @@
-# This is in lib so we can use it in a thread pool without the Rails executor
-#
-# Keeps TLS connections to push services open between deliveries, so a push doesn't pay for a new TCP and TLS
-# handshake every time. Each connection is pinned to the address Push::Subscription resolved and guarded for the
-# delivery that opened it, and is handed out again only to a delivery whose own resolution, just made, returned that
-# same address for the same host. Net::HTTP reconnects to its pinned address, never to a new lookup of the host.
-class WebPush::Connections
-  class ConnectionLost < StandardError; end
-  class StaleConnection < StandardError; end
-
-  # Where a request failed. Before writing it, Net::HTTP checks an idle connection (:checking) and connects again
-  # if the push service closed it (:connecting); then it writes (:sent). Only a failed check means a dead idle
-  # connection that a new one can replace without sending the push twice.
-  module Stages
-    attr_reader :stage
-
-    private
-      def begin_transport(...)
-        @stage = :checking
-        super.tap { @stage = :sent }
-      end
-
-      def connect(...)
-        @stage = :connecting if @stage == :checking
-        super
-      end
-  end
-
-  def initialize(keep_alive_timeout: 30, max_idle: 150)
-    @keep_alive_timeout = keep_alive_timeout
-    @max_idle = max_idle
-    @idle = Hash.new { |idle, address| idle[address] = [] }
-    @mutex = Mutex.new
-    @pid = Process.pid
-  end
-
-  def request(http, request)
-    unless http.ipaddr && !http.proxy? && http.use_ssl? && !http.started?
-      raise ArgumentError, "Only new, direct TLS connections pinned to an address are pooled"
-    end
-    address = [ http.address, http.port, http.ipaddr ]
-
-    if idle = checkout(address)
-      begin
-        return send_over(idle, request, reused: true).tap { checkin(address, idle) }
-      rescue StaleConnection
-        # The push service had closed it: a new connection takes the push
-      end
-    end
-
-    http.extend Stages
-    http.keep_alive_timeout = @keep_alive_timeout
-    http.start
-    send_over(http, request, reused: false).tap { checkin(address, http) }
-  end
-
-  def shutdown
-    @mutex.synchronize do
-      forget_after_fork
-      @shut_down = true
-      @idle.each_value { |connections| connections.each { |http, _| close(http) } }
-      @idle.clear
-    end
-  end
-
-  private
-    def send_over(http, request, reused:)
-      http.request(request)
-    rescue IOError, SystemCallError, OpenSSL::SSL::SSLError => error
-      close(http)
-      # Only a connection that was idle can have been dead already: on a new one the error is the push service's
-      raise StaleConnection if reused && http.stage == :checking
-      # The push service may have it: don't send it twice, and don't report a dropped connection as a TLS failure
-      raise ConnectionLost, "#{error.class}: #{error.message}" if http.stage == :sent
-      raise
-    end
-
-    def checkout(address)
-      @mutex.synchronize do
-        forget_after_fork
-        close_expired
-        @idle[address].pop&.first
-      end
-    end
-
-    def checkin(address, http)
-      @mutex.synchronize do
-        close_expired
-        if @shut_down || @idle.values.sum(&:size) >= @max_idle
-          close(http)
-        else
-          @idle[address].push [ http, now ]
-        end
-      end
-    end
-
-    # A forked process must not write on its parent's TLS sessions. They're left to the parent, not closed.
-    def forget_after_fork
-      unless @pid == Process.pid
-        @idle = Hash.new { |idle, address| idle[address] = [] }
-        @pid = Process.pid
-      end
-    end
-
-    def close_expired
-      @idle.each_value do |connections|
-        connections.reject! { |http, idle_since| (now - idle_since > @keep_alive_timeout).tap { |expired| close(http) if expired } }
-      end
-      @idle.delete_if { |_, connections| connections.empty? }
-    end
-
-    def close(http)
-      http.finish if http.started?
-    rescue IOError, SystemCallError, OpenSSL::SSL::SSLError
-    end
-
-    def now
-      Process.clock_gettime(Process::CLOCK_MONOTONIC)
-    end
-end
@@ -5,17 +5,13 @@ class WebPush::Pool
  def initialize(invalid_subscription_handler:)
    @delivery_pool = Concurrent::ThreadPoolExecutor.new(max_threads: 50, max_queue: 10000)
    @invalidation_pool = Concurrent::FixedThreadPool.new(1)
-    @connection = WebPush::Connections.new
+    @connection = Net::HTTP::Persistent.new(name: "web_push", pool_size: 150)
    @invalid_subscription_handler = invalid_subscription_handler
  end

  def queue(payload, subscriptions)
-    subscriptions.find_in_batches do |batch|
-      unread_counts = Membership.unread.where(user_id: batch.map(&:user_id)).group(:user_id).count
-
-      batch.each do |subscription|
-        deliver_later(payload, subscription, badge: unread_counts.fetch(subscription.user_id, 0))
-      end
+    subscriptions.find_each do |subscription|
+      deliver_later(payload, subscription)
    end
  end

@@ -26,9 +22,9 @@ class WebPush::Pool
  end

  private
-    def deliver_later(payload, subscription, badge:)
+    def deliver_later(payload, subscription)
      # Ensure any AR operations happen before we post to the thread pool
-      notification = subscription.notification(**payload, badge: badge)
+      notification = subscription.notification(**payload)
      subscription_id = subscription.id

      delivery_pool.post do
@@ -40,16 +40,6 @@ class PresenceChannelTest < ActionCable::Channel::TestCase
    end
  end

-  test "subscribing tells the user's other tabs when they read the room" do
-    membership = users(:david).memberships.first
-
-    freeze_time do
-      assert_broadcast_on "user_#{users(:david).id}_reads", { room_id: membership.room_id, at: Time.current.to_f } do
-        subscribe room_id: membership.room_id
-      end
-    end
-  end
-
  test "unsubscribing marks the membership as disconnected" do
    membership = users(:david).memberships.first
    subscribe room_id: membership.room_id
@@ -8,7 +8,7 @@ class UnreadRoomsChannelTest < ActionCable::Channel::TestCase

    assert subscription.confirmed?
    assert_has_stream "user_#{users(:jz).id}_unreads"
-    assert_not_includes subscription.stream_names, "unread_rooms"
+    assert_not_includes subscription.streams, "unread_rooms"
  end

  test "an outsider is not told about activity in a room they can't see" do
@@ -16,9 +16,7 @@ class UnreadRoomsChannelTest < ActionCable::Channel::TestCase
    assert_not direct.users.include?(users(:jz)), "jz must be an outsider for this test to mean anything"

    broadcasts = capture_unread_broadcasts_for(users(:jz)) do
-      perform_enqueued_jobs only: Message::BroadcastUnreadRoomJob do
-        direct.messages.create!(body: "Private", creator: users(:kevin), client_message_id: "outsider").broadcast_create
-      end
+      direct.messages.create!(body: "Private", creator: users(:kevin), client_message_id: "outsider").broadcast_create
    end

    assert_empty broadcasts
@@ -26,16 +24,12 @@ class UnreadRoomsChannelTest < ActionCable::Channel::TestCase

  test "a member is told about activity in their own room" do
    direct = rooms(:bender_and_kevin)
-    message = nil

    broadcasts = capture_unread_broadcasts_for(users(:kevin)) do
-      perform_enqueued_jobs only: Message::BroadcastUnreadRoomJob do
-        message = direct.messages.create!(body: "Private", creator: users(:bender), client_message_id: "member")
-        message.broadcast_create
-      end
+      direct.messages.create!(body: "Private", creator: users(:bender), client_message_id: "member").broadcast_create
    end

-    assert_equal [ { "roomId" => direct.id, "at" => message.created_at.to_f } ], broadcasts
+    assert_equal [ direct.id ], broadcasts.collect { |broadcast| broadcast["roomId"] }
  end

  private
@@ -43,7 +37,7 @@ class UnreadRoomsChannelTest < ActionCable::Channel::TestCase
      stub_connection(current_user: user)
      subscribe

-      stream = subscription.stream_names.sole
+      stream = subscription.streams.sole
      before = ActionCable.server.pubsub.broadcasts(stream).size

      yield
@@ -10,16 +10,6 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
    assert_response :ok
  end

-  test "edit shows whether room creation is restricted to administrators" do
-    get edit_account_url
-    assert_select "label.switch input.switch__input[type=checkbox]:not([checked])"
-
-    accounts(:signal).update!(settings: { restrict_room_creation_to_administrators: true })
-
-    get edit_account_url
-    assert_select "label.switch input.switch__input[type=checkbox][checked][data-action='change->form#submit']"
-  end
-
  test "edit groups administrators separately from members with a divider" do
    get edit_account_url

@@ -52,19 +42,6 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
    end
  end

-  test "edit lists a page of members and the next page carries on from it" do
-    User.insert_all 501.times.map { |i| { name: "Member #{i}", email_address: "member#{i}@37signals.com" } }
-    users(:kevin).banned!
-
-    get edit_account_url
-    first_page = listed_user_ids
-    get account_users_url(page: 2, format: :turbo_stream)
-    next_page = listed_user_ids
-
-    assert_not_empty next_page
-    assert_equal User.where(status: [ :active, :banned ]).without_bots.ids.sort, (first_page + next_page).sort
-  end
-
  test "update" do
    assert users(:david).administrator?

@@ -81,9 +58,4 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
    put account_url, params: { account: { name: "Different" } }
    assert_response :forbidden
  end
-
-  private
-    def listed_user_ids
-      response.body.scan(%r{href="/users/(\d+)"}).flatten.map(&:to_i)
-    end
 end
@@ -1 +1 @@
 .0.7
 .4.10