github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-09 18:00:33 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,812 Commits 68 Branches 330 Tags 107 MiB
1998b53451
Commit Graph

1385 Commits

Author SHA1 Message Date
Him188
1998b53451 Add Message.times 2020-03-08 19:23:39 +08:00
Him188
ef29345d71 Use RequiresOptIn 2020-03-08 00:47:14 +08:00
Him188
c5d98cbefd Replace use of Experimental with OptIn 2020-03-08 00:47:12 +08:00
Him188
710379eb80 Specify actual type 2020-03-08 00:44:05 +08:00
Him188
1ef3eb471b Use custom Json configuration 2020-03-08 00:43:52 +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
b1f36704c8 Revert "Use io.ktor.utils.io than kotlinx.io" 
This reverts commit 6a85769e
 2020-03-08 00:24:49 +08:00
Him188
1b8a87b4ce Fix build 2020-03-08 00:08:11 +08:00
Him188
61ca490b5d Rearrange dependencies 2020-03-07 22:23:10 +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
92504fc313 Merge remote-tracking branch 'origin/master' 2020-03-07 11:29:23 +08:00
Him188
26210e7845 Generify functions 2020-03-07 11:29:04 +08:00
Him188
defe7ce054 Fix addSuppressed 2020-03-07 11:19:05 +08:00
Him188
fea2acbb85 Remove useless reference 2020-03-07 00:28:27 +08:00
Him188
e222465ded Make account internal 2020-03-07 00:24:37 +08:00
Him188
03f873276a Enhance flatten and asMessageChain 2020-03-07 00:24:22 +08:00
Him188
27fe240630 Fix addSuppressed, close #116 2020-03-06 22:06:36 +08:00
Him188
37344c19d6 Fix addSuppressed 2020-03-06 22:04:55 +08:00
Him188
91df72981c Migrate to @RequiresOptIn 2020-03-06 17:51:58 +08:00
Him188
060098a5de No inlining because of Kotlin's stacktrace issue 2020-03-06 10:34:11 +08:00
Him188
db28915b8e Fix referneces 2020-03-06 10:28:37 +08:00
Him188
eaeb242800 Specify receiver to avoid being confusing 2020-03-06 10:21:01 +08:00
Him188
b17c30853c Cancel event listener when channel is closed 2020-03-06 10:19:37 +08:00
Him188
baa3c2109e Use Channel.UNLIMITED as a default capacity for CoroutineScope.incoming 2020-03-06 10:17:36 +08:00
Him188
3b16f0a226 Fix warnings 2020-03-05 21:36:46 +08:00
Him188
bfcb8606a2 Merge branch 'master' into kotlin-1.3.70 2020-03-05 15:49:48 +08:00
Him188
8c48ca8136 Use new serialization 2020-03-05 14:52:12 +08:00
Him188
954d6156a9 Fix build 2020-03-05 09:47:42 +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
8cefb73033 Make cache private 2020-03-04 12:20:41 +08:00
Him188
99ca0dec1f Introduce cache for MessageChainBuilder 2020-03-04 12:17:05 +08:00
Him188
0a6b39e62c Adapt new kotlinx.serialization 2020-03-04 10:50:54 +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
b5bd36fb8f Avoid self-suppression 2020-03-03 20:04:46 +08:00
Him188
e022e81cd8 Fix typos 2020-03-03 16:48:06 +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
9b1f17b074 Specify JvmNames 2020-03-03 08:47:18 +08:00