From fe232b17d349777dea284b5555865762e8152abb Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Wed, 9 Sep 2020 12:33:35 -0700 Subject: [PATCH] test --- api/bots/btc.ts | 2 +- api/network/intercept.ts | 2 +- dist/api/bots/btc.js | 3 +-- dist/api/bots/btc.js.map | 2 +- dist/api/network/intercept.js | 2 +- dist/api/network/intercept.js.map | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/api/bots/btc.ts b/api/bots/btc.ts index 4e7dd44..61e964e 100644 --- a/api/bots/btc.ts +++ b/api/bots/btc.ts @@ -21,6 +21,7 @@ export function init() { client.on(msg_types.MESSAGE, async (message: Sphinx.Message) => { const arr = message.content.split(' ') + console.log("BTC MSG ARR",arr) if (arr.length < 2) return if (arr[0]!=='/btc') return const cmd = arr[1] @@ -28,7 +29,6 @@ export function init() { switch (cmd) { case 'price': - if (arr.length < 3) return console.log("price", arr[2]) try { const r = await fetch(url+'?symbol=BTC&convert=USD',{ diff --git a/api/network/intercept.ts b/api/network/intercept.ts index 392e5b0..c6f2258 100644 --- a/api/network/intercept.ts +++ b/api/network/intercept.ts @@ -48,7 +48,7 @@ export async function isBotMsg(msg:Msg, sentByMe:boolean): Promise { didEmit = true } } catch(e){} - } else if(txt.startsWith(`${botInTribe.botPrefix} `)){ + } else if(txt && txt.startsWith(`${botInTribe.botPrefix} `)){ builtinBotEmit(msg) didEmit = true } diff --git a/dist/api/bots/btc.js b/dist/api/bots/btc.js index f606c08..bc1a262 100644 --- a/dist/api/bots/btc.js +++ b/dist/api/bots/btc.js @@ -27,6 +27,7 @@ function init() { client.login('_', actions_1.finalAction); client.on(msg_types.MESSAGE, (message) => __awaiter(this, void 0, void 0, function* () { const arr = message.content.split(' '); + console.log("BTC MSG ARR", arr); if (arr.length < 2) return; if (arr[0] !== '/btc') @@ -34,8 +35,6 @@ function init() { const cmd = arr[1]; switch (cmd) { case 'price': - if (arr.length < 3) - return; console.log("price", arr[2]); try { const r = yield fetch(url + '?symbol=BTC&convert=USD', { diff --git a/dist/api/bots/btc.js.map b/dist/api/bots/btc.js.map index 85c57bd..5a41f8c 100644 --- a/dist/api/bots/btc.js.map +++ b/dist/api/bots/btc.js.map @@ -1 +1 @@ -{"version":3,"file":"btc.js","sourceRoot":"","sources":["../../../api/bots/btc.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"btc.js","sourceRoot":"","sources":["../../../api/bots/btc.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/network/intercept.js b/dist/api/network/intercept.js index 9b1545b..1075028 100644 --- a/dist/api/network/intercept.js +++ b/dist/api/network/intercept.js @@ -55,7 +55,7 @@ function isBotMsg(msg, sentByMe) { } catch (e) { } } - else if (txt.startsWith(`${botInTribe.botPrefix} `)) { + else if (txt && txt.startsWith(`${botInTribe.botPrefix} `)) { bots_1.builtinBotEmit(msg); didEmit = true; } diff --git a/dist/api/network/intercept.js.map b/dist/api/network/intercept.js.map index 2cbea3f..15a0501 100644 --- a/dist/api/network/intercept.js.map +++ b/dist/api/network/intercept.js.map @@ -1 +1 @@ -{"version":3,"file":"intercept.js","sourceRoot":"","sources":["../../../api/network/intercept.ts"],"names":[],"mappings":";;;;;;;;;;;AACA,sCAAkC;AAClC,kCAAsC;AACtC,6BAA4B;AAE5B,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAC,6BAA6B,CAAC,CAAC,CAAA;AAE7E;;;EAGE;AAEF,kDAAkD;AAClD,SAAsB,QAAQ,CAAC,GAAO,EAAE,QAAgB;;QACtD,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,CAAA;QAC/B,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAA;QACxB,IAAG,OAAO,KAAG,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE;YAC5C,OAAO,KAAK,CAAA,CAAC,sCAAsC;SACpD;QACD,MAAM,IAAI,GAAG,MAAM,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAC,KAAK,EAAC;gBAC5C,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI;aACpB,EAAC,CAAC,CAAA;QACH,IAAG,CAAC,IAAI;YAAE,OAAO,KAAK,CAAA;QAEtB,IAAI,OAAO,GAAG,KAAK,CAAA;QAEnB,IAAG,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;YAC1B,qBAAc,CAAC,GAAG,CAAC,CAAA;YACnB,OAAO,GAAG,IAAI,CAAA;SACf;QAED,OAAO,CAAC,GAAG,CAAC,UAAU,EAAC,OAAO,CAAC,CAAA;QAC/B,IAAG,OAAO;YAAE,OAAO,OAAO,CAAA;QAE1B,MAAM,WAAW,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAC,KAAK,EAAC;gBACtD,MAAM,EAAE,IAAI,CAAC,EAAE;aAChB,EAAC,CAAC,CAAA;QAEH,IAAG,CAAC,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,CAAC;YAAE,OAAO,KAAK,CAAA;QAErD,MAAM,YAAY,CAAC,WAAW,EAAE,CAAM,UAAU,EAAA,EAAE;YAChD,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAC,UAAU,CAAC,SAAS,CAAC,CAAA;YACxD,IAAG,UAAU,CAAC,QAAQ,EAAC;gBACrB,IAAI;oBACF,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;oBAChD,IAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAC;wBAC5B,qBAAc,CAAC,GAAG,CAAC,CAAA;wBACnB,OAAO,GAAG,IAAI,CAAA;qBACf;iBACF;gBAAC,OAAM,CAAC,EAAC,GAAE;aACb;iBAAM,IAAG,GAAG,CAAC,UAAU,CAAC,GAAG,UAAU,CAAC,SAAS,GAAG,CAAC,EAAC;gBACnD,qBAAc,CAAC,GAAG,CAAC,CAAA;gBACnB,OAAO,GAAG,IAAI,CAAA;aACf;QACH,CAAC,CAAA,CAAC,CAAA;QAEF,OAAO,OAAO,CAAA;IAChB,CAAC;CAAA;AA5CD,4BA4CC;AAED,SAAe,YAAY,CAAC,KAAK,EAAE,QAAQ;;QAC1C,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;YACjD,MAAM,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;SAC5C;IACF,CAAC;CAAA"} \ No newline at end of file +{"version":3,"file":"intercept.js","sourceRoot":"","sources":["../../../api/network/intercept.ts"],"names":[],"mappings":";;;;;;;;;;;AACA,sCAAkC;AAClC,kCAAsC;AACtC,6BAA4B;AAE5B,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAC,6BAA6B,CAAC,CAAC,CAAA;AAE7E;;;EAGE;AAEF,kDAAkD;AAClD,SAAsB,QAAQ,CAAC,GAAO,EAAE,QAAgB;;QACtD,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,CAAA;QAC/B,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAA;QACxB,IAAG,OAAO,KAAG,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE;YAC5C,OAAO,KAAK,CAAA,CAAC,sCAAsC;SACpD;QACD,MAAM,IAAI,GAAG,MAAM,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAC,KAAK,EAAC;gBAC5C,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI;aACpB,EAAC,CAAC,CAAA;QACH,IAAG,CAAC,IAAI;YAAE,OAAO,KAAK,CAAA;QAEtB,IAAI,OAAO,GAAG,KAAK,CAAA;QAEnB,IAAG,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;YAC1B,qBAAc,CAAC,GAAG,CAAC,CAAA;YACnB,OAAO,GAAG,IAAI,CAAA;SACf;QAED,OAAO,CAAC,GAAG,CAAC,UAAU,EAAC,OAAO,CAAC,CAAA;QAC/B,IAAG,OAAO;YAAE,OAAO,OAAO,CAAA;QAE1B,MAAM,WAAW,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAC,KAAK,EAAC;gBACtD,MAAM,EAAE,IAAI,CAAC,EAAE;aAChB,EAAC,CAAC,CAAA;QAEH,IAAG,CAAC,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,CAAC;YAAE,OAAO,KAAK,CAAA;QAErD,MAAM,YAAY,CAAC,WAAW,EAAE,CAAM,UAAU,EAAA,EAAE;YAChD,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAC,UAAU,CAAC,SAAS,CAAC,CAAA;YACxD,IAAG,UAAU,CAAC,QAAQ,EAAC;gBACrB,IAAI;oBACF,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;oBAChD,IAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAC;wBAC5B,qBAAc,CAAC,GAAG,CAAC,CAAA;wBACnB,OAAO,GAAG,IAAI,CAAA;qBACf;iBACF;gBAAC,OAAM,CAAC,EAAC,GAAE;aACb;iBAAM,IAAG,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,UAAU,CAAC,SAAS,GAAG,CAAC,EAAC;gBAC1D,qBAAc,CAAC,GAAG,CAAC,CAAA;gBACnB,OAAO,GAAG,IAAI,CAAA;aACf;QACH,CAAC,CAAA,CAAC,CAAA;QAEF,OAAO,OAAO,CAAA;IAChB,CAAC;CAAA;AA5CD,4BA4CC;AAED,SAAe,YAAY,CAAC,KAAK,EAAE,QAAQ;;QAC1C,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;YACjD,MAAM,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;SAC5C;IACF,CAAC;CAAA"} \ No newline at end of file