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
4,042 Commits 68 Branches 330 Tags 107 MiB
4024d677cf
Commit Graph

1137 Commits

Author SHA1 Message Date
Him188
bd4dcec68e Fix copyright 2020-08-23 19:57:09 +08:00
Him188
eb8f6c8829 Merge branch 'master' into dev 2020-08-22 14:03:11 +08:00
Him188
44d90c703f Exclude kotlinx-coroutines-core and kotlin-stdlib from dependencies to avoid clashes (fix #523) 2020-08-22 12:56:41 +08:00
Him188
3e4de4fa74 Merge remote-tracking branch 'origin/dev' into dev 2020-08-22 01:32:19 +08:00
Him188
146768ea10 Fix exception message in PermissionDeniedException 2020-08-22 01:30:38 +08:00
mzdluo123
8e3fb15556
Fix receiving messages repeatedly 2020-08-21 17:57:34 +08:00
Him188
7d4df0f952 Merge branch 'dev' 2020-08-19 20:45:11 +08:00
Him188
0dd4974250 Add blocking bridge for group.uploadVoice, close #512 2020-08-19 20:42:40 +08:00
Him188
088c2712d3 Merge branch 'dev' 2020-08-19 20:38:31 +08:00
Him188
9bf6a59d9b Fix #511: group.uploadImage causes compiler error in Java 2020-08-19 20:36:31 +08:00
Him188
1b67a9fcd8 Merge branch 'dev' 2020-08-19 10:44:41 +08:00
ryoii
5edcf410b6 [Fix conflict] ReNamed pb struct 2020-08-19 10:22:53 +08:00
Him188
31f688cdca Merge remote-tracking branch 'origin/dev' into dev 2020-08-19 10:22:23 +08:00
ryoii
2f5be83279 [Fix conflict] ReNamed pb struct 2020-08-19 10:21:02 +08:00
ryoii
faa7c4189f Merge remote-tracking branch 'origin/dev' into dev 2020-08-19 10:10:11 +08:00
ryoii
08a2753fde Merge branch 'dev1.3' into dev 
# Conflicts:
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/OnlinePush.ReqPush.kt
 2020-08-19 10:09:03 +08:00
TheSnowfield
22d871c68a
update some unknown fields (#487) 
* update some unknown fields in Tlv.kt

* 1 to true
 2020-08-19 10:06:31 +08:00
Karlatemp
b42733ad15
Support Nick changed event (#507) 
* Support Nick change

* Fix up FriendInfo

* @JvmField

* Update friend.kt

Co-authored-by: Him188 <Him188@mamoe.net>
 2020-08-19 10:04:59 +08:00
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