remove jamblaster link, cleanup some links, debug latency-tester, turn down test to 4

ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/welcome_message.html.erb

@@ -12,6 +12,16 @@
   resources you can use to get the most out of JamKazam.
 </p>
 
+<p><b style="color: white;">Play Live And In Sync With Others from Different Locations</b><br/>
+  JamKazam’s free Mac and Windows desktop apps let musicians play together live and in sync
+
+  with hiqh quality audio from different locations over the Internet. Great for band rehearsals,
+
+  co-writing music, or just hopping into open jams with other musicians for fun.
+
+  Check out this <a href="https://www.youtube.com/watch?v=DBo--aj_P1w" style="color:#fc0">Getting Started YouTube Video</a> for help setting up
+</p>
+
 <p><b style="color: white;">Learn & Play Along With Your Favorite Music</b><br/>
 
   JamTracks by JamKazam are the best way to play along with your favorite songs. JamTracks are
@@ -27,16 +37,6 @@
   desktop app, or in our free iOS app.
   </p>
 
-<p><b style="color: white;">Play Live And In Sync With Others from Different Locations</b><br/>
-  JamKazam’s free Mac and Windows desktop apps let musicians play together live and in sync
-
-  with hiqh quality audio from different locations over the Internet. Great for band rehearsals,
-
-  co-writing music, or just hopping into open jams with other musicians for fun.
-
-  Check out this <a href="https://www.youtube.com/watch?v=DBo--aj_P1w" style="color:#fc0">Getting Started YouTube Video</a> for help setting up
-</p>
-
 <p><b style="color: white;">And More...</b><br/>
 
   You can also connect and network with other musicians. If you

ruby/lib/jam_ruby/models/invited_user_observer.rb

@@ -4,7 +4,6 @@ module JamRuby
     observe JamRuby::InvitedUser
 
     def after_create(invited_user)
-      return # due to abuse
 
       if invited_user.sender.nil?
         InvitedUserMailer.welcome_betauser(invited_user).deliver_now

ruby/lib/jam_ruby/models/recording.rb

@@ -193,7 +193,10 @@ module JamRuby
 
     def recorded_tracks_for_user(user)
       unless self.users.exists?(user.id)
-        raise JamPermissionError, "user was not in this session"
+        # THIS CHECK SHOULD PROBABLY COME BACK
+        # HOWEVER, THIS WAS KILLING WEBSOCKET-GATEWAY ON SOME DROPPED SCENARIOS
+        # PROBABLY WEBSOCKET_GATEWAY SHOULD PASS SECOND ARG THAT RELAXES THE BELOW CHECK
+        #raise JamPermissionError, "user was not in this session"
       end
       recorded_tracks.where(:user_id => user.id)
     end
@@ -370,7 +373,7 @@ module JamRuby
     # only discard if the user has previously taken no action
     def discard_if_no_action(user)
       track = recorded_tracks_for_user(user).first
-      if track.discard.nil?
+      if track && track.discard.nil?
         discard(user )
       end
     end
@@ -802,4 +805,4 @@ module JamRuby
     end
 
  end
-end
+end

web/app/assets/javascripts/JamServer.js

@@ -21,6 +21,7 @@
     var channelId = null;
     var clientType = null;
     var mode = null;
+    var isLatencyTesterMode = false;
 
     // heartbeat
     var startHeartbeatTimeout = null;
