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

579 Commits

Author SHA1 Message Date
Him188
24fe8e848e Add toString 2020-02-10 16:44:08 +08:00
Him188
fda2040de9 Update docs 2020-02-10 16:01:59 +08:00
Him188
ec82232aa3 Cleanup 2020-02-10 13:54:21 +08:00
Him188
2d9be2542b Remove unnecessary object 2020-02-10 13:14:11 +08:00
Him188
b479a213bc Add heartbeat 2020-02-10 13:12:59 +08:00
Him188
7a47f58429 Rename LoginPacket to WtLogin.Login 2020-02-10 13:11:41 +08:00
Him188
94570ec447 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/MessageSvc.kt
 2020-02-09 23:22:10 +08:00
Him188
e116224180 Move DeviceInfo 2020-02-09 23:20:29 +08:00
Him188
23adcf6d4a Quote reply support 2020-02-09 23:20:12 +08:00
jiahua.liu
3ce04ddd67 Merge remote-tracking branch 'origin/master' 2020-02-09 16:00:24 +08:00
jiahua.liu
f4810e1f23 MemberList change 2020-02-09 15:59:58 +08:00
Him188
cf7e325259 Add copyright 2020-02-09 01:01:36 +08:00
jiahua.liu
f0de474aaa MemberList change 2020-02-09 00:11:50 +08:00
jiahua.liu
23954c475d online push 2020-02-08 23:49:57 +08:00
jiahua.liu
571b4c4162 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/OnlinePush.kt
 2020-02-08 21:44:24 +08:00
