github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-23 22:30:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix build

Browse Source
This commit is contained in:
Him188 2020-04-08 14:57:42 +08:00
parent 3fdb64660d
commit fc8714de5f
2 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events/BotEvents.kt
View File

@ -12,8 +12,6 @@
package net.mamoe.mirai.event.events package net.mamoe.mirai.event.events
import kotlinx.atomicfu.AtomicBoolean
import kotlinx.atomicfu.atomic
import net.mamoe.mirai.Bot import net.mamoe.mirai.Bot
import net.mamoe.mirai.JavaFriendlyAPI import net.mamoe.mirai.JavaFriendlyAPI
import net.mamoe.mirai.contact.* import net.mamoe.mirai.contact.*
@ -22,6 +20,7 @@ import net.mamoe.mirai.event.BroadcastControllable
import net.mamoe.mirai.event.CancellableEvent import net.mamoe.mirai.event.CancellableEvent
import net.mamoe.mirai.event.events.ImageUploadEvent.Failed import net.mamoe.mirai.event.events.ImageUploadEvent.Failed
import net.mamoe.mirai.event.events.ImageUploadEvent.Succeed import net.mamoe.mirai.event.events.ImageUploadEvent.Succeed
import net.mamoe.mirai.event.internal.MiraiAtomicBoolean
import net.mamoe.mirai.message.data.Image import net.mamoe.mirai.message.data.Image
import net.mamoe.mirai.message.data.MessageChain import net.mamoe.mirai.message.data.MessageChain
import net.mamoe.mirai.message.data.MessageSource import net.mamoe.mirai.message.data.MessageSource
@ -31,6 +30,7 @@ import net.mamoe.mirai.utils.MiraiExperimentalAPI
import net.mamoe.mirai.utils.MiraiInternalAPI import net.mamoe.mirai.utils.MiraiInternalAPI
import net.mamoe.mirai.utils.SinceMirai import net.mamoe.mirai.utils.SinceMirai
import net.mamoe.mirai.utils.internal.runBlocking import net.mamoe.mirai.utils.internal.runBlocking
import kotlin.jvm.JvmField
import kotlin.jvm.JvmName import kotlin.jvm.JvmName
import kotlin.jvm.JvmOverloads import kotlin.jvm.JvmOverloads
import kotlin.jvm.JvmSynthetic import kotlin.jvm.JvmSynthetic
@ -511,7 +511,8 @@ data class NewFriendRequestEvent(
*/ */
val fromNick: String val fromNick: String
) : BotEvent, Packet { ) : BotEvent, Packet {
internal val responded: AtomicBoolean = atomic(false) @JvmField
internal val responded: MiraiAtomicBoolean = MiraiAtomicBoolean(false)
/** /**
* @return 申请人来自的群. 当申请人来自其他途径申请时为 `null` * @return 申请人来自的群. 当申请人来自其他途径申请时为 `null`
@ -563,7 +564,8 @@ data class MemberJoinRequestEvent(
) : BotEvent, Packet { ) : BotEvent, Packet {
val group: Group = this.bot.getGroup(groupId) val group: Group = this.bot.getGroup(groupId)
internal val responded: AtomicBoolean = atomic(false) @JvmField
internal val responded: MiraiAtomicBoolean = MiraiAtomicBoolean(false)
@JvmSynthetic @JvmSynthetic
suspend fun accept() = bot.acceptMemberJoinRequest(this) suspend fun accept() = bot.acceptMemberJoinRequest(this)

35
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/select.kt
View File

@ -119,6 +119,7 @@ suspend inline fun <reified T : ContactMessage, R> T.selectMessages(
* *
* @see MessageSelectBuilderUnit 查看上层 API * @see MessageSelectBuilderUnit 查看上层 API
*/ */
@Suppress("PARAMETER_NAME_CHANGED_ON_OVERRIDE")
@SinceMirai("0.29.0") @SinceMirai("0.29.0")
abstract class MessageSelectBuilder<M : ContactMessage, R> @PublishedApi internal constructor( abstract class MessageSelectBuilder<M : ContactMessage, R> @PublishedApi internal constructor(
ownerMessagePacket: M, ownerMessagePacket: M,
@ -148,24 +149,16 @@ abstract class MessageSelectBuilder<M : ContactMessage, R> @PublishedApi interna
@JvmName("reply3") @JvmName("reply3")
@Suppress( @Suppress(
"INAPPLICABLE_JVM_NAME", "INAPPLICABLE_JVM_NAME", "unused", "UNCHECKED_CAST",
"unused", "INVALID_CHARACTERS", "NAME_CONTAINS_ILLEGAL_CHARS", "FunctionName"
"UNCHECKED_CAST",
"INVALID_CHARACTERS",
"NAME_CONTAINS_ILLEGAL_CHARS",
"FunctionName"
) )
@Deprecated("Using `reply` DSL in message selection is prohibited", level = DeprecationLevel.HIDDEN) @Deprecated("Using `reply` DSL in message selection is prohibited", level = DeprecationLevel.HIDDEN)
override infix fun MessageSelectionTimeoutChecker.`->`(message: String): Nothing = error("prohibited") override infix fun MessageSelectionTimeoutChecker.`->`(message: String): Nothing = error("prohibited")
@JvmName("reply3") @JvmName("reply3")
@Suppress( @Suppress(
"INAPPLICABLE_JVM_NAME", "INAPPLICABLE_JVM_NAME", "unused", "UNCHECKED_CAST",
"unused", "INVALID_CHARACTERS", "NAME_CONTAINS_ILLEGAL_CHARS", "FunctionName"
"UNCHECKED_CAST",
"INVALID_CHARACTERS",
"NAME_CONTAINS_ILLEGAL_CHARS",
"FunctionName"
) )
@Deprecated("Using `reply` DSL in message selection is prohibited", level = DeprecationLevel.HIDDEN) @Deprecated("Using `reply` DSL in message selection is prohibited", level = DeprecationLevel.HIDDEN)
override infix fun MessageSelectionTimeoutChecker.`->`(message: Message): Nothing = error("prohibited") override infix fun MessageSelectionTimeoutChecker.`->`(message: Message): Nothing = error("prohibited")
@ -232,7 +225,7 @@ abstract class MessageSelectBuilder<M : ContactMessage, R> @PublishedApi interna
override fun ListeningFilter.quoteReply(toReply: String) = error("prohibited") override fun ListeningFilter.quoteReply(toReply: String) = error("prohibited")
@Deprecated("Using `reply` DSL in message selection is prohibited", level = DeprecationLevel.HIDDEN) @Deprecated("Using `reply` DSL in message selection is prohibited", level = DeprecationLevel.HIDDEN)
override fun ListeningFilter.quoteReply(message: Message) = error("prohibited") override fun ListeningFilter.quoteReply(toReply: Message) = error("prohibited")
@Deprecated("Using `reply` DSL in message selection is prohibited", level = DeprecationLevel.HIDDEN) @Deprecated("Using `reply` DSL in message selection is prohibited", level = DeprecationLevel.HIDDEN)
override fun ListeningFilter.quoteReply(replier: suspend M.(String) -> Any?) = error("prohibited") override fun ListeningFilter.quoteReply(replier: suspend M.(String) -> Any?) = error("prohibited")
@ -351,12 +344,8 @@ abstract class MessageSelectBuilderUnit<M : ContactMessage, R> @PublishedApi int
@JvmName("reply3") @JvmName("reply3")
@Suppress( @Suppress(
"INAPPLICABLE_JVM_NAME", "INAPPLICABLE_JVM_NAME", "unused", "UNCHECKED_CAST",
"unused", "INVALID_CHARACTERS", "NAME_CONTAINS_ILLEGAL_CHARS", "FunctionName"
"UNCHECKED_CAST",
"INVALID_CHARACTERS",
"NAME_CONTAINS_ILLEGAL_CHARS",
"FunctionName"
) )
open infix fun MessageSelectionTimeoutChecker.`->`(message: Message) { open infix fun MessageSelectionTimeoutChecker.`->`(message: Message) {
return this.reply(message) return this.reply(message)
@ -364,12 +353,8 @@ abstract class MessageSelectBuilderUnit<M : ContactMessage, R> @PublishedApi int
@JvmName("reply3") @JvmName("reply3")
@Suppress( @Suppress(
"INAPPLICABLE_JVM_NAME", "INAPPLICABLE_JVM_NAME", "unused", "UNCHECKED_CAST",
"unused", "INVALID_CHARACTERS", "NAME_CONTAINS_ILLEGAL_CHARS", "FunctionName"
"UNCHECKED_CAST",
"INVALID_CHARACTERS",
"NAME_CONTAINS_ILLEGAL_CHARS",
"FunctionName"
) )
open infix fun MessageSelectionTimeoutChecker.`->`(message: String) { open infix fun MessageSelectionTimeoutChecker.`->`(message: String) {
return this.reply(message) return this.reply(message)