refactor: cleanup and permissions fixes

package.json

@@ -38,7 +38,7 @@
 		"start:profiler:0x": "0x --collect-only dist/Skyra.js",
 		"test": "NODE_OPTIONS=\"--loader tsx/esm\" vitest",
 		"lint": "eslint --fix --ext ts src tests",
-		"format": "prettier --write --loglevel=warn \"{src,tests}/**/*.{js,ts,json}\"",
+		"format": "prettier --write --log-level=warn \"{src,tests}/**/*.{js,ts,json}\"",
 		"scripts:tlds": "node scripts/tlds.mjs",
 		"scripts:migration": "node scripts/migrations.mjs",
 		"dockerps": "pwsh -NoLogo ./.docker/control.ps1",
@@ -67,7 +67,6 @@
 		"@sapphire/stopwatch": "^1.5.0",
 		"@sapphire/time-utilities": "^1.7.10",
 		"@sapphire/utilities": "^3.13.0",
-		"@sentry/hub": "^7.79.0",
 		"@sentry/integrations": "^7.79.0",
 		"@sentry/node": "^7.79.0",
 		"@skyra/ai": "^1.2.0",

src/arguments/command.ts

@@ -1,6 +1,6 @@
 import { LanguageKeys } from '#lib/i18n/languageKeys';
 import type { SkyraCommand } from '#lib/structures';
-import { PermissionLevels } from '#lib/types/Enums';
+import { PermissionLevels } from '#lib/types';
 import { OWNERS } from '#root/config';
 import { Argument } from '@sapphire/framework';
 

src/arguments/commandMatch.ts

@@ -1,7 +1,7 @@
 import { CommandMatcher } from '#lib/database';
 import { LanguageKeys } from '#lib/i18n/languageKeys';
 import type { SkyraCommand } from '#lib/structures';
-import { PermissionLevels } from '#lib/types/Enums';
+import { PermissionLevels } from '#lib/types';
 import { OWNERS } from '#root/config';
 import { Argument } from '@sapphire/framework';
 

src/arguments/commandName.ts

@@ -1,6 +1,6 @@
 import { LanguageKeys } from '#lib/i18n/languageKeys';
 import type { SkyraCommand } from '#lib/structures';
-import { PermissionLevels } from '#lib/types/Enums';
+import { PermissionLevels } from '#lib/types';
 import { OWNERS } from '#root/config';
 import { FuzzySearch } from '#utils/Parsers/FuzzySearch';
 import { Argument, Command } from '@sapphire/framework';

src/commands/Admin/conf.ts

