diff --git a/index.ts b/index.ts index b1147de..ba39a46 100644 --- a/index.ts +++ b/index.ts @@ -82,7 +82,7 @@ process.on("SIGINT", async () => { log("Captcha Image Found!", "i"); const imageUrl = message.attachments.first()?.url if(!imageUrl) throw new Error("Could Not Retrieve Captcha Image URL") - const answer = await solveCaptcha(imageUrl) as string | undefined + const answer = await solveCaptcha(message.client, imageUrl) as string | undefined if(!answer || /\d/.test(answer)) throw new Error(answer ? `Captcha Solving Returns Invalid Answer: ${answer}` : "Could Not Retrieve Captcha Answer") const owo = message.client.users.cache.get(global.owoID) if(!owo?.dmChannel) await owo?.createDM() @@ -96,7 +96,7 @@ process.on("SIGINT", async () => { } else if(/(https?:\/\/[^\s]+)/g.test(message.content)) { log("HCaptcha Link Found!", "i") throw new Error("Due to NoCaptchaAI's non-response, This Feature is Not Available Yet!") - await solveCaptcha() + await solveCaptcha(message.client) } else throw new Error("Captcha Message Found but Got No Image/Link") selfbotNotify(message) } catch (error) { diff --git a/package.json b/package.json index 41b2698..8dc2091 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "discord-owo-selfbot", - "version": "2.2.7", + "version": "2.2.8", "description": "Ain't the best OwO Tool Farm, but worth a try (why not?)", "type": "module", "exports": "./dist/index.js", diff --git a/src/Extension.ts b/src/Extension.ts index 77d2c1f..c26bba3 100644 --- a/src/Extension.ts +++ b/src/Extension.ts @@ -151,24 +151,30 @@ const commandHandler = async () => { return commands } -const reloadPresence = (client:discord.Client) => { +const reloadPresence = async (client:discord.Client) => { + const getExternalURL = await discord.RichPresence.getExternal( + client, + "367827983903490050", + "https://i.imgur.com/9wrvM38.png", + "https://i.imgur.com/MscNx02.png" + ) const activity = new discord.RichPresence() - .setApplicationId("817229550684471297") + .setApplicationId("367827983903490050") .setType("PLAYING") .setName("I AM ETERNITYYY") .setDetails("Simply fulfilling my duties") - .setStartTimestamp(new Date(global.startTime)) - .setAssetsLargeImage("mp:attachments/1112736530243522740/1134462426956435546/9wrvM38.png") + .setStartTimestamp(client.readyAt!) + .setAssetsLargeImage(getExternalURL[0].external_asset_path) .setAssetsLargeText("You Dare Challenge me?") - .setAssetsSmallImage("mp:avatars/749103042581889168/16f85900e27694838e415af9f039953a.webp") - .setAssetsSmallText("BKI Eternity_VN") + .setAssetsSmallImage(getExternalURL[1].external_asset_path) + .setAssetsSmallText("BKI Eternityyy") .addButton('Github', "https://github.com/LongAKolangle/discord-owo-selfbot") - .addButton('Youtube', "https://youtube.com/@EternityNqu") + .addButton('Youtube', "https://www.youtube.com/@daongotau") client.user?.setActivity(activity.toJSON()) client.user?.setStatus("idle") } -const solveCaptcha = async (url?:string, huntbotCaptcha = false) => { +const solveCaptcha = async (client: discord.Client, url?:string, huntbotCaptcha = false) => { if(url && !huntbotCaptcha) { const response = await axios.get(url, { responseType: "arraybuffer", diff --git a/src/SelfbotWorker.ts b/src/SelfbotWorker.ts index a417e9c..dc257f9 100644 --- a/src/SelfbotWorker.ts +++ b/src/SelfbotWorker.ts @@ -134,7 +134,7 @@ const aHuntbot = async () => { log(`Huntbot Will Arrive/Re-check in: ${timeHandler(Date.now(), timeoutHuntbot)}`, "i") return; } - const answer = await solveCaptcha(msg.attachments.first()?.url) as string | undefined + const answer = await solveCaptcha(msg.client, msg.attachments.first()?.url) as string | undefined if(!answer || !/^\w{5}$/.test(answer)) { timeoutHuntbot = new Date().setMinutes(new Date().getMinutes() + 10, new Date().getMinutes() + ranInt(10, 50)) throw new Error(answer ? `Huntbot Captcha Solving Returns Invalid Answer: ${answer}` : "Could Not Retrieve Huntbot Captcha Answer")