Hessenuk/DiscordTickets
Hessenuk/DiscordTickets
2
0
Fork 0
mirror of https://github.com/Hessenuk/DiscordTickets.git synced 2024-10-01 07:25:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed archiving (linereader was broken)

Browse Source 
Co-Authored-By: Camdan M <camthehelpdesk@gmail.com>
This commit is contained in:
Isaac (eartharoid) 2020-11-13 19:50:11 +00:00
parent f8dc04d991
commit c3f1532bba
3 changed files with 42 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package-lock.json generated
View File

@ -1642,6 +1642,11 @@
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
}, },
"n-readlines": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/n-readlines/-/n-readlines-1.0.1.tgz",
"integrity": "sha512-z4SyAIVgMy7CkgsoNw7YVz40v0g4+WWvvqy8+ZdHrCtgevcEO758WQyrYcw3XPxcLxF+//RszTz/rO48nzD0wQ=="
},
"natural-compare": { "natural-compare": {
"version": "1.4.0", "version": "1.4.0",
"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",

1
package.json
View File

@ -11,6 +11,7 @@
"dotenv": "^8.2.0", "dotenv": "^8.2.0",
"leekslazylogger": "^2.0.7", "leekslazylogger": "^2.0.7",
"line-reader": "^0.4.0", "line-reader": "^0.4.0",
"n-readlines": "^1.0.1",
"node-fetch": "^2.6.1", "node-fetch": "^2.6.1",
"sequelize": "^6.3.5", "sequelize": "^6.3.5",
"terminal-link": "^2.1.1" "terminal-link": "^2.1.1"

63
src/modules/archive.js
View File

@ -9,7 +9,7 @@
const Logger = require('leekslazylogger'); const Logger = require('leekslazylogger');
const log = new Logger(); const log = new Logger();
const lineReader = require('line-reader'); const Readlines = require('n-readlines');
const fs = require('fs'); const fs = require('fs');
const { join } = require('path'); const { join } = require('path');
const dtf = require('@eartharoid/dtf'); const dtf = require('@eartharoid/dtf');
@ -117,41 +117,50 @@ module.exports.export = (Ticket, channel) => new Promise((resolve, reject) => {
}; };
data.messages = []; data.messages = [];
let line,
lineNumber = 0;
lineReader.eachLine(raw, line => { const lineByLine = new Readlines(join(__dirname, raw));
let message = JSON.parse(line);
// eslint-disable-next-line no-cond-assign
while (line = lineByLine.next()) {
let message = JSON.parse(line.toString('ascii'));
let index = data.messages.findIndex(m => m.id === message.id); let index = data.messages.findIndex(m => m.id === message.id);
if (index === -1) data.messages.push(message); if (index === -1) data.messages.push(message);
else data.messages[index] = message; else data.messages[index] = message;
}, () => { lineNumber++;
let endpoint = config.transcripts.web.server; }
if (endpoint[endpoint.length - 1] === '/') endpoint = endpoint.slice(0, -1); data.ticket.messages = lineNumber;
endpoint += `/${data.ticket.creator}/${data.ticket.channel}/?key=${process.env.ARCHIVES_KEY}`; let endpoint = config.transcripts.web.server;
fetch(encodeURI(endpoint), { if (endpoint[endpoint.length - 1] === '/') endpoint = endpoint.slice(0, -1);
method: 'post',
body: JSON.stringify(data),
headers: { 'Content-Type': 'application/json' },
})
.then(res => res.json())
.then(res => {
if (res.status !== 200) {
log.warn(res);
return resolve(new Error(`${res.status} (${res.message})`));
}
log.success(`Uploaded ticket #${ticket.id} archive to server`); endpoint += `/${data.ticket.creator}/${data.ticket.channel}/?key=${process.env.ARCHIVES_KEY}`;
fs.unlinkSync(join(__dirname, raw)); fetch(encodeURI(endpoint), {
fs.unlinkSync(join(__dirname, json)); method: 'post',
body: JSON.stringify(data),
headers: { 'Content-Type': 'application/json' },
})
.then(res => res.json())
.then(res => {
if (res.status !== 200) {
log.warn(res);
return resolve(new Error(`${res.status} (${res.message})`));
}
resolve(res.url); log.success(`Uploaded ticket #${ticket.id} archive to server`);
}).catch(e => {
log.warn(e); fs.unlinkSync(join(__dirname, raw));
return resolve(e); fs.unlinkSync(join(__dirname, json));
});
}); resolve(res.url);
}).catch(e => {
log.warn(e);
return resolve(e);
});
})(); })();
}); });