Skip to content

Commit c88b9c4

Browse files
authored
Merge pull request #27 from simple-robot/dev/event-deserializer-default
为部分事件内的属性添加默认值
2 parents ec1c176 + c39572e commit c88b9c4

File tree

12 files changed

+17
-17
lines changed

12 files changed

+17
-17
lines changed

simbot-component-onebot-v11/simbot-component-onebot-v11-common/src/commonMain/kotlin/love/forte/simbot/component/onebot/v11/common/api/StatusResult.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,5 @@ public data class StatusResult
4343
@SourceEventConstructor
4444
constructor(
4545
public val online: Boolean? = null,
46-
public val good: Boolean,
46+
public val good: Boolean = false,
4747
)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public interface OneBotGroupBanEvent : OneBotNoticeEvent, MemberEvent {
6868
/**
6969
* 操作者的ID
7070
*/
71-
public val operatorId: LongID
71+
public val operatorId: LongID?
7272
get() = sourceEvent.operatorId
7373

7474
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public interface OneBotGroupRecallEvent : OneBotNoticeEvent, ChatGroupEvent {
5656
/**
5757
* 操作者ID
5858
*/
59-
public val operatorId: LongID
59+
public val operatorId: LongID?
6060
get() = sourceEvent.operatorId
6161

6262
/**

simbot-component-onebot-v11/simbot-component-onebot-v11-event/src/commonMain/kotlin/love/forte/simbot/component/onebot/v11/event/message/RawGroupMessageEvent.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ public data class RawGroupMessageEvent @SourceEventConstructor constructor(
6363
public val anonymous: Anonymous? = null,
6464
override val message: List<OneBotMessageSegment> = emptyList(),
6565
@SerialName("raw_message")
66-
override val rawMessage: String,
66+
override val rawMessage: String = "",
6767
@SerialName("user_id")
6868
override val userId: LongID,
69-
override val font: Int?,
69+
override val font: Int? = null,
7070
override val sender: Sender
7171
) : RawMessageEvent {
7272

@@ -97,7 +97,7 @@ public data class RawGroupMessageEvent @SourceEventConstructor constructor(
9797
public val card: String = "",
9898
public val area: String? = null,
9999
public val level: Int? = null,
100-
public val role: String,
100+
public val role: String = "member",
101101
public val title: String? = null,
102102
override val sex: String = DEFAULT_SEX,
103103
override val age: Int = DEFAULT_AGE,

simbot-component-onebot-v11/simbot-component-onebot-v11-event/src/commonMain/kotlin/love/forte/simbot/component/onebot/v11/event/message/RawPrivateMessageEvent.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ public data class RawPrivateMessageEvent @SourceEventConstructor constructor(
5656
override val subType: String,
5757
override val message: List<OneBotMessageSegment> = emptyList(),
5858
@SerialName("raw_message")
59-
override val rawMessage: String,
59+
override val rawMessage: String = "",
6060
@SerialName("user_id")
6161
override val userId: LongID,
62-
override val font: Int?,
62+
override val font: Int? = null,
6363
override val sender: Sender
6464
) : RawMessageEvent {
6565
/**

simbot-component-onebot-v11/simbot-component-onebot-v11-event/src/commonMain/kotlin/love/forte/simbot/component/onebot/v11/event/meta/RawHeartbeatEvent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,5 @@ public data class RawHeartbeatEvent(
4545
@SerialName("post_type")
4646
override val postType: String,
4747
public val status: StatusResult,
48-
public val interval: Long,
48+
public val interval: Long = -1L,
4949
) : RawMetaEvent

simbot-component-onebot-v11/simbot-component-onebot-v11-event/src/commonMain/kotlin/love/forte/simbot/component/onebot/v11/event/notice/RawGroupBanEvent.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ public data class RawGroupBanEvent(
5252
@SerialName("group_id")
5353
public val groupId: LongID,
5454
@SerialName("operator_id")
55-
public val operatorId: LongID,
55+
public val operatorId: LongID? = null,
5656
@SerialName("user_id")
5757
public val userId: LongID,
58-
public val duration: Long,
58+
public val duration: Long = -1L,
5959
) : RawNoticeEvent {
6060
public companion object {
6161
/**

simbot-component-onebot-v11/simbot-component-onebot-v11-event/src/commonMain/kotlin/love/forte/simbot/component/onebot/v11/event/notice/RawGroupDecreaseEvent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public data class RawGroupDecreaseEvent(
5151
@SerialName("group_id")
5252
public val groupId: LongID,
5353
@SerialName("operator_id")
54-
public val operatorId: LongID,
54+
public val operatorId: LongID? = null,
5555
@SerialName("user_id")
5656
public val userId: LongID,
5757
) : RawNoticeEvent

simbot-component-onebot-v11/simbot-component-onebot-v11-event/src/commonMain/kotlin/love/forte/simbot/component/onebot/v11/event/notice/RawGroupIncreaseEvent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public data class RawGroupIncreaseEvent(
5151
@SerialName("group_id")
5252
public val groupId: LongID,
5353
@SerialName("operator_id")
54-
public val operatorId: LongID,
54+
public val operatorId: LongID? = null,
5555
@SerialName("user_id")
5656
public val userId: LongID,
5757
) : RawNoticeEvent

simbot-component-onebot-v11/simbot-component-onebot-v11-event/src/commonMain/kotlin/love/forte/simbot/component/onebot/v11/event/notice/RawGroupRecallEvent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public data class RawGroupRecallEvent(
5050
@SerialName("user_id")
5151
public val userId: LongID,
5252
@SerialName("operator_id")
53-
public val operatorId: LongID,
53+
public val operatorId: LongID?,
5454
@SerialName("message_id")
5555
public val messageId: LongID,
5656
) : RawNoticeEvent

simbot-component-onebot-v11/simbot-component-onebot-v11-event/src/commonMain/kotlin/love/forte/simbot/component/onebot/v11/event/notice/RawGroupUploadEvent.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public data class RawGroupUploadEvent(
6262
public data class FileInfo(
6363
val id: ID,
6464
val name: String,
65-
val size: Long,
66-
val busid: Long,
65+
val size: Long = -1L,
66+
val busid: Long = -1L,
6767
)
6868
}

simbot-component-onebot-v11/simbot-component-onebot-v11-message/src/commonMain/kotlin/love/forte/simbot/component/onebot/v11/message/segment/OneBotMessageSegment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public fun OneBotMessageSegment.toElement(): OneBotMessageSegmentElement =
8686
* 消息段 [OneBotMessageSegment] 作为 [OneBotMessageElement] 的实现。
8787
*
8888
* [OneBotMessageSegment] 不能直接实现 [Message.Element],
89-
* 因为消息段的多态序列化鸣潮很可能会与其他序列化信息产生冲突(比如 `at`,没有特殊的前缀,容易引发歧义)。
89+
* 因为消息段的多态序列化信息很可能会与其他序列化信息产生冲突(比如 `at`,没有特殊的前缀,容易引发歧义)。
9090
*
9191
* 因此需要使用 [OneBotMessageSegmentElement] 作为其包装。
9292
* 可以使用 [OneBotMessageSegment.toElement] 或此类的构造函数构建它。

0 commit comments

Comments
 (0)