SEGAy/MaiMaiDXNet
1
0
Fork 0
mirror of https://dev.s-ul.net/Galexion/MaiMaiDXNet.git synced 2024-11-24 05:30:11 +01:00
Code Releases Activity

Artemis Support Active!

Browse Source
This commit is contained in:
Galexion 2023-07-16 22:54:56 -04:00
parent 9e5522edd0
commit 7ae51a2895
10 changed files with 471 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

127
dbhandler.js
View File

@ -1,6 +1,20 @@
const { serverType, ArtConnSettings,DXMemorialImageDirectory } = require('./config.json'); const { serverType, ArtConnSettings, DXMemorialImageDirectory } = require('./config.json');
const sqlite3 = require('sqlite3').verbose(); const sqlite3 = require('sqlite3').verbose();
let db = new sqlite3.Database(DXMemorialImageDirectory + '\\db.sqlite'); const db = new sqlite3.Database(DXMemorialImageDirectory + '\\db.sqlite');
const mysql = require('mysql');
var con = mysql.createConnection(ArtConnSettings)
if (serverType === 1) {
con.connect((err) => {
if (err) {
console.error('Error connecting to MySQL database:', err);
process.exit()
return;
}
console.log('Connected to MySQL database.');
});
}
// index.js route '/' // index.js route '/'
async function getUserCount() { async function getUserCount() {
@ -17,7 +31,15 @@ async function getUserCount() {
}); });
}); });
} else { } else {
return new Promise((resolve, reject) => {
con.query("SELECT * FROM aime.mai2_profile_detail", function (err, result, fields) {
if (err) {
reject(err)
throw err
};
resolve(JSON.parse(JSON.stringify(result)).length);
});
});
} }
} }
// index.js & api.js /getUserData/ // index.js & api.js /getUserData/
@ -49,8 +71,32 @@ async function getUserData(req) {
}); });
}); // function is required to obtain the User Data, and create the user profile. I'm going to bed. }); // function is required to obtain the User Data, and create the user profile. I'm going to bed.
} else { // 07-23 oh god im going to have to recreate this function again aren't i } else { // 07-23 oh god im going to have to recreate this function again aren't i
return new Promise((resolve, reject) => {
con.query("SELECT * FROM aime.mai2_profile_detail", function (err, result, fields) {
if (err) {
reject(err)
throw err
};
// Make the Request easier to get to.
const cookies = req.cookies
var mUser = undefined // Leave the Matched User undefined until the user is found.
for (user of result) { // For Each User in Rows
console.log(user.user)
if (cookies.aime_card_id === user.user.toString()) { // If the Access Code for the card is in the system,
mUser = user; // set the Matched User Variable to the User, and break the for Loop.
break;
} }
}
if (mUser) {
// Return a Response with the whole identifiable user data. the EXT_ID will be used later to identify images and other things and match them to the user's profile.
resolve(mUser);
} else {
reject(new Error('User not found'));
}
})
});
};
} }
@ -79,7 +125,29 @@ async function getExtId(req) {
}); });
}); });
} else { } else {
return new Promise((resolve, reject) => {
con.query("SELECT * FROM aime.aime_card", function (err, result, fields) {
if (err) {
reject(err)
throw err
};
// Make the Request easier to get to.
var request = req.body;
var mUser = undefined // Leave the Matched User undefined until the user is found.
for (user of result) { // For Each User in Rows
if (request.input === user.access_code) { // If the Access Code for the card is in the system,
mUser = user; // set the Matched User Variable to the User, and break the for Loop.
break;
}
}
if (mUser) {
// Return a Response with the whole identifiable user data. the EXT_ID will be used later to identify images and other things and match them to the user's profile.
resolve(mUser);
} else {
reject(new Error('User not found'));
}
})
});
} }
} }
@ -107,7 +175,29 @@ async function getUserScores(req) {
}); });
}); });
} else { } else {
return new Promise((resolve, reject) => {
con.query("SELECT * FROM aime.mai2_playlog", function (err, result, fields) {
if (err) {
reject(err)
throw err
};
// Make the Request easier to get to.
const cookies = req.cookies
var mUser = undefined // Leave the Matched User undefined until the user is found.
// Make the Request easier to get to.
var request = req.body;
var mUser = new Array(); // Leave the Matched User's Scores undefined until the user is found.
for (score of result) { // For Each Score in Rows
console.log(request.input)
if (request.input == score.user) { // If the inputed User ID and Score's User ID Matches,
mUser.push(score) // add that score into the array.
}
}
// Return a Response with all the Scores listed under that user.
resolve(mUser)
})
});
} }
} }
@ -136,6 +226,29 @@ async function getUserArea(req) {
}); });
} else { } else {
return new Promise((resolve, reject) => {
con.query("SELECT * FROM aime.mai2_item_map", function (err, result, fields) {
if (err) {
reject(err)
throw err
};
// Make the Request easier to get to.
const cookies = req.cookies
var mUser = undefined // Leave the Matched User undefined until the user is found.
// Make the Request easier to get to.
var request = req.body;
var mUser = new Array(); // Leave the Matched User's Scores undefined until the user is found.
for (score of result) { // For Each Score in Rows
console.log(request.input)
if (request.input == score.user) { // If the inputed User ID and Score's User ID Matches,
mUser.push(score) // add that score into the array.
}
}
// Return a Response with all the Scores listed under that user.
resolve(mUser)
})
});
} }
} }
@ -153,7 +266,7 @@ async function getUserBanned(req) {
db.run('UPDATE maimai2_user_detail SET ban_state = ? WHERE id = ?', [2, request.input], function (err) { db.run('UPDATE maimai2_user_detail SET ban_state = ? WHERE id = ?', [2, request.input], function (err) {
if (err) { if (err) {
console.error(err.message); console.error(err.message);
reject({"status":"failure","message":"Unable to ban user, see reason","reason":err}); reject({ "status": "failure", "message": "Unable to ban user, see reason", "reason": err });
} else { } else {
resolve({ "status": "Success", "message": `User ${request.input} banned.` }) resolve({ "status": "Success", "message": `User ${request.input} banned.` })
} }
@ -176,7 +289,7 @@ async function getUserUnbanned(req) {
db.run('UPDATE maimai2_user_detail SET ban_state = ? WHERE id = ?', [0, request.input], function (err) { db.run('UPDATE maimai2_user_detail SET ban_state = ? WHERE id = ?', [0, request.input], function (err) {
if (err) { if (err) {
console.error(err.message); console.error(err.message);
reject({"status":"failure","message":"Unable to ban user, see reason","reason":err}); reject({ "status": "failure", "message": "Unable to ban user, see reason", "reason": err });
} else { } else {
resolve({ "status": "Success", "message": `User ${request.input} banned.` }) resolve({ "status": "Success", "message": `User ${request.input} banned.` })
} }
@ -187,4 +300,4 @@ async function getUserUnbanned(req) {
} }
} }
module.exports = {getUserCount,getUserData,getUserScores,getUserArea,getUserBanned,getUserUnbanned,getExtId}; module.exports = { getUserCount, getUserData, getUserScores, getUserArea, getUserBanned, getUserUnbanned, getExtId };

174
package-lock.json generated
View File

@ -17,6 +17,7 @@
"fs": "^0.0.1-security", "fs": "^0.0.1-security",
"http-errors": "^2.0.0", "http-errors": "^2.0.0",
"morgan": "^1.10.0", "morgan": "^1.10.0",
"mysql": "^2.18.1",
"path": "^0.12.7", "path": "^0.12.7",
"sqlite3": "^5.1.4" "sqlite3": "^5.1.4"
} }
@ -269,6 +270,14 @@
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
}, },
"node_modules/bignumber.js": {
"version": "9.0.0",
"resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.0.tgz",
"integrity": "sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A==",
"engines": {
"node": "*"
}
},
"node_modules/binary-extensions": { "node_modules/binary-extensions": {
"version": "2.2.0", "version": "2.2.0",
"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
@ -505,6 +514,11 @@
"resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
"integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==" "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
}, },
"node_modules/core-util-is": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
"integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
},
"node_modules/cross-fetch": { "node_modules/cross-fetch": {
"version": "3.1.5", "version": "3.1.5",
"resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz", "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz",
@ -1114,6 +1128,11 @@
"node": ">=0.12.0" "node": ">=0.12.0"
} }
}, },
"node_modules/isarray": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
"integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
},
"node_modules/isexe": { "node_modules/isexe": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@ -1163,9 +1182,9 @@
} }
}, },
"node_modules/make-dir/node_modules/semver": { "node_modules/make-dir/node_modules/semver": {
"version": "6.3.0", "version": "6.3.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
"bin": { "bin": {
"semver": "bin/semver.js" "semver": "bin/semver.js"
} }
@ -1389,6 +1408,47 @@
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
}, },
"node_modules/mysql": {
"version": "2.18.1",
"resolved": "https://registry.npmjs.org/mysql/-/mysql-2.18.1.tgz",
"integrity": "sha512-Bca+gk2YWmqp2Uf6k5NFEurwY/0td0cpebAucFpY/3jhrwrVGuxU2uQFCHjU19SJfje0yQvi+rVWdq78hR5lig==",
"dependencies": {
"bignumber.js": "9.0.0",
"readable-stream": "2.3.7",
"safe-buffer": "5.1.2",
"sqlstring": "2.3.1"
},
"engines": {
"node": ">= 0.6"
}
},
"node_modules/mysql/node_modules/readable-stream": {
"version": "2.3.7",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
"integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
"dependencies": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
"isarray": "~1.0.0",
"process-nextick-args": "~2.0.0",
"safe-buffer": "~5.1.1",
"string_decoder": "~1.1.1",
"util-deprecate": "~1.0.1"
}
},
"node_modules/mysql/node_modules/safe-buffer": {
"version": "5.1.2",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
},
"node_modules/mysql/node_modules/string_decoder": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
"dependencies": {
"safe-buffer": "~5.1.0"
}
},
"node_modules/negotiator": { "node_modules/negotiator": {
"version": "0.6.3", "version": "0.6.3",
"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
@ -1632,6 +1692,11 @@
"node": ">= 0.6.0" "node": ">= 0.6.0"
} }
}, },
"node_modules/process-nextick-args": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
},
"node_modules/promise-inflight": { "node_modules/promise-inflight": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
@ -1771,9 +1836,9 @@
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
}, },
"node_modules/semver": { "node_modules/semver": {
"version": "7.3.8", "version": "7.5.4",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
"integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
"dependencies": { "dependencies": {
"lru-cache": "^6.0.0" "lru-cache": "^6.0.0"
}, },
@ -1916,9 +1981,9 @@
"optional": true "optional": true
}, },
"node_modules/sqlite3": { "node_modules/sqlite3": {
"version": "5.1.4", "version": "5.1.6",
"resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-5.1.4.tgz", "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-5.1.6.tgz",
"integrity": "sha512-i0UlWAzPlzX3B5XP2cYuhWQJsTtlMD6obOa1PgeEQ4DHEXUuyJkgv50I3isqZAP5oFc2T8OFvakmDh2W6I+YpA==", "integrity": "sha512-olYkWoKFVNSSSQNvxVUfjiVbz3YtBwTJj+mfV5zpHmqW3sELx2Cf4QCdirMelhM5Zh+KDVaKgQHqCxrqiWHybw==",
"hasInstallScript": true, "hasInstallScript": true,
"dependencies": { "dependencies": {
"@mapbox/node-pre-gyp": "^1.0.0", "@mapbox/node-pre-gyp": "^1.0.0",
@ -1937,6 +2002,14 @@
} }
} }
}, },
"node_modules/sqlstring": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.1.tgz",
"integrity": "sha512-ooAzh/7dxIG5+uDik1z/Rd1vli0+38izZhGzSa34FwR7IbelPWCCKSNIl8jlL/F7ERvy8CB2jNeM1E9i9mXMAQ==",
"engines": {
"node": ">= 0.6"
}
},
"node_modules/ssri": { "node_modules/ssri": {
"version": "8.0.1", "version": "8.0.1",
"resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
@ -2359,6 +2432,11 @@
} }
} }
}, },
"bignumber.js": {
"version": "9.0.0",
"resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.0.tgz",
"integrity": "sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A=="
},
"binary-extensions": { "binary-extensions": {
"version": "2.2.0", "version": "2.2.0",
"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
@ -2535,6 +2613,11 @@
"resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
"integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==" "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
}, },
"core-util-is": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
"integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
},
"cross-fetch": { "cross-fetch": {
"version": "3.1.5", "version": "3.1.5",
"resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz", "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz",
@ -3018,6 +3101,11 @@
"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
}, },
"isarray": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
"integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
},
"isexe": { "isexe": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@ -3052,9 +3140,9 @@
}, },
"dependencies": { "dependencies": {
"semver": { "semver": {
"version": "6.3.0", "version": "6.3.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
} }
} }
}, },
@ -3220,6 +3308,46 @@
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
}, },
"mysql": {
"version": "2.18.1",
"resolved": "https://registry.npmjs.org/mysql/-/mysql-2.18.1.tgz",
"integrity": "sha512-Bca+gk2YWmqp2Uf6k5NFEurwY/0td0cpebAucFpY/3jhrwrVGuxU2uQFCHjU19SJfje0yQvi+rVWdq78hR5lig==",
"requires": {
"bignumber.js": "9.0.0",
"readable-stream": "2.3.7",
"safe-buffer": "5.1.2",
"sqlstring": "2.3.1"
},
"dependencies": {
"readable-stream": {
"version": "2.3.7",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
"integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
"isarray": "~1.0.0",
"process-nextick-args": "~2.0.0",
"safe-buffer": "~5.1.1",
"string_decoder": "~1.1.1",
"util-deprecate": "~1.0.1"
}
},
"safe-buffer": {
"version": "5.1.2",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
},
"string_decoder": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
"requires": {
"safe-buffer": "~5.1.0"
}
}
}
},
"negotiator": { "negotiator": {
"version": "0.6.3", "version": "0.6.3",
"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
@ -3394,6 +3522,11 @@
"resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
"integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==" "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A=="
}, },
"process-nextick-args": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
},
"promise-inflight": { "promise-inflight": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
@ -3486,9 +3619,9 @@
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
}, },
"semver": { "semver": {
"version": "7.3.8", "version": "7.5.4",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
"integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
"requires": { "requires": {
"lru-cache": "^6.0.0" "lru-cache": "^6.0.0"
} }
@ -3601,9 +3734,9 @@
} }
}, },
"sqlite3": { "sqlite3": {
"version": "5.1.4", "version": "5.1.6",
"resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-5.1.4.tgz", "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-5.1.6.tgz",
"integrity": "sha512-i0UlWAzPlzX3B5XP2cYuhWQJsTtlMD6obOa1PgeEQ4DHEXUuyJkgv50I3isqZAP5oFc2T8OFvakmDh2W6I+YpA==", "integrity": "sha512-olYkWoKFVNSSSQNvxVUfjiVbz3YtBwTJj+mfV5zpHmqW3sELx2Cf4QCdirMelhM5Zh+KDVaKgQHqCxrqiWHybw==",
"requires": { "requires": {
"@mapbox/node-pre-gyp": "^1.0.0", "@mapbox/node-pre-gyp": "^1.0.0",
"node-addon-api": "^4.2.0", "node-addon-api": "^4.2.0",
@ -3611,6 +3744,11 @@
"tar": "^6.1.11" "tar": "^6.1.11"
} }
}, },
"sqlstring": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.1.tgz",
"integrity": "sha512-ooAzh/7dxIG5+uDik1z/Rd1vli0+38izZhGzSa34FwR7IbelPWCCKSNIl8jlL/F7ERvy8CB2jNeM1E9i9mXMAQ=="
},
"ssri": { "ssri": {
"version": "8.0.1", "version": "8.0.1",
"resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",

1
package.json
View File

@ -17,6 +17,7 @@
"fs": "^0.0.1-security", "fs": "^0.0.1-security",
"http-errors": "^2.0.0", "http-errors": "^2.0.0",
"morgan": "^1.10.0", "morgan": "^1.10.0",
"mysql": "^2.18.1",
"path": "^0.12.7", "path": "^0.12.7",
"sqlite3": "^5.1.4" "sqlite3": "^5.1.4"
} }

