Merge 42e172c502 into 1d02e781dc

Bumps [sequelize](https://github.com/sequelize/sequelize) from 6.35.2 to 6.36.0.
- [Release notes](https://github.com/sequelize/sequelize/releases)
- [Commits](https://github.com/sequelize/sequelize/compare/v6.35.2...v6.36.0)

---
updated-dependencies:
- dependency-name: sequelize
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

package.json

@@ -32,10 +32,10 @@
   "engineStrict": true,
   "packageManager": "yarn@4.1.0+sha256.81a00df816059803e6b5148acf03ce313cad36b7f6e5af6efa040a15981a6ffb",
   "dependencies": {
-    "@napi-rs/canvas": "0.1.45",
     "@octokit/rest": "20.0.2",
     "@toast/tokenservice-client": "1.0.11",
     "ansi-colors": "4.1.3",
+    "canvas": "2.11.2",
     "dayjs": "1.11.10",
     "discord.js": "14.14.1",
     "fast-xml-parser": "4.3.4",

src/commands/dev.ts

@@ -131,7 +131,6 @@ export default class Developer {
         client.users.cache.get(member.id).send(`${message}\n╰ ${interaction.member.displayName}`).then(()=>int.edit(`Successfully sent a DM to **${member.user.username}** with the following message:\n\`\`\`${message}\`\`\``)).catch((e:Error)=>int.edit(`\`${e.message}\``))
       },
       modify_rank_msgs: async()=>{
-        if (interaction.guildId !== client.config.dcServer.id) return interaction.reply({content: 'This command is only available in the main server.', ephemeral: true});
         const member = interaction.options.getMember('member');
         const messages = interaction.options.getInteger('new-message-count');
         const oldData = await client.userLevels.fetchUser(member.id);
@@ -142,6 +141,7 @@ export default class Developer {
             `Successfully modified the message count of **${member.displayName}**`,
             `╰ Old: **${oldData.dataValues.messages.toLocaleString('en-US')}**`,
             `╰ New: **${newData.messages.toLocaleString('en-US')}**`,
+            `╰ Difference: **${(newData.messages - oldData.dataValues.messages).toLocaleString('en-US')}**`,
             'Although if you set the number too high or low, it will have a bigger impact on the leaderboard graph.'
           ))
         ]})

src/commands/mp.ts

@@ -62,7 +62,7 @@ export default class MP {
           .setImage(`attachment://${attachmentName}`)
           .setAuthor({name: `${DSS.slots.used}/${DSS.slots.capacity}`})
           .setFooter({text: `Current time: ${('0'+Math.floor((DSS?.server.dayTime/3600/1000))).slice(-2)}:${('0'+Math.floor((DSS?.server.dayTime/60/1000)%60)).slice(-2)}`})
-        ], files: [new client.attachment(canvas.toBuffer('image/jpeg'), {name: attachmentName})]})
+        ], files: [new client.attachment(canvas.toBuffer(), {name: attachmentName})]})
       },
       details: async()=>{
         const DSS = await fetchData(client, interaction, choiceSelector) as FSData;

src/commands/rank.ts

@@ -42,7 +42,7 @@ export default class Rank {
             name: 'Top users sorted by messages sent:',
             value: allData.sort((a,b)=>b.messages - a.messages).slice(0,15).map((x,i)=>`${i+1}. <@${x.dataValues.id}>: ${x.messages.toLocaleString('en-US')}`).join('\n')
           }).setImage('attachment://dailyMessages.jpg').setFooter({text: 'Graph updates daily'})],
