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
1,834 Commits 68 Branches 330 Tags 107 MiB
802ab47b19
Commit Graph

413 Commits

Author SHA1 Message Date
Him188
73e4dd7914 Add bot ref 2020-02-04 10:30:32 +08:00
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