Skip to content

Commit 5006ae2

Browse files
ForteScarletForteScarlet
committed
所有原始事件类型均更名增加前缀 Raw 
1 parent 897c1fe commit 5006ae2

File tree

56 files changed

+255
-255
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+255
-255
lines changed

‎buildSrc/src/main/kotlin/P.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ object P {
4141
override val homepage: String get() = HOMEPAGE
4242

4343

44-
private val baseVersion = v(0, 2, 0)
44+
private val baseVersion = v(0, 3, 0)
4545

4646
val snapshotVersion = baseVersion - Version.SNAPSHOT
4747
override val version = if (isSnapshot()) snapshotVersion else baseVersion

‎internal-processors/event-type-resolver-processor/src/main/kotlin/onebot11/internal/processors/eventtyperesolver/EventTypeResolverProcessor.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ private val KSerializerClassName =
6060
private const val EVENT_BASE_PACKAGE = "love.forte.simbot.component.onebot.v11.event"
6161

6262
private val EventClassName =
63-
ClassName(EVENT_BASE_PACKAGE, "Event")
63+
ClassName(EVENT_BASE_PACKAGE, "RawEvent")
6464

6565
private val ExpectEventTypeAnnotationClassName =
6666
ClassName(EVENT_BASE_PACKAGE, "ExpectEventType")

‎simbot-component-onebot-v11/simbot-component-onebot-v11-core/src/commonMain/kotlin/love/forte/simbot/component/onebot/v11/core/actor/internal/OneBotFriendImpl.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import love.forte.simbot.component.onebot.v11.core.bot.requestDataBy
2626
import love.forte.simbot.component.onebot.v11.core.internal.message.toReceipt
2727
import love.forte.simbot.component.onebot.v11.core.utils.sendPrivateMsgApi
2828
import love.forte.simbot.component.onebot.v11.core.utils.sendPrivateTextMsgApi
29-
import love.forte.simbot.component.onebot.v11.event.message.PrivateMessageEvent
29+
import love.forte.simbot.component.onebot.v11.event.message.RawPrivateMessageEvent
3030
import love.forte.simbot.component.onebot.v11.message.OneBotMessageContent
3131
import love.forte.simbot.component.onebot.v11.message.OneBotMessageReceipt
3232
import love.forte.simbot.component.onebot.v11.message.resolveToOneBotSegmentList
@@ -73,11 +73,11 @@ internal abstract class OneBotFriendImpl : OneBotFriend {
7373
}
7474

7575
/**
76-
* 基于 [PrivateMessageEvent.Sender] 的 [OneBotFriend] 实现
76+
* 基于 [RawPrivateMessageEvent.Sender] 的 [OneBotFriend] 实现
7777
*
7878
*/
7979
internal class OneBotFriendEventSenderImpl(
80-
private val sender: PrivateMessageEvent.Sender,
80+
private val sender: RawPrivateMessageEvent.Sender,
8181
override val bot: OneBotBotImpl,
8282
) : OneBotFriendImpl(), OneBotFriend {
8383
override val coroutineContext: CoroutineContext = bot.subContext
@@ -89,7 +89,7 @@ internal class OneBotFriendEventSenderImpl(
8989
get() = sender.nickname
9090
}
9191

92-
internal fun PrivateMessageEvent.Sender.toFriend(bot: OneBotBotImpl): OneBotFriendEventSenderImpl =
92+
internal fun RawPrivateMessageEvent.Sender.toFriend(bot: OneBotBotImpl): OneBotFriendEventSenderImpl =
9393
OneBotFriendEventSenderImpl(this, bot)
9494

9595
internal class OneBotFriendApiResultImpl(

‎simbot-component-onebot-v11/simbot-component-onebot-v11-core/src/commonMain/kotlin/love/forte/simbot/component/onebot/v11/core/actor/internal/OneBotMemberImpl.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ import love.forte.simbot.component.onebot.v11.core.bot.requestDataBy
3333
import love.forte.simbot.component.onebot.v11.core.internal.message.toReceipt
3434
import love.forte.simbot.component.onebot.v11.core.utils.sendPrivateMsgApi
3535
import love.forte.simbot.component.onebot.v11.core.utils.sendPrivateTextMsgApi
36-
import love.forte.simbot.component.onebot.v11.event.message.GroupMessageEvent
37-
import love.forte.simbot.component.onebot.v11.event.message.PrivateMessageEvent
36+
import love.forte.simbot.component.onebot.v11.event.message.RawGroupMessageEvent
37+
import love.forte.simbot.component.onebot.v11.event.message.RawPrivateMessageEvent
3838
import love.forte.simbot.component.onebot.v11.message.OneBotMessageContent
3939
import love.forte.simbot.component.onebot.v11.message.OneBotMessageReceipt
4040
import love.forte.simbot.component.onebot.v11.message.resolveToOneBotSegmentList
@@ -172,7 +172,7 @@ internal abstract class OneBotMemberImpl : OneBotMember {
172172
}
173173

174174
internal class OneBotMemberPrivateMessageEventSenderImpl(
175-
private val source: PrivateMessageEvent.Sender,
175+
private val source: RawPrivateMessageEvent.Sender,
176176
override val groupId: ID?,
177177
override val bot: OneBotBotImpl,
178178
override val nick: String?,
@@ -188,9 +188,9 @@ internal class OneBotMemberPrivateMessageEventSenderImpl(
188188
}
189189

190190
internal class OneBotMemberGroupMessageEventSenderImpl(
191-
private val source: GroupMessageEvent.Sender,
191+
private val source: RawGroupMessageEvent.Sender,
192192
override val groupId: ID?,
193-
private val anonymous: GroupMessageEvent.Anonymous?,
193+
private val anonymous: RawGroupMessageEvent.Anonymous?,
194194
override val bot: OneBotBotImpl,
195195
) : OneBotMemberImpl() {
196196
override val coroutineContext: CoroutineContext = bot.subContext
@@ -224,7 +224,7 @@ internal class OneBotMemberGroupMessageEventSenderImpl(
224224
}
225225
}
226226

227-
internal fun PrivateMessageEvent.Sender.toMember(
227+
internal fun RawPrivateMessageEvent.Sender.toMember(
228228
bot: OneBotBotImpl,
229229
groupId: ID? = null,
230230
nick: String? = null,
@@ -238,10 +238,10 @@ internal fun PrivateMessageEvent.Sender.toMember(
238238
role = role
239239
)
240240

241-
internal fun GroupMessageEvent.Sender.toMember(
241+
internal fun RawGroupMessageEvent.Sender.toMember(
242242
bot: OneBotBotImpl,
243243
groupId: ID,
244-
anonymous: GroupMessageEvent.Anonymous?
244+
anonymous: RawGroupMessageEvent.Anonymous?
245245
): OneBotMemberGroupMessageEventSenderImpl =
246246
OneBotMemberGroupMessageEventSenderImpl(
247247
source = this,

‎simbot-component-onebot-v11/simbot-component-onebot-v11-core/src/commonMain/kotlin/love/forte/simbot/component/onebot/v11/core/bot/internal/OneBotBotImpl.kt

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -101,21 +101,21 @@ import love.forte.simbot.component.onebot.v11.core.event.internal.request.OneBot
101101
import love.forte.simbot.component.onebot.v11.core.event.internal.stage.OneBotBotStartedEventImpl
102102
import love.forte.simbot.component.onebot.v11.core.utils.onEachErrorLog
103103
import love.forte.simbot.component.onebot.v11.event.UnknownEvent
104-
import love.forte.simbot.component.onebot.v11.event.message.GroupMessageEvent
105-
import love.forte.simbot.component.onebot.v11.event.message.PrivateMessageEvent
106-
import love.forte.simbot.component.onebot.v11.event.meta.HeartbeatEvent
107-
import love.forte.simbot.component.onebot.v11.event.meta.LifecycleEvent
108-
import love.forte.simbot.component.onebot.v11.event.notice.FriendAddEvent
109-
import love.forte.simbot.component.onebot.v11.event.notice.FriendRecallEvent
110-
import love.forte.simbot.component.onebot.v11.event.notice.GroupAdminEvent
111-
import love.forte.simbot.component.onebot.v11.event.notice.GroupBanEvent
112-
import love.forte.simbot.component.onebot.v11.event.notice.GroupDecreaseEvent
113-
import love.forte.simbot.component.onebot.v11.event.notice.GroupIncreaseEvent
114-
import love.forte.simbot.component.onebot.v11.event.notice.GroupRecallEvent
115-
import love.forte.simbot.component.onebot.v11.event.notice.GroupUploadEvent
116-
import love.forte.simbot.component.onebot.v11.event.notice.NotifyEvent
117-
import love.forte.simbot.component.onebot.v11.event.request.FriendRequestEvent
118-
import love.forte.simbot.component.onebot.v11.event.request.GroupRequestEvent
104+
import love.forte.simbot.component.onebot.v11.event.message.RawGroupMessageEvent
105+
import love.forte.simbot.component.onebot.v11.event.message.RawPrivateMessageEvent
106+
import love.forte.simbot.component.onebot.v11.event.meta.RawHeartbeatEvent
107+
import love.forte.simbot.component.onebot.v11.event.meta.RawLifecycleEvent
108+
import love.forte.simbot.component.onebot.v11.event.notice.RawFriendAddEvent
109+
import love.forte.simbot.component.onebot.v11.event.notice.RawFriendRecallEvent
110+
import love.forte.simbot.component.onebot.v11.event.notice.RawGroupAdminEvent
111+
import love.forte.simbot.component.onebot.v11.event.notice.RawGroupBanEvent
112+
import love.forte.simbot.component.onebot.v11.event.notice.RawGroupDecreaseEvent
113+
import love.forte.simbot.component.onebot.v11.event.notice.RawGroupIncreaseEvent
114+
import love.forte.simbot.component.onebot.v11.event.notice.RawGroupRecallEvent
115+
import love.forte.simbot.component.onebot.v11.event.notice.RawGroupUploadEvent
116+
import love.forte.simbot.component.onebot.v11.event.notice.RawNotifyEvent
117+
import love.forte.simbot.component.onebot.v11.event.request.RawFriendRequestEvent
118+
import love.forte.simbot.component.onebot.v11.event.request.RawGroupRequestEvent
119119
import love.forte.simbot.component.onebot.v11.event.resolveEventSerializer
120120
import love.forte.simbot.component.onebot.v11.event.resolveEventSubTypeFieldName
121121
import love.forte.simbot.event.Event
@@ -126,7 +126,7 @@ import kotlin.coroutines.CoroutineContext
126126
import kotlin.math.max
127127
import kotlin.time.Duration.Companion.milliseconds
128128
import kotlin.time.Duration.Companion.seconds
129-
import love.forte.simbot.component.onebot.v11.event.Event as OBRawEvent
129+
import love.forte.simbot.component.onebot.v11.event.RawEvent as OBRawEvent
130130

131131

132132
/**
@@ -597,54 +597,54 @@ internal fun OneBotBotImpl.resolveRawEventToEvent(raw: String, event: OBRawEvent
597597
return when (event) {
598598
//region 消息事件
599599
// 群消息、匿名消息、系统消息
600-
is GroupMessageEvent -> when (event.subType) {
601-
GroupMessageEvent.SUB_TYPE_NORMAL ->
600+
is RawGroupMessageEvent -> when (event.subType) {
601+
RawGroupMessageEvent.SUB_TYPE_NORMAL ->
602602
OneBotNormalGroupMessageEventImpl(raw, event, bot)
603603

604-
GroupMessageEvent.SUB_TYPE_ANONYMOUS ->
604+
RawGroupMessageEvent.SUB_TYPE_ANONYMOUS ->
605605
OneBotAnonymousGroupMessageEventImpl(raw, event, bot)
606606

607-
GroupMessageEvent.SUB_TYPE_NOTICE ->
607+
RawGroupMessageEvent.SUB_TYPE_NOTICE ->
608608
OneBotNoticeGroupMessageEventImpl(raw, event, bot)
609609

610610
else -> OneBotDefaultGroupMessageEventImpl(raw, event, bot)
611611
}
612612

613613
// 好友私聊消息、成员临时会话
614-
is PrivateMessageEvent -> when (event.subType) {
615-
PrivateMessageEvent.SUB_TYPE_FRIEND ->
614+
is RawPrivateMessageEvent -> when (event.subType) {
615+
RawPrivateMessageEvent.SUB_TYPE_FRIEND ->
616616
OneBotFriendMessageEventImpl(raw, event, bot)
617617

618-
PrivateMessageEvent.SUB_TYPE_GROUP ->
618+
RawPrivateMessageEvent.SUB_TYPE_GROUP ->
619619
OneBotGroupPrivateMessageEventImpl(raw, event, bot)
620620

621621
else -> OneBotDefaultPrivateMessageEventImpl(raw, event, bot)
622622
}
623623
//endregion
624624

625625
//region 元事件
626-
is LifecycleEvent -> OneBotLifecycleEventImpl(raw, event, bot,)
627-
is HeartbeatEvent -> OneBotHeartbeatEventImpl(raw, event, bot,)
626+
is RawLifecycleEvent -> OneBotLifecycleEventImpl(raw, event, bot,)
627+
is RawHeartbeatEvent -> OneBotHeartbeatEventImpl(raw, event, bot,)
628628
//endregion
629629

630630
//region 申请事件
631-
is FriendRequestEvent -> OneBotFriendRequestEventImpl(raw, event, bot)
632-
is GroupRequestEvent -> OneBotGroupRequestEventImpl(raw, event, bot)
631+
is RawFriendRequestEvent -> OneBotFriendRequestEventImpl(raw, event, bot)
632+
is RawGroupRequestEvent -> OneBotGroupRequestEventImpl(raw, event, bot)
633633
//endregion
634634

635635
//region notice events
636-
is FriendAddEvent -> OneBotFriendAddEventImpl(raw, event, bot)
637-
is FriendRecallEvent -> OneBotFriendRecallEventImpl(raw, event, bot)
638-
is GroupAdminEvent -> OneBotGroupAdminEventImpl(raw, event, bot)
639-
is GroupBanEvent -> OneBotGroupBanEventImpl(raw, event, bot)
640-
is GroupIncreaseEvent -> OneBotGroupMemberIncreaseEventImpl(raw, event, bot)
641-
is GroupDecreaseEvent -> OneBotGroupMemberDecreaseEventImpl(raw, event, bot)
642-
is GroupRecallEvent -> OneBotGroupRecallEventImpl(raw, event, bot)
643-
is GroupUploadEvent -> OneBotGroupUploadEventImpl(raw, event, bot)
644-
is NotifyEvent -> when (event.subType) {
645-
NotifyEvent.SUB_TYPE_HONOR -> OneBotHonorEventImpl(raw, event, bot)
646-
NotifyEvent.SUB_TYPE_LUCKY_KING -> OneBotLuckyKingEventImpl(raw, event, bot)
647-
NotifyEvent.SUB_TYPE_POKE -> when {
636+
is RawFriendAddEvent -> OneBotFriendAddEventImpl(raw, event, bot)
637+
is RawFriendRecallEvent -> OneBotFriendRecallEventImpl(raw, event, bot)
638+
is RawGroupAdminEvent -> OneBotGroupAdminEventImpl(raw, event, bot)
639+
is RawGroupBanEvent -> OneBotGroupBanEventImpl(raw, event, bot)
640+
is RawGroupIncreaseEvent -> OneBotGroupMemberIncreaseEventImpl(raw, event, bot)
641+
is RawGroupDecreaseEvent -> OneBotGroupMemberDecreaseEventImpl(raw, event, bot)
642+
is RawGroupRecallEvent -> OneBotGroupRecallEventImpl(raw, event, bot)
643+
is RawGroupUploadEvent -> OneBotGroupUploadEventImpl(raw, event, bot)
644+
is RawNotifyEvent -> when (event.subType) {
645+
RawNotifyEvent.SUB_TYPE_HONOR -> OneBotHonorEventImpl(raw, event, bot)
646+
RawNotifyEvent.SUB_TYPE_LUCKY_KING -> OneBotLuckyKingEventImpl(raw, event, bot)
647+
RawNotifyEvent.SUB_TYPE_POKE -> when {
648648
event.selfId.value == event.targetId?.value ->
649649
OneBotBotSelfPokeEventImpl(raw, event, bot)
650650

‎simbot-component-onebot-v11/simbot-component-onebot-v11-core/src/commonMain/kotlin/love/forte/simbot/component/onebot/v11/core/event/OneBotEvent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import love.forte.simbot.event.Event
2929
/**
3030
* OneBot11原始事件结构体类型。
3131
*/
32-
public typealias OBSourceEvent = love.forte.simbot.component.onebot.v11.event.Event
32+
public typealias OBSourceEvent = love.forte.simbot.component.onebot.v11.event.RawEvent
3333

3434
/**
3535
* 一个OneBot组件事件基类。

‎simbot-component-onebot-v11/simbot-component-onebot-v11-core/src/commonMain/kotlin/love/forte/simbot/component/onebot/v11/core/event/internal/message/OneBotGroupMessageEventImpl.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ import love.forte.simbot.component.onebot.v11.core.internal.message.OneBotMessag
3333
import love.forte.simbot.component.onebot.v11.core.internal.message.toReceipt
3434
import love.forte.simbot.component.onebot.v11.core.utils.sendGroupMsgApi
3535
import love.forte.simbot.component.onebot.v11.core.utils.sendGroupTextMsgApi
36-
import love.forte.simbot.component.onebot.v11.event.message.GroupMessageEvent
36+
import love.forte.simbot.component.onebot.v11.event.message.RawGroupMessageEvent
3737
import love.forte.simbot.component.onebot.v11.message.OneBotMessageContent
3838
import love.forte.simbot.component.onebot.v11.message.OneBotMessageReceipt
3939
import love.forte.simbot.component.onebot.v11.message.resolveToOneBotSegmentList
4040
import love.forte.simbot.message.Message
4141
import love.forte.simbot.message.MessageContent
4242

4343
internal abstract class OneBotGroupMessageEventImpl(
44-
sourceEvent: GroupMessageEvent,
44+
sourceEvent: RawGroupMessageEvent,
4545
final override val bot: OneBotBotImpl
4646
) : OneBotGroupMessageEvent {
4747

@@ -95,7 +95,7 @@ internal abstract class OneBotGroupMessageEventImpl(
9595

9696
internal class OneBotNormalGroupMessageEventImpl(
9797
override val sourceEventRaw: String?,
98-
override val sourceEvent: GroupMessageEvent,
98+
override val sourceEvent: RawGroupMessageEvent,
9999
bot: OneBotBotImpl,
100100
) : OneBotGroupMessageEventImpl(sourceEvent, bot),
101101
OneBotNormalGroupMessageEvent {
@@ -109,7 +109,7 @@ internal class OneBotNormalGroupMessageEventImpl(
109109

110110
internal class OneBotAnonymousGroupMessageEventImpl(
111111
override val sourceEventRaw: String?,
112-
override val sourceEvent: GroupMessageEvent,
112+
override val sourceEvent: RawGroupMessageEvent,
113113
bot: OneBotBotImpl,
114114
) : OneBotGroupMessageEventImpl(sourceEvent, bot),
115115
OneBotAnonymousGroupMessageEvent {
@@ -122,7 +122,7 @@ internal class OneBotAnonymousGroupMessageEventImpl(
122122

123123
internal class OneBotNoticeGroupMessageEventImpl(
124124
override val sourceEventRaw: String?,
125-
override val sourceEvent: GroupMessageEvent,
125+
override val sourceEvent: RawGroupMessageEvent,
126126
bot: OneBotBotImpl,
127127
) : OneBotGroupMessageEventImpl(sourceEvent, bot),
128128
OneBotNoticeGroupMessageEvent {
@@ -132,7 +132,7 @@ internal class OneBotNoticeGroupMessageEventImpl(
132132

133133
internal class OneBotDefaultGroupMessageEventImpl(
134134
override val sourceEventRaw: String?,
135-
override val sourceEvent: GroupMessageEvent,
135+
override val sourceEvent: RawGroupMessageEvent,
136136
bot: OneBotBotImpl,
137137
) : OneBotGroupMessageEventImpl(sourceEvent, bot) {
138138
override fun toString(): String = eventToString("OneBotDefaultGroupMessageEvent")

‎simbot-component-onebot-v11/simbot-component-onebot-v11-core/src/commonMain/kotlin/love/forte/simbot/component/onebot/v11/core/event/internal/message/OneBotPrivateMessageEventImpl.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import love.forte.simbot.component.onebot.v11.core.internal.message.OneBotMessag
3434
import love.forte.simbot.component.onebot.v11.core.internal.message.toReceipt
3535
import love.forte.simbot.component.onebot.v11.core.utils.sendPrivateMsgApi
3636
import love.forte.simbot.component.onebot.v11.core.utils.sendPrivateTextMsgApi
37-
import love.forte.simbot.component.onebot.v11.event.message.PrivateMessageEvent
37+
import love.forte.simbot.component.onebot.v11.event.message.RawPrivateMessageEvent
3838
import love.forte.simbot.component.onebot.v11.message.OneBotMessageContent
3939
import love.forte.simbot.component.onebot.v11.message.OneBotMessageReceipt
4040
import love.forte.simbot.component.onebot.v11.message.resolveToOneBotSegmentList
@@ -43,7 +43,7 @@ import love.forte.simbot.message.MessageContent
4343

4444

4545
internal abstract class OneBotPrivateMessageEventImpl(
46-
final override val sourceEvent: PrivateMessageEvent,
46+
final override val sourceEvent: RawPrivateMessageEvent,
4747
final override val bot: OneBotBotImpl,
4848
) : OneBotPrivateMessageEvent {
4949
override val id: ID
@@ -88,7 +88,7 @@ internal abstract class OneBotPrivateMessageEventImpl(
8888

8989
internal class OneBotFriendMessageEventImpl(
9090
override val sourceEventRaw: String?,
91-
sourceEvent: PrivateMessageEvent,
91+
sourceEvent: RawPrivateMessageEvent,
9292
bot: OneBotBotImpl,
9393
) : OneBotPrivateMessageEventImpl(sourceEvent, bot),
9494
OneBotFriendMessageEvent {
@@ -102,7 +102,7 @@ internal class OneBotFriendMessageEventImpl(
102102

103103
internal class OneBotGroupPrivateMessageEventImpl(
104104
override val sourceEventRaw: String?,
105-
sourceEvent: PrivateMessageEvent,
105+
sourceEvent: RawPrivateMessageEvent,
106106
bot: OneBotBotImpl,
107107
) : OneBotPrivateMessageEventImpl(sourceEvent, bot),
108108
OneBotGroupPrivateMessageEvent {
@@ -121,7 +121,7 @@ internal class OneBotGroupPrivateMessageEventImpl(
121121

122122
internal class OneBotDefaultPrivateMessageEventImpl(
123123
override val sourceEventRaw: String?,
124-
sourceEvent: PrivateMessageEvent,
124+
sourceEvent: RawPrivateMessageEvent,
125125
bot: OneBotBotImpl,
126126
) : OneBotPrivateMessageEventImpl(sourceEvent, bot) {
127127

‎simbot-component-onebot-v11/simbot-component-onebot-v11-core/src/commonMain/kotlin/love/forte/simbot/component/onebot/v11/core/event/internal/meta/OneBotMetaEventImpl.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import love.forte.simbot.component.onebot.v11.core.event.internal.eventToString
2424
import love.forte.simbot.component.onebot.v11.core.event.meta.OneBotHeartbeatEvent
2525
import love.forte.simbot.component.onebot.v11.core.event.meta.OneBotLifecycleEvent
2626
import love.forte.simbot.component.onebot.v11.core.event.meta.OneBotMetaEvent
27-
import love.forte.simbot.component.onebot.v11.event.meta.HeartbeatEvent
28-
import love.forte.simbot.component.onebot.v11.event.meta.LifecycleEvent
27+
import love.forte.simbot.component.onebot.v11.event.meta.RawHeartbeatEvent
28+
import love.forte.simbot.component.onebot.v11.event.meta.RawLifecycleEvent
2929

3030
/**
3131
* OneBot中的元事件类型。
@@ -37,7 +37,7 @@ internal abstract class OneBotMetaEventImpl : OneBotMetaEvent {
3737

3838
internal class OneBotHeartbeatEventImpl(
3939
override val sourceEventRaw: String?,
40-
override val sourceEvent: HeartbeatEvent,
40+
override val sourceEvent: RawHeartbeatEvent,
4141
override val bot: OneBotBot,
4242
) : OneBotHeartbeatEvent, OneBotMetaEventImpl() {
4343
override fun toString(): String =
@@ -46,7 +46,7 @@ internal class OneBotHeartbeatEventImpl(
4646

4747
internal class OneBotLifecycleEventImpl(
4848
override val sourceEventRaw: String?,
49-
override val sourceEvent: LifecycleEvent,
49+
override val sourceEvent: RawLifecycleEvent,
5050
override val bot: OneBotBot,
5151
) : OneBotLifecycleEvent, OneBotMetaEventImpl() {
5252
override fun toString(): String =

‎simbot-component-onebot-v11/simbot-component-onebot-v11-core/src/commonMain/kotlin/love/forte/simbot/component/onebot/v11/core/event/internal/notice/OneBotFriendAddEventImpl.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import love.forte.simbot.common.id.StringID.Companion.ID
2222
import love.forte.simbot.component.onebot.v11.core.bot.OneBotBot
2323
import love.forte.simbot.component.onebot.v11.core.event.internal.eventToString
2424
import love.forte.simbot.component.onebot.v11.core.event.notice.OneBotFriendAddEvent
25-
import love.forte.simbot.component.onebot.v11.event.notice.FriendAddEvent
25+
import love.forte.simbot.component.onebot.v11.event.notice.RawFriendAddEvent
2626

2727

2828
/**
@@ -31,7 +31,7 @@ import love.forte.simbot.component.onebot.v11.event.notice.FriendAddEvent
3131
*/
3232
internal class OneBotFriendAddEventImpl(
3333
override val sourceEventRaw: String?,
34-
override val sourceEvent: FriendAddEvent,
34+
override val sourceEvent: RawFriendAddEvent,
3535
override val bot: OneBotBot
3636
) : OneBotFriendAddEvent {
3737
override val id: ID

0 commit comments

Comments
 (0)