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
8cc25641
Commit
8cc25641
authored
Feb 23, 2020
by
Him188
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
ccc6826e
ca0e50a3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/route/MessageRouteModule.kt
...tlin/net/mamoe/mirai/api/http/route/MessageRouteModule.kt
+1
-1
mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/controller/MiraiGraphicalUIController.kt
...onsole/graphical/controller/MiraiGraphicalUIController.kt
+3
-3
No files found.
mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/route/MessageRouteModule.kt
View file @
8cc25641
...
@@ -54,7 +54,7 @@ fun Application.messageModule() {
...
@@ -54,7 +54,7 @@ fun Application.messageModule() {
}
}
}
}
miraiVerify
<
SendDTO
>(
"/
q
uoteMessage"
)
{
miraiVerify
<
SendDTO
>(
"/
sendQ
uoteMessage"
)
{
it
.
session
.
messageQueue
.
quoteCache
[
it
.
target
]
?.
apply
{
it
.
session
.
messageQueue
.
quoteCache
[
it
.
target
]
?.
apply
{
quoteReply
(
it
.
messageChain
.
toMessageChain
(
group
))
quoteReply
(
it
.
messageChain
.
toMessageChain
(
group
))
}
?:
throw
NoSuchElementException
()
}
?:
throw
NoSuchElementException
()
...
...
mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/controller/MiraiGraphicalUIController.kt
View file @
8cc25641
...
@@ -32,11 +32,11 @@ class MiraiGraphicalUIController : Controller(), MiraiConsoleUI {
...
@@ -32,11 +32,11 @@ class MiraiGraphicalUIController : Controller(), MiraiConsoleUI {
val
consoleInfo
=
ConsoleInfo
()
val
consoleInfo
=
ConsoleInfo
()
suspend
fun
login
(
qq
:
String
,
psd
:
String
)
{
fun
login
(
qq
:
String
,
psd
:
String
)
{
// MiraiConsole
MiraiConsole
.
CommandProcessor
.
runConsoleCommandBlocking
(
"/login $qq $psd"
)
}
}
suspend
fun
sendCommand
(
command
:
String
)
=
Unit
fun
sendCommand
(
command
:
String
)
=
MiraiConsole
.
CommandProcessor
.
runConsoleCommandBlocking
(
command
)
override
fun
pushLog
(
identity
:
Long
,
message
:
String
)
=
Platform
.
runLater
{
override
fun
pushLog
(
identity
:
Long
,
message
:
String
)
=
Platform
.
runLater
{
when
(
identity
)
{
when
(
identity
)
{
...
...
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