github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-21 01:49:15 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,121 Commits 68 Branches 330 Tags 107 MiB
780598d6fa
Commit Graph

1169 Commits

Author SHA1 Message Date
Him188
b78c771430 Ignore inherited stdlib from kotlinx-io 2020-08-19 09:32:56 +08:00
Him188
679d61a6b1 Replace deprecated String.toMessage 2020-08-19 09:32:28 +08:00
Him188
fdede76f11 Merge remote-tracking branch 'origin/dev' into dev 2020-08-18 22:59:42 +08:00
Him188
4703095f46 Use JvmBlockingBridge 2020-08-18 22:09:05 +08:00
Him188
419a8f84c4 Deprecate URL.toExternalImage, Input.toExternalImage and relevant APIs. 2020-08-18 21:21:21 +08:00
HelloWorld
7d321ee206
Merge branch 'dev' into dev 2020-08-18 20:16:12 +08:00
mzdluo123
596194cb10
Merge remote-tracking branch 'origin/dev' into dev 2020-08-18 19:59:21 +08:00
mzdluo123
e840839557
try domain to connect server at first 2020-08-18 19:58:14 +08:00
Him188
6c21971ce0 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	mirai-core/src/commonMain/kotlin/net.mamoe.mirai/contact/Group.kt
 2020-08-18 19:55:12 +08:00
ryoii
996063a58f Named pb struct 2020-08-18 15:48:45 +08:00
sandtechnology
293e4fb06f Format and annotation 2020-08-18 15:25:39 +08:00
mzdluo123
e6374c8849
custom codec 2020-08-18 11:50:52 +08:00
mzdluo123
2936ce4066
Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/contact/GroupImpl.kt
 2020-08-18 10:37:41 +08:00
ryoii
0b290ba532 Fix #448 2020-08-18 10:37:21 +08:00
HelloWorld
eda8ad9318
Merge pull request #502 from yyuueexxiinngg/voice-silk-support 
Add send silk format voice support, fix typo.
 2020-08-18 10:36:50 +08:00
