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
e9730793
Commit
e9730793
authored
Jun 29, 2020
by
Him188
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev' into dev
parents
23dd54b3
49924ea3
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
1 deletion
+10
-1
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.common.kt
...n/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.common.kt
+6
-0
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt
+3
-1
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events/group.kt
...c/commonMain/kotlin/net.mamoe.mirai/event/events/group.kt
+1
-0
No files found.
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.common.kt
View file @
e9730793
...
@@ -141,6 +141,12 @@ internal class QQAndroidBot constructor(
...
@@ -141,6 +141,12 @@ internal class QQAndroidBot constructor(
)
)
}
}
@Suppress
(
"DuplicatedCode"
)
@OptIn
(
LowLevelAPI
::
class
)
override
suspend
fun
rejectMemberJoinRequest
(
event
:
MemberJoinRequestEvent
,
blackList
:
Boolean
)
{
rejectMemberJoinRequest
(
event
,
blackList
,
""
)
}
@Suppress
(
"DuplicatedCode"
)
@Suppress
(
"DuplicatedCode"
)
@OptIn
(
LowLevelAPI
::
class
)
@OptIn
(
LowLevelAPI
::
class
)
override
suspend
fun
rejectMemberJoinRequest
(
event
:
MemberJoinRequestEvent
,
blackList
:
Boolean
,
message
:
String
)
{
override
suspend
fun
rejectMemberJoinRequest
(
event
:
MemberJoinRequestEvent
,
blackList
:
Boolean
,
message
:
String
)
{
...
...
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt
View file @
e9730793
...
@@ -291,8 +291,10 @@ abstract class Bot internal constructor(
...
@@ -291,8 +291,10 @@ abstract class Bot internal constructor(
@Deprecated
(
@Deprecated
(
"use member function."
,
"use member function."
,
replaceWith
=
ReplaceWith
(
"event.reject(blackList)"
),
replaceWith
=
ReplaceWith
(
"event.reject(blackList)"
),
level
=
DeprecationLevel
.
ERROR
level
=
DeprecationLevel
.
HIDDEN
)
)
abstract
suspend
fun
rejectMemberJoinRequest
(
event
:
MemberJoinRequestEvent
,
blackList
:
Boolean
=
false
)
@JvmSynthetic
@JvmSynthetic
abstract
suspend
fun
rejectMemberJoinRequest
(
event
:
MemberJoinRequestEvent
,
blackList
:
Boolean
=
false
,
message
:
String
=
""
)
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 @
e9730793
...
@@ -355,6 +355,7 @@ data class MemberJoinRequestEvent internal constructor(
...
@@ -355,6 +355,7 @@ data class MemberJoinRequestEvent internal constructor(
suspend
fun
accept
()
=
bot
.
acceptMemberJoinRequest
(
this
)
suspend
fun
accept
()
=
bot
.
acceptMemberJoinRequest
(
this
)
@JvmSynthetic
@JvmSynthetic
@JvmOverloads
suspend
fun
reject
(
blackList
:
Boolean
=
false
,
message
:
String
=
""
)
=
bot
.
rejectMemberJoinRequest
(
this
,
blackList
,
message
)
suspend
fun
reject
(
blackList
:
Boolean
=
false
,
message
:
String
=
""
)
=
bot
.
rejectMemberJoinRequest
(
this
,
blackList
,
message
)
@JvmSynthetic
@JvmSynthetic
...
...
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