big link to server list page

LICENSE

@@ -1,6 +1,6 @@
 BSD 2-Clause License
 
-Copyright (c) 2018, Andy Janata
+Copyright (c) 2012-2020, Andy Janata
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

WebContent/game.jsp

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <%--
-Copyright (c) 2012-2018, Andy Janata
+Copyright (c) 2012-2020, Andy Janata
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted
@@ -94,10 +94,6 @@ boolean allowBlankCards = injector.getInstance(Key.get(new TypeLiteral<Boolean>(
     Xyzzy</dfn>
   </h1>
   <h3>A <a href="http://cardsagainsthumanity.com/">Cards Against Humanity</a> clone.</h3>
-  <p>
-    This webapp is still in development. There will be bugs, but hopefully they won't affect gameplay
-    very much.
-  </p>
   <p>
     If this is your first time playing, you may wish to read <a href="index.jsp">the changelog and
     list of known issues</a>.
@@ -113,6 +109,10 @@ boolean allowBlankCards = injector.getInstance(Key.get(new TypeLiteral<Boolean>(
     <a href="https://gist.githubusercontent.com/ajanata/07ededdb584f7bb77a8c7191d3a4bbcc/raw/e76faacc19c2bb598a1a8fd94b9ebcb29c5502e0">
     here's why.</a></li>
   </ul>
+  <h2>The servers are incredibly busy right now. There are several servers to try, there will be
+  room elsewhere! <a href='https://pretendyoure.xyz/zy'>CLICK HERE</a> to see the server list. As
+  long as you're on the same server as your friends, you can play together. Please stop crowding
+  pyx-1 ("The Biggest, Blackest Dick").</h2>
   <div id="nickbox">
     <label for="nickname">Nickname:</label>
     <input type="text" id="nickname" value="" maxlength="30" role="textbox"

WebContent/index.jsp

@@ -50,10 +50,6 @@ to, for instance, display the number of connected players.
   Xyzzy</dfn>
 </h1>
 <h3>A Cards Against Humanity clone.</h3>
-<p>
-  This webapp is still in development. There will be bugs, but hopefully they won't affect gameplay
-  very much.</strong>
-</p>
 <p>
   Your computer's IP address will <strong>always</strong> be logged when you load the game client.
   It is not tied in any way to your username, except possibly if a server error occurs. Gameplay

WebContent/js/cah.ajax.handlers.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2018, Andy Janata
+ * Copyright (c) 2012-2020, Andy Janata
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without modification, are permitted
@@ -48,7 +48,8 @@ cah.ajax.SuccessHandlers[cah.$.AjaxOperation.REGISTER] = function(data) {
 };
 
 cah.ajax.ErrorHandlers[cah.$.AjaxOperation.REGISTER] = function(data) {
-  $("#nickbox_error").text(cah.$.ErrorCode_msg[data[cah.$.AjaxResponse.ERROR_CODE]]);
+  // we actually want to allow HTML here since we're putting a link to the server list
+  $("#nickbox_error").html(cah.$.ErrorCode_msg[data[cah.$.AjaxResponse.ERROR_CODE]]);
   $("#nickname").focus();
 };
 

WebContent/js/cah.constants.js

@@ -199,7 +199,7 @@ cah.$.ErrorCode_msg['niu'] = "Nickname is already in use.";
 cah.$.ErrorCode_msg['ngs'] = "No game specified.";
 cah.$.ErrorCode_msg['nes'] = "You must use more words in a message that long.";
 cah.$.ErrorCode_msg['nitg'] = "You are not in that game.";
-cah.$.ErrorCode_msg['tmu'] = "There are too many users connected. Either join another server, or wait for a user to disconnect.";
+cah.$.ErrorCode_msg['tmu'] = "There are too many users connected. <strong><a href='https://pretendyoure.xyz/zy'>Try another server.</a></strong>";
 cah.$.ErrorCode_msg['ig'] = "Invalid game specified.";
 cah.$.ErrorCode_msg['gf'] = "That game is full. Join another.";
 cah.$.ErrorCode_msg['ncs'] = "No card specified.";

WebContent/privacy.html

@@ -21,7 +21,7 @@ shared with third parties.</p>
 <p>Game play details are kept on a permanent basis, to analyze which cards are the most and least
 popular. The data in these logs may be made publicly available once an interface is completed, and
 may be shared with third parties. These logs will never contain directly personally identifiable
-information, however they do connect cards played in multiple rounds and games to you, and include
+information, however they do connect cards played in multiple rounds and games together, and include
 geographic information no more precise than your postal (ZIP) code (and may be incredibly
 inaccurate). Additionally, unless you opt-out on the Preferences tab, your card play history will be
 tracked between multiple sessions.</p>
@@ -29,7 +29,8 @@ tracked between multiple sessions.</p>
 <ul>
   <li>A temporary ID to correlate all cards you play during a session.</li>
   <li>A persistent ID to correlate your activity between different sessions. Opting-out in the
-  Preferences tab will prevent this ID from being saved between sessions.</li>
+  Preferences tab will prevent this ID from being saved between sessions, causing a new one to be
+  generated every time.</li>
   <li>Your rough geographic location, including city, state/province/territory, country, and postal
   code, to some degree of accuracy.</li>
   <li>Information about your web browser including its name (Chrome, Firefox, etc.) and current

src/main/java/net/socialgamer/cah/Constants.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2012-2018, Andy Janata
+ * Copyright (c) 2012-2020, Andy Janata
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification, are permitted
@@ -415,8 +415,8 @@ public class Constants {
         "an existing game, or wait for one to become available."),
     TOO_MANY_SPECIAL_CHARACTERS("tmsc",
         "You used too many special characters in that message."),
-    TOO_MANY_USERS("tmu", "There are too many users connected. Either join another server, or " +
+    TOO_MANY_USERS("tmu", "There are too many users connected. "
-        "wait for a user to disconnect."),
+        + "<strong><a href='https://pretendyoure.xyz/zy'>Try another server.</a></strong>"),
     WRONG_PASSWORD("wp", "That password is incorrect.");
 
     private final String code;

src/main/resources/WEB-INF/log4j.properties

@@ -1,5 +1,10 @@
-log4j.rootLogger=INFO, stdout
+log4j.rootLogger=WARN, stdout
 
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
+
+
+#log4j.logger.net.socialgamer.cah.metrics=TRACE
+#log4j.logger.org.postgresql=TRACE
+#log4j.logger.net.socialgamer.cah.util.ChatFilter=TRACE