shkong/OpenShamrock
1
0
Fork 0
mirror of https://github.com/whitechi73/OpenShamrock.git synced 2024-08-14 13:12:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Shamrock: fix build error #201

Browse Source
This commit is contained in:
whitechi73 2024-01-18 09:58:16 +08:00
parent 160d1a11ac
commit e92b04ad0f
1 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
xposed/src/main/java/moe/fuqiuluo/shamrock/remote/api/MessageAction.kt
View File

@ -120,13 +120,16 @@ fun Routing.messageAction() {
val userId = fetchGetOrNull("user_id") val userId = fetchGetOrNull("user_id")
val groupId = fetchGetOrNull("group_id") val groupId = fetchGetOrNull("group_id")
val recallDuration = fetchGetOrNull("recall_duration")?.toLongOrNull()
call.respondText(SendMessage( call.respondText(SendMessage(
chatType = chatType, chatType = chatType,
peerId = if (chatType == MsgConstant.KCHATTYPEC2C) userId!! else groupId!!, peerId = if (chatType == MsgConstant.KCHATTYPEC2C) userId!! else groupId!!,
message = message, message = message,
autoEscape = autoEscape, autoEscape = autoEscape,
fromId = groupId ?: userId ?: "", fromId = groupId ?: userId ?: "",
retryCnt = retryCnt retryCnt = retryCnt,
recallDuration = recallDuration
), ContentType.Application.Json) ), ContentType.Application.Json)
} }
post { post {
@ -137,6 +140,7 @@ fun Routing.messageAction() {
val userId = fetchPostOrNull("user_id") val userId = fetchPostOrNull("user_id")
val groupId = fetchPostOrNull("group_id") val groupId = fetchPostOrNull("group_id")
val peerId = if (chatType == MsgConstant.KCHATTYPEC2C) userId!! else groupId!! val peerId = if (chatType == MsgConstant.KCHATTYPEC2C) userId!! else groupId!!
val recallDuration = fetchPostOrNull("recall_duration")?.toLongOrNull()
call.respondText(if (isJsonData() && !isJsonString("message")) { call.respondText(if (isJsonData() && !isJsonString("message")) {
if (isJsonObject("message")) { if (isJsonObject("message")) {
@ -145,7 +149,8 @@ fun Routing.messageAction() {
peerId = peerId, peerId = peerId,
message = listOf(fetchPostJsonObject("message")).jsonArray, message = listOf(fetchPostJsonObject("message")).jsonArray,
fromId = groupId ?: userId ?: "", fromId = groupId ?: userId ?: "",
retryCnt = retryCnt retryCnt = retryCnt,
recallDuration = recallDuration
) )
} else { } else {
SendMessage( SendMessage(
@ -153,7 +158,8 @@ fun Routing.messageAction() {
peerId = peerId, peerId = peerId,
message = fetchPostJsonArray("message"), message = fetchPostJsonArray("message"),
fromId = groupId ?: userId ?: "", fromId = groupId ?: userId ?: "",
retryCnt = retryCnt retryCnt = retryCnt,
recallDuration = recallDuration
) )
} }
} else { } else {
@ -165,7 +171,8 @@ fun Routing.messageAction() {
message = fetchPostOrThrow("message"), message = fetchPostOrThrow("message"),
autoEscape = autoEscape, autoEscape = autoEscape,
fromId = groupId ?: userId ?: "", fromId = groupId ?: userId ?: "",
retryCnt = retryCnt retryCnt = retryCnt,
recallDuration = recallDuration
) )
}, ContentType.Application.Json) }, ContentType.Application.Json)
} }
@ -177,36 +184,41 @@ fun Routing.messageAction() {
val message = fetchGetOrThrow("message") val message = fetchGetOrThrow("message")
val retryCnt = fetchGetOrNull("retry_cnt")?.toInt() ?: 3 val retryCnt = fetchGetOrNull("retry_cnt")?.toInt() ?: 3
val autoEscape = fetchGetOrNull("auto_escape")?.toBooleanStrict() ?: false val autoEscape = fetchGetOrNull("auto_escape")?.toBooleanStrict() ?: false
call.respondText(SendMessage(MsgConstant.KCHATTYPEGROUP, groupId, message, autoEscape, retryCnt = retryCnt)) val recallDuration = fetchGetOrNull("recall_duration")?.toLongOrNull()
call.respondText(SendMessage(MsgConstant.KCHATTYPEGROUP, groupId, message, autoEscape, retryCnt = retryCnt, recallDuration = recallDuration), ContentType.Application.Json)
} }
post { post {
val groupId = fetchPostOrThrow("group_id") val groupId = fetchPostOrThrow("group_id")
val retryCnt = fetchPostOrNull("retry_cnt")?.toInt() ?: 3 val retryCnt = fetchPostOrNull("retry_cnt")?.toInt() ?: 3
val autoEscape = fetchPostOrNull("auto_escape")?.toBooleanStrict() ?: false val autoEscape = fetchPostOrNull("auto_escape")?.toBooleanStrict() ?: false
val recallDuration = fetchPostOrNull("recall_duration")?.toLongOrNull()
val result = if (isJsonData()) { val result = if (isJsonData()) {
if (isJsonString("message")) { if (isJsonString("message")) {
SendMessage(MsgConstant.KCHATTYPEGROUP, groupId, fetchPostJsonString("message"), autoEscape, retryCnt = retryCnt) SendMessage(MsgConstant.KCHATTYPEGROUP, groupId, fetchPostJsonString("message"), autoEscape, retryCnt = retryCnt, recallDuration = recallDuration)
} else { } else {
if (isJsonObject("message")) { if (isJsonObject("message")) {
SendMessage( SendMessage(
chatType = MsgConstant.KCHATTYPEGROUP, chatType = MsgConstant.KCHATTYPEGROUP,
peerId = groupId, peerId = groupId,
message = listOf(fetchPostJsonObject("message")).jsonArray, message = listOf(fetchPostJsonObject("message")).jsonArray,
retryCnt = retryCnt retryCnt = retryCnt,
recallDuration = recallDuration
) )
} else { } else {
SendMessage( SendMessage(
chatType = MsgConstant.KCHATTYPEGROUP, chatType = MsgConstant.KCHATTYPEGROUP,
peerId = groupId, peerId = groupId,
message = fetchPostJsonArray("message"), message = fetchPostJsonArray("message"),
retryCnt = retryCnt retryCnt = retryCnt,
recallDuration = recallDuration
) )
} }
} }
} else { } else {
SendMessage(MsgConstant.KCHATTYPEGROUP, groupId, fetchPostOrThrow("message"), autoEscape, retryCnt = retryCnt) SendMessage(MsgConstant.KCHATTYPEGROUP, groupId, fetchPostOrThrow("message"), autoEscape, retryCnt = retryCnt, recallDuration = recallDuration)
} }
call.respondText(result, ContentType.Application.Json) call.respondText(result, ContentType.Application.Json)
@ -220,13 +232,14 @@ fun Routing.messageAction() {
val message = fetchGetOrThrow("message") val message = fetchGetOrThrow("message")
val retryCnt = fetchGetOrNull("retry_cnt")?.toInt() ?: 3 val retryCnt = fetchGetOrNull("retry_cnt")?.toInt() ?: 3
val autoEscape = fetchGetOrNull("auto_escape")?.toBooleanStrict() ?: false val autoEscape = fetchGetOrNull("auto_escape")?.toBooleanStrict() ?: false
val recallDuration = fetchGetOrNull("recall_duration")?.toLongOrNull()
call.respondText(SendMessage( call.respondText(SendMessage(
chatType = if (groupId == null) MsgConstant.KCHATTYPEC2C else MsgConstant.KCHATTYPETEMPC2CFROMGROUP, chatType = if (groupId == null) MsgConstant.KCHATTYPEC2C else MsgConstant.KCHATTYPETEMPC2CFROMGROUP,
peerId = userId, peerId = userId,
message = message, message = message,
autoEscape = autoEscape, autoEscape = autoEscape,
fromId = groupId ?: userId, fromId = groupId ?: userId,
retryCnt = retryCnt retryCnt = retryCnt, recallDuration = recallDuration
), ContentType.Application.Json) ), ContentType.Application.Json)
} }
post { post {
@ -237,7 +250,7 @@ fun Routing.messageAction() {
val chatType = if (groupId == null) MsgConstant.KCHATTYPEC2C else MsgConstant.KCHATTYPETEMPC2CFROMGROUP val chatType = if (groupId == null) MsgConstant.KCHATTYPEC2C else MsgConstant.KCHATTYPETEMPC2CFROMGROUP
val fromId = groupId ?: userId val fromId = groupId ?: userId
val recallDuration = fetchPostOrNull("recall_duration")?.toLongOrNull()
val result = if (isJsonData()) { val result = if (isJsonData()) {
if (isJsonString("message")) { if (isJsonString("message")) {
@ -247,7 +260,7 @@ fun Routing.messageAction() {
message = fetchPostJsonString("message"), message = fetchPostJsonString("message"),
autoEscape = autoEscape, autoEscape = autoEscape,
fromId = fromId, fromId = fromId,
retryCnt = retryCnt retryCnt = retryCnt, recallDuration = recallDuration
) )
} else { } else {
if (isJsonObject("message")) { if (isJsonObject("message")) {
@ -256,7 +269,7 @@ fun Routing.messageAction() {
peerId = userId, peerId = userId,
message = listOf(fetchPostJsonObject("message")).jsonArray, message = listOf(fetchPostJsonObject("message")).jsonArray,
fromId = fromId, fromId = fromId,
retryCnt = retryCnt retryCnt = retryCnt, recallDuration = recallDuration
) )
} else { } else {
SendMessage( SendMessage(
@ -264,7 +277,7 @@ fun Routing.messageAction() {
peerId = userId, peerId = userId,
message = fetchPostJsonArray("message"), message = fetchPostJsonArray("message"),
fromId = fromId, fromId = fromId,
retryCnt = retryCnt retryCnt = retryCnt, recallDuration = recallDuration
) )
} }
} }
@ -275,7 +288,7 @@ fun Routing.messageAction() {
message = fetchPostOrThrow("message"), message = fetchPostOrThrow("message"),
autoEscape = autoEscape, autoEscape = autoEscape,
fromId = fromId, fromId = fromId,
retryCnt = retryCnt retryCnt = retryCnt, recallDuration = recallDuration
) )
} }