diff --git a/core/src/main/kotlin/matterlink/bridge/command/BridgeCommandRegistry.kt b/core/src/main/kotlin/matterlink/bridge/command/BridgeCommandRegistry.kt index b41b946..eb41e4c 100644 --- a/core/src/main/kotlin/matterlink/bridge/command/BridgeCommandRegistry.kt +++ b/core/src/main/kotlin/matterlink/bridge/command/BridgeCommandRegistry.kt @@ -44,7 +44,7 @@ object BridgeCommandRegistry { return if (help.isNotBlank()) help else "No help for '$cmd'" } - fun getCommandList(permLvl: Int): String { + fun getCommandList(permLvl: Double): String { return commandMap .filterValues { it.permLevel <= permLvl diff --git a/core/src/main/kotlin/matterlink/bridge/command/CustomCommand.kt b/core/src/main/kotlin/matterlink/bridge/command/CustomCommand.kt index 94039b6..93a7184 100644 --- a/core/src/main/kotlin/matterlink/bridge/command/CustomCommand.kt +++ b/core/src/main/kotlin/matterlink/bridge/command/CustomCommand.kt @@ -10,7 +10,7 @@ data class CustomCommand( val type: CommandType = CommandType.RESPONSE, val execute: String = "", val response: String = "", - override val permLevel: Int = 0, + override val permLevel: Double = 0.0, override val help: String = "", val allowArgs: Boolean = true, val timeout: Int = 20 diff --git a/core/src/main/kotlin/matterlink/bridge/command/HelpCommand.kt b/core/src/main/kotlin/matterlink/bridge/command/HelpCommand.kt index 0aa5d58..85f2710 100644 --- a/core/src/main/kotlin/matterlink/bridge/command/HelpCommand.kt +++ b/core/src/main/kotlin/matterlink/bridge/command/HelpCommand.kt @@ -6,7 +6,7 @@ import matterlink.config.cfg object HelpCommand : IBridgeCommand { override val help: String = "Returns the help string for the given command. Syntax: help " - override val permLevel = 0 + override val permLevel = 0.0 override fun execute(alias: String, user: String, userId: String, server: String, args: String): Boolean { val msg: String = when { args.isEmpty() -> diff --git a/core/src/main/kotlin/matterlink/bridge/command/IBridgeCommand.kt b/core/src/main/kotlin/matterlink/bridge/command/IBridgeCommand.kt index 9c533e1..ead5f7e 100644 --- a/core/src/main/kotlin/matterlink/bridge/command/IBridgeCommand.kt +++ b/core/src/main/kotlin/matterlink/bridge/command/IBridgeCommand.kt @@ -4,7 +4,7 @@ import matterlink.config.PermissionConfig interface IBridgeCommand { val help: String - val permLevel: Int + val permLevel: Double fun execute(alias: String, user: String, userId: String, server: String, args: String): Boolean @@ -15,9 +15,9 @@ interface IBridgeCommand { fun validate() = true companion object { - fun getPermLevel(userId: String, server: String): Int { - if (PermissionConfig.perms[server] == null) return 0 - return PermissionConfig.perms[server]?.get(userId) ?: 0 + fun getPermLevel(userId: String, server: String): Double { + val serverMap = PermissionConfig.perms[server] ?: return 0.0 + return serverMap[userId] ?: 0.0 } } } \ No newline at end of file diff --git a/core/src/main/kotlin/matterlink/config/CommandConfig.kt b/core/src/main/kotlin/matterlink/config/CommandConfig.kt index 2dee27e..59a0158 100644 --- a/core/src/main/kotlin/matterlink/config/CommandConfig.kt +++ b/core/src/main/kotlin/matterlink/config/CommandConfig.kt @@ -37,7 +37,7 @@ object CommandConfig { ), "uptime" to CustomCommand( type = CommandType.RESPONSE, - permLevel = 1, + permLevel = 1.0, response = "{uptime}", help = "Print server uptime", allowArgs = false diff --git a/core/src/main/kotlin/matterlink/config/PermissionConfig.kt b/core/src/main/kotlin/matterlink/config/PermissionConfig.kt index 11a19b3..407f893 100644 --- a/core/src/main/kotlin/matterlink/config/PermissionConfig.kt +++ b/core/src/main/kotlin/matterlink/config/PermissionConfig.kt @@ -8,7 +8,7 @@ import matterlink.instance import matterlink.stackTraceString import java.io.File -typealias PermissionMap = Map> +typealias PermissionMap = Map> object PermissionConfig { private val gson: Gson = GsonBuilder().setPrettyPrinting().create() @@ -16,11 +16,11 @@ object PermissionConfig { private val default = mapOf( "irc.esper" to mapOf( - "~nikky@nikky.moe" to 0, - "user@example." to 0 + "~nikky@nikky.moe" to 0.0, + "user@example." to 0.0 ), "discord.game" to mapOf( - "112228624366575616" to 0 + "112228624366575616" to 0.0 ) ) diff --git a/gradle.properties b/gradle.properties index ad33eab..6c4a0f0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ mod_name = MatterLink -mod_version = 1.5.4 +mod_version = 1.5.5 forgelin_version = 1.6.0 curse_id = 287323 curse_release_type = beta \ No newline at end of file