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
510a041f
Commit
510a041f
authored
Jun 26, 2020
by
ryoii
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Close #393
parent
9375c0fa
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
11 deletions
+15
-11
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.common.kt
...n/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.common.kt
+7
-4
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/NewContact.kt
...irai/qqandroid/network/protocol/packet/chat/NewContact.kt
+3
-2
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt
+1
-1
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events/group.kt
...c/commonMain/kotlin/net.mamoe.mirai/event/events/group.kt
+3
-3
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/lowLevelApi.kt
...core/src/commonMain/kotlin/net.mamoe.mirai/lowLevelApi.kt
+1
-1
No files found.
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.common.kt
View file @
510a041f
...
...
@@ -146,7 +146,7 @@ internal class QQAndroidBot constructor(
@Suppress
(
"DuplicatedCode"
)
@OptIn
(
LowLevelAPI
::
class
)
override
suspend
fun
rejectMemberJoinRequest
(
event
:
MemberJoinRequestEvent
,
blackList
:
Boolean
)
{
override
suspend
fun
rejectMemberJoinRequest
(
event
:
MemberJoinRequestEvent
,
blackList
:
Boolean
,
message
:
String
)
{
checkGroupPermission
(
event
.
bot
,
event
.
group
)
{
event
::
class
.
simpleName
?:
"<anonymous class>"
}
check
(
event
.
responded
.
compareAndSet
(
false
,
true
))
{
"the request $this has already been responded"
...
...
@@ -162,7 +162,8 @@ internal class QQAndroidBot constructor(
fromNick
=
event
.
fromNick
,
groupId
=
event
.
groupId
,
accept
=
false
,
blackList
=
blackList
blackList
=
blackList
,
message
=
message
)
}
...
...
@@ -755,7 +756,8 @@ internal abstract class QQAndroidBotBase constructor(
fromNick
:
String
,
groupId
:
Long
,
accept
:
Boolean
?,
blackList
:
Boolean
blackList
:
Boolean
,
message
:
String
)
{
network
.
apply
{
NewContact
.
SystemMsgNewGroup
.
Action
(
...
...
@@ -765,7 +767,8 @@ internal abstract class QQAndroidBotBase constructor(
groupId
=
groupId
,
isInvited
=
false
,
accept
=
accept
,
blackList
=
blackList
blackList
=
blackList
,
message
=
message
).
sendWithoutExpect
()
groups
[
groupId
].
apply
{
members
.
delegate
.
addLast
(
newMember
(
object
:
MemberInfo
{
...
...
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/NewContact.kt
View file @
510a041f
...
...
@@ -223,7 +223,8 @@ internal class NewContact {
groupId
:
Long
,
isInvited
:
Boolean
,
accept
:
Boolean
?,
blackList
:
Boolean
=
false
blackList
:
Boolean
=
false
,
message
:
String
=
""
)
=
buildOutgoingUniPacket
(
client
)
{
writeProtoBuf
(
...
...
@@ -236,7 +237,7 @@ internal class NewContact {
false
->
12
// reject
},
groupCode
=
groupId
,
msg
=
""
,
msg
=
message
,
remark
=
""
,
blacklist
=
blackList
),
...
...
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt
View file @
510a041f
...
...
@@ -295,7 +295,7 @@ abstract class Bot internal constructor(
level
=
DeprecationLevel
.
ERROR
)
@JvmSynthetic
abstract
suspend
fun
rejectMemberJoinRequest
(
event
:
MemberJoinRequestEvent
,
blackList
:
Boolean
=
false
)
abstract
suspend
fun
rejectMemberJoinRequest
(
event
:
MemberJoinRequestEvent
,
blackList
:
Boolean
=
false
,
message
:
String
=
""
)
/**
* 忽略加群验证(需管理员权限)
...
...
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events/group.kt
View file @
510a041f
...
...
@@ -353,7 +353,7 @@ data class MemberJoinRequestEvent internal constructor(
suspend
fun
accept
()
=
bot
.
acceptMemberJoinRequest
(
this
)
@JvmSynthetic
suspend
fun
reject
(
blackList
:
Boolean
=
false
)
=
bot
.
rejectMemberJoinRequest
(
this
,
blackList
)
suspend
fun
reject
(
blackList
:
Boolean
=
false
,
message
:
String
=
""
)
=
bot
.
rejectMemberJoinRequest
(
this
,
blackList
,
message
)
@JvmSynthetic
suspend
fun
ignore
(
blackList
:
Boolean
=
false
)
=
bot
.
ignoreMemberJoinRequest
(
this
,
blackList
)
...
...
@@ -366,8 +366,8 @@ data class MemberJoinRequestEvent internal constructor(
@JavaFriendlyAPI
@JvmOverloads
@JvmName
(
"reject"
)
fun
__rejectBlockingForJava__
(
blackList
:
Boolean
=
false
)
=
runBlocking
{
bot
.
rejectMemberJoinRequest
(
this
@MemberJoinRequestEvent
,
blackList
)
}
fun
__rejectBlockingForJava__
(
blackList
:
Boolean
=
false
,
message
:
String
=
""
)
=
runBlocking
{
bot
.
rejectMemberJoinRequest
(
this
@MemberJoinRequestEvent
,
blackList
,
message
)
}
@JavaFriendlyAPI
@JvmOverloads
...
...
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/lowLevelApi.kt
View file @
510a041f
...
...
@@ -137,5 +137,5 @@ interface LowLevelBotAPIAccessor {
*/
@LowLevelAPI
@MiraiExperimentalAPI
suspend
fun
_lowLevelSolveMemberJoinRequestEvent
(
eventId
:
Long
,
fromId
:
Long
,
fromNick
:
String
,
groupId
:
Long
,
accept
:
Boolean
?,
blackList
:
Boolean
)
suspend
fun
_lowLevelSolveMemberJoinRequestEvent
(
eventId
:
Long
,
fromId
:
Long
,
fromNick
:
String
,
groupId
:
Long
,
accept
:
Boolean
?,
blackList
:
Boolean
,
message
:
String
=
""
)
}
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