Info getting only every x seconds fix if server is not avaible, removed unnecesarry logging

This commit is contained in:
MrFry 2020-04-01 13:30:30 +02:00
parent bf2b44ee56
commit bbb0cfbf3a

View file

@ -21,7 +21,7 @@
// ==UserScript== // ==UserScript==
// @name Moodle/Elearning/KMOOC test help // @name Moodle/Elearning/KMOOC test help
// @version 2.0.0.5 // @version 2.0.0.6
// @description Online Moodle/Elearning/KMOOC test help // @description Online Moodle/Elearning/KMOOC test help
// @author MrFry // @author MrFry
// @match https://elearning.uni-obuda.hu/main/* // @match https://elearning.uni-obuda.hu/main/*
@ -60,8 +60,9 @@
var addEventListener // add event listener function var addEventListener // add event listener function
const serverAdress = 'https://qmining.frylabs.net/' const serverAdress = 'https://qmining.frylabs.net/'
const apiAdress = 'https://api.frylabs.net/'
// const serverAdress = 'http://localhost:8080/' // const serverAdress = 'http://localhost:8080/'
const apiAdress = 'https://api.frylabs.net/'
// const apiAdress = 'http://localhost:8080/'
const ircAddress = 'https://kiwiirc.com/nextclient/irc.sub.fm/#qmining' const ircAddress = 'https://kiwiirc.com/nextclient/irc.sub.fm/#qmining'
// forcing pages for testing. unless you test, do not set these to true! // forcing pages for testing. unless you test, do not set these to true!
@ -1621,14 +1622,13 @@
} }
if (now > lastCheck + (infoExpireTime * 1000)) { if (now > lastCheck + (infoExpireTime * 1000)) {
console.log('GETTING DATA FROM SREVER')
setVal('lastInfoCheckTime', now)
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
xmlhttpRequest({ xmlhttpRequest({
method: 'GET', method: 'GET',
url: apiAdress + 'infos?version=true&motd=true&subjinfo=true&cversion=' + info().script.version, url: apiAdress + 'infos?version=true&motd=true&subjinfo=true&cversion=' + info().script.version,
onload: function (response) { onload: function (response) {
try { try {
setVal('lastInfoCheckTime', now)
const res = JSON.parse(response.responseText) const res = JSON.parse(response.responseText)
setVal('lastInfo', response.responseText) setVal('lastInfo', response.responseText)
resolve(res) resolve(res)
@ -1645,7 +1645,6 @@
}) })
}) })
} else { } else {
console.log('USING OLD')
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
try { try {
resolve(JSON.parse(getVal('lastInfo'))) resolve(JSON.parse(getVal('lastInfo')))