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
4,019 Commits 68 Branches 330 Tags 107 MiB
f107048944
Commit Graph

1130 Commits

Author SHA1 Message Date
ryoii
a03848da30 Improve delete notify 2020-04-25 00:40:20 +08:00
ryoii
bb3944d5ae Support handle bot invited into a group, close #259 2020-04-25 00:24:16 +08:00
ryoii
78b46ceabe Fix: PacketFactory for MessageSvc.Del 2020-04-24 21:34:07 +08:00
ryoii
769b6ce207 Delete notify uniformly 2020-04-24 21:24:56 +08:00
ryoii
f5112aaac5 Fix: delete notify sent from tx server 2020-04-24 21:17:35 +08:00
Him188
c8e20800a0 Fix #263 2020-04-24 16:45:45 +08:00
Him188
09524da1e9 Add docs, rearrange implementations 2020-04-24 16:41:21 +08:00
Him188
077885465b Add docs, rearrange implementations 2020-04-24 15:12:50 +08:00
Him188
b0fbb10150 Fix build 2020-04-24 09:13:58 +08:00
Him188
70f421aee8 Fix long message, unify logs 2020-04-23 21:56:29 +08:00
Him188
d584b765ab Halt bot when failed with LoginFailedException 2020-04-23 21:47:48 +08:00
Him188
437f9db575 Unified Image suffix: .mirai 2020-04-23 20:37:01 +08:00
Him188
65f45d6c84 Fix unmodified nameCard 2020-04-23 19:36:09 +08:00
Him188
4a217d83a6 Fix #247 2020-04-23 19:08:59 +08:00
Him188
6f69497247 Rearrange highway image upload 2020-04-23 18:36:21 +08:00
Him188
8e8f91bbee Send temp messages as friend messages if a target Member is also a friend 2020-04-23 18:36:04 +08:00
Him188
5b2ae6e9ad Simplify Image structure, close #244 2020-04-23 17:10:21 +08:00
Him188
eb123bb3a9 Fix #242 2020-04-23 14:46:30 +08:00
Him188
3eb9745485 Fix #231, fix #254 2020-04-23 14:32:00 +08:00
Him188
9531ed8a01 Fix build 2020-04-23 14:21:15 +08:00
Him188
83f721c59a Cleanup 2020-04-23 14:20:55 +08:00
Him188
1b4e1475a0 Support ForwardMessage DSL 2020-04-23 14:17:24 +08:00
Him188
454205a6af Add ContactMessage.time 2020-04-23 11:52:44 +08:00
Him188
200a140f38 Fix forward message displaying on TIM PC 2020-04-22 22:15:02 +08:00
Him188
1786c95e07 Support merged forward messages! 2020-04-22 22:09:53 +08:00
Him188
d9135cb8a3 Fix #248 2020-04-22 19:57:38 +08:00
Him188
3545482034 Fix #253 2020-04-22 18:39:10 +08:00
Him188
66f4620292 Add MessageSource.internalId, support OfflineMessageSource building 2020-04-22 18:35:30 +08:00
Him188
a63af80668 Deprecate QQ 
Introduce `Friend` extending `User`
Introduce `User` acting as the superclass of `Friend` and `Member`

Add extensions `Member.asFriend`, etc.
Remove specialized `Contact.hashCode` and `Contact.equals`, inherit from `kotlin.Any`
Specify `toString` behavior in abstract `Contact` classes, instead of in implementation classes.

Add virtual member `Contact.sendMessage(String)`

Migrate the project from using `QQ` to `Friend`

Remove multiplatform Contact class structure, keep them common.

Remove extension `Long.at` in `GroupMessage`, `QQ.at` in `ContactMessage`.
Add `At.asMember()` in `GroupMessage`.

Make `calculateGroupUinByGroupCode`, `calculateGroupCodeByGroupUin` static on JVM.
 2020-04-22 16:08:04 +08:00
