Skip to content

Commit ebbcda2

Browse files
authored
Merge branch 'GalvinPython:dev' into dev
2 parents e9396a3 + b1b4efc commit ebbcda2

File tree

7 files changed

+95
-58
lines changed

7 files changed

+95
-58
lines changed

.github/dependabot.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ updates:
66
interval: "weekly"
77
assignees:
88
- "GalvinPython"
9+
target-branch: "dev"

api/db/queries/guilds.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export async function updateGuild(guild: Omit<Guild, "cooldown" | "updates_enabl
2929
pool.query(
3030
`
3131
INSERT INTO guilds (id, name, icon, members)
32-
VALUES (?, ?, ?, ?, ?, ?)
32+
VALUES (?, ?, ?, ?)
3333
ON DUPLICATE KEY UPDATE
3434
name = VALUES(name),
3535
icon = VALUES(icon),
@@ -42,7 +42,6 @@ export async function updateGuild(guild: Omit<Guild, "cooldown" | "updates_enabl
4242
guild.members,
4343
],
4444
(err, results) => {
45-
console.dir(results, { depth: null });
4645
if (err) {
4746
reject([err, null]);
4847
} else {

bot/events/guildAdd.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import { Events } from "discord.js";
2+
import client from "../index";
3+
import { updateGuildInfo } from "../utils/requestAPI";
4+
5+
client.on(Events.GuildCreate, async (guild) => {
6+
try {
7+
await updateGuildInfo(guild.id, guild.name, guild.iconURL() ?? 'https://cdn.discordapp.com/embed/avatars/0.png', guild.memberCount);
8+
console.log(`Joined guild ${guild.name} with ${guild.memberCount} members`);
9+
} catch (e) {
10+
console.error(e);
11+
}
12+
})

bot/events/ready.ts

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
import { ActivityType, Events, PresenceUpdateStatus } from 'discord.js';
2+
import client from '../index';
3+
4+
// update the bot's presence
5+
function updatePresence() {
6+
if (!client?.user) return;
7+
client.user.setPresence({
8+
activities: [
9+
{
10+
name: `${client.guilds.cache.size} servers with ${client.guilds.cache.reduce((acc, guild) => acc + guild.memberCount, 0).toLocaleString('en-US')} members.`,
11+
type: ActivityType.Watching,
12+
},
13+
],
14+
status: PresenceUpdateStatus.Online,
15+
});
16+
}
17+
18+
// Log into the bot
19+
client.once(Events.ClientReady, async (bot) => {
20+
console.log(`Ready! Logged in as ${bot.user?.tag}`);
21+
updatePresence();
22+
});
23+
24+
// Update the server count in the status every minute
25+
setInterval(updatePresence, 60000);

bun.lockb

100755100644
1.58 KB
Binary file not shown.

package-lock.json

Lines changed: 54 additions & 54 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
"lint": "eslint . --config eslint.config.mjs"
1111
},
1212
"devDependencies": {
13-
"@eslint/js": "^9.6.0",
13+
"@eslint/js": "^9.7.0",
1414
"@types/bun": "latest",
1515
"@types/cors": "^2.8.17",
1616
"@types/eslint__js": "^8.42.3",
1717
"@types/express": "^4.17.21",
18-
"typescript-eslint": "^7.16.0"
18+
"typescript-eslint": "^7.16.1"
1919
},
2020
"peerDependencies": {
2121
"typescript": "^5.0.0"

0 commit comments

Comments
 (0)