Skip to content

Commit 12608e7

Browse files
alexemanuelolalexemanuelol
committed
minor refactoring
1 parent dfc31a5 commit 12608e7

25 files changed

+245
-295
lines changed

‎eslint.config.mjs

+8-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@ export default defineConfig([
88
{ files: ["**/*.{js,mjs,cjs,ts}"] },
99
{ files: ["**/*.js"], languageOptions: { sourceType: "commonjs" } },
1010
{ files: ["**/*.{js,mjs,cjs,ts}"], languageOptions: { globals: globals.browser } },
11-
{ files: ["**/*.{js,mjs,cjs,ts}"], plugins: { js }, extends: ["js/recommended"] },
11+
{
12+
files: ["**/*.{js,mjs,cjs,ts}"],
13+
plugins: { js },
14+
extends: ["js/recommended"],
15+
rules: {
16+
"max-len": ["error", { code: 120 }]
17+
}
18+
},
1219
tseslint.configs.recommended,
1320
]);

‎src/discordEvents/channelDelete.ts

+2-5
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import * as discordjs from 'discord.js';
2222

2323
import { guildInstanceManager as gim, log } from '../../index';
2424
import { DiscordManager } from '../managers/discordManager';
25+
import { GuildInstance } from '../managers/guildInstanceManager';
2526

