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

Compare commits

base: shkong:1.0.8
Branches Tags
shkong:master shkong:v1.0.9 shkong:gh-pages shkong:docs
shkong:1.1.1 shkong:1.0.9 shkong:1.1.0-ntrnm shkong:1.1.0 shkong:1.0.8 shkong:1.0.7 shkong:1.0.6 shkong:1.0.5
...
compare: shkong:b03e02675bec2c1631d0f47826f4e92fdd838b7b
Branches Tags
shkong:v1.0.9 shkong:master shkong:gh-pages shkong:docs
shkong:1.1.1 shkong:1.0.9 shkong:1.1.0-ntrnm shkong:1.1.0 shkong:1.0.8 shkong:1.0.7 shkong:1.0.6 shkong:1.0.5

2 Commits
1.0.8 ... b03e02675b

Author SHA1 Message Date
白池
b03e02675b Shamrock: add timeout #223 2024-02-05 22:16:12 +08:00
白池
e68a1ffd37 Shamrock: fix guild sync 2024-02-05 22:12:20 +08:00
3 changed files with 7 additions and 6 deletions
Expand all files Collapse all files

7
xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetGProChannelList.kt
View File

@ -1,5 +1,6 @@
package moe.fuqiuluo.shamrock.remote.action.handlers package moe.fuqiuluo.shamrock.remote.action.handlers
import kotlinx.coroutines.withTimeoutOrNull
import kotlinx.serialization.SerialName import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import kotlinx.serialization.json.JsonElement import kotlinx.serialization.json.JsonElement
@ -18,8 +19,10 @@ internal object GetGProChannelList: IActionHandler() {
return invoke(guildId.toULong(), refresh, echo = session.echo) return invoke(guildId.toULong(), refresh, echo = session.echo)
} }
operator fun invoke(guildId: ULong, refresh: Boolean, echo: JsonElement = EmptyJsonString): String { suspend operator fun invoke(guildId: ULong, refresh: Boolean, echo: JsonElement = EmptyJsonString): String {
val result = GProSvc.getChannelList(guildId, refresh) val result = withTimeoutOrNull(5000) {
GProSvc.getChannelList(guildId, refresh)
} ?: return error("timeout", echo)
result.onFailure { result.onFailure {
return error(it.message ?: "unable to fetch channel list", echo) return error(it.message ?: "unable to fetch channel list", echo)
} }

4
xposed/src/main/java/moe/fuqiuluo/shamrock/remote/api/BDHWorker.kt
View File

@ -5,6 +5,7 @@ import com.tencent.mobileqq.transfile.TransferRequest
import com.tencent.mobileqq.transfile.api.ITransFileController import com.tencent.mobileqq.transfile.api.ITransFileController
import io.ktor.server.routing.Routing import io.ktor.server.routing.Routing
import io.ktor.server.routing.post import io.ktor.server.routing.post
import moe.fuqiuluo.shamrock.remote.service.config.ShamrockConfig
import moe.fuqiuluo.shamrock.remote.structures.Status import moe.fuqiuluo.shamrock.remote.structures.Status
import moe.fuqiuluo.shamrock.tools.fetchPost import moe.fuqiuluo.shamrock.tools.fetchPost
import moe.fuqiuluo.shamrock.tools.respond import moe.fuqiuluo.shamrock.tools.respond
@ -15,7 +16,7 @@ import kotlin.random.Random
import kotlin.random.nextLong import kotlin.random.nextLong
fun Routing.registerBDH() { fun Routing.registerBDH() {
post("/upload_group_image") { if(ShamrockConfig.isDev()) post("/upload_group_image") {
val troop = fetchPost("troop") val troop = fetchPost("troop")
val picBytes = Base64.decode(fetchPost("pic"), Base64.DEFAULT) val picBytes = Base64.decode(fetchPost("pic"), Base64.DEFAULT)
val md5Str = MD5.getMd5Hex(picBytes) val md5Str = MD5.getMd5Hex(picBytes)
@ -46,5 +47,4 @@ fun Routing.registerBDH() {
.transferAsync(transferRequest) .transferAsync(transferRequest)
respond(isOk = true, Status.Ok, "$md5Str.jpg") respond(isOk = true, Status.Ok, "$md5Str.jpg")
} }
} }

2
xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/listener/AioListener.kt
View File

@ -174,8 +174,6 @@ internal object AioListener : IKernelMsgListener {
override fun onMsgInfoListUpdate(msgList: ArrayList<MsgRecord>?) { override fun onMsgInfoListUpdate(msgList: ArrayList<MsgRecord>?) {
msgList?.forEach { record -> msgList?.forEach { record ->
if (record.chatType == MsgConstant.KCHATTYPEGUILD) return@forEach// TODO: 频道消息暂不处理
if (record.sendStatus == MsgConstant.KSENDSTATUSFAILED if (record.sendStatus == MsgConstant.KSENDSTATUSFAILED
|| record.sendStatus == MsgConstant.KSENDSTATUSSENDING || record.sendStatus == MsgConstant.KSENDSTATUSSENDING
) { ) {