ajanata · devgianlu · May 17, 2020 · May 17, 2020 · May 19, 2020 · May 19, 2020
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,7 @@
+version: 2
+updates:
+  - package-ecosystem: maven
+    directory: "/"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,5 @@ build.properties
 target
 ssl/
 src/main/java/net/socialgamer/cah/util/RealShadowBannedStringProvider.java
+.idea
+*.iml
diff --git a/WebContent/cah.css b/WebContent/cah.css
@@ -413,14 +413,20 @@ span.debug, span.admin {
 .game_right_side, .game_options {
   position: absolute;
   left: 246px;
-  width: 1000px;
+  width: 75%;
 }
 
 .game_options {
   background: #eee;
   z-index: 500;
 }
 
+.custom_decks_list {
+  margin-top: 10px;
+  height: 120px;
+  width: 100%;
+}
+
 .game_right_side_box {
   height: 60%;
   margin: 10px;

diff --git a/WebContent/game.jsp b/WebContent/game.jsp
@@ -45,6 +45,9 @@ RequestWrapper wrapper = new RequestWrapper(request);
 ServletContext servletContext = pageContext.getServletContext();
 Injector injector = (Injector) servletContext.getAttribute(StartupUtils.INJECTOR);
 boolean allowBlankCards = injector.getInstance(Key.get(new TypeLiteral<Boolean>(){}, AllowBlankCards.class));
+boolean customDecksEnabled = injector.getInstance(Key.get(new TypeLiteral<Boolean>(){}, CustomDecksEnabled.class));
+boolean showAddCustomDeckUrl = injector.getInstance(Key.get(new TypeLiteral<Boolean>(){}, ShowAddCustomDeckUrl.class));
+boolean showAddCustomDeckJson = injector.getInstance(Key.get(new TypeLiteral<Boolean>(){}, ShowAddCustomDeckJson.class));
 %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -477,11 +480,29 @@ boolean allowBlankCards = injector.getInstance(Key.get(new TypeLiteral<Boolean>(
       	<option value="Unlimited">Unlimited</option>
       </select>
       <br/>
-      <fieldset class="card_sets">
-        <legend>Card Sets</legend>
-        <span class="base_card_sets"></span>
-        <span class="extra_card_sets"></span>
-      </fieldset>
+      <div style="display: flex">
+        <fieldset class="card_sets">
+          <legend>Card Sets</legend>
+          <span class="base_card_sets"></span>
+          <span class="extra_card_sets"></span>
+        </fieldset>
+        <% if (customDecksEnabled) { %>
+          <fieldset>
+            <legend>Custom Card Sets</legend>
+            <% if (showAddCustomDeckJson) { %>
+              <input type="button" class="add_custom_deck_json skip_changed" value="Upload JSON"/>
+            <% } %>
+
+            <% if (showAddCustomDeckUrl) { %>
+              <input type="button" class="add_custom_deck_url skip_changed" value="Download from URL"/>
+            <% } %>
+
+            <input type="button" class="remove_selected_custom_deck skip_changed" value="Removed selected"/>
+            <select class="custom_decks_list skip_changed" multiple="multiple">
+            </select>
+        </fieldset>
+        <% } %>
+      </div>
       <% if (allowBlankCards) { %>
         <br/>
         <label id="blanks_limit_label" title="Blank cards allow a player to type in their own answer.">

diff --git a/WebContent/js/cah.ajax.builder.js b/WebContent/js/cah.ajax.builder.js
@@ -189,13 +189,32 @@ cah.ajax.Builder.prototype.withEmote = function(emote) {
 };
 
 /**
- * @param {string}
- *          id The Cardcast ID of the deck to add.
+ * @param {string} json The custom deck JSON
+ * @returns {cah.ajax.Builder} This object.
+ */
+cah.ajax.Builder.prototype.withCustomDeckJson = function(json) {
+  this.assertNotExecuted_();
+  this.data[cah.$.AjaxRequest.CUSTOM_CARDSET_JSON] = json;
+  return this;
+};
+
+/**
+ * @param {string} url The custom deck URL
+ * @returns {cah.ajax.Builder} This object.
+ */
+cah.ajax.Builder.prototype.withCustomDeckUrl = function(url) {
+  this.assertNotExecuted_();
+  this.data[cah.$.AjaxRequest.CUSTOM_CARDSET_URL] = url;
+  return this;
+};
+
+/**
+ * @param {int} id The custom deck ID
  * @returns {cah.ajax.Builder} This object.
  */
-cah.ajax.Builder.prototype.withCardcastId = function(id) {
+cah.ajax.Builder.prototype.withCustomDeckId = function(id) {
   this.assertNotExecuted_();
-  this.data[cah.$.AjaxRequest.CARDCAST_ID] = id;
+  this.data[cah.$.AjaxRequest.CUSTOM_CARDSET_ID] = id;
   return this;
 };
 

diff --git a/WebContent/js/cah.ajax.handlers.js b/WebContent/js/cah.ajax.handlers.js
@@ -300,19 +300,19 @@ cah.ajax.SuccessHandlers[cah.$.AjaxOperation.SCORE] = function(data, req) {
   }
 };
 
-cah.ajax.SuccessHandlers[cah.$.AjaxOperation.CARDCAST_ADD_CARDSET] = function(data) {
+cah.ajax.SuccessHandlers[cah.$.AjaxOperation.ADD_CARDSET] = function(data) {
   // pass
 };
 
-cah.ajax.SuccessHandlers[cah.$.AjaxOperation.CARDCAST_REMOVE_CARDSET] = function(data) {
+cah.ajax.SuccessHandlers[cah.$.AjaxOperation.REMOVE_CARDSET] = function(data) {
   // pass
 };
 
-cah.ajax.SuccessHandlers[cah.$.AjaxOperation.CARDCAST_LIST_CARDSETS] = function(data, req) {
+cah.ajax.SuccessHandlers[cah.$.AjaxOperation.LIST_CARDSETS] = function(data, req) {
   var gameId = req[cah.$.AjaxRequest.GAME_ID];
   var game = cah.currentGames[gameId];
   if (game) {
-    game.listCardcastDecks(data[cah.$.AjaxResponse.CARD_SETS]);
+    game.updateCustomDecks(data[cah.$.AjaxResponse.CARD_SETS]);
   }
 };
 

diff --git a/WebContent/js/cah.app.js b/WebContent/js/cah.app.js
@@ -213,29 +213,6 @@ function chatsubmit_click(game_id, parent_element) {
       case 'names':
         ajax = cah.Ajax.build(cah.$.AjaxOperation.NAMES);
         break;
-      case 'addcardcast':
-        if (game_id !== null) {
-          ajax = cah.Ajax.build(cah.$.AjaxOperation.CARDCAST_ADD_CARDSET).withCardcastId(
-              text.split(' ')[0]).withGameId(game_id);
-        } else {
-          cah.log.error("This command only works in a game.");
-        }
-        break;
-      case 'removecardcast':
-        if (game_id !== null) {
-          ajax = cah.Ajax.build(cah.$.AjaxOperation.CARDCAST_REMOVE_CARDSET).withCardcastId(
-              text.split(' ')[0]).withGameId(game_id);
-        } else {
-          cah.log.error("This command only works in a game.");
-        }
-        break;
-      case 'listcardcast':
-        if (game_id !== null) {
-          ajax = cah.Ajax.build(cah.$.AjaxOperation.CARDCAST_LIST_CARDSETS).withGameId(game_id);
-        } else {
-          cah.log.error("This command only works in a game.");
-        }
-        break;
       case 'whois':
         ajax = cah.Ajax.build(cah.$.AjaxOperation.WHOIS).withNickname(text.split(' ')[0]);
         // so we can show it in the right place; the server ignores this