apexify.js 2.4.2 → 2.4.4-beta.1

package/lib/ai/apexAI.js

@@ -160,7 +160,7 @@ function apexAI(message, options) {
                     drawValid = draw && (0, utils_1.shouldDrawImage)(finalText, drawTrigger);
                     if (!drawValid) return [3 /*break*/, 23];
                     textToDraw = textEnhancer || finalText;
-                    return [4 /*yield*/, (0, utils_1.drawImage)(message, numOfImages, textToDraw, hercai, response, imageModel, nsfw)];
+                    return [4 /*yield*/, (0, utils_1.drawImage)(message, numOfImages, textToDraw, hercai, imageModel, nsfw)];
                 case 22: return [2 /*return*/, _y.sent()];
                 case 23:
                     if (!(voice === true)) return [3 /*break*/, 25];

package/lib/ai/functions/draw.js

@@ -35,21 +35,12 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.drawImage = void 0;
-var google_translate_1 = require("@iamtraction/google-translate");
+var translate = require("@iamtraction/google-translate");
 var sharp = require("sharp");
 var discord_js_1 = require("discord.js");
-var axios_1 = require("axios");
+var axios = require("axios");
 var api = require("api");
 var sdk = api("@prodia/v1.3.0#be019b2kls0gqss3");
 sdk.auth("43435e1c-cab1-493f-a224-f51e4b97ce8d");
@@ -124,7 +115,7 @@ var validProdiaModals = [
     "timeless-1.0.ckpt [7c4971d4]",
     "toonyou_beta6.safetensors [980f6b15]",
 ];
-function drawImage(_0x2f79ae, numOfImages, _0x28baff, _0x5cea2c, _0x59b128, _0x182d15, nsfw) {
+function drawImage(message, numOfImages, textToDraw, hercai, imageModel, nsfw) {
     return __awaiter(this, void 0, void 0, function () {
         function retry(fn, retriesLeft) {
             if (retriesLeft === void 0) { retriesLeft = maxRetryAttempts; }
@@ -151,13 +142,13 @@ function drawImage(_0x2f79ae, numOfImages, _0x28baff, _0x5cea2c, _0x59b128, _0x1
                 });
             });
         }
-        var maxRetryAttempts, retryInterval, translatedText_1, _0x168f75, buttonsRow1, imageUrls, _loop_1, _0x4d7fb6, state_1, selectMenu_1, options, redrawButton, row1, row2, _0x56e917_1;
+        var maxRetryAttempts, retryInterval, response, translatedText_1, attachData, buttonsRow1, imageUrls, _loop_1, _0x4d7fb6, state_1, selectMenu_1, options, row1, row2, e_1;
         var _a;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
                     maxRetryAttempts = 3;
-                    retryInterval = 5000;
+                    retryInterval = 10000;
                     _b.label = 1;
                 case 1:
                     _b.trys.push([1, 8, , 9]);
@@ -165,36 +156,36 @@ function drawImage(_0x2f79ae, numOfImages, _0x28baff, _0x5cea2c, _0x59b128, _0x1
                         throw new Error("Number of images can't be greater than 4 or smaller than 0.");
                     }
                     return [4 /*yield*/, retry(function () {
-                            return (0, google_translate_1)(_0x28baff, {
+                            return (0, translate)(textToDraw, {
                                 from: "auto",
                                 to: "en",
                             });
                         })];
                 case 2:
                     translatedText_1 = _b.sent();
-                    _0x168f75 = [];
+                    attachData = [];
                     buttonsRow1 = [];
                     imageUrls = [];
                     _loop_1 = function (_0x4d7fb6) {
-                        var generateResponse, generatedJobId, error_2, _0x279cfe, _0x2b4402, _0x46cafe, attachment, urlButton, imageUrl, textToCheck_1, nsfwWords, _0x29a652, urlButton;
+                        var generateResponse, generatedJobId, error_2, buffferedImage, res, resizedImage, attachment, urlButton, imageUrl, textToCheck_1, nsfwWords, attach, urlButton;
                         return __generator(this, function (_c) {
                             switch (_c.label) {
                                 case 0:
                                     _c.trys.push([0, 7, , 12]);
-                                    if (!validHercaiModals.includes(_0x182d15)) return [3 /*break*/, 2];
+                                    if (!validHercaiModals.includes(imageModel)) return [3 /*break*/, 2];
                                     return [4 /*yield*/, retry(function () {
-                                            return _0x5cea2c.drawImage({
-                                                model: _0x182d15,
+                                            return hercai.drawImage({
+                                                model: imageModel,
                                                 prompt: translatedText_1.text,
                                             });
                                         })];
                                 case 1:
-                                    _0x59b128 = _c.sent();
+                                    response = _c.sent();
                                     return [3 /*break*/, 6];
                                 case 2:
-                                    if (!validProdiaModals.includes(_0x182d15)) return [3 /*break*/, 5];
+                                    if (!validProdiaModals.includes(imageModel)) return [3 /*break*/, 5];
                                     return [4 /*yield*/, sdk.generate({
-                                            model: _0x182d15,
+                                            model: imageModel,
                                             prompt: translatedText_1.text,
                                         })];
                                 case 3:
@@ -202,7 +193,7 @@ function drawImage(_0x2f79ae, numOfImages, _0x28baff, _0x5cea2c, _0x59b128, _0x1
                                     generatedJobId = generateResponse.data.job;
                                     return [4 /*yield*/, checkJobStatus(generatedJobId)];
                                 case 4:
-                                    _0x59b128 = _c.sent();
+                                    response = _c.sent();
                                     return [3 /*break*/, 6];
                                 case 5: throw new Error("Invalid modal name.");
                                 case 6: return [3 /*break*/, 12];
@@ -210,48 +201,48 @@ function drawImage(_0x2f79ae, numOfImages, _0x28baff, _0x5cea2c, _0x59b128, _0x1
                                     error_2 = _c.sent();
                                     if (!(error_2.response && error_2.response.status === 429)) return [3 /*break*/, 8];
                                     console.error("Too many requests. Please try again later.");
-                                    return [2 /*return*/, { value: _0x2f79ae.reply("Please wait i am in a cool down for a minute") }];
+                                    return [2 /*return*/, { value: message.reply("Please wait i am in a cool down for a minute") }];
                                 case 8:
                                     if (!(error_2.response && error_2.response.status === 500)) return [3 /*break*/, 9];
                                     console.error("Internal server error. Please try again later.");
-                                    return [2 /*return*/, { value: _0x2f79ae.reply("Please wait i am in a cool down for a minute") }];
-                                case 9: return [4 /*yield*/, _0x2f79ae.reply("Please wait i am in a cool down for a minute")];
+                                    return [2 /*return*/, { value: message.reply("Please wait i am in a cool down for a minute") }];
+                                case 9: return [4 /*yield*/, message.reply("Please wait i am in a cool down for a minute")];
                                 case 10:
                                     _c.sent();
                                     throw new Error("Error processing message in file");
                                 case 11: return [3 /*break*/, 12];
                                 case 12:
-                                    _0x279cfe = void 0;
-                                    if (!(_0x182d15 === "v3")) return [3 /*break*/, 15];
+                                    buffferedImage = void 0;
+                                    if (!(imageModel === "v3")) return [3 /*break*/, 15];
                                     return [4 /*yield*/, retry(function () {
-                                            return axios_1.get(_0x59b128.url, {
+                                            return axios.get(response.url, {
                                                 responseType: "arraybuffer",
                                             });
                                         })];
                                 case 13:
-                                    _0x2b4402 = _c.sent();
-                                    _0x279cfe = Buffer.from(_0x2b4402.data, "binary");
-                                    return [4 /*yield*/, sharp(_0x279cfe)
+                                    res = _c.sent();
+                                    buffferedImage = Buffer.from(res.data, "binary");
+                                    return [4 /*yield*/, sharp(buffferedImage)
                                             .resize({
                                             width: 0x320,
                                         })
                                             .toBuffer()];
                                 case 14:
-                                    _0x46cafe = _c.sent();
+                                    resizedImage = _c.sent();
                                     attachment = {
-                                        file: _0x46cafe,
+                                        file: resizedImage,
                                         name: "image_".concat(_0x4d7fb6 + 1, ".png"),
                                     };
-                                    _0x168f75.push(attachment);
+                                    attachData.push(attachment);
                                     urlButton = new discord_js_1.ButtonBuilder()
                                         .setStyle(discord_js_1.ButtonStyle.Link)
                                         .setLabel("Image ".concat(_0x4d7fb6 + 1))
-                                        .setURL(_0x59b128.url);
+                                        .setURL(response.url);
                                     buttonsRow1.push(urlButton);
-                                    imageUrls.push(_0x59b128.url);
+                                    imageUrls.push(response.url);
                                     return [3 /*break*/, 18];
                                 case 15:
-                                    imageUrl = _0x59b128.url || _0x59b128;
+                                    imageUrl = response.url || response;
                                     if (!nsfw) return [3 /*break*/, 17];
                                     return [4 /*yield*/, attemptImageCaptioning(imageUrl)];
                                 case 16:
@@ -337,13 +328,13 @@ function drawImage(_0x2f79ae, numOfImages, _0x28baff, _0x5cea2c, _0x59b128, _0x1
                                         "femboy",
                                         "ass",
                                     ];
-                                    if (nsfwWords.some(function (word) { return textToCheck_1.includes(word); })) {
-                                       return _0x2f79ae.reply("Warning ⚠️. The generated image contatining nsfw content. Turn off nsfw to send nsfw images.");
+                                    if (textToCheck_1 && nsfwWords.some(function (word) { return textToCheck_1 === null || textToCheck_1 === void 0 ? void 0 : textToCheck_1.includes(word); })) {
+                                        message.reply("Warning ⚠️. The generated image contatining nsfw content. Turn off nsfw to sedn nsfw images.");
                                     }
                                     _c.label = 17;
                                 case 17:
-                                    _0x29a652 = new discord_js_1.AttachmentBuilder(imageUrl, { name: "image_".concat(_0x4d7fb6 + 1, ".png") });
-                                    _0x168f75.push(_0x29a652);
+                                    attach = new discord_js_1.AttachmentBuilder(imageUrl, { name: "image_".concat(_0x4d7fb6 + 1, ".png") });
+                                    attachData.push(attach);
                                     urlButton = new discord_js_1.ButtonBuilder()
                                         .setStyle(discord_js_1.ButtonStyle.Link)
                                         .setLabel("Image ".concat(_0x4d7fb6 + 1))
@@ -351,7 +342,7 @@ function drawImage(_0x2f79ae, numOfImages, _0x28baff, _0x5cea2c, _0x59b128, _0x1
                                     buttonsRow1.push(urlButton);
                                     imageUrls.push(imageUrl);
                                     _c.label = 18;
-                                case 18: return [4 /*yield*/, new Promise(function (_0x412825) { return setTimeout(_0x412825, 0x7d0); })];
+                                case 18: return [4 /*yield*/, new Promise(function (resolve) { return setTimeout(resolve, 0x7d0); })];
                                 case 19:
                                     _c.sent();
                                     return [2 /*return*/];
@@ -394,14 +385,10 @@ function drawImage(_0x2f79ae, numOfImages, _0x28baff, _0x5cea2c, _0x59b128, _0x1
                             .setValue("process_".concat(index + 1));
                         selectMenu_1.addOptions(selectOption);
                     });
-                    redrawButton = new discord_js_1.ButtonBuilder()
-                        .setStyle(discord_js_1.ButtonStyle.Primary)
-                        .setLabel("Redraw")
-                        .setCustomId("redraw_button");
-                    row1 = (_a = new discord_js_1.ActionRowBuilder()).addComponents.apply(_a, __spreadArray(__spreadArray([], buttonsRow1, false)));
+                    row1 = (_a = new discord_js_1.ActionRowBuilder()).addComponents.apply(_a, buttonsRow1);
                     row2 = new discord_js_1.ActionRowBuilder().addComponents(selectMenu_1);
-                    return [4 /*yield*/, _0x2f79ae.reply({
-                            files: _0x168f75,
+                    return [4 /*yield*/, message.reply({
+                            files: attachData,
                             components: [row1, row2],
                             allowedMentions: { repliedUser: false },
                         })];
@@ -409,13 +396,13 @@ function drawImage(_0x2f79ae, numOfImages, _0x28baff, _0x5cea2c, _0x59b128, _0x1
                     _b.sent();
                     return [2 /*return*/, imageUrls];
                 case 8:
-                    _0x56e917_1 = _b.sent();
-                    console.error("Error in drawImage:", _0x56e917_1.message);
-                    if (_0x56e917_1.response) {
-                        console.error("Status code:", _0x56e917_1.response.status);
-                        console.error("Response data:", _0x56e917_1.response.data);
+                    e_1 = _b.sent();
+                    console.error("Error in drawImage:", e_1.message);
+                    if (e_1.response) {
+                        console.error("Status code:", e_1.response.status);
+                        console.error("Response data:", e_1.response.data);
                     }
-                    _0x2f79ae.reply({
+                    message.reply({
                         content: "An error occurred while processing the images.",
                         allowedMentions: { repliedUser: false },
                     });
@@ -477,7 +464,7 @@ function attemptImageCaptioning(imageUrl) {
                             switch (_a.label) {
                                 case 0:
                                     _a.trys.push([0, 2, , 3]);
-                                    return [4 /*yield*/, axios_1.post("https://api-inference.huggingface.co/models/Salesforce/blip-image-captioning-base", { image: imageUrl }, {
+                                    return [4 /*yield*/, axios.post("https://api-inference.huggingface.co/models/Salesforce/blip-image-captioning-base", { image: imageUrl }, {
                                             headers: {
                                                 "Content-Type": "application/json",
                                                 Authorization: "Bearer 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",

package/lib/ai/functions/generateVoiceResponse.js

@@ -62,7 +62,7 @@ function generateVoiceResponse(message, numOfImages, finalText, hercai, response
                     _a.trys.push([1, 23, 24, 25]);
                     msg = message.content;
                     if (!drawValid) return [3 /*break*/, 3];
-                    return [4 /*yield*/, (0, draw_1.drawImage)(message, numOfImages, finalText, hercai, response, imageModel, nsfw)];
+                    return [4 /*yield*/, (0, draw_1.drawImage)(message, numOfImages, finalText, hercai, imageModel, nsfw)];
                 case 2: return [2 /*return*/, _a.sent()];
                 case 3:
                     if (!(message.attachments.size > 0)) return [3 /*break*/, 7];

package/lib/canvas/ApexPainter.js

@@ -27,6 +27,7 @@ class ApexPainter {
         offsetX: 0,
         offsetY: 0,
         blur: 0,
+        opacity: 0,
       },
       stroke: {
         color: null,
@@ -391,8 +392,9 @@ ctx.drawImage(customBgImage, 0, 0);
   }
 
   isShapeName(source) {
+    
     const validShapes = ["square", "circle", "triangle", "rectangle"];
-    return validShapes.includes(source.toLowerCase());
+    return validShapes.includes(source?.toLowerCase() || 'square');
   }
 
   drawShape(ctx, shapeOptions, canvasBackgroundColor) {