github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-07 16:40:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move InternalFlagOnlyMessage implementations from .message to .message.flags

Browse Source
This commit is contained in:
Him188 2022-01-14 20:40:40 +00:00
parent 68c36669fc
commit 255bfafeed
7 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mirai-core/src/commonMain/kotlin/contact/AbstractUser.kt
View File

@ -18,8 +18,8 @@ import net.mamoe.mirai.data.UserInfo
import net.mamoe.mirai.event.broadcast import net.mamoe.mirai.event.broadcast
import net.mamoe.mirai.event.events.* import net.mamoe.mirai.event.events.*
import net.mamoe.mirai.internal.QQAndroidBot import net.mamoe.mirai.internal.QQAndroidBot
import net.mamoe.mirai.internal.message.MiraiInternalMessageFlag
import net.mamoe.mirai.internal.message.contextualBugReportException import net.mamoe.mirai.internal.message.contextualBugReportException
import net.mamoe.mirai.internal.message.flags.MiraiInternalMessageFlag
import net.mamoe.mirai.internal.message.image.* import net.mamoe.mirai.internal.message.image.*
import net.mamoe.mirai.internal.network.components.BdhSession import net.mamoe.mirai.internal.network.components.BdhSession
import net.mamoe.mirai.internal.network.highway.ChannelKind import net.mamoe.mirai.internal.network.highway.ChannelKind

2
mirai-core/src/commonMain/kotlin/contact/GroupImpl.kt
View File

@ -26,9 +26,9 @@ import net.mamoe.mirai.internal.QQAndroidBot
import net.mamoe.mirai.internal.contact.announcement.AnnouncementsImpl import net.mamoe.mirai.internal.contact.announcement.AnnouncementsImpl
import net.mamoe.mirai.internal.contact.file.RemoteFilesImpl import net.mamoe.mirai.internal.contact.file.RemoteFilesImpl
import net.mamoe.mirai.internal.contact.info.MemberInfoImpl import net.mamoe.mirai.internal.contact.info.MemberInfoImpl
import net.mamoe.mirai.internal.message.MiraiInternalMessageFlag
import net.mamoe.mirai.internal.message.OfflineAudioImpl import net.mamoe.mirai.internal.message.OfflineAudioImpl
import net.mamoe.mirai.internal.message.contextualBugReportException import net.mamoe.mirai.internal.message.contextualBugReportException
import net.mamoe.mirai.internal.message.flags.MiraiInternalMessageFlag
import net.mamoe.mirai.internal.message.image.OfflineGroupImage import net.mamoe.mirai.internal.message.image.OfflineGroupImage
import net.mamoe.mirai.internal.message.image.calculateImageInfo import net.mamoe.mirai.internal.message.image.calculateImageInfo
import net.mamoe.mirai.internal.message.image.getIdByImageType import net.mamoe.mirai.internal.message.image.getIdByImageType

3
mirai-core/src/commonMain/kotlin/contact/SendMessageHandler.kt
View File

@ -20,6 +20,9 @@ import net.mamoe.mirai.event.nextEvent
import net.mamoe.mirai.internal.asQQAndroidBot import net.mamoe.mirai.internal.asQQAndroidBot
import net.mamoe.mirai.internal.getMiraiImpl import net.mamoe.mirai.internal.getMiraiImpl
import net.mamoe.mirai.internal.message.* import net.mamoe.mirai.internal.message.*
import net.mamoe.mirai.internal.message.flags.DontAsLongMessage
import net.mamoe.mirai.internal.message.flags.ForceAsLongMessage
import net.mamoe.mirai.internal.message.flags.IgnoreLengthCheck
import net.mamoe.mirai.internal.message.image.FriendImage import net.mamoe.mirai.internal.message.image.FriendImage
import net.mamoe.mirai.internal.message.image.OfflineGroupImage import net.mamoe.mirai.internal.message.image.OfflineGroupImage
import net.mamoe.mirai.internal.message.source.OnlineMessageSourceToFriendImpl import net.mamoe.mirai.internal.message.source.OnlineMessageSourceToFriendImpl

2
mirai-core/src/commonMain/kotlin/contact/file/AbsoluteFolderImpl.kt
View File

