Merge remote-tracking branch 'origin/master'

1e93da9a · Him188 · f3cf0004 · f5dda0cc · 1e93da9a
Commit 1e93da9a authored Apr 11, 2020 by Him188
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events/BotEvents.kt ...mmonMain/kotlin/net.mamoe.mirai/event/events/BotEvents.kt +3 -3

No files found.
--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events/BotEvents.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events/BotEvents.kt
@@ -551,7 +551,7 @@ data class NewFriendRequestEvent(
     */
    val eventId: Long,
    /**
-     * 入群申请消息
+     * 申请好友消息
     */
    val message: String,
    /**
@@ -594,7 +594,7 @@ data class NewFriendRequestEvent(
 }

 /**
- * 机器人被邀请加入群
+ * 一个账号请求加入群事件
 */
 @SinceMirai("0.35.0")
 data class MemberJoinRequestEvent(
@@ -650,4 +650,4 @@ data class MemberJoinRequestEvent(
        runBlocking { bot.ignoreMemberJoinRequest(this@MemberJoinRequestEvent, blackList) }
 }

-// endregion 好友、群认证
\ No newline at end of file
+// endregion 好友、群认证