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
433e1fda
Commit
433e1fda
authored
Nov 27, 2019
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add queryPreviousNameList
parent
043eadd1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
13 deletions
+18
-13
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/QQ.kt
...-core/src/commonMain/kotlin/net.mamoe.mirai/contact/QQ.kt
+10
-0
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/internal/ContactImpl.kt
...in/kotlin/net.mamoe.mirai/contact/internal/ContactImpl.kt
+8
-13
No files found.
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/QQ.kt
View file @
433e1fda
...
@@ -7,6 +7,7 @@ import kotlinx.coroutines.Deferred
...
@@ -7,6 +7,7 @@ import kotlinx.coroutines.Deferred
import
net.mamoe.mirai.Bot
import
net.mamoe.mirai.Bot
import
net.mamoe.mirai.contact.data.Profile
import
net.mamoe.mirai.contact.data.Profile
import
net.mamoe.mirai.network.BotSession
import
net.mamoe.mirai.network.BotSession
import
net.mamoe.mirai.network.protocol.tim.packet.action.PreviousNameList
/**
/**
* QQ 对象.
* QQ 对象.
...
@@ -33,4 +34,13 @@ interface QQ : Contact {
...
@@ -33,4 +34,13 @@ interface QQ : Contact {
* 将会同步更新 property [profile]
* 将会同步更新 property [profile]
*/
*/
suspend
fun
updateProfile
():
Profile
suspend
fun
updateProfile
():
Profile
/**
* 查询曾用名.
*
* 曾用名可能是:
* - 昵称
* - 共同群内的群名片
*/
suspend
fun
queryPreviousNameList
():
PreviousNameList
}
}
\ No newline at end of file
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/internal/ContactImpl.kt
View file @
433e1fda
...
@@ -13,10 +13,7 @@ import net.mamoe.mirai.message.Message
...
@@ -13,10 +13,7 @@ import net.mamoe.mirai.message.Message
import
net.mamoe.mirai.message.MessageChain
import
net.mamoe.mirai.message.MessageChain
import
net.mamoe.mirai.message.chain
import
net.mamoe.mirai.message.chain
import
net.mamoe.mirai.message.singleChain
import
net.mamoe.mirai.message.singleChain
import
net.mamoe.mirai.network.protocol.tim.packet.action.RequestProfileDetailsPacket
import
net.mamoe.mirai.network.protocol.tim.packet.action.*
import
net.mamoe.mirai.network.protocol.tim.packet.action.RequestProfileDetailsResponse
import
net.mamoe.mirai.network.protocol.tim.packet.action.SendFriendMessagePacket
import
net.mamoe.mirai.network.protocol.tim.packet.action.SendGroupMessagePacket
import
net.mamoe.mirai.network.sessionKey
import
net.mamoe.mirai.network.sessionKey
import
net.mamoe.mirai.utils.SuspendLazy
import
net.mamoe.mirai.utils.SuspendLazy
...
@@ -41,11 +38,11 @@ internal data class GroupImpl internal constructor(override val bot: Bot, val gr
...
@@ -41,11 +38,11 @@ internal data class GroupImpl internal constructor(override val bot: Bot, val gr
override
suspend
fun
getMember
(
id
:
UInt
):
Member
=
override
suspend
fun
getMember
(
id
:
UInt
):
Member
=
if
(
_members
.
containsKey
(
id
))
_members
[
id
]
!!
if
(
_members
.
containsKey
(
id
))
_members
[
id
]
!!
else
membersLock
.
withLock
{
else
membersLock
.
withLock
{
_members
.
getOrPut
(
id
)
{
MemberImpl
(
bot
,
bot
.
getQQ
(
id
),
this
)
}
_members
.
getOrPut
(
id
)
{
MemberImpl
(
bot
.
getQQ
(
id
),
this
)
}
}
}
override
suspend
fun
sendMessage
(
message
:
MessageChain
)
{
override
suspend
fun
sendMessage
(
message
:
MessageChain
)
{
bot
.
sendPacket
(
SendGroupMessagePacket
(
bot
.
qqAccount
,
internalId
,
bot
.
sessionKey
,
message
))
bot
.
sendPacket
(
GroupPacket
.
Message
(
bot
.
qqAccount
,
internalId
,
bot
.
sessionKey
,
message
))
}
}
override
fun
toString
():
String
=
"Group(${this.id})"
override
fun
toString
():
String
=
"Group(${this.id})"
...
@@ -67,18 +64,16 @@ internal data class QQImpl internal constructor(override val bot: Bot, override
...
@@ -67,18 +64,16 @@ internal data class QQImpl internal constructor(override val bot: Bot, override
return
_profile
!!
return
_profile
!!
}
}
override
suspend
fun
queryPreviousNameList
():
PreviousNameList
=
bot
.
withSession
{
QueryPreviousNamePacket
(
bot
.
qqAccount
,
sessionKey
,
id
).
sendAndExpect
()
}
override
fun
toString
():
String
=
"QQ(${this.id})"
override
fun
toString
():
String
=
"QQ(${this.id})"
}
}
/**
/**
* 群成员
* 群成员
*/
*/
internal
data class
MemberImpl
(
override
val
bot
:
Bot
,
private
val
delegate
:
QQ
,
override
val
group
:
Group
)
:
Member
,
ContactImpl
()
{
internal
data class
MemberImpl
(
private
val
delegate
:
QQ
,
override
val
group
:
Group
)
:
QQ
by
delegate
,
Member
{
override
val
profile
:
Deferred
<
Profile
>
get
()
=
delegate
.
profile
override
val
id
:
UInt
get
()
=
delegate
.
id
override
suspend
fun
updateProfile
():
Profile
=
delegate
.
updateProfile
()
override
suspend
fun
sendMessage
(
message
:
MessageChain
)
=
delegate
.
sendMessage
(
message
)
override
fun
toString
():
String
=
"Member(${this.id})"
override
fun
toString
():
String
=
"Member(${this.id})"
}
}
\ No newline at end of file
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