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
7443e2ae
Commit
7443e2ae
authored
Mar 23, 2020
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add companion `Key`s to `GroupImage`, `FriendImage`, `OnlineImage`, `OfflineImage`
parent
917aaf68
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
2 deletions
+14
-2
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/Image.kt
...c/commonMain/kotlin/net.mamoe.mirai/message/data/Image.kt
+9
-1
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/MessageChain.kt
...nMain/kotlin/net.mamoe.mirai/message/data/MessageChain.kt
+5
-1
No files found.
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/Image.kt
View file @
7443e2ae
...
@@ -85,6 +85,8 @@ abstract class AbstractImage internal constructor() : Image {
...
@@ -85,6 +85,8 @@ abstract class AbstractImage internal constructor() : Image {
* 一般由 [Contact.uploadImage] 得到
* 一般由 [Contact.uploadImage] 得到
*/
*/
interface
OnlineImage
:
Image
{
interface
OnlineImage
:
Image
{
companion
object
Key
:
Message
.
Key
<
OnlineImage
>
/**
/**
* 原图下载链接. 包含域名
* 原图下载链接. 包含域名
*/
*/
...
@@ -115,7 +117,9 @@ suspend fun Image.queryUrl(): String {
...
@@ -115,7 +117,9 @@ suspend fun Image.queryUrl(): String {
* 一般由 [Contact.uploadImage] 得到
* 一般由 [Contact.uploadImage] 得到
* @see queryOriginUrl
* @see queryOriginUrl
*/
*/
interface
OfflineImage
:
Image
interface
OfflineImage
:
Image
{
companion
object
Key
:
Message
.
Key
<
OfflineImage
>
}
/**
/**
* 原图下载链接. 包含域名
* 原图下载链接. 包含域名
...
@@ -142,6 +146,8 @@ suspend inline fun OfflineImage.queryOriginUrl(): String = queryUrl()
...
@@ -142,6 +146,8 @@ suspend inline fun OfflineImage.queryOriginUrl(): String = queryUrl()
// CustomFace
// CustomFace
@OptIn
(
MiraiInternalAPI
::
class
)
@OptIn
(
MiraiInternalAPI
::
class
)
sealed
class
GroupImage
:
AbstractImage
()
{
sealed
class
GroupImage
:
AbstractImage
()
{
companion
object
Key
:
Message
.
Key
<
GroupImage
>
abstract
val
filepath
:
String
abstract
val
filepath
:
String
abstract
val
fileId
:
Int
abstract
val
fileId
:
Int
abstract
val
serverIp
:
Int
abstract
val
serverIp
:
Int
...
@@ -213,6 +219,8 @@ abstract class OnlineGroupImage : GroupImage(), OnlineImage
...
@@ -213,6 +219,8 @@ abstract class OnlineGroupImage : GroupImage(), OnlineImage
*/
// NotOnlineImage
*/
// NotOnlineImage
@OptIn
(
MiraiInternalAPI
::
class
)
@OptIn
(
MiraiInternalAPI
::
class
)
sealed
class
FriendImage
:
AbstractImage
()
{
sealed
class
FriendImage
:
AbstractImage
()
{
companion
object
Key
:
Message
.
Key
<
FriendImage
>
abstract
val
resourceId
:
String
abstract
val
resourceId
:
String
abstract
val
md5
:
ByteArray
abstract
val
md5
:
ByteArray
abstract
val
filepath
:
String
abstract
val
filepath
:
String
...
...
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/MessageChain.kt
View file @
7443e2ae
...
@@ -127,6 +127,10 @@ fun <M : Message> MessageChain.firstOrNull(key: Message.Key<M>): M? = when (key)
...
@@ -127,6 +127,10 @@ fun <M : Message> MessageChain.firstOrNull(key: Message.Key<M>): M? = when (key)
AtAll
->
first
<
AtAll
>()
AtAll
->
first
<
AtAll
>()
PlainText
->
first
<
PlainText
>()
PlainText
->
first
<
PlainText
>()
Image
->
first
<
Image
>()
Image
->
first
<
Image
>()
OnlineImage
->
first
<
OnlineImage
>()
OfflineImage
->
first
<
OfflineImage
>()
GroupImage
->
first
<
GroupImage
>()
FriendImage
->
first
<
FriendImage
>()
Face
->
first
<
Face
>()
Face
->
first
<
Face
>()
QuoteReply
->
first
<
QuoteReply
>()
QuoteReply
->
first
<
QuoteReply
>()
MessageSource
->
first
<
MessageSource
>()
MessageSource
->
first
<
MessageSource
>()
...
@@ -360,7 +364,7 @@ fun Message.flatten(): Sequence<SingleMessage> {
...
@@ -360,7 +364,7 @@ fun Message.flatten(): Sequence<SingleMessage> {
}
}
fun
CombinedMessage
.
flatten
():
Sequence
<
SingleMessage
>
{
fun
CombinedMessage
.
flatten
():
Sequence
<
SingleMessage
>
{
if
(
this
.
isFlat
()){
if
(
this
.
isFlat
())
{
@Suppress
(
"UNCHECKED_CAST"
)
@Suppress
(
"UNCHECKED_CAST"
)
return
(
this
as
Iterable
<
SingleMessage
>).
asSequence
()
return
(
this
as
Iterable
<
SingleMessage
>).
asSequence
()
}
else
return
this
.
asSequence
().
flatten
()
}
else
return
this
.
asSequence
().
flatten
()
...
...
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