Disable starter flairs (reverts 6f4fcd8) (#572)

api/controllers/FlairController.js

@@ -112,12 +112,6 @@ module.exports = {
       var newsvFlair = _.get(req, "user.flair.svex.flair_css_class") || "";
       newsvFlair = newsvFlair.replace(/2/, "");
       var promises = [];
-      var extraFlair = req.allParams().extraFlair;
-      if (extraFlair && _.includes(Flairs.extraFlair, extraFlair)) {
-        newPFlair = Flairs.makeNewCSSClass(newPFlair, extraFlair, "PokemonTrades");
-      } else if (extraFlair) {
-        return res.status(400).json({error: "Unexpected extra flair."});
-      }
       promises.push(Reddit.setUserFlair(refreshToken, req.user.name, newPFlair, flairs.ptrades, "PokemonTrades"));
       promises.push(Reddit.setUserFlair(refreshToken, req.user.name, newsvFlair, flairs.svex, "SVExchange"));
       promises.push(User.update({name: req.user.name}, {loggedFriendCodes: friend_codes}));

api/services/Flairs.js

@@ -3,10 +3,7 @@ var _ = require('lodash');
 var referenceService = require('./References.js');
 var NodeCache = require('node-cache');
 var app_claim_cache = new NodeCache({stdTTL: 300});
-var extraFlair = ['rowlet', 'litten', 'popplio'];
-var extraFlairRegExp = new RegExp("(" + extraFlair.join("|") + ")");
 
-exports.extraFlair = extraFlair;
 exports.formattedName = function(name) {
   if (!name) {
     return "";
@@ -264,13 +261,6 @@ exports.makeNewCSSClass = function (previous_flair, new_addition, subreddit) {
   if (new_addition === 'involvement') {
     return previous_flair.replace(/( |$)/, '1$1');
   }
-  if (_.includes(extraFlair, new_addition)) {
-    if (previous_flair.match(extraFlairRegExp)) {
-      return previous_flair.replace(extraFlairRegExp, new_addition);
-    } else {
-      return previous_flair + " " + new_addition;
-    }
-  }
   if (subreddit === 'pokemontrades' || !/ribbon/.test(previous_flair + new_addition)) {
     return previous_flair.replace(/[^ 1]*/, new_addition);
   }

assets/styles/flairs.less

@@ -97,23 +97,3 @@ a[href="/lucky"], a[href="/egg"], a[href="/eevee"], a[href="/togepi"], a[href="/
 .flair2-beautyribbon:before { background-position: -44px 0;}
 .flair2-smartribbon:before { background-position: -66px 0; margin-bottom: -2px; }
 .flair2-toughribbon:before { background-position: -88px 0; margin-bottom: -2px; }
-
-.flair-rowlet:after, .flair-litten:after, .flair-popplio:after {
-    content: "";
-    width: 40px;
-    height: 30px;
-    font-size: 0;
-    display: inline-block;
-    background: url(/images/starterflairs.png) no-repeat -0px -0px;
-    vertical-align: middle;
-    pointer-events: none;
-    margin: 0 0px 5px -3px;
-}
-
-.flair-litten:after {
-    background-position: -40px 0;
-}
-
-.flair-popplio:after {
-    background-position: -80px 0;
-}

assets/userCtrl.js

@@ -290,8 +290,7 @@ module.exports = function ($scope, $location, io) {
 
     io.socket.post(url, {
       "ptrades": ptrades,
-      "svex": svex,
-      "extraFlair": $scope.user.extraFlair
+      "svex": svex
     }, function (data, res) {
       if (res.statusCode === 200) {
         $scope.userok.setFlairText = true;

assets/views/home/flairText.ejs

@@ -87,26 +87,6 @@
                 </button>
               </div>
             </div>
-
-
-            <div class="form-group col-md-12">
-              <label for="friendcode1" class="col-md-3 control-label optional">/r/pokemontrades starter flair</label>
-
-              <div class="col-md-9">
-                <div class="btn-group">
-                  <button class="btn btn-default" ng-model="user.extraFlair" btn-radio="'rowlet'">
-                    <span class="flair-rowlet"></span>
-                  </button>
-                  <button class="btn btn-default" ng-model="user.extraFlair" btn-radio="'litten'">
-                    <span class="flair-litten"></span>
-                  </button>
-                  <button class="btn btn-default" ng-model="user.extraFlair" btn-radio="'popplio'">
-                    <span class="flair-popplio"></span>
-                  </button>
-                </div>
-              </div>
-            </div>
-
             <div class="row">
               <div class="col-md-12">
                 <div class="alert">

test/.eslintrc

@@ -1,8 +1,6 @@
 {
-  "env": {
-      "mocha": true
-  },
   "globals": {
-    "global": true
-  },
-}
+    "it": true,
+    "describe": true
+  }
+}

test/unit/data/flairCssClasses.json

@@ -13,15 +13,7 @@
     "ovalcharm1 hok,banned": "ovalcharm1 banned",
     "masterball1 hok something-else,banned": "masterball1 banned",
     "dreamball banned,banned": "dreamball banned",
-    "banned,banned": "banned",
-    "greatball popplio,pokeball": "pokeball popplio",
-    "greatball,popplio": "greatball popplio",
-    "greatball,rowlet": "greatball rowlet",
-    "greatball,litten": "greatball litten",
-    "greatball hok,popplio": "greatball hok popplio",
-    "greatball1,popplio": "greatball1 popplio",
-    "greatball1 popplio,rowlet": "greatball1 rowlet",
-    "greatball popplio,banned": "greatball banned"
+    "banned,banned": "banned"
   },
 
   "SVExchange": {
@@ -34,10 +26,6 @@
     "manaphy smartribbon,toughribbon": "manaphy toughribbon",
     "eggcup,beautyribbon": "eggcup beautyribbon",
     "beautyribbon,eggcup": "eggcup beautyribbon",
-    "beautyribbon,popplio": "beautyribbon popplio",
-    "beautyribbon popplio,rowlet": "beautyribbon rowlet",
-    "togepi,popplio": "togepi popplio",
-    "togepi popplio,rowlet": "togepi rowlet",
     ",banned": "banned",
     "lucky,banned": "lucky banned",
     "lucky cuteribbon,banned": "lucky cuteribbon banned",
@@ -49,4 +37,4 @@
     "pichu banned,toughribbon": "pichu toughribbon banned",
     "coolribbon banned,togepi": "togepi coolribbon banned"
   }
-}
+}

test/unit/data/referenceFactory.js

@@ -50,4 +50,4 @@ module.exports = {
     }
     return refs;
   }
-};
+};

test/unit/services/Flairs.test.js

@@ -1,6 +1,7 @@
 'use strict';
 var _ = require("lodash");
 var assert = require("chai").assert;
+var Flairs = require("../../../api/services/Flairs");
 
 var flairTexts = require("../data/flairTexts.json");
 var flairCssClasses = require("../data/flairCssClasses.json");
@@ -9,8 +10,6 @@ var fcs = require("../data/friendCodes.json");
 var users = require("../data/users.json");
 var refFactory = require("../data/referenceFactory.js");
 
-var Flairs = require("../../../api/services/Flairs");
-
 describe("Flair text", function () {
   it("Throws error on incorrect pokemontrades flair", function () {
     try{