github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-02-08 16:32:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve message event logs:

Browse Source 
- Do not include MessageSource
- Treat MessageSyncEvent as a message sent by others
This commit is contained in:
Him188 2021-01-23 03:09:04 +08:00
parent e2554f0ea6
commit 162bc9113c
1 changed files with 48 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
mirai-core/src/commonMain/kotlin/contact/util.kt
View File

@ -165,34 +165,57 @@ internal fun MessageChain.verityLength(
@Suppress("RemoveRedundantQualifierName") // compiler bug @Suppress("RemoveRedundantQualifierName") // compiler bug
internal fun net.mamoe.mirai.event.events.MessageEvent.logMessageReceived() { internal fun net.mamoe.mirai.event.events.MessageEvent.logMessageReceived() {
fun renderGroupMessage(group: Group, senderName: String, sender: Member, message: MessageChain): String { fun renderMessage(message: MessageChain): String {
val displayId = if (sender is AnonymousMember) "匿名" else sender.id.toString() return message.filterNot { it is MessageSource }.joinToString("").replaceMagicCodes()
return "[${group.name}(${group.id})] ${senderName}($displayId) -> $message".replaceMagicCodes()
} }
when (this) { fun renderGroupMessage(group: Group, senderName: String, sender: Member, message: MessageChain): String {
is net.mamoe.mirai.event.events.GroupMessageEvent -> bot.logger.verbose { val displayId = if (sender is AnonymousMember) "匿名" else sender.id.toString()
renderGroupMessage(group, senderName, sender, message) return "[${group.name}(${group.id})] ${senderName}($displayId) -> ${renderMessage(message)}"
}
fun renderGroupTempMessage(group: Group, senderName: String, sender: Member, message: MessageChain): String {
return "[${group.name}(${group.id})] $senderName(Temp ${sender.id}) -> ${renderMessage(message)}"
}
fun renderStrangerMessage(senderName: String, sender: User, message: MessageChain): String {
return "[$senderName(Stranger ${sender.id}) -> ${renderMessage(message)}"
}
fun renderFriendMessage(sender: User, message: MessageChain): String {
return "${sender.nick}(${sender.id}) -> ${renderMessage(message)}"
}
fun renderOtherClientMessage(client: OtherClient): String {
return "${client.platform} -> ${renderMessage(message)}"
}
bot.logger.verbose {
when (this) {
is net.mamoe.mirai.event.events.GroupMessageEvent ->
renderGroupMessage(group, senderName, sender, message)
is net.mamoe.mirai.event.events.GroupMessageSyncEvent ->
renderGroupMessage(group, senderName, sender, message)
is net.mamoe.mirai.event.events.GroupTempMessageEvent ->
renderGroupTempMessage(group, senderName, sender, message)
is net.mamoe.mirai.event.events.GroupTempMessageSyncEvent ->
renderGroupTempMessage(group, senderName, sender, message)
is net.mamoe.mirai.event.events.StrangerMessageEvent,
is net.mamoe.mirai.event.events.StrangerMessageSyncEvent ->
renderStrangerMessage(senderName, sender, message)
is net.mamoe.mirai.event.events.FriendMessageEvent,
is net.mamoe.mirai.event.events.FriendMessageSyncEvent ->
renderFriendMessage(sender, message)
is net.mamoe.mirai.event.events.OtherClientMessageEvent ->
renderOtherClientMessage(client)
else -> toString()
} }
is net.mamoe.mirai.event.events.GroupTempMessageEvent -> bot.logger.verbose {
"[${group.name}(${group.id})] $senderName(Temp ${sender.id}) -> $message".replaceMagicCodes()
}
is net.mamoe.mirai.event.events.StrangerMessageEvent -> bot.logger.verbose {
"[$senderName(Stranger ${sender.id}) -> $message".replaceMagicCodes()
}
is net.mamoe.mirai.event.events.FriendMessageEvent -> bot.logger.verbose {
"${sender.nick}(${sender.id}) -> $message".replaceMagicCodes()
}
is net.mamoe.mirai.event.events.OtherClientMessageEvent -> bot.logger.verbose {
"${client.platform} -> $message".replaceMagicCodes()
}
is GroupMessageSyncEvent -> bot.logger.verbose {
renderGroupMessage(group, senderName, sender, message)
}
is MessageSyncEvent -> bot.logger.verbose {
"${this.subject} <- $message".replaceMagicCodes()
}
else -> bot.logger.verbose(toString())
} }
} }