diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/ActionManager.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/ActionManager.kt index 23c0ad4..075a860 100644 --- a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/ActionManager.kt +++ b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/ActionManager.kt @@ -193,8 +193,8 @@ internal class ActionSession { return params[key].asBoolean } - fun getBooleanOrDefault(key: String, default: T? = null): T { - return (params[key].asBooleanOrNull as? T) ?: default as T + fun getBooleanOrDefault(key: String, default: Boolean? = null): Boolean { + return params[key].asBooleanOrNull ?: default as Boolean } fun getObject(key: String): JsonObject { diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/SendMessage.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/SendMessage.kt index 5ec4a47..5ac060e 100644 --- a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/SendMessage.kt +++ b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/SendMessage.kt @@ -75,7 +75,14 @@ internal object SendMessage: IActionHandler() { // return logic("contact is not found", echo = echo) //} val result = if (autoEscape) { - MsgSvc.sendToAio(chatType, peerId, arrayListOf(message).json, fromId = fromId) + MsgSvc.sendToAio(chatType, peerId, listOf( + mapOf( + "type" to "text", + "data" to mapOf( + "text" to message + ) + ) + ).json, fromId = fromId) } else { val msg = MessageHelper.decodeCQCode(message) if (msg.isEmpty()) {