From 3f1a3402d84a2758b24dc1820ea0ddff7d13aa6e Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Sun, 8 Sep 2024 18:18:02 +0000
Subject: [PATCH] Merged in feature/all-clients-are-modern (pull request #49)

Move all clients to the 'modern' track.

* Force old client website to upgrade to new client

* Also add

* wording fix
---
 ruby/lib/jam_ruby/models/artifact_update.rb   | 3 ++-
 web/app/assets/javascripts/JamServer.js       | 1 +
 web/app/assets/javascripts/clientUpdate.js    | 2 +-
 web/app/views/clients/_client_update.html.erb | 6 ++----
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ruby/lib/jam_ruby/models/artifact_update.rb b/ruby/lib/jam_ruby/models/artifact_update.rb
index 7eed4ee59..518205ed0 100644
--- a/ruby/lib/jam_ruby/models/artifact_update.rb
+++ b/ruby/lib/jam_ruby/models/artifact_update.rb
@@ -12,7 +12,8 @@ module JamRuby
       "#{CLIENT_PREFIX}/JamBlasterClient",
       "#{CLIENT_PREFIX_MODERN}/Win32",
       "#{CLIENT_PREFIX_MODERN}/MacOSX-Intel",
-      "#{CLIENT_PREFIX_MODERN}/MacOSX-M"
+      "#{CLIENT_PREFIX_MODERN}/MacOSX-M",
+      "#{CLIENT_PREFIX_MODERN}/MacOSX"
     ]
 
     self.primary_key = 'id'
diff --git a/web/app/assets/javascripts/JamServer.js b/web/app/assets/javascripts/JamServer.js
index a23989315..91821766b 100644
--- a/web/app/assets/javascripts/JamServer.js
+++ b/web/app/assets/javascripts/JamServer.js
@@ -711,6 +711,7 @@
         client_id: client_id,
         machine: machine,
         os: context.JK.GetOSAsString(),
+        product: "JamClientModern",
         //jamblaster_serial_no: context.PlatformStore.jamblasterSerialNo(),
         udp_reachable: context.JK.StunInstance ? !context.JK.StunInstance.sync() : null // latency tester doesn't have the stun class loaded
       }
diff --git a/web/app/assets/javascripts/clientUpdate.js b/web/app/assets/javascripts/clientUpdate.js
index 627a0e48d..255050401 100644
--- a/web/app/assets/javascripts/clientUpdate.js
+++ b/web/app/assets/javascripts/clientUpdate.js
@@ -265,7 +265,7 @@
         return;
       }
 
-      var product = "JamClient"
+      var product = "JamClientModern"
       var currentVersion = context.jamClient.ClientUpdateVersion();
 
       if (!forceShow && (currentVersion == null || currentVersion.indexOf("Compiled")) > -1) {
diff --git a/web/app/views/clients/_client_update.html.erb b/web/app/views/clients/_client_update.html.erb
index ec80b0110..9c3d94458 100644
--- a/web/app/views/clients/_client_update.html.erb
+++ b/web/app/views/clients/_client_update.html.erb
@@ -114,11 +114,9 @@
 
   <div align="center">
     <div class="download-manual">
-      <p class="fix"><b>Step 1:</b> Uninstall the JamKazam application manually.</p>
-      <br/>
-      <p class="fix"><b>Step 2:</b> Download the latest JamKazam installer from <a class="open-downloads" href="/downloads" rel="external">our downloads page.</a></p><br/>
+      <p class="fix"><b>Step 1:</b> Download the latest JamKazam installer from <a class="open-downloads" href="/downloads" rel="external">our downloads page.</a></p><br/>
 
-      <p class="fix"><b>Step 3:</b> Double-click the downloaded file, and then drag & drop the Jamkazam application into your Applications folder.</p>
+      <p class="fix"><b>Step 2:</b> Double-click the downloaded file, and then drag & drop the Jamkazam application into your Applications folder, <b>and choose Replace option</b></p>
     </div>
     <div class="error-detail">
       Our automatic updater is temporarily not working for Mac OS on this release.