github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-10 10:30:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,159 Commits 68 Branches 330 Tags 107 MiB
b227f719a2
Commit Graph

2459 Commits

Author SHA1 Message Date
Karlatemp
1e53f56212
Rename NotSupportedSliderCaptchaException to UnsupportedSliderCaptchaException 2020-12-24 01:14:27 +08:00
Karlatemp
2b12ae0ded
typo 2020-12-24 01:07:41 +08:00
Karlatemp
5db71cd299
Disable SliderCaptcha. #745 2020-12-24 00:34:13 +08:00
Karlatemp
dffade2a92
Don't relogin bot when bot logging in 2020-12-24 00:14:17 +08:00
Him188
7446453e8e HummerResv12 2020-12-23 22:56:10 +08:00
Him188
81ef2d4195 Merge remote-tracking branch 'origin/dev' into dev 2020-12-23 22:46:43 +08:00
Him188
f613b7f7b7 Support other client messages: 
- Add OtherClientMessageEvent
 2020-12-23 22:46:10 +08:00
Karlatemp
33ab43f222
Merge pull request #758 from sandtechnology/Update-packet 
Update outdated packet value
 2020-12-23 22:10:27 +08:00
sandtechnology
f4d2fc3ac6 Update outdated packet value 2020-12-23 21:23:28 +08:00
Him188
3b35dbcac5 Support OtherClient online status: 
- Add ClientKind
- Add OtherClientOnlineEvent,OtherClientOfflineEvent
- Add Bot.otherClients
- Add OtherClientList
 2020-12-23 20:57:39 +08:00
Him188
960b67f829 Move FriendImpl.uploadImage implementation to AbstractUser.uploadImage, simplify MemberImpl 2020-12-23 19:55:27 +08:00
Him188
db9ee62250 Add AbstractContact and AbstractUser for future inheritance 2020-12-23 19:49:04 +08:00
Him188
d7bddc77ed
Merge pull request #749 from sandtechnology/Fix-login 
Fix protocol error again, thanks to @wdvxdr1123 and MiraiGo
 2020-12-22 11:14:20 +08:00
