github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-08 17:20:11 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,231 Commits 68 Branches 330 Tags 107 MiB
76a70f596f
Commit Graph

765 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
Him188
f613b7f7b7 Support other client messages: 
- Add OtherClientMessageEvent
 2020-12-23 22:46:10 +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
f1136e9b37 Add ContactList.getOrFail 2020-12-23 20:50:12 +08:00
Him188
8b988585d6 Add OtherClient 2020-12-23 20:15:11 +08:00
Him188
e978918303 Change event constructors from internal to public with @MiraiInternalApi 2020-12-23 19:53:37 +08:00
Him188
85853b88c1 Add ContactOrBot.bot 2020-12-23 19:30:15 +08:00
Him188
8d0d53a8b8 Suppress UNUSED_PARAMETER for JvmMethodEventsTestJava 2020-12-23 18:41:55 +08:00
Him188
c0c7853ab7 Fix build 2020-12-23 18:38:46 +08:00
Him188
f691a8f3e0 Add ContactOrBot.avatarUrl 2020-12-23 18:35:36 +08:00
Him188
cce37faae9 Add Message.contentEquals parameter strict for checking element properties. 2020-12-23 18:23:17 +08:00
Him188
4a8aded303 Fix doc 2020-12-23 18:02:44 +08:00
Him188
ff855fc6f1 Add Message.deserializeFromJsonString and Message.serializeToJsonString 2020-12-23 18:02:35 +08:00
Him188
21cb125984 Move MessageKey from Message.kt to MessageKey.kt 2020-12-23 17:51:13 +08:00
Him188
77a4aa8977 Code cleanup, improve docs 2020-12-23 17:48:22 +08:00
Him188
75d5020a0a Improve docs 2020-12-23 17:44:33 +08:00
Him188
ed2c223125 Implement MessageChain.hashCode and MessageChain.equals 2020-12-23 17:41:01 +08:00
Him188
93aeda2aeb Merge remote-tracking branch 'origin/dev' into dev 2020-12-22 13:15:24 +08:00
Him188
55a7ca82f7 Wrap exceptions thrown in EventHandler with relevant event so as to allow obtaining event instance in SimpleListenerHost.handleException. Fix #533 2020-12-22 13:15:02 +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
Him188
6540b71bbd
Merge pull request #748 from lc6a/dev 
Update README.md
 2020-12-21 22:48:03 +08:00
sandtechnology
5a7771012b Fix protocol error again, thanks to @wdvxdr1123 and MiraiGo 2020-12-21 22:45:56 +08:00
lc6a
87407e97d9
Update README.md 
修改写错的内容
 2020-12-21 22:09:56 +08:00
Karlatemp
2b041f64f8
Merge branch 'anonymous' into dev, close #432 2020-12-21 13:05:08 +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
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
c934ff5b89
Use ConcurrentLinkedQueue for EventSystem, #630 2020-12-20 10:49:17 +08:00
Karlatemp
c96e7b609e
Support anonymous in network 2020-12-20 09:56:42 +08:00
Karlatemp
1083e5d625
Low level api for mute AnonymousMember 2020-12-20 09:51:23 +08:00
Him188
565abae671 Improve docs 2020-12-20 09:46:14 +08:00
Him188
51703eb8ba Check mirai.no-desktop 2020-12-20 09:46:02 +08:00
Him188
9d8e0ebf02 Improve StandardCharImageLoginSolver: 
- Add loggerSupplier
- Improve log message
 2020-12-20 09:45:04 +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
279758f08f
Merge pull request #728 from sandtechnology/Fix-voice 
Fix #577: voice compression
 2020-12-20 08:10:14 +08:00
Him188
79242ed483 Add BuilderInference to selectMessages and whileSelectMessages 2020-12-20 08:05:32 +08:00
Him188
945bcc9b5b Add MessageChain.findIsInstance 2020-12-20 08:04:56 +08:00
Him188
65d98314e0 Add AbstractMessageEvent to fix #732 2020-12-19 22:53:35 +08:00
Karlatemp
3252221308
fix protocol 
Thanks Mrs4s/MiraiGo

fix #737
Maybe fix:#717
 2020-12-19 21:42:21 +08:00
Karlatemp
7994bcec0e
Fix EventListeners for Java 
fix #738
 2020-12-19 19:41:31 +08:00