41
public/javascript/login.js
View File

@ -1,12 +1,12 @@
// Get the cookie string // Get the cookie string
const cookieString = document.cookie; const cookieString = document.cookie;
// Parse the cookie string and extract the values // Parse the cookie string and extract the values
const cookies = cookieString.split(';'); const cookies = cookieString.split(';');
let ext_id, luid; let ext_id, luid;
for (let i = 0; i < cookies.length; i++) { for (let i = 0; i < cookies.length; i++) {
const cookie = cookies[i].trim(); const cookie = cookies[i].trim();
const cookieParts = cookie.split('='); const cookieParts = cookie.split('=');
@ -17,19 +17,19 @@
if (cookieParts[0] === 'luid') { if (cookieParts[0] === 'luid') {
luid = cookieParts[1]; luid = cookieParts[1];
} }
} }
// Sends user to User Page if already signed in // Sends user to User Page if already signed in
if (ext_id && luid) { if (ext_id && luid) {
console.log(`User Data Detected, sending to user page.`); console.log(`User Data Detected, sending to user page.`);
window.location = "/user"; window.location = "/user";
} else { } else {
console.log('User Data Not Detected! Please Sign In.'); console.log('User Data Not Detected! Please Sign In.');
} }
const form = document.getElementById("myForm"); const form = document.getElementById("myForm");
form.addEventListener("submit", function(event) { form.addEventListener("submit", function (event) {
event.preventDefault(); // Prevent the default form submission behavior event.preventDefault(); // Prevent the default form submission behavior
const input = document.getElementsByName("myInput")[0].value; const input = document.getElementsByName("myInput")[0].value;
@ -48,24 +48,27 @@
.then(response => response.json()) .then(response => response.json())
.then(data => { .then(data => {
console.log(data) console.log(data)
let releventData = { let releventData = {
luid: data.data.luid, luid: data.data.luid || data.data.access_code,
ext_id: data.data.ext_id ext_id: data.data.ext_id
} }
console.log(releventData) console.log(releventData)
// Set the cookie expiration to 7 days from now // Set the cookie expiration to 7 days from now
const expirationDate = new Date(Date.now() + 7 * 24 * 60 * 60 * 1000); const expirationDate = new Date(Date.now() + 7 * 24 * 60 * 60 * 1000);
// Set the ext_id cookie // Set the ext_id cookie
document.cookie = `ext_id=${data.data.ext_id}; expires=${expirationDate.toUTCString()}`; document.cookie = `ext_id=${releventData.ext_id}; expires=${expirationDate.toUTCString()}`;
// Set the luid cookie // Set the luid cookie
document.cookie = `luid=${data.data.luid}; expires=${expirationDate.toUTCString()}`; document.cookie = `luid=${releventData.luid}; expires=${expirationDate.toUTCString()}`;
console.log(data.data.id) console.log(data.data.id)
// Set the aime_card_id cookie // Set the aime_card_id cookie
if (window.serverType === 0) {
document.cookie = `aime_card_id=${data.data.id.toString()}; expires=${expirationDate.toUTCString()}`; document.cookie = `aime_card_id=${data.data.id.toString()}; expires=${expirationDate.toUTCString()}`;
} else {
document.cookie = `aime_card_id=${data.data.user.toString()}; expires=${expirationDate.toUTCString()}`;
}
// Set the cookie // Set the cookie
window.location = "/user"; window.location = "/user";
}) })
.catch(error => console.error(error)); .catch(error => console.error(error));
}); });

