diff --git a/api/services/Flairs.js b/api/services/Flairs.js index 8d27c5e4..e4f8b171 100644 --- a/api/services/Flairs.js +++ b/api/services/Flairs.js @@ -227,7 +227,7 @@ exports.formattedRequirements = function (flair, flairs) { return formatted; }; -exports.gameOptions = ['X', 'Y', 'ΩR', 'αS', 'S', 'M', 'US', 'UM', 'LGP', 'LGE', 'SW', 'SH', 'BD', 'SP', 'PLA'].join('|'); +exports.gameOptions = ['X', 'Y', 'ΩR', 'αS', 'S', 'M', 'US', 'UM', 'LGP', 'LGE', 'SW', 'SH', 'BD', 'SP', 'PLA', 'SCA', 'VIO'].join('|'); exports.legalIgn = '[^()|,]{0,11}[^()|,\\s]'; // Parse the games. e.g. 'ExampleName (X, Y)' --> [{ign: 'ExampleName', game: 'X'}, {ign: 'ExampleName', game: 'Y'}] diff --git a/assets/common/regexCommon.js b/assets/common/regexCommon.js index b957d976..805dc881 100644 --- a/assets/common/regexCommon.js +++ b/assets/common/regexCommon.js @@ -1,11 +1,11 @@ -var ptradesFlair = "(:[a-zA-Z0-9_-]*:)*((?:SW-)?([0-9]{4}-){2}[0-9]{4})(, ((?:SW-)?([0-9]{4}-){2}[0-9]{4}))* \\|\\| ([^ ,|(]*( \\((X|Y|ΩR|αS|S|M|US|UM|LGP|LGE|SW|SH|BD|SP|PLA)(, (X|Y|ΩR|αS|S|M|US|UM|LGP|LGE|SW|SH|BD|SP|PLA))*\\))?)(, ([^ ,|(]*( \\((X|Y|ΩR|αS|S|M|US|UM|LGP|LGE|SW|SH|BD|SP|PLA)(, (X|Y|ΩR|αS|S|M|US|UM|LGP|LGE|SW|SH|BD|SP|PLA))*\\))?))*"; +var ptradesFlair = "(:[a-zA-Z0-9_-]*:)*((?:SW-)?([0-9]{4}-){2}[0-9]{4})(, ((?:SW-)?([0-9]{4}-){2}[0-9]{4}))* \\|\\| ([^ ,|(]*( \\((X|Y|ΩR|αS|S|M|US|UM|LGP|LGE|SW|SH|BD|SP|PLA|SCA|VIO)(, (X|Y|ΩR|αS|S|M|US|UM|LGP|LGE|SW|SH|BD|SP|PLA|SCA|VIO))*\\))?)(, ([^ ,|(]*( \\((X|Y|ΩR|αS|S|M|US|UM|LGP|LGE|SW|SH|BD|SP|PLA|SCA|VIO)(, (X|Y|ΩR|αS|S|M|US|UM|LGP|LGE|SW|SH|BD|SP|PLA|SCA|VIO))*\\))?))*"; var regex = { emoji: "(:[a-zA-Z0-9_-]*:)", tsv: "[0-3]\\d{3}|40(?:[0-8]\\d|9[0-5])", tsvBars: "(\\|\\| [0-9]{4})|(, [0-9]{4})", fc: "((?:SW-)?([0-9]{4}-){2}[0-9]{4})", console: "Switch|3DS", - game: "((\\()|(,))(X|Y|ΩR|αS|S|M|US|UM|LGP|LGE|SW|SH|BD|SP|PLA)((,)|(\\)))", + game: "((\\()|(,))(X|Y|ΩR|αS|S|M|US|UM|LGP|LGE|SW|SH|BD|SP|PLA|SCA|VIO)((,)|(\\)))", ign: "((\\d \\|\\|)|(\\),)) [^(|,]*( (\\()|(\\|)|(,)|$)", ptradesFlair: ptradesFlair, diff --git a/assets/userCtrl.js b/assets/userCtrl.js index 3eb1cec5..8c802481 100644 --- a/assets/userCtrl.js +++ b/assets/userCtrl.js @@ -291,7 +291,7 @@ module.exports = function ($scope, $location, io) { }; $scope.possibleConsoles = ["Switch", "3DS"]; - $scope.possibleGames = ["X", "Y", "ΩR", "αS", "S", "M", "US", "UM", "LGP", "LGE", "SW", "SH", "BD", "SP", "PLA"]; + $scope.possibleGames = ["X", "Y", "ΩR", "αS", "S", "M", "US", "UM", "LGP", "LGE", "SW", "SH", "BD", "SP", "PLA", "SCA", "VIO"]; $scope.setFlairText = function () { $("#setTextError").html("").hide();