Him188
41f1c12c8a Fix build 2020-04-22 11:27:14 +08:00
Him188
c425a809ba Fix #245 2020-04-21 14:53:24 +08:00
Him188
96610b30e3 Support CustomMessage 2020-04-20 21:26:16 +08:00
Him188
0689f84bf8 Cleanup 2020-04-20 17:03:41 +08:00
Him188
405696d9ac Use sequenceId as MessageSource.id, await sequenceId on Group.sendMessage 2020-04-18 16:56:18 +08:00
Him188
c695f2cddf Fix #240 2020-04-18 14:53:32 +08:00
Him188
7f347feedd Deprecate openChannel 2020-04-17 21:36:39 +08:00
Him188
fa211cab5c Fix retry when no Internet connection 2020-04-17 21:36:29 +08:00
Him188
db8cb84c99 Rearrange implementations for MessageSource, implement recall state check 2020-04-17 14:19:32 +08:00
Him188
47a288c614 Fix #220 2020-04-17 10:40:39 +08:00
Him188
6d57f44e91 Optimize useless getters, fix #236 2020-04-17 09:29:29 +08:00
Him188
870ed59d97 Inherit kotlinx-coroutines dependency from ktor 2020-04-16 10:39:27 +08:00
Him188
2b2edeacb1 Support operator in GroupNameChangeEvent, optimize logs, close #217 2020-04-15 19:55:10 +08:00
Him188
991f46fe64 Introduce ServiceMessage, fix #229, fix #224 2020-04-15 19:14:59 +08:00
Him188
e1004f12c9 Fix #220 2020-04-15 18:29:17 +08:00
Him188
c6059ab9ec Add tests 2020-04-15 18:18:59 +08:00
Him188
f79d3f9aa0 Fix AtomicResizeCacheList 2020-04-15 17:55:54 +08:00
Him188
e1c1c35d70 Introduce AtomicResizeCacheList to reduce duplication, fix #225 2020-04-15 17:51:32 +08:00
Him188
b30c380637 Fix #226 2020-04-15 17:01:04 +08:00
Him188
90ee9b441a Rework reconnection, fixes #228 2020-04-15 16:46:39 +08:00
Him188
f1ac53f115 Cleanup 2020-04-15 10:47:11 +08:00
Him188
e31805a835 Add comments, preparing for #220, #229 2020-04-15 08:48:23 +08:00
Him188
6eb4423bfc Remove debugging loggers 2020-04-15 08:19:49 +08:00
Him188
26c81cb93b Fix longMessage 2020-04-13 20:44:17 +08:00
Him188
bb6cac3261 Cleanup 2020-04-13 20:18:57 +08:00
Him188
51a95da5db Fix build 2020-04-13 18:56:25 +08:00
Him188
f5a8420231 Speed up image uploading 2020-04-13 11:13:27 +08:00
Him188
fe764d1fa8 Increase buffer size for uploading image 2020-04-13 10:50:58 +08:00
Him188
2b95bea8da Unified logMessageReceived 2020-04-13 10:27:22 +08:00
Him188
67084129cd Ignore ClearCountMsg 2020-04-13 10:18:31 +08:00
Him188
c433360d87 Add exception logger 2020-04-12 20:19:36 +08:00
Him188
a0c1675abc Add default values 2020-04-12 19:54:16 +08:00
Him188
da801d7b6d Support server changing, close #52 2020-04-12 19:17:27 +08:00
Him188
e6ef03f60d Fix ConfigPush 2020-04-12 17:24:17 +08:00
Him188
e23f91bac1 Estimate length of originalMessage 2020-04-12 01:42:37 +08:00
Him188
d97aa7bd94 Unified MessageSource.toJceData 2020-04-12 01:41:27 +08:00
Him188
0f91587ae7 Fix nameCard deserializing 2020-04-11 22:29:54 +08:00
Him188
fdef3bdbdd Merge remote-tracking branch 'origin/master' 2020-04-11 21:25:52 +08:00
ryoii
cd0b27e63d Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/PbMessageSvc.kt
 2020-04-11 21:24:35 +08:00
