oira666_tg 1.0.2 → 1.0.4

package/middleware/message_info.js

@@ -7,7 +7,7 @@ const { MessageInfoManager } = require('../source/classes/MessageInfoManager');
 // messageInfo.clean(); // delete data
 
 
-export default async (ctx, next) => {
+module.exports = async (ctx, next) => {
   if (!ctx.from) {
     await next();
     return;

package/middleware/session.js

@@ -1,7 +1,7 @@
 const _ = require('lodash');
 const { TelegramSession } = require('../source/classes/TelegramSession');
 
-export default async (ctx, next) => {
+module.exports = async (ctx, next) => {
   if (!ctx.from) {
     await next();
     return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oira666_tg",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "tg framework for oira666",
   "main": "index.js",
   "scripts": {

package/source/classes/MessageInfo.js

@@ -1,5 +1,5 @@
 const _ = require('lodash');
-const { options } = require('../options');
+const { options } = require('../../options');
 const db = options.db;
 
 

package/source/classes/TelegramSession.js

@@ -1,10 +1,11 @@
 const _ = require('lodash');
 const moment = require('moment');
-const { options } = require('../options');
-const db = options.db;
+const { options } = require('../../options');
+
+const { db } = options;
 
 class TelegramSession {
-  constructor (from_id, chat_id) {
+  constructor(from_id, chat_id) {
     this.session_key = `${from_id}:${chat_id}`;
     this.user_id = +from_id || 0;
     this._data = null;
@@ -13,33 +14,33 @@ class TelegramSession {
     this._keyboard = null;
   }
 
+  set data(value) {
+    this._data = !_.isEmpty(value) ? value : null;
+  }
+
   get data() {
     return !_.isEmpty(this._data) ? this._data : {};
   }
 
+  set keyboard(value) {
+    this._keyboard = Array.isArray(value) && !_.isEmpty(value) ? value : null;
+  }
+
   get keyboard() {
     return !_.isEmpty(this._keyboard) ? this._keyboard : [];
   }
 
+  set handler_history(value) {
+    this._handler_history = !_.isEmpty(value) ? value : null;
+  }
+
   get handler_history() {
     return !_.isEmpty(this._handler_history) ? this._handler_history : [];
   }
 
   get expected_input() {
-    return +moment() - +moment(this._expected_input?.dt_create) <= options.expected_input_lifetime ?
-            this._expected_input?.action || null : null;
-  }
-
-  set data(value) {
-    this._data = !_.isEmpty(value) ? value : null;
-  }
-
-  set keyboard(value) {
-    this._keyboard = Array.isArray(value) && !_.isEmpty(value) ? value : null;
-  }
-
-  set handler_history(value) {
-    this._handler_history = !_.isEmpty(value) ? value : null;
+    return +moment() - +moment(this._expected_input?.dt_create) <= options.expected_input_lifetime
+      ? this._expected_input?.action || null : null;
   }
 
   set expected_input(value) {
@@ -47,17 +48,18 @@ class TelegramSession {
   }
 
   async save() {
-    if (! this.session_key) return;
+    if (!this.session_key) return;
 
     if (_.isEmpty(this._data) && _.isEmpty(this._handler_history) && _.isEmpty(this._expected_input)) {
       await this._deleteSession();
-    } else {
+    }
+    else {
       await this._saveSession();
     }
   }
 
   async _saveSession() {
-    if (! this.session_key) return;
+    if (!this.session_key) return;
 
     const query = `
       INSERT INTO session (session_key, user_id, data, keyboard, handler_history, expected_input, dt_access)
@@ -76,27 +78,27 @@ class TelegramSession {
       keyboard: _.isEmpty(this._keyboard) ? null : JSON.stringify(this._keyboard),
       handler_history: _.isEmpty(this._handler_history) ? null : JSON.stringify(this._handler_history),
       expected_input: _.isEmpty(this._expected_input) ? null : JSON.stringify(this._expected_input),
-      dt_access: new Date()
-    }
+      dt_access: new Date(),
+    };
     await db.query(query, params);
   }
 
   async _deleteSession() {
-    if (! this.session_key) return;
+    if (!this.session_key) return;
 
-    const query = `DELETE FROM telegram_session WHERE session_key = :session_key`;
-    await db.query(query, {session_key: this.session_key});
+    const query = 'DELETE FROM telegram_session WHERE session_key = :session_key';
+    await db.query(query, { session_key: this.session_key });
   }
 
   async load() {
-    if (! this.session_key) return;
+    if (!this.session_key) return;
 
     const query = `
       SELECT *
       FROM session
       WHERE session_key = :session_key
     `;
-    const data = await db.query(query, {session_key: this.session_key});
+    const data = await db.query(query, { session_key: this.session_key });
 
     if (!_.isEmpty(data)) {
       this._data = data[0].data ? JSON.parse(data[0].data) : null;
@@ -105,7 +107,6 @@ class TelegramSession {
       this._expected_input = data[0].expected_input ? JSON.parse(data[0].expected_input) : null;
     }
   }
-
 }
 
 module.exports.TelegramSession = TelegramSession;

package/source/classes/TextButtons.js

@@ -1,4 +1,5 @@
-const { options } = require('../options');
+const { options } = require('../../options');
+
 const Markup = options.Markup;
 
 

package/source/classes/User.js

@@ -1,5 +1,6 @@
 import _ from 'lodash';
-const { options } = require('../options');
+const { options } = require('../../options');
+
 const db = options.db;
 
 class User {

package/source/handlers/id.js

@@ -1,4 +1,4 @@
-export default async (ctx) => {
+module.exports = async (ctx) => {
   await ctx.telegram.sendMessage(
     ctx.chat.id,
     ctx.t`ID Твоего пользователя в телеграме: ${ctx.from.id}\nID этого чата в телеграме: ${ctx.chat.id}`,

package/source/handlers/test.js

@@ -1,4 +1,4 @@
-export default async (ctx) => {
+module.exports = async (ctx) => {
   try {
     await ctx.telegram.sendMessage(
       ctx.chat.id,

package/utils/regexps.js

@@ -3,6 +3,6 @@ const regexps = {
   handlername: /^[a-zA-Z\/\d_]+$/,
   url: /^https?:\/\/.+\.[A-Za-zА-Яа-я]{2,5}((\/|\?).*)?$/,
   handlername_args: /^[a-zA-Z_\/]+(\s.+)?$/,
-}
+};
 
 module.exports.regexps = regexps;

package/utils/send_empty_message.js

@@ -2,9 +2,7 @@ const send_empty_message = async (ctx, message_text) => {
   const message = await ctx.telegram.sendMessage(
     ctx.chat.id,
     message_text,
-    {
-      parse_mode: 'HTML',
-    }
+    { parse_mode: 'HTML' }
   );
   return message.message_id;
 };