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
38748e0c
Commit
38748e0c
authored
Apr 02, 2020
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use Kotlin 1.3.71
parent
1605a5b6
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
22 additions
and
19 deletions
+22
-19
buildSrc/src/main/kotlin/Versions.kt
buildSrc/src/main/kotlin/Versions.kt
+5
-5
mirai-core-qqandroid/src/androidMain/kotlin/net/mamoe/mirai/qqandroid/utils/MiraiPlatformUtils.kt
...lin/net/mamoe/mirai/qqandroid/utils/MiraiPlatformUtils.kt
+1
-1
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.kt
...mmonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.kt
+2
-2
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/message/convension.kt
...in/kotlin/net/mamoe/mirai/qqandroid/message/convension.kt
+6
-3
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/MultiMsg.kt
.../mirai/qqandroid/network/protocol/packet/chat/MultiMsg.kt
+6
-6
mirai-core-qqandroid/src/jvmMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.kt
.../jvmMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.kt
+1
-1
mirai-core/src/androidMain/kotlin/net/mamoe/mirai/message/MessageReceipt.kt
...roidMain/kotlin/net/mamoe/mirai/message/MessageReceipt.kt
+1
-1
No files found.
buildSrc/src/main/kotlin/Versions.kt
View file @
38748e0c
...
...
@@ -13,11 +13,11 @@ object Versions {
}
object
Kotlin
{
const
val
stdlib
=
"1.
4-M
1"
const
val
coroutines
=
"1.3.5
-1.4-M1
"
const
val
atomicFU
=
"0.14.2
-1.4-M1
"
const
val
serialization
=
"0.20.0
-1.4-M1
"
const
val
ktor
=
"1.3.2
-1.4-M1
"
const
val
stdlib
=
"1.
3.7
1"
const
val
coroutines
=
"1.3.5"
const
val
atomicFU
=
"0.14.2"
const
val
serialization
=
"0.20.0"
const
val
ktor
=
"1.3.2"
const
val
io
=
"0.1.16"
const
val
coroutinesIo
=
"0.1.16"
...
...
mirai-core-qqandroid/src/androidMain/kotlin/net/mamoe/mirai/qqandroid/utils/MiraiPlatformUtils.kt
View file @
38748e0c
@
file
:
Suppress
(
"unused"
,
"unused"
)
@
file
:
Suppress
(
"unused"
,
"unused"
,
"NOTHING_TO_INLINE"
)
package
net.mamoe.mirai.qqandroid.utils
...
...
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.kt
View file @
38748e0c
...
...
@@ -382,8 +382,8 @@ internal abstract class QQAndroidBotBase constructor(
sequenceId
=
client
.
atomicNextMessageSequenceId
(),
time
=
time
.
toInt
(),
random
=
Random
.
nextInt
().
absoluteValue
.
toUInt
(),
groupCode
,
group
.
botAsMember
.
nameCardOrNick
groupCode
=
groupCode
,
botMemberNameCard
=
group
.
botAsMember
.
nameCardOrNick
)
val
response
=
...
...
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/message/convension.kt
View file @
38748e0c
...
...
@@ -25,8 +25,11 @@ import net.mamoe.mirai.qqandroid.network.protocol.data.proto.MsgComm
import
net.mamoe.mirai.qqandroid.utils.MiraiPlatformUtils
import
net.mamoe.mirai.qqandroid.utils.encodeToString
import
net.mamoe.mirai.qqandroid.utils.hexToBytes
import
net.mamoe.mirai.utils.*
import
net.mamoe.mirai.qqandroid.utils.read
import
net.mamoe.mirai.utils.MiraiExperimentalAPI
import
net.mamoe.mirai.utils.MiraiInternalAPI
import
net.mamoe.mirai.utils.MiraiLogger
import
net.mamoe.mirai.utils.debug
private
val
UNSUPPORTED_MERGED_MESSAGE_PLAIN
=
PlainText
(
"你的QQ暂不支持查看[转发多条消息],请期待后续版本。"
)
...
...
@@ -127,7 +130,7 @@ internal fun MessageChain.toRichTextElems(forGroup: Boolean, withGeneralFlags: B
}
is
QuoteReply
,
// already transformed above
is
MessageSource
,
// mirai only
is
RichMessage
,
// already transformed above
is
RichMessage
// already transformed above
->
{
}
...
...
@@ -145,7 +148,7 @@ internal fun MessageChain.toRichTextElems(forGroup: Boolean, withGeneralFlags: B
longTextFlag
=
1
,
longTextResid
=
longTextResId
!!
,
pbReserve
=
"78 00 F8 01 00 C8 02 00"
.
hexToBytes
()
)
,
)
)
)
}
...
...
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/MultiMsg.kt
View file @
38748e0c
...
...
@@ -34,7 +34,7 @@ import net.mamoe.mirai.qqandroid.utils._miraiContentToString
internal
class
MessageValidationData
@OptIn
(
MiraiInternalAPI
::
class
)
constructor
(
val
data
:
ByteArray
,
val
md5
:
ByteArray
=
MiraiPlatformUtils
.
md5
(
data
)
,
val
md5
:
ByteArray
=
MiraiPlatformUtils
.
md5
(
data
)
)
{
override
fun
toString
():
String
{
return
"MessageValidationData(data=<size=${data.size}>, md5=${md5.contentToString()})"
...
...
@@ -66,7 +66,7 @@ internal fun MessageChain.calculateValidationDataForGroup(
msgType
=
82
,
// troop
groupInfo
=
MsgComm
.
GroupInfo
(
groupCode
=
groupCode
,
groupCard
=
botMemberNameCard
,
// Cinnamon
groupCard
=
botMemberNameCard
// Cinnamon
),
isSrcMsg
=
false
),
...
...
@@ -74,8 +74,8 @@ internal fun MessageChain.calculateValidationDataForGroup(
richText
=
ImMsgBody
.
RichText
(
elems
=
richTextElems
.
toMutableList
()
)
)
,
)
,
)
)
)
)
...
...
@@ -120,13 +120,13 @@ internal class MultiMsg {
msgMd5
=
messageData
.
md5
,
msgSize
=
messageData
.
data
.
size
.
toLong
(),
msgType
=
3
// TODO 3 for group?
)
,
)
),
netType
=
3
,
// wifi=3, wap=5
platformType
=
9
,
subcmd
=
1
,
termType
=
5
,
reqChannelType
=
0
,
reqChannelType
=
0
)
)
}
...
...
mirai-core-qqandroid/src/jvmMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.kt
View file @
38748e0c
...
...
@@ -17,11 +17,11 @@ import kotlinx.coroutines.io.*
import
kotlinx.io.core.*
import
kotlinx.io.pool.useInstance
import
net.mamoe.mirai.BotAccount
import
net.mamoe.mirai.qqandroid.utils.ByteArrayPool
import
net.mamoe.mirai.utils.BotConfiguration
import
net.mamoe.mirai.utils.Context
import
net.mamoe.mirai.utils.ContextImpl
import
net.mamoe.mirai.utils.MiraiInternalAPI
import
net.mamoe.mirai.utils.io.ByteArrayPool
import
net.mamoe.mirai.qqandroid.utils.toReadPacket
import
java.nio.ByteBuffer
...
...
mirai-core/src/androidMain/kotlin/net/mamoe/mirai/message/MessageReceipt.kt
View file @
38748e0c
...
...
@@ -84,7 +84,7 @@ actual constructor(
if
(
_isRecalled
.
compareAndSet
(
false
,
true
))
{
return
when
(
val
contact
=
target
)
{
is
QQ
,
is
Group
,
is
Group
->
contact
.
bot
.
recallIn
(
source
,
millis
)
else
->
error
(
"Unknown contact type"
)
}
...
...
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