Working the modules into Shared, untested

Shared/calc_random.js

@@ -0,0 +1,17 @@
+//initialize the exports
+exports = module.exports = {};
+
+//Random
+//low - the inclusive lower bounds of the result
+//high - the inclusive higher bounds of the result
+exports.Random = function(low, high) {
+	//inclusive high
+	return Math.floor(Math.random() * (high - low + 1) + low);
+}
+
+//Gamble (depreciated)
+//percentage - chance of winning as a percentage
+exports.Gamble = function(percentage) {
+	// Random generation by %
+	return exports.Random(1, 100) <= percentage;
+}

Shared/data_request.js

@@ -0,0 +1,15 @@
+//initialize the exports
+exports = module.exports = {};
+
+require("dotenv").config({path: "../.env"});
+let request = require("sync-request");
+
+exports.LoadServerData = function(dataType, usersID = "") {
+	let response = request("GET", `${process.env.SERVER_ADDRESS}/getData.php?pk=${process.env.SERVER_PASS_KEY}&dataType=${dataType}&userid=${usersID}`);
+	return response.getBody();
+}
+
+exports.SendServerData = function(dataType, usersID = "", dataToSend="", dataToSend2 = ""){
+	let response = request("GET", `${process.env.SERVER_ADDRESS}/sendData.php?pk=${process.env.SERVER_PASS_KEY}&dataType=${dataType}&userid=${usersID}&dataToSend=${dataToSend}&dataToSend2=${dataToSend2}`);
+	return response.getBody();
+}

Shared/factions.js

@@ -1,8 +1,8 @@
 //initialize the exports
 exports = module.exports = {};
 
-dataRequest = require("../modules/dataRequest");
-messaging = require("./messaging");
+let dataRequest = require("./data_request");
+let messaging = require("./messaging");
 
 //CheckFaction
 //factionRole - the value to check
@@ -82,13 +82,13 @@ exports.ChangeFaction = async function(client, factionRole, channel, member) {
 		return "alreadyJoined";
 	}
 
-	if (dataRequest.loadServerData("hasConvertedToday", member.user.id) == 1) {
+	if (dataRequest.LoadServerData("hasConvertedToday", member.user.id) == 1) {
 		//can't change too fast
 		return "hasConvertedToday";
 	}
 
 	//Creates a new user
-	var newUserResponse = String(dataRequest.sendServerData("newUser", "New user.", member.user.id));
+	var newUserResponse = String(dataRequest.SendServerData("newUser", member.user.id, "New user."));
 
 	//joins the new faction
 	await member.removeRole(process.env.GROUP_A_ROLE);
@@ -97,7 +97,7 @@ exports.ChangeFaction = async function(client, factionRole, channel, member) {
 	await member.addRole(factionRole);
 
 	//send the server the info (for logging)
-	dataRequest.sendServerData("conversion", "Converted to " + exports.GetFactionName(factionRole), member.user.id);
+	dataRequest.SendServerData("conversion", member.user.id, "Converted to " + exports.GetFactionName(factionRole));
 
 	if (newUserResponse === "createdUser") {
 		//send the private welcoming message

Shared/progression.js

@@ -1,6 +1,6 @@
 exports = module.exports = {};
 
-const dataRequest = require('../modules/dataRequest');
+let dataRequest = require('./data_request');
 
 //AddXP
 //client - discord.js client
@@ -12,7 +12,7 @@ exports.AddXP = function(client, user, amount) {
 		user = client.users.find(item => item.username === user || item.id === user);
 	}
 
-	dataRequest.sendServerData("addXP", amount, user.id);
+	dataRequest.SendServerData("addXP", user.id, amount);
 }
 
 //LevelUp
@@ -32,7 +32,7 @@ exports.LevelUp = function(client, member) { //NOTE: why is this called separate
 	if (client.user.username == process.env.GROUP_B_LEADER_NAME && !member.roles.has(process.env.GROUP_B_ROLE)) return;
 	if (client.user.username == process.env.GROUP_C_LEADER_NAME && !member.roles.has(process.env.GROUP_C_ROLE)) return;
 
-	let response = String(dataRequest.sendServerData("getLevelUp", 0, member.user.id)); //TODO: please change the order of sendServerData's arguments!
+	let response = String(dataRequest.sendServerData("getLevelUp", member.user.id));
 	let responseArray = response.split(",");
 
 	let responseMessage = responseArray[0];

Shared/shared.js

@@ -1,6 +1,8 @@
 //initialize the exports
 exports = module.exports = {};
 
+exports = Object.assign(exports, require("./calc_random.js"));
+exports = Object.assign(exports, require("./data_request.js"));
 exports = Object.assign(exports, require("./factions.js"));
 exports = Object.assign(exports, require("./inventory.js"));
 exports = Object.assign(exports, require("./messaging.js"));