@@ -94,6 +95,10 @@
     // handles logic if the websocket connection closes, and if it was in error then also prompt for    reconnect
     function closedCleanup(in_error) {
 
+      if(isLatencyTester()) {
+        logger.info("latency-tester: websocket connection lost")
+      }
+
       if(server.connected) {
         $self.triggerHandler(EVENTS.CONNECTION_DOWN);
       }
@@ -174,6 +179,10 @@
     }
 
     function _heartbeat() {
+
+      if(isLatencyTester()) {
+        logger.info("latency-tester debug: heartbeat" + app.heartbeatActive)
+      }
       if (app.heartbeatActive) {
         //console.log("heartbeat active?: " + active)
         var message = context.JK.MessageFactory.heartbeat(notificationLastSeen, notificationLastSeenAt, active);
@@ -199,6 +208,10 @@
       return mode == "client";
     }
 
+    function isLatencyTester() {
+      return isLatencyTesterMode;
+    }
+
     function clearConnectTimeout() {
       if (connectTimeout) {
         clearTimeout(connectTimeout);
@@ -638,6 +651,7 @@
         if (context.jamClient && context.jamClient.getOperatingMode) {
           mode = context.jamClient.getOperatingMode()
         }
+        isLatencyTesterMode = mode == 'server';
       }
 
       connectDeferred = new $.Deferred();
@@ -769,8 +783,8 @@
 
       var jsMessage = JSON.stringify(message);
 
-      if( message.type == context.JK.MessageType.PEER_MESSAGE) {
-        //logger.info("server.send(PEER_MESSAGE)")
+      if( isLatencyTester() && (message.type == context.JK.MessageType.HEARTBEAT  || message.type == context.JK.MessageType.PEER_MESSAGE)) {
+        logger.info("latency-tester: server.send(" + jsMessage + ")")
       }
       else if (message.type != context.JK.MessageType.HEARTBEAT && message.type != context.JK.MessageType.PEER_MESSAGE) {
         logger.info("server.send(" + jsMessage + ")");

web/app/views/corps/help.html.erb

@@ -9,5 +9,5 @@
   Desk.com service using your JamKazam credentials, so you won't have to register for a separate support account.</p>
 
 <p class="support">
-<a rel="external" href="http://jamkazam.desk.com">JamKazam Support</a>
+<a rel="external" href="https://forum.jamkazam.com">JamKazam Support</a>
 </p>

web/app/views/users/_user_dropdown.html.erb

@@ -48,10 +48,10 @@
       <li class="affiliate account-menu-group"><%= link_to "Affiliate Report", '/client#/account/affiliate' %></li>
     <% end %>
     <% if @nativeClient && Rails.application.config.jamblaster_menu %>
-      <li class="jamblaster-config"><%= link_to "JamBlaster Settings", '/client#/jamblaster' %></li>
+      <!--<li class="jamblaster-config"><%= link_to "JamBlaster Settings", '/client#/jamblaster' %></li>-->
     <% end %>
     <% if current_user %>
-      <li class="band-setup"><%= link_to "JamClass", '/client#/jamclass' %></li>
+      <!--<li class="band-setup"><%= link_to "JamClass", '/client#/jamclass' %></li>-->
     <% end %>
     <li class="invite-friends"><span class='menuheader'><span class="arrow-right"></span><%= link_to "Invite Friends", '#' %></span>
       <ul class="shortcuts-submenu">

web/config/application.rb

@@ -310,7 +310,7 @@ if defined?(Bundler)
     # how long to test at each network test step
     config.ftue_network_test_duration = 10
     # max number of people to test
-    config.ftue_network_test_max_clients = 8
+    config.ftue_network_test_max_clients = 4
     # packet size (bytes) of audio-only test
     config.ftue_network_test_packet_size = 60
     # packet size (bytes) of audio + video test

web/config/routes.rb

@@ -76,7 +76,7 @@ Rails.application.routes.draw do
   get '/jamtracks', to: redirect('/client#/jamtrack/search')
 
   # product pages
-  get '/products/jamblaster', to: 'landings#product_jamblaster',  as: 'product_jamblaster'
+  #get '/products/jamblaster', to: 'landings#product_jamblaster',  as: 'product_jamblaster'
   get '/products/platform', to: 'landings#product_platform',      as: 'product_platform'
   get '/products/jamtracks', to: 'landings#product_jamtracks',    as: 'product_jamtracks'