Commit Graph

512 Commits

Author SHA1 Message Date
Him188
6a605156e5 Error catching 2020-02-04 08:40:57 +08:00
Him188
a85b763f4e Fix group message 2020-02-04 08:34:39 +08:00
Him188
c89076b4b9 Merge remote-tracking branch 'origin/master' 2020-02-03 23:03:44 +08:00
Him188
9c15287305 Fix missing file 2020-02-03 23:03:30 +08:00
jiahua.liu
a776b25b27 Merge remote-tracking branch 'origin/master' 2020-02-03 22:00:27 +08:00
jiahua.liu
df24d101bc Troop management - Mute member 2020-02-03 22:00:14 +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
3d8c60cbd4 Troop management 2020-02-03 17:11:36 +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
8e54e71661 Fix group message 2020-02-03 16:58:23 +08:00
Him188
dc940ee0cc CustomFace support 2020-02-03 16:31:35 +08:00
Him188
c13109cf5b Merge remote-tracking branch 'origin/master' 2020-02-03 15:57:34 +08:00
Him188
c429a7cf3a Fix decrypt 2020-02-03 15:57:15 +08:00
jiahua.liu
584cdd7d6e to merge 2020-02-03 15:21:03 +08:00
jiahua.liu
455f408ece Merge remote-tracking branch 'origin/master' 2020-02-03 14:54:57 +08:00
jiahua.liu
f63a077e21 to merge 2020-02-03 14:54:13 +08:00
Him188
e2dd51e075 No add in getFriend 2020-02-03 14:52:40 +08:00
Him188
ce7c9f8c82 Remove getQQOrAdd 2020-02-03 14:51:23 +08:00
Him188
d3d7e530a9 Rename getQQ to getFriend Add deprecation message 2020-02-03 14:25:19 +08:00
Him188
102da76a32 Async friendlist 2020-02-03 13:30:06 +08:00
Him188
8c69eefcde Use groupCode as primary key 2020-02-03 02:45:40 +08:00
Him188
d9e5805255 Improve performance 2020-02-03 01:59:41 +08:00
jiahua.liu
32e8e21b87 Group/Friend List finally complete 2020-02-03 01:34:17 +08:00
jiahua.liu
0f587cadc5 Group Permissions 2020-02-03 01:03:20 +08:00
jiahua.liu
826331c5b7 group UIN and Group code 2020-02-03 00:55:35 +08:00
jiahua.liu
ccdeaba817 change ID to Groupcode for logging 2020-02-03 00:49:44 +08:00
jiahua.liu
9ebd716823 fix group related 2020-02-03 00:47:23 +08:00
jiahua.liu
6b698ef4d4 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/ContactImpl.kt
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt
2020-02-03 00:17:22 +08:00
jiahua.liu
4081c1b850 List complete 2020-02-03 00:15:27 +08:00
jiahua.liu
bfdcee1a1c List complete 2020-02-03 00:15:09 +08:00
Him188
5d46d1c4be C2C message send support 2020-02-02 23:21:42 +08:00
Him188
6ac9acc640 Rewrite image 2020-02-02 23:21:26 +08:00
Him188
bc860a2d0d Merge remote-tracking branch 'origin/master'
# Conflicts:
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/list/FriendListPacket.kt
2020-02-02 21:02:56 +08:00
Him188
73d1a3d4d2 Merge remote-tracking branch 'origin/master' 2020-02-02 21:02:06 +08:00
jiahua.liu
f949175ee3 to merge 2020-02-02 21:01:44 +08:00
Him188
36ef9c2890 Fix fucking length 2020-02-02 21:01:30 +08:00
jiahua.liu
0d4850591c Troop Member List 2020-02-02 20:11:41 +08:00
jiahua.liu
7de51f995c Merge remote-tracking branch 'origin/master' 2020-02-02 18:10:53 +08:00
jiahua.liu
05eb88e556 Troop List complete 2020-02-02 18:10:35 +08:00
Him188
b38f82523f Fix expcetion when length=0 2020-02-02 18:04:19 +08:00
Him188
0c6526afb8 Fix friendlist 2020-02-02 17:35:42 +08:00
Him188
bfcd265016 Merge remote-tracking branch 'origin/master' 2020-02-02 16:43:15 +08:00
Him188
26e9f893d7 Atomic packet parser 2020-02-02 16:43:03 +08:00
jiahua.liu
ae9d2bca10 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt
2020-02-02 16:16:04 +08:00
jiahua.liu
4ae589bb47 Troop List complete 2020-02-02 16:14:35 +08:00
Him188
63a4d5f3b9 New PacketFactory structure 2020-02-02 16:02:17 +08:00
Him188
26c86129c6 Less retry for friendlist 2020-02-02 00:55:14 +08:00
Him188
54e494f2a5 Remove print 2020-02-02 00:49:15 +08:00
Him188
f1b7803145 Merge remote-tracking branch 'origin/master' 2020-02-02 00:47:58 +08:00
Him188
a30fab106c Fix trooplist 2020-02-02 00:47:35 +08:00
jiahua.liu
3cbd26e263 Merge remote-tracking branch 'origin/master' 2020-02-02 00:45:51 +08:00
jiahua.liu
897ec10656 to merge 2020-02-02 00:45:25 +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
424c9bb2af Friend List Complete 2020-02-01 23:11:17 +08:00
jiahua.liu
722422d460 Friend List Complete 2020-02-01 21:39:25 +08:00
jiahua.liu
a404717143 Friend List Complete 2020-02-01 21:34:10 +08:00
jiahua.liu
a849119fe5 Friend List Complete 2020-02-01 21:29:15 +08:00
jiahua.liu
579e349676 Friend List Complete 2020-02-01 20:54:52 +08:00
Him188
adec995ded Merge remote-tracking branch 'origin/master' 2020-02-01 20:30:42 +08:00
Him188
bdcff30c23 Fix packet resend 2020-02-01 20:26:09 +08:00
jiahua.liu
bd6388297d Merge remote-tracking branch 'origin/master'
# Conflicts:
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt
2020-02-01 20:19:13 +08:00
Him188
b515ec6fb9 Remove testing code 2020-02-01 20:08:21 +08:00
jiahua.liu
be8ab11f36 Friend List Complete 2020-02-01 19:46:39 +08:00
Him188
df56c86fca Fix build 2020-02-01 00:58:23 +08:00
Him188
aa0bf81af1 Add init retry 2020-01-31 23:33:03 +08:00
Him188
4c1b25d4bb Remove print 2020-01-31 23:14:46 +08:00
Him188
6ef78118ad Fix bugs 2020-01-31 23:10:31 +08:00
jiahua.liu
be7c53767e Merge remote-tracking branch 'origin/master' 2020-01-31 22:04:37 +08:00
jiahua.liu
221a4fe931 Friend List Complete 2020-01-31 22:04:18 +08:00
Him188
f9cf47a19a Bot factory 2020-01-31 21:49:48 +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
jiahua.liu
192a83de0c troop List 2020-01-31 21:17:53 +08:00
Him188
f85a6cd5a7 Add fast-fail on packet loss 2020-01-31 20:13:09 +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
b85c91b25d Fix build 2020-01-31 17:52:28 +08:00
Him188
85b72ac4b8 Remove println 2020-01-31 17:48:48 +08:00
Him188
26b9aa10e4 Jce head fix 2020-01-31 17:47:30 +08:00
Him188
e41c9231e1 Add intro 2020-01-31 15:06:23 +08:00
Him188
538c2b9791 Adjust accessibility 2020-01-31 15:05:24 +08:00
Him188
44a95792dd Remove print 2020-01-31 02:08:21 +08:00
Him188
359be12356 SEND IMAGE SUPPORT 2020-01-31 02:01:00 +08:00
Him188
06224aa10a Fix channel close 2020-01-31 01:43:31 +08:00
Him188
dc0df986ba Fix sync cookie 2020-01-31 01:34:52 +08:00
Him188
18cf5621d0 Fix override 2020-01-30 23:54:58 +08:00
Him188
fb3fe2bcca Improve login and init 2020-01-30 23:53:28 +08:00
Him188
288d0df738 Image support 2020-01-30 23:51:25 +08:00
Him188
08783fe2b2 Improve login procedure 2020-01-30 23:51:12 +08:00
Him188
f1890783bd Switch on logger while debugging 2020-01-30 23:50:18 +08:00
Him188
8451fabe5d Add response check 2020-01-30 23:49:43 +08:00
jiahua.liu
745cb7484d Merge remote-tracking branch 'origin/master' 2020-01-30 23:43:32 +08:00
jiahua.liu
7d1a6ef871 troop List 2020-01-30 23:43:18 +08:00
Him188
592d328ece Make internal 2020-01-30 23:34:37 +08:00
Him188
e6be82fac8 Mark with dangerous 2020-01-30 23:34:24 +08:00
Him188
d7ac5fa1b0 Add atomic message sequence id 2020-01-30 23:34:10 +08:00
Him188
f0d8bbcc28 Fix packetListener removal 2020-01-30 23:33:44 +08:00
Him188
432a8690b1 Fix structure end reading 2020-01-30 23:00:09 +08:00
Him188
db7d0e8372 Remove print 2020-01-30 22:43:34 +08:00
Him188
afa2cc700f Fix deserializing nested struct in map 2020-01-30 22:41:26 +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
Him188
d3557c92a7 Merge remote-tracking branch 'origin/master' 2020-01-30 21:11:38 +08:00
Him188
c378dcb0f4 Add length param 2020-01-30 21:11:17 +08:00
jiahua.liu
6fff5b2757 Merge remote-tracking branch 'origin/master' 2020-01-30 20:49:32 +08:00
jiahua.liu
a8551fd349 friendlist resp 2020-01-30 20:49:20 +08:00
Him188
db4954bae1 Make public 2020-01-30 20:48:22 +08:00
Him188
b93b6d1923 Merge remote-tracking branch 'origin/master' 2020-01-30 20:40:13 +08:00
Him188
0ca7c4bc10 Fix import 2020-01-30 20:39:58 +08:00
jiahua.liu
b9eacbcf1a Merge remote-tracking branch 'origin/master' 2020-01-30 20:39:42 +08:00
jiahua.liu
ef9938a025 friendlist resp 2020-01-30 20:39:19 +08:00
Him188
b28a786ea8 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt
2020-01-30 20:37:41 +08:00
Him188
c49406c2ce Avoid leaking 2020-01-30 20:35:13 +08:00
Him188
6e22272adf Use delegate 2020-01-30 20:30:04 +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
392c2fd730 Move files 2020-01-30 19:17:22 +08:00
Him188
d561568eee Remove unnecessary parts 2020-01-30 19:17:12 +08:00
Him188
a2d652b50f Fix FriendListPacket 2020-01-30 18:49:20 +08:00
Him188
efb662a978 Generator for directory 2020-01-30 18:49:06 +08:00
Him188
dc9551abbf Remove println 2020-01-30 18:48:46 +08:00
Him188
683396ecb1 Add toString 2020-01-30 18:28:04 +08:00
Him188
1924c59f55 Fix FriendListPacket.kt 2020-01-30 18:24:57 +08:00
Him188
8ae506223c Fix build 2020-01-30 17:44:50 +08:00
Him188
5398e3796a Merge remote-tracking branch 'origin/master' 2020-01-30 17:19:04 +08:00
Him188
3a11adf1c0 Jce null support 2020-01-30 17:18:49 +08:00
jiahua.liu
421365cd8b friend list packet 2020-01-30 16:12:23 +08:00
jiahua.liu
e891073433 Merge remote-tracking branch 'origin/master' 2020-01-30 15:49:36 +08:00
jiahua.liu
a850b33d8e friend list packet 2020-01-30 15:45:52 +08:00
Him188
b9e9c00748 Rename Register to StatSvc 2020-01-30 14:55:34 +08:00
jiahua.liu
444dd45921 friend list packet 2020-01-30 14:54:56 +08:00
jiahua.liu
034de9f17a friend list packet 2020-01-30 14:39:56 +08:00
jiahua.liu
c7950560cd merge loginPacket 2020-01-30 13:26:34 +08:00
jiahua.liu
3ae1832ac1 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/login/LoginPacket.kt
2020-01-30 13:25:53 +08:00
jiahua.liu
92b7b10f0e network handler update 2020-01-30 13:23:58 +08:00
Him188
41a94f9dd2 Cleanup 2020-01-30 02:27:07 +08:00
Him188
7e51a9daf1 Fix build 2020-01-30 02:20:42 +08:00
Him188
6b432b2aa6 ProtoBufWithNullableSupport 2020-01-30 01:34:23 +08:00
Him188
dd7fb68b1c Move packets 2020-01-30 00:40:16 +08:00
Him188
27dbfcfb39 Move packets 2020-01-30 00:35:39 +08:00
Him188
a120f3d44d Remove getPhoneNumber 2020-01-29 23:54:52 +08:00
Him188
905823b94b Slider captcha solver 2020-01-29 23:53:18 +08:00
Him188
817f3b02a1 Name device as mirai 2020-01-29 23:53:01 +08:00
jiahua.liu
32f5eb1966 设备锁 2020-01-29 23:26:05 +08:00
jiahua.liu
7bc63b7e9a Merge remote-tracking branch 'origin/master'
# Conflicts:
#	mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/cryptor/ECDH.kt
2020-01-29 23:07:59 +08:00
jiahua.liu
231def49fc SubCommand20 2020-01-29 23:07:40 +08:00
Him188
4c79081b12 Enhance c2s 2020-01-29 23:07:16 +08:00
Him188
27f52e6b07 Uint type 2020-01-29 21:58:43 +08:00
Him188
a5995007eb Enhance debugger tools 2020-01-29 21:53:49 +08:00
jiahua.liu
aefe39eaf4 Merge branch 'master' of https://github.com/mamoe/mirai 2020-01-29 21:53:01 +08:00
jiahua.liu
c094aba06e loginpacket correction 2020-01-29 21:52:41 +08:00
Him188
fb1b37520b Enhance debugger tools 2020-01-29 21:52:22 +08:00
Him188
47e02cd2f1 Fix build 2020-01-29 21:06:31 +08:00
jiahua.liu
d28b37bbca Merge remote-tracking branch 'origin/master'
# Conflicts:
#	mirai-core-qqandroid/src/jvmTest/kotlin/androidPacketTests/serverToClient.kt
2020-01-29 20:48:41 +08:00
jiahua.liu
9516c30862 loginpacket correction 2020-01-29 20:47:51 +08:00
Him188
21187a0a34 Fix build 2020-01-29 20:41:16 +08:00
Him188
aca71d0c96 Fix build 2020-01-29 20:37:45 +08:00
Him188
ac52cbb47e Do fix 2020-01-29 20:30:20 +08:00
jiahua.liu
625d48f3a5 Merge remote-tracking branch 'origin/master' 2020-01-29 20:19:08 +08:00
jiahua.liu
171bbfc861 loginpacket correction 2020-01-29 20:18:52 +08:00
jiahua.liu
7b12a541a2 loginpacket correction 2020-01-29 20:18:27 +08:00
jiahua.liu
b2542cd6bf Merge remote-tracking branch 'origin/master'
# Conflicts:
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/data/MsgSvc.kt
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/MessageSvc.PushNotify.kt
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/login/LoginPacket.kt
#	mirai-core-qqandroid/src/jvmTest/kotlin/androidPacketTests/clientToServer.kt
2020-01-29 20:17:20 +08:00
Him188
7d06b49839 Add C2cMessageSyncData 2020-01-29 20:16:10 +08:00
jiahua.liu
01c478e4f5 MsgSvc data packets 2020-01-29 20:13:33 +08:00
Him188
6a8e6b93a0 zip support 2020-01-29 19:54:09 +08:00
Him188
b50f3e4d16 Advance info 2020-01-29 19:54:01 +08:00
Him188
f3ec99e560 Annotate BotAccount.id with @RawAccountIdUse 2020-01-29 19:26:30 +08:00
Him188
18b25b90b8 Add comments 2020-01-29 19:21:08 +08:00
Him188
b3c6787e0a Introduce MultiPacket 2020-01-29 19:18:52 +08:00
Him188
8fb20f4f63 Correct classname 2020-01-29 19:17:40 +08:00
Him188
42bd8face7 Introduce typealias TlvMap = MutableMap<Int, ByteArray> 2020-01-29 19:17:13 +08:00
Him188
c0d6e906fa Client to client message support 2020-01-29 19:15:09 +08:00
Him188
7dc23b5fbe Add BytePacketBuilder.writeProtoBuf 2020-01-29 19:14:26 +08:00
Him188
37788bcbca Rearrange declarations 2020-01-29 19:14:07 +08:00
Him188
c17c736054 Generify packet consumer 2020-01-29 16:27:04 +08:00
Him188
849519afc6 Fix var name 2020-01-29 16:26:41 +08:00
Him188
1c285b1cb8 ProtoBuf utilities 2020-01-29 16:26:25 +08:00
Him188
2f2a8666b9 Add docs 2020-01-29 15:46:05 +08:00
Him188
e2f59416f0 Testing tools 2020-01-29 13:48:49 +08:00
Him188
964c236ddf Testing tools 2020-01-29 13:44:34 +08:00
Him188
3d49f3b58a Testing tools 2020-01-29 13:38:19 +08:00
Him188
e131774956 Testing tools 2020-01-29 13:37:07 +08:00
Him188
5425ea77cc Correct ProtoBuf package 2020-01-29 13:36:48 +08:00
Him188
a03d30c558 Remove redundant call 2020-01-28 21:57:20 +08:00
Him188
43ee2553a7 Remove redundant print 2020-01-28 21:55:31 +08:00
Him188
4ac84cf1c9 Merge remote-tracking branch 'origin/master' 2020-01-28 21:48:24 +08:00
Him188
a68dec9749 Add : ProtoBuf 2020-01-28 21:48:11 +08:00
jiahua.liu
933eb1c2d4 MsgSvc data packets 2020-01-28 21:43:23 +08:00
Him188
f8e7d3ac7b Fix test 2020-01-28 21:11:01 +08:00
Him188
e7ea19682a Fix test 2020-01-28 21:10:14 +08:00
Him188
2f9d104f88 Jce Serialization optional elements support 2020-01-28 20:37:02 +08:00
Him188
d47bd11df5 Enable NewInference 2020-01-28 18:33:44 +08:00
jiahua.liu
1c96bb081a Merge remote-tracking branch 'origin/master' 2020-01-28 17:30:34 +08:00
jiahua.liu
e71cb76579 GetFriendList 2020-01-28 17:28:24 +08:00
Him188
94502d446b JceStruct serialization: optional elements support 2020-01-28 17:27:28 +08:00
Him188
2e80d33048 JceStruct serialization 2020-01-28 17:11:01 +08:00
jiahua.liu
23e6ce4e23 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/login/Register.kt
2020-01-28 14:00:29 +08:00