Commit Graph

1411 Commits

Author SHA1 Message Date
Him188
ff8e6e8b80 Add sequenceId to MessageSource 2020-02-21 16:29:39 +08:00
Him188
776e591556 Support MemberLeaveEvent.Quit, close #51 2020-02-21 15:33:16 +08:00
Him188
67e709452a Fix recursive call 2020-02-21 14:39:14 +08:00
Him188
247ad692d8 Add extensions 2020-02-20 22:55:19 +08:00
Him188
086f04e1f5 Add member.muteTimeRemaining 2020-02-20 22:36:19 +08:00
Him188
97615e5d7e Add docs 2020-02-20 22:19:54 +08:00
Him188
f8e31b6920 Add docs 2020-02-20 22:19:41 +08:00
Him188
cb06520b8e Explicitly override hashCode and toString in interface Contact, close #80 2020-02-20 22:01:34 +08:00
Him188
9660b44142 Broadcast BotReloginEvent, close #78 2020-02-20 21:42:48 +08:00
Him188
9437d1528d Unified relogin cause 2020-02-20 21:42:20 +08:00
Him188
61838a0e14 Add additional coroutineContext 2020-02-20 17:47:49 +08:00
Him188
395f20c273 Fix event and improve performance 2020-02-20 17:32:41 +08:00
Him188
7c3debc00c Fix GroupMessage subscribing 2020-02-20 17:16:46 +08:00
Him188
3d4ff807af Add MessageSource.time 2020-02-20 13:24:27 +08:00
Him188
f5a6040668 Add additional coroutineScope parameter 2020-02-20 13:20:36 +08:00
Him188
37cea58a19 Fix ambiguous eq 2020-02-20 13:18:59 +08:00
Him188
1bcac33151 Move At.member from GroupMessage to MessagePacket 2020-02-20 11:52:26 +08:00
Him188
3e29fbf34b Reconnect always 2020-02-20 11:35:04 +08:00
Him188
7838ccf042 Adjust file names 2020-02-20 11:23:37 +08:00
Him188
3c29474c0b Correct groupCardOrNick to nameCardOrNick 2020-02-19 20:37:53 +08:00
Him188
e66cfc95a7 Unified toString: "[mirai:$imageId]" 2020-02-19 20:28:29 +08:00
Him188
a81eea422b Face decoding 2020-02-19 20:28:10 +08:00
Him188
c32843fbf3 Add Short.toByteArray() 2020-02-19 20:13:57 +08:00
Him188
abe5db2023 Add MessageChain.foreachContent(lambda) and Message.hasContent() 2020-02-19 19:56:00 +08:00
Him188
de15339929 Fix platform declaration clash 2020-02-19 19:11:46 +08:00
Him188
2322387f73 Add bot.subscribe, close #61 2020-02-19 19:10:14 +08:00
Him188
c3bd03fcae Improve logs 2020-02-19 18:36:04 +08:00
Him188
d829060072 Change default config values 2020-02-19 18:33:20 +08:00
Him188
9a436271db Fix uninitialized vars 2020-02-19 18:33:11 +08:00
Him188
2deb1601a8 No broadcast for events from friend message syncing 2020-02-19 18:28:58 +08:00
Him188
32abb01861 Fix tryNTimes 2020-02-19 18:03:37 +08:00
Him188
89c614d0a1 Fix ECDH curve 2020-02-19 14:44:03 +08:00
Him188
e878307c13 Fix event broadcasting 2020-02-19 14:43:31 +08:00
Him188
9de13ca6fd Fix ECDH 2020-02-19 14:15:38 +08:00
Him188
4798b8c1ec Remove unnecessary if 2020-02-19 13:26:17 +08:00
Him188
57479e0db6 Replace all 登陆s with 登录 2020-02-19 13:25:41 +08:00
Him188
c20040f1ac Add common property isEnabled to all loggers 2020-02-19 12:20:21 +08:00
Him188
c937511412 Fix login retry 2020-02-19 12:16:28 +08:00
Him188
4f7b266e03 Add tryCount param to lambda 2020-02-19 12:16:17 +08:00
Him188
3b7a9b6d42 Fix logger 2020-02-19 12:16:05 +08:00
Him188
67c31ed0cb Add logs before and after logging in 2020-02-19 11:41:14 +08:00
Him188
016be17049 Fix #70 2020-02-19 11:36:24 +08:00
Him188
b2e0114e4f Adjust job cancelling hence fix #65 2020-02-19 11:28:23 +08:00
Him188
9b58606366 Fix initialization error 2020-02-18 21:46:09 +08:00
Him188
9989894802 Fix test 2020-02-18 21:10:18 +08:00
Him188
35b8cfeb2a Fix test 2020-02-18 21:09:45 +08:00
Him188
7ad3bfbf8f Add MiraiAtomicBoolean, fuck atomicfu 2020-02-18 21:05:51 +08:00
Him188
eafa943e5f Remove redundant apply 2020-02-18 20:35:44 +08:00
Him188
29a5ab53a9 Use default shareKey if ECDH is not available 2020-02-18 20:02:13 +08:00
Him188
757bedc657 Suppress EXTENSION_SHADOWED_BY_MEMBER 2020-02-18 13:38:11 +08:00
Him188
2b4d9a8e79 Add tryNTimes 2020-02-18 13:35:14 +08:00
Him188
4bec7d753b Make java user happier 2020-02-18 13:18:30 +08:00
Him188
29091e817f Fix gradle dependency 2020-02-18 13:03:51 +08:00
Him188
efa404d0d3 Try fix compilation bug 2020-02-17 18:36:08 +08:00
Him188
69ff377654 Add references 2020-02-17 14:14:16 +08:00
Him188
0be36f71b8 More useful .incoming 2020-02-17 14:13:18 +08:00
Him188
9b3bc88b3d Add Bot.closeAndJoin 2020-02-17 09:39:02 +08:00
Him188
7d283808f7 Rename awaitDisconnection to join 2020-02-17 09:26:32 +08:00
Him188
b59ae076ec Add context getter 2020-02-17 00:16:50 +08:00
jiahua.liu
a2ae001fe1 Console Terminal Chinese Supported 2020-02-16 22:44:56 +08:00
jiahua.liu
47c26e43db Merge remote-tracking branch 'origin/master' 2020-02-16 20:10:24 +08:00
jiahua.liu
e971fd769d Mirai Console (Terminal)V0.01 2020-02-16 20:10:12 +08:00
Him188
eb8660667e Merge remote-tracking branch 'origin/master' 2020-02-16 18:28:31 +08:00
Him188
dcddcc9229 Change lambda parameter of onEvent for matching(Regex) and finding(Regex) to MatchResult 2020-02-16 18:25:37 +08:00
jiahua.liu
33d5cf566e Mirai Console (Terminal)V0.01 2020-02-16 18:04:42 +08:00
jiahua.liu
d0fb1383a0 Mirai Console V0.01 2020-02-16 17:25:30 +08:00
Him188
ef4588832b Fix publish 2020-02-16 13:54:42 +08:00
Him188
a30b9bc76a Remove redundant permission 2020-02-16 02:42:09 +08:00
Him188
4b345fd3b6
Merge pull request #57 from HoshinoTented/master
Add incoming channel for Bot
2020-02-15 11:25:54 -06:00
Him188
cde551625a Fix ecdh availability detect 2020-02-16 01:21:02 +08:00
Him188
b3c97c1678 Simplify 2020-02-16 01:19:22 +08:00
HoshinoTented
cebdd40e76 add incoming channel 2020-02-16 00:59:56 +08:00
Him188
606879cba1 Test ECDH keyPair before success 2020-02-16 00:19:53 +08:00
Him188
b7e4dc0772 Add default values 2020-02-15 23:24:43 +08:00
Him188
a555180493 Fuck bintray publish 2020-02-15 22:54:17 +08:00
ryoii
f8282e7d4d correct default At display name 2020-02-15 18:03:48 +08:00
Him188
04da180071 Fix has 2020-02-15 17:21:41 +08:00
Him188
25b3b2b2be Japt 2020-02-15 15:03:52 +08:00
Him188
7ddf93988b Remove @JvmStatic for JDK1.6 compatibility 2020-02-15 14:15:35 +08:00
Him188
98de5893d7 Add @JvmStatic and @JvmOverloads 2020-02-15 14:13:07 +08:00
Him188
dd9e59aabe Implement Event explicitly 2020-02-15 14:12:51 +08:00
Him188
ba212d2b7a Generate equals and hashCode for BotAccount 2020-02-15 13:10:12 +08:00
Him188
45d5131e32 Unified exception throw 2020-02-15 13:08:27 +08:00
Him188
f989cd9391 Multiplatform Exceptions to deal with kotlin bug 2020-02-15 12:12:30 +08:00
Him188
5eb731e975 Adjust property names 2020-02-15 12:12:10 +08:00
Him188
5d629fe644 Close #55 2020-02-15 11:10:37 +08:00
Him188
2e614f65f9 EventListeners: use atomic lock to avoid redundant object creation 2020-02-15 11:04:33 +08:00
Him188
2b464a287e Add MessageSource.quote 2020-02-14 22:26:40 +08:00
Him188
066ad39561 Remove ambiguous functions on Android 2020-02-14 22:16:01 +08:00
Him188
8eda95659c Fix multiplatform BotConfiguration 2020-02-14 22:15:29 +08:00
Him188
32c15a47de Remove debugPrintln 2020-02-14 22:06:52 +08:00
Him188
8a4750badb Fix platform implementations 2020-02-14 22:05:59 +08:00
Him188
797cef15e2 Logger: Accept String over Any; Introduce common optional log functions 2020-02-14 22:04:32 +08:00
Him188
2ae7c75a16 Add default values 2020-02-14 21:55:28 +08:00
Him188
ace1174678 Fix configuration 2020-02-14 21:54:03 +08:00
Him188
32e854db29 Improve DeviceInfo 2020-02-14 21:09:36 +08:00
Him188
bf7189fdd5 Slow down heartbeat 2020-02-14 20:31:22 +08:00
Him188
617b231865 japt Events 2020-02-14 20:21:05 +08:00
Him188
843643a78d Add internal functions for japt 2020-02-14 20:20:28 +08:00
Him188
7451991973 Catch missing exceptions thrown under Bot CoroutineScope 2020-02-14 20:19:38 +08:00
Him188
5b4e99c52d Override close explicitly 2020-02-14 20:13:40 +08:00
Him188
afb74ec652 Annotate subscribeInternal with @MiraiInternalAPI 2020-02-14 19:21:43 +08:00
Him188
f37434c663 Remove @MiraiInternalAPI from NetworkHandler 2020-02-14 19:12:50 +08:00
Him188
1993047221 Redesign reconnecting logic 2020-02-14 18:41:24 +08:00
Him188
c03fb41fd0 Add LoginFailedException 2020-02-14 18:40:04 +08:00
Him188
ba946eb249 Add ForceOfflineException for clearer close reason 2020-02-14 18:37:20 +08:00
Him188
2bbc324245 Make @MessageDsl public 2020-02-14 18:33:35 +08:00
Him188
98b0073f81 Add BotOfflineEvent.Dropped and BotReloginEvent 2020-02-14 18:20:31 +08:00
Him188
8bf302d386 Annotate readTlvMap with @MiraiInternalIp 2020-02-14 13:45:46 +08:00
Him188
1058377663 Support AtAll in message.first() 2020-02-14 10:21:33 +08:00
Him188
8f03d44df1 Add shortcut 2020-02-13 16:09:10 +08:00
Him188
a3945924a4 Add docs 2020-02-13 13:42:32 +08:00
Him188
184e595896 Fix gradle dependency 2020-02-13 13:18:51 +08:00
Him188
e2136b5c40 Make easier 2020-02-13 09:53:32 +08:00
Him188
8e05595bac Add return values to MessageDsl subscribers 2020-02-13 09:47:45 +08:00
Him188
631ca4f639 Fix duplicated function name 2020-02-13 09:41:32 +08:00
Him188
d365ec5b4e New feature: AtAll 2020-02-13 09:36:47 +08:00
Him188
46fc012fa3 Add AtAll 2020-02-13 09:36:17 +08:00
Him188
fe8ed44ef2 Fix At.followedBy 2020-02-13 09:36:02 +08:00
Him188
397861500f Message DSL: add String.reply(Message) 2020-02-13 09:35:43 +08:00
Him188
21c2fb5766 Set defaultLogger initially disabled 2020-02-13 09:21:25 +08:00
Him188
0221767aa8 Remove unused configurations 2020-02-13 09:11:19 +08:00
Him188
fbe973f3a1 Fix false positive mute state 2020-02-13 09:06:39 +08:00
Him188
9a8a992977 Add note 2020-02-13 01:11:03 +08:00
Him188
3be82bb53d Fix doc 2020-02-13 01:07:50 +08:00
Him188
7ff9783daa Add docs 2020-02-13 01:06:54 +08:00
Him188
7cd65f92af Fix build 2020-02-13 00:27:07 +08:00
jiahua.liu
aca459f60d Merge remote-tracking branch 'origin/master' 2020-02-13 00:11:31 +08:00
jiahua.liu
55e70bd3c3 smart config 2020-02-13 00:10:59 +08:00
Him188
cc42069196 Add BotUnmuteEvent 2020-02-12 23:54:27 +08:00
Him188
9694991592 Make EventLogger public so as to be able to enable 2020-02-12 23:47:26 +08:00
Him188
da32f5190f Add event log 2020-02-12 23:30:58 +08:00
Him188
d36727718b Remove get() 2020-02-12 23:30:52 +08:00
Him188
3ab0e67516 Introduce logger supplier, close #43 2020-02-12 23:24:37 +08:00
Him188
defaf83a07 Make var EventDisabled visible 2020-02-12 23:24:14 +08:00
Him188
fec3702ba9 Improve performance 2020-02-12 23:09:34 +08:00
Him188
348d13a4c1 Handle event of new member joining 2020-02-12 23:09:23 +08:00
Him188
3b0ee9ad99 Fix #42 2020-02-12 22:24:57 +08:00
Him188
35c7e7947f Remove redundant nullable signal 2020-02-12 20:59:14 +08:00
Him188
426784324f Rename addLastAll to addAll 2020-02-12 20:54:08 +08:00
Him188
fda644d248 Ensure info accessibility 2020-02-12 20:48:06 +08:00
Him188
999ce68cec Fix addLastAll 2020-02-12 20:47:30 +08:00
Him188
51ee123a1e Introduce information descriptors for contacts 2020-02-12 20:03:19 +08:00
Him188
b0d274dd1a Adjust param type: accept null in UnsafeWeakRef<T>.getValue 2020-02-12 20:02:30 +08:00
Him188
e3241654dc Implement BroadcastControllable, so duplicated events are ignored 2020-02-12 20:01:36 +08:00
Him188
ec115e83b1 Add Iterable<E>.toLockFreeLinkedList() and Sequence<E>.toLockFreeLinkedList() 2020-02-12 20:00:52 +08:00
Him188
fbe5f14a9c Merge remote-tracking branch 'origin/master' 2020-02-12 19:09:29 +08:00
jiahua.liu
e072c5b10e Get Kicker 2020-02-12 17:10:32 +08:00
Him188
f91a44ba55 Add quick reference to DSL 2020-02-12 16:14:27 +08:00
Him188
905d4ede9a Fix build 2020-02-12 13:52:07 +08:00
Him188
e33fea8a3f Remove override 2020-02-12 09:07:40 +08:00
Him188
80a3a9a65e Add shortcuts 2020-02-12 09:04:25 +08:00
Him188
5bd96876d9 Add event broadcast 2020-02-11 22:06:03 +08:00
Him188
dfa3af5643 Fix build 2020-02-11 21:33:03 +08:00
Him188
bc71475f35 Add event broadcasting 2020-02-11 21:29:28 +08:00
Him188
96db7a6062 Remove BroadcastControllable from GroupMessage 2020-02-11 21:29:03 +08:00
Him188
049cf30659 New event design 2020-02-11 20:40:35 +08:00
Him188
63b5785b2d Add MemberCardChangeEvent 2020-02-11 19:55:03 +08:00
Him188
4d77951ae4 Redesign event structure 2020-02-11 13:14:40 +08:00
Him188
a322ce735b Make CancellableEvent an interface, introduce AbstractCancellableEvent 2020-02-11 12:30:49 +08:00
Him188
001ad975b9 Make CancellableEvent an interface, introduce AbstractCancellableEvent 2020-02-11 12:02:19 +08:00
Him188
7891ffc136 Make interface Event the base type of a event, remove interface Subscribable 2020-02-11 11:56:42 +08:00
Him188
474c5686e6 Merge remote-tracking branch 'origin/master' 2020-02-11 09:16:58 +08:00
Him188
bfc516f350 senderId, sourceMessage, groupId are now accessible from MessageSource 2020-02-11 09:16:43 +08:00
jiahua.liu
79bf367013 S0me events 2020-02-10 22:45:53 +08:00
Him188
8180098a02 Add interface NoLog 2020-02-10 16:52:54 +08:00
Him188
6504283d4d Remove unused annotations 2020-02-10 16:44:41 +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
644842e191 Remove useless LoginResult 2020-02-10 13:54:01 +08:00
Him188
b265533b4d Fix warnings 2020-02-10 13:18:05 +08:00
Him188
0094307ad3 Add MiraiLoggerWithSwitch.isEnabled 2020-02-10 13:13:48 +08:00
Him188
b479a213bc Add heartbeat 2020-02-10 13:12:59 +08:00
Him188
7d5543eb85 Suppress false positive warnings 2020-02-10 13:12:39 +08:00
Him188
3c83883c66 Add space automatically if necessary 2020-02-09 23:35:11 +08:00
Him188
b991c6ef0c Add permissions 2020-02-09 23:34:55 +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
Him188
33867d0444 Compatibility improvement 2020-02-09 12:52:00 +08:00
Him188
cf7e325259 Add copyright 2020-02-09 01:01:36 +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
6e6c1d813d OnlinePushPack JCEs 2020-02-08 20:57:31 +08:00
Him188
24d7d49a24 Fix endsWith 2020-02-08 16:57:48 +08:00
Him188
5c5670c66f Add QuoteReply 2020-02-08 16:03:20 +08:00
Him188
6d2a360780 Add heartbeat 2020-02-08 00:36:58 +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
b8d6e4203b Merge remote-tracking branch 'origin/master' 2020-02-07 18:44:12 +08:00
Him188
13b72b312c Friend image upload 2020-02-07 18:43:24 +08:00
Him188
4b162c546c Small fixes 2020-02-07 16:57:00 +08:00
ryoii
929501c132 fix: imageId parse error 2020-02-07 16:01:16 +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
98881fe3fc Common constructor for Image 2020-02-07 12:46:14 +08:00
Him188
b7d8396f78 Add default value =0 for fieldId 2020-02-07 12:33:01 +08:00
Him188
8ad087c406 Add fast-fail size check 2020-02-07 12:32:41 +08:00
Him188
a7857f147d Remove inline modifier 2020-02-07 12:30:26 +08:00
Him188
4d2510d0e7 Replace "\r" with "" 2020-02-07 10:18:33 +08:00
Him188
5f4c3882cf Group image support 2020-02-07 10:11:39 +08:00
Him188
dc36d07217 Fix exception handling 2020-02-07 08:43:43 +08:00
Him188
224b8058e8 Rename st to St 2020-02-06 15:42:29 +08:00
Him188
22096a9f44 Fix bugs 2020-02-06 15:32:33 +08:00
Him188
9fe26540b2 Remove ECDHTest.kt 2020-02-06 14:56:13 +08:00
Him188
388e1a5b7f Cleanup 2020-02-06 13:58:57 +08:00
Him188
9aa1d7d395 Remove Contact.withBot 2020-02-06 12:44:00 +08:00
Him188
787fad1617 Add permission check 2020-02-06 12:43:51 +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
Him188
e53dcfd26b Improve performance 2020-02-06 11:12:29 +08:00
Him188
0671fd9abd Add comments 2020-02-06 11:11:06 +08:00
Him188
9c6d60d46a Make isRemoved inline 2020-02-06 11:10:23 +08:00
jiahua.liu
e43a5176e0 edit group name supported 2020-02-05 23:34:26 +08:00
jiahua.liu
da2e09855b special title 2020-02-05 22:55:49 +08:00
Him188
37745b839e Add docs 2020-02-05 10:40:10 +08:00
Him188
22f2c5087e Reformat code 2020-02-05 09:03:00 +08:00
jiahua.liu
5f4ccf2fe9 Group management Update 2020-02-05 00:14:18 +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
f2f2de06a9 Fix at 2020-02-04 18:18:29 +08:00
Him188
f244a12b8b Fix image 2020-02-04 17:11:57 +08:00
jiahua.liu
35742632b3 Group Card 2020-02-04 15:56:43 +08:00
Him188
a105a48350 Improve ContactList 2020-02-04 12:23:38 +08:00
Him188
bf64571717 Improve LockFreeLinkedList 2020-02-04 12:21:33 +08:00
Him188
42221c5d27 Remove isOnline 2020-02-04 12:09:00 +08:00
jiahua.liu
cdb0a89fa8 bot permissions 2020-02-04 11:53:14 +08:00
Him188
f793a67ab3 close streams after copying 2020-02-04 08:53:57 +08:00
Him188
4e57eea779 Use kotlin rather that JDK9 2020-02-04 08:49:32 +08:00
Him188
af08f52236 Fix toExternalImage 2020-02-04 08:27:45 +08:00
Him188
9f0169c622 Fix md5 2020-02-04 08:27:32 +08:00
Him188
9c15287305 Fix missing file 2020-02-03 23:03:30 +08:00
Him188
b240370f20 Add common filepath 2020-02-03 21:42:14 +08:00
Him188
35dca403bf Image upload 2020-02-03 21:38:37 +08:00
Him188
dc940ee0cc CustomFace support 2020-02-03 16:31:35 +08:00
Him188
c429a7cf3a Fix decrypt 2020-02-03 15:57:15 +08:00
Him188
10e6c51948 Make inline 2020-02-03 14:51:28 +08:00
Him188
a113f0ed1e Remove val previous 2020-02-03 14:25:36 +08:00
Him188
d3d7e530a9 Rename getQQ to getFriend Add deprecation message 2020-02-03 14:25:19 +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
Him188
719023826d Merge remote-tracking branch 'origin/master' 2020-02-03 00:54:12 +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
bfdcee1a1c List complete 2020-02-03 00:15:09 +08:00
Him188
ab4a0c82d6 this is now instance of GroupMessage for sentFrom 2020-02-02 23:30:37 +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
73d1a3d4d2 Merge remote-tracking branch 'origin/master' 2020-02-02 21:02:06 +08:00
Him188
36ef9c2890 Fix fucking length 2020-02-02 21:01:30 +08:00
Him188
f3ec93071f Fix size 2020-02-02 20:23:20 +08:00
jiahua.liu
0d4850591c Troop Member List 2020-02-02 20:11:41 +08:00