Commit Graph

398 Commits

Author SHA1 Message Date
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