shaytan/telegram_glpi
1
0
Fork 0
mirror of https://github.com/stjornleysi/telegram_glpi.git synced 2025-11-29 08:33:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
atorop
2024-11-02 10:25:18 +03:00
parent 7059a2138e
commit 2d82b6ce4b
7 changed files with 104 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/const.js
View File

@@ -30,10 +30,10 @@ exports.keyboards = {
exports.inlineKeyboards = { exports.inlineKeyboards = {
open: [[{text: '✅', callback_data: 'CloseTicket'}, {text: '➡️', callback_data: 'AssignTicket'}, {text: '*️⃣', callback_data: 'ChangeStatus'}]], open: [[{text: '✅', callback_data: 'CloseTicket'}, {text: '➡️', callback_data: 'AssignTicket'}, {text: '*️⃣', callback_data: 'ChangeStatus'}]],
close: [[{text: '✔', callback_data: 'OpenTicket'}, {text: '➡️', callback_data: 'AssignTicket'}, {text: '*️⃣', callback_data: 'ChangeStatus'}]], close: [[{text: '✔', callback_data: 'OpenTicket'}, {text: '➡️', callback_data: 'AssignTicket'}, {text: '*️⃣', callback_data: 'ChangeStatus'}]],
confirmOpen: [[{text: 'Открыть заявку', callback_data: 'ConfirmOpen'}, {text: 'Отмена', callback_data: 'RefreshStatus'}]], confirmOpen: [[{text: 'Открыть заявку', callback_data: 'ConfirmOpen'}, {text: 'Отмена', callback_data: 'RefreshTicket'}]],
confirmClose: [[{text: 'Закрыть заявку', callback_data: 'ConfirmClose'}, {text: 'Отмена', callback_data: 'RefreshStatus'}]], confirmClose: [[{text: 'Закрыть заявку', callback_data: 'ConfirmClose'}, {text: 'Отмена', callback_data: 'RefreshTicket'}]],
userAddComment: [[{text: '❓ Добавить комментарий', callback_data: 'UserAddComment'}]], userAddComment: [[{text: '❓ Добавить комментарий', callback_data: 'UserAddComment'}]],
changeStatus: [[{text: 'В ожидание', callback_data: 'WaitingStatus'}, {text: 'В работу', callback_data: 'WorkingStatus'}], [{text: 'Открыть тему', callback_data: 'OpenThread'}, {text: 'Отмена', callback_data: 'RefreshStatus'}]], changeStatus: [[{text: 'В ожидание', callback_data: 'WaitingStatus'}, {text: 'В работу', callback_data: 'WorkingStatus'}], [{text: 'Открыть тему', callback_data: 'OpenThread'}, {text: 'Отмена', callback_data: 'RefreshTicket'}]],
configUserGroups: [ configUserGroups: [
[{text: 'Add new group', callback_data: 'AddNewGroup'}, {text: 'Add new user in group', callback_data: 'AddNewUser'}], [{text: 'Add new group', callback_data: 'AddNewGroup'}, {text: 'Add new user in group', callback_data: 'AddNewUser'}],
[{text: 'Remove group', callback_data: 'RemoveGroup'}, {text: 'Remove user', callback_data: 'RemoveUser'}, {text: 'Exit', callback_data: 'ExitConfig'}] [{text: 'Remove group', callback_data: 'RemoveGroup'}, {text: 'Remove user', callback_data: 'RemoveUser'}, {text: 'Exit', callback_data: 'ExitConfig'}]

131
lib/glpiParse.js
View File

@@ -13,34 +13,29 @@ const glpiUrl = conf.glpiConfig.apiurl.replace("apirest.php", "");
exports.parseTickets = async (bot, messageData) => { exports.parseTickets = async (bot, messageData) => {
let listTickets = await glpm.getAllItems('Ticket', 5); let listTickets = await glpm.getAllItems('Ticket', 5);
for(let i = 4; i >= 0; i--){ for(let i = 4; i >= 0; i--){
let ticketId;
try{ try{
let ticketId;
if(!listTickets[i]) break; if(!listTickets[i]) break;
ticketId = listTickets[i].id; ticketId = listTickets[i].id;
if(ticketId <= messageData.ticket) continue; if(ticketId <= messageData.ticket) continue;
if(listTickets[i].users_id_recipient != conf.glpiConfig.user_id){ let userRecipient = listTickets[i].users_id_recipient;
let usersArray = await glpm.getUsers(ticketId); let ticketAuthor = "Unknown";
let authorEmail; if(userRecipient != conf.glpiConfig.user_id){
if(!usersArray[0]) continue; if(userRecipient != 0){
if(usersArray[0].hasOwnProperty('alternative_email') && usersArray[0].alternative_email){ let temp = await glpm.getItem("User", userRecipient);
authorEmail = usersArray[0].alternative_email; ticketAuthor = temp.firstname + ' ' + temp.realname;
}else{ }else{
let temp = await glpm.getItem("User", usersArray[0].users_id); let usersArray = await glpm.getUsers(ticketId);
authorEmail = temp.firstname + ' ' + temp.realname; if(usersArray[0].hasOwnProperty('alternative_email')){
} ticketAuthor = usersArray[0].alternative_email;
let text = await htmlToText(listTickets[i].content); }
let messageText = `🟢 <b>ЗАЯВКА <a href="${glpiUrl}front/ticket.form.php?id=${ticketId}">№${ticketId}</a></b>\n\n`;
messageText += `<b>Автор заявки: </b>${authorEmail}\n`;
messageText += `<b>Проблема: </b>${listTickets[i].name}\n<b>Описание: </b>`;
messageText += text;
if(messageText.length > 600){
messageText = `${messageText.substring(0, 500)} + '\n\n<b><a href="${glpiUrl}front/ticket.form.php?id=${ticketId}">Читать дальше</a></b>`;
} }
let messageText = await parseMessageText(listTickets[i], ticketAuthor, "🟢");
let messg = await bot.telegram.sendMessage(conf.supportChatId, messageText, { let messg = await bot.telegram.sendMessage(conf.supportChatId, messageText, {
parse_mode: 'HTML', parse_mode: 'HTML',
reply_markup: { inline_keyboard: cns.inlineKeyboards.open } reply_markup: { inline_keyboard: cns.inlineKeyboards.open }
}); });
await editMessageText(bot, messg.message_id, messageText, cns.inlineKeyboards.open); //await editMessageText(bot, messg.message_id, messageText, cns.inlineKeyboards.open);
messageData.data[ticketId] = { messageData.data[ticketId] = {
messageId: messg.message_id, messageId: messg.message_id,
status: 1 status: 1
@@ -49,20 +44,21 @@ exports.parseTickets = async (bot, messageData) => {
await createThread(bot, messageData, ticketId, title); await createThread(bot, messageData, ticketId, title);
await sleep(1000); await sleep(1000);
} }
messageData.ticket = ticketId;
fs.writeFileSync(dir + "/../data/messageData.json", JSON.stringify(messageData, null, 3));
}catch(e){ }catch(e){
fs.appendFileSync(dir + "/../logs/logs.json", JSON.stringify("*** parseTickets:\n" + e, null, 3)); fs.appendFileSync(dir + "/../logs/logs.txt", e.stack);
} }
messageData.ticket = ticketId;
fs.writeFileSync(dir + "/../data/messageData.json", JSON.stringify(messageData, null, 3));
} }
} }
exports.parseComments = async (bot, messageData) => { exports.parseComments = async (bot, messageData) => {
let listComments = await glpm.getAllItems('ITILFollowup', 5); let listComments = await glpm.getAllItems('ITILFollowup', 5);
for (let i = 4; i >= 0; i--) { for (let i = 4; i >= 0; i--) {
let commentId;
try{ try{
if(!listComments[i]) break; if(!listComments[i]) break;
let commentId = listComments[i].id; commentId = listComments[i].id;
if(commentId <= messageData.comment) continue; if(commentId <= messageData.comment) continue;
if(listComments[i].users_id != conf.glpiConfig.user_id){ if(listComments[i].users_id != conf.glpiConfig.user_id){
let ticketId = listComments[i].items_id; let ticketId = listComments[i].items_id;
@@ -84,13 +80,12 @@ exports.parseComments = async (bot, messageData) => {
messageText = `${messageText.substring(0, 2400)} + '\n\n<b><a href="${glpiUrl}front/ticket.form.php?id=${ticketId}">Читать дальше</a></b>`; messageText = `${messageText.substring(0, 2400)} + '\n\n<b><a href="${glpiUrl}front/ticket.form.php?id=${ticketId}">Читать дальше</a></b>`;
} }
await bot.telegram.sendMessage(conf.supportChatId, messageText, {parse_mode: "HTML", message_thread_id: messageData.data[ticketId].threadId}); await bot.telegram.sendMessage(conf.supportChatId, messageText, {parse_mode: "HTML", message_thread_id: messageData.data[ticketId].threadId});
await sleep(1000);
} }
messageData.comment = commentId;
fs.writeFileSync(dir + "/../data/messageData.json", JSON.stringify(messageData, null, 3));
}catch(e){ }catch(e){
fs.appendFileSync(dir + "/../logs/logs.json", JSON.stringify("*** parseComments:\n" + e, null, 3)); fs.appendFileSync(dir + "/../logs/logs.txt", e.stack);
} }
messageData.comment = commentId;
fs.writeFileSync(dir + "/../data/messageData.json", JSON.stringify(messageData, null, 3));
} }
} }
@@ -98,76 +93,52 @@ exports.refreshStatus = async (bot, messageData) => {
let listTickets = await glpm.getAllItems('Ticket', 100); let listTickets = await glpm.getAllItems('Ticket', 100);
for(let i = 99; i >= 0; i--){ for(let i = 99; i >= 0; i--){
try{ try{
let ticketId = listTickets[i].id; if(!listTickets[i] || !messageData.data.hasOwnProperty(listTickets[i].id)) continue;
if(!listTickets[i] || !messageData.data.hasOwnProperty(ticketId)) continue; await this.editTicketStatus(bot, messageData, listTickets[i].id, true);
let td = messageData.data[ticketId];
if(td.status != listTickets[i].status){
let usersArray = await glpm.getUsers(ticketId);
let message = await htmlToText(listTickets[i].content);
let authorEmail;
if(!usersArray[0]) authorEmail == "Unknown";
else if(usersArray[0].hasOwnProperty('alternative_email') && usersArray[0].alternative_email){
authorEmail = usersArray[0].alternative_email;
}else if(usersArray[0].users_id == conf.glpiConfig.user_id){
await editTicketStatus(bot, messageData, message);
continue;
}else{
let temp = await glpm.getItem("User", usersArray[0].users_id);
authorEmail = temp.firstname + ' ' + temp.realname;
}
let color = await getTicketColor(listTickets[i].status);
let messageText = `${color} <b>ЗАЯВКА <a href="${glpiUrl}front/ticket.form.php?id=${ticketId}">№${ticketId}</a></b>\n\n`;
messageText += `<b>Автор заявки: </b>${authorEmail}\n`;
messageText += `<b>Проблема: </b>${listTickets[i].name}\n<b>Описание: </b>`;
messageText += message;
if(messageText.length > 600){
messageText = `${messageText.substring(0, 500)} + '\n\n<b><a href="${glpiUrl}front/ticket.form.php?id=${ticketId}">Читать дальше</a></b>`;
}
let inKeyboard = await getKeyboardFromStatus(listTickets[i].status);
if(td.hasOwnProperty('threadId')){
if(listTickets[i].status == 5 || listTickets[i].status == 6){
await closeThread(bot, messageData, ticketId);
}else{
let title = `${color} ${ticketId} - ${listTickets[i].name}`;
await bot.telegram.editForumTopic(conf.supportChatId, td.threadId, { name: title });
}
}
await editMessageText(bot, td.messageId, messageText, inKeyboard);
await editMessageText(bot, td.pinMessageId, messageText, inKeyboard);
messageData.data[ticketId].status = listTickets[i].status;
}else if(td.hasOwnProperty('threadId') && (listTickets[i].status == 5 || listTickets[i].status == 6)){
await closeThread(bot, messageData, ticketId);
}
}catch(e){ }catch(e){
fs.appendFileSync(dir + "/../logs/logs.json", JSON.stringify("*** refreshStatus:\n" + e, null, 3)); fs.appendFileSync(dir + "/../logs/logs.txt", e.stack);
} }
} }
fs.writeFileSync(dir + "/../data/messageData.json", JSON.stringify(messageData, null, 3)); fs.writeFileSync(dir + "/../data/messageData.json", JSON.stringify(messageData, null, 3));
} }
exports.editTicketStatus = async (bot, messageData, message) => { exports.editTicketStatus = async (bot, messageData, ticketId, fastRequests) => {
try{ try{
let ticketId = message.text.split('№')[1].split('\n')[0];
let ticket = await glpm.getItem('Ticket', ticketId); let ticket = await glpm.getItem('Ticket', ticketId);
let inKeyboard = await getKeyboardFromStatus(ticket.status); let inKeyboard = await getKeyboardFromStatus(ticket.status);
if(messageData.data[ticketId].status != ticket.status){ if(messageData.data[ticketId].status != ticket.status){
messageData.data[ticketId].status = ticket.status;
let color = await getTicketColor(ticket.status); let color = await getTicketColor(ticket.status);
let title = ticket.name; let ticketAuthor = "Unknown";
if(messageData.data[ticketId].hasOwnProperty('userChatId')){ if(ticket.users_id_recipient != 0){
title = `${title.split(' - ')[1]} - ${title.split(' - ')[2]}`; let temp = await glpm.getItem("User", ticket.users_id_recipient);
ticketAuthor = temp.firstname + ' ' + temp.realname;
}else{
let usersArray = await glpm.getUsers(ticketId);
if(usersArray[0].hasOwnProperty('alternative_email')){
ticketAuthor = usersArray[0].alternative_email;
}
} }
title = `${color} ${ticketId} - ${title}`; let messageText = await parseMessageText(ticket, ticketAuthor, color);
if(messageData.data[ticketId].hasOwnProperty('threadId')){ if(messageData.data[ticketId].hasOwnProperty('threadId')){
await bot.telegram.editForumTopic(conf.supportChatId, messageData.data[ticketId].threadId, { name: title }); if(ticket.status == 5 || ticket.status == 6){
await closeThread(bot, messageData, ticketId);
}else{
let title = `${color} ${ticketId} - ${ticket.name}`;
await bot.telegram.editForumTopic(conf.supportChatId, messageData.data[ticketId].threadId, { name: title });
await editMessageText(bot, messageData.data[ticketId].pinMessageId, messageText, inKeyboard);
}
await sleep(1000);
} }
let messageText = await parseMessageText(message, messageData, ticketId);
await editMessageText(bot, messageData.data[ticketId].messageId, messageText, inKeyboard); await editMessageText(bot, messageData.data[ticketId].messageId, messageText, inKeyboard);
await editMessageText(bot, messageData.data[ticketId].pinMessageId, messageText, inKeyboard); messageData.data[ticketId].status = ticket.status;
fs.writeFileSync(dir + "/../data/messageData.json", JSON.stringify(messageData, null, 3));
}else if(!fastRequests){
await editMessageMarkup(bot, messageData.data[ticketId].messageId, inKeyboard);
if(messageData.data[ticketId].hasOwnProperty('threadId')){
await editMessageMarkup(bot, messageData.data[ticketId].pinMessageId, inKeyboard);
}
} }
await editMessageMarkup(bot, message.message_id, inKeyboard);
fs.writeFileSync(dir + "/../data/messageData.json", JSON.stringify(messageData, null, 3));
}catch(e){ }catch(e){
fs.appendFileSync(dir + "/../logs/logs.json", JSON.stringify("*** editTicketStatus:\n" + e, null, 3)); fs.appendFileSync(dir + "/../logs/logs.txt", e.stack);
} }
} }

16
lib/glpm.js
View File

@@ -26,7 +26,7 @@ exports.createTicket = async (title, description) => {
}); });
return response.data.id; return response.data.id;
}catch(e){ }catch(e){
fs.appendFileSync(__dirname + "/../logs/logs.json", JSON.stringify("*** createTicket:\n" + e, null, 3)); fs.appendFileSync(__dirname + "/../logs/logs.txt", e.stack);
} }
} }
@@ -51,7 +51,7 @@ exports.changeStatusTicket = async (ticketId, statusId) => {
}); });
return response; return response;
}catch(e){ }catch(e){
fs.appendFileSync(__dirname + "/../logs/logs.json", JSON.stringify("*** changeStatusTicket:\n" + e, null, 3)); fs.appendFileSync(__dirname + "/../logs/logs.txt", e.stack);
} }
} }
@@ -77,7 +77,7 @@ exports.assignTicket = async (ticketId, userId) => {
}); });
return response.data; return response.data;
}catch(e){ }catch(e){
fs.appendFileSync(__dirname + "/../logs/logs.json", JSON.stringify("*** assignTicket:\n" + e, null, 3)); fs.appendFileSync(__dirname + "/../logs/logs.txt", e.stack);
} }
} }
@@ -96,7 +96,7 @@ exports.getItem = async(item, id) => { // ITILFollowup = комментари
}); });
return response.data; return response.data;
}catch(e){ }catch(e){
fs.appendFileSync(__dirname + "/../logs/logs.json", JSON.stringify("*** getItem:\n" + e, null, 3)); fs.appendFileSync(__dirname + "/../logs/logs.txt", e.stack);
} }
} }
@@ -115,7 +115,7 @@ exports.getAllItems = async(item, cnt) => {
}); });
return response.data; return response.data;
}catch(e){ }catch(e){
fs.appendFileSync(__dirname + "/../logs/logs.json", JSON.stringify("*** getAllItems:\n" + e, null, 3)); fs.appendFileSync(__dirname + "/../logs/logs.txt", e.stack);
} }
} }
@@ -141,7 +141,7 @@ exports.addComment = async(ticketId, comment) => {
}); });
return response.data; return response.data;
}catch(e){ }catch(e){
fs.appendFileSync(__dirname + "/../logs/logs.json", JSON.stringify("*** addComment:\n" + e, null, 3)); fs.appendFileSync(__dirname + "/../logs/logs.txt", e.stack);
} }
} }
@@ -166,7 +166,7 @@ exports.removeComment = async(ticketId, commentId) => {
}); });
return response.data; return response.data;
}catch(e){ }catch(e){
fs.appendFileSync(__dirname + "/../logs/logs.json", JSON.stringify("*** removeComment:\n" + e, null, 3)); fs.appendFileSync(__dirname + "/../logs/logs.txt", e.stack);
} }
} }
@@ -185,6 +185,6 @@ exports.getUsers = async(ticketId) => {
}); });
return response.data; return response.data;
}catch(e){ }catch(e){
fs.appendFileSync(__dirname + "/../logs/logs.json", JSON.stringify("*** getUsers:\n" + e, null, 3)); fs.appendFileSync(__dirname + "/../logs/logs.txt", e.stack);
} }
} }

