SileNce/discord_bot
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: SileNce:3c8bec050d7e01e68d1a4ab6db185d25069703e8
Branches Tags
SileNce:master
SileNce:allow_dates_in_timer_cmd
SileNce:development
SileNce:process_info
SileNce:tdoss_improve
SileNce:whitelist_gen
SileNce:user_whitelist
SileNce:prompt_improvement
SileNce:lastfmroast
SileNce:whitelist
SileNce:chat
SileNce:experiments
SileNce:devbot
SileNce:remove-parse-ms-dependency
..
compare: SileNce:f28055e02405ed2f329f3aff407fda2bf1134968
Branches Tags
SileNce:allow_dates_in_timer_cmd
SileNce:development
SileNce:master
SileNce:process_info
SileNce:tdoss_improve
SileNce:whitelist_gen
SileNce:user_whitelist
SileNce:prompt_improvement
SileNce:lastfmroast
SileNce:whitelist
SileNce:chat
SileNce:experiments
SileNce:devbot
SileNce:remove-parse-ms-dependency

No commits in common. "3c8bec050d7e01e68d1a4ab6db185d25069703e8" and "f28055e02405ed2f329f3aff407fda2bf1134968" have entirely different histories.
3c8bec050d ... f28055e024

2 changed files with 1 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

16
server.js
View file

@ -2,7 +2,6 @@ const fs = require('fs');
const createInitialConfig = require("./util/createInitialConfig")
const convertTimerJSONToSQL = require('./util/timer/convertTimerJSONToSQL.js');
const createTimersTable = require('./server/createDatabaseTables/createTimersTable');
const convertCustomCommandsJSONToSQL = require('./server/convertCustomCommandsJSONToSQL.js');
if(!fs.existsSync("./data/config.json")) {
createInitialConfig();
}
@ -11,22 +10,11 @@ async function checkAndConvertJSONToSQL(){
if(fs.existsSync("./data/timers.json")){
process.stdout.write(true + "\n")
await convertTimerJSONToSQL();
fs.renameSync('data/timers.json', 'data/timers.json.old');
console.log("Renamed timers.json to timers.json.old");
}else{
process.stdout.write(false + "\n")
}
process.stdout.write("Checking if customCommands.json exists... ")
if(fs.existsSync('./data/customCommands.json')){
process.stdout.write(true + "\n")
await convertCustomCommandsJSONToSQL();
fs.renameSync('data/customCommands.json', 'data/customCommands.json.old');
}else{
process.stdout.write(false + "\n")
}
}
@ -94,6 +82,4 @@ async function prepareBot(){
prepareBot().then( () => {
startBot();
}).catch(error => {
console.error("Error preparing the bot:\n", error)
})
});

40
server/convertCustomCommandsJSONToSQL.js
View file

@ -1,40 +0,0 @@
const sqlite3 = require('sqlite3').verbose();
module.exports = async function () {
const customCommands = require('../data/customCommands.json')
const db = new sqlite3.Database('data/database.db');
return new Promise((resolve, reject) => {
customCommands.forEach(element => {
});
for (let i = 0; i < timers.length; i++) {
let user = timers[i].user;
let reminderTime = timers[i].reminderDate;
let channel = timers[i].channel;
let customMessage = timers[i].customMessage;
let hasPassed = false;
db.run(`INSERT INTO timers (
user,
reminderTime,
channel,
customMessage,
hasPassed
) VALUES (?, ?, ?, ?, ?)`, [user, reminderTime, channel, customMessage, hasPassed], function (error) {
if (error) {
console.error(`Error while converting timers.json to SQL: ${error}`)
reject(error);
}
})
}
db.close();
console.log("Converted timers.json to SQL successfully.");
resolve();
})
}