Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
Mirai
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
Mirai
Commits
4d870b24
Commit
4d870b24
authored
Oct 16, 2019
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename Image.imageId to Image.id
parent
6105ce8e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/Message.kt
.../src/commonMain/kotlin/net.mamoe.mirai/message/Message.kt
+4
-4
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/internal/MessageDataInternal.kt
...n/net.mamoe.mirai/message/internal/MessageDataInternal.kt
+2
-2
No files found.
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/Message.kt
View file @
4d870b24
...
@@ -76,10 +76,10 @@ data class PlainText(override val stringValue: String) : Message() {
...
@@ -76,10 +76,10 @@ data class PlainText(override val stringValue: String) : Message() {
* 图片消息.
* 图片消息.
* 由接收消息时构建, 可直接发送
* 由接收消息时构建, 可直接发送
*
*
* @param i
mageI
d 类似 `{7AA4B3AA-8C3C-0F45-2D9B-7F302A0ACEAA}.jpg`. 群的是大写id, 好友的是小写id
* @param id 类似 `{7AA4B3AA-8C3C-0F45-2D9B-7F302A0ACEAA}.jpg`. 群的是大写id, 好友的是小写id
*/
*/
data class
Image
(
val
i
mageI
d
:
String
)
:
Message
()
{
data class
Image
(
val
id
:
String
)
:
Message
()
{
override
val
stringValue
:
String
=
"[$i
mageI
d]"
override
val
stringValue
:
String
=
"[$id]"
}
}
// ==================================== At ====================================
// ==================================== At ====================================
...
@@ -168,7 +168,7 @@ data class MessageChain(
...
@@ -168,7 +168,7 @@ data class MessageChain(
override
fun
retainAll
(
elements
:
Collection
<
Message
>):
Boolean
=
delegate
.
retainAll
(
elements
)
override
fun
retainAll
(
elements
:
Collection
<
Message
>):
Boolean
=
delegate
.
retainAll
(
elements
)
override
fun
set
(
index
:
Int
,
element
:
Message
):
Message
=
delegate
.
set
(
index
,
element
)
override
fun
set
(
index
:
Int
,
element
:
Message
):
Message
=
delegate
.
set
(
index
,
element
)
override
fun
subList
(
fromIndex
:
Int
,
toIndex
:
Int
):
MutableList
<
Message
>
=
delegate
.
subList
(
fromIndex
,
toIndex
)
override
fun
subList
(
fromIndex
:
Int
,
toIndex
:
Int
):
MutableList
<
Message
>
=
delegate
.
subList
(
fromIndex
,
toIndex
)
override
fun
iterator
():
MutableIterator
<
Message
>
=
this
.
delegate
.
iterator
()
override
fun
iterator
():
MutableIterator
<
Message
>
=
delegate
.
iterator
()
override
operator
fun
contains
(
element
:
Message
):
Boolean
=
delegate
.
contains
(
element
)
override
operator
fun
contains
(
element
:
Message
):
Boolean
=
delegate
.
contains
(
element
)
override
val
size
:
Int
=
delegate
.
size
override
val
size
:
Int
=
delegate
.
size
// endregion
// endregion
...
...
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/internal/MessageDataInternal.kt
View file @
4d870b24
...
@@ -143,7 +143,7 @@ fun MessageChain.toPacket(): ByteReadPacket = buildPacket {
...
@@ -143,7 +143,7 @@ fun MessageChain.toPacket(): ByteReadPacket = buildPacket {
writeLVPacket
{
writeLVPacket
{
writeByte
(
0
x02
)
writeByte
(
0
x02
)
writeLVString
(
i
mageI
d
)
writeLVString
(
id
)
writeHex
(
"04 00 "
+
writeHex
(
"04 00 "
+
"04 9B 53 B0 08 "
+
"04 9B 53 B0 08 "
+
"05 00 "
+
"05 00 "
+
...
@@ -153,7 +153,7 @@ fun MessageChain.toPacket(): ByteReadPacket = buildPacket {
...
@@ -153,7 +153,7 @@ fun MessageChain.toPacket(): ByteReadPacket = buildPacket {
"07 00 "
+
"07 00 "
+
"01 43 08 00 00 09 00 01 01 0B 00 00 14 00 04 11 00 00 00 15 00 04 00 00 02 BC 16 00 04 00 00 02 BC 18 00 04 00 00 7D 5E FF 00 5C 15 36 20 39 32 6B 41 31 43 39 62 35 33 62 30 30 38 64 39 38 61 35 61 37 30 20"
)
"01 43 08 00 00 09 00 01 01 0B 00 00 14 00 04 11 00 00 00 15 00 04 00 00 02 BC 16 00 04 00 00 02 BC 18 00 04 00 00 7D 5E FF 00 5C 15 36 20 39 32 6B 41 31 43 39 62 35 33 62 30 30 38 64 39 38 61 35 61 37 30 20"
)
writeHex
(
"20 20 20 20 20 35 30 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20"
)
writeHex
(
"20 20 20 20 20 35 30 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20"
)
writeStringUtf8
(
i
mageI
d
)
writeStringUtf8
(
id
)
writeByte
(
0
x41
)
writeByte
(
0
x41
)
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment