github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-02-24 19:20:30 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,016 Commits 68 Branches 330 Tags 107 MiB
e7a1ee20e5
Commit Graph

413 Commits

Author SHA1 Message Date
luo123
6973488db7 move to lowLevelApi.kt 2020-03-14 11:01:21 +08:00
luo123
4e7b3b0048 delete announcement 2020-03-14 00:45:36 +08:00
luo123
e57215a603 send announcement 2020-03-14 00:07:52 +08:00
luo123
aa61e9441a get GroupAnnouncementList is working now 2020-03-13 22:33:11 +08:00
luo123
220d293b7a get group announce list 2020-03-13 21:06:57 +08:00
Cyenoch
b3fa841d5f Addressed an exception that was thrown because InetAddress.getLocalHost().hostAddress might get an ipv6 address 2020-03-11 23:01:53 +08:00
Him188
21abfe4a64 Fix zip and unzip 2020-03-08 22:04:11 +08:00
Him188
243b2ea731 Gather all platform-specified utilities into a MiraiPlatformUtils 2020-03-08 21:14:41 +08:00
Him188
71de716e92 Fix compilation bug 2020-03-08 20:26:37 +08:00
Him188
4cc8808372 Make output open 2020-03-08 20:12:33 +08:00
Him188
7593e34898 Add standard output override 2020-03-08 20:09:53 +08:00
Him188
1ef3eb471b Use custom Json configuration 2020-03-08 00:43:52 +08:00
Him188
e39fe5a46f Merge branch 'master' into kotlin-1.3.70 
# Conflicts:
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidClient.kt
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/highway/HighwayHelper.kt
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/highway/highway.kt
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/login/WtLogin.kt
#	mirai-core/build.gradle.kts
#	mirai-core/src/androidMain/kotlin/net/mamoe/mirai/utils/addSuppressed.kt
#	mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/ExternalImage.kt
#	mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/channels.kt
#	mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/io/chunked.kt
#	mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/io/input.kt
#	mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/addSuppressed.kt
 2020-03-08 00:29:51 +08:00
Him188
e60a6bcf68 Revert "Use ktor.io than kotlinx.io" 2020-03-07 22:04:31 +08:00
Him188
b3c4f24e33 Revert "Use io.ktor.utils.io than kotlinx.io" 
This reverts commit 6a85769e
 2020-03-07 18:48:07 +08:00
Him188
92504fc313 Merge remote-tracking branch 'origin/master' 2020-03-07 11:29:23 +08:00
Him188
26210e7845 Generify functions 2020-03-07 11:29:04 +08:00
Him188
defe7ce054 Fix addSuppressed 2020-03-07 11:19:05 +08:00
Him188
e222465ded Make account internal 2020-03-07 00:24:37 +08:00
Him188
27fe240630 Fix addSuppressed, close #116 2020-03-06 22:06:36 +08:00
Him188
37344c19d6 Fix addSuppressed 2020-03-06 22:04:55 +08:00
Him188
8777d583b0 Merge remote-tracking branch 'origin/kotlin-1.3.70' into kotlin-1.3.70 
# Conflicts:
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/highway/HighwayHelper.kt
#	mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/io/chunked.kt
 2020-03-05 09:45:12 +08:00
Him188
9bff0f77ec Kotlin 1.3.70 2020-03-05 09:44:50 +08:00
Him188
c962bd2641 Revert "Adapt new kotlinx.serialization" 
This reverts commit 0a6b39e6
 2020-03-04 14:11:36 +08:00
Him188
60b6eab73e Revert "Update to Kotlin 1.3.70" 
This reverts commit 2e57e358
 2020-03-04 13:58:01 +08:00