20
public/javascript/user.js
View File

@ -104,7 +104,7 @@ async function getReleventInformationMap(mapData, mapid) {
// Ban Check lmao // Ban Check lmao
if (userdata.ban_state !== 0) { if (userdata.ban_state === 2 ||userdata.banState === 2) {
//nice //nice
const parent = document.getElementById("User"); const parent = document.getElementById("User");
const wrapperDiv = document.createElement("div"); const wrapperDiv = document.createElement("div");
@ -135,7 +135,7 @@ if (userdata.ban_state !== 0) {
// Check if the user image element exists // Check if the user image element exists
if (userdata.icon_id === 10) { if (userdata.icon_id === 10 || userdata.iconId === 10) {
const userImage = document.getElementById('user-image'); const userImage = document.getElementById('user-image');
userImage.src = "images/" + ext_id + '-up.jpg'; userImage.src = "images/" + ext_id + '-up.jpg';
} else if (document.currentScript.getAttribute('data-userdata')) { } else if (document.currentScript.getAttribute('data-userdata')) {
@ -201,6 +201,7 @@ async function userPlayLogFormatter(div, loadMoreButton) {
} }
// Get the user's play log data and music IDs. // Get the user's play log data and music IDs.
console.log(UserPlayLogData)
const musicIds = UserPlayLogData.map(score => score.music_id); const musicIds = UserPlayLogData.map(score => score.music_id);
const musicData = await musicMetadata(); const musicData = await musicMetadata();
@ -209,7 +210,7 @@ async function userPlayLogFormatter(div, loadMoreButton) {
for (let i = UserPlayLogData.length - 1; i >= 0; i--) { for (let i = UserPlayLogData.length - 1; i >= 0; i--) {
const scoreDiv = document.createElement('div'); // Create a Div const scoreDiv = document.createElement('div'); // Create a Div
let score = JSON.parse(JSON.stringify(UserPlayLogData[i])); // get score data let score = JSON.parse(JSON.stringify(UserPlayLogData[i])); // get score data
let song = await getReleventInformation(musicData, score.music_id) // get song data let song = await getReleventInformation(musicData, score.music_id || score.musicId) // get song data
if (song === null) { if (song === null) {
continue continue
} }
@ -217,7 +218,7 @@ async function userPlayLogFormatter(div, loadMoreButton) {
if (!song || !song.name) { // if a song can't be found, skip it and increment the error counter by 1. if (!song || !song.name) { // if a song can't be found, skip it and increment the error counter by 1.
console.log(song) console.log(song)
console.log(score.music_id) console.log(score.music_id || score.musicId)
console.log("Song or title is undefined"); console.log("Song or title is undefined");
errorIncrement++ errorIncrement++
continue; continue;
@ -225,7 +226,7 @@ async function userPlayLogFormatter(div, loadMoreButton) {
scoreDiv.innerHTML = ` scoreDiv.innerHTML = `
<div class="score-title"> <div class="score-title">
<h4>${song.name.str} || ${new Date(score.user_play_date)}</h4> <h4>${song.name.str} || ${new Date(score.user_play_date||score.userPlayDate)}</h4>
</div> </div>
`; `;
/* Score Jacket Image */ /* Score Jacket Image */
@ -236,7 +237,7 @@ async function userPlayLogFormatter(div, loadMoreButton) {
}); });
scoreJacketDiv.classList.add('score-jacket'); scoreJacketDiv.classList.add('score-jacket');
jacket.classList.add('score-jacket'); jacket.classList.add('score-jacket');
jacket.src = "assets/jacket/UI_Jacket_" + padNumber(Number(score.music_id), 6) + '.png'; jacket.src = "assets/jacket/UI_Jacket_" + padNumber(Number(score.music_id||score.musicId), 6) + '.png';
scoreJacketDiv.append(jacket) scoreJacketDiv.append(jacket)
scoreDiv.append(scoreJacketDiv) scoreDiv.append(scoreJacketDiv)
@ -255,7 +256,7 @@ async function userPlayLogFormatter(div, loadMoreButton) {
const scoreGradeDiv = document.createElement('div'); const scoreGradeDiv = document.createElement('div');
scoreGradeDiv.classList.add('score-grade'); scoreGradeDiv.classList.add('score-grade');
let scoreGrade = document.createElement('h4'); let scoreGrade = document.createElement('h4');
scoreGrade.textContent = `${scoreGrades[score.score_rank]}`; scoreGrade.textContent = `${scoreGrades[score.score_rank||score.scoreRank]}`;
scoreGradeDiv.append(scoreGrade); scoreGradeDiv.append(scoreGrade);
scoreDiv.append(scoreGradeDiv); scoreDiv.append(scoreGradeDiv);
@ -295,9 +296,6 @@ async function userPlayLogFormatter(div, loadMoreButton) {
} }
// If there are no more scores to load, hide the "Load More" button. // If there are no more scores to load, hide the "Load More" button.
if (startIndex + scoreIncrement >= UserPlayLogData.length) {
loadMoreButton.style.display = "none";
}
} }
/* User Area Status Renderer */ /* User Area Status Renderer */
@ -309,7 +307,7 @@ async function userAreaStatusFormatter(div) {
let areaWrapper = document.createElement('div'); // create the Wrapper Div let areaWrapper = document.createElement('div'); // create the Wrapper Div
for (let i = UserAreaData.length - 1; i >= 0; i--) { for (let i = UserAreaData.length - 1; i >= 0; i--) {
const area = UserAreaData[i]; // get the area const area = UserAreaData[i]; // get the area
const mapInfo = await getReleventInformationMap(mapMetadata, area.map_id); // get the relevent Map Information const mapInfo = await getReleventInformationMap(mapMetadata, area.map_id||area.mapId); // get the relevent Map Information
console.log(mapInfo) console.log(mapInfo)
if(!mapInfo) continue // continue if mapInfo cant be found for a map if(!mapInfo) continue // continue if mapInfo cant be found for a map
const areaGrid = document.createElement('div'); // create the Grid for the area inforrmation to go const areaGrid = document.createElement('div'); // create the Grid for the area inforrmation to go

2
readme.md
View File

@ -45,7 +45,7 @@ Create a `config.json` file and paste this in, with paths to your instance.
"ArtConnSettings": { "ArtConnSettings": {
"host":"192.168.smt.hng", "host":"192.168.smt.hng",
"user":"MaiDXNet", "user":"MaiDXNet",
"pass":"aSecurePassword" "password":"aSecurePassword"
}, },
"imageFolder": "N:\\MaiMaiDXNet\\public\\images" "imageFolder": "N:\\MaiMaiDXNet\\public\\images"
} }

4
routes/api.js
View File

@ -11,7 +11,7 @@ var {getExtId,getUserArea,getUserScores,getUserUnbanned,getUserBanned, getUserDa
res.status(200).json({ data: mUser, status: "Complete" }); res.status(200).json({ data: mUser, status: "Complete" });
}, },
(reason) => { (reason) => {
res.status(500).json({ error: err.message, status: "Failed" }); res.status(500).json({ error: reason, status: "Failed" });
console.error(reason); // Error! console.error(reason); // Error!
}, },
); );
@ -23,7 +23,7 @@ var {getExtId,getUserArea,getUserScores,getUserUnbanned,getUserBanned, getUserDa
res.status(200).json({ data: mUser, status: "Complete" }); res.status(200).json({ data: mUser, status: "Complete" });
}, },
(reason) => { (reason) => {
res.status(500).json({ error: err.message, status: "Failed" }); res.status(500).json({ error: reason, status: "Failed" });
console.error(reason); // Error! console.error(reason); // Error!
}, },
); );

7
routes/index.js
View File

@ -6,12 +6,13 @@ var { getUserCount, getUserData } = require("../dbhandler.js");
/* GET home page. */ /* GET home page. */
var title = 'MaiDXNet'; var title = 'MaiDXNet';
router.get('/', async function (req, res, next) { router.get('/', async function (req, res, next) {
var usersRegistered = await getUserCount().then( await getUserCount().then(
(userCount) => { (userCount) => {
var params = { var params = {
totalUsers: userCount // ToDo: Change this to use the internal dbhandler api totalUsers: userCount, // ToDo: Change this to use the internal dbhandler api
serverType: config.serverType
}; };
console.log(`Recived User Count:`+userCount) console.log(`Recived User Count:`+userCount);
res.render('index', { title: title, params: params }); res.render('index', { title: title, params: params });
}, },
(reason) => { (reason) => {

17
views/index.ejs
View File

@ -1,9 +1,18 @@
<% var rootPath='../' ; %> <% var rootPath='../' ; %>
<%- include(rootPath + 'templates/header.ejs' ); %> <%- include(rootPath + 'templates/header.ejs' ); %>
<% if (params.serverType===0) { %>
<script>
window.serverType = 0;
</script>
<% } else { %>
<script>
window.serverType = 1;
</script>
<% } %>
<div id="loginContent"> <div id="loginContent">
<h1>MaiDXNet</h1> <h1>MaiDXNet</h1>
<h5>Total Users Registered: <%= params.totalUsers %></h5> <h5>Total Users Registered: <%= params.totalUsers %>
</h5>
<h4>Please Input your 20 Digit Access Code.</h4> <h4>Please Input your 20 Digit Access Code.</h4>
<form id="myForm"> <form id="myForm">
<input type="text" name="myInput" minlength="20" maxlength="20" placeholder="0000011111222223333344444" required> <input type="text" name="myInput" minlength="20" maxlength="20" placeholder="0000011111222223333344444" required>
@ -17,7 +26,9 @@
</h4> </h4>
<h5> <h5>
- Site Is Not Complete<br> - Site Is Not Complete<br>
- Unfortunatly Some Song Jackets Cannot be found, which will lead certain lisenced and original songs to load without their jackets when checking your play log. - Unfortunatly Some Song Jackets Cannot be found, which will lead certain lisenced and original songs to
load without their jackets when checking your play log. <br>
- Artemis does not Support Memorial Photos, though that is coming.
</h5> </h5>
</div> </div>
</body> </body>

25
views/user.ejs
View File

@ -3,8 +3,25 @@
<% function normalizeText(text) { return text .normalize('NFD') .replace(/[\u0300-\u036f]/g, '' <% function normalizeText(text) { return text .normalize('NFD') .replace(/[\u0300-\u036f]/g, ''
).replace(/[\uFF01-\uFF5E]/g, function(ch) { return String.fromCharCode(ch.charCodeAt(0) - 0xFEE0); }); } %> ).replace(/[\uFF01-\uFF5E]/g, function(ch) { return String.fromCharCode(ch.charCodeAt(0) - 0xFEE0); }); } %>
<link href="/stylesheets/user.css" rel="stylesheet" type="text/css"> <link href="/stylesheets/user.css" rel="stylesheet" type="text/css">
<%
// set parameters correctly for either aqua format or Artemis format
var user = {};
if(userdata.user_name !== undefined) {
user = {
user_name: userdata.user_name,
music_rating: userdata.music_rating,
total_awake: userdata.total_awake
}
} else {
user = {
user_name: userdata.userName,
music_rating: userdata.musicRating,
total_awake: userdata.totalAwake
}
}
%>
<div id="User"> <div id="User">
<h1>Yo! Welcome Back <%= normalizeText(userdata.user_name) %>!</h1> <h1>Yo! Welcome Back <%= normalizeText(user.user_name) %>!</h1>
<div id="wrapper"> <div id="wrapper">
<!-- Calm before the storm --> <!-- Calm before the storm -->
@ -26,14 +43,14 @@
<h4 id="user-title-text"></h4> <h4 id="user-title-text"></h4>
</div> </div>
<div class="user-name"> <div class="user-name">
<h4><%= normalizeText(userdata.user_name) %></h4> <h4><%= normalizeText(user.user_name) %></h4>
</div> </div>
<div class="dx-rating"> <div class="dx-rating">
<h4><%= userdata.music_rating%></h4> <h4><%= user.music_rating%></h4>
</div> </div>
<div class="user-class"></div> <div class="user-class"></div>
<div class="awakens"> <div class="awakens">
<h4>★ ☓<%= userdata.total_awake%></h4> <h4>★ ☓<%= user.total_awake%></h4>
</div> </div>
</div><!-- This is just one nested div, Trmazi it's going to get a lot worse from here on. --> </div><!-- This is just one nested div, Trmazi it's going to get a lot worse from here on. -->
<div data-content="content-2" id="user-play-data" class="hidden"> <div data-content="content-2" id="user-play-data" class="hidden">