1
0
mirror of https://github.com/toast-ts/Daggerbot-TS.git synced 2024-11-18 04:40:59 -05:00

Compare commits

...

24 Commits

Author SHA1 Message Date
Toast
a716b89571
Merge e8bb291ffb into a7802e5e78 2024-03-19 20:25:49 +11:00
toast-ts
e8bb291ffb Delete Yarn PnP files as per #99 2024-03-19 16:57:15 +11:00
toast-ts
1390937028 Merge branch 'master' into sequelize-v7 2024-03-19 16:55:49 +11:00
toast-ts
2616b8996b Merge branch 'master' into sequelize-v7 2024-03-18 13:22:20 +11:00
toast-ts
6a254e897e Merge branch 'master' into sequelize-v7 2024-03-11 17:32:31 +11:00
toast-ts
66c6dc9aa3 Merge branch 'master' into sequelize-v7 2024-03-04 13:29:48 +11:00
toast-ts
1866ac8cb7 Merge branch 'master' into sequelize-v7 2024-03-04 13:27:12 +11:00
toast-ts
29437ef5d7 Remove autoresponses for Monster 2024-03-04 13:26:48 +11:00
toast-ts
50d12f39be Merge branch 'master' into sequelize-v7 2024-03-04 11:06:18 +11:00
toast-ts
20f2ac5656 Merge branch 'master' into sequelize-v7 2024-03-03 19:17:49 +11:00
toast-ts
e841712456 Merge branch 'master' into sequelize-v7 2024-02-28 20:21:36 +11:00
toast-ts
8e367e4c80 Merge branch 'master' into sequelize-v7 2024-02-26 13:49:25 +11:00
toast-ts
14077381ac Merge branch 'master' into sequelize-v7 2024-02-25 20:42:26 +11:00
toast-ts
424de10a8c Optimize functions in punishment model 2024-02-25 20:39:32 +11:00
toast-ts
cd40816e8f Log transaction failed const to console instead of nowhere 2024-02-25 20:19:27 +11:00
toast-ts
afc04047eb Update @types/pg 2024-02-25 20:17:14 +11:00
toast-ts
54d0db19b6 Merge branch 'master' into sequelize-v7 2024-02-25 20:15:08 +11:00
toast-ts
7ca33f1de8 Clean up some of the stuff 2024-02-25 20:14:17 +11:00
toast-ts
e42b4ed857 Merge branch 'master' into sequelize-v7 2024-02-24 16:45:15 +11:00
toast-ts
890aa5292d Merge branch 'master' into sequelize-v7 2024-02-22 08:05:10 +11:00
toast-ts
827881c136 Merge branch 'master' into sequelize-v7 2024-02-20 07:57:45 +11:00
toast-ts
aaf746db5e Merge branch 'master' into sequelize-v7 2024-02-18 09:00:56 +11:00
toast-ts
8b541cbed3 Merge branch 'master' into sequelize-v7 2024-02-13 08:29:25 +11:00
toast-ts
4fb097fa70 Sync Sequelize v7 changes from Canary repository 2024-02-12 19:55:45 +11:00
13 changed files with 404 additions and 260 deletions

View File

@ -29,6 +29,7 @@
"dependencies": { "dependencies": {
"@napi-rs/canvas": "0.1.51", "@napi-rs/canvas": "0.1.51",
"@octokit/rest": "20.0.2", "@octokit/rest": "20.0.2",
"@sequelize/core": "7.0.0-alpha.37",
"@toast/tokenservice-client": "1.0.16", "@toast/tokenservice-client": "1.0.16",
"ansi-colors": "4.1.3", "ansi-colors": "4.1.3",
"dayjs": "1.11.10", "dayjs": "1.11.10",
@ -39,8 +40,8 @@
"node-cron": "3.0.3", "node-cron": "3.0.3",
"pg": "8.11.3", "pg": "8.11.3",
"pg-hstore": "2.3.4", "pg-hstore": "2.3.4",
"postgres-array": "3.0.2",
"redis": "4.6.13", "redis": "4.6.13",
"sequelize": "6.37.1",
"simple-git": "3.23.0", "simple-git": "3.23.0",
"systeminformation": "5.22.3", "systeminformation": "5.22.3",
"undici": "6.9.0" "undici": "6.9.0"
@ -50,7 +51,6 @@
"@types/node": "20.11.28", "@types/node": "20.11.28",
"@types/node-cron": "3.0.11", "@types/node-cron": "3.0.11",
"@types/pg": "8.11.2", "@types/pg": "8.11.2",
"@types/sequelize": "4.28.20",
"typescript": "5.4.2" "typescript": "5.4.2"
} }
} }

View File

