Merge remote-tracking branch 'origin/master'

mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/data/Exception.kt

@@ -27,11 +27,6 @@ object NotVerifiedSessionException : IllegalAccessException("Session未激活")
  */
 object NoSuchBotException: IllegalAccessException("指定Bot不存在")
 
-/**
- * 指定Bot不存在
- */
-object PermissionDeniedException: IllegalAccessException("无操作限权")
-
 /**
  * 错误参数
  */

mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/route/BaseRoute.kt

@@ -35,6 +35,7 @@ import net.mamoe.mirai.api.http.data.common.DTO
 import net.mamoe.mirai.api.http.data.common.VerifyDTO
 import net.mamoe.mirai.api.http.util.jsonParseOrNull
 import net.mamoe.mirai.api.http.util.toJson
+import net.mamoe.mirai.contact.PermissionDeniedException
 import org.slf4j.Logger
 import org.slf4j.helpers.NOPLogger
 import org.slf4j.helpers.NOPLoggerFactory

mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/route/GroupManageRouteModule.kt

@@ -4,7 +4,6 @@ import io.ktor.application.Application
 import io.ktor.application.call
 import io.ktor.routing.routing
 import kotlinx.serialization.Serializable
-import net.mamoe.mirai.api.http.data.PermissionDeniedException
 import net.mamoe.mirai.api.http.data.StateCode
 import net.mamoe.mirai.api.http.data.common.DTO
 import net.mamoe.mirai.api.http.data.common.VerifyDTO
@@ -29,27 +28,21 @@ fun Application.groupManageModule() {
         }
 
         miraiVerify<MuteDTO>("/mute") {
-            when (it.session.bot.getGroup(it.target)[it.memberId].mute(it.time)) {
-                true -> call.respondStateCode(StateCode.Success)
-                else -> throw PermissionDeniedException
-            }
+            it.session.bot.getGroup(it.target)[it.memberId].mute(it.time)
+            call.respondStateCode(StateCode.Success)
         }
 
         miraiVerify<MuteDTO>("/unmute") {
-            when (it.session.bot.getGroup(it.target).members[it.memberId].unmute()) {
-                true -> call.respondStateCode(StateCode.Success)
-                else -> throw PermissionDeniedException
-            }
+            it.session.bot.getGroup(it.target).members[it.memberId].unmute()
+            call.respondStateCode(StateCode.Success)
         }
 
         /**
          * 移出群聊（需要相关权限）
          */
         miraiVerify<KickDTO>("/kick") {
-            when (it.session.bot.getGroup(it.target)[it.memberId].kick(it.msg)) {
-                true -> call.respondStateCode(StateCode.Success)
-                else -> throw PermissionDeniedException
-            }
+            it.session.bot.getGroup(it.target)[it.memberId].kick(it.msg)
+            call.respondStateCode(StateCode.Success)
         }
 
         /**

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/At.kt

@@ -12,6 +12,7 @@
 package net.mamoe.mirai.message.data
 
 import net.mamoe.mirai.contact.Member
+import net.mamoe.mirai.contact.groupCardOrNick
 import net.mamoe.mirai.utils.MiraiInternalAPI
 
 
@@ -22,7 +23,7 @@ import net.mamoe.mirai.utils.MiraiInternalAPI
  */
 class At @MiraiInternalAPI constructor(val target: Long, val display: String) : Message {
     @UseExperimental(MiraiInternalAPI::class)
-    constructor(member: Member) : this(member.id, "@${member.nick}")
+    constructor(member: Member) : this(member.id, "@${member.groupCardOrNick}")
 
     override fun toString(): String = display