38
lib/utils.js
View File

@@ -17,6 +17,7 @@ exports.htmlToText = async (text) => {
delete textArray[i]; delete textArray[i];
} }
} }
// text.replace(/(\.\s)+/g, '. ');
let messageText = ''; let messageText = '';
for(let k in textArray){ for(let k in textArray){
if(textArray[k][0] != '>' && textArray[k].trim() && textArray[k].indexOf('ts@krtech.ru писал') == -1 && textArray[k].indexOf('cellpadding="0"') == -1){ if(textArray[k][0] != '>' && textArray[k].trim() && textArray[k].indexOf('ts@krtech.ru писал') == -1 && textArray[k].indexOf('cellpadding="0"') == -1){
@@ -25,24 +26,33 @@ exports.htmlToText = async (text) => {
} }
return messageText.replace(/\[.*?\]/g, ''); return messageText.replace(/\[.*?\]/g, '');
}catch(e){ }catch(e){
fs.appendFileSync(dir + "/../logs/logs.json", JSON.stringify("*** htmlToText:\n" + e, null, 3)); fs.appendFileSync(dir + "/../logs/logs.txt", e.stack);
} }
} }
exports.parseMessageText = async (message, messageData, ticketId) => { exports.parseMessageText = async (ticket, ticketAuthor, color) => {
try{ try{
let color = await this.getTicketColor(messageData.data[ticketId].status); let messageText = `${color} <b>ЗАЯВКА <a href="${glpiUrl}front/ticket.form.php?id=${ticket.id}">№${ticket.id}</a></b>\n\n`;
text = message.text.split('\n'); if(ticket.users_id_recipient == conf.glpiConfig.user_id){
messageText = `${color} <b>ЗАЯВКА <a href="${glpiUrl}front/ticket.form.php?id=${ticketId}">№${ticketId}</a></b>\n\n`; let text = html.convert(he.decode(ticket.content), {preserveNewlines: true});
for(let i = 2; i < text.length; i++){ let halfText = text.split("\nОписание: ");
if(text[i].indexOf(':') >= 0) messageText += `<b>${text[i].replace(':', ':</b>')}\n`; let headers = halfText[0].split("\n");
} for(let i = 0; i < headers.length; i++){
if(text[text.length - 1].indexOf("Читать дальше") >= 0){ messageText += `<b>${headers[i].split(": ")[0]}: </b>${headers[i].split(": ")[1]}\n`;
messageText = `${messageText.replace('Читать дальше', '')}\n<b><a href="${glpiUrl}front/ticket.form.php?id=${ticketId}">Читать дальше</a></b>`; }
messageText += `<b>Описание: </b>${halfText[1]}`;
}else{
let text = await this.htmlToText(ticket.content);
messageText += `<b>Автор заявки: </b>${ticketAuthor}\n`;
messageText += `<b>Проблема: </b>${ticket.name}\n<b>Описание: </b>`;
messageText += text;
if(messageText.length > 600){
messageText = `${messageText.substring(0, 500)} + '\n\n<b><a href="${glpiUrl}front/ticket.form.php?id=${ticket.id}">Читать дальше</a></b>`;
}
} }
return messageText; return messageText;
}catch(e){ }catch(e){
fs.appendFileSync(dir + "/../logs/logs.json", JSON.stringify("*** parseMessageText:\n" + e, null, 3)); fs.appendFileSync(dir + "/../logs/logs.txt", e.stack);
} }
} }
@@ -66,7 +76,7 @@ exports.createThread = async (bot, messageData, ticketId, title) => {
messageData.data[ticketId].pinMessageId = msg.message_id; messageData.data[ticketId].pinMessageId = msg.message_id;
fs.writeFileSync(dir + "/../data/messageData.json", JSON.stringify(messageData, null, 3)); fs.writeFileSync(dir + "/../data/messageData.json", JSON.stringify(messageData, null, 3));
}catch(e){ }catch(e){
fs.appendFileSync(dir + "/../logs/logs.json", JSON.stringify("*** createThread:\n" + e, null, 3)); fs.appendFileSync(dir + "/../logs/logs.txt", e.stack);
} }
} }
@@ -105,7 +115,7 @@ exports.editMessageText = async (bot, messageId, messageText, keyboard) => {
reply_markup: {inline_keyboard: keyboard} reply_markup: {inline_keyboard: keyboard}
}); });
}catch(e){ }catch(e){
//fs.appendFileSync(dir + "/../logs/logs.json", JSON.stringify(e, null, 3)); //fs.appendFileSync(dir + "/../logs/logs.txt", e.stack);
} }
} }
@@ -113,7 +123,7 @@ exports.editMessageMarkup = async (bot, messageId, keyboard) => {
try{ try{
await bot.telegram.editMessageReplyMarkup(conf.supportChatId, messageId, undefined, {inline_keyboard: keyboard}); await bot.telegram.editMessageReplyMarkup(conf.supportChatId, messageId, undefined, {inline_keyboard: keyboard});
}catch(e){ }catch(e){
//fs.appendFileSync(dir + "/../logs/logs.json", JSON.stringify(e, null, 3)); //fs.appendFileSync(dir + "/../logs/logs.txt", e.stack);
} }
} }

