From b778ab42c3a4dd5de671f0ae168f7e4a1dc20008 Mon Sep 17 00:00:00 2001
From: Dragon Fire <danielbodendahl@gmail.com>
Date: Sat, 30 Jan 2021 23:02:37 -0500
Subject: [PATCH] Generate Image for typing-(race/test)

---
 commands/games-mp/typing-race.js | 11 +++++-----
 commands/games-sp/typing-test.js | 36 ++++++++++++++++++++++++++------
 package.json                     |  2 +-
 3 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/commands/games-mp/typing-race.js b/commands/games-mp/typing-race.js
index 208ea33d..d03557ee 100644
--- a/commands/games-mp/typing-race.js
+++ b/commands/games-mp/typing-race.js
@@ -1,7 +1,6 @@
 const Command = require('../../structures/Command');
 const { stripIndents } = require('common-tags');
 const { verify, fetchHSUserDisplay } = require('../../util/Util');
-const sentences = require('../../assets/json/typing-test');
 
 module.exports = class TypingRaceCommand extends Command {
 	constructor(client) {
@@ -34,11 +33,11 @@ module.exports = class TypingRaceCommand extends Command {
 				this.client.games.delete(msg.channel.id);
 				return msg.say('Looks like they declined...');
 			}
-			const sentence = sentences[Math.floor(Math.random() * sentences.length)];
-			await msg.say(stripIndents`
-				**Type the following sentence within 30 seconds:**
-				${sentence}
-			`);
+			const sentence = this.client.registry.commands.get('typing-test').generateSentence(6);
+			const img = await this.client.registry.commands.get('typing-test').generateImage(sentence);
+			await msg.say(`**Type the following sentence within 30 seconds:**`, {
+				files: [{ attachment: img, name: 'typing-race.png' }]
+			});
 			const now = Date.now();
 			const filter = res => [opponent.id, msg.author.id].includes(res.author.id) && res.content === sentence;
 			const winner = await msg.channel.awaitMessages(filter, {
diff --git a/commands/games-sp/typing-test.js b/commands/games-sp/typing-test.js
index 577e7a57..3fd56ca9 100644
--- a/commands/games-sp/typing-test.js
+++ b/commands/games-sp/typing-test.js
@@ -1,7 +1,9 @@
 const Command = require('../../structures/Command');
+const { createCanvas, registerFont } = require('canvas');
 const { stripIndents } = require('common-tags');
 const { list, fetchHSUserDisplay } = require('../../util/Util');
-const sentences = require('../../assets/json/typing-test');
+const words = require('../../assets/json/word-list');
+registerFont(path.join(__dirname, '..', '..', 'assets', 'fonts', 'Noto-Regular.ttf'), { family: 'Noto' });
 const difficulties = ['baby', 'easy', 'medium', 'hard', 'extreme', 'impossible'];
 const times = {
 	baby: 60000,
@@ -33,12 +35,11 @@ module.exports = class TypingTestCommand extends Command {
 	}
 
 	async run(msg, { difficulty }) {
-		const sentence = sentences[Math.floor(Math.random() * sentences.length)];
+		const sentence = this.generateSentence(6);
 		const time = times[difficulty];
-		await msg.reply(stripIndents`
-			**You have ${time / 1000} seconds to type this sentence.**
-			${sentence}
-		`);
+		await msg.reply(`**You have ${time / 1000} seconds to type this sentence.**`, {
+			files: [{ attachment: this.generateImage(sentence), name: 'typing-test.png' }]
+		});
 		const now = Date.now();
 		const msgs = await msg.channel.awaitMessages(res => res.author.id === msg.author.id, {
 			max: 1,
@@ -61,4 +62,27 @@ module.exports = class TypingTestCommand extends Command {
 			${scoreBeat ? `**New High Score!** Old:` : `High Score:`} ${highScore / 1000} (Held by ${user})
 		`);
 	}
+
+	generateSentence(length) {
+		const sentence = [];
+		for (let i = 0; i < length; i++) sentence.push(words[Math.floor(Math.random() * words.length)]);
+		return sentence.join(' ');
+	}
+
+	generateImage(sentence) {
+		const canvasPre = createCanvas(1, 1);
+		const ctxPre = canvasPre.getContext('2d');
+		ctxPre.font = '75px Noto';
+		const len = ctxPre.measureText(sentence);
+		const canvas = createCanvas(100 + len.width, 200);
+		const ctx = canvas.getContext('2d');
+		ctx.font = '75px Noto';
+		ctx.textBaseline = 'middle';
+		ctx.textAlign = 'center';
+		ctx.fillStyle = 'white';
+		ctx.fillRect(0, 0, canvas.width, canvas.height);
+		ctx.fillStyle = 'black';
+		ctx.fillText(sentence, canvas.width / 2, canvas.height / 2);
+		return canvas.toBuffer();
+	}
 };
diff --git a/package.json b/package.json
index 38bffc2b..3b727d76 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "xiao",
-	"version": "128.2.0",
+	"version": "128.2.1",
 	"description": "Your personal server companion.",
 	"main": "Xiao.js",
 	"scripts": {