hamyack/GTA4RP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use from-discord util instead of manual check

Browse Source
This commit is contained in:
Vortrex
2020-12-16 08:14:26 -06:00
parent 44d4c4144c
commit 9e07c96ec2
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/server/messaging.js
View File

@@ -12,7 +12,9 @@
function messageAdminAction(messageText) { function messageAdminAction(messageText) {
message(`⚠️ ${messageText}`, getColourByName("orange")); message(`⚠️ ${messageText}`, getColourByName("orange"));
if(getServerConfig().discordEnabled) {
messageDiscord(`:warning: ${messageText}`); messageDiscord(`:warning: ${messageText}`);
}
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@@ -23,7 +25,7 @@ function messageClientNormal(client, messageText, colour = COLOUR_WHITE) {
return true; return true;
} }
if(client instanceof Client) { if(!isClientFromDiscord(client)) {
messageClient(`${messageText}`, client, colour); messageClient(`${messageText}`, client, colour);
} else { } else {
messageDiscordUser(client, `${messageText}`); messageDiscordUser(client, `${messageText}`);
@@ -38,7 +40,7 @@ function messageClientError(client, messageText) {
return true; return true;
} }
if(client instanceof Client) { if(!isClientFromDiscord(client)) {
messageClientNormal(client, `🚫 ${messageText}`, getColourByName("white")); messageClientNormal(client, `🚫 ${messageText}`, getColourByName("white"));
} else { } else {
messageDiscordUser(client, `:no_entry_sign: ${messageText}`); messageDiscordUser(client, `:no_entry_sign: ${messageText}`);
@@ -53,7 +55,7 @@ function messageClientSyntax(client, messageText) {
return true; return true;
} }
if(client instanceof Client) { if(!isClientFromDiscord(client)) {
messageClientNormal(client, `⌨️ USAGE: [#FFFFFF] ${messageText}`, getColourByType("syntaxMessage")); messageClientNormal(client, `⌨️ USAGE: [#FFFFFF] ${messageText}`, getColourByType("syntaxMessage"));
} else { } else {
messageDiscordUser(client, `:keyboard: ${messageText}`); messageDiscordUser(client, `:keyboard: ${messageText}`);
@@ -68,7 +70,7 @@ function messageClientAlert(client, messageText) {
return true; return true;
} }
if(client instanceof Client) { if(!isClientFromDiscord(client)) {
messageClientNormal(client, `⚠️ [#FFFFFF] ${messageText}`, getColourByName("white")); messageClientNormal(client, `⚠️ [#FFFFFF] ${messageText}`, getColourByName("white"));
} else { } else {
messageDiscordUser(client, `:warning: ${messageText}`); messageDiscordUser(client, `:warning: ${messageText}`);
@@ -83,7 +85,7 @@ function messageClientSuccess(client, messageText) {
return true; return true;
} }
if(client instanceof Client) { if(!isClientFromDiscord(client)) {
messageClientNormal(client, `👍 [#FFFFFF] ${messageText}`, getColourByName("white")); messageClientNormal(client, `👍 [#FFFFFF] ${messageText}`, getColourByName("white"));
} else { } else {
messageDiscordUser(client, `:thumbsup: ${messageText}`); messageDiscordUser(client, `:thumbsup: ${messageText}`);
@@ -98,7 +100,7 @@ function messageClientInfo(client, messageText) {
return true; return true;
} }
if(client instanceof Client) { if(!isClientFromDiscord(client)) {
messageClientNormal(client, `ℹ️ [#FFFFFF] ${messageText}`, getColourByName("white")); messageClientNormal(client, `ℹ️ [#FFFFFF] ${messageText}`, getColourByName("white"));
} else { } else {
messageDiscordUser(client, `:information_source: ${messageText}`); messageDiscordUser(client, `:information_source: ${messageText}`);
@@ -126,7 +128,7 @@ function messageClientShout(client, shoutingClient, messageText) {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function messageClientDoAction(client, doingActionClient, messageText) { function messageClientDoAction(client, doingActionClient, messageText) {
if(client instanceof Client) { if(!isClientFromDiscord(client)) {
messageClientNormal(client, `${messageText} * (${getClientSubAccountName(doingActionClient)})`, getColourByType("doActionMessage")); messageClientNormal(client, `${messageText} * (${getClientSubAccountName(doingActionClient)})`, getColourByType("doActionMessage"));
} }
} }