2
package.json
View File

@@ -12,7 +12,7 @@
"nodemonConfig": { "nodemonConfig": {
"ignore": [ "ignore": [
"./data/messageData.json", "./data/messageData.json",
"./logs/logs.json" "./logs/logs.txt"
], ],
"delay": "10" "delay": "10"
} }

2
telegram_support.service
View File

@@ -1,6 +1,6 @@
[Service] [Service]
User=root User=root
ExecStart=node /root/telegram_support_bot/telegram_support_bot.js ExecStart=node /home/telegram_support_bot/telegram_support_bot.js
Restart=always Restart=always
[Install] [Install]

24
telegram_support_bot.js
View File

@@ -146,9 +146,8 @@ bot.on('text', async (ctx) => {
}catch{} }catch{}
if(!ticketData.hasOwnProperty(ctx.chat.id) && ticketId){ if(!ticketData.hasOwnProperty(ctx.chat.id) && ticketId){
if(!messageData.data[ticketId].hasOwnProperty('threadId')){ if(!messageData.data[ticketId].hasOwnProperty('threadId')){
let ticket = await glpm.getItem('Ticket', ticketId); await ctx.reply("Эта заявка уже закрыта. Создайте, пожалуйста, новую");
let title = `🟢 ${ticketId} - ${ticket.name}`; return;
await createThread(bot, messageData, ticketId, title);
} }
if(!ctx.chat.last_name) ctx.chat.last_name = ''; if(!ctx.chat.last_name) ctx.chat.last_name = '';
let userName = ctx.chat.first_name + ' ' + ctx.chat.last_name; let userName = ctx.chat.first_name + ' ' + ctx.chat.last_name;
@@ -278,7 +277,7 @@ function createAction(action, keyboard, status){
let td = messageData.data[ticketId]; let td = messageData.data[ticketId];
if(status || action == 'OpenThread'){ if(status || action == 'OpenThread'){
await glpm.changeStatusTicket(ticketId, status); await glpm.changeStatusTicket(ticketId, status);
await editTicketStatus(bot, messageData, message); await editTicketStatus(bot, messageData, ticketId);
if(status == 6){ if(status == 6){
if(td.hasOwnProperty('userChatId')){ if(td.hasOwnProperty('userChatId')){
try{ try{
@@ -312,15 +311,16 @@ function createAction(action, keyboard, status){
} }
}); });
}catch(e){ }catch(e){
fs.appendFileSync(dir + "/logs/logs.json", JSON.stringify(e, null, 3)); fs.appendFileSync(dir + "/logs/logs.txt", e.stack);
} }
} }
// Обработчик для кнопки "Отмена" // Обработчик для кнопки "Отмена"
bot.action('RefreshStatus', async (ctx) => { bot.action('RefreshTicket', async (ctx) => {
let message = ctx.update.callback_query.message; let message = ctx.update.callback_query.message;
await editTicketStatus(bot, messageData, message); let ticketId = message.text.split('№')[1].split('\n')[0];
await editTicketStatus(bot, messageData, ticketId);
}); });
// Обработчик для кнопки с подсказкой о добавлении комментария // Обработчик для кнопки с подсказкой о добавлении комментария
@@ -357,7 +357,7 @@ bot.action('ConfirmConfig', async (ctx) => {
let jsonData = JSON.stringify(conf, null, 3); let jsonData = JSON.stringify(conf, null, 3);
fs.writeFileSync(dir + "/data/conf.json", jsonData); fs.writeFileSync(dir + "/data/conf.json", jsonData);
createAssignActions(); createAssignActions();
await deleteMessage(ctx.update.callback_query, configData.id); await deleteMessage(conf.supportChatId, configData.id);
configData = {}; configData = {};
await editMessageMarkup(bot, messageId, cns.inlineKeyboards.configUserGroups); await editMessageMarkup(bot, messageId, cns.inlineKeyboards.configUserGroups);
} }
@@ -370,7 +370,7 @@ bot.action('ExitConfig', async (ctx) => {
}); });
bot.action('CancellConfirm', async (ctx) => { bot.action('CancellConfirm', async (ctx) => {
await deleteMessage(conf.supportChatId, configData.id); await deleteMessage(ctx.update.callback_query, configData.id);
configData = {}; configData = {};
let message = ctx.update.callback_query.message; let message = ctx.update.callback_query.message;
await editMessageMarkup(bot, message.message_id, cns.inlineKeyboards.configUserGroups); await editMessageMarkup(bot, message.message_id, cns.inlineKeyboards.configUserGroups);
@@ -390,7 +390,7 @@ bot.action('AssignTicket', async (ctx) => {
keyboard[keyboard.length-1].push({text: key, callback_data: 'ButtonFor_' + key}); keyboard[keyboard.length-1].push({text: key, callback_data: 'ButtonFor_' + key});
row++; row++;
} }
keyboard[keyboard.length-1].push({text: 'Отмена', callback_data: 'RefreshStatus'}); keyboard[keyboard.length-1].push({text: 'Отмена', callback_data: 'RefreshTicket'});
await editMessageMarkup(bot, message.message_id, keyboard); await editMessageMarkup(bot, message.message_id, keyboard);
}); });
@@ -409,7 +409,7 @@ function createAssignActions(){
if(message.text.indexOf("⚫") < 0){ if(message.text.indexOf("⚫") < 0){
await glpm.changeStatusTicket(ticketId, 2); await glpm.changeStatusTicket(ticketId, 2);
} }
await editTicketStatus(bot, messageData, message); await editTicketStatus(bot, messageData, ticketId);
if(messageData.data[ticketId].hasOwnProperty('threadId')){ if(messageData.data[ticketId].hasOwnProperty('threadId')){
await closeThread(bot, messageData, ticketId); await closeThread(bot, messageData, ticketId);
} }
@@ -436,7 +436,7 @@ bot.launch();
counter = 0; counter = 0;
} }
}catch(e){ }catch(e){
fs.appendFileSync(dir + "/logs/logs.json", JSON.stringify(e, null, 3)); fs.appendFileSync(dir + "/logs/logs.txt", e.stack);
} }
await sleep(10000); await sleep(10000);
counter++; counter++;