Update - Market page refactor

Author: EnterpriseGoose

app/assets/images/market-bg.webp

@@ -1,6 +1,13 @@
 class CatacombsController < ApplicationController
+  before_action :check_user_eligibility, except: [:index]
 
   def index
+    # Redirect banned users away from catacombs
+    if current_user&.banned?
+      redirect_to root_path, alert: "You cannot access the catacombs."
+      return
+    end
+    
     @betting_enabled = Flipper.enabled?(:betting, current_user)
     @current_week = ApplicationController.helpers.current_week_number
     @personal_bet = current_user.personal_bets.find_by(week: @current_week) if current_user
@@ -22,6 +29,7 @@ def index
       @emerald_unlocked = current_user.emerald_unlocked
       @amethyst_unlocked = current_user.amethyst_unlocked
       @current_runes = current_user.current_runes
+      @user_is_out = current_user.out?
     end
 
     # Calculate current hours for personal bet if exists
@@ -412,4 +420,12 @@ def log_runes
 
     render json: { success: true }
   end
+
+  private
+
+  def check_user_eligibility
+    if current_user&.out?
+      render json: { success: false, message: "You cannot use catacombs actions while out of Siege" }, status: :forbidden
+    end
+  end
 end

app/assets/images/market-front.webp

@@ -87,16 +87,14 @@ def purchase
             render json: { success: false, error: "You've already purchased the maximum amount of this item! (#{purchased_count}/#{max_purchases})" }
             return
           end
-        elsif tech_tree_item[:maxPurchases].nil?
-          # Infinite purchases (like grants) - no purchase limit
         elsif tech_tree_item[:maxPurchases] && tech_tree_item[:maxPurchases] > 1
           # Multi-purchase item with static limit
           if purchased_count >= tech_tree_item[:maxPurchases]
             render json: { success: false, error: "You've already purchased the maximum amount of this item!" }
             return
           end
         else
-          # Single purchase item
+          # Default: Single purchase item (maxPurchases nil or 1)
           if purchased_count > 0
             render json: { success: false, error: "You already own this item!" }
             return
@@ -206,9 +204,15 @@ def purchase
 
   def set_main_device
     device_id = params[:device_id]
+    should_refund = params[:refund] == true || params[:refund] == "true"
+
+    if should_refund
+      refunded_coins = current_user.refund_tech_tree_purchases
+      Rails.logger.info "Refunded #{refunded_coins} coins to user #{current_user.id}"
+    end
 
     if current_user.set_main_device(device_id)
-      render json: { success: true, message: "Main device updated successfully" }
+      render json: { success: true, message: "Main device updated successfully", refunded: should_refund }
     else
       render json: { success: false, error: "Invalid device selection" }
     end

app/assets/images/market/market-bg.webp

@@ -349,6 +349,39 @@ def set_main_device(device_id)
     update(main_device: device_id)
   end
 
+  def refund_tech_tree_purchases
+    # Load tech tree data to get the list of actual tech tree items
+    tech_tree_data = JSON.parse(File.read(Rails.root.join("config", "tech_tree_data.json")))
+    tech_tree_item_names = []
+
+    # Extract all tech tree item names
+    tech_tree_data.each do |category_name, category_data|
+      next unless category_data["branches"]
+
+      category_data["branches"].each do |device_name, device_branches|
+        device_branches.each do |direction, item|
+          tech_tree_item_names << item["title"] if item["title"]
+        end
+      end
+    end
+
+    # Find purchases that match tech tree items
+    tech_tree_purchases = shop_purchases.where(item_name: tech_tree_item_names)
+    total_refund = 0
+
+    tech_tree_purchases.each do |purchase|
+      total_refund += purchase.coins_spent
+    end
+
+    tech_tree_purchases.destroy_all
+
+    if total_refund > 0
+      update(coins: coins + total_refund)
+    end
+
+    total_refund
+  end
+
   def main_device_name
     case main_device
     when "framework_12"

app/assets/images/market/market-front.webp

@@ -717,28 +717,43 @@ document.addEventListener('DOMContentLoaded', function() {
     .then(response => response.json())
     .then(data => {
       // Update the display with the trust status
-      let statusHtml = '';
+      element.innerHTML = '';
+      const span = document.createElement('span');
+      span.style.fontWeight = '600';
+      
       switch(data.status) {
         case 'trusted':
-          statusHtml = '<span style="color: #059669; font-weight: 600;">✓ Trusted</span>';
+          span.style.color = '#059669';
+          span.textContent = '✓ Trusted';
           break;
         case 'neutral':
-          statusHtml = '<span style="color: #2563eb; font-weight: 600;">○ Neutral</span>';
+          span.style.color = '#2563eb';
+          span.textContent = '○ Neutral';
           break;
         case 'banned':
-          statusHtml = '<span style="color: #dc2626; font-weight: 600;">✗ Banned</span>';
+          span.style.color = '#dc2626';
+          span.textContent = '✗ Banned';
           break;
         case 'error':
-          statusHtml = `<span style="color: #dc2626; font-weight: 600;" title="${data.message || 'API Error'}">⚠ Error</span>`;
+          span.style.color = '#dc2626';
+          span.textContent = '⚠ Error';
+          span.title = data.message || 'API Error';
           break;
         default:
-          statusHtml = `<span style="color: #6b7280; font-weight: 600;" title="${data.message || 'Unknown status'}">? Unknown</span>`;
+          span.style.color = '#6b7280';
+          span.textContent = '? Unknown';
+          span.title = data.message || 'Unknown status';
       }
-      element.innerHTML = statusHtml;
+      element.appendChild(span);
     })
     .catch(error => {
       console.error('Error loading hackatime trust for user', userId, ':', error);
-      element.innerHTML = '<span style="color: #dc2626; font-weight: 600;">⚠ Error</span>';
+      element.innerHTML = '';
+      const span = document.createElement('span');
+      span.style.color = '#dc2626';
+      span.style.fontWeight = '600';
+      span.textContent = '⚠ Error';
+      element.appendChild(span);
     });
   });
 });

app/assets/images/market/merchant.webp

@@ -1437,7 +1437,8 @@
             const addHeight = Math.max((commit.additions / maxChanges) * 130, 3);
             const delHeight = Math.max((commit.deletions / maxChanges) * 130, 3);
 
-            const commitTitle = `${commit.message}\\nAdditions: +${commit.additions}\\nDeletions: -${commit.deletions}\\nAuthor: ${commit.author}`;
+            const escapeAttr = (str) => String(str).replace(/[&<>"']/g, m => ({'&':'&amp;','<':'&lt;','>':'&gt;','"':'&quot;',"'":'&#39;'}[m]));
+            const commitTitle = escapeAttr(`${commit.message}\nAdditions: +${commit.additions}\nDeletions: -${commit.deletions}\nAuthor: ${commit.author}`);
 
             // Calculate opacity based on stack position (darker = more recent)
             const opacity = 1 - (stackIndex * 0.15);