Merge 8b541cbed3 into b18523556d

src/commands/mp.ts

@@ -1,7 +1,7 @@
 import Discord from 'discord.js';
 import TClient from '../client.js';
 import Logger from '../helpers/Logger.js';
-import CanvasBuilder from '../components/CanvasBuilder.js';
+import CanvasBuilder from '../components/CanvasGraph.js';
 import RanIntoHumor from '../helpers/RanIntoHumor.js';
 import MessageTool from '../helpers/MessageTool.js';
 import PalletLibrary from '../helpers/PalletLibrary.js';
@@ -43,7 +43,7 @@ export default class MP {
         if (!DSS) return console.log('Endpoint failed - players');
 
         const PDArr = await client.MPServer.fetchPlayerData(choiceSelector);
-        const canvas = await CanvasBuilder.generateGraph(PDArr.slice(-120), 'players');
+        const canvas = await new CanvasBuilder().generateGraph(PDArr.slice(-120), 'players');
         const players:string[] = [];
         let embedColor:Discord.ColorResolvable;
 

src/commands/rank.ts

@@ -3,7 +3,7 @@ import Discord from 'discord.js';
 import TClient from '../client.js';
 import Formatters from '../helpers/Formatters.js';
 import MessageTool from '../helpers/MessageTool.js';
-import CanvasBuilder from '../components/CanvasBuilder.js';
+import CanvasBuilder from '../components/CanvasGraph.js';
 export default class Rank {
   static async run(client: TClient, interaction: Discord.ChatInputCommandInteraction<'cached'>){
     if (interaction.guildId !== client.config.dcServer.id) return interaction.reply({content: 'This command doesn\'t work in this server.', ephemeral: true});
@@ -32,7 +32,7 @@ export default class Rank {
         });
         if (data.length < 2) return interaction.reply('Not enough data to generate graph.');
 
-        const graph = await CanvasBuilder.generateGraph(data, 'leaderboard');
+        const graph = await new CanvasBuilder().generateGraph(data, 'leaderboard');
 			  interaction.reply({
           embeds: [new client.embed().setColor(client.config.embedColor).setTitle('Leaderboard')
           .setDescription(MessageTool.concatMessage(

src/components/CanvasGraph.ts

@@ -2,10 +2,10 @@ import {createCanvas, Canvas, SKRSContext2D} from '@napi-rs/canvas';
 import {Config} from 'src/interfaces';
 import ConfigHelper from '../helpers/ConfigHelper.js';
 export default class CanvasBuilder {
-  private static readonly canvas: Canvas = createCanvas(1500, 750);
-  private static readonly ctx: SKRSContext2D = this.canvas.getContext('2d');
-  private static readonly config: Config = ConfigHelper.readConfig();
-  private static readonly palette = {
+  private readonly canvas: Canvas;
+  private readonly ctx: SKRSContext2D;
+  private readonly 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',
@@ -16,7 +16,13 @@ export default class CanvasBuilder {
     greenLine: '#57F287'
   };
 
-  public static async generateGraph(data:number[], type:'players'|'leaderboard'):Promise<Canvas> {
+  constructor() {
+    this.canvas = createCanvas(1500, 750);
+    this.ctx = this.canvas.getContext('2d');
+    this.config = ConfigHelper.readConfig() as Config;
+  }
+
+  public async generateGraph(data:number[], type:'players'|'leaderboard'):Promise<Canvas> {
     // Handle negative
     for (const [i, change] of data.entries()) if (change < 0) data[i] = data[i - 1] || data[i + 1] || 0;