Fix : New UI version from website

gclem · Dec 19, 2017 · 7a5c0a9 · 7a5c0a9
1 parent 302677b
commit 7a5c0a9
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/lib/overwatch.js b/lib/overwatch.js
@@ -108,12 +108,12 @@ let OverwatchProvider = function () {
         return url.replace('%LANG%', lang) + `${platform}${region}/${encodeURIComponent(tag)}`;
     };
 
-    let getSearchUrl = (nickname, lang = "en-us") => {
+    let getSearchUrl = (nickname, lang = "en-us", encode = false) => {
 
         if(! LOCALES.includes(lang))
             throw new Error(`${lang}_INVALID_LOCALE`);
 
-        return searchUrl.replace('%LANG%', lang) + encodeURIComponent(nickname);
+        return searchUrl.replace('%LANG%', lang) + (encode ? encodeURIComponent(nickname) : nickname);
     };
 
     let parseSeason = (url) => {
@@ -227,11 +227,14 @@ let OverwatchProvider = function () {
     }
 
     let handle = (err) => {
+        console.log(err)
         switch (err.response.statusCode) {
             case 404:
                 throw new Error('PROFILE_NOT_FOUND');
             case 500:
                 throw new Error('TECHNICAL_EXCEPTION_HTML_STRUCTURE_MAY_HAVE_CHANGED')
+            case 502:
+                throw new Error('TECHNICAL_EXCEPTION_NOT_REACHABLE')
             default:
                 throw new Error('TECHNICAL_EXCEPTION_NOT_IDENTIFIED')
         }
@@ -290,13 +293,21 @@ let OverwatchProvider = function () {
     };
 
     self.search = (username, lang = "en-us") => {
+
+        //// Sanitize for new UI version
+        username = username.replace("-", "#");
+
         var options = {
-            uri: getSearchUrl(username, lang),
+            uri: getSearchUrl(username, lang, true),
+            headers: {
+                'User-Agent': 'Overwatch-JS'
+            },
             json: true
         };
 
         return rp(options).then((datas) => {
             _.each(datas, (player) => {
+
                 var i = player.careerLink.split('/');
                 player.platform = i[2];
                 player.region = i[3];