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
3c29474c
Commit
3c29474c
authored
Feb 19, 2020
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correct `groupCardOrNick` to `nameCardOrNick`
parent
e66cfc95
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/data/common/ContactDTO.kt
...kotlin/net/mamoe/mirai/api/http/data/common/ContactDTO.kt
+1
-1
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Member.kt
...e/src/commonMain/kotlin/net.mamoe.mirai/contact/Member.kt
+2
-2
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/At.kt
.../src/commonMain/kotlin/net.mamoe.mirai/message/data/At.kt
+2
-2
No files found.
mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/data/common/ContactDTO.kt
View file @
3c29474c
...
@@ -37,7 +37,7 @@ data class MemberDTO(
...
@@ -37,7 +37,7 @@ data class MemberDTO(
val
group
:
GroupDTO
val
group
:
GroupDTO
)
:
ContactDTO
()
{
)
:
ContactDTO
()
{
constructor
(
member
:
Member
)
:
this
(
constructor
(
member
:
Member
)
:
this
(
member
.
id
,
member
.
group
CardOrNick
,
member
.
permission
,
member
.
id
,
member
.
name
CardOrNick
,
member
.
permission
,
GroupDTO
(
member
.
group
)
GroupDTO
(
member
.
group
)
)
)
}
}
...
...
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Member.kt
View file @
3c29474c
...
@@ -37,7 +37,7 @@ interface Member : QQ, Contact {
...
@@ -37,7 +37,7 @@ interface Member : QQ, Contact {
*
*
* 在修改时将会异步上传至服务器.
* 在修改时将会异步上传至服务器.
*
*
* @see [
group
CardOrNick] 获取非空群名片或昵称
* @see [
name
CardOrNick] 获取非空群名片或昵称
*
*
* @see MemberCardChangeEvent 群名片被管理员, 自己或 [Bot] 改动事件
* @see MemberCardChangeEvent 群名片被管理员, 自己或 [Bot] 改动事件
* @throws PermissionDeniedException 无权限修改时
* @throws PermissionDeniedException 无权限修改时
...
@@ -96,7 +96,7 @@ interface Member : QQ, Contact {
...
@@ -96,7 +96,7 @@ interface Member : QQ, Contact {
*
*
* 若 [群名片][Member.nameCard] 不为空则返回群名片, 为空则返回 [QQ.nick]
* 若 [群名片][Member.nameCard] 不为空则返回群名片, 为空则返回 [QQ.nick]
*/
*/
val
Member
.
group
CardOrNick
:
String
get
()
=
this
.
nameCard
.
takeIf
{
it
.
isNotEmpty
()
}
?:
this
.
nick
val
Member
.
name
CardOrNick
:
String
get
()
=
this
.
nameCard
.
takeIf
{
it
.
isNotEmpty
()
}
?:
this
.
nick
@ExperimentalTime
@ExperimentalTime
suspend
inline
fun
Member
.
mute
(
duration
:
Duration
)
{
suspend
inline
fun
Member
.
mute
(
duration
:
Duration
)
{
...
...
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/At.kt
View file @
3c29474c
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
package
net.mamoe.mirai.message.data
package
net.mamoe.mirai.message.data
import
net.mamoe.mirai.contact.Member
import
net.mamoe.mirai.contact.Member
import
net.mamoe.mirai.contact.
group
CardOrNick
import
net.mamoe.mirai.contact.
name
CardOrNick
import
net.mamoe.mirai.utils.MiraiInternalAPI
import
net.mamoe.mirai.utils.MiraiInternalAPI
import
kotlin.jvm.JvmMultifileClass
import
kotlin.jvm.JvmMultifileClass
import
kotlin.jvm.JvmName
import
kotlin.jvm.JvmName
...
@@ -28,7 +28,7 @@ import kotlin.jvm.JvmName
...
@@ -28,7 +28,7 @@ import kotlin.jvm.JvmName
*/
*/
class
At
@MiraiInternalAPI
constructor
(
val
target
:
Long
,
val
display
:
String
)
:
Message
{
class
At
@MiraiInternalAPI
constructor
(
val
target
:
Long
,
val
display
:
String
)
:
Message
{
@UseExperimental
(
MiraiInternalAPI
::
class
)
@UseExperimental
(
MiraiInternalAPI
::
class
)
constructor
(
member
:
Member
)
:
this
(
member
.
id
,
"@${member.
group
CardOrNick}"
)
constructor
(
member
:
Member
)
:
this
(
member
.
id
,
"@${member.
name
CardOrNick}"
)
override
fun
toString
():
String
=
display
override
fun
toString
():
String
=
display
...
...
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