Simplify Contact structure

mirai-core/src/androidMain/kotlin/net/mamoe/mirai/BotJavaFriendlyAPI.kt

@@ -4,7 +4,6 @@ import kotlinx.coroutines.*
 import net.mamoe.mirai.contact.PermissionDeniedException
 import net.mamoe.mirai.contact.recall
 import net.mamoe.mirai.data.AddFriendResult
-import net.mamoe.mirai.message.MessageReceipt
 import net.mamoe.mirai.message.data.Image
 import net.mamoe.mirai.message.data.MessageChain
 import net.mamoe.mirai.message.data.MessageSource

mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/Contact.kt

-/*
- * Copyright 2020 Mamoe Technologies and contributors.
- *
- * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
- * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link.
- *
- * https://github.com/mamoe/mirai/blob/master/LICENSE
- */
-
-package net.mamoe.mirai.contact
-
-import kotlinx.coroutines.CoroutineScope
-import net.mamoe.mirai.Bot
-import net.mamoe.mirai.JavaFriendlyAPI
-import net.mamoe.mirai.event.events.BeforeImageUploadEvent
-import net.mamoe.mirai.event.events.EventCancelledException
-import net.mamoe.mirai.event.events.ImageUploadEvent
-import net.mamoe.mirai.event.events.MessageSendEvent.FriendMessageSendEvent
-import net.mamoe.mirai.event.events.MessageSendEvent.GroupMessageSendEvent
-import net.mamoe.mirai.message.MessageReceipt
-import net.mamoe.mirai.message.data.Message
-import net.mamoe.mirai.message.data.OfflineImage
-import net.mamoe.mirai.message.data.id
-import net.mamoe.mirai.utils.ExternalImage
-import net.mamoe.mirai.utils.MiraiInternalAPI
-import net.mamoe.mirai.utils.OverFileSizeMaxException
-import net.mamoe.mirai.utils.WeakRefProperty
-
-
-/**
- * 联系人. 虽然叫做联系人, 但他的子类有 [QQ] 和 [群][Group].
- *
- * @author Him188moe
- */
-@OptIn(MiraiInternalAPI::class, JavaFriendlyAPI::class)
-actual abstract class Contact : CoroutineScope, ContactJavaFriendlyAPI() {
-    /**
-     * 这个联系人所属 [Bot].
-     */
-    @WeakRefProperty
-    actual abstract val bot: Bot
-
-    /**
-     * 可以是 QQ 号码或者群号码.
-     *
-     * 对于 [QQ], `uin` 与 `id` 是相同的意思.
-     * 对于 [Group], `groupCode` 与 `id` 是相同的意思.
-     *
-     * @see QQ.id
-     * @see Group.id
-     */
-    actual abstract val id: Long
-
-    /**
-     * 向这个对象发送消息.
-     *
-     * 单条消息最大可发送 4500 字符或 50 张图片.
-     *
-     * @see FriendMessageSendEvent 发送好友信息事件, cancellable
-     * @see GroupMessageSendEvent  发送群消息事件. cancellable
-     *
-     * @throws EventCancelledException 当发送消息事件被取消时抛出
-     * @throws BotIsBeingMutedException 发送群消息时若 [Bot] 被禁言抛出
-     * @throws MessageTooLargeException 当消息过长时抛出
-     *
-     * @return 消息回执. 可 [引用回复][MessageReceipt.quote]（仅群聊）或 [撤回][MessageReceipt.recall] 这条消息.
-     */
-    @JvmSynthetic
-    actual abstract suspend fun sendMessage(message: Message): MessageReceipt<Contact>
-
-    /**
-     * 上传一个图片以备发送.
-     *
-     * @see BeforeImageUploadEvent 图片发送前事件, cancellable
-     * @see ImageUploadEvent 图片发送完成事件
-     *
-     * @throws EventCancelledException 当发送消息事件被取消
-     * @throws OverFileSizeMaxException 当图片文件过大而被服务器拒绝上传时. (最大大小约为 20 MB)
-     */
-    @JvmSynthetic
-    actual abstract suspend fun uploadImage(image: ExternalImage): OfflineImage
-
-    /**
-     * 判断 `this` 和 [other] 是否是相同的类型, 并且 [id] 相同.
-     *
-     * 注:
-     * [id] 相同的 [Member] 和 [QQ], 他们并不 [equals].
-     * 因为, [Member] 含义为群员, 必属于一个群.
-     * 而 [QQ] 含义为一个独立的人, 可以是好友, 也可以是陌生人.
-     */
-    actual abstract override fun equals(other: Any?): Boolean
-
-    /**
-     * @return `bot.hashCode() * 31 + id.hashCode()`
-     */
-    actual abstract override fun hashCode(): Int
-
-    /**
-     * @return "QQ($id)" or "Group($id)" or "Member($id)"
-     */
-    actual abstract override fun toString(): String
-}
\ No newline at end of file

mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/ContactJavaFriendlyAPI.kt