Him188
59eea052be Update docs 2020-12-19 13:57:38 +08:00
Him188
cc8856ed1a Update docs 2020-12-19 11:15:57 +08:00
Him188
3ffdde0ca2 Use ConcurrentHashMap for Bot._instance, fix #727 2020-12-19 08:42:35 +08:00
sandtechnology
ea113dd246 Fix #577 2020-12-19 01:45:19 +08:00
Him188
13215ea34d Update docs 2020-12-19 00:22:25 +08:00
Him188
d414ce7ce7 Add migration helper for PokeMessage.type 2020-12-18 21:10:24 +08:00
Him188
dee81e6257 Change annotation Retention to BINARY for MiraiInternalApi, MiraiExperimentalApi, MemberDeprecatedApi 2020-12-18 21:03:31 +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
cf908472e2 Add migration helper for ServiceMessage 2020-12-18 20:12:06 +08:00
Him188
669b04b287 Add At.getDisplay 2020-12-18 19:56:39 +08:00
Him188
6efb2ae525 Add migration helper for At.display 2020-12-18 19:42:35 +08:00
Him188
0e19197361 Add migration helpers for OfflineMessageSource.Kind 2020-12-18 19:39:33 +08:00
Him188
a5e9bef3b6 Update docs 2020-12-18 16:26:59 +08:00
Him188
82f24b736c Fix HMPP platform structure 2020-12-18 15:37:13 +08:00
Him188
19e54d16f2 Fix build 2020-12-18 15:25:23 +08:00
Him188
f1dcda4239 Dont' suggest static import on migration for deprecated declarations in Bot.Companion 2020-12-18 15:08:11 +08:00
Him188
20a6896755 Add migration helpers for MessageEvent 2020-12-18 14:40:21 +08:00
Him188
5737dc7463 Add migration helpers for BotFactory 2020-12-18 14:29:16 +08:00
Him188
b63df48729 Add BotFactory.newBot defaults 2020-12-18 14:26:44 +08:00
Him188
61533fe8c1 Add docs 2020-12-18 14:15:08 +08:00
Him188
9c22de03e0 Add migration helper for MiraiLogger 2020-12-18 14:14:38 +08:00
Him188
bf88731086 Fix publishing and add mirai-core-all 2020-12-17 12:41:44 +08:00
Him188
ee36735632 Add deprecated constructor for migration 2020-12-17 11:34:41 +08:00
Him188
95013a6ca2 Change Duration.asHumanReadable to Duration.toHumanReadableString for clearer semantics 2020-12-17 09:21:59 +08:00
Him188
9c71a9c953 Change Bot to interface 2020-12-17 09:08:26 +08:00
Him188
caeedf5d5d Move TimeUtils from mirai-core-api to mirai-core-utils 2020-12-17 08:31:24 +08:00
Him188
16eaeac371 Deprecate Member.mute(Int) extension 2020-12-17 08:23:49 +08:00
Him188
e0b8bf687d Deprecate Member.takeIfIsFriend 2020-12-17 08:21:19 +08:00
Him188
d5c94f26b4 Add Group.contains(Member) 2020-12-17 08:16:51 +08:00
Him188
10c1bc4d8b Add doc for IMirai.BotFactory 2020-12-16 23:14:11 +08:00
Him188
c478f24db0 Update to 8.4.18 2020-12-16 22:57:37 +08:00
Him188
0888cd3f5b Change BotNudgedEvent.from to UserOrBot 2020-12-16 21:32:29 +08:00
Him188
8fa6189138 Improve nudge: 
- Introduce common UserOrBot.nudge for User and Bot
- Update docs
 2020-12-16 19:48:06 +08:00
Him188
fa983e38cf Implement QuoteReply.toString 2020-12-16 19:35:53 +08:00
Him188
51c9bf5d2b Review MessageReceipt: 
- Remove constructor parameter botAsMember
- Add extensions
 2020-12-16 19:31:05 +08:00