@ -25,16 +25,16 @@ export default class Case {
update: async()=>{ update: async()=>{
const reason = interaction.options.getString('reason'); const reason = interaction.options.getString('reason');
await client.punishments.updateReason(caseId, reason); await client.punishments.updateReason(caseId, reason);
if (client.punishments.findCase(caseId)) { if (client.punishments.findCaseOrCancels('case_id', caseId)) {
await this.updateEntry(client, caseId, reason); await this.updateEntry(client, caseId, reason);
await interaction.reply({embeds: [new client.embed().setColor(client.config.embedColorGreen).setTitle('Case updated').setDescription(`Case #${caseId} has been successfully updated with new reason:\n\`${reason}\``)]}); await interaction.reply({embeds: [new client.embed().setColor(client.config.embedColorGreen).setTitle('Case updated').setDescription(`Case #${caseId} has been successfully updated with new reason:\n\`${reason}\``)]});
} else interaction.reply({embeds: [new client.embed().setColor(client.config.embedColorRed).setTitle('Case not updated').setDescription(`Case #${caseId} is not found in database, not updating the reason.`)]}); } else interaction.reply({embeds: [new client.embed().setColor(client.config.embedColorRed).setTitle('Case not updated').setDescription(`Case #${caseId} is not found in database, not updating the reason.`)]});
}, },
view: async()=>{ view: async()=>{
const punishment = await client.punishments.findCase(caseId); const punishment = await client.punishments.findCaseOrCancels('case_id', caseId);
if (!punishment) return interaction.reply('Case ID is not found in database.'); if (!punishment) return interaction.reply('Case ID is not found in database.');
const cancelledBy = punishment.dataValues.expired ? await client.punishments.findByCancels(punishment.dataValues.case_id) : null; const cancelledBy = punishment.dataValues.expired ? await client.punishments.findCaseOrCancels('cancels', punishment.dataValues.case_id) : null;
const cancels = punishment.dataValues.cancels ? await client.punishments.findCase(punishment.dataValues.cancels) : null; const cancels = punishment.dataValues.cancels ? await client.punishments.findCaseOrCancels('case_id', punishment.dataValues.cancels) : null;
const embed = new client.embed().setColor(client.config.embedColor).setTimestamp(Number(punishment.dataValues.time)).setTitle(`${punishment.dataValues.type[0].toUpperCase()+punishment.dataValues.type.slice(1)} | Case #${punishment.dataValues.case_id}`).addFields( const embed = new client.embed().setColor(client.config.embedColor).setTimestamp(Number(punishment.dataValues.time)).setTitle(`${punishment.dataValues.type[0].toUpperCase()+punishment.dataValues.type.slice(1)} | Case #${punishment.dataValues.case_id}`).addFields(
{name: 'User', value: `${punishment.member_name}\n${MessageTool.formatMention(punishment.dataValues.member, 'user')}\n\`${punishment.dataValues.member}\``, inline: true}, {name: 'User', value: `${punishment.member_name}\n${MessageTool.formatMention(punishment.dataValues.member, 'user')}\n\`${punishment.dataValues.member}\``, inline: true},
{name: 'Moderator', value: `${client.users.resolve(punishment.moderator).tag}\n${MessageTool.formatMention(punishment.dataValues.moderator, 'user')}\n\`${punishment.dataValues.moderator}\``, inline: true}, {name: 'Moderator', value: `${client.users.resolve(punishment.moderator).tag}\n${MessageTool.formatMention(punishment.dataValues.moderator, 'user')}\n\`${punishment.dataValues.moderator}\``, inline: true},

View File

@ -5,7 +5,7 @@ import MessageTool from '../helpers/MessageTool.js';
export default class Unpunish { export default class Unpunish {
static async run(client: TClient, interaction: Discord.ChatInputCommandInteraction<'cached'>){ static async run(client: TClient, interaction: Discord.ChatInputCommandInteraction<'cached'>){
if (!MessageTool.isModerator(interaction.member as Discord.GuildMember)) return MessageTool.youNeedRole(interaction, 'dcmod'); if (!MessageTool.isModerator(interaction.member as Discord.GuildMember)) return MessageTool.youNeedRole(interaction, 'dcmod');
const punishment = await client.punishments.findCase(interaction.options.getInteger('case_id', true)); const punishment = await client.punishments.findCaseOrCancels('case_id', interaction.options.getInteger('case_id', true));
if (!punishment) return interaction.reply({content: 'Case ID is not found in database.', ephemeral: true}); if (!punishment) return interaction.reply({content: 'Case ID is not found in database.', ephemeral: true});
if (['unban', 'unmute', 'punishmentOverride'].includes(punishment.dataValues.type)) return interaction.reply({content: 'This case ID is immutable. (Informative case)', ephemeral: true}); if (['unban', 'unmute', 'punishmentOverride'].includes(punishment.dataValues.type)) return interaction.reply({content: 'This case ID is immutable. (Informative case)', ephemeral: true});
if (punishment.dataValues.expired) return interaction.reply({content: 'This case ID is already expired.', ephemeral: true}); if (punishment.dataValues.expired) return interaction.reply({content: 'This case ID is already expired.', ephemeral: true});

View File

@ -1,4 +1,4 @@
import {Sequelize} from 'sequelize'; import {Sequelize} from '@sequelize/core';
import Logger from '../helpers/Logger.js'; import Logger from '../helpers/Logger.js';
import TSClient from '../helpers/TSClient.js'; import TSClient from '../helpers/TSClient.js';

View File

@ -1,5 +1,5 @@
import DatabaseServer from '../components/DatabaseServer.js'; import DatabaseServer from '../components/DatabaseServer.js';
import {Model, DataTypes} from 'sequelize'; import {Model, DataTypes} from '@sequelize/core';
import CacheServer from '../components/CacheServer.js'; import CacheServer from '../components/CacheServer.js';
class MPServer extends Model { class MPServer extends Model {
@ -57,58 +57,45 @@ export class MPServerSvc {
} }
query = async(pattern:string)=>await this.model.sequelize.query(pattern); query = async(pattern:string)=>await this.model.sequelize.query(pattern);
async fetchPlayerData(serverName:string) { async fetchPlayerData(serverName:string) {
const findServerByName = await this.model.findOne({where: {serverName: serverName}}); const server = await this.model.findOne({where: {serverName: serverName}});
if (findServerByName) return findServerByName.dataValues.playerData; return server ? server.dataValues.playerData : [];
else return [];
} }
async addServer(serverName:string, ip:string, code:string) { async addServer(serverName:string, ip:string, code:string) {
const findServerByName = await this.model.findOne({where: {serverName: serverName}}); await this.model.upsert({
if (findServerByName) { serverName,
(await findServerByName.update({serverName: serverName, ip: ip, code: code})).save();
await CacheServer.delete(cacheKey).then(async()=>await this.findInCache());
} else {
await this.model.create({
serverName: serverName,
isActive: true, isActive: true,
ip: ip, ip,
code: code, code,
playerData: [] playerData: []
}); });
await CacheServer.delete(cacheKey).then(async()=>await this.findInCache()); await CacheServer.delete(cacheKey).then(async()=>await this.findInCache());
} }
}
async removeServer(serverName:string) { async removeServer(serverName:string) {
const findServerByName = await this.model.findOne({where: {serverName: serverName}}); await this.model.destroy({where: {serverName}});
if (findServerByName) {
await this.model.destroy({where: {serverName: serverName}});
await CacheServer.delete(cacheKey).then(async()=>await this.findInCache()); await CacheServer.delete(cacheKey).then(async()=>await this.findInCache());
} }
}
async toggleServerUsability(serverName:string, isActive:boolean) { async toggleServerUsability(serverName:string, isActive:boolean) {
const findServerByName = await this.model.findOne({where: {serverName: serverName}}); const [updated] = await this.model.update({isActive}, {where: {serverName}});
if (findServerByName) { if (updated) {
this.model.update({isActive: isActive}, {where: {serverName: serverName}}).then(async flagUpdated=>{
if (flagUpdated) {
await CacheServer.delete(cacheKey).then(async()=>await this.findInCache()); await CacheServer.delete(cacheKey).then(async()=>await this.findInCache());
return true; return true;
} }
}); return false;
} else return false;
} }
async incrementPlayerCount(serverName:string, playerCount:number) { async incrementPlayerCount(serverName:string, playerCount:number) {
const findServerByName = await this.model.findOne({where: {serverName: serverName}}); const server = await this.model.findOne({where: {serverName}});
if (findServerByName) { if (server) {
let PD = findServerByName.dataValues.playerData; let PD = server.dataValues.playerData;
if (PD.length > 1920) PD = []; //Selfnote: 86400/45 = 1920, where 86400 is seconds in a day and 45 is the MPModule's refresh interval. if (PD.length > 1920) PD = []; //Selfnote: 86400/45 = 1920, where 86400 is seconds in a day and 45 is the MPModule's refresh interval.
PD.push(playerCount); PD.push(playerCount);
const updatePD = await this.model.update({playerData: PD}, {where: {serverName: serverName}}); await this.model.update({playerData: PD}, {where: {serverName}});
if (updatePD) true; return true;
else return false; }
} else return false; return false;
} }
async findInCache(): Promise<IServer[]> { async findInCache(): Promise<IServer[]> {
const cachedResult = await CacheServer.get(cacheKey, true); const cachedResult = await CacheServer.get(cacheKey, true);
let result; let result:IServer[];
if (cachedResult) result = cachedResult; if (cachedResult) result = cachedResult;
else { else {
result = await this.model.findAll(); result = await this.model.findAll();

View File

@ -1,5 +1,6 @@
import DatabaseServer from '../components/DatabaseServer.js'; import DatabaseServer from '../components/DatabaseServer.js';
import {Model, DataTypes} from 'sequelize'; import {Model, DataTypes} from '@sequelize/core';
import Logger from '../helpers/Logger.js';
class dailyMsgs extends Model { class dailyMsgs extends Model {
declare public day: number; declare public day: number;
@ -26,18 +27,20 @@ export class DailyMsgsSvc {
tableName: 'dailymsgs', tableName: 'dailymsgs',
createdAt: false, createdAt: false,
updatedAt: false, updatedAt: false,
indexes: [
{name: 'day_index', fields: ['day'], unique: true}
],
sequelize: DatabaseServer.seq sequelize: DatabaseServer.seq
}) })
this.model.sync(); this.model.sync();
} }
query = async(pattern:string)=>await this.model.sequelize.query(pattern); query = async(pattern:string)=>await this.model.sequelize.query(pattern);
nukeDays = async()=>await this.model.destroy({truncate: true}); nukeDays = async()=>await this.model.destroy();
fetchDays = async()=>await this.model.findAll(); fetchDays = async()=>await this.model.findAll();
async newDay(formattedDate:number, total:number) { async newDay(formattedDate:number, total:number) {
if (await this.model.findOne({where: {day: formattedDate}})) return console.log('This day already exists!') const [instance, created] = await this.model.findOrCreate({where: {day: formattedDate}, defaults: {total}});
return await this.model.create({day: formattedDate, total: total}); if (!created) return Logger.console('log', 'DailyMsgs', 'This day already exists!');
return instance
// Save previous day's total messages into database when a new day starts. // Save previous day's total messages into database when a new day starts.
} }
updateDay = async(formattedDate:number, total:number)=>await this.model.update({total: total}, {where: {day: formattedDate}});
// THIS IS FOR DEVELOPMENT PURPOSES ONLY, NOT TO BE USED IN LIVE ENVIRONMENT!
} }

View File

@ -1,5 +1,5 @@
import DatabaseServer from '../components/DatabaseServer.js'; import DatabaseServer from '../components/DatabaseServer.js';
import {Model, DataTypes} from 'sequelize'; import {Model, DataTypes} from '@sequelize/core';
class prohibitedWords extends Model { class prohibitedWords extends Model {
declare public word: string; declare public word: string;

View File

@ -1,12 +1,24 @@
import Discord from 'discord.js'; import Discord from 'discord.js';
import TClient from '../client.js'; import TClient from '../client.js';
import ms from 'ms'; import ms from 'ms';
import Logger from '../helpers/Logger.js';
import {Punishment} from 'src/interfaces'; import {Punishment} from 'src/interfaces';
import DatabaseServer from '../components/DatabaseServer.js'; import DatabaseServer from '../components/DatabaseServer.js';
import {Model, DataTypes} from 'sequelize'; import {Model, DataTypes} from '@sequelize/core';
import CacheServer from '../components/CacheServer.js'; import CacheServer from '../components/CacheServer.js';
import Formatters from '../helpers/Formatters.js'; import Formatters from '../helpers/Formatters.js';
const PAST_TENSE_MAPPING = {
ban: 'banned',
softban: 'softbanned',
kick: 'kicked',
mute: 'muted',
warn: 'warned',
remind: 'reminded'
};
const TRANSACTION_FAILED = 'An error occurred while updating the database. See console for more details.';
class punishments extends Model { class punishments extends Model {
declare public case_id: number; declare public case_id: number;
declare public type: string; declare public type: string;
@ -84,20 +96,20 @@ export class PunishmentsSvc {
} }
query = async(pattern:string)=>await this.model.sequelize.query(pattern); query = async(pattern:string)=>await this.model.sequelize.query(pattern);
async updateReason(caseId:number, reason:string) { async updateReason(caseId:number, reason:string) {
const findCase = this.findCase(caseId); const findCase = this.findCaseOrCancels('case_id', caseId);
if (findCase) return this.model.update({reason: reason}, {where: {case_id: caseId}}); if (findCase) return this.model.update({reason}, {where: {case_id: caseId}});
} }
findCase =(caseId:number)=>this.model.findOne({where: {case_id: caseId}}); findCaseOrCancels = (column:'case_id'|'cancels', id:number)=>this.model.findOne({where: {[column]: id}});
findByCancels =(caseId:number)=>this.model.findOne({where: {cancels: caseId}})
getAllCases =()=>this.model.findAll(); getAllCases =()=>this.model.findAll();
async generateCaseId() { async generateCaseId() {
const result = await this.model.findAll(); const result = await this.model.max('case_id');
return Math.max(...result.map((x:Punishment)=>x.case_id), 0) + 1; if (typeof result === 'number') return result + 1;
else return 0;
} }
async findInCache():Promise<any> { async findInCache():Promise<Punishment[]> {
const cacheKey = 'punishments'; const cacheKey = 'punishments';
const cachedResult = await CacheServer.get(cacheKey, true); const cachedResult = await CacheServer.get(cacheKey, true);
let result:any; let result:Punishment[];
if (cachedResult) result = cachedResult; if (cachedResult) result = cachedResult;
else { else {
result = await this.model.findAll(); result = await this.model.findAll();
@ -132,16 +144,7 @@ export class PunishmentsSvc {
} }
(this.client.channels.cache.get(channel) as Discord.TextChannel).send({embeds: [embed]}); (this.client.channels.cache.get(channel) as Discord.TextChannel).send({embeds: [embed]});
} }
getPastTense(type:string) { getPastTense =(type:string)=>PAST_TENSE_MAPPING[type];
return {
ban: 'banned',
softban: 'softbanned',
kick: 'kicked',
mute: 'muted',
warn: 'warned',
remind: 'reminded'
}[type];
}
async punishmentAdd(type:string, options:{time?:string, interaction?:Discord.ChatInputCommandInteraction}, moderator:string, reason: string, user:Discord.User, guildUser?:Discord.GuildMember) { async punishmentAdd(type:string, options:{time?:string, interaction?:Discord.ChatInputCommandInteraction}, moderator:string, reason: string, user:Discord.User, guildUser?:Discord.GuildMember) {
const {time, interaction} = options; const {time, interaction} = options;
const now = Date.now(); const now = Date.now();
@ -165,14 +168,22 @@ export class PunishmentsSvc {
if (guildUser) await guildUser.send(`You've been ${this.getPastTense(type)} ${inOrFromBoolean} **${guild.name}**${durText}\n\`${reason}\` (Case #${punishment.case_id})`).catch(()=>embed.setFooter({text: 'Unable to DM a member'})); if (guildUser) await guildUser.send(`You've been ${this.getPastTense(type)} ${inOrFromBoolean} **${guild.name}**${durText}\n\`${reason}\` (Case #${punishment.case_id})`).catch(()=>embed.setFooter({text: 'Unable to DM a member'}));
if (['ban', 'softban'].includes(type)) { switch (type) {
case 'ban':
case 'softban': {
const alreadyBanned = await guild.bans.fetch(user.id).catch(()=>null); // 172800 seconds is 48 hours, just for future reference const alreadyBanned = await guild.bans.fetch(user.id).catch(()=>null); // 172800 seconds is 48 hours, just for future reference
if (!alreadyBanned) punishmentResult = await guild.bans.create(user.id, {reason: auditLogReason, deleteMessageSeconds: 172800}).catch((err:Error)=>err.message); if (alreadyBanned) punishmentResult = `This user already exists in the guild\'s ban list.\nReason: \`${alreadyBanned?.reason}\``;
else punishmentResult = `This user already exists in the guild\'s ban list.\nReason: \`${alreadyBanned?.reason}\``; else punishmentResult = await guild.bans.create(user.id, {reason: auditLogReason, deleteMessageSeconds: 172800}).catch((err:Error)=>err.message);
} else if (type === 'kick') punishmentResult = await guildUser?.kick(auditLogReason).catch((err:Error)=>err.message);
else if (type === 'mute') punishmentResult = await guildUser?.timeout(millisecondTime, auditLogReason).catch((err:Error)=>err.message);
if (type === 'softban' && typeof punishmentResult !== 'string') punishmentResult = await guild.bans.remove(user.id, auditLogReason).catch((err:Error)=>err.message); if (type === 'softban' && typeof punishmentResult !== 'string') punishmentResult = await guild.bans.remove(user.id, auditLogReason).catch((err:Error)=>err.message);
break;
}
case 'kick':
punishmentResult = await guildUser?.kick(auditLogReason).catch((err:Error)=>err.message);
break;
case 'mute':
punishmentResult = await guildUser?.timeout(millisecondTime, auditLogReason).catch((err:Error)=>err.message);
break;
}
if (millisecondTime && ['ban', 'mute'].includes(type)) { if (millisecondTime && ['ban', 'mute'].includes(type)) {
punishment.endTime = now + millisecondTime; punishment.endTime = now + millisecondTime;
@ -183,9 +194,9 @@ export class PunishmentsSvc {
if (interaction) return interaction.editReply(punishmentResult); if (interaction) return interaction.editReply(punishmentResult);
else return punishmentResult; else return punishmentResult;
} else { } else {
const checkIfExists = await this.model.findOne({where: {case_id: punishment.case_id}}); try { // https://sequelize.org/docs/v7/querying/transactions/
if (checkIfExists) this.model.update({expired: punishment.expired, time: punishment.time, endTime: punishment.endTime}, {where: {case_id: punishment.case_id}}) await this.model.sequelize.transaction(async transaction=>{
else await this.model.create({ await this.model.upsert({
case_id: punishment.case_id, case_id: punishment.case_id,
type: punishment.type, type: punishment.type,
member_name: punishment.member_name, member_name: punishment.member_name,
@ -197,8 +208,14 @@ export class PunishmentsSvc {
endTime: punishment.endTime, endTime: punishment.endTime,
cancels: punishment.cancels, cancels: punishment.cancels,
duration: punishment.duration duration: punishment.duration
}); }, {transaction});
await this.createModlog(punishment); await this.createModlog(punishment);
});
} catch (err) {
Logger.console('error', 'Punishment', err);
Logger.console('log', 'Punishment:Transaction', TRANSACTION_FAILED);
return;
}
if (interaction) return interaction.editReply({embeds: [embed]}); if (interaction) return interaction.editReply({embeds: [embed]});
else return punishmentResult; else return punishmentResult;
@ -217,20 +234,29 @@ export class PunishmentsSvc {
let removePunishmentData:Punishment = {type: `un${punishment.type}`, case_id: ID, cancels: punishment.case_id, member_name: punishment.member_name, member: punishment.member, reason, moderator, time: now}; let removePunishmentData:Punishment = {type: `un${punishment.type}`, case_id: ID, cancels: punishment.case_id, member_name: punishment.member_name, member: punishment.member, reason, moderator, time: now};
let removePunishmentResult:any; let removePunishmentResult:any;
if (punishment.type === 'ban') removePunishmentResult = await guild.bans.remove(punishment.member, auditLogReason).catch((err:Error)=>err.message); switch (punishment.type) {
else if (punishment.type === 'mute') { case 'ban':
removePunishmentResult = await guild.bans.remove(punishment.member, auditLogReason).catch((err:Error)=>err.message);
break;
case 'mute':
if (guildUser) { if (guildUser) {
removePunishmentResult = await guildUser.timeout(null, auditLogReason).catch((err:Error)=>err.message); removePunishmentResult = await guildUser.timeout(null, auditLogReason).catch((err:Error)=>err.message);
guildUser.send(`You've been unmuted in **${guild.name}**.`).catch(()=>null); guildUser.send(`You've been unmuted in **${guild.name}**.`).catch(()=>null);
} else this.model.update({expired: true}, {where: {case_id: caseId}}); } else this.model.update({expired: true}, {where: {case_id: caseId}});
} else removePunishmentData.type = 'punishmentOverride'; break;
default:
removePunishmentData.type = 'punishmentOverride';
break;
}
if (typeof removePunishmentResult === 'string') {// Punishment was unsuccessful if (typeof removePunishmentResult === 'string') {// Punishment was unsuccessful
if (interaction) return interaction.editReply(removePunishmentResult); if (interaction) return interaction.editReply(removePunishmentResult);
else return removePunishmentResult; else return removePunishmentResult;
} else { } else {
this.model.update({expired: true}, {where: {case_id: caseId}}).then(()=> try { // https://sequelize.org/docs/v7/querying/transactions/
this.model.create({ await this.model.sequelize.transaction(async transaction=>{
await this.model.update({expired: true}, {where: {case_id: caseId}, transaction})
await this.model.upsert({
case_id: removePunishmentData.case_id, case_id: removePunishmentData.case_id,
type: removePunishmentData.type, type: removePunishmentData.type,
member_name: removePunishmentData.member_name, member_name: removePunishmentData.member_name,
@ -242,9 +268,14 @@ export class PunishmentsSvc {
endTime: removePunishmentData.endTime, endTime: removePunishmentData.endTime,
cancels: removePunishmentData.cancels, cancels: removePunishmentData.cancels,
duration: removePunishmentData.duration duration: removePunishmentData.duration
}) }, {transaction});
);
await this.createModlog(removePunishmentData); await this.createModlog(removePunishmentData);
});
} catch (err) {
Logger.console('error', 'Punishment', err);
Logger.console('log', 'Punishment:Transaction', TRANSACTION_FAILED);
return;
}
if (interaction) return interaction.reply({embeds: [new this.client.embed() if (interaction) return interaction.reply({embeds: [new this.client.embed()
.setColor(this.client.config.embedColor) .setColor(this.client.config.embedColor)

View File

@ -1,5 +1,5 @@
import DatabaseServer from '../components/DatabaseServer.js'; import DatabaseServer from '../components/DatabaseServer.js';
import {Model, DataTypes} from 'sequelize'; import {Model, DataTypes} from '@sequelize/core';
class suggestions extends Model { class suggestions extends Model {
declare public id: number; declare public id: number;

View File

@ -2,7 +2,7 @@ import TClient from '../client.js';
import MessageTool from '../helpers/MessageTool.js'; import MessageTool from '../helpers/MessageTool.js';
import CacheServer from '../components/CacheServer.js'; import CacheServer from '../components/CacheServer.js';
import DatabaseServer from '../components/DatabaseServer.js'; import DatabaseServer from '../components/DatabaseServer.js';
import {Model, DataTypes} from 'sequelize'; import {Model, DataTypes} from '@sequelize/core';
import {ChatInputCommandInteraction, Snowflake} from 'discord.js'; import {ChatInputCommandInteraction, Snowflake} from 'discord.js';
class tagsystem extends Model { class tagsystem extends Model {
@ -79,7 +79,7 @@ export class TagSystemSvc {
async findInCache(): Promise<Tags[]> { async findInCache(): Promise<Tags[]> {
const cacheKey = 'tags'; const cacheKey = 'tags';
const cachedResult = await CacheServer.get(cacheKey, true); const cachedResult = await CacheServer.get(cacheKey, true);
let result; let result:Tags[];
if (cachedResult) result = cachedResult; if (cachedResult) result = cachedResult;
else { else {
result = await this.model.findAll(); result = await this.model.findAll();

View File

@ -2,7 +2,7 @@ import Discord from 'discord.js';
import TClient from '../client.js'; import TClient from '../client.js';
import MessageTool from '../helpers/MessageTool.js'; import MessageTool from '../helpers/MessageTool.js';
import DatabaseServer from '../components/DatabaseServer.js'; import DatabaseServer from '../components/DatabaseServer.js';
import {Model, DataTypes} from 'sequelize'; import {Model, DataTypes} from '@sequelize/core';
import {writeFileSync} from 'node:fs'; import {writeFileSync} from 'node:fs';
import cron from 'node-cron'; import cron from 'node-cron';
import Logger from '../helpers/Logger.js'; import Logger from '../helpers/Logger.js';
@ -61,9 +61,9 @@ export class UserLevelsSvc {
fetchEveryone = async()=>await this.model.findAll(); fetchEveryone = async()=>await this.model.findAll();
fetchUser = async(userId:string)=>await this.model.findByPk(userId); fetchUser = async(userId:string)=>await this.model.findByPk(userId);
deleteUser = async(userId:string)=>await this.model.destroy({where: {id: userId}}); deleteUser = async(userId:string)=>await this.model.destroy({where: {id: userId}});
async modifyUser(userId:string, updatedMessages:number) { async modifyUser(userId:string, messages:number) {
await this.model.update({messages: updatedMessages}, {where: {id: userId}}); const [_, [updatedUser]] = await this.model.update({messages}, {where: {id: userId}, returning: true});
return (await this.model.findByPk(userId)).dataValues; return updatedUser.dataValues;
} }
async blockUser(userId:string, duration:number):Promise<boolean> { async blockUser(userId:string, duration:number):Promise<boolean> {
const data = await this.model.findByPk(userId); const data = await this.model.findByPk(userId);
@ -74,8 +74,8 @@ export class UserLevelsSvc {
} }
} }
async getActiveUsers() { async getActiveUsers() {
const members = (await this.model.findAll()).sort((a,b)=>b.dataValues.messages-a.dataValues.messages); const members = await this.model.findAll({order: [['messages', 'DESC']], limit: 5});
return members.slice(0, 5); return members;
} }
async messageIncremental(userId:string) { async messageIncremental(userId:string) {
const data = await this.model.findByPk(userId); const data = await this.model.findByPk(userId);
@ -119,7 +119,7 @@ export class UserLevelsSvc {
Logger.console('log', 'Cron:resetAllData', `Counted ${performCountBeforeReset.toLocaleString()} members before reset`); Logger.console('log', 'Cron:resetAllData', `Counted ${performCountBeforeReset.toLocaleString()} members before reset`);
await this.client.dailyMsgs.nukeDays(); await this.client.dailyMsgs.nukeDays();
await this.model.drop().then(async()=>await this.model.sync()); await this.model.truncate();
try { try {
// Send notification to dcServer's logs channel after cronjob is complete. // Send notification to dcServer's logs channel after cronjob is complete.
@ -139,16 +139,12 @@ export class UserLevelsSvc {
// Reset LRSstart to current Epoch and save it to config file // Reset LRSstart to current Epoch and save it to config file
const newEpoch = new Date().getTime(); const newEpoch = new Date().getTime();
if (this.client.config.LRSstart !== newEpoch) {
this.client.config.LRSstart = newEpoch; this.client.config.LRSstart = newEpoch;
const logText = `Resetting LRSstart to \`${newEpoch}\`, saved to config file`; Logger.console('log', 'Cron:resetAllData', `Resetting LRSstart to \`${newEpoch}\`, saved to config file`);
Logger.console('log', 'DailyMsgs', logText);
(this.client.channels.resolve(this.client.config.dcServer.channels.bot_log) as Discord.TextChannel).send({embeds: [new this.client.embed()
.setColor(this.client.config.embedColorXmas)
.setTitle('Happy New Years! Level System is clean!')
.setDescription(logText)
]}).catch(err=>console.log(err));
writeFileSync('src/config.json', JSON.stringify(this.client.config, null, 2)); writeFileSync('src/config.json', JSON.stringify(this.client.config, null, 2));
Logger.console('log', 'Cron:resetAllData', 'Job completed'); Logger.console('log', 'Cron:resetAllData', 'Job completed');
}
}) })
} }
algorithm = (level:number)=>level*level*15; algorithm = (level:number)=>level*level*15;

View File

@ -1,5 +1,5 @@
import DatabaseServer from '../components/DatabaseServer.js'; import DatabaseServer from '../components/DatabaseServer.js';
import {Model, DataTypes} from 'sequelize'; import {Model, DataTypes} from '@sequelize/core';
class youtubeChannels extends Model { class youtubeChannels extends Model {
declare public ytchannel: string; declare public ytchannel: string;
@ -36,9 +36,8 @@ export class YouTubeChannelsSvc {
} }
query = async(pattern:string)=>await this.model.sequelize.query(pattern); query = async(pattern:string)=>await this.model.sequelize.query(pattern);
async addChannel(YTChannelID:string, DCChannelID:string, DCRole:string) { async addChannel(YTChannelID:string, DCChannelID:string, DCRole:string) {
if (await this.model.findOne({where: {ytchannel: YTChannelID}})) return false; const [_, created] = await this.model.findOrCreate({where: {ytchannel: YTChannelID}, defaults: {dcchannel: DCChannelID, dcrole: DCRole}});
await this.model.create({ytchannel: YTChannelID, dcchannel: DCChannelID, dcrole: DCRole}); return created;
return true;
} }
delChannel = async(YTChannelID:string)=>await this.model.destroy({where: {ytchannel: YTChannelID}}); delChannel = async(YTChannelID:string)=>await this.model.destroy({where: {ytchannel: YTChannelID}});
getChannels = async()=>await this.model.findAll(); getChannels = async()=>await this.model.findAll();

358
yarn.lock
View File

@ -215,6 +215,33 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@nodelib/fs.scandir@npm:2.1.5":
version: 2.1.5
resolution: "@nodelib/fs.scandir@npm:2.1.5"
dependencies:
"@nodelib/fs.stat": "npm:2.0.5"
run-parallel: "npm:^1.1.9"
checksum: 10/6ab2a9b8a1d67b067922c36f259e3b3dfd6b97b219c540877a4944549a4d49ea5ceba5663905ab5289682f1f3c15ff441d02f0447f620a42e1cb5e1937174d4b
languageName: node
linkType: hard
"@nodelib/fs.stat@npm:2.0.5, @nodelib/fs.stat@npm:^2.0.2":
version: 2.0.5
resolution: "@nodelib/fs.stat@npm:2.0.5"
checksum: 10/012480b5ca9d97bff9261571dbbec7bbc6033f69cc92908bc1ecfad0792361a5a1994bc48674b9ef76419d056a03efadfce5a6cf6dbc0a36559571a7a483f6f0
languageName: node
linkType: hard
"@nodelib/fs.walk@npm:^1.2.3":
version: 1.2.8
resolution: "@nodelib/fs.walk@npm:1.2.8"
dependencies:
"@nodelib/fs.scandir": "npm:2.1.5"
fastq: "npm:^1.6.0"
checksum: 10/40033e33e96e97d77fba5a238e4bba4487b8284678906a9f616b5579ddaf868a18874c0054a75402c9fbaaa033a25ceae093af58c9c30278e35c23c9479e79b0
languageName: node
linkType: hard
"@octokit/auth-token@npm:^4.0.0": "@octokit/auth-token@npm:^4.0.0":
version: 4.0.0 version: 4.0.0
resolution: "@octokit/auth-token@npm:4.0.0" resolution: "@octokit/auth-token@npm:4.0.0"
@ -427,6 +454,50 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@sequelize/core@npm:7.0.0-alpha.37":
version: 7.0.0-alpha.37
resolution: "@sequelize/core@npm:7.0.0-alpha.37"
dependencies:
"@types/debug": "npm:^4.1.7"
"@types/validator": "npm:^13.7.5"
bnf-parser: "npm:3.1.6"
dayjs: "npm:^1.11.5"
debug: "npm:^4.3.4"
dottie: "npm:^2.0.2"
fast-glob: "npm:^3.2.12"
inflection: "npm:^3.0.0"
lodash: "npm:^4.17.21"
pg-connection-string: "npm:^2.5.0"
pg-hstore: "npm:^2.3.4"
retry-as-promised: "npm:^7.0.3"
semver: "npm:^7.3.7"
sequelize-pool: "npm:^8.0.0"
toposort-class: "npm:^1.0.1"
type-fest: "npm:^3.0.0"
uuid: "npm:^9.0.0"
validator: "npm:^13.7.0"
wkx: "npm:^0.5.0"
peerDependenciesMeta:
ibm_db:
optional: true
mariadb:
optional: true
mysql2:
optional: true
odbc:
optional: true
pg:
optional: true
snowflake-sdk:
optional: true
sqlite3:
optional: true
tedious:
optional: true
checksum: 10/dcaadb079bc5fcc505efbfff18ca8165dae4a24ad9c9f9f99e91474343e27986ceef702a69db0ab5406988b151dfa76f05e536425c08b29e80e10da70bb437fd
languageName: node
linkType: hard
"@toast/tokenservice-client@npm:1.0.16": "@toast/tokenservice-client@npm:1.0.16":
version: 1.0.16 version: 1.0.16
resolution: "@toast/tokenservice-client@npm:1.0.16::__archiveUrl=https%3A%2F%2Fgit.toast-server.net%2Fapi%2Fpackages%2Ftoast%2Fnpm%2F%2540toast%252Ftokenservice-client%2F-%2F1.0.16%2Ftokenservice-client-1.0.16.tgz" resolution: "@toast/tokenservice-client@npm:1.0.16::__archiveUrl=https%3A%2F%2Fgit.toast-server.net%2Fapi%2Fpackages%2Ftoast%2Fnpm%2F%2540toast%252Ftokenservice-client%2F-%2F1.0.16%2Ftokenservice-client-1.0.16.tgz"
@ -436,23 +507,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@types/bluebird@npm:*": "@types/debug@npm:^4.1.7":
version: 3.5.42
resolution: "@types/bluebird@npm:3.5.42"
checksum: 10/09ad60b083f916c7611936d3c70986df8f2eae11e46768ab7901d86bee5b1ca6b00cd9ef8cc0d3761256e2bc4ada3388e5529f71745a6b3d7602e868e3530310
languageName: node
linkType: hard
"@types/continuation-local-storage@npm:*":
version: 3.2.7
resolution: "@types/continuation-local-storage@npm:3.2.7"
dependencies:
"@types/node": "npm:*"
checksum: 10/1f272b53bc56774773b7cbd6019ae26843599fb9073cb70c3dda13f8bfac5eabb6c8bf33f548a37be9c6d772eb9a4ab4399bc7d25bc82588655f51f572df79f3
languageName: node
linkType: hard
"@types/debug@npm:^4.1.8":
version: 4.1.12 version: 4.1.12
resolution: "@types/debug@npm:4.1.12" resolution: "@types/debug@npm:4.1.12"
dependencies: dependencies:
@ -461,13 +516,6 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@types/lodash@npm:*":
version: 4.14.202
resolution: "@types/lodash@npm:4.14.202"
checksum: 10/1bb9760a5b1dda120132c4b987330d67979c95dbc22612678682cd61b00302e190f4207228f3728580059cdab5582362262e3819aea59960c1017bd2b9fb26f6
languageName: node
linkType: hard
"@types/ms@npm:*, @types/ms@npm:0.7.34": "@types/ms@npm:*, @types/ms@npm:0.7.34":
version: 0.7.34 version: 0.7.34
resolution: "@types/ms@npm:0.7.34" resolution: "@types/ms@npm:0.7.34"
@ -502,19 +550,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@types/sequelize@npm:4.28.20": "@types/validator@npm:^13.7.5":
version: 4.28.20
resolution: "@types/sequelize@npm:4.28.20"
dependencies:
"@types/bluebird": "npm:*"
"@types/continuation-local-storage": "npm:*"
"@types/lodash": "npm:*"
"@types/validator": "npm:*"
checksum: 10/8b3faec2e650ee299ae8a8a06bab7bd928131938ba34c7faa1d5c099682d6649e7aa68b0540a3e4883db7e3bc10d043ae3f23624d11b42a60f6bcbd40800ffac
languageName: node
linkType: hard
"@types/validator@npm:*, @types/validator@npm:^13.7.17":
version: 13.11.9 version: 13.11.9
resolution: "@types/validator@npm:13.11.9" resolution: "@types/validator@npm:13.11.9"
checksum: 10/2d397c69293cc726e0cf1b4c74c563ca4e459b00f216f3ff0ac184c9648103be27169e8c67f85be9c6e7a3fcbb149c6add66a2547b185a1b25aa79e4b61261bd checksum: 10/2d397c69293cc726e0cf1b4c74c563ca4e459b00f216f3ff0ac184c9648103be27169e8c67f85be9c6e7a3fcbb149c6add66a2547b185a1b25aa79e4b61261bd
@ -560,6 +596,22 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"bnf-parser@npm:3.1.6":
version: 3.1.6
resolution: "bnf-parser@npm:3.1.6"
checksum: 10/caaf7078e2a5a9ab97f7f0b65eb1d034b5f5b9f80b189fee9ff3b9aa36dad79820b12f978eb079a7c8b3da37a7bd65b763313deee5058fc76c5d6900d2e3b981
languageName: node
linkType: hard
"braces@npm:^3.0.2":
version: 3.0.2
resolution: "braces@npm:3.0.2"
dependencies:
fill-range: "npm:^7.0.1"
checksum: 10/966b1fb48d193b9d155f810e5efd1790962f2c4e0829f8440b8ad236ba009222c501f70185ef732fef17a4c490bb33a03b90dab0631feafbdf447da91e8165b1
languageName: node
linkType: hard
"buffer-writer@npm:2.0.0": "buffer-writer@npm:2.0.0":
version: 2.0.0 version: 2.0.0
resolution: "buffer-writer@npm:2.0.0" resolution: "buffer-writer@npm:2.0.0"
@ -587,12 +639,12 @@ __metadata:
dependencies: dependencies:
"@napi-rs/canvas": "npm:0.1.51" "@napi-rs/canvas": "npm:0.1.51"
"@octokit/rest": "npm:20.0.2" "@octokit/rest": "npm:20.0.2"
"@sequelize/core": "npm:7.0.0-alpha.37"
"@toast/tokenservice-client": "npm:1.0.16" "@toast/tokenservice-client": "npm:1.0.16"
"@types/ms": "npm:0.7.34" "@types/ms": "npm:0.7.34"
"@types/node": "npm:20.11.28" "@types/node": "npm:20.11.28"
"@types/node-cron": "npm:3.0.11" "@types/node-cron": "npm:3.0.11"
"@types/pg": "npm:8.11.2" "@types/pg": "npm:8.11.2"
"@types/sequelize": "npm:4.28.20"
ansi-colors: "npm:4.1.3" ansi-colors: "npm:4.1.3"
dayjs: "npm:1.11.10" dayjs: "npm:1.11.10"
discord.js: "npm:14.14.1" discord.js: "npm:14.14.1"
@ -602,8 +654,8 @@ __metadata:
node-cron: "npm:3.0.3" node-cron: "npm:3.0.3"
pg: "npm:8.11.3" pg: "npm:8.11.3"
pg-hstore: "npm:2.3.4" pg-hstore: "npm:2.3.4"
postgres-array: "npm:3.0.2"
redis: "npm:4.6.13" redis: "npm:4.6.13"
sequelize: "npm:6.37.1"
simple-git: "npm:3.23.0" simple-git: "npm:3.23.0"
systeminformation: "npm:5.22.3" systeminformation: "npm:5.22.3"
typescript: "npm:5.4.2" typescript: "npm:5.4.2"
@ -611,7 +663,7 @@ __metadata:
languageName: unknown languageName: unknown
linkType: soft linkType: soft
"dayjs@npm:1.11.10": "dayjs@npm:1.11.10, dayjs@npm:^1.11.5":
version: 1.11.10 version: 1.11.10
resolution: "dayjs@npm:1.11.10" resolution: "dayjs@npm:1.11.10"
checksum: 10/27e8f5bc01c0a76f36c656e62ab7f08c2e7b040b09e613cd4844abf03fb258e0350f0a83b02c887b84d771c1f11e092deda0beef8c6df2a1afbc3f6c1fade279 checksum: 10/27e8f5bc01c0a76f36c656e62ab7f08c2e7b040b09e613cd4844abf03fb258e0350f0a83b02c887b84d771c1f11e092deda0beef8c6df2a1afbc3f6c1fade279
@ -673,7 +725,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"dottie@npm:^2.0.6": "dottie@npm:^2.0.2":
version: 2.0.6 version: 2.0.6
resolution: "dottie@npm:2.0.6" resolution: "dottie@npm:2.0.6"
checksum: 10/698731cfa2c1b530ba3491fa864dc572678a2a6de801f25912e2e4d7d4669ae013b696711786016bf41c7b6f98057c678503f14550bb171b3f70cdadffb9218f checksum: 10/698731cfa2c1b530ba3491fa864dc572678a2a6de801f25912e2e4d7d4669ae013b696711786016bf41c7b6f98057c678503f14550bb171b3f70cdadffb9218f
@ -694,6 +746,19 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"fast-glob@npm:^3.2.12":
version: 3.3.2
resolution: "fast-glob@npm:3.3.2"
dependencies:
"@nodelib/fs.stat": "npm:^2.0.2"
"@nodelib/fs.walk": "npm:^1.2.3"
glob-parent: "npm:^5.1.2"
merge2: "npm:^1.3.0"
micromatch: "npm:^4.0.4"
checksum: 10/222512e9315a0efca1276af9adb2127f02105d7288fa746145bf45e2716383fb79eb983c89601a72a399a56b7c18d38ce70457c5466218c5f13fad957cee16df
languageName: node
linkType: hard
"fast-xml-parser@npm:4.3.6": "fast-xml-parser@npm:4.3.6":
version: 4.3.6 version: 4.3.6
resolution: "fast-xml-parser@npm:4.3.6" resolution: "fast-xml-parser@npm:4.3.6"
@ -705,6 +770,24 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"fastq@npm:^1.6.0":
version: 1.17.1
resolution: "fastq@npm:1.17.1"
dependencies:
reusify: "npm:^1.0.4"
checksum: 10/a443180068b527dd7b3a63dc7f2a47ceca2f3e97b9c00a1efe5538757e6cc4056a3526df94308075d7727561baf09ebaa5b67da8dcbddb913a021c5ae69d1f69
languageName: node
linkType: hard
"fill-range@npm:^7.0.1":
version: 7.0.1
resolution: "fill-range@npm:7.0.1"
dependencies:
to-regex-range: "npm:^5.0.1"
checksum: 10/e260f7592fd196b4421504d3597cc76f4a1ca7a9488260d533b611fc3cefd61e9a9be1417cb82d3b01ad9f9c0ff2dbf258e1026d2445e26b0cf5148ff4250429
languageName: node
linkType: hard
"fraction.js@npm:4.3.4": "fraction.js@npm:4.3.4":
version: 4.3.4 version: 4.3.4
resolution: "fraction.js@npm:4.3.4" resolution: "fraction.js@npm:4.3.4"
@ -719,10 +802,42 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"inflection@npm:^1.13.4": "glob-parent@npm:^5.1.2":
version: 1.13.4 version: 5.1.2
resolution: "inflection@npm:1.13.4" resolution: "glob-parent@npm:5.1.2"
checksum: 10/a0cc1b105ccbda9607b5d1610b5c7aa35456ca06b7f3573a47c677e1f829052859cacc36601c3c07de89cb756616a440814ef2d190a6ae70398e6aa6efc2a547 dependencies:
is-glob: "npm:^4.0.1"
checksum: 10/32cd106ce8c0d83731966d31517adb766d02c3812de49c30cfe0675c7c0ae6630c11214c54a5ae67aca882cf738d27fd7768f21aa19118b9245950554be07247
languageName: node
linkType: hard
"inflection@npm:^3.0.0":
version: 3.0.0
resolution: "inflection@npm:3.0.0"
checksum: 10/e8aae6abb872a8aa19184a1b84470fff7120806329c78011befcf50bce04a7b0d65012ac373f2cc5caeaaf241874c7ae20a26038ff7dbe0cdae0b863f25b5e02
languageName: node
linkType: hard
"is-extglob@npm:^2.1.1":
version: 2.1.1
resolution: "is-extglob@npm:2.1.1"
checksum: 10/df033653d06d0eb567461e58a7a8c9f940bd8c22274b94bf7671ab36df5719791aae15eef6d83bbb5e23283967f2f984b8914559d4449efda578c775c4be6f85
languageName: node
linkType: hard
"is-glob@npm:^4.0.1":
version: 4.0.3
resolution: "is-glob@npm:4.0.3"
dependencies:
is-extglob: "npm:^2.1.1"
checksum: 10/3ed74f2b0cdf4f401f38edb0442ddfde3092d79d7d35c9919c86641efdbcbb32e45aa3c0f70ce5eecc946896cd5a0f26e4188b9f2b881876f7cb6c505b82da11
languageName: node
linkType: hard
"is-number@npm:^7.0.0":
version: 7.0.0
resolution: "is-number@npm:7.0.0"
checksum: 10/6a6c3383f68afa1e05b286af866017c78f1226d43ac8cb064e115ff9ed85eb33f5c4f7216c96a71e4dfea289ef52c5da3aef5bbfade8ffe47a0465d70c0c8e86
languageName: node languageName: node
linkType: hard linkType: hard
@ -782,19 +897,20 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"moment-timezone@npm:^0.5.43": "merge2@npm:^1.3.0":
version: 0.5.45 version: 1.4.1
resolution: "moment-timezone@npm:0.5.45" resolution: "merge2@npm:1.4.1"
dependencies: checksum: 10/7268db63ed5169466540b6fb947aec313200bcf6d40c5ab722c22e242f651994619bcd85601602972d3c85bd2cc45a358a4c61937e9f11a061919a1da569b0c2
moment: "npm:^2.29.4"
checksum: 10/45e3793d44bea8e826c934a335ebf0b92c6d6dae562fdb59d8c45a16d5c11de4d6692b5fa7eebca969881f06b81b55f8535883bfbc727b597d601709fa5a2bb2
languageName: node languageName: node
linkType: hard linkType: hard
"moment@npm:^2.29.4": "micromatch@npm:^4.0.4":
version: 2.30.1 version: 4.0.5
resolution: "moment@npm:2.30.1" resolution: "micromatch@npm:4.0.5"
checksum: 10/ae42d876d4ec831ef66110bdc302c0657c664991e45cf2afffc4b0f6cd6d251dde11375c982a5c0564ccc0fa593fc564576ddceb8c8845e87c15f58aa6baca69 dependencies:
braces: "npm:^3.0.2"
picomatch: "npm:^2.3.1"
checksum: 10/a749888789fc15cac0e03273844dbd749f9f8e8d64e70c564bcf06a033129554c789bb9e30d7566d7ff6596611a08e58ac12cf2a05f6e3c9c47c50c4c7e12fa2
languageName: node languageName: node
linkType: hard linkType: hard
@ -851,14 +967,14 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"pg-connection-string@npm:^2.6.1, pg-connection-string@npm:^2.6.2": "pg-connection-string@npm:^2.5.0, pg-connection-string@npm:^2.6.2":
version: 2.6.2 version: 2.6.2
resolution: "pg-connection-string@npm:2.6.2" resolution: "pg-connection-string@npm:2.6.2"
checksum: 10/22265882c3b6f2320785378d0760b051294a684989163d5a1cde4009e64e84448d7bf67d9a7b9e7f69440c3ee9e2212f9aa10dd17ad6773f6143c6020cebbcb5 checksum: 10/22265882c3b6f2320785378d0760b051294a684989163d5a1cde4009e64e84448d7bf67d9a7b9e7f69440c3ee9e2212f9aa10dd17ad6773f6143c6020cebbcb5
languageName: node languageName: node
linkType: hard linkType: hard
"pg-hstore@npm:2.3.4": "pg-hstore@npm:2.3.4, pg-hstore@npm:^2.3.4":
version: 2.3.4 version: 2.3.4
resolution: "pg-hstore@npm:2.3.4" resolution: "pg-hstore@npm:2.3.4"
dependencies: dependencies:
@ -958,6 +1074,20 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"picomatch@npm:^2.3.1":
version: 2.3.1
resolution: "picomatch@npm:2.3.1"
checksum: 10/60c2595003b05e4535394d1da94850f5372c9427ca4413b71210f437f7b2ca091dbd611c45e8b37d10036fa8eade25c1b8951654f9d3973bfa66a2ff4d3b08bc
languageName: node
linkType: hard
"postgres-array@npm:3.0.2, postgres-array@npm:~3.0.1":
version: 3.0.2
resolution: "postgres-array@npm:3.0.2"
checksum: 10/0159517e4e5f263bf9e324f0c4d3c10244a294021f2b5980abc8c23afdb965370a7fc0c82012fce4d28e83186ad089b6476b05fcef6c88f8e43e37a3a2fa0ad5
languageName: node
linkType: hard
"postgres-array@npm:~2.0.0": "postgres-array@npm:~2.0.0":
version: 2.0.0 version: 2.0.0
resolution: "postgres-array@npm:2.0.0" resolution: "postgres-array@npm:2.0.0"
@ -965,13 +1095,6 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"postgres-array@npm:~3.0.1":
version: 3.0.2
resolution: "postgres-array@npm:3.0.2"
checksum: 10/0159517e4e5f263bf9e324f0c4d3c10244a294021f2b5980abc8c23afdb965370a7fc0c82012fce4d28e83186ad089b6476b05fcef6c88f8e43e37a3a2fa0ad5
languageName: node
linkType: hard
"postgres-bytea@npm:~1.0.0": "postgres-bytea@npm:~1.0.0":
version: 1.0.0 version: 1.0.0
resolution: "postgres-bytea@npm:1.0.0" resolution: "postgres-bytea@npm:1.0.0"
@ -1025,6 +1148,13 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"queue-microtask@npm:^1.2.2":
version: 1.2.3
resolution: "queue-microtask@npm:1.2.3"
checksum: 10/72900df0616e473e824202113c3df6abae59150dfb73ed13273503127235320e9c8ca4aaaaccfd58cf417c6ca92a6e68ee9a5c3182886ae949a768639b388a7b
languageName: node
linkType: hard
"redis@npm:4.6.13": "redis@npm:4.6.13":
version: 4.6.13 version: 4.6.13
resolution: "redis@npm:4.6.13" resolution: "redis@npm:4.6.13"
@ -1046,13 +1176,29 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"retry-as-promised@npm:^7.0.4": "retry-as-promised@npm:^7.0.3":
version: 7.0.4 version: 7.0.4
resolution: "retry-as-promised@npm:7.0.4" resolution: "retry-as-promised@npm:7.0.4"
checksum: 10/cd9fd20e990c6980a2979348fbc198aa4a065f03242c1cd7782372da7054253927e0803291c843db07255a38d255936cc0f9da55bf826c9f75443a9dedb8bf4b checksum: 10/cd9fd20e990c6980a2979348fbc198aa4a065f03242c1cd7782372da7054253927e0803291c843db07255a38d255936cc0f9da55bf826c9f75443a9dedb8bf4b
languageName: node languageName: node
linkType: hard linkType: hard
"reusify@npm:^1.0.4":
version: 1.0.4
resolution: "reusify@npm:1.0.4"
checksum: 10/14222c9e1d3f9ae01480c50d96057228a8524706db79cdeb5a2ce5bb7070dd9f409a6f84a02cbef8cdc80d39aef86f2dd03d155188a1300c599b05437dcd2ffb
languageName: node
linkType: hard
"run-parallel@npm:^1.1.9":
version: 1.2.0
resolution: "run-parallel@npm:1.2.0"
dependencies:
queue-microtask: "npm:^1.2.2"
checksum: 10/cb4f97ad25a75ebc11a8ef4e33bb962f8af8516bb2001082ceabd8902e15b98f4b84b4f8a9b222e5d57fc3bd1379c483886ed4619367a7680dad65316993021d
languageName: node
linkType: hard
"seedrandom@npm:^3.0.5": "seedrandom@npm:^3.0.5":
version: 3.0.5 version: 3.0.5
resolution: "seedrandom@npm:3.0.5" resolution: "seedrandom@npm:3.0.5"
@ -1060,7 +1206,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"semver@npm:^7.5.4": "semver@npm:^7.3.7":
version: 7.6.0 version: 7.6.0
resolution: "semver@npm:7.6.0" resolution: "semver@npm:7.6.0"
dependencies: dependencies:
@ -1071,53 +1217,10 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"sequelize-pool@npm:^7.1.0": "sequelize-pool@npm:^8.0.0":
version: 7.1.0 version: 8.0.0
resolution: "sequelize-pool@npm:7.1.0" resolution: "sequelize-pool@npm:8.0.0"
checksum: 10/eeb0837451afb245cf3aece5d93c50ef051bd7f4397c4e578f8cbf41ebf485e0acd887c1aa3f4394b80dc874229a32ce5aafeaa2f00ec3ecc5dfcc518bd7bf7e checksum: 10/c449ec2f3444f75372fde505bf26a22724ee7336192fd7937e546759bca19256fefd39970230b4eb11f1dcb106607dae7085e14e3dc8e3c1a90d30f7874de204
languageName: node
linkType: hard
"sequelize@npm:6.37.1":
version: 6.37.1
resolution: "sequelize@npm:6.37.1"
dependencies:
"@types/debug": "npm:^4.1.8"
"@types/validator": "npm:^13.7.17"
debug: "npm:^4.3.4"
dottie: "npm:^2.0.6"
inflection: "npm:^1.13.4"
lodash: "npm:^4.17.21"
moment: "npm:^2.29.4"
moment-timezone: "npm:^0.5.43"
pg-connection-string: "npm:^2.6.1"
retry-as-promised: "npm:^7.0.4"
semver: "npm:^7.5.4"
sequelize-pool: "npm:^7.1.0"
toposort-class: "npm:^1.0.1"
uuid: "npm:^8.3.2"
validator: "npm:^13.9.0"
wkx: "npm:^0.5.0"
peerDependenciesMeta:
ibm_db:
optional: true
mariadb:
optional: true
mysql2:
optional: true
oracledb:
optional: true
pg:
optional: true
pg-hstore:
optional: true
snowflake-sdk:
optional: true
sqlite3:
optional: true
tedious:
optional: true
checksum: 10/05be9a1e67c444a0a9c2951cd9b0fd7ac08ed2b81671307ca631b4c7597f357b53a26cdff3a3e39a3cd0a927abfce18afc7a472957fcb17b4e26aa5caca97e3c
languageName: node languageName: node
linkType: hard linkType: hard
@ -1163,6 +1266,15 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"to-regex-range@npm:^5.0.1":
version: 5.0.1
resolution: "to-regex-range@npm:5.0.1"
dependencies:
is-number: "npm:^7.0.0"
checksum: 10/10dda13571e1f5ad37546827e9b6d4252d2e0bc176c24a101252153ef435d83696e2557fe128c4678e4e78f5f01e83711c703eef9814eb12dab028580d45980a
languageName: node
linkType: hard
"toposort-class@npm:^1.0.1": "toposort-class@npm:^1.0.1":
version: 1.0.1 version: 1.0.1
resolution: "toposort-class@npm:1.0.1" resolution: "toposort-class@npm:1.0.1"
@ -1184,6 +1296,13 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"type-fest@npm:^3.0.0":
version: 3.13.1
resolution: "type-fest@npm:3.13.1"
checksum: 10/9a8a2359ada34c9b3affcaf3a8f73ee14c52779e89950db337ce66fb74c3399776c697c99f2532e9b16e10e61cfdba3b1c19daffb93b338b742f0acd0117ce12
languageName: node
linkType: hard
"typed-function@npm:^4.1.1": "typed-function@npm:^4.1.1":
version: 4.1.1 version: 4.1.1
resolution: "typed-function@npm:4.1.1" resolution: "typed-function@npm:4.1.1"
@ -1257,7 +1376,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"uuid@npm:8.3.2, uuid@npm:^8.3.2": "uuid@npm:8.3.2":
version: 8.3.2 version: 8.3.2
resolution: "uuid@npm:8.3.2" resolution: "uuid@npm:8.3.2"
bin: bin:
@ -1266,7 +1385,16 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"validator@npm:^13.9.0": "uuid@npm:^9.0.0":
version: 9.0.1
resolution: "uuid@npm:9.0.1"
bin:
uuid: dist/bin/uuid
checksum: 10/9d0b6adb72b736e36f2b1b53da0d559125ba3e39d913b6072f6f033e0c87835b414f0836b45bcfaf2bdf698f92297fea1c3cc19b0b258bc182c9c43cc0fab9f2
languageName: node
linkType: hard
"validator@npm:^13.7.0":
version: 13.11.0 version: 13.11.0
resolution: "validator@npm:13.11.0" resolution: "validator@npm:13.11.0"
checksum: 10/4bf094641eb71729c06a42d669840e7189597ba655a8264adabac9bf03f95cd6fde5fbc894b0a13ee861bd4a852f56d2afdc9391aeaeb3fc0f9633a974140e12 checksum: 10/4bf094641eb71729c06a42d669840e7189597ba655a8264adabac9bf03f95cd6fde5fbc894b0a13ee861bd4a852f56d2afdc9391aeaeb3fc0f9633a974140e12