00ll00 5 lat temu
rodzic
commit
55720d3bd0

+ 1 - 1
src/main/kotlin/bot_luo_core/data/DataObj.kt

@@ -144,7 +144,7 @@ abstract class DataObj(
             jsonObj.getObject(key, tr)
             jsonObj.getObject(key, tr)
         } else null
         } else null
     }
     }
-    inline fun <reified T: Map<*, *>> getObj(): T? {
+    inline fun <reified T: Map<*, *>> getObj(): T {
         val tr = object : TypeReference<T>() {}
         val tr = object : TypeReference<T>() {}
         return jsonObj.toJavaObject(tr)
         return jsonObj.toJavaObject(tr)
     }
     }

+ 2 - 2
src/main/kotlin/bot_luo_core/data/GroupTags.kt

@@ -6,12 +6,12 @@ import java.util.*
 import kotlin.collections.ArrayList
 import kotlin.collections.ArrayList
 import kotlin.collections.HashMap
 import kotlin.collections.HashMap
 
 
-object GroupTags: DataObj("data/group_tags.json", 1000L, false) {
+object GroupTags: DataObj("data/group_tags.json", 10000L, false) {
     override fun unload() {}
     override fun unload() {}
 
 
     val BUILTIN_GROUP_TAGS = listOf("#this", "#none")
     val BUILTIN_GROUP_TAGS = listOf("#this", "#none")
 
 
-    val tags: HashMap<String, ArrayList<String>> = getObj()?: HashMap()
+    val tags: HashMap<String, ArrayList<String>> = getObj()
 
 
     private fun saveTags() = setObj(tags)
     private fun saveTags() = setObj(tags)
 
 

+ 2 - 2
src/main/kotlin/bot_luo_core/data/UserTags.kt

@@ -6,12 +6,12 @@ import java.util.*
 import kotlin.collections.ArrayList
 import kotlin.collections.ArrayList
 import kotlin.collections.HashMap
 import kotlin.collections.HashMap
 
 
-object UserTags: DataObj("data/user_tags.json", 1000L, false)  {
+object UserTags: DataObj("data/user_tags.json", 10000L, false)  {
     override fun unload() {}
     override fun unload() {}
 
 
     val BUILTIN_USER_TAGS = listOf("#this", "#any")
     val BUILTIN_USER_TAGS = listOf("#this", "#any")
 
 
-    val tags: HashMap<String, ArrayList<String>> = getObj() ?: HashMap()
+    val tags: HashMap<String, ArrayList<String>> = getObj()
 
 
     private fun saveTags() = setObj(tags)
     private fun saveTags() = setObj(tags)