Commit e54ead63 authored by Him188's avatar Him188

Fix binary compatibility

parent 17bbcdb3
...@@ -70,16 +70,19 @@ abstract class MessageEvent : @PlannedRemoval("1.2.0") ContactMessage(), ...@@ -70,16 +70,19 @@ abstract class MessageEvent : @PlannedRemoval("1.2.0") ContactMessage(),
*/ */
abstract override val sender: User abstract override val sender: User
abstract val senderName: String /**
* 发送人名称
*/
abstract override val senderName: String
/** 消息内容 */ /** 消息内容 */
abstract override val message: MessageChain abstract override val message: MessageChain
/** 消息发送时间 (由服务器提供) */ /** 消息发送时间 (由服务器提供) */
abstract val time: Int abstract override val time: Int
/** 消息源 */ /** 消息源 */
open val source: OnlineMessageSource.Incoming get() = message.source as OnlineMessageSource.Incoming override val source: OnlineMessageSource.Incoming get() = message.source as OnlineMessageSource.Incoming
} }
/** 消息事件的扩展函数 */ /** 消息事件的扩展函数 */
...@@ -170,7 +173,15 @@ internal expect interface MessageEventPlatformExtensions<out TSender : User, out ...@@ -170,7 +173,15 @@ internal expect interface MessageEventPlatformExtensions<out TSender : User, out
replaceWith = ReplaceWith("MessageEvent", "net.mamoe.mirai.message.MessageEvent"), replaceWith = ReplaceWith("MessageEvent", "net.mamoe.mirai.message.MessageEvent"),
level = DeprecationLevel.ERROR level = DeprecationLevel.ERROR
) )
abstract class MessagePacketBase<out TSender : User, out TSubject : Contact> : Packet, BotEvent, AbstractEvent() abstract class MessagePacketBase<out TSender : User, out TSubject : Contact> : Packet, BotEvent, AbstractEvent() {
abstract override val bot: Bot
abstract val sender: User
abstract val subject: Contact
abstract val message: MessageChain
abstract val time: Int
abstract val source: OnlineMessageSource.Incoming
abstract val senderName: String
}
@PlannedRemoval("1.2.0") @PlannedRemoval("1.2.0")
@Deprecated( @Deprecated(
...@@ -180,7 +191,15 @@ abstract class MessagePacketBase<out TSender : User, out TSubject : Contact> : P ...@@ -180,7 +191,15 @@ abstract class MessagePacketBase<out TSender : User, out TSubject : Contact> : P
) )
@Suppress("DEPRECATION_ERROR") @Suppress("DEPRECATION_ERROR")
abstract class MessagePacket : MessagePacketBase<User, Contact>(), abstract class MessagePacket : MessagePacketBase<User, Contact>(),
BotEvent, MessageEventExtensions<User, Contact> BotEvent, MessageEventExtensions<User, Contact> {
abstract override val bot: Bot
abstract override val sender: User
abstract override val subject: Contact
abstract override val message: MessageChain
abstract override val time: Int
abstract override val source: OnlineMessageSource.Incoming
abstract override val senderName: String
}
@PlannedRemoval("1.2.0") @PlannedRemoval("1.2.0")
@Deprecated( @Deprecated(
...@@ -190,7 +209,15 @@ abstract class MessagePacket : MessagePacketBase<User, Contact>(), ...@@ -190,7 +209,15 @@ abstract class MessagePacket : MessagePacketBase<User, Contact>(),
) )
@Suppress("DEPRECATION_ERROR") @Suppress("DEPRECATION_ERROR")
abstract class ContactMessage : MessagePacket(), abstract class ContactMessage : MessagePacket(),
BotEvent, MessageEventExtensions<User, Contact> BotEvent, MessageEventExtensions<User, Contact> {
abstract override val bot: Bot
abstract override val sender: User
abstract override val subject: Contact
abstract override val message: MessageChain
abstract override val time: Int
abstract override val source: OnlineMessageSource.Incoming
abstract override val senderName: String
}
@PlannedRemoval("1.2.0") @PlannedRemoval("1.2.0")
@Deprecated( @Deprecated(
...@@ -199,7 +226,15 @@ abstract class ContactMessage : MessagePacket(), ...@@ -199,7 +226,15 @@ abstract class ContactMessage : MessagePacket(),
level = DeprecationLevel.ERROR level = DeprecationLevel.ERROR
) )
@Suppress("DEPRECATION_ERROR") @Suppress("DEPRECATION_ERROR")
abstract class FriendMessage : MessageEvent() abstract class FriendMessage : MessageEvent() {
abstract override val bot: Bot
abstract override val sender: Friend
abstract override val subject: Friend
abstract override val message: MessageChain
abstract override val time: Int
abstract override val source: OnlineMessageSource.Incoming.FromFriend
abstract override val senderName: String
}
@PlannedRemoval("1.2.0") @PlannedRemoval("1.2.0")
@Deprecated( @Deprecated(
...@@ -210,6 +245,13 @@ abstract class FriendMessage : MessageEvent() ...@@ -210,6 +245,13 @@ abstract class FriendMessage : MessageEvent()
@Suppress("DEPRECATION_ERROR") @Suppress("DEPRECATION_ERROR")
abstract class GroupMessage : MessageEvent() { abstract class GroupMessage : MessageEvent() {
abstract val group: Group abstract val group: Group
abstract override val bot: Bot
abstract override val sender: Member
abstract override val subject: Group
abstract override val message: MessageChain
abstract override val time: Int
abstract override val source: OnlineMessageSource.Incoming.FromGroup
abstract override val senderName: String
} }
@PlannedRemoval("1.2.0") @PlannedRemoval("1.2.0")
...@@ -218,4 +260,13 @@ abstract class GroupMessage : MessageEvent() { ...@@ -218,4 +260,13 @@ abstract class GroupMessage : MessageEvent() {
replaceWith = ReplaceWith("TempMessageEvent", "net.mamoe.mirai.message.TempMessageEvent"), replaceWith = ReplaceWith("TempMessageEvent", "net.mamoe.mirai.message.TempMessageEvent"),
level = DeprecationLevel.ERROR level = DeprecationLevel.ERROR
) )
abstract class TempMessage : MessageEvent() abstract class TempMessage : MessageEvent() {
\ No newline at end of file abstract override val bot: Bot
abstract override val sender: Member
abstract override val subject: Member
abstract override val message: MessageChain
abstract override val time: Int
abstract override val source: OnlineMessageSource.Incoming.FromTemp
abstract val group: Group
abstract override val senderName: String
}
\ No newline at end of file
...@@ -29,7 +29,7 @@ class TempMessageEvent( ...@@ -29,7 +29,7 @@ class TempMessageEvent(
override val bot: Bot get() = sender.bot override val bot: Bot get() = sender.bot
override val subject: Member get() = sender override val subject: Member get() = sender
inline val group: Group get() = sender.group override val group: Group get() = sender.group
override val senderName: String get() = sender.nameCardOrNick override val senderName: String get() = sender.nameCardOrNick
override val source: OnlineMessageSource.Incoming.FromTemp get() = message.source as OnlineMessageSource.Incoming.FromTemp override val source: OnlineMessageSource.Incoming.FromTemp get() = message.source as OnlineMessageSource.Incoming.FromTemp
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment