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

Cleanup

Browse Source
This commit is contained in:
Vortrex
2022-06-14 17:32:37 -05:00
parent 7e7f729997
commit dbde2ed35f
1 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
scripts/server/messaging.js
View File

@@ -16,7 +16,7 @@ function initMessagingScript() {
function announceAdminAction(localeString, ...args) { function announceAdminAction(localeString, ...args) {
let clients = getClients(); let clients = getClients();
for(let i in clients) { for (let i in clients) {
let argsArray = [clients[i], localeString]; let argsArray = [clients[i], localeString];
argsArray = argsArray.concat(args); argsArray = argsArray.concat(args);
let messageText = getLocaleString.apply(null, argsArray); let messageText = getLocaleString.apply(null, argsArray);
@@ -61,8 +61,8 @@ function messageAdmins(messageText, colour = getColourByName("softRed")) {
//logToConsole(LOG_WARN, `🛡️ ${plainMessage}`); //logToConsole(LOG_WARN, `🛡️ ${plainMessage}`);
let clients = getClients(); let clients = getClients();
for(let i in clients) { for (let i in clients) {
if(doesPlayerHaveStaffPermission(clients[i], getStaffFlagValue("BasicModeration"))) { if (doesPlayerHaveStaffPermission(clients[i], getStaffFlagValue("BasicModeration"))) {
messagePlayerNormal(clients[i], `🛡️ ${messageText}`, colour); messagePlayerNormal(clients[i], `🛡️ ${messageText}`, colour);
} }
} }
@@ -74,12 +74,12 @@ function messageAdmins(messageText, colour = getColourByName("softRed")) {
// =========================================================================== // ===========================================================================
function messagePlayerError(client, messageText) { function messagePlayerError(client, messageText) {
if(isConsole(client)) { if (isConsole(client)) {
logToConsole(LOG_INFO, `❌ ${messageText}`); logToConsole(LOG_INFO, `❌ ${messageText}`);
return true; return true;
} }
if(!isClientFromDiscord(client)) { if (!isClientFromDiscord(client)) {
messagePlayerNormal(client, `❌ ${messageText}`, getColourByName("white")); messagePlayerNormal(client, `❌ ${messageText}`, getColourByName("white"));
} else { } else {
messageDiscordUser(client, `❌ ${messageText}`); messageDiscordUser(client, `❌ ${messageText}`);
@@ -89,12 +89,12 @@ function messagePlayerError(client, messageText) {
// =========================================================================== // ===========================================================================
function messagePlayerSyntax(client, messageText) { function messagePlayerSyntax(client, messageText) {
if(isConsole(client)) { if (isConsole(client)) {
logToConsole(LOG_INFO, `⌨️ ${messageText}`); logToConsole(LOG_INFO, `⌨️ ${messageText}`);
return true; return true;
} }
if(!isClientFromDiscord(client)) { if (!isClientFromDiscord(client)) {
messagePlayerNormal(client, `⌨️ USAGE: {MAINCOLOUR} ${messageText}`, getColourByType("syntaxMessage")); messagePlayerNormal(client, `⌨️ USAGE: {MAINCOLOUR} ${messageText}`, getColourByType("syntaxMessage"));
} else { } else {
messageDiscordUser(client, `⌨️ ${messageText}`); messageDiscordUser(client, `⌨️ ${messageText}`);
@@ -104,12 +104,12 @@ function messagePlayerSyntax(client, messageText) {
// =========================================================================== // ===========================================================================
function messagePlayerAlert(client, messageText) { function messagePlayerAlert(client, messageText) {
if(isConsole(client)) { if (isConsole(client)) {
logToConsole(LOG_INFO, `⚠️ ${messageText}`); logToConsole(LOG_INFO, `⚠️ ${messageText}`);
return true; return true;
} }
if(!isClientFromDiscord(client)) { if (!isClientFromDiscord(client)) {
messagePlayerNormal(client, `⚠️ ${messageText}`, getColourByName("white")); messagePlayerNormal(client, `⚠️ ${messageText}`, getColourByName("white"));
} else { } else {
messageDiscordUser(client, `⚠️ ${messageText}`); messageDiscordUser(client, `⚠️ ${messageText}`);
@@ -119,12 +119,12 @@ function messagePlayerAlert(client, messageText) {
// =========================================================================== // ===========================================================================
function messagePlayerSuccess(client, messageText) { function messagePlayerSuccess(client, messageText) {
if(isConsole(client)) { if (isConsole(client)) {
logToConsole(LOG_INFO, `✔️ ${messageText}`); logToConsole(LOG_INFO, `✔️ ${messageText}`);
return true; return true;
} }
if(!isClientFromDiscord(client)) { if (!isClientFromDiscord(client)) {
messagePlayerNormal(client, `✔️ ${messageText}`, getColourByName("white")); messagePlayerNormal(client, `✔️ ${messageText}`, getColourByName("white"));
} else { } else {
messageDiscordUser(client, `✔️ ${messageText}`); messageDiscordUser(client, `✔️ ${messageText}`);
@@ -134,12 +134,12 @@ function messagePlayerSuccess(client, messageText) {
// =========================================================================== // ===========================================================================
function messagePlayerInfo(client, messageText) { function messagePlayerInfo(client, messageText) {
if(isConsole(client)) { if (isConsole(client)) {
logToConsole(LOG_INFO, `ℹ️ ${messageText}`); logToConsole(LOG_INFO, `ℹ️ ${messageText}`);
return true; return true;
} }
if(!isClientFromDiscord(client)) { if (!isClientFromDiscord(client)) {
messagePlayerNormal(client, `ℹ️ ${messageText}`, getColourByName("white")); messagePlayerNormal(client, `ℹ️ ${messageText}`, getColourByName("white"));
} else { } else {
messageDiscordUser(client, `:information_source: ${messageText}`); messageDiscordUser(client, `:information_source: ${messageText}`);
@@ -149,12 +149,12 @@ function messagePlayerInfo(client, messageText) {
// =========================================================================== // ===========================================================================
function messagePlayerTip(client, messageText) { function messagePlayerTip(client, messageText) {
if(isConsole(client)) { if (isConsole(client)) {
logToConsole(LOG_INFO, `ℹ️ ${messageText}`); logToConsole(LOG_INFO, `ℹ️ ${messageText}`);
return true; return true;
} }
if(!isClientFromDiscord(client)) { if (!isClientFromDiscord(client)) {
messagePlayerNormal(client, `ℹ️ ${messageText}`, getColourByName("white")); messagePlayerNormal(client, `ℹ️ ${messageText}`, getColourByName("white"));
} else { } else {
messageDiscordUser(client, `:information_source: ${messageText}`); messageDiscordUser(client, `:information_source: ${messageText}`);
@@ -188,7 +188,7 @@ function messagePlayerShout(client, shoutingClient, messageText) {
// =========================================================================== // ===========================================================================
function messagePlayerDoAction(client, doingActionClient, messageText) { function messagePlayerDoAction(client, doingActionClient, messageText) {
if(!isClientFromDiscord(client)) { if (!isClientFromDiscord(client)) {
messagePlayerNormal(client, `${messageText} * (${getClientSubAccountName(doingActionClient)})`, getColourByType("doActionMessage")); messagePlayerNormal(client, `${messageText} * (${getClientSubAccountName(doingActionClient)})`, getColourByType("doActionMessage"));
} }
} }
@@ -214,7 +214,7 @@ function messagePlayerAdminChat(client, adminChattingClient, messageText) {
// =========================================================================== // ===========================================================================
function messagePlayerNewbieTip(client, message) { function messagePlayerNewbieTip(client, message) {
if(!hasBitFlag(getPlayerData(client).accountData.settings, getAccountSettingsFlagValue("NoActionTips"))) { if (!hasBitFlag(getPlayerData(client).accountData.settings, getAccountSettingsFlagValue("NoActionTips"))) {
messagePlayerNormal(client, `💡 ${message}`); messagePlayerNormal(client, `💡 ${message}`);
} }
} }
@@ -222,8 +222,8 @@ function messagePlayerNewbieTip(client, message) {
// =========================================================================== // ===========================================================================
function messagePlayerTimedRandomTip(client, message) { function messagePlayerTimedRandomTip(client, message) {
if(isPlayerLoggedIn(client) && isPlayerSpawned(client)) { if (isPlayerLoggedIn(client) && isPlayerSpawned(client)) {
if(!hasBitFlag(getPlayerData(client).accountData.settings, getAccountSettingsFlagValue("NoRandomTips"))) { if (!hasBitFlag(getPlayerData(client).accountData.settings, getAccountSettingsFlagValue("NoRandomTips"))) {
messagePlayerNormal(client, `💡 ${message}`); messagePlayerNormal(client, `💡 ${message}`);
} }
} }
@@ -233,7 +233,7 @@ function messagePlayerTimedRandomTip(client, message) {
function makeChatBoxSectionHeader(name) { function makeChatBoxSectionHeader(name) {
let resultString = `{clanOrange}== {jobYellow}${name} `; let resultString = `{clanOrange}== {jobYellow}${name} `;
let endFiller = fillStringWithCharacter("=", getGlobalConfig().chatSectionHeaderLength-resultString.length); let endFiller = fillStringWithCharacter("=", getGlobalConfig().chatSectionHeaderLength - resultString.length);
return `${resultString} {clanOrange}${endFiller}`; return `${resultString} {clanOrange}${endFiller}`;
} }
@@ -241,7 +241,7 @@ function makeChatBoxSectionHeader(name) {
function clearChatBox(client) { function clearChatBox(client) {
//game.messages.clear(); //game.messages.clear();
for(let i = 0; i <= 20; i++) { for (let i = 0; i <= 20; i++) {
messageClient(" ", client, COLOUR_WHITE); messageClient(" ", client, COLOUR_WHITE);
} }
} }
@@ -255,8 +255,8 @@ function messagePlayerHelpContent(client, messageString) {
// =========================================================================== // ===========================================================================
function messagePlayersInRace(raceId, message) { function messagePlayersInRace(raceId, message) {
for(let i in clients) { for (let i in clients) {
if(getPlayerRace(clients[i]) == raceId) { if (getPlayerRace(clients[i]) == raceId) {
messagePlayerNormal(clients[i], message); messagePlayerNormal(clients[i], message);
} }
} }