github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-20 18:44:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Migrate deprecated calls

Browse Source
This commit is contained in:
Him188 2020-12-16 19:21:47 +08:00
parent 4fb3d6c2b3
commit e7632f05d6
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mirai-core-api/src/commonMain/kotlin/message/data/At.kt
View File

@ -41,7 +41,7 @@ public data class At(
/** /**
* 构造一个 [At], 仅供内部使用, 否则可能造成消息无法发出的问题. * 构造一个 [At], 仅供内部使用, 否则可能造成消息无法发出的问题.
*/ */
@Suppress("FunctionName", "UnusedParameter") @Suppress("FunctionName", "UNUSED_PARAMETER")
@JvmStatic @JvmStatic
@LowLevelApi @LowLevelApi
@Deprecated("Use constructor instead", ReplaceWith("At(target)", "net.mamoe.mirai.message.data.At")) @Deprecated("Use constructor instead", ReplaceWith("At(target)", "net.mamoe.mirai.message.data.At"))

8
mirai-core-api/src/commonMain/kotlin/utils/FileCacheStrategy.kt
View File

@ -127,7 +127,7 @@ public interface FileCacheStrategy {
@MiraiExperimentalApi @MiraiExperimentalApi
@Throws(java.io.IOException::class) @Throws(java.io.IOException::class)
override fun newImageCache(input: Input): ExternalImage { override fun newImageCache(input: Input): ExternalImage {
return ExternalImage(createTempFile(directory = directory).apply { return ExternalImage(File.createTempFile("tmp", null, directory).apply {
deleteOnExit() deleteOnExit()
input.withOut(this.outputStream()) { copyTo(it) } input.withOut(this.outputStream()) { copyTo(it) }
}.asReusableInput(true)) }.asReusableInput(true))
@ -136,7 +136,7 @@ public interface FileCacheStrategy {
@MiraiExperimentalApi @MiraiExperimentalApi
@Throws(java.io.IOException::class) @Throws(java.io.IOException::class)
override fun newImageCache(input: InputStream): ExternalImage { override fun newImageCache(input: InputStream): ExternalImage {
return ExternalImage(createTempFile(directory = directory).apply { return ExternalImage(File.createTempFile("tmp", null, directory).apply {
deleteOnExit() deleteOnExit()
input.withOut(this.outputStream()) { copyTo(it) } input.withOut(this.outputStream()) { copyTo(it) }
}.asReusableInput(true)) }.asReusableInput(true))
@ -150,7 +150,7 @@ public interface FileCacheStrategy {
@MiraiExperimentalApi @MiraiExperimentalApi
override fun newImageCache(input: BufferedImage, format: String): ExternalImage { override fun newImageCache(input: BufferedImage, format: String): ExternalImage {
val file = createTempFile(directory = directory).apply { deleteOnExit() } val file = File.createTempFile("tmp", null, directory).apply { deleteOnExit() }
val digest = MessageDigest.getInstance("md5") val digest = MessageDigest.getInstance("md5")
digest.reset() digest.reset()
@ -180,7 +180,7 @@ public interface FileCacheStrategy {
@MiraiExperimentalApi @MiraiExperimentalApi
override fun newImageCache(input: URL): ExternalImage { override fun newImageCache(input: URL): ExternalImage {
return ExternalImage(createTempFile(directory = directory).apply { return ExternalImage(File.createTempFile("tmp", null, directory).apply {
deleteOnExit() deleteOnExit()
input.openConnection().getInputStream().withOut(this.outputStream()) { copyTo(it) } input.openConnection().getInputStream().withOut(this.outputStream()) { copyTo(it) }
}.asReusableInput(true)) }.asReusableInput(true))

5
mirai-core-api/src/commonMain/kotlin/utils/LoginSolver.kt
View File

@ -112,8 +112,9 @@ public class StandardCharImageLoginSolver(
override suspend fun onSolvePicCaptcha(bot: Bot, data: ByteArray): String? = loginSolverLock.withLock { override suspend fun onSolvePicCaptcha(bot: Bot, data: ByteArray): String? = loginSolverLock.withLock {
val logger = overrideLogger ?: bot.logger val logger = overrideLogger ?: bot.logger
val tempFile: File = createTempFile(suffix = ".png").apply { deleteOnExit() } @Suppress("BlockingMethodInNonBlockingContext")
withContext(Dispatchers.IO) { withContext(Dispatchers.IO) {
val tempFile: File = File.createTempFile("tmp", ".png").apply { deleteOnExit() }
tempFile.createNewFile() tempFile.createNewFile()
logger.info("需要图片验证码登录, 验证码为 4 字母") logger.info("需要图片验证码登录, 验证码为 4 字母")
try { try {
@ -153,7 +154,7 @@ public class StandardCharImageLoginSolver(
} }
} }
override suspend fun onSolveUnsafeDeviceLoginVerify(bot: Bot, url: String): String? = loginSolverLock.withLock { override suspend fun onSolveUnsafeDeviceLoginVerify(bot: Bot, url: String): String = loginSolverLock.withLock {
val logger = overrideLogger ?: bot.logger val logger = overrideLogger ?: bot.logger
logger.info("需要进行账户安全认证") logger.info("需要进行账户安全认证")
logger.info("该账户有[设备锁]/[不常用登录地点]/[不常用设备登录]的问题") logger.info("该账户有[设备锁]/[不常用登录地点]/[不常用设备登录]的问题")