Fixed the calendar

This commit is contained in:
ION606
2022-08-16 14:15:12 -07:00
parent 2f073c0eb2
commit 1e8ed76c18
7 changed files with 337 additions and 177 deletions
+2 -4
View File
@@ -152,7 +152,7 @@
link.innerText = ev.link; link.innerText = ev.link;
link.onclick = function(event) { event.preventDefault(); window.open(ev.link, '_blank'); } link.onclick = function(event) { event.preventDefault(); window.open(ev.link, '_blank'); }
const timeFull = new Date(Number(evlist[ind].time) + (Number(ev.offset) + 1) * 60000); const timeFull = new Date(Number(evlist[ind].time) + (Number(ev.offset)) * 60000);
var time = [timeFull.getHours().toString(), timeFull.getMinutes().toString()]; var time = [timeFull.getHours().toString(), timeFull.getMinutes().toString()];
//Make sure it looks like 01:08 and not 1:8 //Make sure it looks like 01:08 and not 1:8
@@ -217,12 +217,10 @@
function sendData(event, inp) { function sendData(event, inp) {
event.preventDefault(); event.preventDefault();
var serverSettings = JSON.parse(window.localStorage.getItem('serverInfo')); var serverSettings = JSON.parse(window.sessionStorage.getItem('serverInfo'));
window.opener.location.reload(); window.opener.location.reload();
if (inp.inp == 'cal') { if (inp.inp == 'cal') {
// const userId = JSON.parse(window.localStorage.getItem('Id'));
var xhrsess = new XMLHttpRequest(); var xhrsess = new XMLHttpRequest();
xhrsess.open('post', 'http://www.selmerbot.com/getSessionInfo/', true); xhrsess.open('post', 'http://www.selmerbot.com/getSessionInfo/', true);
xhrsess.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded; charset=UTF-8'); xhrsess.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded; charset=UTF-8');
+253 -159
View File
@@ -139,6 +139,14 @@
border-color: #000000; border-color: #000000;
} }
.ardpd {
color: inherit;
background-color: rgba(85, 83, 83, 0.2);
}
.ardpd:focus-visible {
color: white;
}
</style> </style>
<!-- Buttons --> <!-- Buttons -->
@@ -280,6 +288,7 @@
w.sessionStorage.setItem("evlist", evjs); w.sessionStorage.setItem("evlist", evjs);
w.sessionStorage.setItem('day', day); w.sessionStorage.setItem('day', day);
w.sessionStorage.setItem('ref', 'guild'); w.sessionStorage.setItem('ref', 'guild');
w.sessionStorage.setItem('serverInfo', window.sessionStorage.getItem('serverInfo'));
w.location.reload(); w.location.reload();
w.document.write('<title>Editing ${(new Date(Number(ev.time)))}</title>'); w.document.write('<title>Editing ${(new Date(Number(ev.time)))}</title>');
@@ -296,6 +305,7 @@
w.sessionStorage.setItem("day", day); w.sessionStorage.setItem("day", day);
w.sessionStorage.setItem('ref', 'guild'); w.sessionStorage.setItem('ref', 'guild');
w.sessionStorage.setItem('serverInfo', window.sessionStorage.getItem('serverInfo'));
w.location.reload(); w.location.reload();
// w.document.write('<title>Editing ${(' + String(day) + ')}</title>'); // w.document.write('<title>Editing ${(' + String(day) + ')}</title>');
@@ -374,154 +384,207 @@
</script> </script>
<script> <script>
function getSessionData() {
return new Promise((resolve, reject) => {
var xhrsess = new XMLHttpRequest();
xhrsess.open('post', 'http://www.selmerbot.com/getSessionInfo/', true);
xhrsess.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded; charset=UTF-8');
xhrsess.setRequestHeader('session', window.localStorage.getItem('sessionId'));
//Reminder that this will return a map of strings (you'll have to use JSON.parse() again)
xhrsess.onloadend = (e) => {
resolve(JSON.parse(xhrsess.response));
}
xhrsess.send();
});
}
//Maybe pre-load the channels in the server into local storage for accessing when chosing the welcome/logging channels? //Maybe pre-load the channels in the server into local storage for accessing when chosing the welcome/logging channels?
window.onload = () => { window.onload = () => {
var serverSettings = JSON.parse(window.localStorage.getItem('serverInfo')); const serverInfoPromise = getSessionData();
serverInfoPromise.then((sessionInfo) => {
const serverInfo = JSON.parse(sessionInfo.currentServer);
var serverSettings = JSON.parse(serverInfo.serverSettings);
if (!serverSettings) { if (!serverSettings) {
alert("Please log in to continue"); alert("Please log in to continue");
if (window.location.href.indexOf('localhost') != -1) { if (window.location.href.indexOf('localhost') != -1) {
window.location = 'https://discord.com/api/oauth2/authorize?client_id=926551095352901632&redirect_uri=http%3A%2F%2Flocalhost%3A53134%2F&response_type=token&scope=identify%20guilds'; window.location = 'https://discord.com/api/oauth2/authorize?client_id=926551095352901632&redirect_uri=http%3A%2F%2Flocalhost%3A53134%2F&response_type=token&scope=identify%20guilds';
} else { } else {
window.location = 'https://discord.com/api/oauth2/authorize?client_id=944046902415093760&redirect_uri=http%3A%2F%2Fwww.selmerbot.com%2F&response_type=token&scope=identify%20guilds'; window.location = 'https://discord.com/api/oauth2/authorize?client_id=944046902415093760&redirect_uri=http%3A%2F%2Fwww.selmerbot.com%2F&response_type=token&scope=identify%20guilds';
}
}
//Get serverId instead of the userId
const id = serverSettings.Id;
//Check if the user has premium
var xhrverify = new XMLHttpRequest();
xhrverify.open('post', 'http://www.selmerbot.com/verifypremium/', true);
xhrverify.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded; charset=UTF-8');
//Use the guild Id as the userId
xhrverify.setRequestHeader('userId', id);
xhrverify.onloadend = (e) => {
//Load the channels
var xhr = new XMLHttpRequest();
xhr.open('get', `http://www.selmerbot.com/getChannels/`, true);
xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded; charset=UTF-8');
xhr.setRequestHeader('serverNumber', id);
xhr.onloadend = (e) => {
//Channel Section
const channels = JSON.parse(xhr.response);
// console.log(channels.text);
// window.localStorage.setItem('channels', (xhr.response));
for (let i = 0; i < channels.text.length; i ++) {
var channel = channels.text[i];
if (channel.name && channel.id) {
var optlog = document.createElement('option');
optlog.value = channel.id;
optlog.innerHTML = channel.name;
//I need two because if I try to append the same one, it only appends to one dorpdown
var optwelcome = document.createElement('option');
optwelcome.value = channel.id;
optwelcome.innerHTML = channel.name;
if (serverSettings.WELCOME.welcomechannel == optwelcome.value) {
optwelcome.setAttribute('selected', '');
}
if (serverSettings.LOG.logchannel == optlog.value) {
optlog.setAttribute('selected', '');
// optlog.selected = serverSettings.LOG.logchannel;
}
document.getElementById('logchanneldropdown').appendChild(optlog);
document.getElementById('welcomechanneldropdown').appendChild(optwelcome);
}
} }
// document.getElementById('body').classList.replace('hide', 'show');
//Welcome section
let wc = serverSettings.WELCOME.welcomechannel || '';
let wm = serverSettings.WELCOME.welcomemessage || '';
// document.getElementById('wc').setAttribute('value', wc);
document.getElementById('wm').setAttribute('value', wm);
//Logging section ,"LOG":{"_id":"LOG","keepLogs":false,"logchannel":null,"severity":0}}
let kl = serverSettings.LOG.keepLogs || false;
let lc = serverSettings.LOG.logchannel || '';
let ls = serverSettings.LOG.severity || 0;
document.getElementById('kl').checked = kl;
// document.getElementById('lc').setAttribute('value', lc);
// document.getElementById('ls').children[ls].checked = true; //Doesn't work
}
xhr.send();
//#region Calendar
if (xhrverify.response == "Unauthorized") {
document.getElementById("calForm").style.display = "none";
document.getElementById("unauth").style.display = "block";
return;
} else if (xhrverify.response == 'Internal Server Error') {
alert("Uh oh, an Internal Server Error has occured!\nPlease try again!");
return window.location.href = "index.html";
} }
//Get serverId instead of the userId
const id = serverInfo.Id;
//Check if the user has premium
var xhrverify = new XMLHttpRequest();
xhrverify.open('post', 'http://www.selmerbot.com/verifypremium/', true);
xhrverify.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded; charset=UTF-8');
var xhr2 = new XMLHttpRequest(); //Use the guild Id as the userId
xhr2.open('get', 'http://www.selmerbot.com/getCal/', true); xhrverify.setRequestHeader('userId', id);
xhr2.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded; charset=UTF-8'); xhrverify.onloadend = (e) => {
xhr2.setRequestHeader('guildId', id); // //Load the channels
// var xhr = new XMLHttpRequest();
// xhr.open('get', `http://www.selmerbot.com/getChannels/`, true);
// xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded; charset=UTF-8');
// xhr.setRequestHeader('serverNumber', id);
// xhr.onloadend = (e) => {
//Channel Section
const channels = JSON.parse(serverInfo.channels);
const roles = JSON.parse(serverInfo.roles);
// console.log(channels.text);
// window.localStorage.setItem('channels', (xhr.response));
xhr2.onloadend = (e) => { for (let i = 0; i < channels.text.length; i ++) {
const calList = new Map(); var channel = channels.text[i];
if (channel.name && channel.id) {
var optlog = document.createElement('option');
optlog.value = channel.id;
optlog.innerHTML = channel.name;
const res = JSON.parse(xhr2.response); console.log(res, typeof res); //I need two because if I try to append the same one, it only appends to one dorpdown
const times = res[0]; var optwelcome = document.createElement('option');
const monthNames = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"]; optwelcome.value = channel.id;
document.getElementById('monthName').innerText = `Editing Reminders for the Month of ${monthNames[(new Date()).getMonth()]}`; optwelcome.innerHTML = channel.name;
times.forEach((time, ind) => { var optann = document.createElement('option');
const fullDate = new Date(Number(time)); optann.value = channel.id;
const month = fullDate.getMonth(); optann.innerHTML = channel.name;
const day = fullDate.getDate();
//Make sure it's the right month (old ones should be removed, this is just a catch) if (serverSettings.WELCOME.welcomechannel == optwelcome.value) {
if (month == (new Date()).getMonth()) { optwelcome.setAttribute('selected', '');
if (calList.has(day)) { }
var temp = calList.get(day);
temp.push(res[1][ind]); if (serverSettings.LOG.logchannel == optlog.value) {
calList.set(day, temp); optlog.setAttribute('selected', '');
} else { // optlog.selected = serverSettings.LOG.logchannel;
calList.set(day, [res[1][ind]]); }
if (serverSettings.announcement.channel == optann.value) {
optann.setAttribute('selected', '');
}
document.getElementById('logchanneldropdown').appendChild(optlog);
document.getElementById('welcomechanneldropdown').appendChild(optwelcome);
document.getElementById('achanneldropdown').appendChild(optann);
} }
} }
});
const ard = document.getElementById('aroledropdown');
roles.forEach((role) => {
var opt = document.createElement('option');
opt.value = role.Id;
opt.innerHTML = role.name;
// opt.style += `background-color: ${role.color + '33'};`;
if (role.color == '#000000') {
opt.style = 'color: white';
}
else {
opt.style = `color: ${role.color}; background-color: ${role.color + '33'};`;
}
calSetup(calList); if (serverSettings.announcement.role == role.Id) {
opt.setAttribute('selected', '');
}
ard.appendChild(opt);
});
// document.getElementById('body').classList.replace('hide', 'show');
//Welcome section
let wc = serverSettings.WELCOME.welcomechannel || '';
let wm = serverSettings.WELCOME.welcomemessage || '';
// document.getElementById('wc').setAttribute('value', wc);
document.getElementById('wm').setAttribute('value', wm);
//Logging section ,"LOG":{"_id":"LOG","keepLogs":false,"logchannel":null,"severity":0}}
let kl = serverSettings.LOG.keepLogs || false;
let lc = serverSettings.LOG.logchannel || '';
let ls = serverSettings.LOG.severity || 0;
document.getElementById('kl').checked = kl;
// document.getElementById('lc').setAttribute('value', lc);
// document.getElementById('ls').children[ls].checked = true; //Doesn't work
// }
// xhr.send();
//#region Calendar
if (xhrverify.response == "Unauthorized") {
document.getElementById("calForm").style.display = "none";
document.getElementById("unauth").style.display = "block";
return;
} else if (xhrverify.response == 'Internal Server Error') {
alert("Uh oh, an Internal Server Error has occured!\nPlease try again!");
return window.location.href = "index.html";
}
var xhr2 = new XMLHttpRequest();
xhr2.open('get', 'http://www.selmerbot.com/getCal/', true);
xhr2.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded; charset=UTF-8');
xhr2.setRequestHeader('guildId', id);
xhr2.onloadend = (e) => {
const calList = new Map();
const res = JSON.parse(xhr2.response); console.log(res, typeof res);
const times = res[0];
const monthNames = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
document.getElementById('monthName').innerText = `Editing Reminders for the Month of ${monthNames[(new Date()).getMonth()]}`;
times.forEach((time, ind) => {
const fullDate = new Date(Number(time));
const month = fullDate.getMonth();
const day = fullDate.getDate();
//Make sure it's the right month (old ones should be removed, this is just a catch)
if (month == (new Date()).getMonth()) {
if (calList.has(day)) {
var temp = calList.get(day);
temp.push(res[1][ind]);
calList.set(day, temp);
} else {
calList.set(day, [res[1][ind]]);
}
}
});
calSetup(calList);
}
xhr2.send();
//#endregion
} }
xhr2.send(); xhrverify.send();
});
//#endregion
}
xhrverify.send();
} }
function logout() { function logout() {
window.localStorage.clear();
window.sessionStorage.clear();
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
xhr.open('post', 'http://www.selmerbot.com/logout/', true); xhr.open('post', 'http://www.selmerbot.com/logout/', true);
xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded; charset=UTF-8'); xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded; charset=UTF-8');
xhr.setRequestHeader('sessionid', window.localStorage.getItem('sessionId')); xhr.setRequestHeader('sessionid', window.localStorage.getItem('sessionId'));
xhr.onloadend = (e) => { window.location.href = 'index.html'; } xhr.onloadend = (e) => {
window.localStorage.clear();
window.sessionStorage.clear();
window.location.href = 'index.html';
}
xhr.send(); xhr.send();
} }
</script> </script>
@@ -561,47 +624,67 @@
b.classList.replace('saved', 'saving'); b.classList.replace('saved', 'saving');
b.innerText = 'SAVING'; b.innerText = 'SAVING';
var serverSettings = JSON.parse(window.localStorage.getItem('serverInfo')); const sessionInfoPromise = getSessionData();
sessionInfoPromise.then((sessionInfo) => {
var serverInfo = JSON.parse(sessionInfo.currentServer);
// var serverInfo = JSON.parse(window.sessionStorage.getItem('serverInfo'));
var serverSettings = JSON.parse(serverInfo.serverSettings);
if (inp.inp == 'logs') { if (inp.inp == 'logs') {
const ls = document.getElementsByName('ls'); const ls = document.getElementsByName('ls');
var sevname = ''; var sevname = '';
for (i in ls) { for (i in ls) {
if (ls[i].checked) { sevname = ls[i].id.substring(3); } if (ls[i].checked) { sevname = ls[i].id.substring(3); }
} }
const sevlist = ['none', 'low', 'meduim', 'high'] const sevlist = ['none', 'low', 'meduim', 'high']
serverSettings.LOG.severity = sevlist.indexOf(sevname); serverSettings.LOG.severity = sevlist.indexOf(sevname);
serverSettings.LOG.logchannel = document.getElementById('logchanneldropdown').value || null; serverSettings.LOG.logchannel = document.getElementById('logchanneldropdown').value || null;
let kl = false; let kl = false;
if (document.getElementById('kl').checked) { if (document.getElementById('kl').checked) {
kl = true; kl = true;
} }
serverSettings.LOG.keepLogs = kl; serverSettings.LOG.keepLogs = kl;
} else { } else if (inp.inp == 'announcement') {
serverSettings.WELCOME.welcomechannel = document.getElementById('welcomechanneldropdown').value || null; serverSettings.announcement.channel = document.getElementById('achanneldropdown').value || null;
serverSettings.WELCOME.welcomemessage = document.getElementById('wm').value || null; serverSettings.announcement.role = document.getElementById('aroledropdown').value || null;
} console.log(serverSettings.announcement);
//Send the data to the server
var xhr = new XMLHttpRequest();
xhr.open('post', 'http://www.selmerbot.com/sendData/', true);
xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded; charset=UTF-8');
xhr.setRequestHeader('serverSettings', JSON.stringify(serverSettings));
xhr.onloadend = (e) => {
if (xhr.response == 'DONE') {
b.classList.replace('saving', 'saved');
b.innerText = 'SAVED';
window.localStorage.setItem('serverInfo', JSON.stringify(serverSettings));
} else { } else {
b.classList.replace('saving', 'failed'); serverSettings.WELCOME.welcomechannel = document.getElementById('welcomechanneldropdown').value || null;
b.innerText = 'FAILED'; serverSettings.WELCOME.welcomemessage = document.getElementById('wm').value || null;
} }
}
//Send the data to the server
xhr.send(JSON.stringify(serverSettings)); var xhr = new XMLHttpRequest();
xhr.open('post', 'http://www.selmerbot.com/sendData/', true);
xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded; charset=UTF-8');
xhr.setRequestHeader('serverSettings', JSON.stringify(serverSettings));
xhr.onloadend = (e) => {
if (xhr.response == 'DONE') {
//Change the current server data
var xhrs = new XMLHttpRequest();
xhrs.open('post', 'http://www.selmerbot.com/setCurrentServer/', true);
xhrs.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded; charset=UTF-8');
xhrs.setRequestHeader('serverNumber', serverInfo.Id);
xhrs.setRequestHeader('sessionid', window.localStorage.getItem("sessionId"));
xhrs.onloadend = (e) => {
if (xhrs.response != 'OK') { alert("Uh Oh! There's been a problem!\nError Code: " + xhrs.response); }
b.classList.replace('saving', 'saved');
b.innerText = 'SAVED';
window.sessionStorage.setItem('serverInfo', JSON.stringify(serverSettings));
window.location.reload();
}
xhrs.send();
} else {
b.classList.replace('saving', 'failed');
b.innerText = 'FAILED';
}
}
xhr.send(JSON.stringify(serverSettings));
});
} }
</script> </script>
</head> </head>
@@ -761,8 +844,19 @@
<tbody id="calbody" style="color: black;"> <tbody id="calbody" style="color: black;">
</tbody> </tbody>
</table> </table><br><br>
<!-- <input type="submit" value="Submit", class="submitButton" onclick="sendData(event, { 'inp': 'cal' })"> -->
<label for="ardpd" style="margin-top: 30px;">Select your event ping role</label>
<select id="aroledropdown" name="ardpd" class="form-select mb-5 ardpd" aria-label="Default select example">
<option selected=""></option>
</select>
<label class="ps-1" for="acd">Event Channel Name:</label>
<select id="achanneldropdown" name="acd" class="form-select mb-5">
<option selected=""></option>
</select>
<input type="submit" value="Submit", class="submitButton" onclick="sendData(event, { 'inp': 'announcement' })">
</form> </form>
</div> </div>
+8 -4
View File
@@ -235,8 +235,10 @@
xhr.setRequestHeader('userId', window.sessionStorage.getItem('Id')); xhr.setRequestHeader('userId', window.sessionStorage.getItem('Id'));
xhr.onloadend = (e) => { xhr.onloadend = (e) => {
//Maybe have an alert for logged in? //No need
window.localStorage.removeItem("Id");
window.localStorage.setItem('sessionId', xhr.response); window.localStorage.setItem('sessionId', xhr.response);
document.getElementById('alertrow').style = ""; document.getElementById('alertrow').style = "";
window.location.href = "index.html"; window.location.href = "index.html";
@@ -272,14 +274,16 @@
} }
function logout() { function logout() {
window.localStorage.clear();
window.sessionStorage.clear();
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
xhr.open('post', 'http://www.selmerbot.com/logout/', true); xhr.open('post', 'http://www.selmerbot.com/logout/', true);
xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded; charset=UTF-8'); xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded; charset=UTF-8');
xhr.setRequestHeader('sessionid', window.localStorage.getItem('sessionId')); xhr.setRequestHeader('sessionid', window.localStorage.getItem('sessionId'));
xhr.onloadend = (e) => { window.location.href = 'index.html'; } xhr.onloadend = (e) => {
window.localStorage.clear();
window.sessionStorage.clear();
window.location.href = 'index.html';
}
xhr.send(); xhr.send();
} }
</script> </script>
+62 -1
View File
@@ -74,7 +74,7 @@ app.post('/user', async(request, response) => {
const sessionId = uuidv4(); const sessionId = uuidv4();
const dbo = client.db('main').collection('sessions'); const dbo = client.db('main').collection('sessions');
dbo.insertOne({ sessionId: sessionId, userId: id, guilds: JSON.stringify(guilds) }); dbo.insertOne({ sessionId: sessionId, userId: id, guilds: JSON.stringify(guilds), currentServer: null });
response.send(sessionId); response.send(sessionId);
}); });
@@ -152,6 +152,66 @@ app.get('/getChannels', async (req, res) => {
}); });
app.get('/temp.html', async (req, res) => { return res.sendFile('temp.html', { root: '.' }); });
//Headers: servernumber, sessionid
app.post('/setCurrentServer', async (req, res) => {
try {
const id = req.headers.servernumber;
if (id) {
const obj = {};
const arr = {text: [], voice: []};
const guild = bot.guilds.cache.get(id);
const roles = [];
guild.roles.cache.filter((role) => { return(!role.managed) }).forEach((role) => {
let newObj = {};
newObj.Id = role.id;
newObj.name = role.name;
newObj.color = role.hexColor;
roles.push(newObj);
});
const channels = guild.channels.cache;
channels.forEach((channel) => {
const type = channel.type;
if (type == 'GUILD_TEXT') {
arr.text.push({ name: channel.name, id: channel.id });
} else if (type == 'GUILD_VOICE') {
arr.voice.push({ name: channel.name, id: channel.id });
}
});
connection.then((client) => {
const dbo = client.db(id).collection('SETUP');
dbo.find().toArray(async (err, docs) => {
const m = new Map();
m.set('Id', id);
await Promise.all(docs.map(async (doc) => {
m.set(doc._id, doc);
})).then(() => {
obj['Id'] = id;
obj['roles'] = JSON.stringify(roles);
obj['channels'] = JSON.stringify(arr);
obj['serverSettings'] = JSON.stringify(Object.fromEntries(m));
const dbo = client.db('main').collection('sessions');
dbo.updateOne({ sessionId: req.headers.sessionid }, {$set: { currentServer: JSON.stringify(obj) }});
res.sendStatus(200);
});
})
});
}
} catch (err) {
console.error(err);
res.sendStatus(500);
}
});
app.get('/getCal', async (req, res) => { app.get('/getCal', async (req, res) => {
const userId = req.headers.userid || false; const userId = req.headers.userid || false;
const guildId = req.headers.guildid || false; const guildId = req.headers.guildid || false;
@@ -310,6 +370,7 @@ app.post('/sendData', async (req, res) => {
await dbo.updateOne({ _id: 'WELCOME' }, {$set: { welcomechannel: pref.WELCOME.welcomechannel, welcomemessage: pref.WELCOME.welcomemessage }}); await dbo.updateOne({ _id: 'WELCOME' }, {$set: { welcomechannel: pref.WELCOME.welcomechannel, welcomemessage: pref.WELCOME.welcomemessage }});
await dbo.updateOne({ _id: 'LOG' }, {$set: { keepLogs: pref.LOG.keepLogs, logchannel: pref.LOG.logchannel, severity: pref.LOG.severity }}); await dbo.updateOne({ _id: 'LOG' }, {$set: { keepLogs: pref.LOG.keepLogs, logchannel: pref.LOG.logchannel, severity: pref.LOG.severity }});
await dbo.updateOne({ _id: 'announcement' }, {$set: { channel: pref.announcement.channel, role: pref.announcement.role }});
}).then(() => { res.send("DONE"); }) }).then(() => { res.send("DONE"); })
.catch((err) => { .catch((err) => {
console.error(err); console.error(err);
+6 -5
View File
@@ -73,9 +73,6 @@
window.onload = async () => { window.onload = async () => {
//#region GUILDS //#region GUILDS
// const guilds = JSON.parse(JSON.parse(window.localStorage.getItem('guilds')));
//Guilds section
const sessionDataPromise = getSessionData(); const sessionDataPromise = getSessionData();
sessionDataPromise.then((sessionData) => { sessionDataPromise.then((sessionData) => {
const guilds = JSON.parse(sessionData.guilds); const guilds = JSON.parse(sessionData.guilds);
@@ -120,10 +117,14 @@
imagem.onclick = function() { imagem.onclick = function() {
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
xhr.open('post', 'http://www.selmerbot.com/getServer/', true); xhr.open('post', 'http://www.selmerbot.com/setCurrentServer/', true);
xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded; charset=UTF-8'); xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded; charset=UTF-8');
xhr.setRequestHeader('serverNumber', guilds[i].id); xhr.setRequestHeader('serverNumber', guilds[i].id);
xhr.onloadend = (e) => { window.localStorage.setItem('serverInfo', (xhr.response)); window.location = 'http://www.selmerbot.com/dashboard.html'; } xhr.setRequestHeader('sessionid', window.localStorage.getItem("sessionId"));
xhr.onloadend = (e) => {
// window.sessionStorage.setItem('serverInfo', (xhr.response));
window.location = 'http://www.selmerbot.com/dashboard.html';
}
xhr.send(); xhr.send();
} }
} else { } else {
+1 -1
View File
@@ -176,7 +176,7 @@
const offsetTS = offset * 60000; const offsetTS = offset * 60000;
const d = new Date(new Date().getFullYear(), new Date().getMonth(), day, hour, minute); const d = new Date(new Date().getFullYear(), new Date().getMonth(), day, hour, minute);
const serverSettings = JSON.parse(window.localStorage.getItem('serverInfo')); const serverSettings = JSON.parse(window.sessionStorage.getItem('serverInfo'));
const sessionDataPromise = getSessionData(); const sessionDataPromise = getSessionData();
sessionDataPromise.then((sessionData) => { sessionDataPromise.then((sessionData) => {
+5 -3
View File
@@ -163,14 +163,16 @@
} }
function logout() { function logout() {
window.localStorage.clear();
window.sessionStorage.clear();
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
xhr.open('post', 'http://www.selmerbot.com/logout/', true); xhr.open('post', 'http://www.selmerbot.com/logout/', true);
xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded; charset=UTF-8'); xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded; charset=UTF-8');
xhr.setRequestHeader('sessionid', window.localStorage.getItem('sessionId')); xhr.setRequestHeader('sessionid', window.localStorage.getItem('sessionId'));
xhr.onloadend = (e) => { window.location.href = 'index.html'; } xhr.onloadend = (e) => {
window.localStorage.clear();
window.sessionStorage.clear();
window.location.href = 'index.html';
}
xhr.send(); xhr.send();
} }