Skip to content

Commit 50d788e

Browse files
jaga-livejaga-live
committed
refactor - rename live apps discord client
1 parent c375833 commit 50d788e

10 files changed

+46
-34
lines changed

‎src/common/services/discord-action.service.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { injectable } from 'inversify';
2-
import { liveClient } from '../../modules/app';
2+
import { discordClient } from '../../modules/app';
33
import { DiscordActionTypes } from '../enum/discord-action.enum';
44
import { ActionConfigDto } from '../dto/action-config.dto';
55

@@ -43,26 +43,26 @@ export class DiscordActionService {
4343
}
4444

4545
private async createMessage(config: any) {
46-
await liveClient.message.send(config.channelId, config.plainMessage);
46+
await discordClient.message.send(config.channelId, config.plainMessage);
4747
}
4848

4949
private async react(config: any) {
50-
await liveClient.message.react(
50+
await discordClient.message.react(
5151
config.channelId,
5252
config.messageId,
5353
config.emoji,
5454
);
5555
}
5656

5757
private async reply(config: any) {
58-
await liveClient.message.reply(
58+
await discordClient.message.reply(
5959
config.channelId,
6060
config.messageId,
6161
config.plainMessage,
6262
);
6363
}
6464

6565
private async deleteMessage(config: any) {
66-
await liveClient.message.delete(config.channelId, config.messageId);
66+
await discordClient.message.delete(config.channelId, config.messageId);
6767
}
6868
}

‎src/common/services/service-status.service.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { TYPES } from '../../core/inversify.types';
33
import { GuildRepo } from '../../repository/guild.repo';
44
import { performance } from 'perf_hooks';
55
import { RedisService } from './redis.service';
6-
import { liveClient } from '../../modules/app';
6+
import { discordClient } from '../../modules/app';
77
import { DiscordEmbeds } from '@live-apps/discord';
88
import { DiscordEmbedField } from '../../types/discord.types';
99
import { QueueService } from './queue.service';
@@ -128,7 +128,7 @@ Certain features won't work unless kitty chan can access these services. 💡`,
128128
embeds.fields?.push({ name: '', value: '' }); // Add an empty field for spacing
129129
}
130130

131-
await liveClient.message.sendEmbed(channelId, [embeds]);
131+
await discordClient.message.sendEmbed(channelId, [embeds]);
132132
}
133133

