🔀 Merge pull request #1136 from TF2Autobot/small_fixes

TF2Autobot · Jun 1, 2022 · 7469287 · 7469287
2 parents 8264ac0 + 53b3cec
commit 7469287
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 21 deletions.
diff --git a/src/classes/Commands/Commands.ts b/src/classes/Commands/Commands.ts
@@ -133,6 +133,7 @@ export default class Commands {
                 '✋ Hold on',
                 'Hold on',
                 'Sending',
+                'Checking', // for "Checking out..." phrase from gladiator
                 '👋 Welcome',
                 'Welcome',
                 'To',

diff --git a/src/classes/MyHandler/MyHandler.ts b/src/classes/MyHandler/MyHandler.ts
@@ -2432,7 +2432,7 @@ export default class MyHandler extends Handler {
                             ? this.opt.customMessage.welcome
                                   .replace(/%name%/g, '')
                                   .replace(/%admin%/g, isAdmin ? '!help' : '!how2trade')
-                            : `Hi! If you don't know how things work, please type "!` + (isAdmin ? 'help' : 'how2trade')
+                            : `Hi! If you don't know how things work, please type "!${isAdmin ? 'help' : 'how2trade'}"`
                     );
                 }
 
@@ -2452,8 +2452,8 @@ export default class MyHandler extends Handler {
                     ? this.opt.customMessage.welcome
                           .replace(/%name%/g, friend.player_name)
                           .replace(/%admin%/g, isAdmin ? '!help' : '!how2trade')
-                    : `Hi ${friend.player_name}! If you don't know how things work, please type "!` +
-                          (isAdmin ? 'help' : 'how2trade')
+                    : `Hi ${friend.player_name}! If you don't know how things work, please type ` +
+                          `"!${isAdmin ? 'help' : 'how2trade'}"`
             );
         });
     }
@@ -2664,7 +2664,7 @@ export default class MyHandler extends Handler {
     }
 
     onDeleteArchivedListingError(err: Error): void {
-        log.debug('Error on delete archived listings:', err);
+        log.error('Error on delete archived listings:', err);
     }
 }
 

diff --git a/src/lib/pricer/pricestf/prices-tf-api.ts b/src/lib/pricer/pricestf/prices-tf-api.ts
@@ -1,5 +1,6 @@
-import axios, { AxiosRequestConfig, Method } from 'axios';
+import axios, { AxiosRequestConfig, Method, AxiosError } from 'axios';
 import { PricerOptions } from '../../../classes/IPricer';
+import log from '../../logger';
 
 export interface PricesTfRequestCheckResponse {
     enqueued: boolean;
@@ -56,22 +57,18 @@ export default class PricesTfApi {
                 await this.setupToken();
             }
 
-            return await PricesTfApi.apiRequest(
-                httpMethod,
-                path,
-                params,
-                {},
-                {
-                    Authorization: 'Bearer ' + this.token,
-                    ...headers
-                }
-            );
+            return await PricesTfApi.apiRequest(httpMethod, path, params, data, {
+                Authorization: 'Bearer ' + this.token,
+                ...headers
+            });
         } catch (e) {
-            if (e && 401 === e['statusCode'] ? e['statusCode'] : e['status']) {
+            const err = e as AxiosError;
+            if (err.response && err.response.status === 401) {
+                log.debug('Requesting new token from prices.tf due to 401');
                 await this.setupToken();
-                return this.authedApiRequest(httpMethod, path, params, {}, headers);
+                return this.authedApiRequest(httpMethod, path, params, data, headers);
             }
-            throw e;
+            throw err;
         }
     }
 

diff --git a/src/lib/pricer/pricestf/prices-tf-pricer.ts b/src/lib/pricer/pricestf/prices-tf-pricer.ts
@@ -31,9 +31,9 @@ export default class PricesTfPricer implements IPricer {
             const pricelist = await PricesTfApi.apiRequest(
                 'GET',
                 '/json/pricelist-array',
-                {},
-                {},
-                {},
+                undefined,
+                undefined,
+                undefined,
                 'https://autobot.tf'
             );