Skip to content

Commit ccaaf0d

Browse files
author
HunteRoi
committed
fix: clean up and check runtime
1 parent d09d5ee commit ccaaf0d

File tree

11 files changed

+31
-105
lines changed

11 files changed

+31
-105
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "datadrop",
3-
"version": "1.11.1",
3+
"version": "1.11.2",
44
"type": "module",
55
"main": "./build/index.js",
66
"scripts": {
@@ -27,12 +27,12 @@
2727
"@hunteroi/discord-verification": "^1.5.0",
2828
"discord.js": "^14.16.2",
2929
"dotenv": "^16.4.5",
30-
"ts-postgres": "1.3.0"
3130
"nodemailer": "^6.9.1",
31+
"ts-postgres": "1.3.0"
3232
},
3333
"devDependencies": {
3434
"@types/node": "^20.12.7",
35-
"@types/nodemailer": "^6.4.7",
35+
"@types/nodemailer": "^6.4.7",
3636
"@typescript-eslint/eslint-plugin": "^7.6.0",
3737
"@typescript-eslint/parser": "^7.6.0",
3838
"eslint": "^9.0.0",

src/datadrop.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@ import { LogEventLevel, DefaultLogger, ConsoleLogger } from '@hunteroi/advanced-
55
import { InteractionsSelfRoleManager, RoleToEmojiData, SelfRoleManagerEvents } from '@hunteroi/discord-selfrole';
66
import { ChildChannelData, ParentChannelData, TempChannelsManager, TempChannelsManagerEvents } from '@hunteroi/discord-temp-channels';
77
import { VerificationManager, VerificationManagerEvents } from '@hunteroi/discord-verification';
8-
import { SendGridService } from '@hunteroi/discord-verification/lib/services/SendGridService';
9-
import * as path from 'path';
108

119
import { PostgresDatabaseService, SMTPService } from './services/index.js';
1210
import { getErrorMessage, readFilesFrom } from './helpers.js';
13-
import { Configuration, User, IDatabaseService } from './models/index.js';
11+
import { Configuration, IDatabaseService, User } from './models/index.js';
1412
import { readConfig } from './config.js';
1513

1614
export class DatadropClient extends Client {

src/events/error.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { DatadropClient } from '../datadrop';
1+
import { DatadropClient } from '../datadrop.js';
22

3-
module.exports = async (client: DatadropClient, error: Error) => {
3+
export default async function error(client: DatadropClient, error: Error) {
44
client.logger.error(`${error.name}: ${error.message}\n${error.cause}\n${error.stack}`);
5-
};
5+
}

src/events/interactionCreate.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ActionRowBuilder, ButtonBuilder, ButtonInteraction, ButtonStyle, Interaction, italic, ModalBuilder, ModalSubmitInteraction, RepliableInteraction, TextInputBuilder, TextInputStyle } from 'discord.js';
22

3-
import { DatadropClient } from 'src/datadrop.js';
3+
import { DatadropClient } from '../datadrop.js';
44

55
export default async function interactionCreate(client: DatadropClient, interaction: Interaction) {
66
if (isVerificationButton(interaction)) {

src/events/messageCreate.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { ChannelType, Message } from 'discord.js';
2+
23
import { DatadropClient } from '../datadrop.js';
34

45
const escapeRegex = (str: string | null | undefined) => str?.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');

src/models/Configuration.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import { Snowflake } from 'discord.js';
22

3-
import { SendGridOptions } from '@hunteroi/discord-verification/lib/services/SendGridService.js';
4-
53
import { SMTPServiceOptions } from '../services/SMTPService.js';
64

75
export interface SpecialRoleConfiguration {

src/models/index.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
export * from './Configuration';
2-
export * from './IDatabaseService';
3-
export * from './User';
1+
import { Configuration } from './Configuration.js';
2+
import { IDatabaseService } from './IDatabaseService.js';
3+
import { User } from './User.js';
4+
5+
export { Configuration, IDatabaseService, User };

src/services/PostgresDatabaseService.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ import { Client, DatabaseError, PreparedStatement, Value } from 'ts-postgres';
33

44
import { ConsoleLogger } from '@hunteroi/advanced-logger';
55

6-
import { User } from '../models/User.js';
7-
import { IDatabaseService } from '../models/IDatabaseService.js';
6+
import { User, IDatabaseService } from '../models/index.js';
87

98
export default class PostgresDatabaseService implements IDatabaseService {
109
#logger: ConsoleLogger;

src/services/SMTPService.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
import { ISenderAPI, SenderAPIData } from '@hunteroi/discord-verification';
21
import { createTransport } from 'nodemailer';
32
import SMTPTransport from 'nodemailer/lib/smtp-transport';
43

4+
import { ISenderAPI, SenderAPIData } from '@hunteroi/discord-verification';
5+
56
export type SMTPServiceOptions = SMTPTransport.Options;
67

78
export default class SMTPService implements ISenderAPI {

src/services/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import PostgresDatabaseService from './PostgresDatabaseService';
2-
import SMTPService from './SMTPService';
1+
import PostgresDatabaseService from './PostgresDatabaseService.js';
2+
import SMTPService from './SMTPService.js';
33

44
export { PostgresDatabaseService, SMTPService };

0 commit comments

Comments
 (0)