Skip to content
This repository has been archived by the owner on Aug 12, 2024. It is now read-only.

add alias for websocket #262

Merged
merged 2 commits into from
Feb 28, 2024
Merged

add alias for websocket #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
031beb8
add alias for websocket
huankong233 Feb 28, 2024
8b62f93
Merge branch 'master' into master
Simplxss Feb 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/ClearMsgs.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/FavAddImageMsg.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/FavAddTextMsg.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetForwardMsg.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetFriendSystemMsg.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetGroupMsgHistory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetGroupSystemMsg.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetHistoryMsg.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/KickTroopMember.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/SendForwardMessage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/SendGroupForwardMessage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/SendMsgByResid.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion ...d/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/SendPrivateForwardMessage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down