Skip to content

merge staging into master #30

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

Merged
stolarchukboris merged 3 commits into from
May 1, 2025
Merged

merge staging into master #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c76cac
change to `MessageFlags`, add point commands, allow people to see the…
stolarchukboris Apr 26, 2025
edc3938
Bump discord.js from 14.18.0 to 14.19.1 (#32)
dependabot[bot] Apr 29, 2025
f5adb93
Bump mysql2 from 3.14.0 to 3.14.1 (#31)
dependabot[bot] Apr 29, 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
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cfa-manager",
"version": "1.6.3",
"version": "1.6.4",
"description": "Discord bot that manages the Chaos Forces Alliance.",
"main": "src/index.js",
"type": "module",
Expand All @@ -18,12 +18,12 @@
"author": "Asynchronite",
"license": "AGPLv3",
"dependencies": {
"discord.js": "^14.18.0",
"discord.js": "^14.19.1",
"dotenv": "^16.5.0",
"knex": "^3.1.0",
"moment": "^2.30.1",
"moment-duration-format": "^2.3.2",
"mysql2": "^3.14.0",
"mysql2": "^3.14.1",
"pm2": "^6.0.5",
"remove": "^0.1.5"
}
Expand Down
127 changes: 64 additions & 63 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions src/commands/command/dm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ export const data = new SlashCommandBuilder()
export async function execute(interaction) {
await interaction.deferReply();

const allowedIDs = ["1239137720669044766", "1255634139730935860", "1071373709157351464"]; //llasat one is astro
const allowedIDs = ["1239137720669044766", "1255634139730935860"];

if (!(interaction.member.roles.cache.hasAny(...allowedIDs) || allowedIDs.includes(interaction.member.id))) return await interaction.editReply({
if (!(interaction.member.roles.cache.hasAny(...allowedIDs))) return await interaction.editReply({
embeds: [
new EmbedBuilder()
.setTitle('Access denied!')
.setDescription('You do not have the required permissions to use this command!')
.setTitle('Access denied.')
.setDescription('You do not have the required permissions to use this command.')
.setColor(Colors.Red)
.setTimestamp()
.setFooter({
Expand Down
Loading
Loading