134134
/**MongoDB - Check by fetching home guild */
@@ -245,7 +245,7 @@ Certain features won't work unless kitty chan can access these services. 💡`,
245245
/**LiveApps Discord - API call */
246246
private async liveAppsDiscordAPI(guildId: string) {
247247
const start = performance.now();
248-
const getGuild = await liveClient.guild.fetch(guildId, {
248+
const getGuild = await discordClient.guild.fetch(guildId, {
249249
ignoreCache: true,
250250
expiry: 3600,
251251
});
@@ -269,7 +269,7 @@ Certain features won't work unless kitty chan can access these services. 💡`,
269269
/**LiveApps Discord - Fetch Cache */
270270
private async liveAppsDiscordCache(guildId: string) {
271271
const start = performance.now();
272-
const getGuild = await liveClient.guild.fetch(guildId, {
272+
const getGuild = await discordClient.guild.fetch(guildId, {
273273
expiry: 3600,
274274
});
275275
const end = performance.now();

‎src/handlers/events.handler.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import { NoResponse } from '../proto/kitty_chan/NoResponse';
2121
import { ServiceStatus } from '../common/services/service-status.service';
2222
import { WelcomerService } from '../modules/greet/welcomer.service';
2323
import { LoggerService } from '../modules/logger/logger.service';
24-
import { liveClient } from '../modules/app';
24+
import { discordClient } from '../modules/app';
2525
import { LanguageFilter } from '../modules/language/language-filter.service';
2626
import { DiscordEventsType } from '../common/enum/discord-events.enum';
2727
import { AutoSailConfigService } from '../modules/auto-sail/auto-sail-config.service';
@@ -219,7 +219,7 @@ export class EventsHandler implements EventsServiceHandlers {
219219
this.loggerService.memberUpdate(guildMember);
220220

221221
//Update Member cache
222-
await liveClient.member.fetch(guildMember.guildId, guildMember.userId, {
222+
await discordClient.member.fetch(guildMember.guildId, guildMember.userId, {
223223
ignoreCache: true,
224224
});
225225

‎src/modules/app.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import { injectable } from 'inversify';
22
import 'dotenv/config';
33
import { OnInit } from '../jobs/on-init';
4-
import { Client as LiveClient } from '@live-apps/discord';
4+
import { Client as LiveAppsDiscordClient } from '@live-apps/discord';
55
import container from '../core/inversify.di';
66
import { EsService } from '../common/services/es.service';
77
import { TYPES } from '../core/inversify.types';
88

99
/**
1010
* LiveApps Discord Client Config
1111
*/
12-
export const liveClient = new LiveClient({
12+
export const discordClient = new LiveAppsDiscordClient({
1313
events: [],
1414
redisOptions: {
1515
host: process.env.REDIS_HOST,

‎src/modules/commands/commands.service.ts

+7-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { TYPES } from '../../core/inversify.types';
55
import { UtilityService } from '../../common/services/utils.service';
66
import { flip_coin_wake_word } from './data/wake_words/general';
77
import { PortalService } from '../portal/portal.service';
8-
import { liveClient } from '../app';
8+
import { discordClient } from '../app';
99

1010
@injectable()
1111
export class CommandService {
@@ -50,7 +50,11 @@ export class CommandService {
5050
const content = `Hey there! I'm kitty chan. I'm currently at very early stages of development.
5151
You will be invited when a stable version is released :)`;
5252

53-
await liveClient.message.reply(guild.channelId, guild.messageId, content);
53+
await discordClient.message.reply(
54+
guild.channelId,
55+
guild.messageId,
56+
content,
57+
);
5458

5559
return true;
5660
}
@@ -78,7 +82,7 @@ export class CommandService {
7882
};
7983
}
8084

81-
await liveClient.message.reply(
85+
await discordClient.message.reply(
8286
guild.channelId,
8387
guild.messageId,
8488
response.message,

‎src/modules/greet/welcomer.service.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { injectable } from 'inversify';
22
import { IGuildMember } from '../../common/interface/shared.interface';
33
import DiscordTemplateModel from '../template/model/discord-templates.model';
4-
import { liveClient } from '../app';
4+
import { discordClient } from '../app';
55
import Guild from '../guild/model/guild.model';
66
import {
77
DiscordTemplateType,
@@ -19,7 +19,7 @@ export class WelcomerService {
1919
const template = await this.getDefaultTemplate();
2020
if (!template) return;
2121

22-
await liveClient.message.send(
22+
await discordClient.message.send(
2323
guildConfig.welcomer.channelId,
2424
await this.fillTemplatePlaceHolder(template.content, guild),
2525
);

‎src/modules/guild/guild.service.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { TYPES } from '../../core/inversify.types';
99
import { RolesService } from '../roles/roles.service';
1010
import { RedisService } from '../../common/services/redis.service';
1111
import User from './model/user.model';
12-
import { liveClient } from '../app';
12+
import { discordClient } from '../app';
1313
import Features from '../features/model/features.model';
1414
import { DiscordPresenceStatus } from '../../common/enum/discord-presence.enum';
1515

@@ -63,7 +63,7 @@ export class GuildService {
6363
async guildUpdate(guild: IBasicGuild) {
6464
const { guildId } = guild;
6565

66-
const getDiscordGuild = await liveClient.guild.fetch(guildId, {
66+
const getDiscordGuild = await discordClient.guild.fetch(guildId, {
6767
ignoreCache: true,
6868
});
6969
if (!getDiscordGuild) {

‎src/modules/logger/logger.service.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
IMessageUpdate,
55
} from '../../common/interface/shared.interface';
66
import { DiscordTemplateType } from '../../common/enum/discord-template.enum';
7-
import { liveClient } from '../app';
7+
import { discordClient } from '../app';
88
import { TYPES } from '../../core/inversify.types';
99
import { DiscordTemplateService } from '../../common/services/discord-template.service';
1010
import Features from '../features/model/features.model';
@@ -38,7 +38,7 @@ export class LoggerService {
3838

3939
/**Guild Member Update Logger */
4040
async memberUpdate(member: IGuildMemberUpdate) {
41-
const memberCache = await liveClient.member.fetch(
41+
const memberCache = await discordClient.member.fetch(
4242
member.guildId,
4343
member.userId,
4444
{ onlyCache: true },
@@ -239,7 +239,7 @@ export class LoggerService {
239239
return;
240240
}
241241

242-
const guild = await liveClient.guild.fetch(content.guildId);
242+
const guild = await discordClient.guild.fetch(content.guildId);
243243
const guildName = guild.name;
244244

245245
if (template.type === DiscordTemplateType.plain) {
@@ -248,15 +248,15 @@ export class LoggerService {
248248
template.content,
249249
);
250250

251-
await liveClient.message.send(channelId, plainContent);
251+
await discordClient.message.send(channelId, plainContent);
252252
} else if (template.type === DiscordTemplateType.embed) {
253253
content.guildName = guildName;
254254

255255
const embed: any = await this.templateService.fillEmbedTemplate(content, {
256256
...template.embed,
257257
});
258258

259-
await liveClient.message.sendEmbed(channelId, [embed]);
259+
await discordClient.message.sendEmbed(channelId, [embed]);
260260
}
261261
}
262262
}

‎src/modules/portal/portal.service.ts

+7-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { TYPES } from '../../core/inversify.types';
33
import { IGuild, IGuildMessage } from '../../common/interface/shared.interface';
44
import PortalRoom from './model/portal-room.model';
55
import { SharedService } from '../../common/services/shared.service';
6-
import { liveClient } from '../app';
6+
import { discordClient } from '../app';
77
import { PortalMsg } from '../../common/messages/portal/portal';
88
import { FeaturesRepo } from '../features/repo/features.repo';
99
import { FeaturesEnum } from '../features/enum/features.enum';
@@ -125,13 +125,17 @@ export class PortalService {
125125

126126
//Common Reply Handler
127127
private async reply(content: string, guild: IGuild) {
128-
await liveClient.message.reply(guild.channelId, guild.messageId, content);
128+
await discordClient.message.reply(
129+
guild.channelId,
130+
guild.messageId,
131+
content,
132+
);
129133
return;
130134
}
131135

132136
private async message(guilds: any[]) {
133137
guilds.map(async (e) => {
134-
await liveClient.message.send(e.channelId, e.message);
138+
await discordClient.message.send(e.channelId, e.message);
135139
});
136140
}
137141
}

‎src/modules/roles/roles.service.ts

+10-6
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import ReactionRoles from './model/reaction-roles.model';
44
import ReactionRole from './model/reaction-roles.model';
55
import { IMessageReaction } from '../../common/interface/shared.interface';
66
import { compareRolesMapping } from '../../utils/roles-mapping';
7-
import { liveClient } from '../app';
7+
import { discordClient } from '../app';
88

99
/**
1010
* Reaction Roles Action
@@ -39,7 +39,7 @@ export class RolesService {
3939
}
4040

4141
///Update Message
42-
await liveClient.message.editEmbed(
42+
await discordClient.message.editEmbed(
4343
channelId,
4444
reactionRoleMessageRef,
4545
embed,
@@ -63,7 +63,7 @@ export class RolesService {
6363
for (let index = 0; index < emojiToBeUpdated.length; index++) {
6464
const emoji = emojiToBeUpdated[index].emoji;
6565

66-
await liveClient.message.react(
66+
await discordClient.message.react(
6767
channelId,
6868
reactionRoleMessageRef,
6969
emoji.type === 'standard'
@@ -89,7 +89,7 @@ export class RolesService {
8989
}
9090

9191
///Delete Message
92-
await liveClient.message.delete(channelId, reactionRoleMessageRef);
92+
await discordClient.message.delete(channelId, reactionRoleMessageRef);
9393
await ReactionRoles.deleteOne({ messageId: reactionRoleMessageRef });
9494

9595
return {
@@ -129,7 +129,7 @@ export class RolesService {
129129
}
130130

131131
///Add role to User
132-
return liveClient.roles.set(reaction_role.guildId, userId, role.roleId);
132+
return discordClient.roles.set(reaction_role.guildId, userId, role.roleId);
133133
}
134134

135135
///Handle Role React
@@ -160,6 +160,10 @@ export class RolesService {
160160
}
161161

162162
///Add role to User
163-
await liveClient.roles.remove(reaction_role.guildId, userId, role.roleId);
163+
await discordClient.roles.remove(
164+
reaction_role.guildId,
165+
userId,
166+
role.roleId,
167+
);
164168
}
165169
}

0 commit comments

Comments
 (0)