jiahua.liu
2061683d72 online push 2020-02-08 21:43:29 +08:00
jiahua.liu
6e6c1d813d OnlinePushPack JCEs 2020-02-08 20:57:31 +08:00
Him188
96554f2c95 Remove bad heartbeat 2020-02-08 16:59:24 +08:00
Him188
02b4f10e0a Merge remote-tracking branch 'origin/master' 2020-02-08 16:04:20 +08:00
Him188
ee3f08f722 Move MessageQQA.kt to message 2020-02-08 16:04:06 +08:00
Him188
ad2e1e243e Less log 2020-02-08 16:03:43 +08:00
jiahua.liu
f18007f650 OnlinePushPack JCEs 2020-02-08 15:04:05 +08:00
jiahua.liu
b99725853f Merge remote-tracking branch 'origin/master' 2020-02-08 14:51:57 +08:00
jiahua.liu
b4dc91f21b Group Listener 2020-02-08 14:51:45 +08:00
Him188
ce3ba66d34 Faster init: saved 200ms for each load 2020-02-08 01:17:44 +08:00
Him188
44cdbf8a94 Simplify structure, improve performance 2020-02-08 01:17:14 +08:00
Him188
f891ff02f7 Merge remote-tracking branch 'origin/master' 2020-02-08 00:37:21 +08:00
Him188
6d2a360780 Add heartbeat 2020-02-08 00:36:58 +08:00
jiahua.liu
96c3e775b3 Merge remote-tracking branch 'origin/master' 2020-02-08 00:14:50 +08:00
jiahua.liu
9d9089dd98 Group Listener 2020-02-08 00:14:11 +08:00
Him188
13d6bd29d4 Fix build 2020-02-07 23:35:07 +08:00
Him188
68d86a924f Introduce _ vars 2020-02-07 23:18:32 +08:00
Him188
ca43cf689c Remove data modifier 2020-02-07 23:18:12 +08:00
Him188
2e3e7bee2b Fix ambiguous function name 2020-02-07 23:18:01 +08:00
Him188
b3eabcdcbb Merge remote-tracking branch 'origin/master' 2020-02-07 21:55:00 +08:00
jiahua.liu
1302951b58 to get mute all 2020-02-07 21:53:36 +08:00
Him188
a8aded9bf9 Fix error message 2020-02-07 21:41:08 +08:00
jiahua.liu
13aa04e685 to get mute all 2020-02-07 21:33:35 +08:00
jiahua.liu
a058323e4d to get mute all 2020-02-07 21:32:32 +08:00
jiahua.liu
009f11ea0b Merge remote-tracking branch 'origin/master' 2020-02-07 21:25:51 +08:00
jiahua.liu
5e0048bfe2 Kick 2020-02-07 21:25:35 +08:00
Him188
a66c71dd8d Friend image upload done 2020-02-07 21:09:35 +08:00
Him188
867b2c8911 Merge remote-tracking branch 'origin/master' 2020-02-07 20:35:28 +08:00
Him188
e7bff90536 Add OnlinePush.ReqPush 2020-02-07 20:35:10 +08:00
jiahua.liu
8de1fe9150 Merge remote-tracking branch 'origin/master' 2020-02-07 20:32:09 +08:00
jiahua.liu
c92e385839 Kick Member.kt 2020-02-07 20:31:50 +08:00
Him188
13b72b312c Friend image upload 2020-02-07 18:43:24 +08:00
Him188
96d6268adb Explicit expect function 2020-02-07 16:59:30 +08:00
Him188
4b162c546c Small fixes 2020-02-07 16:57:00 +08:00
Him188
98669ca121 Add tips 2020-02-07 14:20:37 +08:00
Him188
abfa13c29b Add permission check 2020-02-07 14:18:25 +08:00
Him188
fa515ed3b9 Specify classname for toString 2020-02-07 14:11:09 +08:00
Him188
6c0694c732 Fix coroutineScope 2020-02-07 14:10:37 +08:00
jiahua.liu
ba352a9869 fix launch issue 2020-02-07 13:51:55 +08:00
Him188
c50c4365ac Override equals, hashcode and toString 2020-02-07 13:13:05 +08:00
Him188
4ae0eecd4d Add fast-fail check 2020-02-07 12:46:34 +08:00
Him188
4b9795da38 Add comment 2020-02-07 12:46:22 +08:00
Him188
80078ab25e Print imports 2020-02-07 12:32:27 +08:00
Him188
0f57613319 Friend image query support 2020-02-07 12:32:04 +08:00
Him188
8dddf2a24c Move ImageRequest 2020-02-07 12:31:43 +08:00
Him188
f7092976f1 Ignore offline messages 2020-02-07 12:31:20 +08:00
Him188
f634a5282f Add HighwayHelper 2020-02-07 12:30:59 +08:00
Him188
abfc40096a Adjust class package 2020-02-07 11:04:40 +08:00
Him188
b53bbdf513 Fix JceStruct read 2020-02-07 11:04:16 +08:00
Him188
f75116a246 Fix #28 2020-02-07 10:46:09 +08:00
Him188
4d2510d0e7 Replace "\r" with "" 2020-02-07 10:18:33 +08:00
Him188
802ab47b19 Fix #40 2020-02-07 10:15:48 +08:00
Him188
10c377e891 Fix build.gradle 2020-02-07 10:11:47 +08:00
Him188
5f4c3882cf Group image support 2020-02-07 10:11:39 +08:00
Him188
1b3065a44c Replace "\n" as """\n""" for log 2020-02-07 09:01:28 +08:00
Him188
6d0972dd54 Fix compilation dependency 2020-02-07 08:44:47 +08:00
Him188
d2b6f11993 Specify lambda param 2020-02-06 16:04:23 +08:00
Him188
27a44f08ff Ignore messages when offline 2020-02-06 16:04:13 +08:00
Him188
79426f3bb0 Add coroutineScope 2020-02-06 15:46:20 +08:00
Him188
224b8058e8 Rename st to St 2020-02-06 15:42:29 +08:00
Him188
388e1a5b7f Cleanup 2020-02-06 13:58:57 +08:00
Him188
7973858bd7 Add docs 2020-02-06 12:43:37 +08:00
Him188
52dc100b19 Add docs 2020-02-06 11:33:49 +08:00
jiahua.liu
e43a5176e0 edit group name supported 2020-02-05 23:34:26 +08:00
jiahua.liu
385f71e2ee Merge remote-tracking branch 'origin/master' 2020-02-05 22:56:03 +08:00
jiahua.liu
da2e09855b special title 2020-02-05 22:55:49 +08:00
Him188
1fc0ee59cb Add names 2020-02-05 21:52:50 +08:00
jiahua.liu
a9502957ad Merge remote-tracking branch 'origin/master' 2020-02-05 21:31:45 +08:00
jiahua.liu
6f67edfdfa GetGroupOperationInfo 2020-02-05 21:31:22 +08:00
Him188
37745b839e Add docs 2020-02-05 10:40:10 +08:00
Him188
69f1ee2cf2 Add equals 2020-02-05 09:03:10 +08:00
jiahua.liu
ff1c075f24 Group management Update 2020-02-05 00:45:29 +08:00
jiahua.liu
ad71076620 Merge remote-tracking branch 'origin/master' 2020-02-04 23:54:36 +08:00
jiahua.liu
5c04ba445c Group management Update 2020-02-04 23:54:21 +08:00
Him188
1ae688a03d Fix build 2020-02-04 19:01:00 +08:00
Him188
346f7e53fa Make MsgInfo.lFromUin and MsgInfo.uMsgTime nullable 2020-02-04 18:52:37 +08:00
Him188
8df1cfff55 Cleanup 2020-02-04 18:52:09 +08:00
jiahua.liu
30d41f6e9d Merge remote-tracking branch 'origin/master' 2020-02-04 17:23:26 +08:00
jiahua.liu
27ea93c8b0 Update Readme-CHN 2020-02-04 17:23:08 +08:00
Him188
f244a12b8b Fix image 2020-02-04 17:11:57 +08:00
jiahua.liu
88aba06dec Group Card 2020-02-04 16:16:06 +08:00
jiahua.liu
35742632b3 Group Card 2020-02-04 15:56:43 +08:00
jiahua.liu
5daf97015a Image Provider 2020-02-04 15:37:09 +08:00
jiahua.liu
44585d2df6 Merge remote-tracking branch 'origin/master' 2020-02-04 14:30:24 +08:00
jiahua.liu
39c32c7cb9 Bot Permission 2020-02-04 14:30:12 +08:00
Him188
42221c5d27 Remove isOnline 2020-02-04 12:09:00 +08:00
Him188
0c89e16c0a Remove debug print 2020-02-04 12:08:53 +08:00
Him188
59a70a59c8 Merge remote-tracking branch 'origin/master' 2020-02-04 12:04:50 +08:00
Him188
17455a3dce Add log 2020-02-04 12:04:34 +08:00
jiahua.liu
0bca1d193a Merge remote-tracking branch 'origin/master' 2020-02-04 12:04:08 +08:00
jiahua.liu
2805a14e25 to merge 2020-02-04 12:03:53 +08:00
Him188
d678d14a57 Merge remote-tracking branch 'origin/master' 2020-02-04 12:03:28 +08:00
Him188
e21ec9ed50 Add log 2020-02-04 12:03:16 +08:00
jiahua.liu
cdb0a89fa8 bot permissions 2020-02-04 11:53:14 +08:00
jiahua.liu
a68ad3adac Mute Permission 2020-02-04 11:32:13 +08:00
Him188
15d89f2bd1 Fix build 2020-02-04 11:23:12 +08:00
Him188
1a206612e5
Merge pull request #34 from uebian/master 
处理禁言
 2020-02-03 21:19:34 -06:00
uebian
60d03a9869 处理禁言 2020-02-04 11:13:02 +08:00
Him188
bf2a308f9f Fix build 2020-02-04 10:35:58 +08:00
Him188
8e4226149c Add fast-fail 2020-02-04 10:35:53 +08:00
Him188
d48f5e4a58 Move Unmute out of the object Mute 2020-02-04 10:31:38 +08:00
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