2627
export const name = 'channelDelete';
2728
export const once = false;
@@ -33,11 +34,7 @@ export async function execute(dm: DiscordManager, channel: discordjs.DMChannel |
3334

3435
const guildId = channel.guild.id;
3536

36-
const gInstance = gim.getGuildInstance(guildId);
37-
if (!gInstance) {
38-
log.warn(`${funcName} GuildInstance was not found.`, logParam);
39-
return;
40-
}
37+
const gInstance = gim.getGuildInstance(guildId) as GuildInstance;
4138

4239
let changed = false;
4340
const channelIds = gInstance.guildChannelIds;

‎src/discordEvents/guildMemberRemove.ts

+12-13
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import { guildInstanceManager as gim, credentialsManager as cm, fcmListenerManag
2424
import { DiscordManager } from '../managers/discordManager';
2525
import { Credentials } from '../managers/credentialsManager';
2626
import * as types from '../utils/types';
27+
import { GuildInstance } from '../managers/guildInstanceManager';
2728

2829
export const name = 'guildMemberRemove';
2930
export const once = false;
@@ -50,20 +51,18 @@ export async function execute(dm: DiscordManager, member: discordjs.GuildMember)
5051
cm.updateCredentials(steamId);
5152
}
5253

53-
const gInstance = gim.getGuildInstance(member.guild.id);
54-
if (gInstance !== null) {
55-
Object.keys(gInstance.pairingDataMap).forEach(serverId => {
56-
Object.keys(gInstance.pairingDataMap[serverId]).forEach(steamId => {
57-
if (associatedSteamIds.includes(steamId as types.SteamId)) {
58-
delete gInstance.pairingDataMap[serverId][steamId];
59-
}
60-
});
61-
62-
if (Object.keys(gInstance.pairingDataMap[serverId]).length === 0) {
63-
delete gInstance.pairingDataMap[serverId];
54+
const gInstance = gim.getGuildInstance(member.guild.id) as GuildInstance;
55+
Object.keys(gInstance.pairingDataMap).forEach(serverId => {
56+
Object.keys(gInstance.pairingDataMap[serverId]).forEach(steamId => {
57+
if (associatedSteamIds.includes(steamId as types.SteamId)) {
58+
delete gInstance.pairingDataMap[serverId][steamId];
6459
}
6560
});
6661

67-
gim.updateGuildInstance(member.guild.id);
68-
}
62+
if (Object.keys(gInstance.pairingDataMap[serverId]).length === 0) {
63+
delete gInstance.pairingDataMap[serverId];
64+
}
65+
});
66+
67+
gim.updateGuildInstance(member.guild.id);
6968
}

‎src/discordEvents/ready.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,9 @@ export async function execute(dm: DiscordManager) {
113113
for (const [serverId, content] of Object.entries(gInstance.serverInfoMap)) {
114114
if (content.active) {
115115
if (rpm.addInstance(guild.id, serverId, content.mainSteamId)) {
116-
const rustPlusInstance = rpm.getInstance(guild.id, serverId);
117-
if (rustPlusInstance) {
118-
await rustPlusInstance.startup();
116+
const rpInstance = rpm.getInstance(guild.id, serverId);
117+
if (rpInstance) {
118+
await rpInstance.startup();
119119
}
120120
}
121121
}

‎src/discordGuildSlashCommands/credentials.ts

+8-6
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,10 @@ export default {
128128

129129
async function executeAdd(dm: DiscordManager, interaction: discordjs.ChatInputCommandInteraction): Promise<boolean> {
130130
const funcName = '[SlashCommand: credentials: add]';
131-
const logParam = { guildId: interaction.guildId };
131+
const guildId = interaction.guildId as types.GuildId;
132+
const logParam = { guildId: guildId };
132133

133134
const id = `Interaction ID: ${interaction.id} -`
134-
const guildId = (interaction.guild as discordjs.Guild).id;
135135
const discordUserId = interaction.user.id;
136136

137137
const gcmAndroidId = interaction.options.getString('gcm_android_id', true);
@@ -207,10 +207,10 @@ async function executeAdd(dm: DiscordManager, interaction: discordjs.ChatInputCo
207207

208208
async function executeRemove(dm: DiscordManager, interaction: discordjs.ChatInputCommandInteraction): Promise<boolean> {
209209
const funcName = '[SlashCommand: credentials: remove]';
210-
const logParam = { guildId: interaction.guildId };
210+
const guildId = interaction.guildId as types.GuildId;
211+
const logParam = { guildId: guildId };
211212

212213
const id = `Interaction ID: ${interaction.id} -`
213-
const guildId = (interaction.guild as discordjs.Guild).id;
214214
const discordUserId = interaction.user.id;
215215

216216
const steamId = interaction.options.getString('steam_id', true);
@@ -290,7 +290,8 @@ async function executeRemove(dm: DiscordManager, interaction: discordjs.ChatInpu
290290

291291
async function executeInfo(dm: DiscordManager, interaction: discordjs.ChatInputCommandInteraction): Promise<boolean> {
292292
const funcName = '[SlashCommand: credentials: info]';
293-
const logParam = { guildId: interaction.guildId };
293+
const guildId = (interaction.guild as discordjs.Guild).id;
294+
const logParam = { guildId: guildId };
294295

295296
const id = `Interaction ID: ${interaction.id} -`
296297

@@ -311,7 +312,8 @@ async function executeInfo(dm: DiscordManager, interaction: discordjs.ChatInputC
311312

312313
async function executeList(dm: DiscordManager, interaction: discordjs.ChatInputCommandInteraction): Promise<boolean> {
313314
const funcName = '[SlashCommand: credentials: list]';
314-
const logParam = { guildId: interaction.guildId };
315+
const guildId = (interaction.guild as discordjs.Guild).id;
316+
const logParam = { guildId: guildId };
315317

316318
const id = `Interaction ID: ${interaction.id} -`
317319

‎src/discordGuildSlashCommands/role.ts

+11-8
Original file line numberDiff line numberDiff line change
@@ -122,13 +122,14 @@ export default {
122122

123123
async function executeAdd(dm: DiscordManager, interaction: discordjs.ChatInputCommandInteraction): Promise<boolean> {
124124
const funcName = '[SlashCommand: role: add]';
125-
const logParam = { guildId: interaction.guildId };
125+
const guildId = interaction.guildId as types.GuildId;
126+
const logParam = { guildId: guildId };
126127

127128
const id = `Interaction ID: ${interaction.id} -`
128129
const type = interaction.options.getString('type', true) as 'roleIds' | 'adminIds';
129130
const roleId = interaction.options.getString('role', true);
130131

131-
const gInstance = gim.getGuildInstance(interaction.guildId as types.GuildId);
132+
const gInstance = gim.getGuildInstance(guildId);
132133
if (!gInstance) {
133134
await discordMessages.sendDefaultMessage(dm, interaction, 'errorTitleUnknownError',
134135
'errorDescUnknownError');
@@ -166,7 +167,7 @@ async function executeAdd(dm: DiscordManager, interaction: discordjs.ChatInputCo
166167
}
167168

168169
gInstance[type].push(roleId);
169-
gim.updateGuildInstance(interaction.guildId as types.GuildId);
170+
gim.updateGuildInstance(guildId);
170171

171172
/* Used to update permissions. */
172173
await dm.setupGuild(interaction.guild as discordjs.Guild);
@@ -184,13 +185,14 @@ async function executeAdd(dm: DiscordManager, interaction: discordjs.ChatInputCo
184185

185186
async function executeRemove(dm: DiscordManager, interaction: discordjs.ChatInputCommandInteraction): Promise<boolean> {
186187
const funcName = '[SlashCommand: role: remove]';
187-
const logParam = { guildId: interaction.guildId };
188+
const guildId = interaction.guildId as types.GuildId;
189+
const logParam = { guildId: guildId };
188190

189191
const id = `Interaction ID: ${interaction.id} -`
190192
const type = interaction.options.getString('type', true) as 'roleIds' | 'adminIds';
191193
const roleId = interaction.options.getString('role', true);
192194

193-
const gInstance = gim.getGuildInstance(interaction.guildId as types.GuildId);
195+
const gInstance = gim.getGuildInstance(guildId);
194196
if (!gInstance) {
195197
await discordMessages.sendDefaultMessage(dm, interaction, 'errorTitleUnknownError',
196198
'errorDescUnknownError');
@@ -228,7 +230,7 @@ async function executeRemove(dm: DiscordManager, interaction: discordjs.ChatInpu
228230
}
229231

230232
gInstance[type] = gInstance[type].filter(gInstanceRoleId => gInstanceRoleId !== roleId);
231-
gim.updateGuildInstance(interaction.guildId as types.GuildId);
233+
gim.updateGuildInstance(guildId);
232234

233235
/* Used to update permissions. */
234236
await dm.setupGuild(interaction.guild as discordjs.Guild);
@@ -246,11 +248,12 @@ async function executeRemove(dm: DiscordManager, interaction: discordjs.ChatInpu
246248

247249
async function executeList(dm: DiscordManager, interaction: discordjs.ChatInputCommandInteraction): Promise<boolean> {
248250
const funcName = '[SlashCommand: role: list]';
249-
const logParam = { guildId: interaction.guildId };
251+
const guildId = interaction.guildId as types.GuildId;
252+
const logParam = { guildId: guildId };
250253

251254
const id = `Interaction ID: ${interaction.id} -`
252255

253-
const gInstance = gim.getGuildInstanceDeepCopy(interaction.guildId as types.GuildId);
256+
const gInstance = gim.getGuildInstanceDeepCopy(guildId);
254257
if (!gInstance) {
255258
await discordMessages.sendDefaultMessage(dm, interaction, 'errorTitleUnknownError',
256259
'errorDescUnknownError');

‎src/discordUtils/discordButtons.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020

2121
import * as discordjs from 'discord.js';
2222

23+
import { guildInstanceManager as gim, localeManager as lm } from '../../index';
2324
import { ConnectionStatus } from '../managers/rustPlusManager';
2425
import * as types from '../utils/types';
2526
import * as constants from '../utils/constants';
26-
import { guildInstanceManager as gim, localeManager as lm } from '../../index';
2727
import {
2828
EventNotificationSettings,
2929
GuildInstance,

‎src/discordUtils/discordEmbeds.ts

+14-10
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@
2121
import * as discordjs from 'discord.js';
2222

2323
import { localeManager as lm, guildInstanceManager as gim, config, credentialsManager as cm } from '../../index';
24-
import { GuildInstance, ServerInfo, SmartSwitch, SmartAlarm, StorageMonitor, StorageMonitorType } from '../managers/guildInstanceManager';
24+
import {
25+
GuildInstance, ServerInfo, SmartSwitch, SmartAlarm, StorageMonitor, StorageMonitorType
26+
27+
} from '../managers/guildInstanceManager';
2528
import * as constants from '../utils/constants';
2629
import { DiscordManager } from '../managers/discordManager';
2730
import * as types from '../utils/types';
@@ -243,7 +246,8 @@ export async function getFcmPlayerDeathEmbed(title: string, body: PlayerDeathBod
243246

244247
export function getDefaultEmbed(dm: DiscordManager, interaction: discordjs.Interaction, imageName: string,
245248
title: string, description: string, parameters: { [key: string]: string } = {}): discordjs.EmbedBuilder {
246-
const gInstance = gim.getGuildInstance(interaction.guildId as types.GuildId) as GuildInstance;
249+
const guildId = interaction.guildId as types.GuildId;
250+
const gInstance = gim.getGuildInstance(guildId) as GuildInstance;
247251
const language = gInstance.generalSettings.language;
248252

249253
return getEmbed({
@@ -287,7 +291,8 @@ export function getHelpEmbed(dm: DiscordManager, imageName: string): discordjs.E
287291

288292
export function getRoleListEmbed(dm: DiscordManager, interaction: discordjs.Interaction, imageName: string):
289293
discordjs.EmbedBuilder {
290-
const gInstance = gim.getGuildInstance(interaction.guildId as types.GuildId) as GuildInstance;
294+
const guildId = interaction.guildId as types.GuildId;
295+
const gInstance = gim.getGuildInstance(guildId) as GuildInstance;
291296
const language = gInstance.generalSettings.language;
292297

293298
const adminIds = gInstance.adminIds;
@@ -336,16 +341,16 @@ export function getRoleListEmbed(dm: DiscordManager, interaction: discordjs.Inte
336341

337342
export async function getCredentialsInfoEmbed(dm: DiscordManager, interaction: discordjs.Interaction,
338343
imageName: string): Promise<discordjs.EmbedBuilder> {
339-
const gInstance = gim.getGuildInstance(interaction.guildId as types.GuildId) as GuildInstance;
344+
const guildId = interaction.guildId as types.GuildId;
345+
const gInstance = gim.getGuildInstance(guildId) as GuildInstance;
340346
const language = gInstance.generalSettings.language;
341347

342348
const discordUserId = interaction.user.id;
343349
const steamIds = cm.getCredentialSteamIdsFromDiscordUserId(discordUserId);
344350

345351
const fields: discordjs.EmbedField[] = [];
346352
for (const steamId of steamIds) {
347-
const credentials = cm.getCredentials(steamId);
348-
if (!credentials) continue;
353+
const credentials = cm.getCredentials(steamId) as Credentials;
349354

350355
const guildNames: string[] = [];
351356
for (const guildId of credentials.associatedGuilds) {
@@ -387,16 +392,15 @@ export async function getCredentialsInfoEmbed(dm: DiscordManager, interaction: d
387392

388393
export function getCredentialsListEmbed(dm: DiscordManager, interaction: discordjs.Interaction,
389394
imageName: string): discordjs.EmbedBuilder {
390-
const gInstance = gim.getGuildInstance(interaction.guildId as types.GuildId) as GuildInstance;
395+
const guildId = interaction.guildId as types.GuildId;
396+
const gInstance = gim.getGuildInstance(guildId) as GuildInstance;
391397
const language = gInstance.generalSettings.language;
392398

393-
const guildId = (interaction.guild as discordjs.Guild).id;
394399
const steamIds = cm.getCredentialSteamIdsFromGuildId(guildId);
395400

396401
const fields: discordjs.EmbedField[] = [];
397402
for (const steamId of steamIds) {
398-
const credentials = cm.getCredentials(steamId);
399-
if (!credentials) continue;
403+
const credentials = cm.getCredentials(steamId) as Credentials;
400404

401405
const hasExpired = credentials.expireDate < (Date.now() / 1000);
402406

0 commit comments

Comments
 (0)