github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-03-09 19:50:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Him188 2020-02-15 18:14:36 +08:00
commit 19bcfc74af
4 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -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.data.common.VerifyDTO
import net.mamoe.mirai.api.http.util.jsonParseOrNull import net.mamoe.mirai.api.http.util.jsonParseOrNull
import net.mamoe.mirai.api.http.util.toJson import net.mamoe.mirai.api.http.util.toJson
import net.mamoe.mirai.contact.PermissionDeniedException
import org.slf4j.Logger import org.slf4j.Logger
import org.slf4j.helpers.NOPLogger import org.slf4j.helpers.NOPLogger
import org.slf4j.helpers.NOPLoggerFactory import org.slf4j.helpers.NOPLoggerFactory

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

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

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

@ -12,6 +12,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.groupCardOrNick
import net.mamoe.mirai.utils.MiraiInternalAPI 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 { class At @MiraiInternalAPI constructor(val target: Long, val display: String) : Message {
@UseExperimental(MiraiInternalAPI::class) @UseExperimental(MiraiInternalAPI::class)
constructor(member: Member) : this(member.id, "@${member.nick}") constructor(member: Member) : this(member.id, "@${member.groupCardOrNick}")
override fun toString(): String = display override fun toString(): String = display