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
0e5e2336
Commit
0e5e2336
authored
Feb 23, 2020
by
ryoii
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Http api return messageId after send a message
parent
94d859a4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
18 deletions
+28
-18
mirai-api-http/README_CH.md
mirai-api-http/README_CH.md
+13
-7
mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/route/MessageRouteModule.kt
...tlin/net/mamoe/mirai/api/http/route/MessageRouteModule.kt
+14
-10
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/MessageReceipt.kt
...mmonMain/kotlin/net.mamoe.mirai/message/MessageReceipt.kt
+1
-1
No files found.
mirai-api-http/README_CH.md
View file @
0e5e2336
...
...
@@ -175,12 +175,13 @@ fun main() {
| target | Long | false | 987654321 | 发送消息目标好友的QQ号 |
| messageChain | Array | false | [] | 消息链,是一个消息对象构成的数组 |
#### 响应: 返回统一状态码
#### 响应: 返回统一状态码
(并携带messageId)
```
json5
{
"code": 0,
"msg": "success"
"msg": "success",
"messageId": 1234567890 // 一个Long类型属性,标识本条消息,用于撤回和引用回复
}
```
...
...
@@ -213,12 +214,13 @@ fun main() {
| target | Long | false | 987654321 | 发送消息目标群的群号 |
| messageChain | Array | false | [] | 消息链,是一个消息对象构成的数组 |
#### 响应: 返回统一状态码
#### 响应: 返回统一状态码
(并携带messageId)
```
json5
{
"code": 0,
"msg": "success"
"msg": "success",
"messageId": 1234567890 // 一个Long类型属性,标识本条消息,用于撤回和引用回复
}
```
...
...
@@ -251,12 +253,13 @@ fun main() {
| target | Long | false | 987654321 | 引用消息的Message Source的Uid |
| messageChain | Array | false | [] | 消息链,是一个消息对象构成的数组 |
#### 响应: 返回统一状态码
#### 响应: 返回统一状态码
(并携带messageId)
```
json5
{
"code": 0,
"msg": "success"
"msg": "success",
"messageId": 1234567890 // 一个Long类型属性,标识本条消息,用于撤回和引用回复
}
```
...
...
@@ -370,7 +373,10 @@ Content-Type:multipart/form-data
}
},{
"type": "FriendMessage", // 消息类型:GroupMessage或FriendMessage或各类Event
"messageChain": [{ // 消息链,是一个消息对象构成的数组
"messageChain": [{ // 消息链,是一个消息对象构成的数组
"type": "Source",
"uid": 123456
},{
"type": "Plain",
"text": "Miral牛逼"
}],
...
...
mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/route/MessageRouteModule.kt
View file @
0e5e2336
...
...
@@ -20,10 +20,10 @@ import io.ktor.response.respondText
import
io.ktor.routing.post
import
io.ktor.routing.routing
import
kotlinx.serialization.Serializable
import
kotlinx.serialization.Transient
import
net.mamoe.mirai.api.http.AuthedSession
import
net.mamoe.mirai.api.http.SessionManager
import
net.mamoe.mirai.api.http.data.*
import
net.mamoe.mirai.api.http.data.common.DTO
import
net.mamoe.mirai.api.http.data.common.MessageChainDTO
import
net.mamoe.mirai.api.http.data.common.VerifyDTO
import
net.mamoe.mirai.api.http.data.common.toMessageChain
...
...
@@ -44,23 +44,26 @@ fun Application.messageModule() {
miraiVerify
<
SendDTO
>(
"/sendFriendMessage"
)
{
it
.
session
.
bot
.
getFriend
(
it
.
target
).
apply
{
sendMessage
(
it
.
messageChain
.
toMessageChain
(
this
))
// this aka QQ
val
receipt
=
sendMessage
(
it
.
messageChain
.
toMessageChain
(
this
))
// this aka QQ
receipt
.
source
.
ensureSequenceIdAvailable
()
call
.
respondDTO
(
SendRetDTO
(
messageId
=
receipt
.
source
.
id
))
}
call
.
respondStateCode
(
StateCode
.
Success
)
}
miraiVerify
<
SendDTO
>(
"/sendGroupMessage"
)
{
it
.
session
.
bot
.
getGroup
(
it
.
target
).
apply
{
sendMessage
(
it
.
messageChain
.
toMessageChain
(
this
))
// this aka Group
val
receipt
=
sendMessage
(
it
.
messageChain
.
toMessageChain
(
this
))
// this aka Group
receipt
.
source
.
ensureSequenceIdAvailable
()
call
.
respondDTO
(
SendRetDTO
(
messageId
=
receipt
.
source
.
id
))
}
call
.
respondStateCode
(
StateCode
.
Success
)
}
miraiVerify
<
SendDTO
>(
"/sendQuoteMessage"
)
{
it
.
session
.
messageQueue
.
quoteCache
[
it
.
target
]
?.
apply
{
quoteReply
(
it
.
messageChain
.
toMessageChain
(
group
))
val
receipt
=
quoteReply
(
it
.
messageChain
.
toMessageChain
(
group
))
receipt
.
source
.
ensureSequenceIdAvailable
()
call
.
respondDTO
(
SendRetDTO
(
messageId
=
receipt
.
source
.
id
))
}
?:
throw
NoSuchElementException
()
call
.
respondStateCode
(
StateCode
.
Success
)
}
miraiVerify
<
SendImageDTO
>(
"sendImageMessage"
)
{
...
...
@@ -127,9 +130,10 @@ private data class SendImageDTO(
@Serializable
private
class
SendRetDTO
(
val
messageId
:
Long
,
@Transient
val
stateCode
:
StateCode
=
Success
)
:
StateCode
(
stateCode
.
code
,
stateCode
.
msg
)
val
code
:
Int
=
0
,
val
msg
:
String
=
"success"
,
val
messageId
:
Long
)
:
DTO
@Serializable
private
data class
RecallDTO
(
...
...
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/MessageReceipt.kt
View file @
0e5e2336
...
...
@@ -31,7 +31,7 @@ import net.mamoe.mirai.utils.unsafeWeakRef
* @see QQ.sendMessage 发送群消息, 返回回执(此对象)
*/
open
class
MessageReceipt
<
C
:
Contact
>(
private
val
source
:
MessageSource
,
val
source
:
MessageSource
,
target
:
C
)
{
init
{
...
...
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