@@ -2,7 +2,7 @@ import { configurableGroups, isSchemaGroup, isSchemaKey, readSettings, remove, r
 import { LanguageKeys } from '#lib/i18n/languageKeys';
 import { SettingsMenu, SkyraSubcommand } from '#lib/structures';
 import type { GuildMessage } from '#lib/types';
-import { PermissionLevels } from '#lib/types/Enums';
+import { PermissionLevels } from '#lib/types';
 import { isValidCustomEmoji, isValidSerializedTwemoji, isValidTwemoji } from '#lib/util/functions/emojis';
 import { filter, map } from '#utils/common';
 import { inlineCode } from '@discordjs/builders';

src/commands/Admin/roleset.ts

@@ -1,8 +1,7 @@
 import { GuildEntity, GuildSettings, readSettings, writeSettings, type UniqueRoleSet } from '#lib/database';
 import { LanguageKeys } from '#lib/i18n/languageKeys';
 import { SkyraCommand, SkyraSubcommand } from '#lib/structures';
-import type { GuildMessage } from '#lib/types';
-import { PermissionLevels } from '#lib/types/Enums';
+import { PermissionLevels, type GuildMessage } from '#lib/types';
 import { ApplyOptions } from '@sapphire/decorators';
 import { CommandOptionsRunTypeEnum } from '@sapphire/framework';
 import { send } from '@sapphire/plugin-editable-commands';

src/commands/General/invite.ts

@@ -62,7 +62,7 @@ export class UserCommand extends SkyraCommand {
 				  PermissionFlagsBits.EmbedLinks |
 				  PermissionFlagsBits.KickMembers |
 				  PermissionFlagsBits.ManageChannels |
-				  PermissionFlagsBits.ManageEmojisAndStickers |
+				  PermissionFlagsBits.ManageGuildExpressions |
 				  PermissionFlagsBits.ManageGuild |
 				  PermissionFlagsBits.ManageMessages |
 				  PermissionFlagsBits.ManageNicknames |

src/commands/Management/Configuration/manage-command-auto-delete.ts

@@ -1,8 +1,7 @@
 import { GuildSettings, readSettings, writeSettings } from '#lib/database';
 import { LanguageKeys } from '#lib/i18n/languageKeys';
 import { SkyraSubcommand } from '#lib/structures';
-import type { GuildMessage } from '#lib/types';
-import { PermissionLevels } from '#lib/types/Enums';
+import { PermissionLevels, type GuildMessage } from '#lib/types';
 import { minutes, seconds } from '#utils/common';
 import { ApplyOptions } from '@sapphire/decorators';
 import type { GuildTextBasedChannelTypes } from '@sapphire/discord.js-utilities';

src/commands/Management/Configuration/manage-command-channel.ts

@@ -1,8 +1,7 @@
 import { GuildSettings, readSettings, writeSettings } from '#lib/database';
 import { LanguageKeys } from '#lib/i18n/languageKeys';
 import { SkyraSubcommand } from '#lib/structures';
-import type { GuildMessage } from '#lib/types';
-import { PermissionLevels } from '#lib/types/Enums';
+import { PermissionLevels, type GuildMessage } from '#lib/types';
 import { ApplyOptions } from '@sapphire/decorators';
 import { CommandOptionsRunTypeEnum } from '@sapphire/framework';
 import { send } from '@sapphire/plugin-editable-commands';

src/commands/Management/Configuration/manage-reaction-roles.ts

@@ -1,8 +1,7 @@
 import { GuildSettings, readSettings, writeSettings, type ReactionRole } from '#lib/database';
 import { LanguageKeys } from '#lib/i18n/languageKeys';
 import { SkyraPaginatedMessage, SkyraSubcommand } from '#lib/structures';
-import type { GuildMessage } from '#lib/types';
-import { PermissionLevels } from '#lib/types/Enums';
+import { PermissionLevels, type GuildMessage } from '#lib/types';
 import { getEmojiString, getEmojiTextFormat } from '#utils/functions';
 import { LongLivingReactionCollector } from '#utils/LongLivingReactionCollector';
 import { getColor, sendLoadingMessage } from '#utils/util';

src/commands/Management/Configuration/setIgnoreChannels.ts

@@ -1,11 +1,10 @@
 import { GuildSettings, writeSettings } from '#lib/database';
 import { LanguageKeys } from '#lib/i18n/languageKeys';
 import { SkyraCommand } from '#lib/structures';
-import type { GuildMessage } from '#lib/types';
-import { PermissionLevels } from '#lib/types/Enums';
+import { PermissionLevels, type GuildMessage } from '#lib/types';
 import { ApplyOptions } from '@sapphire/decorators';
 import type { GuildTextBasedChannelTypes } from '@sapphire/discord.js-utilities';
-import { Args, CommandOptionsRunTypeEnum, container, Argument } from '@sapphire/framework';
+import { Args, Argument, CommandOptionsRunTypeEnum, container } from '@sapphire/framework';
 import { send } from '@sapphire/plugin-editable-commands';
 
 @ApplyOptions<SkyraCommand.Options>({

src/commands/Management/Configuration/setPrefix.ts

@@ -1,8 +1,7 @@
 import { GuildSettings, writeSettings } from '#lib/database';
 import { LanguageKeys } from '#lib/i18n/languageKeys';
 import { SkyraCommand } from '#lib/structures';
-import type { GuildMessage } from '#lib/types';
-import { PermissionLevels } from '#lib/types/Enums';
+import { PermissionLevels, type GuildMessage } from '#lib/types';
 import { ApplyOptions } from '@sapphire/decorators';
 import { CommandOptionsRunTypeEnum } from '@sapphire/framework';
 import { send } from '@sapphire/plugin-editable-commands';

src/commands/Management/Helpers/guild-info.ts

@@ -10,7 +10,7 @@ import { isCategoryChannel, isNewsChannel, isStageChannel, isTextChannel, isVoic
 import { CommandOptionsRunTypeEnum } from '@sapphire/framework';
 import { send } from '@sapphire/plugin-editable-commands';
 import { chunk } from '@sapphire/utilities';
-import { PermissionFlagsBits } from 'discord-api-types/v10';
+import { GuildVerificationLevel, PermissionFlagsBits } from 'discord-api-types/v10';
 import { EmbedBuilder, PermissionsBitField, Role } from 'discord.js';
 
 const SORT = (x: Role, y: Role) => Number(y.position > x.position) || Number(x.position === y.position) - 1;
@@ -179,7 +179,7 @@ export class UserCommand extends SkyraCommand {
 		return args.t(LanguageKeys.Commands.Management.GuildInfoOther, {
 			size: guild.roles.cache.size,
 			createdAt: time(seconds.fromMilliseconds(guild.createdTimestamp), TimestampStyles.ShortDateTime),
-			verificationLevel: guild.verificationLevel
+			verificationLevel: GuildVerificationLevel[guild.verificationLevel]
 		});
 	}
 }

src/commands/Management/Helpers/role-info.ts

@@ -1,7 +1,7 @@
 import { LanguageKeys } from '#lib/i18n/languageKeys';
 import { SkyraCommand } from '#lib/structures';
-import type { GuildMessage } from '#lib/types';
-import { PermissionLevels } from '#lib/types/Enums';
+import { PermissionLevels, type GuildMessage } from '#lib/types';
+import { PermissionsBits } from '#utils/bits';
 import { BrandingColors } from '#utils/constants';
 import { ApplyOptions } from '@sapphire/decorators';
 import { CommandOptionsRunTypeEnum } from '@sapphire/framework';
@@ -21,12 +21,12 @@ export class UserCommand extends SkyraCommand {
 		const role = args.finished ? message.member.roles.highest : await args.pick('roleName');
 		const roleInfoTitles = args.t(LanguageKeys.Commands.Management.RoleInfoTitles);
 
-		const permissions = role.permissions.has(PermissionFlagsBits.Administrator)
+		const permissions = role.permissions.bitfield;
+		const permissionsString = PermissionsBits.has(permissions, PermissionFlagsBits.Administrator)
 			? args.t(LanguageKeys.Commands.Management.RoleInfoAll)
-			: role.permissions.toArray().length > 0
-			? role.permissions
-					.toArray()
-					.map((key) => `+ **${args.t(`permissions:${key}`, key)}**`)
+			: permissions > 0n
+			? PermissionsBits.toArray(permissions)
+					.map((name) => `+ ${args.t(`permissions:${name}`)}`)
 					.join('\n')
 			: args.t(LanguageKeys.Commands.Management.RoleInfoNoPermissions);
 
@@ -40,7 +40,7 @@ export class UserCommand extends SkyraCommand {
 			.setColor(role.color || BrandingColors.Secondary)
 			.setTitle(`${role.name} [${role.id}]`)
 			.setDescription(description)
-			.addFields({ name: roleInfoTitles.PERMISSIONS, value: permissions });
+			.addFields({ name: roleInfoTitles.PERMISSIONS, value: permissionsString });
 		return send(message, { embeds: [embed] });
 	}
 }

src/commands/Management/Members/stickyRoles.ts

@@ -1,7 +1,6 @@
 import { LanguageKeys } from '#lib/i18n/languageKeys';
 import { SkyraSubcommand } from '#lib/structures';
-import type { GuildMessage } from '#lib/types';
-import { PermissionLevels } from '#lib/types/Enums';
+import { PermissionLevels, type GuildMessage } from '#lib/types';
 import { getStickyRoles } from '#utils/functions';
 import { ApplyOptions } from '@sapphire/decorators';
 import { CommandOptionsRunTypeEnum } from '@sapphire/framework';

src/commands/Management/Message Filters/filter.ts

@@ -2,8 +2,7 @@ import { GuildEntity, GuildSettings, readSettings, writeSettings } from '#lib/da
 import { LanguageKeys } from '#lib/i18n/languageKeys';
 import { IncomingType, OutgoingType } from '#lib/moderation/workers';
 import { SkyraSubcommand } from '#lib/structures';
-import type { GuildMessage } from '#lib/types';
-import { PermissionLevels } from '#lib/types/Enums';
+import { PermissionLevels, type GuildMessage } from '#lib/types';
 import { ApplyOptions } from '@sapphire/decorators';
 import { CommandOptionsRunTypeEnum } from '@sapphire/framework';
 import { send } from '@sapphire/plugin-editable-commands';

src/commands/Management/create-mute.ts

@@ -1,8 +1,7 @@
 import { GuildSettings, writeSettings } from '#lib/database';
 import { LanguageKeys } from '#lib/i18n/languageKeys';
 import { SkyraCommand } from '#lib/structures';
-import type { GuildMessage } from '#lib/types';
-import { PermissionLevels } from '#lib/types/Enums';
+import { PermissionLevels, type GuildMessage } from '#lib/types';
 import { minutes } from '#utils/common';
 import { Emojis } from '#utils/constants';
 import { getEmojiReactionFormat, getSecurity, promptConfirmation, promptForMessage, type SerializedEmoji } from '#utils/functions';

src/commands/Management/permissionNodes.ts

@@ -1,8 +1,7 @@
 import { GuildSettings, PermissionNodeAction, readSettings, writeSettings, type PermissionsNode } from '#lib/database';
 import { LanguageKeys } from '#lib/i18n/languageKeys';
 import { SkyraSubcommand } from '#lib/structures';
-import type { GuildMessage } from '#lib/types';
-import { PermissionLevels } from '#lib/types/Enums';
+import { PermissionLevels, type GuildMessage } from '#lib/types';
 import { resolveOnErrorCodes } from '#utils/common';
 import { ApplyOptions } from '@sapphire/decorators';
 import { Args, CommandOptionsRunTypeEnum } from '@sapphire/framework';

src/commands/Misc/remindme.ts

@@ -1,7 +1,7 @@
 import type { ScheduleEntity } from '#lib/database';
 import { LanguageKeys } from '#lib/i18n/languageKeys';
 import { SkyraCommand, SkyraPaginatedMessage } from '#lib/structures';
-import { Schedules } from '#lib/types/Enums';
+import { Schedules } from '#lib/types';
 import { ButtonInviteTeryl, ButtonSkyraV7, makeRow } from '#utils/deprecate';
 import { getColor, getFullEmbedAuthor, sendLoadingMessage } from '#utils/util';
 import { ApplyOptions, RequiresClientPermissions } from '@sapphire/decorators';

src/commands/Misc/snipe.ts

@@ -1,7 +1,6 @@
 import { LanguageKeys } from '#lib/i18n/languageKeys';
 import { SkyraCommand } from '#lib/structures';
-import type { GuildMessage } from '#lib/types';
-import { PermissionLevels } from '#lib/types/Enums';
+import { PermissionLevels, type GuildMessage } from '#lib/types';
 import { getSnipedMessage } from '#utils/functions';
 import { getColor, getContent, getFullEmbedAuthor, getImage } from '#utils/util';
 import { ApplyOptions } from '@sapphire/decorators';

src/commands/Moderation/Management/history.ts

@@ -1,8 +1,7 @@
 import type { ModerationEntity } from '#lib/database';
 import { LanguageKeys } from '#lib/i18n/languageKeys';
 import { SkyraPaginatedMessage, SkyraSubcommand } from '#lib/structures';
-import type { GuildMessage } from '#lib/types';
-import { PermissionLevels } from '#lib/types/Enums';
+import { PermissionLevels, type GuildMessage } from '#lib/types';
 import { seconds } from '#utils/common';
 import { getModeration } from '#utils/functions';
 import { TypeVariation } from '#utils/moderationConstants';
@@ -56,6 +55,9 @@ export class UserCommand extends SkyraSubcommand {
 					break;
 				case TypeVariation.Warning:
 					++warnings;
+					break;
+				default:
+					break;
 			}
 		}
 

src/commands/Moderation/Management/moderations.ts

@@ -1,8 +1,7 @@
 import type { ModerationEntity } from '#lib/database';
 import { LanguageKeys } from '#lib/i18n/languageKeys';
 import { SkyraCommand, SkyraPaginatedMessage, SkyraSubcommand } from '#lib/structures';
-import type { GuildMessage } from '#lib/types';
-import { PermissionLevels } from '#lib/types/Enums';
+import { PermissionLevels, type GuildMessage } from '#lib/types';
 import { seconds } from '#utils/common';
 import { getModeration } from '#utils/functions';
 import { TypeCodes } from '#utils/moderationConstants';

src/commands/Moderation/Management/mutes.ts

@@ -1,7 +1,6 @@
 import { LanguageKeys } from '#lib/i18n/languageKeys';
 import { SkyraCommand } from '#lib/structures';
-import type { GuildMessage } from '#lib/types';
-import { PermissionLevels } from '#lib/types/Enums';
+import { PermissionLevels, type GuildMessage } from '#lib/types';
 import type { UserPaginatedMessageCommand as Moderations } from '#root/commands/Moderation/Management/moderations';
 import { ApplyOptions } from '@sapphire/decorators';
 import { CommandOptionsRunTypeEnum } from '@sapphire/framework';

src/commands/Moderation/Management/warnings.ts

@@ -1,7 +1,6 @@
 import { LanguageKeys } from '#lib/i18n/languageKeys';
 import { SkyraCommand } from '#lib/structures';
-import type { GuildMessage } from '#lib/types';
-import { PermissionLevels } from '#lib/types/Enums';
+import { PermissionLevels, type GuildMessage } from '#lib/types';
 import type { UserPaginatedMessageCommand as Moderations } from '#root/commands/Moderation/Management/moderations';
 import { ApplyOptions } from '@sapphire/decorators';
 import { CommandOptionsRunTypeEnum } from '@sapphire/framework';

src/commands/Moderation/Utilities/case.ts

@@ -1,7 +1,6 @@
 import { LanguageKeys } from '#lib/i18n/languageKeys';
 import { SkyraCommand, SkyraSubcommand } from '#lib/structures';
-import type { GuildMessage } from '#lib/types';
-import { PermissionLevels } from '#lib/types/Enums';
+import { PermissionLevels, type GuildMessage } from '#lib/types';
 import { getModeration } from '#utils/functions';
 import { ApplyOptions } from '@sapphire/decorators';
 import { CommandOptionsRunTypeEnum } from '@sapphire/framework';
@@ -36,7 +35,7 @@ export class UserCommand extends SkyraSubcommand {
 		const entry = await moderation.fetch(caseId);
 		if (!entry) this.error(LanguageKeys.Commands.Moderation.ReasonNotExists);
 
-		entry.remove();
+		await entry.remove();
 		moderation.delete(entry.caseId);
 
 		const content = args.t(LanguageKeys.Commands.Moderation.CaseDeleted, { case: entry.caseId });

src/commands/Moderation/Utilities/permissions.ts

@@ -1,7 +1,7 @@
 import { LanguageKeys } from '#lib/i18n/languageKeys';
 import { SkyraCommand } from '#lib/structures';
-import type { GuildMessage } from '#lib/types';
-import { PermissionLevels } from '#lib/types/Enums';
+import { PermissionLevels, type GuildMessage } from '#lib/types';
+import { PermissionsBits, PermissionsBitsList } from '#utils/bits';
 import { ZeroWidthSpace } from '#utils/constants';
 import { getColor, getTag } from '#utils/util';
 import { ApplyOptions } from '@sapphire/decorators';
@@ -10,8 +10,6 @@ import { send } from '@sapphire/plugin-editable-commands';
 import { PermissionFlagsBits } from 'discord-api-types/v10';
 import { EmbedBuilder } from 'discord.js';
 
-const PERMISSION_FLAGS = Object.keys(PermissionFlagsBits) as (keyof typeof PermissionFlagsBits)[];
-
 @ApplyOptions<SkyraCommand.Options>({
 	description: LanguageKeys.Commands.Moderation.PermissionsDescription,
 	detailedDescription: LanguageKeys.Commands.Moderation.PermissionsExtended,
@@ -26,14 +24,14 @@ export class UserCommand extends SkyraCommand {
 			this.error(LanguageKeys.Misc.UserNotInGuild);
 		});
 
-		const { permissions } = member;
+		const permissions = member.permissions.bitfield;
 		const list = [ZeroWidthSpace];
 
-		if (permissions.has(PermissionFlagsBits.Administrator)) {
+		if (PermissionsBits.has(permissions, PermissionFlagsBits.Administrator)) {
 			list.push(args.t(LanguageKeys.Commands.Moderation.PermissionsAll));
 		} else {
-			for (const flag of PERMISSION_FLAGS) {
-				list.push(`${permissions.has(flag) ? '🔹' : '🔸'} ${args.t(`permissions:${flag}`, flag)}`);
+			for (const [name, flag] of PermissionsBitsList) {
+				list.push(`${PermissionsBits.has(permissions, flag) ? '🔹' : '🔸'} ${args.t(`permissions:${name}`)}`);
 			}
 		}
 

src/commands/Moderation/Utilities/reason.ts

@@ -1,7 +1,6 @@
 import { LanguageKeys } from '#lib/i18n/languageKeys';
 import { SkyraCommand } from '#lib/structures';
-import type { GuildMessage } from '#lib/types';
-import { Events, PermissionLevels } from '#lib/types/Enums';
+import { Events, PermissionLevels, type GuildMessage } from '#lib/types';
 import { getModeration, sendTemporaryMessage } from '#utils/functions';
 import { getImage } from '#utils/util';
 import { ApplyOptions } from '@sapphire/decorators';

src/commands/Moderation/Utilities/slowmode.ts

@@ -1,7 +1,6 @@
 import { LanguageKeys } from '#lib/i18n/languageKeys';
 import { SkyraCommand } from '#lib/structures';
-import type { GuildMessage } from '#lib/types/Discord';
-import { PermissionLevels } from '#lib/types/Enums';
+import { PermissionLevels, type GuildMessage } from '#lib/types';
 import { hours, seconds } from '#utils/common';
 import { ApplyOptions } from '@sapphire/decorators';
 import { CommandOptionsRunTypeEnum } from '@sapphire/framework';

src/commands/Moderation/Utilities/time.ts

@@ -1,8 +1,7 @@
 import type { ModerationEntity } from '#lib/database';
 import { LanguageKeys } from '#lib/i18n/languageKeys';
 import { SkyraCommand } from '#lib/structures';
-import type { GuildMessage } from '#lib/types';
-import { PermissionLevels } from '#lib/types/Enums';
+import { PermissionLevels, type GuildMessage } from '#lib/types';
 import { seconds, years } from '#utils/common';
 import { getModeration, getSecurity } from '#utils/functions';
 import { SchemaKeys, TypeCodes } from '#utils/moderationConstants';

src/commands/Moderation/addrole.ts

@@ -1,7 +1,6 @@
 import { LanguageKeys } from '#lib/i18n/languageKeys';
 import { ModerationCommand, type HandledCommandContext } from '#lib/moderation';
-import type { GuildMessage } from '#lib/types';
-import { PermissionLevels } from '#lib/types/Enums';
+import { PermissionLevels, type GuildMessage } from '#lib/types';
 import { years } from '#utils/common';
 import { getSecurity } from '#utils/functions';
 import { getImage } from '#utils/util';

src/commands/Moderation/dehoist.ts

@@ -1,7 +1,6 @@
 import { LanguageKeys } from '#lib/i18n/languageKeys';
 import { SkyraCommand } from '#lib/structures';
-import type { GuildMessage } from '#lib/types';
-import { PermissionLevels } from '#lib/types/Enums';
+import { PermissionLevels, type GuildMessage } from '#lib/types';
 import { getColor, sendLoadingMessage } from '#utils/util';
 import { ApplyOptions } from '@sapphire/decorators';
 import { CommandOptionsRunTypeEnum } from '@sapphire/framework';

src/commands/Moderation/lockdown.ts

@@ -1,7 +1,6 @@
 import { LanguageKeys } from '#lib/i18n/languageKeys';
 import { LockdownManager, SkyraSubcommand } from '#lib/structures';
-import type { GuildMessage } from '#lib/types';
-import { PermissionLevels } from '#lib/types/Enums';
+import { PermissionLevels, type GuildMessage } from '#lib/types';
 import { floatPromise } from '#utils/common';
 import { assertNonThread, getSecurity } from '#utils/functions';
 import { clearAccurateTimeout, setAccurateTimeout } from '#utils/Timers';