From 5203c736dd0037acaae0c2f782446464513677d6 Mon Sep 17 00:00:00 2001
From: Dragon Fire <danielbodendahl@gmail.com>
Date: Fri, 26 Apr 2024 18:22:25 -0400
Subject: [PATCH] Fix emoji size

---
 commands/edit-image-text/tweet.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/commands/edit-image-text/tweet.js b/commands/edit-image-text/tweet.js
index 8d8fa0b7..3b239273 100644
--- a/commands/edit-image-text/tweet.js
+++ b/commands/edit-image-text/tweet.js
@@ -207,7 +207,7 @@ module.exports = class TweetCommand extends Command {
 		const emoji = text.match(emojiRegex());
 		if (!emoji) {
 			ctx.fillText(wrapped.join('\n'), x, y);
-			this.fillHashtags(ctx, wrapped, x, y);
+			this.fillHashtags(ctx, wrapped, x, y, emojiSize);
 			return ctx;
 		}
 		for (let currentLine = 0; currentLine < wrapped.length; currentLine++) {
@@ -234,11 +234,11 @@ module.exports = class TweetCommand extends Command {
 				currentX += emojiSize;
 			}
 		}
-		this.fillHashtags(ctx, wrapped, x, y);
+		this.fillHashtags(ctx, wrapped, x, y, emojiSize);
 		return ctx;
 	}
 
-	fillHashtags(ctx, wrappedText, x, y) {
+	fillHashtags(ctx, wrappedText, x, y, emojiSize) {
 		const height = 23 + 9;
 		let currentLine = 0;
 		for (const line of wrappedText) {
@@ -248,7 +248,9 @@ module.exports = class TweetCommand extends Command {
 				if (!word.startsWith('#') && !word.startsWith('@')) continue;
 				let preWords = words.slice(0, i).join(' ');
 				if (i !== 0) preWords += ' ';
-				const preLen = ctx.measureText(preWords).width;
+				const emoji = preWords.match(emojiRegex());
+				let preLen = ctx.measureText(preWords.replace(emojiRegex(), '')).width;
+				preLen += emoji.length * emojiSize;
 				const oldStyle = ctx.fillStyle;
 				ctx.fillStyle = '#1da1f2';
 				ctx.fillText(word, x + preLen, y + (height * currentLine));