sorceress
/
MatterLink
mirror of https://github.com/AgathaSorceress/MatterLink.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix gson type confusion bug

This commit is contained in:
nikky 2018-04-22 18:56:42 +02:00
parent f367690789
commit 928576c64b
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/kotlin/matterlink/bridge/command/BridgeCommandRegistry.kt
View File

@ -44,7 +44,7 @@ object BridgeCommandRegistry {
return if (help.isNotBlank()) help else "No help for '$cmd'" return if (help.isNotBlank()) help else "No help for '$cmd'"
} }
fun getCommandList(permLvl: Int): String { fun getCommandList(permLvl: Double): String {
return commandMap return commandMap
.filterValues { .filterValues {
it.permLevel <= permLvl it.permLevel <= permLvl

2
core/src/main/kotlin/matterlink/bridge/command/CustomCommand.kt
View File

@ -10,7 +10,7 @@ data class CustomCommand(
val type: CommandType = CommandType.RESPONSE, val type: CommandType = CommandType.RESPONSE,
val execute: String = "", val execute: String = "",
val response: String = "", val response: String = "",
override val permLevel: Int = 0, override val permLevel: Double = 0.0,
override val help: String = "", override val help: String = "",
val allowArgs: Boolean = true, val allowArgs: Boolean = true,
val timeout: Int = 20 val timeout: Int = 20

2
core/src/main/kotlin/matterlink/bridge/command/HelpCommand.kt
View File

@ -6,7 +6,7 @@ import matterlink.config.cfg
object HelpCommand : IBridgeCommand { object HelpCommand : IBridgeCommand {
override val help: String = "Returns the help string for the given command. Syntax: help <command>" override val help: String = "Returns the help string for the given command. Syntax: help <command>"
override val permLevel = 0 override val permLevel = 0.0
override fun execute(alias: String, user: String, userId: String, server: String, args: String): Boolean { override fun execute(alias: String, user: String, userId: String, server: String, args: String): Boolean {
val msg: String = when { val msg: String = when {
args.isEmpty() -> args.isEmpty() ->

8
core/src/main/kotlin/matterlink/bridge/command/IBridgeCommand.kt
View File

@ -4,7 +4,7 @@ import matterlink.config.PermissionConfig
interface IBridgeCommand { interface IBridgeCommand {
val help: String val help: String
val permLevel: Int val permLevel: Double
fun execute(alias: String, user: String, userId: String, server: String, args: String): Boolean fun execute(alias: String, user: String, userId: String, server: String, args: String): Boolean
@ -15,9 +15,9 @@ interface IBridgeCommand {
fun validate() = true fun validate() = true
companion object { companion object {
fun getPermLevel(userId: String, server: String): Int { fun getPermLevel(userId: String, server: String): Double {
if (PermissionConfig.perms[server] == null) return 0 val serverMap = PermissionConfig.perms[server] ?: return 0.0
return PermissionConfig.perms[server]?.get(userId) ?: 0 return serverMap[userId] ?: 0.0
} }
} }
} }

2
core/src/main/kotlin/matterlink/config/CommandConfig.kt
View File

@ -37,7 +37,7 @@ object CommandConfig {
), ),
"uptime" to CustomCommand( "uptime" to CustomCommand(
type = CommandType.RESPONSE, type = CommandType.RESPONSE,
permLevel = 1, permLevel = 1.0,
response = "{uptime}", response = "{uptime}",
help = "Print server uptime", help = "Print server uptime",
allowArgs = false allowArgs = false

8
core/src/main/kotlin/matterlink/config/PermissionConfig.kt
View File

@ -8,7 +8,7 @@ import matterlink.instance
import matterlink.stackTraceString import matterlink.stackTraceString
import java.io.File import java.io.File
typealias PermissionMap = Map<String, Map<String, Int>> typealias PermissionMap = Map<String, Map<String, Double>>
object PermissionConfig { object PermissionConfig {
private val gson: Gson = GsonBuilder().setPrettyPrinting().create() private val gson: Gson = GsonBuilder().setPrettyPrinting().create()
@ -16,11 +16,11 @@ object PermissionConfig {
private val default = mapOf( private val default = mapOf(
"irc.esper" to mapOf( "irc.esper" to mapOf(
"~nikky@nikky.moe" to 0, "~nikky@nikky.moe" to 0.0,
"user@example." to 0 "user@example." to 0.0
), ),
"discord.game" to mapOf( "discord.game" to mapOf(
"112228624366575616" to 0 "112228624366575616" to 0.0
) )
) )

2
gradle.properties
View File

@ -1,5 +1,5 @@
mod_name = MatterLink mod_name = MatterLink
mod_version = 1.5.4 mod_version = 1.5.5
forgelin_version = 1.6.0 forgelin_version = 1.6.0
curse_id = 287323 curse_id = 287323
curse_release_type = beta curse_release_type = beta