ryoii
28108a36ae Fix temp message and friend message recall 2020-04-11 21:22:18 +08:00
Him188
b9a3675dad Support Group.quit, add BotLeaveEvent.Active 2020-04-11 20:15:23 +08:00
Him188
0f86ad0240 Cleanup 2020-04-11 19:11:55 +08:00
Him188
6b93129048 Add contextual exceptions 2020-04-11 19:03:15 +08:00
Him188
0dfea0698c Add sequence cache to filter duplicated events, fix #221 2020-04-11 18:47:40 +08:00
Him188
16d6c56202 Add soutv for debugging purposes 2020-04-11 18:24:52 +08:00
Him188
f3cf0004af Fix values 2020-04-11 16:07:37 +08:00
Him188
505943cb3d Handle SMS login 2020-04-11 16:06:21 +08:00
Him188
30303c0473 Fix unsigned values 2020-04-11 16:06:19 +08:00
Him188
3f1221699d Fix build 2020-04-10 23:43:59 +08:00
ryoii
847a073ac0 Merge remote-tracking branch 'origin/master' 2020-04-10 23:39:59 +08:00
ryoii
39f0ae7b24 Clear useless print 2020-04-10 23:39:42 +08:00
Him188
67856777f6 Merge remote-tracking branch 'origin/master' 2020-04-10 23:38:54 +08:00
Him188
125f53a72e Fix botPermission 2020-04-10 23:38:37 +08:00
Him188
4d52078c88 Remove unused class 2020-04-10 22:39:44 +08:00
Him188
458fe2ee94 Fix duplicated OnlinePush 2020-04-10 22:24:46 +08:00
Him188
b0bc0ec62b Rearrange files 2020-04-10 20:45:20 +08:00
Him188
7bb9052afd Add missing copyright 2020-04-10 20:40:50 +08:00
Him188
f11690472a Fix new member joining, close #172 2020-04-10 20:31:20 +08:00
Him188
d8a5291880 Fix new member 2020-04-10 20:29:17 +08:00
Him188
3c786cb042 Support MemberJoinEvent.Active, also fix #164 2020-04-10 20:21:51 +08:00
Him188
418fb43992 Returns botAsMember when Group.get(bot.id) 2020-04-10 19:40:34 +08:00
Him188
2c31a2ac2f Fix jce type 2020-04-10 19:35:00 +08:00
Him188
42e465af35 Fix jce type 2020-04-10 19:34:47 +08:00
Him188
4728ae26b7 Cleanup 2020-04-10 19:16:12 +08:00
Him188
1e1785f4d6 Add ForwardMessage, support decoding, fix LongMessage decoding 2020-04-10 19:16:06 +08:00
Him188
c65350e9cf Change friend list on FriendDeleteEvent 2020-04-10 19:02:38 +08:00
Him188
918ede1fa6 Add FriendDeleteEvent, FriendAddEvent, also fix #216 2020-04-10 18:56:26 +08:00
Him188
1ff84a4c91 Fix #212 2020-04-10 15:06:06 +08:00
Him188
94557a2a33 Reduce nesting depth, also fix #173 2020-04-10 14:50:33 +08:00
ryoii
98542546bc Merge remote-tracking branch 'origin/master' 2020-04-09 16:20:09 +08:00
ryoii
56c63723e8 Fix rich group name card, and support name card changed event. close #210 2020-04-09 16:17:14 +08:00
Him188
ec35eeba1c Simplify Bot structure 2020-04-09 16:14:48 +08:00
Him188
f28e50e0af Add fail-fast check 2020-04-09 16:00:53 +08:00
Him188
ee89f22c87 Fix kick 2020-04-09 15:56:45 +08:00
Him188
8f4313a337 Increase timeout, close #28 2020-04-09 12:27:34 +08:00
Him188
3a8b2dd6d2 Fix MessageSource.id from offline quotations 2020-04-09 09:38:30 +08:00
Him188
a604083e9a Fix naming issue 2020-04-09 08:55:17 +08:00
ryoii
2053ab198c Support TempMessage 2020-04-08 22:12:18 +08:00
Him188
5493bf39da Fix build 2020-04-08 14:43:30 +08:00
Him188
df9a5f7c0a Fix incorrect new contact handling 2020-04-08 14:37:33 +08:00
Him188
b4140b7871 Extract reloadFriendList() outside init() 2020-04-08 14:33:51 +08:00
Him188
6480e78b24 Handle ContactList syncing on new friend or member event. 2020-04-08 14:33:13 +08:00
Him188
afb093ba44 Fix massive concurrent loading 2020-04-08 13:50:48 +08:00
Him188
6a7ece1cb8 Fix LongMessage decodeing 2020-04-08 13:29:26 +08:00
Him188
faf8002de9 Fix massive group list loading 2020-04-08 13:25:20 +08:00
Him188
a69d6e2ecd cleanup 2020-04-08 10:43:13 +08:00
Him188
acd11b6eda Make protocol structure classes internal 2020-04-08 10:42:59 +08:00
Him188
62e6d3f473 Make OIDB structure classes internal 2020-04-08 10:38:56 +08:00
ryoii
b08b5bccf9 Internal struct class 2020-04-08 00:46:14 +08:00
ryoii
0463140b8b Fix bot as a member can't change group card itself 2020-04-07 23:58:18 +08:00
ryoii
eec820c1a7 Support for approving requests of adding friend and joining group, close #91 2020-04-07 21:14:34 +08:00
Him188
5c95ab299e Adjust timeout, add retry for several servers 2020-04-07 14:36:51 +08:00
Him188
7049cc4591 Simplify expression 2020-04-07 13:50:55 +08:00
Him188
fb19c0af36 Support MessageSource in MessageSource.originalMessage 2020-04-07 10:06:11 +08:00
Him188
6c25516143 Fix permission detection on recalling self-sent message 2020-04-07 09:23:05 +08:00
Him188
dc4b0cbe1e Implement Packet.NoLog 2020-04-07 09:01:17 +08:00
Him188
1b8626df13 Implement Packet.NoLog 2020-04-07 09:00:58 +08:00
Him188
b72589de24 Remove useless fast re-login 2020-04-06 20:57:51 +08:00
Him188
09dca31a6b Force message to be in single line 2020-04-06 20:54:37 +08:00
Him188
f6cc90a893 Unified message logs 2020-04-06 20:37:42 +08:00
Him188
560c46ede4 Unified message logs 2020-04-06 20:33:26 +08:00
Him188
165de9a85d Fix references 2020-04-06 19:14:12 +08:00
Him188
b8b749bf65 Completed CombinedMessage redesigning and constraining on concatenation 2020-04-06 18:04:41 +08:00
ryoii
fcf2f5c84c Fix message length estimate again, #195 2020-04-05 23:51:35 +08:00
Him188
7e6badb8db Use retryCatching in place of tryNTimes 2020-04-05 23:36:19 +08:00
Him188
c95efe98a3 Fix addSuppressedMirai on JVM 2020-04-05 23:09:12 +08:00
Him188
c6c404f167 Add missing files 2020-04-04 23:41:31 +08:00
Him188
864cde060e Fix #180 2020-04-04 23:22:52 +08:00
Him188
19bc7b80c5 Rename MessageSource.senderId to MessageSource.fromId 2020-04-04 22:38:08 +08:00
Him188
039b3d7517 Cleanup 2020-04-04 22:17:35 +08:00
Him188
2b49a7586f Reconstruct MessageSource, fix #197, #133 2020-04-04 22:08:53 +08:00
Him188
c3be191db0 Rearrange FlashImage, add more docs 2020-04-04 14:33:55 +08:00
Him188
3cc5cbfcfd Introduce BotIsBeingMutedException to replace IllegalStateException 2020-04-04 14:17:32 +08:00
Him188
e8b0c99006 Fix name 2020-04-04 13:54:11 +08:00
Him188
220e6d42f5 Fix message length estimate, close #195 2020-04-04 13:50:47 +08:00
ryoii
eac23171ec Support Bot.nick, closed #93 2020-04-04 09:47:34 +08:00
ryoii
5e553a56ca Filter repeated GroupNameChangeEvent 2020-04-04 07:02:38 +08:00
ryoii
2a7496c0b5 Fix groupCard charset encode, fixed #77 2020-04-04 06:11:19 +08:00
Him188
18c5911666 Cleanup 2020-04-03 10:32:44 +08:00
Him188
514084c46a Remove prints 2020-04-03 08:52:09 +08:00
Him188
b4f77454a1 Fix FlashImage constructing 2020-04-03 08:48:22 +08:00
Him188
985b0b4ba4 Make FlashImage constructable from mirai-core 2020-04-03 08:44:18 +08:00
ryoii
5cb93c9fa1 Support FlashImage 2020-04-03 03:11:14 +08:00
Him188
f8e0f27fc5 Fix reference 2020-04-02 21:20:36 +08:00
Him188
2f6ee0c4f7 Fix build 2020-04-02 21:05:36 +08:00
Him188
06092f0fc6 Move net.mamoe.mirai.qqandroid.io to net.mamoe.mirai.qqandroid.utils.io 2020-04-02 20:44:09 +08:00
Him188
32553fad2b Introduce ContactMessage to replace MessagePacket<*, *> 2020-04-02 20:27:16 +08:00
Him188
3773548983 Replace use of Bot.uin with Bot.id 2020-04-02 19:27:40 +08:00
Him188
d5868ed7c1 Add MessageTooLargeException to differentiate with mute exception 2020-04-02 18:28:19 +08:00
Him188
069753e9c2 Make chinese letter length estimating more safer 2020-04-02 18:12:04 +08:00
Him188
993faee554 Fix length estimate for the case Quote + Image 2020-04-02 16:16:09 +08:00
Him188
38748e0c10 Use Kotlin 1.3.71 2020-04-02 12:35:27 +08:00
Him188
97522bdf2a Rearrange internal APIs 2020-04-02 09:43:50 +08:00
Him188
6a09aff16d Minimize permission check procedure 2020-04-01 17:48:22 +08:00
Him188
717554ee7f Fix warnings 2020-03-31 15:09:29 +08:00
Him188
a520868994 Fix at 2020-03-31 15:03:27 +08:00
Him188
1f7bc4e50f Fix #178 2020-03-31 11:57:19 +08:00
Him188
8df45b4072 Remove _lowLevelSendLongGroupMessage, fix length counting 2020-03-30 16:01:30 +08:00
Him188
e3a8ae8d90 Fix longMessage size detect 2020-03-30 15:48:42 +08:00
Him188
f322af71d9 Make protocol classes internal 2020-03-30 14:45:24 +08:00
Him188
90b83afce7 Fix #165, use fast conversion, add tests 2020-03-30 14:31:27 +08:00
Him188
d3db5f1c62 Fix OnlinePush.RespPush, fix #83 2020-03-29 20:19:10 +08:00
Him188
b1f666e075 Fix build 2020-03-29 15:41:18 +08:00
Him188
92a57907ec Ignore old poke messages 2020-03-29 15:38:43 +08:00
Him188
52f8543597 Support poke message, close #132 2020-03-29 15:37:31 +08:00
Him188
2f063987a9 Fix #129 2020-03-29 14:28:32 +08:00
Him188
a6079f3eaf Support long message in general sendMessage 2020-03-29 13:56:11 +08:00
Him188
b6c24e008d Plan for redesigning of MessageSource 2020-03-29 13:34:54 +08:00
Him188
6d5b3086f6 Improve performance 2020-03-29 13:17:34 +08:00
Him188
181ab6e382 Improve performance 2020-03-29 13:06:54 +08:00
Him188
8d2e818454 Specify maximum requirements 2020-03-29 12:45:41 +08:00
Him188
90ef83e345 Move protocol-specific classes to mirai-core-qqandroid 2020-03-29 02:46:38 +08:00
Him188
7efb7834db Remove senseless response 2020-03-29 02:34:55 +08:00
Him188
e7a691dc4c Adjust name 2020-03-29 02:33:37 +08:00
Him188
a7e9b151e4 Support long messages 2020-03-29 02:26:59 +08:00
Him188
8f2843cbfa Handle mute result as an IllegalStateException 2020-03-28 14:16:39 +08:00
Him188
8d7e984b1c Remove useless files 2020-03-27 22:19:14 +08:00
Him188
3f523e6f77 Long message 2020-03-27 13:27:34 +08:00
Him188
c3f01f9027
Configure Shadow publish (#160) 
* Test shadow

* Add print stacktrace

* Add more ways to find githubToken

* Error when failed to upload

* Try github token

* Use mamoe token

* Use header

* Rubbish actions

* Fix `GroupImpl.getGroupByUin`

* Triage shadow task on release
 2020-03-25 16:16:21 +08:00
Him188
d5489737a7 Fix version 2020-03-24 17:32:22 +08:00
Him188
3ba1ae4a5c Adjust visibilities 2020-03-24 16:10:39 +08:00
Him188
5dc0475a73 Misc improvements 2020-03-24 15:45:49 +08:00
Him188
83793d3f7e Extract implementations of Contacts to separate files; correct package name 2020-03-24 15:41:26 +08:00
Him188
8eb597470f Extract group settings to interface GroupSettings 2020-03-24 15:35:03 +08:00
Him188
a9972dc030 Reduce code redundancy 2020-03-24 15:28:24 +08:00
Him188
ed46780983 Clear all deprecated functions which are for binary compatibility 2020-03-24 15:24:06 +08:00
Him188
eb7afb6cff Update to Kotlin 1.4-M1 2020-03-24 10:01:03 +08:00
Him188
fccb69bb3f Remove all unnecessary java-friendly JvmName magics 2020-03-23 20:05:17 +08:00
Him188
85840cc4ca Fix build 2020-03-22 23:54:53 +08:00
Him188
91e589c8a1 Fix build 2020-03-22 23:46:07 +08:00
Him188
c1e7b55910 Fix build 2020-03-22 23:44:26 +08:00
Him188
f9a296331d Binary compatibility 2020-03-22 23:42:46 +08:00
Him188
8e37cdbf93 Ensure references is released after Job cancelling 2020-03-22 15:57:43 +08:00
Him188
53fdcd41f7 Change sendMessage(MessageChain) to sendMessage(Message) 2020-03-22 14:16:31 +08:00
Him188
7820b43f6a Review: ensure reentrant, rearrange coroutine job management 2020-03-22 13:36:22 +08:00
Him188
d5c2c19c53 Rearrange tests 2020-03-21 14:15:13 +08:00
Him188
3e6c7bc691 Handle StatSvc.ReqMSFOffline, fix #150 2020-03-21 14:01:00 +08:00
Him188
40f157978f No more data class for ProtoBuf and JceStruct 2020-03-21 13:48:39 +08:00
Him188
1b152b28fb Remove shadowJar plugin 2020-03-19 15:15:15 +08:00
Him188
948658c9ec Fix shadowed struct elements 2020-03-19 14:52:59 +08:00
Him188
56c2331d10 Add new elements 2020-03-19 14:08:38 +08:00
Him188
320bb1b76f Fix deserializing 2020-03-19 14:05:32 +08:00
Him188
f48e27d743 Fix map skipping, close #145 2020-03-19 11:15:11 +08:00
Him188
702d8d9fa9 Fix optional element detecting 2020-03-19 11:07:53 +08:00
Him188
f068033400 Add test for skipping map 2020-03-19 11:07:18 +08:00
Him188
79bb9e7dc9 Add detailed error message 2020-03-17 21:46:15 +08:00
luo123
69d5bbd7fa group active data 2020-03-17 02:49:04 -05:00
Him188
eb02c28e3b Simplify with fold 2020-03-17 12:57:14 +08:00
luo123
9ff791e550 a little change 2020-03-14 11:43:43 +08:00
luo123
6973488db7 move to lowLevelApi.kt 2020-03-14 11:01:21 +08:00
luo123
4e7b3b0048 delete announcement 2020-03-14 00:45:36 +08:00
luo123
e57215a603 send announcement 2020-03-14 00:07:52 +08:00
luo123
aa61e9441a get GroupAnnouncementList is working now 2020-03-13 22:33:11 +08:00
luo123
220d293b7a get group announce list 2020-03-13 21:06:57 +08:00
Him188
0126e4ce67 Apply shadow plugin for future use 2020-03-08 22:25:00 +08:00
Him188
f2608d6956 Merge remote-tracking branch 'origin/master' 2020-03-08 22:22:26 +08:00
Him188
e51cf7ee71 Remove debugging logs 2020-03-08 22:16:04 +08:00
Him188
a64c061377 Support LightApp message 2020-03-08 22:14:59 +08:00
Him188
584b5e9822 xml and Json messages support 2020-03-08 22:05:08 +08:00
Him188
243b2ea731 Gather all platform-specified utilities into a MiraiPlatformUtils 2020-03-08 21:14:41 +08:00
Him188
a8a0d583ab Merge remote-tracking branch 'origin/master' 2020-03-08 20:15:14 +08:00
Him188
cf6b64ef0d Solve TODO 2020-03-08 18:45:23 +08:00
Him188
c69cb6f3de Fix Map entry tags, remove debugging logs 2020-03-08 17:44:34 +08:00
Him188
ce7af37ef4 Migrate to new Jce serializer 2020-03-08 17:13:33 +08:00
Him188
2acca0c2e6 Jce complex nesting support 2020-03-08 16:34:38 +08:00
Him188
e375d17f82 Support maps and nesting 2020-03-08 16:02:11 +08:00
Him188
7c3a2d8e13 Merge remote-tracking branch 'origin/master' 2020-03-08 14:12:29 +08:00
Him188
17b34b9d10 Simplify group quote 2020-03-08 13:27:23 +08:00
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