mzdluo123
ea8ed17844
add @SinceMirai("1.2.0") to voice upload api 2020-08-18 10:31:03 +08:00
Him188
ad74673e7f New MPP publishing (#489) 2020-08-18 09:24:44 +08:00
Him188
370e139221 Rename uploadGroupVoice to uploadVoice 2020-08-18 09:01:45 +08:00
Him188
80debd962a Migrate to new kotlinx-serialization-core; 
Embed JceKt as net.mamoe.mirai.qqandroid.utils.io.serialization.Tars (#489)
 2020-08-18 08:50:16 +08:00
sandtechnology
410f371c74 Merge branch 'dev' of https://github.com/mamoe/mirai into dev 2020-08-18 02:28:11 +08:00
sandtechnology
a062ff9ed3 支持解析好友输入状态 2020-08-18 02:25:21 +08:00
yyuueexxiinngg
c848ab2146 Add send silk format voice support, fix typo. 2020-08-18 00:53:48 +08:00
mzdluo123
10a9a035e1
fix 2020-08-18 00:51:17 +08:00
mzdluo123
c6a92d978e
fix build ╮(╯-╰)╭ 2020-08-17 22:58:29 +08:00
mzdluo123
f96c20767d
simple api for send group voice message #423 2020-08-17 22:43:22 +08:00
sandtechnology
f8eed41d62
Fix Method.registerEvent for Kotlin functions (#495) 
* Fix test error

* correct error message

* using none to instead exclamation mark
 2020-08-17 20:41:31 +08:00
sandtechnology
86cbe16b7c correct error message 2020-08-17 18:59:31 +08:00
mzdluo123
7cc6241e45
some things about can't receive friend message 2020-08-16 20:12:28 +08:00
ryoii
d33e0d6b87 [Renaissance] Fix isMute 2020-08-16 10:35:55 +08:00
Him188
9f4e24ca9e Fix imports 2020-08-16 02:09:42 +08:00
Him188
b175119f0f Merge branch 'master' into dev 
# Conflicts:
#	buildSrc/src/main/kotlin/Versions.kt
#	gradle.properties
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.common.kt
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/highway/HighwayHelper.kt
#	mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/LoginFailedException.kt
#	mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/event/JvmMethodListeners.kt
#	mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/internal/retryCatching.jvm.kt
#	settings.gradle
 2020-08-16 01:57:07 +08:00
Him188
45eea16fd5 Update license 2020-08-16 01:49:30 +08:00
Him188
2d83b69d06 Update copyright 2020-08-16 01:31:14 +08:00
Him188
3dcf28592c Update licences and README 2020-08-16 00:15:46 +08:00
Him188
43407aa427 Fix #470: Network Protocol: java.lang.IllegalStateException: returnCode = -10008 2020-07-31 22:49:07 +08:00
Him188
928c91a05e
Merge pull request #477 from Mrs4s/dev 
fix mamoe/mirai#472: group.quit() not working
 2020-07-31 20:28:52 +08:00
Him188
30e20da40f Merge remote-tracking branch 'origin/dev' into dev 2020-07-31 20:22:54 +08:00
Him188
1d0b42df73 Cleanup 2020-07-31 16:33:12 +08:00
Him188
741d8f9eca Fix friend message history syncing 2020-07-31 16:31:37 +08:00
Him188
87e76d4890 Update Kotlin version to 1.4 and relevant libraries 2020-07-31 16:29:25 +08:00
Mrs4s
97d335bc55 fix mamoe/mirai#472 2020-07-31 12:28:40 +08:00
Him188
6abc8c17e4
Merge pull request #471 from Mrs4s/dev 
fix issue of multi msg cannot view on phone.
 2020-07-31 00:07:54 +08:00
CHMing
fe306c4aaa
修复成员进群后第一次发言触发改名事件 (#475) 
* 解决最后一个mirai码之后的消息无法解析的问题

* 修复成员进群后第一次发言触发改名事件

Co-authored-by: caihongming <caihongming@iboxpay.com>
 2020-07-30 14:15:03 +08:00
Him188
6e7c20856c Merge remote-tracking branch 'origin/dev' into dev 2020-07-30 01:58:26 +08:00
Him188
d51678fa29 Misc improvements 2020-07-30 00:53:03 +08:00
Him188
1a81fbd794 Merge remote-tracking branch 'origin/explicit-api' into dev 
# Conflicts:
#	gradle.properties
 2020-07-29 23:59:19 +08:00
mzdluo123
3d773342a6
Revert "try to fix #249 again" 
This reverts commit b320d2ca
 2020-07-29 14:26:25 +08:00
mzdluo123
3eef29af80
fix #389 2020-07-28 14:59:55 +08:00
mzdluo123
b320d2caed
try to fix #249 again 2020-07-28 14:55:14 +08:00
Mrs4s
65b8d4e808 fix issue of multi msg cannot view on phone. 2020-07-28 03:18:22 +08:00
mzdluo123
2ec431489e
try to fix #249 2020-07-25 19:37:39 +08:00
Him188
719b5ac7b5 Explicit api mode 2020-07-20 15:06:30 +08:00
Him188
0a7ebffd95 Fix #428 2020-07-16 22:07:35 +08:00
ryoii
c95306c12e Fix BotJoinGroupEvent.Invite 2020-07-15 17:42:25 +08:00
ryoii
2f0ff513a2 Close #435, support FriendRecallEvent 2020-07-15 15:15:49 +08:00
ryoii
42716ab62d Fix #375, broadcast BotJoinGroupEvent when create new group from other client 2020-07-12 12:02:32 +08:00
ryoii
de484ecb9a Remove debug log 2020-07-12 11:42:21 +08:00
mzdluo123
2ae91bb216
show ptt upload speed 2020-07-11 00:24:12 +08:00
mzdluo123
4b26d4d2c2
Merge remote-tracking branch 'origin/dev' into dev 2020-07-09 21:04:41 +08:00
mzdluo123
fab0378078
fix #360 2020-07-09 12:36:51 +08:00
Him188
486a0dc5cb Merge remote-tracking branch 'origin/fixGroup' into dev 2020-07-09 01:08:54 +08:00
Him188
2a91a229a3 Fix #417 2020-07-09 01:01:30 +08:00
mzdluo123
83ee69ccc6
fix some issue 2020-07-08 23:08:35 +08:00
ryoii
aa69f570d2 Close #370, ignore messages before group is initialized 2020-07-08 16:59:51 +08:00
ryoii
becc54dd42 Close #402 2020-07-08 16:51:16 +08:00
ryoii
a74e895c41 Fix #404, #410: Bot join group from other client 2020-07-08 15:48:17 +08:00
mzdluo123
5b80ccf49a
fix can't receive voice sent from tim pc 2020-07-08 12:21:47 +08:00
mzdluo123
a174f17493
finish fix tim pc 2020-07-07 23:56:21 +08:00
mzdluo123
90a7306822
try fix tim pc 2020-07-07 20:46:41 +08:00
mzdluo123
82faf7732c
try fix tim pc 2020-07-07 11:28:39 +08:00
mzdluo123
9494472cee
add: uploadPttTosServer to HighwayHelper.kt 2020-07-07 09:45:49 +08:00
mzdluo123
038c9d1db1
add: voice upload 2020-07-06 23:47:40 +08:00
mzdluo123
07d9365d70
fix: crash when get GroupActiveData 2020-07-04 14:18:18 +08:00
Him188
2e7a326916 Suppress DEPRECATION for internal usage 2020-07-02 01:27:48 +08:00
Him188
dcfe934a83 Fix missed BotOfflineEvent.Dropped. Close #376 2020-07-02 00:34:37 +08:00
Him188
0741d484c9 Fix #372 2020-07-01 23:36:28 +08:00
Him188
6c4f00a5f8 Fix #405 2020-06-29 13:55:42 +08:00
Him188
e973079337 Merge remote-tracking branch 'origin/dev' into dev 2020-06-29 13:42:45 +08:00
ryoii
49924ea35e Close #398 2020-06-29 10:07:00 +08:00
Him188
23dd54b300 Merge remote-tracking branch 'origin/dev' into dev 2020-06-28 01:05:39 +08:00
ryoii
510a041f0c Close #393 2020-06-26 19:51:10 +08:00
ryoii
0cf9b1b975 Magic number for image type 2020-06-23 23:25:04 +08:00
Karlatemp
89386904b1
Fix #383 2020-06-23 13:22:15 +08:00
Him188
4cb5d654b2 Delegate json serialization strategy to BotConfiguration 2020-06-17 14:19:59 +08:00
Him188
877a8efed3 Ignore old Group settings. Fix #373 2020-06-16 15:20:33 +08:00
Him188
c7ab173a5d Add bug report hints 2020-06-14 19:54:04 +08:00
Him188
d7ab2c1bae Fix potential NoSuchElementException when member is kicked 2020-06-14 19:53:50 +08:00
Him188
e829939154 Arise deprecation level, fix #353 2020-06-14 19:13:31 +08:00
Him188
6f0853e6e4 Implement MessagePreSendEvent and MessagePostSendEvent. 
Deprecate `MessageSendEvent`
Fix #339
 2020-06-14 18:43:21 +08:00
Him188
4961b60494 Merge branch 'master' into dev 2020-06-12 14:43:12 +08:00
ryoii
f99981baa9 SystemMsgNewGroup type 3 2020-06-02 10:25:31 +08:00
Him188
2e8df632cd Fix #361 2020-06-01 20:38:31 +08:00
Him188
c088e423b2 (internal) _miraiContentToString: Ignore transient properties 2020-05-30 01:31:16 +08:00
Him188
480d947ac8 Fix imports 2020-05-29 17:12:01 +08:00
Him188
d2132a66ca Fix imports 2020-05-29 17:11:54 +08:00
Him188
c7b915390a Fix imports 2020-05-29 17:11:23 +08:00
Him188
0af6639e9d Fix build 2020-05-29 16:13:03 +08:00
Him188
2e119f4eeb (internal) Extendable Image.originUrl 2020-05-28 14:25:10 +08:00
Him188
c71cc53d2d Improve performance when log is disabled 2020-05-28 14:10:18 +08:00
Him188
f653f33a6f Improve stability, returns -1 for sequenceId when failed to fetch from server 2020-05-28 14:10:18 +08:00