Him188
e7632f05d6 Migrate deprecated calls 2020-12-16 19:21:47 +08:00
Him188
4fb3d6c2b3 Internal: Suppress UnusedParameter 2020-12-16 19:16:31 +08:00
Him188
03f8cc9713 Update mirai code parser for new At 2020-12-16 19:16:14 +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
c6eef9f68e Internal code style 2020-12-16 18:36:56 +08:00
Him188
fefadad3f4 Add blocking bridges to events 2020-12-16 18:33:56 +08:00
Him188
5459e1c577 Add Contact.sendMessage(String) for convenience 2020-12-16 18:16:46 +08:00
Him188
2ed112bb5e Improve message 2020-12-16 18:16:06 +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
afd1ee30fb Introduce UserOrBot 2020-12-14 12:25:15 +08:00
Him188
115fc63890 Make At.<primary constructor> public and deprecated old _lowLevelConstructAtInstance 2020-12-14 12:16:31 +08:00
Him188
4b2385572d Remove _____newChain______ 2020-12-14 12:12:24 +08:00
Him188
5600cb5698 Fix doc 2020-12-14 12:12:11 +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
0897d0cd7e
Move MessageKey.kt to the correct directory 2020-12-11 19:52:20 +08:00
Karlatemp
f69b6fa7bb
Fix sendTo.kt package 2020-12-11 19:43:29 +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
Karlatemp
49aecee7bc
Fix ConstrainSingleTest 2020-12-11 19:08:18 +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
6b792e3ba6 Simplify MessageChain implementations 2020-12-11 14:53:47 +08:00
Him188
ffbc904bec Make LongMessage and ForwardMessageInternal data classes 2020-12-11 14:25:40 +08:00
Him188
c301ee4e89 Fix doc 2020-12-11 14:05:06 +08:00
Him188
3ad7bf3be8 Fix ambiguous contentEquals for different arguments String and Message: they now all compare contentToString directly 2020-12-11 12:49:31 +08:00
Karlatemp
83559a00d7
Fix MessageChain.getValue 2020-12-11 12:33:08 +08:00
Him188
1eba1214c3 Improve docs 2020-12-10 14:26:13 +08:00
Him188
b1dcc59e21 Make RichMessage ConstrainSingle 2020-12-10 14:26:02 +08:00
Him188
3ae783afa5 Improve docs 2020-12-10 14:01:33 +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
7df5dc65d3 Add contracts to buildMessageChain 2020-12-08 12:07:02 +08:00
Him188
9b6f386f1c Fix typo 2020-12-05 22:50:48 +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
2717bd1dae Use serializer from Message.Serializer 2020-12-05 11:37:16 +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
270109cb89 Merge remote-tracking branch 'origin/dev' into dev 2020-12-04 22:05:14 +08:00
Him188
9cbdc858e7 Rename lazyMessage to message in MiraiLogger extensions. 
https://github.com/mamoe/mirai/issues/630#issuecomment-703645344
 2020-12-04 22:04:56 +08:00
Karlatemp
0237741009
Try to open browser safely. fix #694 2020-12-04 21:08:29 +08:00
Him188
2d8c01ba8b Implement clearRegisteredSerializers 2020-12-04 13:22:33 +08:00
HoshinoTented
12c9af5c3b Fix ambiguous .use call 2020-12-04 13:19:33 +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
32e01f4a60 Redesign MessageEvent hierarchy, close #612, fix #620 2020-12-02 12:56:22 +08:00
Him188
6667d94277 Fix build 2020-12-02 12:12:18 +08:00
Him188
dc00c84820 Fix references 2020-12-02 11:29:58 +08:00
Him188
49513790d5 Fix reference 2020-12-02 10:58:05 +08:00
Him188
b4b7444550 Java-friendly APIs for MessageSource 2020-12-02 10:54:02 +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
Karlatemp
6cfd602570
Fix SwingSolver package 2020-12-01 22:36:12 +08:00
Him188
46e3f42432 Change Contact classes into interfaces 2020-12-01 15:45:57 +08:00
Him188
73b807dd0c Use ANDROID_PHONE by default, close #632 2020-12-01 12:45:15 +08:00
Him188
a7416704b6 Fix jvm method events 2020-12-01 12:44:34 +08:00
Him188
66ec1ab76a Fix ambiguous DefaultLoginSolver 2020-12-01 12:43:04 +08:00
Him188
5d04017666 Add StandardUtils 2020-12-01 12:42:42 +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
66464b87fd Simplify platform structure: merge jvmMain into commonMain 2020-12-01 12:13:43 +08:00
Him188
eafca6d4ed Simplify platform structure: merge jvmMain into commonMain 2020-11-30 23:30:57 +08:00
Him188
d0d73d5285 Fix MiraiImpl resolve 2020-11-22 14:51:39 +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
Karlatemp
f4b99367bb
Add the missing ByteArray.toExternalImage 2020-11-15 00:00:03 +08:00
Karlatemp
525830739c
Fix ReusableInput resources releasing 
fix #675
 2020-11-14 12:06:47 +08:00
Karlatemp
0ebffb735d
Fix PlatformLogger stack trace encoding 2020-11-07 14:23:56 +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
9e6b16c3e5 Fix findMiraiInstance 2020-11-01 23:54:49 +08:00
Him188
1e7aaaec48 Rearrange protocol implementations 2020-11-01 15:07:32 +08:00
Karlatemp
75f3f9de93
Review remark 
- Change DeprecationLevel of FriendRemarkChangeEvent.newName to ERROR
- Simplify logic
 2020-10-29 12:51:45 +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
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