Him188
|
db588f949f
|
Add missing SinceMirai
|
2020-09-15 09:47:32 +08:00 |
|
Him188
|
4aeb23fe81
|
Introduce companion object for BotFactory
|
2020-09-15 09:47:01 +08:00 |
|
Him188
|
c4b76db4a1
|
Merge branch 'master' into dev
|
2020-09-08 12:10:32 +08:00 |
|
Him188
|
0388e1756f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2020-09-08 12:10:07 +08:00 |
|
Him188
|
557c933e61
|
Add JvmBlockingBridge for Image.queryUrl
|
2020-09-08 12:09:54 +08:00 |
|
Him188
|
dd051eb710
|
Merge pull request #505 from shenshaoming/master
change the way of device lock verify
|
2020-09-01 20:13:35 +08:00 |
|
Him188
|
89974923f8
|
Merge pull request #561 from sandtechnology/Fix#550
Fix #550: NoSuchElementException when concatenating an EmptyMessageChain with another
|
2020-09-01 20:09:28 +08:00 |
|
sandtechnology
|
208ecfc1b2
|
Fix #550
|
2020-09-01 12:41:11 +08:00 |
|
Him188
|
bd4dcec68e
|
Fix copyright
|
2020-08-23 19:57:09 +08:00 |
|
yyuueexxiinngg
|
f577a5fd99
|
Make BotJoinGroupEvent.Active and .Invite inherit BotJoinGroupEvent (#532)
|
2020-08-23 16:38:17 +08:00 |
|
Karlatemp
|
e7a1ee20e5
|
Semantic (#526)
|
2020-08-22 12:15:35 +08:00 |
|
Him188
|
e56e4ec1db
|
Fix LockFreeLinkedList.isEmpty, also fixes ContactList.isEmpty
|
2020-08-22 01:28:55 +08:00 |
|
Him188
|
0dd4974250
|
Add blocking bridge for group.uploadVoice, close #512
|
2020-08-19 20:42:40 +08:00 |
|
Him188
|
31f688cdca
|
Merge remote-tracking branch 'origin/dev' into dev
|
2020-08-19 10:22:23 +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
|
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
|
6235dd20ea
|
Fix typo
|
2020-08-18 22:41:49 +08:00 |
|
Him188
|
91853acab0
|
Remove receiver type from nextEvent.filter
|
2020-08-18 22:38:48 +08:00 |
|
Him188
|
3340651998
|
Enhance nextEvent and nextEventOrNull : add filter
|
2020-08-18 22:37:26 +08:00 |
|
Him188
|
329f18a0cb
|
Deprecate String.toMessage for semantic issue with mirai code
|
2020-08-18 21:44:24 +08:00 |
|
Him188
|
419a8f84c4
|
Deprecate URL.toExternalImage, Input.toExternalImage and relevant APIs.
|
2020-08-18 21:21:21 +08:00 |
|
mzdluo123
|
bebe75271c
|
fix build
|
2020-08-18 20:33:35 +08:00 |
|
HelloWorld
|
7d321ee206
|
Merge branch 'dev' into dev
|
2020-08-18 20:16:12 +08:00 |
|
Him188
|
de05757799
|
Fix function name after merging (from uploadGroupVoice to uploadVoice)
|
2020-08-18 20:10:07 +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 |
|
sandtechnology
|
293e4fb06f
|
Format and annotation
|
2020-08-18 15:25:39 +08:00 |
|
申劭明
|
31773954ad
|
Update HyperLinkLabel.kt
修改代码格式
|
2020-08-18 13:09:01 +08:00 |
|
shenshaoming
|
8b22e922a0
|
添加internal访问限制
|
2020-08-18 12:23:18 +08:00 |
|
shenshaoming
|
df7779b88b
|
修改提示信息
|
2020-08-18 11:58:38 +08:00 |
|
shenshaoming
|
9b53fb99ad
|
修改设备锁验证方式,改为通过点击超链接弹出页面
|
2020-08-18 10:54:57 +08:00 |
|
mzdluo123
|
f779ac08ac
|
fix typo
|
2020-08-18 10:39:01 +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 |
|
mzdluo123
|
ea8ed17844
|
add @SinceMirai("1.2.0") to voice upload api
|
2020-08-18 10:31:03 +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
|
ecd00f8c55
|
Merge remote-tracking branch 'origin/dev' into dev
|
2020-08-17 22:43:47 +08:00 |
|
mzdluo123
|
f96c20767d
|
simple api for send group voice message #423
|
2020-08-17 22:43:22 +08:00 |
|
Karlatemp
|
39775c2fa0
|
日志系统可以重定向为log4j等jvm日志系统 (#498)
* Close #395
* LoggerAdapters
|
2020-08-17 22:21:53 +08:00 |
|
Karlatemp
|
2161b67775
|
Fix ListenerHost: inappropriate receiver for invoke for Java methods. (#499)
* Fix the abnormal behavior of ListenerHost.
* Rename test unit name
|
2020-08-17 21:18:37 +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
|
3a346686ed
|
using none to instead exclamation mark
|
2020-08-17 19:39:46 +08:00 |
|
sandtechnology
|
bf8d07f87b
|
Fix test error
|
2020-08-17 18:53:51 +08:00 |
|
mzdluo123
|
7cc6241e45
|
some things about can't receive friend message
|
2020-08-16 20:12:28 +08:00 |
|
ryoii
|
fdbbe0b205
|
[Renaissance] Fix typo
|
2020-08-16 10:28:17 +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 |
|