From 296a692db910b5473005e4654796f43587cba000 Mon Sep 17 00:00:00 2001 From: Andy Janata Date: Sat, 4 Apr 2020 09:57:04 -0700 Subject: [PATCH] big link to server list page --- LICENSE | 2 +- WebContent/game.jsp | 10 +++++----- WebContent/index.jsp | 4 ---- WebContent/js/cah.ajax.handlers.js | 5 +++-- WebContent/js/cah.constants.js | 2 +- WebContent/privacy.html | 5 +++-- src/main/java/net/socialgamer/cah/Constants.java | 6 +++--- src/main/resources/WEB-INF/log4j.properties | 7 ++++++- 8 files changed, 22 insertions(+), 19 deletions(-) diff --git a/LICENSE b/LICENSE index 3fa9502..4a72d94 100644 --- a/LICENSE +++ b/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 diff --git a/WebContent/game.jsp b/WebContent/game.jsp index 416f468..7dca38a 100644 --- a/WebContent/game.jsp +++ b/WebContent/game.jsp @@ -1,6 +1,6 @@ <%-- -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( Xyzzy

A Cards Against Humanity clone.

-

- This webapp is still in development. There will be bugs, but hopefully they won't affect gameplay - very much. -

If this is your first time playing, you may wish to read the changelog and list of known issues. @@ -113,6 +109,10 @@ boolean allowBlankCards = injector.getInstance(Key.get(new TypeLiteral( here's why. +

The servers are incredibly busy right now. There are several servers to try, there will be + room elsewhere! CLICK HERE 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").

A Cards Against Humanity clone.

-

- This webapp is still in development. There will be bugs, but hopefully they won't affect gameplay - very much. -

Your computer's IP address will always 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 diff --git a/WebContent/js/cah.ajax.handlers.js b/WebContent/js/cah.ajax.handlers.js index 9bf8531..f6c5f92 100644 --- a/WebContent/js/cah.ajax.handlers.js +++ b/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(); }; diff --git a/WebContent/js/cah.constants.js b/WebContent/js/cah.constants.js index 8126bba..a2bf31a 100644 --- a/WebContent/js/cah.constants.js +++ b/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. Try another server."; cah.$.ErrorCode_msg['ig'] = "Invalid game specified."; cah.$.ErrorCode_msg['gf'] = "That game is full. Join another."; cah.$.ErrorCode_msg['ncs'] = "No card specified."; diff --git a/WebContent/privacy.html b/WebContent/privacy.html index 710f773..b76870a 100644 --- a/WebContent/privacy.html +++ b/WebContent/privacy.html @@ -21,7 +21,7 @@ shared with third parties.

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.

@@ -29,7 +29,8 @@ tracked between multiple sessions.

  • A temporary ID to correlate all cards you play during a session.
  • 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.
    • + Preferences tab will prevent this ID from being saved between sessions, causing a new one to be + generated every time.
  • Your rough geographic location, including city, state/province/territory, country, and postal code, to some degree of accuracy.
  • Information about your web browser including its name (Chrome, Firefox, etc.) and current diff --git a/src/main/java/net/socialgamer/cah/Constants.java b/src/main/java/net/socialgamer/cah/Constants.java index 7671c5f..734b3f4 100644 --- a/src/main/java/net/socialgamer/cah/Constants.java +++ b/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 " + - "wait for a user to disconnect."), + TOO_MANY_USERS("tmu", "There are too many users connected. " + + "Try another server."), WRONG_PASSWORD("wp", "That password is incorrect."); private final String code; diff --git a/src/main/resources/WEB-INF/log4j.properties b/src/main/resources/WEB-INF/log4j.properties index 33f8b75..47aeb19 100644 --- a/src/main/resources/WEB-INF/log4j.properties +++ b/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