Fixed tickets /close

dmitry-kotorov · Dec 16, 2019 · 0b58435 · 0b58435
1 parent 86a9d41
commit 0b58435
Show file tree

Hide file tree

Showing 9 changed files with 251 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -61,3 +61,4 @@ typings/
 .env
 
 config.js
+config.js
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/telegram-support-bot.iml b/.idea/telegram-support-bot.iml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/bin/support.db b/bin/support.db
diff --git a/bin/support.js b/bin/support.js
@@ -242,7 +242,7 @@ bot.command('open', (ctx) => {
 
             for (let i in userList) {
               if (userList[i]['userid'] !== null && userList[i]['userid'] !== undefined) {
-                openTickets += '<code>#t' + userList[i]['userid'].toString() + '</code>\n';
+                openTickets += '#t' + userList[i]['userid'].toString() + '\n';
               }
             }
             setTimeout(function() {
@@ -268,18 +268,25 @@ bot.command('close', (ctx) => {
       ctx.getChatAdministrators().then(function(admins) {
         admins = JSON.stringify(admins);
         if (
-          ctx.message.reply_to_message !== undefined &&
           admins.indexOf(ctx.from.id) > -1
         ) {
-          let replyText = ctx.message.reply_to_message.text;
-          let userid = replyText.match(new RegExp('#t' + '(.*)' + ' ' + config.lang_from));
-
-          dbhandler.add(userid[1], "closed")
-          bot.telegram.sendMessage(
-            chat.id,
-            'Ticket <code>#t'+userid[1]+'</code> closed',
-            cache.noSound
-          );
+          let replyText = ctx.update.message.text;
+          let userid = replyText.match(/(\d+)/);
+
+          if (userid[1] !== undefined) {
+              dbhandler.add(userid[1], "closed")
+              bot.telegram.sendMessage(
+                  chat.id,
+                  'Ticket #t'+userid[1]+' closed',
+                  cache.noSound
+              );
+          } else {
+              bot.telegram.sendMessage(
+                  chat.id,
+                  'Unable to close ticket',
+                  cache.noSound
+              );
+          };
         }
       });
     }