From 9697f7b43dba6b997bdc38d513f34221ce87966c Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike@37signals.com>
Date: Mon, 10 Nov 2025 15:49:59 -0500
Subject: [PATCH] Replace some instances of Current.account with model account

---
 app/models/board/entropic.rb     | 2 +-
 app/models/card/promptable.rb    | 2 +-
 app/models/comment/promptable.rb | 2 +-
 app/models/webhook.rb            | 3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/models/board/entropic.rb b/app/models/board/entropic.rb
index d49e0007a..beee4883b 100644
--- a/app/models/board/entropic.rb
+++ b/app/models/board/entropic.rb
@@ -7,7 +7,7 @@ module Board::Entropic
   end
 
   def entropy
-    super || Current.account.entropy
+    super || account.entropy
   end
 
   def auto_postpone_period=(new_value)
diff --git a/app/models/card/promptable.rb b/app/models/card/promptable.rb
index ef2799b8f..4608d3e4b 100644
--- a/app/models/card/promptable.rb
+++ b/app/models/card/promptable.rb
@@ -24,7 +24,7 @@ module Card::Promptable
       * Board id: #{board_id}
       * Board name: #{board.name}
       * Number of comments: #{comments.count}
-      * Path: #{card_path(self, script_name: Current.account.slug)}
+      * Path: #{card_path(self, script_name: account.slug)}
 
       END OF CARD #{id}
     PROMPT
diff --git a/app/models/comment/promptable.rb b/app/models/comment/promptable.rb
index bc20ebfa3..10b49c247 100644
--- a/app/models/comment/promptable.rb
+++ b/app/models/comment/promptable.rb
@@ -20,7 +20,7 @@ module Comment::Promptable
         * Card title: #{card.title}
         * Created by: #{creator.name}}
         * Created at: #{created_at}}
-        * Path: #{card_path(card, anchor: ActionView::RecordIdentifier.dom_id(self), script_name: Current.account.slug)}
+        * Path: #{card_path(card, anchor: ActionView::RecordIdentifier.dom_id(self), script_name: account.slug)}
         END OF COMMENT #{id}
       PROMPT
   end
diff --git a/app/models/webhook.rb b/app/models/webhook.rb
index 13b92f389..c8292a1f6 100644
--- a/app/models/webhook.rb
+++ b/app/models/webhook.rb
@@ -49,8 +49,7 @@ class Webhook < ApplicationRecord
   end
 
   def renderer
-    # TODO:PLANB: Current.account is not quite right, we should use the webhook's account_id
-    @renderer ||= ApplicationController.renderer.new(script_name: "/#{Current.account.external_account_id}", https: !Rails.env.local?)
+    @renderer ||= ApplicationController.renderer.new(script_name: "/#{account.external_account_id}", https: !Rails.env.local?)
   end
 
   def for_basecamp?