github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-03-30 09:50:12 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,801 Commits 68 Branches 330 Tags 107 MiB
ef29345d71
Commit Graph

93 Commits

Author SHA1 Message Date
Him188
e39fe5a46f Merge branch 'master' into kotlin-1.3.70 
# Conflicts:
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidClient.kt
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/highway/HighwayHelper.kt
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/highway/highway.kt
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/login/WtLogin.kt
#	mirai-core/build.gradle.kts
#	mirai-core/src/androidMain/kotlin/net/mamoe/mirai/utils/addSuppressed.kt
#	mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/ExternalImage.kt
#	mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/channels.kt
#	mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/io/chunked.kt
#	mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/io/input.kt
#	mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/addSuppressed.kt
 2020-03-08 00:29:51 +08:00
Him188
b3c4f24e33 Revert "Use io.ktor.utils.io than kotlinx.io" 
This reverts commit 6a85769e
 2020-03-07 18:48:07 +08:00
Him188
9bff0f77ec Kotlin 1.3.70 2020-03-05 09:44:50 +08:00
Him188
60b6eab73e Revert "Update to Kotlin 1.3.70" 
This reverts commit 2e57e358
 2020-03-04 13:58:01 +08:00
Him188
2e57e358c3 Update to Kotlin 1.3.70 2020-03-04 08:54:56 +08:00
Him188
8042249f51 Rename toChain to asMessageChain, add more java-friendly apis 2020-03-03 09:31:01 +08:00
Him188
6a85769e0d Use io.ktor.utils.io than kotlinx.io 2020-02-29 23:19:53 +08:00
Him188
932a3ef1f2 Review: misc improvements 2020-02-28 19:16:22 +08:00
Him188
587fab23e1 Support recall, add MessageReceipt 2020-02-21 18:21:58 +08:00
Him188
751d653545 Fix build 2020-02-15 18:23:21 +08:00
Him188
32c15a47de Remove debugPrintln 2020-02-14 22:06:52 +08:00
Him188
7183439444 Process string properly 2020-02-12 20:00:29 +08:00
Him188
905d4ede9a Fix build 2020-02-12 13:52:07 +08:00
Him188
0d8e481efc Fix build 2020-02-11 09:15:53 +08:00
Him188
ec82232aa3 Cleanup 2020-02-10 13:54:21 +08:00
Him188
cf7e325259 Add copyright 2020-02-09 01:01:36 +08:00
jiahua.liu
571b4c4162 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/OnlinePush.kt
 2020-02-08 21:44:24 +08:00
jiahua.liu
6e6c1d813d OnlinePushPack JCEs 2020-02-08 20:57:31 +08:00
Him188
ee3f08f722 Move MessageQQA.kt to message 2020-02-08 16:04:06 +08:00
Him188
ad2e1e243e Less log 2020-02-08 16:03:43 +08:00
Him188
6d2a360780 Add heartbeat 2020-02-08 00:36:58 +08:00
jiahua.liu
c92e385839 Kick Member.kt 2020-02-07 20:31:50 +08:00
Him188
80078ab25e Print imports 2020-02-07 12:32:27 +08:00
Him188
388e1a5b7f Cleanup 2020-02-06 13:58:57 +08:00
jiahua.liu
da2e09855b special title 2020-02-05 22:55:49 +08:00
jiahua.liu
6f67edfdfa GetGroupOperationInfo 2020-02-05 21:31:22 +08:00
jiahua.liu
ad71076620 Merge remote-tracking branch 'origin/master' 2020-02-04 23:54:36 +08:00
jiahua.liu
5c04ba445c Group management Update 2020-02-04 23:54:21 +08:00
Him188
8df1cfff55 Cleanup 2020-02-04 18:52:09 +08:00
Him188
9c318601a7 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/PacketFactory.kt
#	mirai-core-qqandroid/src/jvmTest/kotlin/test/ProtoBufDataClassGenerator.kt
 2020-02-03 21:40:00 +08:00
Him188
35dca403bf Image upload 2020-02-03 21:38:37 +08:00
jiahua.liu
870234a007 Merge remote-tracking branch 'origin/master' 2020-02-03 17:00:17 +08:00
jiahua.liu
c69502a9ea Proto Bufs 2020-02-03 17:00:01 +08:00
Him188
c429a7cf3a Fix decrypt 2020-02-03 15:57:15 +08:00
Him188
63a4d5f3b9 New PacketFactory structure 2020-02-02 16:02:17 +08:00
Him188
a707af649a Fix ConfigPushSvc.PushResp 2020-02-02 00:44:12 +08:00
Him188
d5ff8f3933 Update syncCookie 2020-02-01 23:17:53 +08:00
jiahua.liu
bd0442c692 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt
 2020-01-31 21:18:51 +08:00
Him188
c044c64b82 Try fix group list 2020-01-31 19:58:18 +08:00
jiahua.liu
06515bc0be Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/list/FriendListPacket.kt
 2020-01-31 18:10:29 +08:00
jiahua.liu
0b01fd7b36 troop List 2020-01-31 18:06:23 +08:00
Him188
26b9aa10e4 Jce head fix 2020-01-31 17:47:30 +08:00
Him188
f1890783bd Switch on logger while debugging 2020-01-30 23:50:18 +08:00
Him188
9d206d1af9 Fix nested struct list deserializing 2020-01-30 21:27:34 +08:00
Him188
d8eb2e126e Fix nested struct list serializing 2020-01-30 21:25:08 +08:00
jiahua.liu
af4f6c4160 fix Jce Data Class generator when facing Map<T,\" \"K> 2020-01-30 20:16:26 +08:00
Him188
b3e9d553aa Simplify log 2020-01-30 19:31:51 +08:00
Him188
efb662a978 Generator for directory 2020-01-30 18:49:06 +08:00
Him188
3a11adf1c0 Jce null support 2020-01-30 17:18:49 +08:00
jiahua.liu
034de9f17a friend list packet 2020-01-30 14:39:56 +08:00