github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-10 02:20:14 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,803 Commits 68 Branches 330 Tags 107 MiB
6731525e49
Commit Graph

693 Commits

Author SHA1 Message Date
Him188
6731525e49 Improve structure 2020-03-08 00:57:29 +08:00
Him188
0a64654a4f Use kotlinx.io 2020-03-08 00:49:24 +08:00
Him188
c5d98cbefd Replace use of Experimental with OptIn 2020-03-08 00:47:12 +08:00
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
200b8b98e7 Merge remote-tracking branch 'origin/master' 2020-03-08 00:25:31 +08:00
Him188
b1f36704c8 Revert "Use io.ktor.utils.io than kotlinx.io" 
This reverts commit 6a85769e
 2020-03-08 00:24:49 +08:00
Him188
1b1be6944c Merge remote-tracking branch 'origin/master' 2020-03-08 00:12:53 +08:00
Him188
3d9b598d57 Improve Heartbeat 2020-03-07 22:45:12 +08:00
Him188
e60a6bcf68 Revert "Use ktor.io than kotlinx.io" 2020-03-07 22:04:31 +08:00
Him188
6b54abe730 Revert "Use ktor.io than kotlinx.io" 
This reverts commit ffee2e26
 2020-03-07 18:49:59 +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
dba3cb5707 Simplify expression 2020-03-07 12:45:34 +08:00
Him188
e222465ded Make account internal 2020-03-07 00:24:37 +08:00
Him188
472da8d3f6 List support 2020-03-06 22:05:55 +08:00
Him188
92df108740 Support Lists 2020-03-06 19:09:34 +08:00
Him188
2260d331d4 Support ByteArray 2020-03-06 18:33:01 +08:00
Him188
d01c3c4675 Support optional elements 2020-03-06 17:51:48 +08:00
Him188
e52a394060 Add tests 2020-03-06 15:16:33 +08:00
Him188
19cc131247 Suppress false positive warnings 2020-03-06 15:15:39 +08:00
Him188
24983d8bbe Throws EOFException rather than IllegalStateException 2020-03-06 15:14:51 +08:00
Him188
115ccec9ed Rearrange classes 2020-03-06 14:41:15 +08:00
Him188
d8c64286e2 Use constant 2020-03-06 14:17:30 +08:00
Him188
4085ecbdd8 Fix warnings 2020-03-05 21:39:53 +08:00
Him188
3b16f0a226 Fix warnings 2020-03-05 21:36:46 +08:00
Him188
b0abd0df28 Skip field when preparing next head 2020-03-05 21:21:06 +08:00
Him188
bfcb8606a2 Merge branch 'master' into kotlin-1.3.70 2020-03-05 15:49:48 +08:00
Him188
cde198759c Rewrite Jce 2020-03-05 14:52:35 +08:00
Him188
8c48ca8136 Use new serialization 2020-03-05 14:52:12 +08:00
Him188
8777d583b0 Merge remote-tracking branch 'origin/kotlin-1.3.70' into kotlin-1.3.70 
# Conflicts:
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/highway/HighwayHelper.kt
#	mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/io/chunked.kt
 2020-03-05 09:45:12 +08:00
Him188
9bff0f77ec Kotlin 1.3.70 2020-03-05 09:44:50 +08:00
Him188
33d562a296 Merge remote-tracking branch 'origin/kotlin-1.3.70' into kotlin-1.3.70 2020-03-04 21:50:49 +08:00
Him188
9a039e1602 Fix reference 
(cherry picked from commit 8dabeba40d)
 2020-03-04 21:50:17 +08:00
Him188
8dabeba40d Fix reference 2020-03-04 21:21:23 +08:00
Him188
c962bd2641 Revert "Adapt new kotlinx.serialization" 
This reverts commit 0a6b39e6
 2020-03-04 14:11:36 +08:00
Him188
60b6eab73e Revert "Update to Kotlin 1.3.70" 
This reverts commit 2e57e358
 2020-03-04 13:58:01 +08:00
Him188
b62151ea6e Fix dependency 2020-03-04 12:23:33 +08:00
Him188
0a6b39e62c Adapt new kotlinx.serialization 2020-03-04 10:50:54 +08:00
Him188
30b6181e3e Fix #105 2020-03-04 09:32:32 +08:00
Him188
095feaf5cb Fix #106 2020-03-04 09:27:37 +08:00
Him188
b9d5fa4c14 Fix #107 2020-03-04 09:14:53 +08:00
Him188
a5c3e9f5ba Misc improvements 2020-03-04 09:01:34 +08:00
Him188
2e57e358c3 Update to Kotlin 1.3.70 2020-03-04 08:54:56 +08:00
Him188
e6cb229b18 Unified packet sending 2020-03-03 20:51:55 +08:00
Him188
a448dbbaf8 Fix relogin 2020-03-03 20:14:35 +08:00
Him188
a9753c4414 Fix sendMessage 2020-03-03 16:43:18 +08:00
Him188
12ebfa1db5 Unified Image types: Online/Offline Image, Group/Friend Image 2020-03-03 13:45:33 +08:00
Him188
3c25c3df65 Simplify calls 2020-03-03 10:26:50 +08:00
Him188
9047fd0d4c Bump version to 8.2.7 2020-03-03 09:47:33 +08:00
Him188
8042249f51 Rename toChain to asMessageChain, add more java-friendly apis 2020-03-03 09:31:01 +08:00
Him188
56bf626a59 Pass @LowLevelAPI annotation 2020-03-03 08:47:32 +08:00