(v4.1.2) Massive permission system cleanup

This commit is contained in:
DJj123dj
2026-02-06 20:08:55 +01:00
parent 24d98aeaeb
commit 1f402a848e
26 changed files with 504 additions and 962 deletions
+47
View File
@@ -101,6 +101,20 @@ export interface ODPermissionSettings {
*/
export type ODPermissionCalculationCallback = (user:discord.User, channel?:discord.Channel|null, guild?:discord.Guild|null, settings?:ODPermissionSettings|null) => Promise<ODPermissionResult>
/**## ODPermissionCommandResult `type`
* The result of calculating permissions for a command.
*/
export type ODPermissionCommandResult = {
/**Returns `true` when the user has valid permissions. */
hasPerms:false,
reason:"no-perms"|"disabled"|"not-in-server"
}|{
/**Returns `true` when the user has valid permissions. */
hasPerms:true,
/**Is the user a server admin or a normal member? This does not decide if the user has permissions or not. */
isAdmin:boolean
}
/**## ODPermissionManager `class`
* This is an Open Ticket permission manager.
*
@@ -110,6 +124,8 @@ export type ODPermissionCalculationCallback = (user:discord.User, channel?:disco
* Add new permissions using the `ODPermission` class in your plugin!
*/
export class ODPermissionManager extends ODManager<ODPermission> {
/**Alias for Open Ticket debugger. */
#debug: ODDebugger
/**The function for calculating permissions in this manager. */
#calculation: ODPermissionCalculationCallback|null
/**An alias to the Open Discord client manager. */
@@ -124,6 +140,7 @@ export class ODPermissionManager extends ODManager<ODPermission> {
constructor(debug:ODDebugger, client:ODClientManager, useDefaultCalculation?:boolean){
super(debug,"permission")
this.#debug = debug
this.#calculation = useDefaultCalculation ? this.#defaultCalculation : null
this.#client = client
}
@@ -290,4 +307,34 @@ export class ODPermissionManager extends ODManager<ODPermission> {
//spread result to prevent accidental modification because of referencing
return {...this.defaultResult}
}
/**Check the permissions for a certain command of the bot. */
async checkCommandPerms(permissionMode:string,requiredLevel:ODPermissionType,user:discord.User,member?:discord.GuildMember|null,channel?:discord.Channel|null,guild?:discord.Guild|null,settings?:ODPermissionSettings): Promise<ODPermissionCommandResult> {
if (permissionMode === "none"){
return {hasPerms:false,reason:"disabled"}
}else if (permissionMode === "everyone"){
const isAdmin = this.hasPermissions(requiredLevel,await this.getPermissions(user,channel,guild,settings))
return {hasPerms:true,isAdmin}
}else if (permissionMode === "admin"){
const isAdmin = this.hasPermissions(requiredLevel,await this.getPermissions(user,channel,guild,settings))
if (!isAdmin) return {hasPerms:false,reason:"no-perms"}
else return {hasPerms:true,isAdmin}
}else{
if (!guild || !member){
this.#debug.debug("ODPermissionManager.checkCommandPerms(): Permission Error, Not in server! (#1)")
return {hasPerms:false,reason:"not-in-server"}
}
const role = await this.#client.fetchGuildRole(guild,permissionMode)
if (!role){
this.#debug.debug("ODPermissionManager.checkCommandPerms(): Permission Error, Not in server! (#2)")
return {hasPerms:false,reason:"not-in-server"}
}
if (!role.members.has(member.id)) return {hasPerms:false,reason:"no-perms"}
const isAdmin = this.hasPermissions(requiredLevel,await this.getPermissions(user,channel,guild,settings))
return {hasPerms:true,isAdmin}
}
}
}