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,277 Commits 68 Branches 330 Tags 107 MiB
95013a6ca2
Commit Graph

2111 Commits

Author SHA1 Message Date
Him188
1e7aaaec48 Rearrange protocol implementations 2020-11-01 15:07:32 +08:00
AdoptOSS
fd5b0251d0
Use emptyList() as the default value of List<*> for ProtoBuf (#666) 2020-11-01 08:30:30 +08:00
Karlatemp
75f3f9de93
Review remark 
- Change DeprecationLevel of FriendRemarkChangeEvent.newName to ERROR
- Simplify logic
 2020-10-29 12:51:45 +08:00
Karlatemp
d1d5435e99
remark 2020-10-28 12:43:28 +08:00
Karlatemp
14e3ddf8d6
Remark support 2020-10-28 12:33:17 +08:00
Karlatemp
d3f6b3ce33
Merge branch 'remark' into dev 
# Conflicts:
#	mirai-core/src/commonMain/kotlin/contact/FriendImpl.kt
 2020-10-28 11:46:02 +08:00
AdoptOSS
bb3d039bf8
Simplify DeviceInfo (#655) 
* Simplify DeviceInfo

* Place random string helper properly

* Make DeviceInfo::random java-friendly
 2020-10-27 08:57:28 +08:00
Karlatemp
26fdf6b22d
Merge remote-tracking branch 'origin/dev' into 1.x 
# Conflicts:
#	build.gradle.kts
#	mirai-core-api/src/commonMain/kotlin/event/events/bot.kt
#	mirai-core-api/src/commonMain/kotlin/event/events/friend.kt
 2020-10-03 22:15:52 +08:00
Karlatemp
c1f609d0de
Nugde stability update 2020-10-03 22:12:49 +08:00
Him188
0477ed94e8 Fix tests 2020-10-03 13:47:36 +08:00
Him188
0d96ea53d0 Fix build 2020-10-03 13:44:19 +08:00
Him188
80722aaea7 Pretty buildscript 2020-10-03 13:35:05 +08:00
Him188
a9d4d14576 Rearrange module structure: 
- Rename mirai-core to mirai-core-api
- Rename mirai-core-qqandroid to mirai-core
- Rename package net.mamoe.mirai.qqandroid to net.mamoe.mirai.internal
- Delete old android targets
- Configure default packages correctly
- Update licenses
 2020-10-03 12:42:13 +08:00
Him188
fb2f437a21 Merge remote-tracking branch 'origin/dev' into dev 2020-10-03 12:09:12 +08:00
Him188
32705d9920 Remove JvmBlockingBridge on Image.queryUrl 2020-10-03 12:08:57 +08:00
Karlatemp
e643988c87
Standard Captcha update (#543) 
* Standard Captcha update

- Add icon
- Typo
- System tips

* Remove unnecessary message.

* Update WindowHelperJvm.kt
 2020-09-28 13:29:45 +08:00
Him188
780598d6fa Add mirai-core-all 2020-09-22 18:56:27 +08:00
Karlatemp
ae6d6a8f9c
Fix BotJoinGroupEvent.Retrieve.toString() (#606) 2020-09-20 01:33:34 +08:00
Karlatemp
d860d6b328
Support friend remark 2020-09-19 21:39:41 +08:00
Him188
1b7252e8ef Update event README 2020-09-16 12:12:22 +08:00
Him188
1717501d85 Fix nudge 2020-09-16 09:44:05 +08:00
Him188
8a7f56f90b Redesign nudge 2020-09-15 22:42:28 +08:00
Him188
c21b28e160 Add SinceMirai for FriendNudgeEvent 2020-09-15 21:24:46 +08:00
sandtechnology
59f465f66b
Support Nudge (#600) 
* Support Nudge message

* Delete duplicated code

* Renamed NudgeManager and using boolean return value in Nudge method

* Fix document and remove JvmSynthetic annotation

* Remove test code

* Add document for bot object

* use checkIsFriendImpl to instead cast operation

* Add a space between char and number

* Change the text of bot and member to reference

* Revert change in QQAndroidBotNetworkHandler

* Make debug log more clearly

* Support tracking chat target in FriendNudgeEvent

* Add LICENSE in NudgePacket.kt
 2020-09-15 21:17:21 +08:00
Him188
140a851d46 Add SinceMirai for _lowLevelGetGroupHonorListData 2020-09-15 19:35:29 +08:00
Karlatemp
359c9cdc5f
Support Group Retrieve, fix #528 (#531) 
* Support Group Retrieve, fix #528

* Code Review

- Fix unexpected member in owner changing event.
- Allocate group when changing the owner to the bot if group is missing.
 2020-09-15 19:30:52 +08:00
Karlatemp
8d0fd96a22
Fix Ansi Pollution (#596) 2020-09-15 19:29:27 +08:00
Hieuzest
152709a0f1
Fix: add host for Voice.url (#584) 
* Fix: add host for Voice.url

* Full return url for Voice
 2020-09-15 19:29:16 +08:00
yyuueexxiinngg
1faccc72f3
Add low level api for getting group honor members list. (#501) 
* Add low level api for getting group honor members list.

* Remove default value for level name, unifies serialize result typing in GroupHonorTypeSerializer

* Remove unnecessary commas

* Remove filed 'bkn' from GroupHonorListData to prevent potential credential leak

* _GetGroupHonorList support getting ACTIVE data

* Add @SinceMirai("1.3.0") annotation to GroupHonorInfo

* Add @JvmStatic annotation, rename GroupHonorType.fromInt to .deserializeFromInt and make it internal
 2020-09-15 12:54:02 +08:00
Him188
19e8d8c6ed Fix group info, e.g. isMuteAll, isAllowMemberInvite. Close #286 2020-09-15 12:51:25 +08:00
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
Him188
45cde508a9 Merge remote-tracking branch 'origin/dev' into dev 2020-08-22 12:57:09 +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
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
9bf6a59d9b Fix #511: group.uploadImage causes compiler error in Java 2020-08-19 20:36:31 +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
4703095f46 Use JvmBlockingBridge 2020-08-18 22:09:05 +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
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
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
Him188
2d83b69d06 Update copyright 2020-08-16 01:31:14 +08:00
Him188
8b421ec45c Remove improper inline functions 2020-08-01 22:10:56 +08:00
Him188
43407aa427 Fix #470: Network Protocol: java.lang.IllegalStateException: returnCode = -10008 2020-07-31 22:49:07 +08:00
Him188
9a9ff4a58e Add supertype GroupEvent for GroupMessageEvent 2020-07-31 22:34:41 +08:00
Him188
8c4855a10e Fix build 2020-07-31 22:32:22 +08:00
Him188
1d0b42df73 Cleanup 2020-07-31 16:33:12 +08:00
Him188
01e887fff5 Fix clashed Jvm classname 2020-07-31 16:32:23 +08:00
Him188
87e76d4890 Update Kotlin version to 1.4 and relevant libraries 2020-07-31 16:29:25 +08:00
Him188
2b09cdaa12 Add JDK bindings 2020-07-31 16:26:22 +08:00
Him188
80c477b42e Improve documents 2020-07-30 01:12:40 +08:00
Him188
5607301244 Close #450: add BotConfiguration.loadDeviceInfoJson 2020-07-30 01:12:05 +08:00
Him188
ac91e77b5f Fix #427: documentation issue on syncFromEvent 2020-07-30 01:02:18 +08:00
Him188
d51678fa29 Misc improvements 2020-07-30 00:53:03 +08:00
Him188
474e548137 Move MiraiCode from mirai-serialization to mirai-core 2020-07-30 00:52:36 +08:00
Him188
22b9868f13 Use Kotlin language level 1.4 2020-07-30 00:51:48 +08:00