Merge branch 'master' into master

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/ClearMsgs.kt

@@ -8,7 +8,7 @@ import moe.fuqiuluo.shamrock.tools.EmptyJsonString
 import moe.fuqiuluo.shamrock.xposed.helper.NTServiceFetcher
 import moe.fuqiuluo.symbols.OneBotHandler
 
-@OneBotHandler("clear_msgs")
+@OneBotHandler("clear_msgs", ["clear_messages"])
 internal object ClearMsgs: IActionHandler() {
     override suspend fun internalHandle(session: ActionSession): String {
         val msgType = session.getString("message_type")

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/FavAddImageMsg.kt

@@ -19,7 +19,7 @@ import moe.fuqiuluo.symbols.OneBotHandler
 import moe.fuqiuluo.symbols.decodeProtobuf
 import protobuf.fav.WeiyunComm
 
-@OneBotHandler("fav.add_image_msg")
+@OneBotHandler("fav.add_image_msg", ["fav.add_image_message"])
 internal object FavAddImageMsg: IActionHandler() {
     override suspend fun internalHandle(session: ActionSession): String {
         val uin = session.getLong("user_id")

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/FavAddTextMsg.kt

@@ -16,7 +16,7 @@ import moe.fuqiuluo.symbols.OneBotHandler
 import moe.fuqiuluo.symbols.decodeProtobuf
 import protobuf.fav.WeiyunComm
 
-@OneBotHandler("fav.add_text_msg")
+@OneBotHandler("fav.add_text_msg", ["fav.add_text_msg"])
 internal object FavAddTextMsg: IActionHandler() {
     override suspend fun internalHandle(session: ActionSession): String {
         val uin = session.getLong("user_id")

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetForwardMsg.kt

@@ -8,7 +8,7 @@ import moe.fuqiuluo.shamrock.remote.service.data.GetForwardMsgResult
 import moe.fuqiuluo.shamrock.tools.EmptyJsonString
 import moe.fuqiuluo.symbols.OneBotHandler
 
-@OneBotHandler("get_forward_msg")
+@OneBotHandler("get_forward_msg", ["get_forward_message"])
 internal object GetForwardMsg : IActionHandler() {
     override suspend fun internalHandle(session: ActionSession): String {
         val id = session.getString("id")

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetFriendSystemMsg.kt

@@ -10,7 +10,7 @@ import moe.fuqiuluo.shamrock.remote.service.data.FriendRequest
 import moe.fuqiuluo.shamrock.tools.EmptyJsonString
 import moe.fuqiuluo.symbols.OneBotHandler
 
-@OneBotHandler("get_friend_system_msg")
+@OneBotHandler("get_friend_system_msg", ["get_friend_system_message"])
 internal object GetFriendSystemMsg : IActionHandler() {
     override suspend fun internalHandle(session: ActionSession): String {
         return invoke(echo = session.echo)

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetGroupMsgHistory.kt

@@ -6,7 +6,7 @@ import moe.fuqiuluo.shamrock.remote.action.ActionSession
 import moe.fuqiuluo.shamrock.remote.action.IActionHandler
 import moe.fuqiuluo.symbols.OneBotHandler
 
-@OneBotHandler("get_group_msg_history")
+@OneBotHandler("get_group_msg_history", ["get_group_message_history"])
 internal object GetGroupMsgHistory: IActionHandler() {
     override suspend fun internalHandle(session: ActionSession): String {
         val groupId = session.getLong("group_id")

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetGroupSystemMsg.kt

@@ -9,7 +9,7 @@ import moe.fuqiuluo.shamrock.remote.service.data.GroupSystemMessage
 import moe.fuqiuluo.shamrock.tools.EmptyJsonString
 import moe.fuqiuluo.symbols.OneBotHandler
 
-@OneBotHandler("get_group_system_msg")
+@OneBotHandler("get_group_system_msg", ["get_group_system_message"])
 internal object GetGroupSystemMsg: IActionHandler() {
     override suspend fun internalHandle(session: ActionSession): String {
         return invoke(echo = session.echo)

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetHistoryMsg.kt

@@ -21,7 +21,7 @@ import java.util.ArrayList
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 
-@OneBotHandler("get_history_msg")
+@OneBotHandler("get_history_msg", ["get_history_message"])
 internal object GetHistoryMsg : IActionHandler() {
     override suspend fun internalHandle(session: ActionSession): String {
         val msgType = session.getString("message_type")

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/KickTroopMember.kt

@@ -12,7 +12,7 @@ internal object KickTroopMember: IActionHandler() {
     override suspend fun internalHandle(session: ActionSession): String {
         val groupId = session.getLong("group_id")
         val userId = session.getLong("user_id")
-        val kickMsg = session.getStringOrNull("kick_msg") ?: ""
+        val kickMsg = session.getStringOrNull("kick_msg") ?: session.getStringOrNull("kick_message") ?: ""
         val rejectAddRequest = session.getBooleanOrDefault("reject_add_request", false)
 
         return invoke(groupId, userId, rejectAddRequest, kickMsg, session.echo)

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/SendForwardMessage.kt

@@ -12,7 +12,7 @@ import moe.fuqiuluo.shamrock.remote.service.data.SendForwardMessageResult
 import moe.fuqiuluo.shamrock.tools.*
 import moe.fuqiuluo.symbols.OneBotHandler
 
-@OneBotHandler("send_forward_msg")
+@OneBotHandler("send_forward_msg", ["send_forward_message"])
 internal object SendForwardMessage : IActionHandler() {
     override suspend fun internalHandle(session: ActionSession): String {
         val detailType = session.getStringOrNull("detail_type") ?: session.getStringOrNull("message_type")

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/SendGroupForwardMessage.kt

@@ -5,8 +5,8 @@ import moe.fuqiuluo.shamrock.remote.action.ActionSession
 import moe.fuqiuluo.shamrock.remote.action.IActionHandler
 import moe.fuqiuluo.symbols.OneBotHandler
 
-@OneBotHandler("send_group_forward_msg")
+@OneBotHandler("send_group_forward_msg", ["send_group_forward_message"])
-internal object SendGroupForwardMessage : IActionHandler() {
+internal object SendGroupForwardMessage: IActionHandler() {
     override suspend fun internalHandle(session: ActionSession): String {
         val groupId = session.getLong("group_id")
         val retryCnt = session.getIntOrNull("retry_cnt") ?: 5

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/SendMsgByResid.kt

@@ -16,7 +16,7 @@ import protobuf.message.routing.Grp
 import kotlin.random.Random
 import kotlin.random.nextUInt
 
-@OneBotHandler("send_msg_by_resid")
+@OneBotHandler("send_msg_by_resid", ["send_message_by_resid"])
 internal object SendMsgByResid : IActionHandler() {
     private val msgSeq = atomic(1000)
 

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/SendPrivateForwardMessage.kt

@@ -5,7 +5,7 @@ import moe.fuqiuluo.shamrock.remote.action.ActionSession
 import moe.fuqiuluo.shamrock.remote.action.IActionHandler
 import moe.fuqiuluo.symbols.OneBotHandler
 
-@OneBotHandler("send_private_forward_msg")
+@OneBotHandler("send_private_forward_msg", ["send_private_forward_message"])
 internal object SendPrivateForwardMessage : IActionHandler() {
     override suspend fun internalHandle(session: ActionSession): String {
         val userId = session.getLong("user_id")