From c53b56c1db95ae85b64d5231a51d866d299390ca Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike@37signals.com>
Date: Wed, 19 Nov 2025 15:49:58 -0500
Subject: [PATCH] Display a helpful error message when join code is exhausted

ref: https://app.fizzy.do/5986089/cards/3015
---
 app/controllers/join_codes_controller.rb       |  8 ++++++--
 app/views/join_codes/inactive.html.erb         | 15 +++++++++++++++
 test/controllers/join_codes_controller_test.rb |  3 ++-
 3 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 app/views/join_codes/inactive.html.erb

diff --git a/app/controllers/join_codes_controller.rb b/app/controllers/join_codes_controller.rb
index 6d790c232..863522893 100644
--- a/app/controllers/join_codes_controller.rb
+++ b/app/controllers/join_codes_controller.rb
@@ -29,10 +29,14 @@ class JoinCodesController < ApplicationController
 
   private
     def set_join_code
-      @join_code ||= Account::JoinCode.active.find_by(code: params.expect(:code), account: Current.account)
+      @join_code ||= Account::JoinCode.find_by(code: params.expect(:code), account: Current.account)
     end
 
     def ensure_join_code_is_valid
-      head :not_found unless @join_code&.active?
+      if @join_code.nil?
+        head :not_found
+      elsif !@join_code.active?
+        render :inactive, status: :gone
+      end
     end
 end
diff --git a/app/views/join_codes/inactive.html.erb b/app/views/join_codes/inactive.html.erb
new file mode 100644
index 000000000..1bddb6e42
--- /dev/null
+++ b/app/views/join_codes/inactive.html.erb
@@ -0,0 +1,15 @@
+<% @page_title = "You can't join #{@join_code.account.name} right now." %>
+
+<div class="panel panel--centered flex flex-column gap-half">
+  <h1 class="txt-x-large font-weight-black margin-none"><%= @page_title %></h1>
+
+  <p class="txt-medium">This join code has no invitations left on it.</p>
+
+  <p class="txt-medium">
+    <%= link_to "Check out Fizzy", "https://www.fizzy.do" %>.
+  </p>
+</div>
+
+<% content_for :footer do %>
+  <%= render "sessions/footer" %>
+<% end %>
diff --git a/test/controllers/join_codes_controller_test.rb b/test/controllers/join_codes_controller_test.rb
index 173e3b5d2..de126abd8 100644
--- a/test/controllers/join_codes_controller_test.rb
+++ b/test/controllers/join_codes_controller_test.rb
@@ -24,7 +24,8 @@ class JoinCodesControllerTest < ActionDispatch::IntegrationTest
 
     get join_path(code: @join_code.code, script_name: @account.slug)
 
-    assert_response :not_found
+    assert_response :gone
+    assert_in_body "This join code has no invitations left on it"
   end
 
   test "create" do