From 38213a68fd01840727baca93f215ec8806439706 Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Tue, 5 Jan 2021 21:45:35 -0600
Subject: [PATCH] try

---
 ruby/lib/jam_ruby/recurly_client.rb | 34 +++++++++++++++++++----------
 web/app/assets/javascripts/ftue.js  |  4 ++--
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/ruby/lib/jam_ruby/recurly_client.rb b/ruby/lib/jam_ruby/recurly_client.rb
index 1accc1246..b25f43755 100644
--- a/ruby/lib/jam_ruby/recurly_client.rb
+++ b/ruby/lib/jam_ruby/recurly_client.rb
@@ -406,12 +406,32 @@ module JamRuby
         account = fed_account
       end
 
+      # first try to find the current subscription. If it's gone, delete our state. If expired, delete our state.
+      if user.recurly_subscription_id
+        begin
+          subscription = Recurly::Subscription.find(user.recurly_subscription_id)
+        rescue Recurly::Resource::NotFound
+          puts "subscription is gone. delete it!"
+          user.update_attribute(:recurly_subscription_id, nil)
+          user.recurly_subscription_id = nil
+          subscription = nil
+        end
+
+        puts "Subscription state: #{subscription.state}"
+        if subscription.state == 'expired'
+          puts "subscription is expired. stop tracking it!"
+          user.update_attribute(:recurly_subscription_id, nil)
+          user.recurly_subscription_id = nil
+          subscription = nil
+        end
+      end
+
       if user.recurly_subscription_id.nil?
         if account
           active_subscription = nil
           account.subscriptions.find_each do |subscription|
             puts "Subscription: #{subscription.inspect} #{subscription.state}"
-            if subscription.state == :active || subscription.state == :future
+            if subscription.state == "active" || subscription.state == "future"
               active_subscription = subscription
               break
             end
@@ -420,20 +440,12 @@ module JamRuby
         else
           puts "can't find subscription for account #{account}"
         end
-      else
-        begin
-          subscription = Recurly::Subscription.find(user.recurly_subscription_id)
-        rescue Recurly::Resource::NotFound
-          puts "subscription is gone. delete it!"
-          user.update_attribute(:recurly_subscription_id, nil)
-          user.recurly_subscription_id = nil
-        end
       end
 
       if subscription && user.recurly_subscription_id.nil?
         puts "Repairing subscription ID on account"
-        user.update_attribute(:recurly_subscription_id, subscription.id)
-        user.recurly_subscription_id = subscription.id
+        user.update_attribute(:recurly_subscription_id, subscription.uuid)
+        user.recurly_subscription_id = subscription.uuid
       end
 
       return [subscription, account]
diff --git a/web/app/assets/javascripts/ftue.js b/web/app/assets/javascripts/ftue.js
index 54ee2c1a0..ad1ff33e6 100644
--- a/web/app/assets/javascripts/ftue.js
+++ b/web/app/assets/javascripts/ftue.js
@@ -477,7 +477,7 @@
         $select.removeAttr("disabled").easyDropDown('enable');
         $('[layout-wizard-step="2"] .settings-asio select').removeAttr("disabled").easyDropDown('enable')
         // Set selects to lowest possible values to start:
-        $('#asio-framesize').val('2.5').change();
+        $('#asio-framesize').val('2').change();
         $('#asio-input-latency').val('0').change();
         $('#asio-output-latency').val('0').change();
         // Special-case for a non-ASIO device, set to 1
@@ -851,7 +851,7 @@
           // Win32 + ControlPanel = ASIO
           // frame=2.5, buffers=0
           $asioBtn.show();
-          $frame.val('2.5');
+          $frame.val('2');
           $bin.val('0');
           $bout.val('0');
         } else {