diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/ClearMsgs.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/ClearMsgs.kt index 0ce56ed5..abebb2c7 100644 --- a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/ClearMsgs.kt +++ b/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") diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/FavAddImageMsg.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/FavAddImageMsg.kt index 5254c683..9f3a23dc 100644 --- a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/FavAddImageMsg.kt +++ b/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") diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/FavAddTextMsg.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/FavAddTextMsg.kt index b37e750f..25626be1 100644 --- a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/FavAddTextMsg.kt +++ b/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") diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetForwardMsg.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetForwardMsg.kt index f4a8d6b6..cb980e58 100644 --- a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetForwardMsg.kt +++ b/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") diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetFriendSystemMsg.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetFriendSystemMsg.kt index a7d5c665..9807467f 100644 --- a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetFriendSystemMsg.kt +++ b/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) diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetGroupMsgHistory.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetGroupMsgHistory.kt index 80bad0aa..c3b182f4 100644 --- a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetGroupMsgHistory.kt +++ b/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") diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetGroupSystemMsg.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetGroupSystemMsg.kt index 0f96a0be..82b69e52 100644 --- a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetGroupSystemMsg.kt +++ b/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) diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetHistoryMsg.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetHistoryMsg.kt index a587dbb0..e6bfc60a 100644 --- a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetHistoryMsg.kt +++ b/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") diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/KickTroopMember.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/KickTroopMember.kt index 15bed755..1cf22812 100644 --- a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/KickTroopMember.kt +++ b/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) diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/SendForwardMessage.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/SendForwardMessage.kt index 7acf84d9..a13d1fd6 100644 --- a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/SendForwardMessage.kt +++ b/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") diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/SendGroupForwardMessage.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/SendGroupForwardMessage.kt index bac2caa5..c15996ac 100644 --- a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/SendGroupForwardMessage.kt +++ b/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") -internal object SendGroupForwardMessage : IActionHandler() { +@OneBotHandler("send_group_forward_msg", ["send_group_forward_message"]) +internal object SendGroupForwardMessage: IActionHandler() { override suspend fun internalHandle(session: ActionSession): String { val groupId = session.getLong("group_id") val retryCnt = session.getIntOrNull("retry_cnt") ?: 5 diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/SendMsgByResid.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/SendMsgByResid.kt index 60b53bfb..1723a161 100644 --- a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/SendMsgByResid.kt +++ b/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) diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/SendPrivateForwardMessage.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/SendPrivateForwardMessage.kt index e857043f..fade95bc 100644 --- a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/SendPrivateForwardMessage.kt +++ b/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")