Karlatemp
27030d150e
login result type: 239, fix #744 2020-12-21 23:33:09 +08:00
sandtechnology
5a7771012b Fix protocol error again, thanks to @wdvxdr1123 and MiraiGo 2020-12-21 22:45:56 +08:00
Karlatemp
2b041f64f8
Merge branch 'anonymous' into dev, close #432 2020-12-21 13:05:08 +08:00
Karlatemp
62f605eb35
Fix voice missing 2020-12-21 13:00:10 +08:00
Karlatemp
2aacfe4064
Merge remote-tracking branch 'origin/dev' into dev 2020-12-21 12:51:51 +08:00
Karlatemp
3d09b8f911
Support long message in private message, close #171 2020-12-21 12:50:41 +08:00
sandtechnology
23114b7e81
Support New QQ System Faces (#720) 
* Update QQ original faces name

* Add missed channel check

* Change data struct to array

* Revert "Add missed channel check"

This reverts commit e30f97dc

* Remove author

* Make internal

* Update Face implement

* Support decode and encode new system faces

* Correct the magic number

* Lazy name val

* Fix naming inconsistent

* Revert "Fix naming inconsistent"

This reverts commit b7db927f

* Fix naming inconsistent again
 2020-12-20 20:59:34 +08:00
sandtechnology
a097e494ef
Fix Sub8A (#742) 
* Fix Sub8A

* Fix error
 2020-12-20 20:58:53 +08:00
Karlatemp
b2c0f8a13a
Don't @AnonymousMember in QuoteReply 2020-12-20 16:45:17 +08:00
Karlatemp
fc9a4e73d3
Improve message logging 2020-12-20 16:28:30 +08:00
Karlatemp
de3fd9d698
Merge remote-tracking branch 'origin/dev' into anonymous 
# Conflicts:
#	mirai-core/src/commonMain/kotlin/message/incomingSourceImpl.kt
 2020-12-20 15:53:06 +08:00
Karlatemp
7796fbf2d2
Fix duplicated GroupRecall broadcast in recall group message 2020-12-20 15:43:08 +08:00
Karlatemp
28249b317c
Support parsing fragmented message. 
close #440
 2020-12-20 15:40:25 +08:00
Karlatemp
c96e7b609e
Support anonymous in network 2020-12-20 09:56:42 +08:00
Karlatemp
c6bef602b5
AnonymousMember 2020-12-20 09:54:26 +08:00
Karlatemp
1083e5d625
Low level api for mute AnonymousMember 2020-12-20 09:51:23 +08:00
Him188
e3b553b4de Improve LoginSolver, close #703: 
- Remove DefaultLoginSolver (originally experimental API)
- Add docs
- No default instance for Android platform
- LoginSolver.Default is nullable now (in case on Android platform)
- BotConfiguration.loginSolver is nullable now (meaning not provided by the user)
 2020-12-20 09:19:52 +08:00
Him188
56e7d4de3d Fix MessageRecallEvent.FriendRecall.authorId, close #704; Add MessageRecallEvent.author 2020-12-20 08:42:34 +08:00
Him188
4474a86e59 Merge remote-tracking branch 'origin/dev' into dev 2020-12-20 08:22:21 +08:00
Him188
d51b268c15 Kill bot on returnCode <=-10000, fix #691 2020-12-20 08:21:50 +08:00
Him188
fcba657fa9
Merge pull request #724 from sandtechnology/update-nudge 
Update nudge template id
 2020-12-20 08:10:52 +08:00
Him188
279758f08f
Merge pull request #728 from sandtechnology/Fix-voice 
Fix #577: voice compression
 2020-12-20 08:10:14 +08:00
Karlatemp
0bb34ee05b
Merge remote-tracking branch 'origin/dev' into anonymous 2020-12-19 23:36:09 +08:00
Karlatemp
3252221308
fix protocol 
Thanks Mrs4s/MiraiGo

fix #737
Maybe fix:#717
 2020-12-19 21:42:21 +08:00
sandtechnology
ea113dd246 Fix #577 2020-12-19 01:45:19 +08:00
Him188
e762a23f00 Improve packet queue 2020-12-18 21:32:41 +08:00
Him188
4eb0c80f08 Merge remote-tracking branch 'origin/dev' into dev 2020-12-18 20:51:29 +08:00
Karlatemp
2340486db8
Re-design Member interfaces #725 2020-12-18 20:31:24 +08:00
Him188
a616991f3e Merge remote-tracking branch 'origin/dev' into dev 2020-12-18 20:12:58 +08:00
Him188
669b04b287 Add At.getDisplay 2020-12-18 19:56:39 +08:00
Karlatemp
b8b9b0afdc
ByteArray.encodeToBase64() 2020-12-18 18:52:02 +08:00
jihuayu
17a223d9ce
fix bkn calculate error. 
close #671
 2020-12-18 18:25:34 +08:00
Him188
82f24b736c Fix HMPP platform structure 2020-12-18 15:37:13 +08:00
sandtechnology
80e1b53b63 Update nudge template id 2020-12-18 13:14:10 +08:00
Him188
20b912bee7 Fix Bot init 2020-12-17 19:50:02 +08:00
Him188
95013a6ca2 Change Duration.asHumanReadable to Duration.toHumanReadableString for clearer semantics 2020-12-17 09:21:59 +08:00
Him188
6ccd20c377 Simplify platform structure, simplify network implementations 2020-12-17 09:18:25 +08:00
Him188
9c71a9c953 Change Bot to interface 2020-12-17 09:08:26 +08:00
Him188
9fc3bad9fe Common ssoVersion, thanks to @ 
wdvxdr1123 (for the previous commit)
 2020-12-16 23:13:15 +08:00
Him188
c478f24db0 Update to 8.4.18 2020-12-16 22:57:37 +08:00
Him188
51c9bf5d2b Review MessageReceipt: 
- Remove constructor parameter botAsMember
- Add extensions
 2020-12-16 19:31:05 +08:00
Him188
6c0b6473ed Make Group.get, Bot.getFriend, Bot.getGroup return nullable. Add getOrFail for migration 2020-12-16 19:11:42 +08:00
Him188
07fc0cbf0a Migrate deprecated calls 2020-12-14 20:31:27 +08:00
Him188
c66eebfda4 Fix build 2020-12-14 20:30:41 +08:00
Him188
0662e48fd2 Use ConcurrentLinkedQueue instead of LockFreeLinkedList for ContactList 2020-12-14 19:46:56 +08:00
Him188
47b4c0f8c1 Remove At.display and defer it to message elems conversions 2020-12-14 19:46:10 +08:00
Him188
6ec0310b1a Introduce messageTarget for message elems conversions 
Introduce messageTarget for message elems conversions

Introduce messageTarget for message elems conversions
 2020-12-14 19:46:10 +08:00
Him188
895c8f6bb3 Add internal Group.uin shortcut for GroupImpl.uin, User.uin and Bot.uin for ContactOrBot.id for clearer logics 2020-12-14 12:51:42 +08:00
Karlatemp
d43cfd1e08
Improve messages logging 2020-12-13 12:10:53 +08:00
Karlatemp
0a5d3097f7
Correct format name of GroupImage 2020-12-13 11:39:54 +08:00
Karlatemp
f504dbd8f2
Move events in net.mamoe.mirai.message to net.mamoe.mirai.event.events, #699 2020-12-11 19:42:50 +08:00
Him188
f59fcf7d5d Message serialization 2020-12-11 15:52:10 +08:00
Him188
021aac1b56 Rename PokeMessage.type to PokeMessage.pokeType 2020-12-11 14:54:52 +08:00
Him188
288f325ca0 Review MessageKey and Messages: 
- Add `Image.isGroupImage`, `Image.isFriendImage`
- Simplify `FlashImage`:
  - Remove `GroupFlashImage`, `FriendFlashImage`
  - Java-friendly factory functions and Kotlin-friendly top-level constructor-like functions
- Unify names of constants in `PokeMessage.Key`
- Make constants in VipFace `@JvmField`
- Review `Image`:
  - Make `AbstractImage` internal (`@MiraiInternalApi`)
  - Improve docs
  - Move top-level regexes to companion statics
- Make Nudge.sendNudge static
- Opt-in `net.mamoe.mirai.message.data.ExperimentalMessageKey`
 2020-12-10 13:54:40 +08:00
Him188
7d5063653a Polymorphic message key, #693 2020-12-10 12:36:17 +08:00
Him188
970f51fbe1 Blocking bridges for contacts, MessageReceipt and Bot 2020-12-05 16:55:57 +08:00
Him188
db100d336f Change currentTimeSeconds from property to function 2020-12-05 16:40:34 +08:00
Him188
360df3e011 Fix Message.contentEquals: compare only contents regardless of classes. 2020-12-05 16:28:29 +08:00
Him188
f6e9f306d4 Redesign Message.Key. #693. 
- `ConstrainSingle` now extends a more general type `SingleMessage` instead of `MessageMetadata` for extendability
- `Message.Key` moved to `ConstrainSingle.Key`
- Delete `companion object Key`s from duplicable messages
 2020-12-05 12:57:34 +08:00
Him188
8e05d97315 Review MiraiLogger: 
- Replace top-level `DefaultLogger` with
  - `MiraiLogger.create`, and
  - `MiraiLogger.setDefaultLoggerCreator`
- `MiraiLogger.Companion` is no longer `MiraiLogger`, moved to `MiraiLogger.TopLevel`
- Mark `PlatformLogger` as
an internal API

close #633
 2020-12-04 22:27:26 +08:00
Him188
1cc40bd95d Don't use pool for sendPacket, #556 2020-12-04 12:46:19 +08:00
Him188
aa7bef113b Message serialization fundamentals #630, close #219 2020-12-03 14:18:49 +08:00
Him188
42a2814125 Ignore sync event, close #619 2020-12-02 16:48:38 +08:00
Him188
a7b1be99e5 Remove all functions and classes deprecated in 1.x, close #530 2020-12-02 13:20:46 +08:00
Him188
dc00c84820 Fix references 2020-12-02 11:29:58 +08:00
Him188
64bd63d7a0 Multiple MessageSource.id and MessageSource.internalId for split sources now, and split messages in the future. Close #618 2020-12-02 10:46:06 +08:00
Him188
8fdfe830fe Introduce new module mirai-core-utils 2020-12-02 09:25:25 +08:00
Karlatemp
d1bd88c001
Fix image extension. fix #635 2020-12-01 22:40:19 +08:00
Him188
46e3f42432 Change Contact classes into interfaces 2020-12-01 15:45:57 +08:00
Him188
97be9afeb9 Fix internals 2020-12-01 13:20:02 +08:00
Him188
ff9702a992 Simplify platform structure 2020-12-01 13:10:04 +08:00
Him188
3fb25a07ae Update versions 2020-12-01 13:02:45 +08:00
Him188
b55893ccb1 Simplify files 2020-12-01 12:38:02 +08:00
Him188
3910044490 Remove @SinceMirai 2020-12-01 12:30:13 +08:00
Him188
16c3e02521 Remove Context 
Simplify BotFactory
 2020-12-01 12:27:35 +08:00
Him188
eafca6d4ed Simplify platform structure: merge jvmMain into commonMain 2020-11-30 23:30:57 +08:00
Him188
641396224e Fix build 2020-11-22 14:45:03 +08:00
Him188
64b5251779 Move service to common resources 2020-11-22 14:33:18 +08:00
Him188
b8002d4b4d Hierarchical MPP: 
- JDK in common target
- Disabled common compilations
- Android targets
- Kotlin 1.4.20
 2020-11-22 14:25:49 +08:00
Him188
bbda068e78 Update buildscript 2020-11-22 11:57:47 +08:00
Karlatemp
525830739c
Fix ReusableInput resources releasing 
fix #675
 2020-11-14 12:06:47 +08:00
Him188
7c2f2bb870 Rename Mirai to IMirai, introduce top-level property Mirai to hold lazy instance. Fix build. 2020-11-07 12:21:03 +08:00
Him188
efdf68a553 Fix tests 2020-11-01 23:57:37 +08:00
Him188
17eeb56a76 Fix build 2020-11-01 23:48:26 +08:00
Him188
6391955459 Merge remote-tracking branch 'origin/dev' into dev 2020-11-01 15:16:33 +08:00
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
Him188
90185490df Implementations rearrangement 2020-07-30 00:26:55 +08:00
Him188
f1efa0016b Remove Suppress 'WRONG_MODIFIER_CONTAINING_DECLARATION' 2020-07-30 00:16:09 +08:00
Him188
dd35cc62d5 Fix #444: FriendMessageEvent is not a subclass of FriendEvent 2020-07-30 00:15:57 +08:00
Him188
c1d54f2fdf Specify @file:JvmName("BotEventsKt") for types.kt 2020-07-30 00:14:49 +08:00
Him188
4f86d15ef3 Simplify buildscript 2020-07-20 17:21:00 +08:00
Him188
719b5ac7b5 Explicit api mode 2020-07-20 15:06:30 +08:00
Karlatemp
22550cafd2
Create java test. Fix #443 (#446) 
* Create java test. Fix #443

* Typo

* gradle-kotlin-dsl
 2020-07-17 20:43:26 +08:00
Him188
9ebfef2dd8 Add tests for #436 2020-07-16 22:24:14 +08:00
Him188
2e7370a0e7 Add notes to UnsupportedSMSLoginException 2020-07-16 22:11:43 +08:00
Him188
0a7ebffd95 Fix #428 2020-07-16 22:07:35 +08:00
Him188
45785adc09 Fix #436 2020-07-16 21:11:34 +08:00
Him188
58908d60b2 Merge remote-tracking branch 'origin/dev' into dev 2020-07-16 13:47:49 +08:00
Him188
d0377a360b Add implementation notes 2020-07-16 13:47:33 +08:00
ryoii
2f0ff513a2 Close #435, support FriendRecallEvent 2020-07-15 15:15:49 +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
46af55fcdf Add @SinceMirai for MiraiProtocol 2020-07-09 01:13:41 +08:00
ryoii
5929233cf9 Fix JvmMethodEventsTest.kt 2020-07-08 17:29:25 +08:00
mzdluo123
a174f17493
finish fix tim pc 2020-07-07 23:56:21 +08:00
mzdluo123
82faf7732c
try fix tim pc 2020-07-07 11:28:39 +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
mzdluo123
2eac5ab607
android watch 2020-07-03 23:08:44 +08:00
Him188
a95acad028 Remove withJava() for IDE issue https://youtrack.jetbrains.com/issue/KT-39991 2020-07-03 16:52:34 +08:00
Him188
9a57f35890 Support Nothing type for EventHandler; Add Java tests 2020-07-03 16:12:55 +08:00
Him188
c18a62deed Fix potential Job shadowing in SimpleListenerHost.coroutineContext 2020-07-03 15:52:25 +08:00
Him188
ecf4b8b95b Fix build 2020-07-02 01:27:16 +08:00
Him188
447e7349fc Move MiraiProtocol from BotConfigurationBase to BotConfiguration 2020-07-02 01:20:49 +08:00
Him188
dcfe934a83 Fix missed BotOfflineEvent.Dropped. Close #376 2020-07-02 00:34:37 +08:00
Him188
680dc0f0cf Fix memory leak on failure on image uploading (Fix #385, fix #387) 2020-07-01 23:24:14 +08:00
Him188
dfddfae876 Add PlatformLogger.printLog, .Color, .timeFormat, .color (Fix #407) 2020-07-01 22:27:42 +08:00
Him188
04eb59dc51 Make BotConfigurationBase public, fix #409 2020-07-01 22:15:08 +08:00
Him188
2de1ebf3df Fix documentation on @PlannedRemoval 2020-07-01 22:11:22 +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
Him188
74af082a2a Update README.md 2020-06-26 19:31:05 +08:00
Him188
5dbc9b3015 Remove Event.DoNotImplementThisClassButExtendAbstractEvent for compiling issue 2020-06-26 19:01:10 +08:00
ryoii
9375c0fa7b Regex for extension name of image 2020-06-24 21:16:38 +08:00
ryoii
0cf9b1b975 Magic number for image type 2020-06-23 23:25:04 +08:00
Him188
4cb5d654b2 Delegate json serialization strategy to BotConfiguration 2020-06-17 14:19:59 +08:00
Him188
7d79f0a8f2 Revert "Deprecate FriendFlashImage and GroupFlashImage in the favor of general FlashImage" 
This reverts commit 36fd7ccd
 2020-06-16 16:08:23 +08:00
Him188
d993dff499 Update module descriptions 2020-06-16 16:05:36 +08:00
Him188
e2e68b091b Make botInstancesSequence stable API 2020-06-16 15:43:36 +08:00
Him188
b10d339adc Add missing @MiraiExperimentalAPI 2020-06-16 15:20:53 +08:00
Him188
245d52149e Add default dir and file for redirectBotLogToDirectory and redirectBotLogToFile 2020-06-16 15:11:57 +08:00
Him188
c4541c8fdc Fix directory detecting 2020-06-16 15:10:03 +08:00
Him188
f175d07c0a Introduce multi-platform BotConfiguration structure; Add redirectNetworkLogToDirectory functions, fix #371 2020-06-16 15:09:32 +08:00
Him188
6684f35379 Add deprecation warnings, Fix #374 2020-06-16 14:16:58 +08:00
Him188
1e15edc39b Add tests for MessageChain delegations 2020-06-15 16:04:14 +08:00
Him188
3178aeb619 Fix doc 2020-06-15 16:03:54 +08:00
Him188
e52c341155 Arise deprecation level 2020-06-15 15:02:53 +08:00
Karlatemp
f5165f7d77
Add Manifest; Disabling SwingSolver with vm property mirai.no-desktop (#362) 
* Disabling SwingSolver with vm property 'mirai.no-desktop'

// for ssh
// java -Dmirai.no-desktop ....

* Add Manifest

* Removed Per-Entry Attributes

Co-authored-by: Him188 <Him188@mamoe.net>
 2020-06-15 11:13:15 +08:00
Him188
f74ee547f2 Fix #369 2020-06-14 23:47:56 +08:00
Niltok
169942237f
Add name for Face (#345) 
* add faceName

* fix incorrect merge

* fix misspelling

* fix incorrect access control

* fix test

* fix typo
 2020-06-14 20:03:37 +08:00
Him188
c7ab173a5d Add bug report hints 2020-06-14 19:54:04 +08:00
Him188
35f2335a5f Fix build 2020-06-14 19:20:00 +08:00
Him188
e829939154 Arise deprecation level, fix #353 2020-06-14 19:13:31 +08:00
Him188
2d1bc6578e Fix reference in KDoc 2020-06-14 18:48:58 +08:00
Him188
6f0853e6e4 Implement MessagePreSendEvent and MessagePostSendEvent. 
Deprecate `MessageSendEvent`
Fix #339
 2020-06-14 18:43:21 +08:00
Him188
4c79d4cd18 Add @MustBeDocumented to MiraiInternalAPI and MiraiExperimentalAPI 2020-06-14 18:36:32 +08:00
Him188
4cb870cb85 Fix build 2020-06-13 22:40:38 +08:00
Him188
f0a67d781e Improve docs on mirai code 2020-06-12 16:33:26 +08:00
Him188
7583172976 Remove parentheses in mirai code of VipFace 2020-06-12 16:02:09 +08:00
Him188
d2602cb97f Introduce interface CodableMessage 2020-06-12 15:59:06 +08:00
Him188
4961b60494 Merge branch 'master' into dev 2020-06-12 14:43:12 +08:00
Him188
4c9532bad6 Update docs 2020-06-07 18:48:43 +08:00
ryoii
9fd2468354 Fix #340 2020-06-06 14:48:27 +08:00
Him188
d689c6c9d0 Improve docs 2020-06-05 13:33:47 +08:00
Him188
2e8df632cd Fix #361 2020-06-01 20:38:31 +08:00
Him188
2dcd8ffea0 Fix log time 2020-06-01 18:11:55 +08:00
Him188
0d98f47348 Fix FlashImage.toString 2020-05-29 17:09:52 +08:00
Him188
0af6639e9d Fix build 2020-05-29 16:13:03 +08:00
Him188
0a928407e7 Remove @Serializable from core module 2020-05-29 14:16:32 +08:00
Him188
36fd7ccda6 Deprecate FriendFlashImage and GroupFlashImage in the favor of general FlashImage 2020-05-29 13:50:47 +08:00
Him188
dd7e2d0bc1 Rename CustomMessage.Factory.serialize to CustomMessage.Factory.dump; 
Rename `CustomMessage.Factory.deserialize` to `CustomMessage.Factory.load`.
Add `CustomMessage.toByteArray()`
 2020-05-29 13:24:59 +08:00
Him188
a5f9504b10 Add Bot.botInstancesSequence 2020-05-28 14:25:11 +08:00
Him188
2e119f4eeb (internal) Extendable Image.originUrl 2020-05-28 14:25:10 +08:00
Him188
9ced447055 Remove @ExperimentalCoroutinesApi since Flow.fold is now stable 2020-05-28 14:10:18 +08:00
Him188
5c7dff223c Mark PttMessage and Voice with @MiraiExperimentalAPI 2020-05-28 14:10:18 +08:00
Him188
0153ed9fa5 Fix build 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
Him188
a084eac8be Rearrange internal implementations 2020-05-28 14:10:18 +08:00
Him188
57b85a3517 Add Bot.botInstancesSequence 2020-05-28 14:10:18 +08:00
Him188
5fd1ba86eb (internal) Extendable Image.originUrl 2020-05-28 14:10:18 +08:00
Him188
1d971badd9 Add docs 2020-05-28 14:08:39 +08:00
Him188
1f308b3018 Update docs 2020-05-28 14:08:37 +08:00
Him188
df8c9e947b Merge remote-tracking branch 'origin/master' 2020-05-27 22:35:22 +08:00
Him188
4b893563bc Add docs 2020-05-27 22:35:04 +08:00
ryoii
7fd5cfe3bb Low level api for request event again 2020-05-25 22:40:10 +08:00
Him188
534ba00f69 Remove (internal) low level API for responding events 2020-05-25 15:33:32 +08:00
Him188
906fbfc191 Fix various ReplaceWith 2020-05-25 14:23:27 +08:00
Him188
aad0cbe6e2 Setup mirai-doc publishing 2020-05-24 16:42:42 +08:00
Him188
452dd94831 Fix doc reference 2020-05-24 16:00:49 +08:00
Him188
4ac4607902 Remove BotJoinGroupEvent.Invite.invitorName as not provided by the server 2020-05-24 14:46:35 +08:00
Him188
0b62370d9d Make MessageEvent constructors internal for future compatibility 2020-05-24 14:44:18 +08:00
Him188
b2b8e1206a Optimize internal event logs 2020-05-24 14:29:59 +08:00
Him188
f558537465 Fix KDoc, close #337 2020-05-24 14:22:17 +08:00
Him188
fb9980f61b Close #341 2020-05-24 14:14:06 +08:00
Him188
9631a2de1f Fix loggers 2020-05-24 14:10:43 +08:00
Him188
5485ffe801 Support Bot.isOnline, close #342 2020-05-24 14:09:16 +08:00
Him188
ab464388c1 Support BotJoinGroupEvent.Invite, close #344 2020-05-24 13:50:36 +08:00
Him188
e8345c382d Make event constructors internal for future compatibility 2020-05-24 13:25:29 +08:00
ryoii
250497dcad Close #338 2020-05-24 10:55:36 +08:00
ryoii
2ca73a4383 Low level api for request event 2020-05-23 21:57:22 +08:00
Him188
0376bc6002 Fix test 2020-05-22 22:49:24 +08:00
Him188
3c1ee33ee0 Fix Java function resolving 2020-05-22 13:20:59 +08:00
Him188
abf367bd5c Fix test 2020-05-22 12:33:17 +08:00
Him188
fa80753250 Update docs 2020-05-22 12:28:56 +08:00
Him188
d47c764a81 Update coroutine version 2020-05-22 00:04:30 +08:00
Him188
5d37d279cb Ignore reply when muted 2020-05-21 23:32:21 +08:00
Him188
5871f727dc Fix exception logging 2020-05-21 21:27:02 +08:00
Him188
c053a31f87 Add warning for unspecified deviceInfo 2020-05-21 21:12:20 +08:00
Him188
ae8d6e0cd2 Fix doc and DefaultLogger usage 2020-05-21 20:35:18 +08:00
Him188
f848473289 Improve loggers: 
Make SimpleLogger open;
Simplify PlatformLogger;
PlatformLogger on JVM now has `isColored` param and prints exception canonically;
Unify log format;
 2020-05-21 20:32:49 +08:00
Him188
b4a3d13011 Add experimental nameAligned and simpleName to SimpleLogger.LogPriority 2020-05-21 17:53:03 +08:00
Him188
3f4dd1ec12 Improve PlatformLogger.jvm, prints stacktrace to a specified output 2020-05-21 17:52:36 +08:00
Him188
6aaba6c5ae Use non-strict JSON serialization for deviceInfo 2020-05-21 17:27:52 +08:00
Him188
b75f90d541 Fix duplicated BotJoinGroupEvent, 
Improve toString of Active, Kick events,
Cancel Group when kicked,
Fix #319
 2020-05-21 16:49:57 +08:00
Him188
2de767d499 Fix unexpected exception thrown when no bot available on Image.queryUrl() 2020-05-21 10:39:13 +08:00
Him188
7172ef628c Fix NPE on initialization of Bot 2020-05-21 10:38:21 +08:00
Him188
e4e526ca80 Support object implementations of Event 2020-05-16 15:32:09 +08:00
Him188
23273718fe Improve docs 2020-05-16 15:17:04 +08:00
Him188
3d06219c67 Introduce SimpleListenerHost for a better Java API 2020-05-16 15:11:03 +08:00
Him188
61284f1d9b Improve docs 2020-05-16 14:35:14 +08:00
Him188
ae32536ed5 Move BotImpl and BotNetworkHandler to mirai-core-qqandroid. 2020-05-16 14:29:03 +08:00
Him188
46598d686c Cleanup; 
Use interface for JavaFriendly APIs;
Deprecate event responder in Bot in the favor of their member functions;
Deprecate `Bot.queryUrl(image: Image)`` in the favor of the extension `Image.queryUrl`
 2020-05-16 14:14:21 +08:00
Him188
dc8945aa39 Increase default heartbeatTimeoutMillis 2020-05-14 19:24:49 +08:00
Him188
4cc814cda5 Annotate Bot.selfQQ with @MiraiExperimentalAPI 2020-05-14 19:24:38 +08:00
Him188
9b52aa6012 No backing field for MemberJoinRequestEvent.group 2020-05-14 19:12:34 +08:00
Him188
f5db6e0201 Improve docs 2020-05-14 19:12:32 +08:00
Him188
29012d74c1 Add docs 2020-05-11 15:50:18 +08:00
Him188
aa12684050 Let ContactOrBot implements CoroutineScope 2020-05-11 15:28:31 +08:00
Him188
7f33f48f98 Improve docs 2020-05-11 15:28:20 +08:00
Him188
68a9d49237 Add a java way to broadcast an event 2020-05-11 15:15:52 +08:00
Him188
f7533e3cd6 Fix #318 2020-05-11 14:32:52 +08:00
Him188
45f00b4651 Fix VerifyError 2020-05-11 11:34:08 +08:00
Him188
8f65a416cd Extract events to separate files 2020-05-11 10:04:18 +08:00
Him188
1db7bba837 Make FriendEvent.bot final 2020-05-11 09:53:03 +08:00
Him188
5be7f2bb2d Fix #315 2020-05-11 09:50:18 +08:00
Him188
d8ef80ea97 Adjust visibility 2020-05-11 09:48:53 +08:00
Him188
2295e832bb Pass @ExperimentalCoroutinesApi to the caller of Message.plus(Flow<Message>) 2020-05-10 19:46:25 +08:00
Him188
719c4b402d Clear group members after Bot completion 2020-05-10 17:55:01 +08:00
Him188
b0888a272e Use Message.plus extensions instead of member functions 2020-05-10 16:09:10 +08:00
Him188
4e187cc95b Fix Message.repeat 2020-05-10 15:47:37 +08:00
Him188
06205cb69b Improve Bot life cycle management, close #317 2020-05-10 15:41:08 +08:00
Him188
aa2805b81f Let ContactList<C> implement Collection<C> 2020-05-10 15:34:06 +08:00
Him188
0b4f53ee12 Optimize Face constructor 2020-05-10 02:55:12 +08:00
Him188
3238223a3f Add doc 2020-05-10 02:54:31 +08:00
Him188
90c0c5c549 Optimize experimental API usages 2020-05-10 02:22:16 +08:00
Him188
904513667c Fix reference 2020-05-10 01:50:35 +08:00