@@ -18,7 +18,6 @@ import net.mamoe.mirai.event.events.*
 import net.mamoe.mirai.event.events.MessageSendEvent.FriendMessageSendEvent
 import net.mamoe.mirai.event.events.MessageSendEvent.GroupMessageSendEvent
 import net.mamoe.mirai.future
-import net.mamoe.mirai.message.MessageReceipt
 import net.mamoe.mirai.message.data.Image
 import net.mamoe.mirai.message.data.Message
 import net.mamoe.mirai.message.uploadImage

mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/Group.kt

@@ -16,7 +16,6 @@ import net.mamoe.mirai.data.MemberInfo
 import net.mamoe.mirai.event.events.*
 import net.mamoe.mirai.event.events.MessageSendEvent.FriendMessageSendEvent
 import net.mamoe.mirai.event.events.MessageSendEvent.GroupMessageSendEvent
-import net.mamoe.mirai.message.MessageReceipt
 import net.mamoe.mirai.message.data.Message
 import net.mamoe.mirai.message.data.OfflineGroupImage
 import net.mamoe.mirai.utils.ExternalImage

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

@@ -16,7 +16,6 @@ import net.mamoe.mirai.JavaFriendlyAPI
 import net.mamoe.mirai.event.events.*
 import net.mamoe.mirai.event.events.MessageSendEvent.FriendMessageSendEvent
 import net.mamoe.mirai.event.events.MessageSendEvent.GroupMessageSendEvent
-import net.mamoe.mirai.message.MessageReceipt
 import net.mamoe.mirai.message.data.Message
 import net.mamoe.mirai.utils.MiraiInternalAPI
 import net.mamoe.mirai.utils.WeakRefProperty

mirai-core/src/androidMain/kotlin/net/mamoe/mirai/contact/QQ.kt

@@ -12,7 +12,6 @@ import net.mamoe.mirai.event.events.EventCancelledException
 import net.mamoe.mirai.event.events.ImageUploadEvent
 import net.mamoe.mirai.event.events.MessageSendEvent.FriendMessageSendEvent
 import net.mamoe.mirai.event.events.MessageSendEvent.GroupMessageSendEvent
-import net.mamoe.mirai.message.MessageReceipt
 import net.mamoe.mirai.message.data.Message
 import net.mamoe.mirai.message.data.OfflineFriendImage
 import net.mamoe.mirai.utils.ExternalImage

mirai-core/src/androidMain/kotlin/net/mamoe/mirai/message/MessagePacket.kt

@@ -13,7 +13,6 @@ package net.mamoe.mirai.message
 
 import android.graphics.Bitmap
 import kotlinx.io.core.Input
-import net.mamoe.mirai.contact.Contact
 import net.mamoe.mirai.contact.QQ
 import net.mamoe.mirai.message.data.Image
 import net.mamoe.mirai.utils.MiraiInternalAPI

mirai-core/src/androidMain/kotlin/net/mamoe/mirai/message/SendImageUtilsAndroid.kt

@@ -15,10 +15,8 @@ import android.graphics.Bitmap
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import kotlinx.io.core.Input
-import net.mamoe.mirai.contact.Contact
 import net.mamoe.mirai.message.data.Image
 import net.mamoe.mirai.utils.OverFileSizeMaxException
-import net.mamoe.mirai.utils.sendTo
 import net.mamoe.mirai.utils.toExternalImage
 import net.mamoe.mirai.utils.upload
 import java.io.File

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

@@ -36,7 +36,7 @@ import kotlin.jvm.JvmSynthetic
  * @author Him188moe
  */ // 不要删除多平台结构 !!! kotlin bug
 @OptIn(MiraiInternalAPI::class, JavaFriendlyAPI::class)
