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
61284f1d
Commit
61284f1d
authored
May 16, 2020
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve docs
parent
ae32536e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
6 deletions
+14
-6
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.common.kt
...n/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.common.kt
+5
-3
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/ForwardMessage.kt
...ain/kotlin/net.mamoe.mirai/message/data/ForwardMessage.kt
+9
-3
No files found.
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.common.kt
View file @
61284f1d
...
...
@@ -22,7 +22,8 @@ import kotlinx.serialization.UnstableDefault
import
kotlinx.serialization.json.Json
import
kotlinx.serialization.json.JsonConfiguration
import
kotlinx.serialization.json.int
import
net.mamoe.mirai.*
import
net.mamoe.mirai.Bot
import
net.mamoe.mirai.LowLevelAPI
import
net.mamoe.mirai.contact.*
import
net.mamoe.mirai.data.*
import
net.mamoe.mirai.event.broadcast
...
...
@@ -31,6 +32,7 @@ import net.mamoe.mirai.event.events.MemberJoinRequestEvent
import
net.mamoe.mirai.event.events.MessageRecallEvent
import
net.mamoe.mirai.event.events.NewFriendRequestEvent
import
net.mamoe.mirai.event.internal.MiraiAtomicBoolean
import
net.mamoe.mirai.getGroupOrNull
import
net.mamoe.mirai.message.MessageReceipt
import
net.mamoe.mirai.message.data.*
import
net.mamoe.mirai.network.LoginFailedException
...
...
@@ -66,7 +68,7 @@ internal fun Bot.asQQAndroidBot(): QQAndroidBot {
return
this
as
QQAndroidBot
}
@Suppress
(
"INVISIBLE_MEMBER"
,
"BooleanLiteralArgument"
)
@Suppress
(
"INVISIBLE_MEMBER"
,
"BooleanLiteralArgument"
,
"OverridingDeprecatedMember"
)
internal
class
QQAndroidBot
constructor
(
context
:
Context
,
account
:
BotAccount
,
...
...
@@ -710,7 +712,7 @@ internal abstract class QQAndroidBotBase constructor(
}
}
@Suppress
(
"DEPRECATION"
)
@Suppress
(
"DEPRECATION"
,
"OverridingDeprecatedMember"
)
override
suspend
fun
queryImageUrl
(
image
:
Image
):
String
=
when
(
image
)
{
is
OnlineFriendImageImpl
->
image
.
originUrl
is
OnlineGroupImageImpl
->
image
.
originUrl
...
...
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/ForwardMessage.kt
View file @
61284f1d
...
...
@@ -27,7 +27,7 @@ import kotlin.jvm.JvmSynthetic
/**
* 合并转发消息
*
*
@param [displayStrategy] 卡片显示方案
*
*
* ### 显示方案
*
...
...
@@ -72,10 +72,14 @@ import kotlin.jvm.JvmSynthetic
* 咕咕咕
* ```
*
*
* ### 构造
* - 使用 [DSL][buildForwardMessage]
* - 通过 [MessageEvent] 集合转换: [toForwardMessage]
*
*
* @param [displayStrategy] 卡片显示方案
*
* @see buildForwardMessage
*/
class
ForwardMessage
@JvmOverloads
constructor
(
...
...
@@ -83,7 +87,7 @@ class ForwardMessage @JvmOverloads constructor(
* 消息列表
*/
val
nodeList
:
Collection
<
INode
>,
val
displayStrategy
:
DisplayStrategy
=
DisplayStrategy
val
displayStrategy
:
DisplayStrategy
=
DisplayStrategy
.
Default
)
:
MessageContent
{
init
{
require
(
nodeList
.
isNotEmpty
())
{
...
...
@@ -190,7 +194,8 @@ fun Iterable<MessageEvent>.toForwardMessage(displayStrategy: DisplayStrategy = D
val
iterator
=
this
.
iterator
()
if
(!
iterator
.
hasNext
())
return
ForwardMessage
(
emptyList
(),
displayStrategy
)
return
ForwardMessage
(
this
.
map
{
ForwardMessage
.
Node
(
it
.
sender
.
id
,
it
.
time
,
it
.
senderName
,
it
.
message
)
},
displayStrategy
)
this
.
map
{
ForwardMessage
.
Node
(
it
.
sender
.
id
,
it
.
time
,
it
.
senderName
,
it
.
message
)
},
displayStrategy
)
}
/**
...
...
@@ -273,6 +278,7 @@ annotation class ForwardMessageDsl
* # 语法
*
* 下文中 `S` 代表消息发送人. 可接受: 发送人账号 id([Long] 或 [Int]) 或 [User]
*
* 下文中 `M` 代表消息内容. 可接受: [String], [Message], 或 [构造消息链][MessageChainBuilder] 的 DSL 代码块
*
* ## 陈述一条消息
...
...
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