Him188
0a6b39e62c Adapt new kotlinx.serialization 2020-03-04 10:50:54 +08:00
Him188
2e57e358c3 Update to Kotlin 1.3.70 2020-03-04 08:54:56 +08:00
Him188
b5bd36fb8f Avoid self-suppression 2020-03-03 20:04:46 +08:00
Him188
12ebfa1db5 Unified Image types: Online/Offline Image, Group/Friend Image 2020-03-03 13:45:33 +08:00
Him188
dc7d73f148 Misc improvements 2020-03-03 08:43:32 +08:00
Him188
cadbd7ff3a Deprecate Bot.qq, Bot.get, Bot.contains 2020-03-03 08:32:39 +08:00
Him188
28c0530268 Add more builders for Bot 2020-03-03 08:26:15 +08:00
Him188
9a482d1926 Add Java-friendly APIs for MessageReceipt 2020-03-01 20:27:30 +08:00
Him188
e479da9898 Fix return types 2020-03-01 20:26:58 +08:00
Him188
b7fa7adf99 Add Java-friendly APIs for Contacts 2020-03-01 20:13:52 +08:00
Him188
422d84d150 Fix build 2020-03-01 18:55:06 +08:00
Him188
cc840151c1 Fix typo 2020-03-01 18:17:21 +08:00
Him188
dab3448fab Add docs 2020-03-01 18:17:00 +08:00
Him188
8de9357fdd Fix typo 2020-03-01 18:13:29 +08:00
Him188
2cfd8be0f3 Improve Java-friendly APIs, add Java Future apis 2020-03-01 18:09:16 +08:00
Him188
ed712295fe Add Java-friendly APIs 2020-03-01 17:10:55 +08:00
Him188
fb072f3cbb Add Java-friendly APIs 2020-03-01 16:55:58 +08:00
Him188
bd1a968db9 misc 2020-03-01 16:55:33 +08:00
Him188
6a85769e0d Use io.ktor.utils.io than kotlinx.io 2020-02-29 23:19:53 +08:00
Him188
734914ad96 Use ByteArray than IoBuffer 2020-02-29 21:25:13 +08:00
Him188
da8a78af12 Fix contentToString 2020-02-28 21:38:31 +08:00
Him188
cfbf4f8ccc Update md5: support buffers 2020-02-28 19:32:17 +08:00
Him188
932a3ef1f2 Review: misc improvements 2020-02-28 19:16:22 +08:00
Him188
50289924fe Wrap with withContext 2020-02-28 12:43:14 +08:00
Him188
c90013b23f Add flush 2020-02-28 10:46:14 +08:00
Him188
e24617fc64 Add ByteReadChannel.toExternalImage 2020-02-28 09:02:42 +08:00
Him188
82454b0d55 Remove duplicated asOutput and asInput 2020-02-28 08:58:29 +08:00
Him188
32b1decd0d Add detailed exception prompt 2020-02-28 08:56:47 +08:00
Him188
ccc6826e3a Redesign MessageChain: 
Make MessageChain immutable
Introduce CombinedMessage, a left-biased list
Introduce MessageChainBuilder
 2020-02-23 16:47:21 +08:00