-expect abstract class Contact() : CoroutineScope, ContactJavaFriendlyAPI {
+abstract class Contact : CoroutineScope, ContactJavaFriendlyAPI() {
     /**
      * 这个联系人所属 [Bot].
      */

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

@@ -17,7 +17,7 @@ import net.mamoe.mirai.utils.MiraiInternalAPI
  */
 @MiraiInternalAPI
 @JavaFriendlyAPI
-expect abstract class ContactJavaFriendlyAPI
+expect abstract class ContactJavaFriendlyAPI()
 
 /**
  * [Member] 中为了让 `Java` 更容易调用的 API

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/javaFriendly.kt

@@ -13,6 +13,7 @@ import net.mamoe.mirai.utils.MiraiInternalAPI
 
 /**
  * 表明这个 API 是为了让 Java 使用者调用更方便.
+ * 一般有一定的性能损失, 且不能在 JVM/Android 以外平台使用. 不要在 Kotlin 调用它.
  */
 @MiraiInternalAPI
 @RequiresOptIn(level = RequiresOptIn.Level.ERROR)

mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/contact/Contact.kt

-/*
- * Copyright 2020 Mamoe Technologies and contributors.
- *
- * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
- * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link.
- *
- * https://github.com/mamoe/mirai/blob/master/LICENSE
- */
-
-package net.mamoe.mirai.contact
-
-import kotlinx.coroutines.CoroutineScope
-import net.mamoe.mirai.Bot
-import net.mamoe.mirai.JavaFriendlyAPI
-import net.mamoe.mirai.event.events.BeforeImageUploadEvent
-import net.mamoe.mirai.event.events.EventCancelledException
-import net.mamoe.mirai.event.events.ImageUploadEvent
-import net.mamoe.mirai.event.events.MessageSendEvent.FriendMessageSendEvent
-import net.mamoe.mirai.event.events.MessageSendEvent.GroupMessageSendEvent
-import net.mamoe.mirai.message.MessageReceipt
-import net.mamoe.mirai.message.data.Message
-import net.mamoe.mirai.message.data.OfflineImage
-import net.mamoe.mirai.message.data.id
-import net.mamoe.mirai.utils.ExternalImage
-import net.mamoe.mirai.utils.MiraiInternalAPI
-import net.mamoe.mirai.utils.OverFileSizeMaxException
-import net.mamoe.mirai.utils.WeakRefProperty
-
-/**
- * 联系人. 虽然叫做联系人, 但他的子类有 [QQ] 和 [群][Group].
- *
- * @author Him188moe
- */
-@OptIn(MiraiInternalAPI::class, JavaFriendlyAPI::class)
-actual abstract class Contact : CoroutineScope, ContactJavaFriendlyAPI() {
-    /**
-     * 这个联系人所属 [Bot].
-     */
-    @WeakRefProperty
-    actual abstract val bot: Bot
-
-    /**
-     * 可以是 QQ 号码或者群号码.
-     *
-     * 对于 [QQ], `uin` 与 `id` 是相同的意思.
-     * 对于 [Group], `groupCode` 与 `id` 是相同的意思.
-     *
-     * @see QQ.id
-     * @see Group.id
-     */
-    actual abstract val id: Long
-
-    /**
-     * 向这个对象发送消息.
-     *
-     * 单条消息最大可发送 4500 字符或 50 张图片.
-     *
-     * @see FriendMessageSendEvent 发送好友信息事件, cancellable
-     * @see GroupMessageSendEvent  发送群消息事件. cancellable
-     *
-     * @throws EventCancelledException 当发送消息事件被取消时抛出
-     * @throws BotIsBeingMutedException 发送群消息时若 [Bot] 被禁言抛出
-     * @throws MessageTooLargeException 当消息过长时抛出
-     *
-     * @return 消息回执. 可 [引用回复][MessageReceipt.quote]（仅群聊）或 [撤回][MessageReceipt.recall] 这条消息.
-     */
-    @JvmSynthetic //
-    actual abstract suspend fun sendMessage(message: Message): MessageReceipt<Contact>
-
-    /**
-     * 上传一个图片以备发送.
-     *
-     * @see BeforeImageUploadEvent 图片发送前事件, cancellable
-     * @see ImageUploadEvent 图片发送完成事件
-     *
-     * @throws EventCancelledException 当发送消息事件被取消
-     * @throws OverFileSizeMaxException 当图片文件过大而被服务器拒绝上传时. (最大大小约为 20 MB)
-     */
-    @JvmSynthetic
-    actual abstract suspend fun uploadImage(image: ExternalImage): OfflineImage
-
-    /**
-     * 判断 `this` 和 [other] 是否是相同的类型, 并且 [id] 相同.
-     *
-     * 注:
-     * [id] 相同的 [Member] 和 [QQ], 他们并不 [equals].
-     * 因为, [Member] 含义为群员, 必属于一个群.
-     * 而 [QQ] 含义为一个独立的人, 可以是好友, 也可以是陌生人.
-     */
-    actual abstract override fun equals(other: Any?): Boolean
-
-    /**
-     * @return `bot.hashCode() * 31 + id.hashCode()`
-     */
-    actual abstract override fun hashCode(): Int
-
-    /**
-     * @return "QQ($id)" or "Group($id)" or "Member($id)"
-     */
-    actual abstract override fun toString(): String
-}
\ No newline at end of file

mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/message/MessagePacket.kt

@@ -15,7 +15,6 @@ import kotlinx.coroutines.io.ByteWriteChannel
 import kotlinx.io.core.Input
 import kotlinx.io.core.Output
 import kotlinx.io.core.use
-import net.mamoe.mirai.contact.Contact
 import net.mamoe.mirai.contact.QQ
 import net.mamoe.mirai.message.data.Image
 import net.mamoe.mirai.utils.MiraiExperimentalAPI

mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/message/SendImageUtilsJvm.kt

@@ -14,11 +14,9 @@ package net.mamoe.mirai.message
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import kotlinx.io.core.Input
-import net.mamoe.mirai.contact.Contact
 import net.mamoe.mirai.message.data.Image
 import net.mamoe.mirai.message.data.OfflineImage
 import net.mamoe.mirai.utils.OverFileSizeMaxException
-import net.mamoe.mirai.utils.sendTo
 import net.mamoe.mirai.utils.toExternalImage
 import net.mamoe.mirai.utils.upload
 import java.awt.image.BufferedImage