Skip to content

Commit fa02763

Browse files
authored
Minor fixes to Admin Command (#203)
* Update permission field to use new reference * Fix function call name * Fixes to allow functioning of admin delete command
1 parent 2f55736 commit fa02763

9 files changed

+18
-19
lines changed

Diff for: commands/admin-standup.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const { SlashCommandBuilder } = require("@discordjs/builders");
2-
const { EmbedBuilder, ButtonBuilder, Permissions } = require("discord.js");
2+
const { EmbedBuilder, ButtonBuilder, PermissionsBitField } = require("discord.js");
33
const paginationEmbed = require("discordjs-button-pagination");
44

55
module.exports = {
@@ -28,7 +28,7 @@ module.exports = {
2828
const standupDB = global.standupDBGlobal;
2929
const TEAM_DIRECTOR_ROLE_ID = "921348676692107274";
3030
if (
31-
!interaction.member.permissions.has(Permissions.FLAGS.ADMINISTRATOR) &&
31+
!interaction.member.permissions.has(PermissionsBitField.Flags.Administrator) &&
3232
!interaction.member._roles.includes(TEAM_DIRECTOR_ROLE_ID)
3333
) {
3434
return await interaction.reply({

Diff for: commands/admin.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const { SlashCommandBuilder } = require("@discordjs/builders");
2-
const { Permissions } = require("discord.js");
2+
const { PermissionsBitField } = require("discord.js");
33

44
const COMMAND_KICKUNVERIFIED = "kickunverified";
55
const COMMAND_DROPUSERTABLE = "dropusertable";
@@ -20,7 +20,7 @@ module.exports = {
2020
),
2121
async execute(interaction) {
2222
try {
23-
if (!interaction.member.permissions.has(Permissions.FLAGS.ADMINISTRATOR)) {
23+
if (!interaction.member.permissions.has(PermissionsBitField.Flags.Administrator)) {
2424
return await interaction.reply({
2525
content: "You do not have permission to execute this command.",
2626
ephemeral: true,
@@ -63,9 +63,9 @@ module.exports = {
6363
return await interaction.reply("Removed unverified members.");
6464
} else if (interaction.options.getSubcommand() === COMMAND_DROPUSERTABLE) {
6565
const userDB = global.userDB;
66-
await userDB.drop_table();
66+
await userDB.deleteUsers();
6767

68-
return await interaction.editReply("Deleted user table.");
68+
return await interaction.reply("Deleted user table.");
6969
}
7070

7171
return await interaction.reply("Error: unknown subcommand.");

Diff for: commands/anonymouspost.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const { SlashCommandBuilder } = require("@discordjs/builders");
22
const { allowedChannels } = require("../config/anon_channel.json");
33
const paginationEmbed = require("discordjs-button-pagination");
44
const fs = require("fs");
5-
const { Util, EmbedBuilder, ButtonBuilder, Permissions } = require("discord.js");
5+
const { Util, EmbedBuilder, ButtonBuilder, PermissionsBitField } = require("discord.js");
66
module.exports = {
77
data: new SlashCommandBuilder()
88
.setName("anonymouspost")
@@ -125,7 +125,7 @@ module.exports = {
125125
}
126126

127127
// Admin permission check
128-
if (!interaction.member.permissions.has(Permissions.FLAGS.ADMINISTRATOR)) {
128+
if (!interaction.member.permissions.has(PermissionsBitField.Flags.Administrator)) {
129129
return await interaction.reply({
130130
content: "You do not have permission to execute this command.",
131131
ephemeral: true,

Diff for: commands/faqadmin.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// @ts-check
22
const { SlashCommandBuilder, SlashCommandSubcommandBuilder } = require("@discordjs/builders");
3-
const { Permissions } = require("discord.js");
3+
const { PermissionsBitField } = require("discord.js");
44

55
// ////////////////////////////////////////////
66
// //////// SETTING UP THE COMMANDS ///////////
@@ -46,7 +46,7 @@ async function handleInteraction(interaction) {
4646
const faqStorage = global.faqStorage;
4747

4848
// Admin permission check (this may not work uhm)
49-
if (!interaction.member.permissions.has(Permissions.FLAGS.ADMINISTRATOR)) {
49+
if (!interaction.member.permissions.has(PermissionsBitField.Flags.Administrator)) {
5050
await interaction.reply({
5151
content: "You do not have permission to execute this command.",
5252
ephemeral: true,

Diff for: commands/logreport.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const { SlashCommandBuilder } = require("@discordjs/builders");
2-
const { Permissions } = require("discord.js");
2+
const { PermissionsBitField } = require("discord.js");
33
const path = require("path");
44
const nodemailer = require("nodemailer");
55

@@ -44,7 +44,7 @@ module.exports = {
4444

4545
async execute(interaction) {
4646
try {
47-
if (!interaction.member.permissions.has(Permissions.FLAGS.ADMINISTRATOR)) {
47+
if (!interaction.member.permissions.has(PermissionsBitField.Flags.Administrator)) {
4848
await interaction.reply({
4949
content: "You do not have permission to execute this command.",
5050
ephemeral: true,

Diff for: commands/reactforrole.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const { SlashCommandBuilder } = require("@discordjs/builders");
2-
const { Permissions, EmbedBuilder } = require("discord.js");
2+
const { PermissionsBitField, EmbedBuilder } = require("discord.js");
33

44
module.exports = {
55
data: new SlashCommandBuilder()
@@ -27,7 +27,7 @@ module.exports = {
2727

2828
async execute(interaction) {
2929
// Only admin users should be able to execute this command
30-
if (!interaction.member.permissions.has(Permissions.FLAGS.ADMINISTRATOR)) {
30+
if (!interaction.member.permissions.has(PermissionsBitField.Flags.Administrator)) {
3131
return await interaction.reply({
3232
content: "You do not have permission to execute this command.",
3333
ephemeral: true,

Diff for: commands/rolesPermOverride.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const { SlashCommandBuilder } = require("@discordjs/builders");
2-
const { Permissions } = require("discord.js");
2+
const { PermissionsBitField } = require("discord.js");
33

44
const is_valid_course_name = (course) => {
55
const reg_comp_course = /^comp\d{4}$/;
@@ -136,7 +136,7 @@ module.exports = {
136136
),
137137
async execute(interaction) {
138138
try {
139-
if (!interaction.member.permissions.has(Permissions.FLAGS.ADMINISTRATOR)) {
139+
if (!interaction.member.permissions.has(PermissionsBitField.Flags.Administrator)) {
140140
return await interaction.reply({
141141
content: "You do not have permission to execute this command.",
142142
ephemeral: true,

Diff for: commands/schedulepost.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const { SlashCommandBuilder } = require("@discordjs/builders");
2-
const { EmbedBuilder, Permissions } = require("discord.js");
2+
const { EmbedBuilder, PermissionsBitField } = require("discord.js");
33

44
module.exports = {
55
data: new SlashCommandBuilder()
@@ -67,7 +67,7 @@ module.exports = {
6767

6868
async execute(interaction) {
6969
// Check if user has admin permission
70-
if (!interaction.member.permissions.has(Permissions.FLAGS.ADMINISTRATOR)) {
70+
if (!interaction.member.permissions.has(PermissionsBitField.Flags.Administrator)) {
7171
return await interaction.reply({
7272
content: "You do not have permission to execute this command.",
7373
ephemeral: true,

Diff for: events/travelguide_ready.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// @ts-check
22
const { DBTravelguide } = require("../lib/database/dbtravelguide");
3-
/* eslint-disable */
43

54
module.exports = {
65
name: "ready",

0 commit comments

Comments
 (0)