Skip to content

Commit 85840cc

Browse files
committed
Fix build
1 parent 91e589c commit 85840cc

File tree

2 files changed

+25
-3
lines changed
  • mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact
  • mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid

2 files changed

+25
-3
lines changed

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/ContactImpl.kt

+24-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
* https://github.com/mamoe/mirai/blob/master/LICENSE
88
*/
99

10+
@file: Suppress("INAPPLICABLE_JVM_NAME")
11+
1012
package net.mamoe.mirai.qqandroid
1113

1214
import kotlinx.coroutines.launch
@@ -37,6 +39,7 @@ import kotlin.contracts.ExperimentalContracts
3739
import kotlin.contracts.contract
3840
import kotlin.coroutines.CoroutineContext
3941
import kotlin.jvm.JvmName
42+
import kotlin.jvm.JvmSynthetic
4043
import net.mamoe.mirai.qqandroid.network.protocol.data.jce.FriendInfo as JceFriendInfo
4144

4245
internal inline class FriendInfoImpl(
@@ -57,8 +60,9 @@ internal class QQImpl(
5760
get() = friendInfo.nick
5861

5962
@JvmName("sendMessageSuspend")
63+
@JvmSynthetic
6064
@Suppress("DuplicatedCode")
61-
override suspend fun sendMessage(message: Message): MessageReceipt<QQ> {
65+
override suspend fun sendMessage(message: Message): MessageReceipt<out QQ> {
6266
val event = FriendMessageSendEvent(this, message.asMessageChain()).broadcast()
6367
if (event.isCancelled) {
6468
throw EventCancelledException("cancelled by FriendMessageSendEvent")
@@ -79,12 +83,14 @@ internal class QQImpl(
7983
}
8084

8185
@JvmName("sendMessageSuspend")
86+
@JvmSynthetic
8287
@Deprecated("for binary compatibility", level = DeprecationLevel.HIDDEN)
83-
override suspend fun sendMessage(message: MessageChain): MessageReceipt<QQ> {
88+
override suspend fun sendMessage(message: MessageChain): MessageReceipt<out QQ> {
8489
return this.sendMessage(message as Message)
8590
}
8691

8792
@JvmName("uploadImageSuspend")
93+
@JvmSynthetic
8894
@OptIn(MiraiInternalAPI::class)
8995
override suspend fun uploadImage(image: ExternalImage): OfflineFriendImage = try {
9096
if (BeforeImageUploadEvent(this, image).broadcast().isCancelled) {
@@ -216,6 +222,8 @@ internal class MemberImpl(
216222
@MiraiExperimentalAPI
217223
override suspend fun queryRemark(): FriendNameRemark = qq.queryRemark()
218224

225+
@JvmName("sendMessageSuspend")
226+
@JvmSynthetic
219227
@Suppress("DuplicatedCode")
220228
override suspend fun sendMessage(message: Message): MessageReceipt<Member> {
221229
val event = FriendMessageSendEvent(this, message.asMessageChain()).broadcast()
@@ -238,11 +246,14 @@ internal class MemberImpl(
238246
}
239247

240248
@JvmName("sendMessageSuspend")
249+
@JvmSynthetic
241250
@Deprecated("for binary compatibility", level = DeprecationLevel.HIDDEN)
242251
override suspend fun sendMessage(message: MessageChain): MessageReceipt<out QQ> {
243252
return this.sendMessage(message as Message)
244253
}
245254

255+
@JvmName("uploadImageSuspend")
256+
@JvmSynthetic
246257
override suspend fun uploadImage(image: ExternalImage): OfflineFriendImage = qq.uploadImage(image)
247258
// endregion
248259

@@ -306,6 +317,8 @@ internal class MemberImpl(
306317

307318
override val bot: QQAndroidBot get() = qq.bot
308319

320+
@JvmName("muteSuspend")
321+
@JvmSynthetic
309322
override suspend fun mute(durationSeconds: Int) {
310323
if (group.botPermission != MemberPermission.OWNER && (!group.botPermission.isOperator() || this.isOperator())) {
311324
throw PermissionDeniedException()
@@ -324,6 +337,8 @@ internal class MemberImpl(
324337
net.mamoe.mirai.event.events.MemberMuteEvent(this@MemberImpl, durationSeconds, null).broadcast()
325338
}
326339

340+
@JvmName("unmuteSuspend")
341+
@JvmSynthetic
327342
override suspend fun unmute() {
328343
if (group.botPermission != MemberPermission.OWNER && (!group.botPermission.isOperator() || this.isOperator())) {
329344
throw PermissionDeniedException()
@@ -342,6 +357,8 @@ internal class MemberImpl(
342357
net.mamoe.mirai.event.events.MemberUnmuteEvent(this@MemberImpl, null).broadcast()
343358
}
344359

360+
@JvmName("kickSuspend")
361+
@JvmSynthetic
345362
override suspend fun kick(message: String) {
346363
if (group.botPermission != MemberPermission.OWNER && (!group.botPermission.isOperator() || this.isOperator())) {
347364
throw PermissionDeniedException()
@@ -614,6 +631,8 @@ internal class GroupImpl(
614631
return members.delegate.filteringGetOrNull { it.id == id }
615632
}
616633

634+
@JvmName("sendMessageSuspend")
635+
@JvmSynthetic
617636
override suspend fun sendMessage(message: Message): MessageReceipt<Group> {
618637
check(!isBotMuted) { "bot is muted. Remaining seconds=$botMuteRemaining" }
619638
val event = GroupMessageSendEvent(this, message.asMessageChain()).broadcast()
@@ -639,12 +658,15 @@ internal class GroupImpl(
639658
}
640659

641660
@JvmName("sendMessageSuspend")
661+
@JvmSynthetic
642662
@Deprecated("for binary compatibility", level = DeprecationLevel.HIDDEN)
643663
override suspend fun sendMessage(message: MessageChain): MessageReceipt<Group> {
644664
return this.sendMessage(message as Message)
645665
}
646666

647667

668+
@JvmName("uploadImageSuspend")
669+
@JvmSynthetic
648670
override suspend fun uploadImage(image: ExternalImage): OfflineGroupImage = try {
649671
if (BeforeImageUploadEvent(this, image).broadcast().isCancelled) {
650672
throw EventCancelledException("cancelled by BeforeImageUploadEvent.ToGroup")

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Member.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ expect abstract class Member() : MemberJavaHappyAPI {
152152
@JvmName("sendMessageSuspend")
153153
@JvmSynthetic
154154
@Deprecated("for binary compatibility", level = DeprecationLevel.HIDDEN)
155-
actual abstract override suspend fun sendMessage(message: MessageChain): MessageReceipt<out QQ>
155+
abstract override suspend fun sendMessage(message: MessageChain): MessageReceipt<out QQ>
156156

157157
}
158158

0 commit comments

Comments
 (0)