Ratstail91/SANCTUM
1
0
Fork 0
mirror of https://github.com/Ratstail91/SANCTUM.git synced 2025-11-29 02:24:27 +11:00
Code Issues Packages Projects Releases Wiki Activity

Shared library can now search for IDs

Browse Source
This commit is contained in:
Kayne Ruse
2018-10-22 17:51:37 +11:00
parent 3f06204ff5
commit c82bb6d65b
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Shared/factions.js
View File

@@ -36,20 +36,20 @@ exports.GetFactionName = function(factionRole) {
//GetFactionChannel //GetFactionChannel
//user - discord.js user //user - discord.js user
exports.GetFactionChannel = function(user) { exports.GetFactionChannel = function(factionRole) {
//factionRole must be a faction role //factionRole must be a faction role
if (!exports.CheckFaction(factionRole)) { if (!exports.CheckFaction(factionRole)) {
throw "factionRole is not a faction!"; throw "factionRole is not a faction!";
} }
if (user.roles.has(process.env.GROUP_A_ROLE)) { if (factionRole === process.env.GROUP_A_ROLE) {
return process.env.GROUP_A_BOT_ID; return process.env.GROUP_A_CHANNEL_ID;
} }
if (user.roles.has(process.env.GROUP_B_ROLE)) { if (factionRole === process.env.GROUP_B_ROLE) {
return process.env.GROUP_B_BOT_ID; return process.env.GROUP_B_CHANNEL_ID;
} }
if (user.roles.has(process.env.GROUP_C_ROLE)) { if (factionRole === process.env.GROUP_C_ROLE) {
return process.env.GROUP_C_BOT_ID; return process.env.GROUP_C_CHANNEL_ID;
} }
} }
@@ -66,13 +66,13 @@ exports.ChangeFaction = async function(client, factionRole, channel, member) {
//handle channel strings //handle channel strings
if (typeof(channel) === "string") { if (typeof(channel) === "string") {
channel = client.channels.find(item => item.name === channel); channel = client.channels.find(item => item.name === channel || item.id === channel);
} }
//handle member strings //handle member strings
if (typeof(member) === "string") { if (typeof(member) === "string") {
//get the member //get the member
let user = client.users.find(item => item.username === member); let user = client.users.find(item => item.username === member || item.id === member);
let guild = client.guilds.get(process.env.SANCTUM_ID); let guild = client.guilds.get(process.env.SANCTUM_ID);
member = guild.members.get(user.id); member = guild.members.get(user.id);
} }

6
Shared/messaging.js
View File

@@ -17,7 +17,7 @@ exports.SendPublicMessage = function(client, user, channel, message, typingDelay
//handle user strings //handle user strings
if (typeof(user) === "string") { if (typeof(user) === "string") {
user = client.users.find(item => item.username === user); user = client.users.find(item => item.username === user || item.id === user);
if (!user) { if (!user) {
throw "Can't find that user"; throw "Can't find that user";
} }
@@ -25,7 +25,7 @@ exports.SendPublicMessage = function(client, user, channel, message, typingDelay
//handle channel strings //handle channel strings
if (typeof(channel) === "string") { if (typeof(channel) === "string") {
channel = client.channels.find(item => item.name === channel); channel = client.channels.find(item => item.name === channel || item.id === channel);
if (!channel) { if (!channel) {
throw "Can't find that channel"; throw "Can't find that channel";
} }
@@ -55,7 +55,7 @@ exports.SendPublicMessage = function(client, user, channel, message, typingDelay
exports.SendPrivateMessage = function(client, user, message) { exports.SendPrivateMessage = function(client, user, message) {
//handle user strings //handle user strings
if (typeof(user) === "string") { if (typeof(user) === "string") {
user = client.users.find(item => item.username === user); user = client.users.find(item => item.username === user || item.id === user);
} }
user.send(message); user.send(message);

6
Shared/progression.js
View File

@@ -9,7 +9,7 @@ const dataRequest = require('../modules/dataRequest');
exports.AddXP = function(client, user, amount) { exports.AddXP = function(client, user, amount) {
//handle user strings //handle user strings
if (typeof(user) === "string") { if (typeof(user) === "string") {
user = client.users.find(item => item.username === user); user = client.users.find(item => item.username === user || item.id === user);
} }
dataRequest.sendServerData("addXP", amount, user.id); dataRequest.sendServerData("addXP", amount, user.id);
@@ -22,7 +22,7 @@ exports.LevelUp = function(client, member) { //NOTE: why is this called separate
//handle member strings //handle member strings
if (typeof(member) === "string") { if (typeof(member) === "string") {
//get the member //get the member
let user = client.users.find(item => item.username === member); let user = client.users.find(item => item.username === member || item.id === member);
let guild = client.guilds.get(process.env.SANCTUM_ID); let guild = client.guilds.get(process.env.SANCTUM_ID);
member = guild.members.get(user.id); member = guild.members.get(user.id);
} }
@@ -59,7 +59,7 @@ exports.RankUp = async function(client, member, level) {
//handle member strings //handle member strings
if (typeof(member) === "string") { if (typeof(member) === "string") {
//get the member //get the member
let user = client.users.find(item => item.username === member); let user = client.users.find(item => item.username === member || item.id === member);
member = guild.members.get(user.id); member = guild.members.get(user.id);
} }

6
Shared/utility.js
View File

@@ -78,7 +78,7 @@ exports.FormatMSS = function(s){
exports.IsAdmin = function(client, user) { exports.IsAdmin = function(client, user) {
//handle user strings //handle user strings
if (typeof(user) === "string") { if (typeof(user) === "string") {
user = client.users.find(item => item.username === user); user = client.users.find(item => item.username === user || item.id === user);
} }
let guild = client.guilds.get(process.env.SANCTUM_ID); let guild = client.guilds.get(process.env.SANCTUM_ID);
@@ -107,14 +107,14 @@ exports.CheckValidDisplay = function(client, member, channel, checkRole) { //See
//handle member strings //handle member strings
if (typeof(member) === "string") { if (typeof(member) === "string") {
//get the member //get the member
let user = client.users.find(item => item.username === member); let user = client.users.find(item => item.username === member || item.id === member);
let guild = client.guilds.get(process.env.SANCTUM_ID); let guild = client.guilds.get(process.env.SANCTUM_ID);
member = guild.members.get(user.id); member = guild.members.get(user.id);
} }
//handle channel strings //handle channel strings
if (typeof(channel) === "string") { if (typeof(channel) === "string") {
channel = client.channels.find(item => item.name === channel); channel = client.channels.find(item => item.name === channel || item.id === channel);
} }
switch(client.user.username) { switch(client.user.username) {