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
828a4794
Commit
828a4794
authored
Nov 25, 2019
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add easier shortcuts
parent
00f33120
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
16 deletions
+5
-16
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/BotHelper.kt
...i-core/src/commonMain/kotlin/net.mamoe.mirai/BotHelper.kt
+2
-6
mirai-demos/mirai-demo-1/src/main/java/demo/subscribe/SubscribeSamples.kt
...i-demo-1/src/main/java/demo/subscribe/SubscribeSamples.kt
+3
-10
No files found.
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/BotHelper.kt
View file @
828a4794
...
...
@@ -99,13 +99,9 @@ suspend inline fun Bot.alsoLogin(noinline configuration: BotConfiguration.() ->
/**
* 使用默认的配置 ([BotConfiguration.Default]) 登录, 返回 [this]
*/
@UseExperimental
(
ExperimentalContracts
::
class
)
suspend
inline
fun
Bot
.
alsoLogin
(
lazyMessageWhenLoginFailed
:
(
LoginResult
)
->
String
):
Bot
{
contract
{
callsInPlace
(
lazyMessageWhenLoginFailed
,
InvocationKind
.
AT_MOST_ONCE
)
}
suspend
inline
fun
Bot
.
alsoLogin
(
message
:
String
):
Bot
{
return
this
.
apply
{
login
().
requireSuccess
(
lazyMessageWhenLoginFailed
)
login
().
requireSuccess
{
message
}
// requireSuccess is inline, so no performance waste
}
}
...
...
mirai-demos/mirai-demo-1/src/main/java/demo/subscribe/SubscribeSamples.kt
View file @
828a4794
...
...
@@ -6,17 +6,15 @@ import kotlinx.coroutines.delay
import
kotlinx.coroutines.withTimeoutOrNull
import
net.mamoe.mirai.Bot
import
net.mamoe.mirai.BotAccount
import
net.mamoe.mirai.alsoLogin
import
net.mamoe.mirai.contact.QQ
import
net.mamoe.mirai.event.*
import
net.mamoe.mirai.login
import
net.mamoe.mirai.message.*
import
net.mamoe.mirai.network.protocol.tim.packet.action.uploadImage
import
net.mamoe.mirai.network.protocol.tim.packet.event.FriendMessage
import
net.mamoe.mirai.network.protocol.tim.packet.event.GroupMessage
import
net.mamoe.mirai.network.protocol.tim.packet.login.ifFail
import
net.mamoe.mirai.utils.suspendToExternalImage
import
java.io.File
import
kotlin.system.exitProcess
private
fun
readTestAccount
():
BotAccount
?
{
val
file
=
File
(
"testAccount.txt"
)
...
...
@@ -39,14 +37,9 @@ suspend fun main() {
id
=
1994701121
u
,
password
=
"123456"
)
)
// 覆盖默认的配置
bot
.
login
{
).
alsoLogin
{
// 覆盖默认的配置
randomDeviceName
=
false
}.
ifFail
{
bot
.
logger
.
error
(
"Login failed: $it"
)
exitProcess
(
1
)
}
bot
.
messageDSL
()
...
...
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