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
2b95bea8
Commit
2b95bea8
authored
Apr 13, 2020
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Unified logMessageReceived
parent
67084129
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
14 deletions
+22
-14
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/contact/util.kt
...mmonMain/kotlin/net/mamoe/mirai/qqandroid/contact/util.kt
+19
-1
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt
...moe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt
+3
-13
No files found.
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/contact/util.kt
View file @
2b95bea8
...
@@ -14,7 +14,7 @@ import net.mamoe.mirai.contact.QQ
...
@@ -14,7 +14,7 @@ import net.mamoe.mirai.contact.QQ
import
net.mamoe.mirai.event.broadcast
import
net.mamoe.mirai.event.broadcast
import
net.mamoe.mirai.event.events.EventCancelledException
import
net.mamoe.mirai.event.events.EventCancelledException
import
net.mamoe.mirai.event.events.MessageSendEvent
import
net.mamoe.mirai.event.events.MessageSendEvent
import
net.mamoe.mirai.message.
MessageReceipt
import
net.mamoe.mirai.message.
*
import
net.mamoe.mirai.message.data.LongMessage
import
net.mamoe.mirai.message.data.LongMessage
import
net.mamoe.mirai.message.data.Message
import
net.mamoe.mirai.message.data.Message
import
net.mamoe.mirai.message.data.QuoteReply
import
net.mamoe.mirai.message.data.QuoteReply
...
@@ -28,6 +28,7 @@ import net.mamoe.mirai.qqandroid.network.protocol.packet.chat.receive.MessageSvc
...
@@ -28,6 +28,7 @@ import net.mamoe.mirai.qqandroid.network.protocol.packet.chat.receive.MessageSvc
import
net.mamoe.mirai.utils.LockFreeLinkedList
import
net.mamoe.mirai.utils.LockFreeLinkedList
import
net.mamoe.mirai.utils.MiraiExperimentalAPI
import
net.mamoe.mirai.utils.MiraiExperimentalAPI
import
net.mamoe.mirai.utils.MiraiInternalAPI
import
net.mamoe.mirai.utils.MiraiInternalAPI
import
net.mamoe.mirai.utils.verbose
@OptIn
(
MiraiInternalAPI
::
class
)
@OptIn
(
MiraiInternalAPI
::
class
)
internal
suspend
fun
QQ
.
sendMessageImpl
(
message
:
Message
):
MessageReceipt
<
QQ
>
{
internal
suspend
fun
QQ
.
sendMessageImpl
(
message
:
Message
):
MessageReceipt
<
QQ
>
{
...
@@ -58,6 +59,23 @@ internal fun Contact.logMessageSent(message: Message) {
...
@@ -58,6 +59,23 @@ internal fun Contact.logMessageSent(message: Message) {
}
}
}
}
@OptIn
(
MiraiInternalAPI
::
class
,
MiraiExperimentalAPI
::
class
)
internal
fun
ContactMessage
.
logMessageReceived
()
{
when
(
this
)
{
is
GroupMessage
->
bot
.
logger
.
verbose
{
"[${group.name.singleLine()}(${group.id})] ${senderName.singleLine()}(${sender.id}) -> ${message.toString()
.
singleLine
()}
"
}
is
TempMessage
->
bot
.
logger
.
verbose
{
"[${group.name.singleLine()}(${group.id})] ${senderName.singleLine()}(Temp ${sender.id}) -> ${message.toString()
.
singleLine
()}
"
}
is
FriendMessage
->
bot
.
logger
.
verbose
{
"${sender.nick.singleLine()}(${sender.id}) -> ${message.toString().singleLine()}"
}
}
}
internal
fun
String
.
singleLine
():
String
{
internal
fun
String
.
singleLine
():
String
{
return
this
.
replace
(
"\n"
,
"""\n"""
).
replace
(
"\r"
,
""
)
return
this
.
replace
(
"\n"
,
"""\n"""
).
replace
(
"\r"
,
""
)
...
...
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt
View file @
2b95bea8
...
@@ -20,16 +20,12 @@ import kotlinx.io.core.use
...
@@ -20,16 +20,12 @@ import kotlinx.io.core.use
import
net.mamoe.mirai.event.*
import
net.mamoe.mirai.event.*
import
net.mamoe.mirai.event.events.BotOfflineEvent
import
net.mamoe.mirai.event.events.BotOfflineEvent
import
net.mamoe.mirai.event.events.BotOnlineEvent
import
net.mamoe.mirai.event.events.BotOnlineEvent
import
net.mamoe.mirai.message.FriendMessage
import
net.mamoe.mirai.message.ContactMessage
import
net.mamoe.mirai.message.GroupMessage
import
net.mamoe.mirai.network.BotNetworkHandler
import
net.mamoe.mirai.network.BotNetworkHandler
import
net.mamoe.mirai.network.UnsupportedSMSLoginException
import
net.mamoe.mirai.network.UnsupportedSMSLoginException
import
net.mamoe.mirai.network.WrongPasswordException
import
net.mamoe.mirai.network.WrongPasswordException
import
net.mamoe.mirai.qqandroid.QQAndroidBot
import
net.mamoe.mirai.qqandroid.QQAndroidBot
import
net.mamoe.mirai.qqandroid.contact.FriendInfoImpl
import
net.mamoe.mirai.qqandroid.contact.*
import
net.mamoe.mirai.qqandroid.contact.GroupImpl
import
net.mamoe.mirai.qqandroid.contact.QQImpl
import
net.mamoe.mirai.qqandroid.contact.singleLine
import
net.mamoe.mirai.qqandroid.event.PacketReceivedEvent
import
net.mamoe.mirai.qqandroid.event.PacketReceivedEvent
import
net.mamoe.mirai.qqandroid.network.protocol.data.jce.StTroopNum
import
net.mamoe.mirai.qqandroid.network.protocol.data.jce.StTroopNum
import
net.mamoe.mirai.qqandroid.network.protocol.data.proto.MsgSvc
import
net.mamoe.mirai.qqandroid.network.protocol.data.proto.MsgSvc
...
@@ -451,13 +447,7 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
...
@@ -451,13 +447,7 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
is
Packet
.
NoLog
->
{
is
Packet
.
NoLog
->
{
// nothing to do
// nothing to do
}
}
is
GroupMessage
->
bot
.
logger
.
verbose
{
is
ContactMessage
->
packet
.
logMessageReceived
()
"[${packet.group.name}(${packet.group.id})] ${packet.senderName}(${packet.sender.id}) -> ${packet.message.toString()
.
singleLine
()}
"
}
is
FriendMessage
->
bot
.
logger
.
verbose
{
"${packet.sender.nick}(${packet.sender.id}) -> ${packet.message.toString().singleLine()}"
}
is
Event
->
bot
.
logger
.
verbose
{
"Event: ${packet.toString().singleLine()}"
}
is
Event
->
bot
.
logger
.
verbose
{
"Event: ${packet.toString().singleLine()}"
}
else
->
logger
.
verbose
{
"Packet: ${packet.toString().singleLine()}"
}
else
->
logger
.
verbose
{
"Packet: ${packet.toString().singleLine()}"
}
}
}
...
...
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