Him188
692e7c950c Image download support, close #49 2020-02-22 23:32:47 +08:00
Him188
0e30d3d69b Better memory management 2020-02-22 11:36:19 +08:00
Him188
67e709452a Fix recursive call 2020-02-21 14:39:14 +08:00
Him188
f5a6040668 Add additional coroutineScope parameter 2020-02-20 13:20:36 +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
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
89c614d0a1 Fix ECDH curve 2020-02-19 14:44:03 +08:00
Him188
9de13ca6fd Fix ECDH 2020-02-19 14:15:38 +08:00
Him188
57479e0db6 Replace all 登陆s with 登录 2020-02-19 13:25:41 +08:00
Him188
7ad3bfbf8f Add MiraiAtomicBoolean, fuck atomicfu 2020-02-18 21:05:51 +08:00
Him188
29a5ab53a9 Use default shareKey if ECDH is not available 2020-02-18 20:02:13 +08:00
Him188
2b4d9a8e79 Add tryNTimes 2020-02-18 13:35:14 +08:00
jiahua.liu
a2ae001fe1 Console Terminal Chinese Supported 2020-02-16 22:44:56 +08:00
jiahua.liu
e971fd769d Mirai Console （Terminal）V0.01 2020-02-16 20:10:12 +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
cde551625a Fix ecdh availability detect 2020-02-16 01:21:02 +08:00
Him188
b3c97c1678 Simplify 2020-02-16 01:19:22 +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
25b3b2b2be Japt 2020-02-15 15:03:52 +08:00
Him188
98de5893d7 Add @JvmStatic and @JvmOverloads 2020-02-15 14:13:07 +08:00
Him188
f989cd9391 Multiplatform Exceptions to deal with kotlin bug 2020-02-15 12:12:30 +08:00
Him188
8eda95659c Fix multiplatform BotConfiguration 2020-02-14 22:15:29 +08:00
Him188
8a4750badb Fix platform implementations 2020-02-14 22:05:59 +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
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
5b4e99c52d Override close explicitly 2020-02-14 20:13:40 +08:00
Him188
7cd65f92af Fix build 2020-02-13 00:27:07 +08:00
jiahua.liu
55e70bd3c3 smart config 2020-02-13 00:10:59 +08:00
Him188
fec3702ba9 Improve performance 2020-02-12 23:09:34 +08:00
Him188
905d4ede9a Fix build 2020-02-12 13:52:07 +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
e116224180 Move DeviceInfo 2020-02-09 23:20:29 +08:00
Him188
cf7e325259 Add copyright 2020-02-09 01:01:36 +08:00
Him188
4b162c546c Small fixes 2020-02-07 16:57:00 +08:00
Him188
a7857f147d Remove inline modifier 2020-02-07 12:30:26 +08:00
Him188
22096a9f44 Fix bugs 2020-02-06 15:32:33 +08:00
Him188
388e1a5b7f Cleanup 2020-02-06 13:58:57 +08:00
Him188
37745b839e Add docs 2020-02-05 10:40:10 +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
35dca403bf Image upload 2020-02-03 21:38:37 +08:00
Him188
36ef9c2890 Fix fucking length 2020-02-02 21:01:30 +08:00
Him188
5c68fc53e8 Fix channel 2020-02-02 17:57:27 +08:00
Him188
df56c86fca Fix build 2020-02-01 00:58:23 +08:00
Him188
f1a5bc05ea Add docs 2020-01-31 22:00:38 +08:00
Him188
f9cf47a19a Bot factory 2020-01-31 21:49:48 +08:00
Him188
8bdfad961f Fix build 2020-01-30 20:35:20 +08:00
Him188
f2c682dba5 Cleanup 2020-01-30 20:31:17 +08:00
Him188
d6d1f2c74d Add send(ByteArray) 2020-01-30 20:02:28 +08:00
jiahua.liu
92b7b10f0e network handler update 2020-01-30 13:23:58 +08:00
Him188
905823b94b Slider captcha solver 2020-01-29 23:53:18 +08:00
Him188
5ae4296bd5 Fix PlatformSocket on Android 2020-01-29 20:12:47 +08:00
Him188
6a8e6b93a0 zip support 2020-01-29 19:54:09 +08:00
Him188
b3c6787e0a Introduce MultiPacket 2020-01-29 19:18:52 +08:00
Him188
2f2a8666b9 Add docs 2020-01-29 15:46:05 +08:00
Him188
55e6c93419 JceStruct serialization 2020-01-28 01:01:40 +08:00
jiahua.liu
d8cd6625e5 Android SMS login - Incomplete 2020-01-27 13:05:15 +08:00
Him188
6c2b435779 Android GroupMessage support 2020-01-25 21:20:13 +08:00
Him188
77ddb6f78d QQA Debugging update 2020-01-22 16:42:22 +08:00
Him188
db3a1fb2d1 Fix contentToString 2020-01-20 00:17:45 +08:00
Him188
1a4ad94d20 Simplify logger structure 2020-01-18 12:32:14 +08:00
Him188
37e4ee5bc6 Fix build 2020-01-12 00:40:06 +08:00
Him188
186fa5d88d Fix build 2020-01-12 00:24:17 +08:00
Him188
d7f67e5159 Fix packet parsing 2020-01-11 15:30:19 +08:00
Him188
78ee01ded1 Fix bugs 2020-01-07 19:26:49 +08:00
Him188
48850d7389 Pass compilation 2020-01-06 21:29:57 +08:00
Him188
e43120742c Fix duplicated generated class name 2020-01-06 20:58:36 +08:00
Him188
d3c97fb6d4 Add ECDH 2020-01-06 20:49:26 +08:00
Him188
9bc3d933f7 Rewrite PlatformDatagramChannel, easier to use 2020-01-06 18:29:52 +08:00
Him188
7da89fb42d Remove redundant @Suppress 2020-01-03 19:17:31 +08:00
Him188
1c316a7ee3 Add more shortcuts 2020-01-01 20:30:35 +08:00
Him188
db2bcb4e02 Enhance performance: no redundant lambda creation when constructing Bot 2019-12-30 22:37:48 +08:00
Him188
a47ea07feb Use BotConfiguration 2019-12-24 14:48:07 +08:00
Him188
a496a93433 Auto loader for BotFactory 2019-12-20 10:19:36 +08:00
Him188
2f67f8363b Rewrite 2019-12-19 17:25:49 +08:00
Him188
eb9a64e5a0 Add WeakRef 2019-12-18 12:49:51 +08:00
Him188
0c6e09361d Rename protocol.tim to protocol.timpc 2019-12-17 11:04:04 +08:00
Him188
1e5dcb0e24 Replace all transferTo to Kotlinx transfer, downgrade JDK requirement 2019-12-15 17:28:17 +08:00
Him188
f771077572 Cleanup 2019-12-15 15:27:56 +08:00
Him188
f13d1e063d Remove unexpected main function 2019-12-15 15:23:08 +08:00
Him188
f3e28fa664 Suppress false positive warning 2019-12-08 21:14:08 +08:00
Him188
9469afa680 Make tips clear 2019-12-08 21:05:42 +08:00
Him188
39204730eb Fix StackOverflowError 2019-12-08 21:00:04 +08:00
Him188
03ca3b5fd1 Add Time utils; Remove klock 2019-12-07 13:17:40 +08:00
Him188
1ea8478584 Make all packets and network stuff internal 2019-12-06 23:46:20 +08:00
Him188
ff96ee7ebf Add extra generic type for sender 2019-12-04 18:00:41 +08:00
Him188
05ca6424db Redesign event subscription, using inherited coroutineContext 2019-11-29 01:16:35 +08:00
Him188
57685d39e7 Simplify message handler 2019-11-28 12:44:47 +08:00
Him188
2bf0a96375 Update libraries and reduce redundant code 2019-11-28 11:22:07 +08:00
Him188
59e15a30e1 Add ConnectionOccupiedEvent support 2019-11-26 12:34:58 +08:00
Him188
0ea95c33e6 Add @JvmStatic 2019-11-22 19:09:23 +08:00
Him188
2b1725b7f4 Add e.printStackTrace() 2019-11-20 19:39:15 +08:00
Him188
1419116a7f Fix captcha resolver 2019-11-19 12:27:03 +08:00
Him188
ae86e67f9e Rename InternalAPI as MiraiInternalAPI 2019-11-16 18:46:34 +08:00
Him188
558ece3ae2 Add comments 2019-11-16 13:05:56 +08:00
Him188
0978d2846d Cleanup 2019-11-16 02:33:10 +08:00
Him188
49c80c8eaf Fix bugs 2019-11-16 01:30:30 +08:00
Him188
83e68a3e1c Specify return type 2019-11-16 00:59:42 +08:00
Him188
108bd48b46 Platform specific APIs 2019-11-16 00:58:48 +08:00
Him188
c839253e18 Platform specific APIs 2019-11-16 00:48:18 +08:00
Him188
f26b274fef Platform specific extensions for BotSession 2019-11-16 00:44:25 +08:00
Him188
8b3d710ede Add docs 2019-11-15 22:56:47 +08:00
Him188
046d8968a4 Cleanup 2019-11-15 12:14:15 +08:00
Him188
2b477b3be7 Redesign events 2019-11-08 19:21:29 +08:00
Him188
8bab12854b Platform adjustment 2019-11-07 15:06:38 +08:00
Him188
6dca4419a4 Add platform details 2019-11-06 21:40:18 +08:00
Him188
bd9cf3bfd1 Redesign packets 2019-11-06 19:49:37 +08:00
Him188
e3c3c71290 Fix events 2019-11-01 22:17:24 +08:00
Him188
8178a8c81a Improve performance 2019-11-01 20:03:43 +08:00
Him188
efb3213371 Fix solveCaptcha on Jvm 2019-11-01 18:00:04 +08:00
Him188
f78c47348e Add suspend shortcuts for toExternalImage 2019-11-01 10:23:18 +08:00
Him188
34f10fe2cf adjust login result 2019-11-01 09:44:12 +08:00
Him188
e2171fd158 adjust logger colors 2019-10-31 23:11:55 +08:00
Him188
dd0501521c Restore ip resolver 2019-10-31 22:30:52 +08:00
Him188
048fe647f0 Reduce multiplatform functions 2019-10-31 22:19:26 +08:00
Him188
71d5dda297 ByteArrayPool 2019-10-30 23:00:29 +08:00
Him188
3f56faae75 Fixed image 2019-10-27 21:49:50 +08:00
Him188
c973fbd0d1 Fixed image 2019-10-27 21:26:20 +08:00
Him188
c63f54bc8c Fix bugs 2019-10-27 18:28:36 +08:00
Him188
82707d5ec6 Update docs 2019-10-27 13:10:38 +08:00
Him188
ff160c20c8 Graceful ImageUploading 2019-10-27 03:37:00 +08:00
Him188
0a471e9b31 Add extensions for images 2019-10-26 18:43:53 +08:00
Him188
490255bcd5 Update docs 2019-10-26 17:06:40 +08:00
Him188
28859056a1 Improve image uploading 2019-10-26 15:54:02 +08:00
Him188
a2f35f5d2d ExternalImage 2019-10-26 15:52:31 +08:00
Him188
3dfaa4ee00 Powerful MessageChains 2019-10-25 00:51:55 +08:00
Him188
d5bf51a357 Adjust class names 2019-10-24 22:55:33 +08:00
Him188
3ab540d5f2 Rename BufferedImage as ExternalImage 2019-10-24 15:03:42 +08:00
Him188
0334d33d7e Extensions of subscribers for Bot 2019-10-24 15:02:57 +08:00
Him188
eed9c8f160 Let BotNetworkHandler implements CoroutineScope 2019-10-24 10:59:13 +08:00
Him188
b7628cd3d6 Adjust package names and file names 2019-10-22 20:08:08 +08:00
Him188
3f30bb4d54 Image uploading is now available 2019-10-22 15:28:48 +08:00
Him188
cfd5b2e845 Image uploading is now available 2019-10-21 01:41:33 +08:00
Him188
d6201a14ba Image uploading is now available 2019-10-21 01:21:24 +08:00
Him188
0494b374ba Image sending is now available 2019-10-20 22:01:50 +08:00
Him188
bc57001e36 Image uploading 2019-10-20 21:37:34 +08:00
Him188
14722eb838 Image uploading 2019-10-20 20:27:35 +08:00