Refactoring

Author: mullwar

LICENSE

@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

README.md

@@ -447,4 +447,4 @@ Use this method to get current webhook status.
 
 ##### `deleteWebhook()`
 
-Use this method to remove webhook integration if you decide to switch back to getUpdates. Returns `True` on success.
+Use this method to remove webhook integration if you decide to switch back to getUpdates. Returns `True` on success.

examples/edit-text.js

@@ -13,7 +13,7 @@ bot.on('/time', msg => {
 function updateTime(chatId, messageId) {
 
     // Update every second
-    setInterval(x => {
+    setInterval(() => {
         bot.editText(
             {chatId, messageId}, `<b>Current time:</b> ${ time() }`,
             {parse: 'html'}

examples/ngrok-webhook.js

@@ -18,4 +18,3 @@ ngrok.connect(port, (error, url) => {
     bot.start();
 
 });
-

examples/plugin-reporter.js

@@ -14,9 +14,9 @@ const bot = new TeleBot({
 });
 
 // Make an error
-bot.on('/error', x => ___REPORT_ERROR_TEST___);
+bot.on('/error', (msg) => msg.MAKE_AN_ERROR);
 
 // Stop with message
-bot.on('/stop', x => bot.stop('bye!'));
+bot.on('/stop', () => bot.stop('bye!'));
 
 bot.start();

examples/webhook.js

@@ -15,4 +15,3 @@ const bot = new TeleBot({
 bot.on('text', msg => bot.sendMessage(msg.from.id, msg.text));
 
 bot.start();
-

lib/telebot.js

@@ -147,7 +147,7 @@ class TeleBot {
         this.event('start');
 
         // Global loop function
-        this.loopFn = setInterval(x => {
+        this.loopFn = setInterval(() => {
 
             // Stop on false looping flag
             if (!f.looping) clearInterval(this.loopFn);
@@ -158,7 +158,7 @@ class TeleBot {
             f.poll = false;
 
             // Get updates
-            this.getUpdates().then(x => {
+            this.getUpdates().then(() => {
 
                 // Retry connecting
                 if (f.retry) {
@@ -178,7 +178,7 @@ class TeleBot {
                 // Tick
                 return this.event('tick');
 
-            }).then(x => {
+            }).then(() => {
 
                 // Seems okay for the next poll
                 f.poll = true;
@@ -193,14 +193,14 @@ class TeleBot {
 
                 return Promise.reject();
 
-            }).catch(x => {
+            }).catch(() => {
 
                 const seconds = this.retryTimeout / 1000;
                 console.log(`[bot.info.update] reconnecting in ${ seconds } seconds...`);
                 this.event('reconnecting');
 
                 // Set reconnecting timeout
-                setTimeout(x => (f.poll = true), this.retryTimeout);
+                setTimeout(() => (f.poll = true), this.retryTimeout);
 
             });
 
@@ -269,7 +269,7 @@ class TeleBot {
                 props = mod.props;
 
                 // Process update
-                promise = promise.then(x => this.processUpdate(update, props));
+                promise = promise.then(() => this.processUpdate(update, props));
 
             }
 
@@ -426,7 +426,7 @@ class TeleBot {
                     let that = this;
 
                     details.remove = (function (fn) {
-                        return x => that.removeEvent(type, fn);
+                        return () => that.removeEvent(type, fn);
                     }(fn));
 
                     fn = fn.call(self, data, self, details);

lib/webhook.js

@@ -19,7 +19,7 @@ module.exports = (bot, opt) => {
         http.createServer(listener);
 
     // Start server
-    server.listen(port, host, x => {
+    server.listen(port, host, () => {
         console.log(`[bot.webhook] started${ key ? ' secure' : ''} server on "${ host }:${ port }"`);
     });
 

plugins/commandButton.js

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

plugins/namedButtons.js

@@ -17,7 +17,7 @@ module.exports = {
     plugin(bot, cfg) {
 
         const buttons = cfg.buttons || {};
-        
+
         bot.on('text', (msg, props) => {
             const text = msg.text;
             for (let buttonId in buttons) {

plugins/regExpMessage.js

@@ -30,4 +30,4 @@ module.exports = {
 
     }
 
-};
+};

plugins/shortReply.js

@@ -70,4 +70,4 @@ module.exports = {
 
     }
 
-};
+};

test/index.js

@@ -66,20 +66,20 @@ test('events', t => {
         return bot.eventList.size;
     }
 
-    var delMe = x => {
+    var delMe = () => {
     };
 
     t.is(count(), 2);
 
     // Set
-    bot.on('start', x => {
+    bot.on('start', () => {
     });
     bot.on('start', delMe);
-    bot.on('custom', x => {
+    bot.on('custom', () => {
     });
-    bot.on('custom', x => {
+    bot.on('custom', () => {
     });
-    bot.on('custom', x => {
+    bot.on('custom', () => {
     });
 
     // Count