@ -18,7 +18,7 @@ import net.mamoe.mirai.contact.file.AbsoluteFolder
import net.mamoe.mirai.contact.isOperator import net.mamoe.mirai.contact.isOperator
import net.mamoe.mirai.internal.contact.GroupImpl import net.mamoe.mirai.internal.contact.GroupImpl
import net.mamoe.mirai.internal.contact.file.RemoteFilesImpl.Companion.findFileByPath import net.mamoe.mirai.internal.contact.file.RemoteFilesImpl.Companion.findFileByPath
import net.mamoe.mirai.internal.message.MiraiInternalMessageFlag import net.mamoe.mirai.internal.message.flags.MiraiInternalMessageFlag
import net.mamoe.mirai.internal.network.QQAndroidClient import net.mamoe.mirai.internal.network.QQAndroidClient
import net.mamoe.mirai.internal.network.components.ClockHolder.Companion.clock import net.mamoe.mirai.internal.network.components.ClockHolder.Companion.clock
import net.mamoe.mirai.internal.network.highway.Highway import net.mamoe.mirai.internal.network.highway.Highway

14
mirai-core/src/commonMain/kotlin/message/ForceAsLongMessage.kt → mirai-core/src/commonMain/kotlin/message/flags/InternalFlagOnlyMessage.kt
View File

@ -9,7 +9,7 @@
@file:Suppress("unused") @file:Suppress("unused")
package net.mamoe.mirai.internal.message package net.mamoe.mirai.internal.message.flags
import net.mamoe.mirai.internal.message.visitor.ex import net.mamoe.mirai.internal.message.visitor.ex
import net.mamoe.mirai.message.data.AbstractMessageKey import net.mamoe.mirai.message.data.AbstractMessageKey
@ -19,6 +19,11 @@ import net.mamoe.mirai.message.data.MessageMetadata
import net.mamoe.mirai.message.data.visitor.MessageVisitor import net.mamoe.mirai.message.data.visitor.MessageVisitor
import net.mamoe.mirai.utils.safeCast import net.mamoe.mirai.utils.safeCast
/**
* Ignore on transformation
*/
internal sealed interface InternalFlagOnlyMessage : MessageMetadata
/** /**
* 内部 flag, 放入 chain 强制作为 long 发送 * 内部 flag, 放入 chain 强制作为 long 发送
*/ */
@ -72,9 +77,4 @@ internal object MiraiInternalMessageFlag : MessageMetadata, ConstrainSingle, Int
data data
) )
} }
} }
/**
* Ignore on transformation
*/
internal sealed interface InternalFlagOnlyMessage : MessageMetadata

1
mirai-core/src/commonMain/kotlin/message/messageToElems.kt
View File

@ -14,6 +14,7 @@ import net.mamoe.mirai.contact.AnonymousMember
import net.mamoe.mirai.contact.ContactOrBot import net.mamoe.mirai.contact.ContactOrBot
import net.mamoe.mirai.contact.Group import net.mamoe.mirai.contact.Group
import net.mamoe.mirai.contact.User import net.mamoe.mirai.contact.User
import net.mamoe.mirai.internal.message.flags.InternalFlagOnlyMessage
import net.mamoe.mirai.internal.message.image.* import net.mamoe.mirai.internal.message.image.*
import net.mamoe.mirai.internal.message.source.MessageSourceInternal import net.mamoe.mirai.internal.message.source.MessageSourceInternal
import net.mamoe.mirai.internal.network.protocol.data.proto.HummerCommelem import net.mamoe.mirai.internal.network.protocol.data.proto.HummerCommelem

2
mirai-core/src/commonMain/kotlin/utils/RemoteFileImpl.kt
View File

@ -19,7 +19,7 @@ import net.mamoe.mirai.contact.isOperator
import net.mamoe.mirai.internal.asQQAndroidBot import net.mamoe.mirai.internal.asQQAndroidBot
import net.mamoe.mirai.internal.contact.groupCode import net.mamoe.mirai.internal.contact.groupCode
import net.mamoe.mirai.internal.message.FileMessageImpl import net.mamoe.mirai.internal.message.FileMessageImpl
import net.mamoe.mirai.internal.message.MiraiInternalMessageFlag import net.mamoe.mirai.internal.message.flags.MiraiInternalMessageFlag
import net.mamoe.mirai.internal.network.highway.Highway import net.mamoe.mirai.internal.network.highway.Highway
import net.mamoe.mirai.internal.network.highway.ResourceKind import net.mamoe.mirai.internal.network.highway.ResourceKind
import net.mamoe.mirai.internal.network.protocol import net.mamoe.mirai.internal.network.protocol