-          files: [new client.attachment(graph.toBuffer('image/jpeg'), {name: 'dailyMessages.jpg'})]
+          files: [new client.attachment(graph.toBuffer(), {name: 'dailyMessages.jpg'})]
         })
 			},
       notification: async()=>{

src/components/CanvasGraph.ts

@@ -1,20 +1,10 @@
-import {createCanvas, Canvas, SKRSContext2D} from '@napi-rs/canvas';
+import {createCanvas, Canvas, CanvasRenderingContext2D} from 'canvas';
 import {Config} from 'src/interfaces';
 import ConfigHelper from '../helpers/ConfigHelper.js';
 export default class CanvasBuilder {
-  private readonly canvas: Canvas;
+  private canvas: Canvas;
-  private readonly ctx: SKRSContext2D;
+  private ctx: CanvasRenderingContext2D;
-  private readonly config: Config;
+  private config: Config;
-  private readonly palette = {
-    // Color palette for the graph -- The variables are named exactly what it shows in graph to make it easier to be referenced to.
-    oddHorizontal: '#555B63',
-    evenHorizontal: '#3E4245',
-    background: '#111111',
-    textColor: '#FFFFFF',
-    redLine: '#E62C3B',
-    yellowLine: '#FFEA00',
-    greenLine: '#57F287'
-  };
 
   constructor() {
     this.canvas = createCanvas(1500, 750);
@@ -23,11 +13,20 @@ export default class CanvasBuilder {
   }
 
   public async generateGraph(data:number[], type:'players'|'leaderboard'):Promise<Canvas> {
-    // Handle negative
+    // Color layout for the graph -- The variables are named exactly what it shows in graph to make it easier to be referenced to.
-    for (const [i, change] of data.entries()) if (change < 0) data[i] = data[i - 1] || data[i + 1] || 0;
+    let oddHorizontal = '#555B63';
+    let evenHorizontal = '#3E4245';
+    let background = '#111111';
+    let textColor = '#FFFFFF';
+    let redLine = '#E62C3B';
+    let yellowLine = '#FFEA00';
+    let greenLine = '#57F287';
 
-    const LBdataFirst = Math.ceil(Math.max(...data) * 10 ** (-Math.max(...data).toString().split('').length + 2)) * 10 ** (Math.max(...data).toString().split('').length - 2)
+    // Handle negative
-    const LBdataSecond = Math.ceil(Math.max(...data) * 10 ** (-Math.max(...data).toString().split('').length + 3)) * 10 ** (Math.max(...data).toString().split('').length - 3)
+    for (const [i, change] of data.entries()) if (change as number < 0) data[i] = data[i - 1] || data[i + 1] || 0;
+
+    const LBdataFirst = Math.ceil(Math.max(...data) * 10 ** (-Math.max(...data).toString().split('').length + 1)) * 10 ** (Math.max(...data).toString().split('').length - 1)
+    const LBdataSecond = Math.ceil(Math.max(...data) * 10 ** (-Math.max(...data).toString().split('').length + 2)) * 10 ** (Math.max(...data).toString().split('').length - 2)
 
     const firstTop = type === 'leaderboard' ? LBdataFirst : 16;
     const secondTop = type === 'leaderboard' ? LBdataSecond : 16;
@@ -35,7 +34,7 @@ export default class CanvasBuilder {
     const origin = [15, 65];
     const size = [1300, 630];
     const nodeWidth = size[0] / (data.length - 1);
-    this.ctx.fillStyle = this.palette.background;
+    this.ctx.fillStyle = background;
     this.ctx.fillRect(0, 0, this.canvas.width, this.canvas.height);
 
     // Grey horizontal lines
@@ -48,20 +47,33 @@ export default class CanvasBuilder {
     }
     const chosenInterval = intervalCandidates.sort((a,b)=>b[2]-a[2])[0];
     let prevY:number[] = [];
-    this.ctx.strokeStyle = this.palette.oddHorizontal;
+    this.ctx.strokeStyle = oddHorizontal;
 
-    for (let i = 0; i <= chosenInterval[1]; i++) {
+    if (type === 'leaderboard') for (let i = 0; i <= chosenInterval[1]; i++) {
       const y = origin[1] + size[1] - (i * (chosenInterval[0] / secondTop) * size[1]);
       if (y < origin[1]) continue;
       const even = ((i + 1) % 2) === 0;
-      if (even) this.ctx.strokeStyle = this.palette.evenHorizontal;
+      if (even) this.ctx.strokeStyle = evenHorizontal;
       this.ctx.beginPath();
       this.ctx.lineTo(origin[0], y);
       this.ctx.lineTo(origin[0] + size[0], y);
       this.ctx.stroke();
       this.ctx.closePath();
-      if (even) this.ctx.strokeStyle = this.palette.oddHorizontal;
+      if (even) this.ctx.strokeStyle = oddHorizontal;
-      prevY.push(y, i * chosenInterval[0]); // It didn't seem to take effect when I tested on leaderboard, so using push instead for both players and leaderboard.
+      prevY = [y, i * chosenInterval[0]];
+    }
+    else for (let i = 0; i < data.length; i++) {
+      const y = origin[1] + size[1] - (i * (chosenInterval[0] / secondTop) * size[1]);
+      if (y < origin[1]) continue;
+      const even = ((i + 1) % 2) === 0;
+      if (even) this.ctx.strokeStyle = evenHorizontal;
+      this.ctx.beginPath();
+      this.ctx.lineTo(origin[0], y);
+      this.ctx.lineTo(origin[0] + size[0], y);
+      this.ctx.stroke();
+      this.ctx.closePath();
+      if (even) this.ctx.strokeStyle = oddHorizontal;
+      prevY.push(y, i * chosenInterval[0]);
     }
 
     // 30 day/minute mark
@@ -75,14 +87,15 @@ export default class CanvasBuilder {
     this.ctx.setLineDash([]);
 
     // Draw points
-    this.ctx.strokeStyle = type === 'leaderboard' ? this.config.embedColor as string : null;
+    const isLeaderboard =()=>type === 'leaderboard' ? this.config.embedColor as string : null;
-    this.ctx.fillStyle = type === 'leaderboard' ? this.config.embedColor as string : null;
+    this.ctx.strokeStyle = isLeaderboard();
+    this.ctx.fillStyle = isLeaderboard();
     this.ctx.lineWidth = 5;
 
     const gradient = this.ctx.createLinearGradient(0, origin[1], 0, origin[1] + size[1]);
-    gradient.addColorStop(1 / 16, this.palette.redLine);
+    gradient.addColorStop(1 / 16, redLine);
-    gradient.addColorStop(5 / 16, this.palette.yellowLine);
+    gradient.addColorStop(5 / 16, yellowLine);
-    gradient.addColorStop(12 / 16, this.palette.greenLine);
+    gradient.addColorStop(12 / 16, greenLine);
 
     let lastCoordinates:number[] = [];
     for (let [i, currentValue] of data.entries()) {
@@ -119,8 +132,8 @@ export default class CanvasBuilder {
     }
 
     // Draw text
-    this.ctx.font = `400 ${textSize}px DejaVu Sans`;
+    this.ctx.font = '400 ' + textSize + 'px sans-serif';
-    this.ctx.fillStyle = this.palette.textColor;
+    this.ctx.fillStyle = textColor;
 
     // Highest value
     this.ctx.fillText(type === 'leaderboard'

src/models/MPServer.ts

@@ -55,7 +55,6 @@ export class MPServerSvc {
     })
     this.model.sync();
   }
-  query = async(pattern:string)=>await this.model.sequelize.query(pattern);
   async fetchPlayerData(serverName:string) {
     const findServerByName = await this.model.findOne({where: {serverName: serverName}});
     if (findServerByName) return findServerByName.dataValues.playerData;

src/models/dailyMsgs.ts

@@ -30,7 +30,6 @@ export class DailyMsgsSvc {
     })
     this.model.sync();
   }
-  query = async(pattern:string)=>await this.model.sequelize.query(pattern);
   nukeDays = async()=>await this.model.destroy({truncate: true});
   fetchDays = async()=>await this.model.findAll();
   async newDay(formattedDate:number, total:number) {

src/models/prohibitedWords.ts

@@ -25,7 +25,6 @@ export class ProhibitedWordsSvc {
     })
     this.model.sync();
   }
-  query = async(pattern:string)=>await this.model.sequelize.query(pattern);
   findWord = async(word:string)=>await this.model.findByPk(word);
   getAllWords = async()=>await this.model.findAll();
   insertWord = async(word:string)=>await this.model.create({word: word});

src/models/punishments.ts

@@ -83,7 +83,6 @@ export class PunishmentsSvc {
     });
     this.model.sync();
   }
-  query = async(pattern:string)=>await this.model.sequelize.query(pattern);
   async updateReason(caseId:number, reason:string) {
     const findCase = this.findCase(caseId);
     if (findCase) return this.model.update({reason: reason}, {where: {case_id: caseId}});

src/models/suggestions.ts

@@ -40,7 +40,6 @@ export class SuggestionsSvc {
     })
     this.model.sync();
   }
-  query = async(pattern:string)=>await this.model.sequelize.query(pattern);
   fetchById = async(id:number)=>await this.model.findByPk(id);
   updateStatus = async(id:number, status:string)=>await this.model.update({status: status}, {where: {id: id}});
   create =(userid:string, description:string)=>this.model.create({userid: userid, suggestion: description, status: 'Pending'})

src/models/tagSystem.ts

@@ -50,7 +50,6 @@ export class TagSystemSvc {
     });
     this.model.sync();
   }
-  query = async(pattern:string)=>await this.model.sequelize.query(pattern);
   async createTag(userid:string, tagName:string, message:string, embedFlag:boolean) {
     CacheServer.delete('tags');
     return await this.model.create({userid: userid, tagname: tagName, message: message.replace(/\\n/g, '\n'), embedFlag: embedFlag});

src/models/userLevels.ts

@@ -57,7 +57,6 @@ export class UserLevelsSvc {
     });
     this.model.sync();
   }
-  query = async(pattern:string)=>await this.model.sequelize.query(pattern);
   fetchEveryone = async()=>await this.model.findAll();
   fetchUser = async(userId:string)=>await this.model.findByPk(userId);
   deleteUser = async(userId:string)=>await this.model.destroy({where: {id: userId}});

src/models/ytChannels.ts

@@ -34,7 +34,6 @@ export class YouTubeChannelsSvc {
     })
     this.model.sync();
   }
-  query = async(pattern:string)=>await this.model.sequelize.query(pattern);
   async addChannel(YTChannelID:string, DCChannelID:string, DCRole:string) {
     if (await this.model.findOne({where: {ytchannel: YTChannelID}})) return false;
     await this.model.create({ytchannel: YTChannelID, dcchannel: DCChannelID, dcrole: DCRole});