Skip to content

added p2ass support . does this count as contribution //? #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Asta-Development wants to merge 2 commits into
base: main
Choose a base branch
from
Open

added p2ass support . does this count as contribution //? #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2bfab94
Update index.js
Asta-Development Apr 2, 2025
32ac92a
Update config.json
Asta-Development Apr 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"ownerID": [ "ID OF MAIN ACCOUNT", "..." ],
"prefix": "!",
"globalCatch": false,
"p2assCatch": true,
"blacklistedGuilds": [ "716390832034414685", "..." ],
"captchaSolvingKey": "CATCHTWO CAPTCHASOLVING API KEY"
}
23 changes: 19 additions & 4 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,21 @@ async function Login(token, Client, guildId) {
}

client.on("messageCreate", async (message) => {
const p2ass = "854233015475109888";
const poketwo = "716390085896962058"
if (
message.author.id == "854233015475109888" &&
Copy link
Copy Markdown
Owner

@kyan0045 kyan0045 Apr 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will need to add support for multiple bots, not just Poketwo Assistant, will make changes later when I actually have time

message.content.includes(":") &&
message.content.includes("%") &&
config.p2assCatch
) {
if (captcha) return;
const msgs = [`c`, `catch`];
const name = message.content.substring(0, message.content.indexOf(":"));
await message.channel.send(
`<@${poketwo}> ${msgs[Math.round(Math.random())]} ${name}`
);
}
if (
(message.guild?.id == guildId &&
message.author.id == "716390085896962058") ||
Expand All @@ -297,10 +312,9 @@ async function Login(token, Client, guildId) {
.catch(() => null);
const newMessage = Array.from(messages.values());
[...messages.values()];

if (
message.embeds[0]?.title?.includes("wild pokémon has appeared") &&
!captcha
!captcha && !config.p2assCatch
) {
if (
config.incenseMode == false &&
Expand Down Expand Up @@ -1150,6 +1164,7 @@ async function Login(token, Client, guildId) {
console.log(err);
}
}
let newWebhook;
if (webhooks.size > 0) {
webhook = new Webhook(webhooks?.first().url);
webhook.setUsername("CatchTwo");
Expand All @@ -1165,10 +1180,10 @@ async function Login(token, Client, guildId) {
});
} catch (err) {
if (err.code == "50013") {
newWebhook = config.logWebhook;
newWebhook = config.logWebhook
}
webhook = new Webhook(config.logWebhook);
}
webhook = new Webhook(newWebhook);
webhook.setUsername("CatchTwo");
webhook.setAvatar(
"https://camo.githubusercontent.com/1c34a30dc74c8cb780498c92aa4aeaa2e0bcec07a94b7a55d5377786adf43a5b/68747470733a2f2f6d656469612e646973636f72646170702e6e65742f6174746163686d656e74732f313033333333343538363936363535323636362f313035343839363838373834323438383432322f696d6167652e706e67"
Expand Down