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
7d283808
Commit
7d283808
authored
Feb 17, 2020
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename `awaitDisconnection` to `join`
parent
b59ae076
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
12 deletions
+20
-12
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.kt
...mmonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.kt
+2
-2
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt
...moe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt
+1
-1
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt
+14
-7
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/BotNetworkHandler.kt
...nMain/kotlin/net.mamoe.mirai/network/BotNetworkHandler.kt
+3
-2
No files found.
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.kt
View file @
7d283808
...
@@ -88,10 +88,10 @@ internal abstract class QQAndroidBotBase constructor(
...
@@ -88,10 +88,10 @@ internal abstract class QQAndroidBotBase constructor(
}.
groups
.
asSequence
().
map
{
it
.
groupUin
.
shl
(
32
)
and
it
.
groupCode
}
}.
groups
.
asSequence
().
map
{
it
.
groupUin
.
shl
(
32
)
and
it
.
groupCode
}
}
}
override
suspend
fun
queryGroupInfo
(
id
:
Long
):
GroupInfo
=
network
.
run
{
override
suspend
fun
queryGroupInfo
(
groupCode
:
Long
):
GroupInfo
=
network
.
run
{
TroopManagement
.
GetGroupInfo
(
TroopManagement
.
GetGroupInfo
(
client
=
bot
.
client
,
client
=
bot
.
client
,
groupCode
=
id
groupCode
=
groupCode
).
sendAndExpect
<
GroupInfoImpl
>(
retry
=
2
)
).
sendAndExpect
<
GroupInfoImpl
>(
retry
=
2
)
}
}
...
...
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt
View file @
7d283808
...
@@ -547,5 +547,5 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
...
@@ -547,5 +547,5 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
super
.
close
(
cause
)
super
.
close
(
cause
)
}
}
override
suspend
fun
awaitDisconnectio
n
()
=
supervisor
.
join
()
override
suspend
fun
joi
n
()
=
supervisor
.
join
()
}
}
\ No newline at end of file
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt
View file @
7d283808
...
@@ -33,7 +33,7 @@ import kotlin.jvm.JvmStatic
...
@@ -33,7 +33,7 @@ import kotlin.jvm.JvmStatic
* 机器人对象. 一个机器人实例登录一个 QQ 账号.
* 机器人对象. 一个机器人实例登录一个 QQ 账号.
* Mirai 为多账号设计, 可同时维护多个机器人.
* Mirai 为多账号设计, 可同时维护多个机器人.
*
*
* 注: Bot 为全协程实现, 没有其他任务时若不使用 [
awaitDisconnectio
n], 主线程将会退出.
* 注: Bot 为全协程实现, 没有其他任务时若不使用 [
joi
n], 主线程将会退出.
*
*
* @see Contact
* @see Contact
*/
*/
...
@@ -144,7 +144,9 @@ abstract class Bot : CoroutineScope {
...
@@ -144,7 +144,9 @@ abstract class Bot : CoroutineScope {
abstract
val
groups
:
ContactList
<
Group
>
abstract
val
groups
:
ContactList
<
Group
>
/**
/**
* 获取一个机器人加入的群. 若没有这个群, 则会抛出异常 [NoSuchElementException]
* 获取一个机器人加入的群.
*
* @throws NoSuchElementException 当不存在这个群时
*/
*/
fun
getGroup
(
id
:
Long
):
Group
{
fun
getGroup
(
id
:
Long
):
Group
{
return
groups
.
delegate
.
getOrNull
(
id
)
return
groups
.
delegate
.
getOrNull
(
id
)
...
@@ -152,21 +154,23 @@ abstract class Bot : CoroutineScope {
...
@@ -152,21 +154,23 @@ abstract class Bot : CoroutineScope {
}
}
/**
/**
*
获取
群列表. 返回值前 32 bits 为 uin, 后 32 bits 为 groupCode
*
向服务器查询
群列表. 返回值前 32 bits 为 uin, 后 32 bits 为 groupCode
*/
*/
abstract
suspend
fun
queryGroupList
():
Sequence
<
Long
>
abstract
suspend
fun
queryGroupList
():
Sequence
<
Long
>
/**
/**
* 查询群资料. 获得的仅为当前时刻的资料.
*
向服务器
查询群资料. 获得的仅为当前时刻的资料.
* 请优先使用 [getGroup] 然后查看群资料.
* 请优先使用 [getGroup] 然后查看群资料.
*/
*/
abstract
suspend
fun
queryGroupInfo
(
id
:
Long
):
GroupInfo
abstract
suspend
fun
queryGroupInfo
(
groupCode
:
Long
):
GroupInfo
/**
/**
* 查询群成员列表.
*
向服务器
查询群成员列表.
* 请优先使用 [getGroup], [Group.members] 查看群成员.
* 请优先使用 [getGroup], [Group.members] 查看群成员.
*
*
* 这个函数很慢. 请不要频繁使用.
* 这个函数很慢. 请不要频繁使用.
*
* @see Group.calculateGroupUinByGroupCode 使用 groupCode 计算 groupUin
*/
*/
abstract
suspend
fun
queryGroupMemberList
(
groupUin
:
Long
,
groupCode
:
Long
,
ownerId
:
Long
):
Sequence
<
MemberInfo
>
abstract
suspend
fun
queryGroupMemberList
(
groupUin
:
Long
,
groupCode
:
Long
,
ownerId
:
Long
):
Sequence
<
MemberInfo
>
...
@@ -184,7 +188,10 @@ abstract class Bot : CoroutineScope {
...
@@ -184,7 +188,10 @@ abstract class Bot : CoroutineScope {
/**
/**
* 挂起直到 [Bot] 下线.
* 挂起直到 [Bot] 下线.
*/
*/
suspend
inline
fun
awaitDisconnection
()
=
network
.
awaitDisconnection
()
suspend
inline
fun
join
()
=
network
.
join
()
@Deprecated
(
"使用 join()"
,
ReplaceWith
(
"this.join()"
),
level
=
DeprecationLevel
.
HIDDEN
)
suspend
inline
fun
awaitDisconnection
()
=
join
()
/**
/**
* 登录, 或重新登录.
* 登录, 或重新登录.
...
...
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/BotNetworkHandler.kt
View file @
7d283808
...
@@ -80,9 +80,10 @@ abstract class BotNetworkHandler : CoroutineScope {
...
@@ -80,9 +80,10 @@ abstract class BotNetworkHandler : CoroutineScope {
}
}
/**
/**
* 等待直到与服务器断开连接. 若未连接则立即返回
* 当 [Bot] 正常运作时, 这个函数将一直挂起协程到 [Bot] 被 [Bot.close]
* 当 [Bot] 离线时, 这个函数立即返回.
*/
*/
abstract
suspend
fun
awaitDisconnectio
n
()
abstract
suspend
fun
joi
n
()
/**
/**
* 关闭网络接口, 停止所有有关协程和任务
* 关闭网络接口, 停止所有有关协程和任务
...
...
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