level image, fixes, revamped role command (still broken), continued working on settings command

5 files changed, 9 insertions, 13 deletions

diff --git a/src/lib/extensions/discord-akairo/BushClient.ts b/src/lib/extensions/discord-akairo/BushClient.ts
index ca5f325..2eaf3d3 100644
--- a/src/lib/extensions/discord-akairo/BushClient.ts
+++ b/src/lib/extensions/discord-akairo/BushClient.ts
@@ -26,6 +26,7 @@ import { contentWithDurationTypeCaster } from '../../../arguments/contentWithDur
 import { discordEmojiTypeCaster } from '../../../arguments/discordEmoji';
 import { durationTypeCaster } from '../../../arguments/duration';
 import { permissionTypeCaster } from '../../../arguments/permission';
+import { roleWithDurationTypeCaster } from '../../../arguments/roleWithDuation';
 import { snowflakeTypeCaster } from '../../../arguments/snowflake';
 import { UpdateCacheTask } from '../../../tasks/updateCache';
 import { ActivePunishment } from '../../models/ActivePunishment';
@@ -264,7 +265,8 @@ export class BushClient<Ready extends boolean = boolean> extends AkairoClient<Re
 			contentWithDuration: contentWithDurationTypeCaster,
 			permission: permissionTypeCaster,
 			snowflake: snowflakeTypeCaster,
-			discordEmoji: discordEmojiTypeCaster
+			discordEmoji: discordEmojiTypeCaster,
+			roleWithDuration: roleWithDurationTypeCaster
 		});
 		// loads all the handlers
 		const loaders = {
diff --git a/src/lib/extensions/discord-akairo/BushClientUtil.ts b/src/lib/extensions/discord-akairo/BushClientUtil.ts
index 9ed890a..ef51b63 100644
--- a/src/lib/extensions/discord-akairo/BushClientUtil.ts
+++ b/src/lib/extensions/discord-akairo/BushClientUtil.ts
@@ -1354,10 +1354,6 @@ export class BushClientUtil extends ClientUtil {
 		return new Promise((resolve) => setTimeout(resolve, s * 1000));
 	}
 
-	camelToSnakeCase(str: string) {
-		return str.replace(/[A-Z]/g, (letter) => `_${letter.toLowerCase()}`);
-	}
-
 	//~ modified from https://stackoverflow.com/questions/31054910/get-functions-methods-of-a-class
 	//~ answer by Bruno Grieder
 	//~ public getMethods(obj: any): string {
diff --git a/src/lib/extensions/discord-akairo/BushCommand.ts b/src/lib/extensions/discord-akairo/BushCommand.ts
index 7ecb679..3a2c619 100644
--- a/src/lib/extensions/discord-akairo/BushCommand.ts
+++ b/src/lib/extensions/discord-akairo/BushCommand.ts
@@ -63,7 +63,8 @@ export type BaseBushArgumentType =
 	| 'contentWithDuration'
 	| 'permission'
 	| 'snowflake'
-	| 'discordEmoji';
+	| 'discordEmoji'
+	| 'roleWithDuration';
 
 export type BushArgumentType = BaseBushArgumentType | RegExp;
 
@@ -180,8 +181,7 @@ export class BushCommand extends Command {
 		}
 		super(id, options);
 		this.options = options;
-		// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-		this.hidden = options.hidden || false;
+		this.hidden = options.hidden ?? false;
 		this.restrictedChannels = options.restrictedChannels!;
 		this.restrictedGuilds = options.restrictedGuilds!;
 		this.completelyHide = options.completelyHide!;
diff --git a/src/lib/extensions/discord.js/BushGuild.ts b/src/lib/extensions/discord.js/BushGuild.ts
index 4fc27a7..2c3b4bd 100644
--- a/src/lib/extensions/discord.js/BushGuild.ts
+++ b/src/lib/extensions/discord.js/BushGuild.ts
@@ -73,8 +73,7 @@ export class BushGuild extends Guild {
 		if (!bans.has(user)) notBanned = true;
 
 		const unbanSuccess = await this.bans
-			// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-			.remove(user, `${moderator.tag} | ${options.reason || 'No reason provided.'}`)
+			.remove(user, `${moderator.tag} | ${options.reason ?? 'No reason provided.'}`)
 			.catch((e) => {
 				if (e?.code === 'UNKNOWN_BAN') {
 					notBanned = true;
@@ -108,8 +107,7 @@ export class BushGuild extends Guild {
 
 		const userObject = client.users.cache.get(user);
 
-		// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-		userObject?.send(`You have been unbanned from **${this}** for **${options.reason || 'No reason provided'}**.`);
+		userObject?.send(`You have been unbanned from **${this}** for **${options.reason ?? 'No reason provided'}**.`);
 
 		if (notBanned) return 'user not banned';
 		return 'success';
diff --git a/src/lib/extensions/discord.js/BushGuildMember.ts b/src/lib/extensions/discord.js/BushGuildMember.ts
index e596c82..6ce473a 100644
--- a/src/lib/extensions/discord.js/BushGuildMember.ts
+++ b/src/lib/extensions/discord.js/BushGuildMember.ts
@@ -182,7 +182,7 @@ export class BushGuildMember extends GuildMember {
 	}
 
 	#checkIfShouldAddRole(role: BushRole | Role): true | 'user hierarchy' | 'role managed' | 'client hierarchy' {
-		if (this.roles.highest.position <= role.position) {
+		if (this.roles.highest.position <= role.position && this.guild.ownerId !== this.id) {
 			return 'user hierarchy';
 		} else if (role.managed) {
 			return 'role managed';