fix parsing

NikkyAI · Nov 2, 2023 · 19a1219 · 19a1219
1 parent 1e5e113
commit 19a1219
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/main/kotlin/moe/nikky/RoleChooserConfig.kt b/src/main/kotlin/moe/nikky/RoleChooserConfig.kt
@@ -72,8 +72,8 @@ data class RoleMappingConfig(
     val roleName: String,
 ) : Data {
     suspend fun reactionEmoji(guildBehavior: GuildBehavior): ReactionEmoji {
-        if(emoji.startsWith("<") && emoji.endsWith(">")) {
-            val id = emoji.substringAfterLast(":").substringBefore("<")
+        if(emoji.startsWith('<') && emoji.contains(":") && emoji.endsWith(">")) {
+            val id = emoji.substringAfterLast(":").substringBefore(">")
             return guildBehavior.emojis.first { it.id.toString() == id }
                 .let {
                     logger.traceF { "found emoji ${it.name}, turning into reaction emoji" }

diff --git a/src/main/kotlin/moe/nikky/RoleManagementExtension.kt b/src/main/kotlin/moe/nikky/RoleManagementExtension.kt
@@ -63,6 +63,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.toList
@@ -930,7 +931,13 @@ class RoleManagementExtension : Extension(), Klogging {
                 roleChoosers = oldConfig.roleChoosers.mapValues { (_, roleChooserConfig) ->
                     roleChooserConfig.copy(
                         roleMapping = roleChooserConfig.roleMapping.map { mapping ->
-                            val emoji = guild.emojis.firstOrNull { it.name == mapping.emoji || it.id.toString() == mapping.emoji }
+
+                            val emoji = if(mapping.emoji.startsWith("<") && mapping.emoji.endsWith(">")) {
+                                val id = mapping.emoji.substringAfterLast(":").substringBefore(">")
+                                guild.emojis.firstOrNull { it.id.toString() == id }
+                            } else {
+                                guild.emojis.firstOrNull { it.name == mapping.emoji || it.id.toString() == mapping.emoji }
+                            }
                             if(emoji != null) {
                                 mapping.copy(
                                     emojiName = emoji.name,