fix: fix music command not work and bump ronebot version
This commit is contained in:
20 files changed
+60
-67
No files matched your search
@@ -11,11 +11,11 @@ import cn.rtast.fancybot.configManager
|
||||
import cn.rtast.fancybot.entity.github.UploadContentPayload
|
||||
import cn.rtast.fancybot.entity.github.UploadContentResponse
|
||||
import cn.rtast.fancybot.enums.ImageBedType
|
||||
import cn.rtast.fancybot.instance
|
||||
import cn.rtast.fancybot.util.Http
|
||||
import cn.rtast.fancybot.util.str.encodeToBase64
|
||||
import cn.rtast.fancybot.util.str.proxy
|
||||
import cn.rtast.fancybot.util.str.toJson
|
||||
import cn.rtast.rob.util.ob.OneBotAction
|
||||
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials
|
||||
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider
|
||||
import software.amazon.awssdk.core.sync.RequestBody
|
||||
@@ -44,7 +44,7 @@ object ImageBed {
|
||||
.build()
|
||||
}
|
||||
|
||||
suspend fun upload(file: ByteArray, fileType: String = ""): String {
|
||||
fun upload(file: ByteArray, fileType: String = ""): String {
|
||||
val randomUUID = UUID.randomUUID().toString()
|
||||
return when (configManager.imageBedType) {
|
||||
ImageBedType.Github -> {
|
||||
@@ -67,8 +67,6 @@ object ImageBed {
|
||||
s3Client.putObject(putObjectRequest, RequestBody.fromBytes(file))
|
||||
return "${configManager.cloudflareR2PublicUrl}/$key".proxy
|
||||
}
|
||||
|
||||
ImageBedType.QQ -> instance.action.uploadImage(file.encodeToBase64(), true)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -11,6 +11,7 @@ import cn.rtast.fancybot.*
|
||||
import cn.rtast.fancybot.util.Http
|
||||
import cn.rtast.rob.BotInstance
|
||||
import cn.rtast.rob.ROneBotFactory
|
||||
import cn.rtast.rob.util.ob.OneBotAction
|
||||
import cn.rtast.rob.util.ob.OneBotListener
|
||||
import java.io.File
|
||||
import kotlin.random.Random
|
||||
@@ -20,8 +21,8 @@ fun randomBooleanWithProbability(probability: Double): Boolean {
|
||||
return randomValue <= (probability * 100)
|
||||
}
|
||||
|
||||
suspend fun OneBotListener.getUserName(groupId: Long, userId: Long): String {
|
||||
val info = instance.action.getGroupMemberInfo(groupId, userId)
|
||||
suspend fun OneBotListener.getUserName(action: OneBotAction, groupId: Long, userId: Long): String {
|
||||
val info = action.getGroupMemberInfo(groupId, userId)
|
||||
return info.card ?: info.nickname
|
||||
}
|
||||
|
||||
@@ -48,5 +49,9 @@ fun initItems() {
|
||||
}
|
||||
|
||||
fun initBackgroundTasks(instance: BotInstance) {
|
||||
tasks.forEach { instance.scheduler.scheduleTask(it.value, 1000L, it.key) }
|
||||
instance.scheduler.scheduleTask({ instance ->
|
||||
configManager.admins.forEach {
|
||||
instance.action.sendLike(it, 1)
|
||||
}
|
||||
}, 1000L, 10000000L)
|
||||
}
|
||||
Reference in New Issue
Block a user