github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-10 18:40:15 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,824 Commits 68 Branches 330 Tags 107 MiB
e4d3a17281
Commit Graph

2337 Commits

Author SHA1 Message Date
Karlatemp
cbae09bf4a
JceRequestSBufferBuilder 2021-01-17 17:42:02 +08:00
Him188
3098a7d953 Broadcast FriendAddEvent on acceptNewFriendRequest 2021-01-17 17:18:11 +08:00
Him188
45072c92d3 Broadcast MemberJoinEvent on acceptMemberJoinRequest, fix #641 2021-01-17 17:16:20 +08:00
Karlatemp
57463fddd8
mirai-login-solver-selenium 1.0-dev-14 2021-01-15 00:47:47 +08:00
Him188
1e55d15047 Fix potential SvcReqMSFLoginNotify (OtherClient online) decode failure 2021-01-14 18:11:53 +08:00
Him188
b49894a4f1 Merge remote-tracking branch 'origin/dev' into dev 2021-01-14 18:00:25 +08:00
Him188
10ef21dd91 Simplify internal implementation 2021-01-14 12:38:13 +08:00
Him188
067ab7c765 Replace deprecation calls internally 2021-01-14 12:28:00 +08:00
Karlatemp
d48ccee708
Splicing fragmented plain text 2021-01-14 11:48:11 +08:00
sandtechnology
3cc3f52e69
Fix #856, also fix wrong comment in PbPushTransMsg.kt (#859) 2021-01-13 21:46:16 +08:00
sandtechnology
72ca12a347
Fix long message error again (#858) 
* Fix #195 again, also fix #539

* Let AtAll consistent with At

Co-authored-by: Him188 <Him188@mamoe.net>

* Change Member to NormalMember for capable events

* Make StrangerRelationChangeEvent sealed

* 2.0-RC

* Fix dokka

* Fix #195 again

* Revert Image length to 260 and increase limit to 15000

* Add fallback measure to group message

* Remove unnecessary log

Co-authored-by: Him188 <Him188@mamoe.net>

Co-authored-by: Him188 <Him188@mamoe.net>
 2021-01-13 21:45:35 +08:00
sandtechnology
837bae41fc
Fix Long message error (#857) 
* Fix #195 again, also fix #539

* Let AtAll consistent with At

Co-authored-by: Him188 <Him188@mamoe.net>

* Change Member to NormalMember for capable events

* Make StrangerRelationChangeEvent sealed

* 2.0-RC

* Fix dokka

* Fix #195 again

Co-authored-by: Him188 <Him188@mamoe.net>
 2021-01-13 18:53:00 +08:00
sandtechnology
72f870a3df
Fix inconsistent message length (#855) 
* Fix #195 again, also fix #539

* Let AtAll consistent with At

Co-authored-by: Him188 <Him188@mamoe.net>

Co-authored-by: Him188 <Him188@mamoe.net>
 2021-01-13 17:25:07 +08:00
Him188
0b2bb82d10 Change Member to NormalMember for capable events 2021-01-12 18:11:47 +08:00
sandtechnology
b9f78be0d5
Support C2C sync and fragmented message decoding of friend (#841) 
* Support C2C sync and fragmented message in friend

* Update mirai-core-api/src/commonMain/kotlin/event/events/MessageSyncEvent.kt

* Update mirai-core-api/src/commonMain/kotlin/event/events/MessageSyncEvent.kt

* Update mirai-core-api/src/commonMain/kotlin/event/events/MessageSyncEvent.kt

* Update mirai-core-api/src/commonMain/kotlin/event/events/MessageSyncEvent.kt

Co-authored-by: Him188 <Him188@mamoe.net>
 2021-01-11 23:32:32 +08:00
Him188
219ecde909
Merge pull request #842 from sandtechnology/FixPCClientMsg 
Fix missed PC client message
 2021-01-11 23:27:34 +08:00
sandtechnology
ee906d85f3 Fix missed PC client message 2021-01-11 21:44:58 +08:00
Him188
d1c9acf7f4 Migrate to new GroupTempMessageEvent 2021-01-11 19:26:15 +08:00
Him188
564c961d3f Add low level APIs for recalling message 2021-01-11 19:11:46 +08:00
Him188
a7dabd63aa Allow modifying IMirai.Http 2021-01-11 18:57:01 +08:00
Him188
190a098227 Do not kill bot on offline. Fix #838 2021-01-11 17:59:07 +08:00
Him188
1d4867d9b6 Merge remote-tracking branch 'origin/dev' into dev 2021-01-11 17:39:28 +08:00
Him188
25ad97766c Fix potential memory leak. #556 2021-01-11 17:39:10 +08:00
Him188
7f8003478c Make OtherClientInfo.platform nullable. 2021-01-11 17:14:24 +08:00
Him188
c074bef9c6 Deprecate TempMessageEvent and add GroupTempMessageEvent for #429 2021-01-11 17:09:01 +08:00
Karlatemp
01c050d0b6
FragmentedMsgParsingCache 2021-01-10 23:20:15 +08:00
sandtechnology
268dcc7039
Support PushStatus and add new ClientKind, Fix #787 (#836) 
* Support PushStatus and improve ClientKind

* Revert NotNull changes
 2021-01-10 23:18:14 +08:00
Him188
c8298b1cac Filter redundant At around QuoteReply sent by Android clients 2021-01-10 04:38:20 +08:00
Him188
ad6e951be8 Fix MessageSource.originalMessage: now offline sources does not have MessageSource in their originalMessage 2021-01-10 03:44:58 +08:00
Him188
b65afd8533 Fix messageSourceKind for OfflineMessageSource in QuoteReply 2021-01-10 03:12:30 +08:00
Him188
1a1eb0e2a4 [Review] MessageSourceBuilder 2021-01-09 21:36:27 +08:00
Him188
989cd3292e Merge remote-tracking branch 'origin/dev' into dev 2021-01-09 14:54:02 +08:00
Karlatemp
bca98c72d5
Fix StackOverflowError in QuoteReply 
fix #829
 2021-01-09 13:11:07 +08:00
Him188
619dafa1ae [Review] Move Listener.ConcurrencyKind and Listener.EventPriority to top-level 2021-01-08 12:41:42 +08:00
Him188
4e2108d841 [Review] NudgeEvent: Simplify and stabilize NudgeEvent, remove all XXXNudgeEvent, add single NudgeEvent 2021-01-08 12:28:12 +08:00
Him188
8f998320ca Fix sendAndExpect retry 2021-01-08 12:04:15 +08:00
Him188
7dd7f48994 Don't catch Error while reconnecting and sending packet, fix #824 2021-01-08 12:03:42 +08:00
Him188
b32090bf2a [Review] OtherClient: 
- Change Bot.otherClients to ContactList<OtherClient>
- Change OtherClient.id to delegate info.appId
- Stabilize OtherClientInfo
 2021-01-08 11:42:44 +08:00
Him188
1885db5523 Code cleanup 2021-01-08 11:37:09 +08:00
Him188
976901603e [Review] MessageRecallEvent: make author and operator not null 2021-01-08 11:11:45 +08:00
Him188
b17c269b62 [Review] Add FlashImage.from(Image), remove deprecated FriendImage.flash and GroupImage.flash 2021-01-08 08:33:47 +08:00
Him188
668398c597 Fix build 2021-01-07 21:11:30 +08:00
Him188
986ebd3c5c [Review] Mirai code: rename CodableMessage.appendAsMiraiCode to appendMiraiCodeTo 2021-01-07 21:05:36 +08:00
Him188
d4852ceb6f [Review] Add missing @MiraiExperimentalApi to appendMiraiCode 2021-01-07 20:53:29 +08:00
Him188
faece77942 [Review] Rearrange utilities 2021-01-06 16:09:44 +08:00
Him188
41a34bdf65 [Review] Extract MessageSerializersImpl to separate file 2021-01-06 15:55:26 +08:00
Him188
5b74f2a64e [Review] Move JavaFriendlyApi to Annotations.kt 2021-01-06 15:02:49 +08:00
Him188
dc449bdca9 [Review] Code cleanup 2021-01-06 14:59:20 +08:00
Him188
1215a56775 [Review] LowLevelApiAccessor: 
- Rename method names, remove "_lowLevel"
- Add blocking bridges
 2021-01-06 14:58:06 +08:00
Him188
1f0d8363f6 Cover all message types in tests 2021-01-06 14:45:00 +08:00
Him188
1fc7698b9b Fix MessageSerializationTest.kt 2021-01-06 14:42:04 +08:00
Him188
ebc7d655e3 Message serialization, fix #767 2021-01-06 13:14:57 +08:00
sandtechnology
866df1b2e1
Fix empty marketFace name and failed to decode on PC (#817) 
* Fix empty marketFace name and failing decoding on PC

* Fix build

Co-authored-by: Him188 <Him188@mamoe.net>
Co-authored-by: Karlatemp <karlatemp@vip.qq.com>
 2021-01-06 00:08:36 +08:00
Him188
1d24a810fe Unify image id 2021-01-05 23:28:34 +08:00
Him188
b7232182ae Ignore OnlinePush.PbPushTransMsg msgType=529, subtype=9. Fix #743 2021-01-05 23:00:26 +08:00
Him188
f00bb216b6 Support sending friend image to group, #307 2021-01-05 22:31:08 +08:00
Him188
ac03d405f9 Support sending group image to friend, #307 2021-01-05 22:31:08 +08:00
Him188
767eb75d4e Move Http client from MiraiPlatformUtils to IMirai.Http 
Delete MiraiPlatformUtils

Add timeout configuration for ktor HttpClient, fix #673
 2021-01-05 20:43:04 +08:00
Him188
95e6ca4c7a Add BotOfflineEvent.reconnect, support auto-reconnect control. 
AbstractBot.offlineListener is now MONITOR
 2021-01-05 20:23:00 +08:00
Him188
44053ae85f Extract network logic to separate classes to speed up inspections 2021-01-05 18:16:20 +08:00
sandtechnology
7d43ab20f8
Syncing when joined group by other client & Add missed invitor in invite event (#804) 
* Introduce UserInfo and change uin to id

* Stranger api: List and asStranger

* Stranger api: Events

* Stranger api: MessageDSL and MessageSource

* Update docs

* Improve LoginSolver

fix project-mirai/mirai-login-solver-selenium#4

* Improve SeleniumLoginSolver loading

* Fix MessageChain.fragmented

* 2.0-M2-1

* Stranger api change: StrangerRelationChangeEvent

* Stranger impl: list and asStranger

* Stranger impl: get stranger list and del stranger protocol

* Stranger impl: add stranger protocol

* Stranger impl: MessageSource refactor and sending&receiving message

* Stranger impl: Dropping long message support (server rejected)

* Stranger impl: sending stranger message when member is stranger

* Fix wrong key

Co-authored-by: Him188 <Him188@mamoe.net>

* Add @LowLevelApi

Co-authored-by: Him188 <Him188@mamoe.net>

* Remove redundant val modifier

* Replace nudge if statement to when statement

* Move list seq to QQAndroidClient

* Replace id with uin in UserInfo and fix build error

* Using by lazy in asStranger

* Fix wrong wordings

* Fix wrong wordings in uploading image

* Fix nudge

* Fix #478, sync other client join group

* Change to NormalMember and update toString method

Co-authored-by: Karlatemp <karlatemp@vip.qq.com>

* Launch on bot network scope

Co-authored-by: Him188 <Him188@mamoe.net>

* Fix TarsDecoder

fix #762

* Fix TarsInput.skipField

Co-authored-by: Him188 <Him188@mamoe.net>
Co-authored-by: Karlatemp <karlatemp@vip.qq.com>
 2021-01-05 17:27:40 +08:00
sandtechnology
24a95201a0
Fix wrong mute packet decoding (#811) 2021-01-05 12:43:21 +08:00
Karlatemp
7edcf987ce
Fix TarsInput.skipField again 2021-01-05 00:18:08 +08:00
sandtechnology
2d5a37f220
Remove debug information in StrangerList.kt (#809) 
* Remove debug information in StrangerList.kt

* Format
 2021-01-04 20:13:06 +08:00
Karlatemp
fce2ac469e
Fix TarsInput.skipField 2021-01-03 23:49:51 +08:00
Karlatemp
1eecefd16e
Fix TarsDecoder 
fix #762
 2021-01-03 22:24:28 +08:00
Karlatemp
9c60961271
Fix display of At 2021-01-01 23:54:13 +08:00
Karlatemp
6bc67c7c48
Fix display of At 2021-01-01 23:51:24 +08:00
sandtechnology
1117c14c7d
Support Stranger & Fix #664 (#795) 
* Introduce UserInfo and change uin to id

* Stranger api: List and asStranger

* Stranger api: Events

* Stranger api: MessageDSL and MessageSource

* Update docs

* Improve LoginSolver

fix project-mirai/mirai-login-solver-selenium#4

* Improve SeleniumLoginSolver loading

* Fix MessageChain.fragmented

* 2.0-M2-1

* Stranger api change: StrangerRelationChangeEvent

* Stranger impl: list and asStranger

* Stranger impl: get stranger list and del stranger protocol

* Stranger impl: add stranger protocol

* Stranger impl: MessageSource refactor and sending&receiving message

* Stranger impl: Dropping long message support (server rejected)

* Stranger impl: sending stranger message when member is stranger

* Fix wrong key

Co-authored-by: Him188 <Him188@mamoe.net>

* Add @LowLevelApi

Co-authored-by: Him188 <Him188@mamoe.net>

* Remove redundant val modifier

* Replace nudge if statement to when statement

* Move list seq to QQAndroidClient

* Replace id with uin in UserInfo and fix build error

* Using by lazy in asStranger

* Fix wrong wordings

* Fix wrong wordings in uploading image

* Fix nudge

Co-authored-by: Him188 <Him188@mamoe.net>
Co-authored-by: Karlatemp <karlatemp@vip.qq.com>
 2021-01-01 21:39:45 +08:00
Him188
901c8b5267 Fix image upload, close #797 2021-01-01 17:07:39 +08:00
Him188
77a0fb4c34 Fix NormalMember.toString 2021-01-01 15:55:19 +08:00
Him188
1a1c15d0d3 Fix potential memory leak on login 2020-12-31 23:50:16 +08:00
Him188
31a5957509 Fix potential memory leak on login 2020-12-31 23:49:12 +08:00
Him188
c9cc29d1d4 Fix JavaApiTest 2020-12-31 21:00:49 +08:00
Him188
c82eb29769 MarketFace should not implement CodableMessage 2020-12-31 17:33:31 +08:00
Karlatemp
7a9557dab7
Fix MessageChain.fragmented 2020-12-30 22:17:44 +08:00
Karlatemp
e9e9a12137
Improve LoginSolver 
fix project-mirai/mirai-login-solver-selenium#4
 2020-12-30 18:22:57 +08:00
Karlatemp
dca1eab5a5
Improve voice upload 2020-12-28 17:44:19 +08:00
Him188
9347d6baf6 Fix voice upload, fix #782 2020-12-28 16:39:30 +08:00
Him188
d8228c523e Fix voice transform 2020-12-28 16:03:17 +08:00
Him188
31a8932070 Fix voice upload 2020-12-28 15:10:47 +08:00
Him188
dfad8572ee Use OkHttp client than CIO 2020-12-28 15:10:32 +08:00
Him188
fc72811e2a Hide Message serializers and postpone implementations later 2020-12-28 14:20:51 +08:00
sandtechnology
ca5835e058
Support delete friend (#776) 
* Support delete friend

* Improvement Member delete

* Add @JvmBlockingBridge

* Revert changes in GetFriendListReq

* Fix build error

* Apply suggestions, check if friend still exist before executing

Co-authored-by: Him188 <Him188@mamoe.net>

* Just let delete function existed in Friend

* Delete missed delete function

* Revert kick function return value to unit

* Let delete function throwing exception instead of returning boolean

* Update doc

* Revert missed kick function change

Co-authored-by: Him188 <Him188@mamoe.net>
 2020-12-28 00:36:34 +08:00
sandtechnology
2b1fe9f27a
Support Group Honor (Talkative Only) (#774) 
* Support Group Honor (Talkative Only)

* Apply suggestions from code review

Co-authored-by: Him188 <Him188@mamoe.net>

* Replace Member with NormalMember

Co-authored-by: Him188 <Him188@mamoe.net>
 2020-12-28 00:34:55 +08:00
Him188
0198e3363a 2.0-M2-dev-13 2020-12-27 23:57:12 +08:00
Him188
42f824d516 Integrate Voice APIs with ExternalResource 2020-12-27 23:31:04 +08:00
Him188
16e4bde07e Stable MessageKey 2020-12-27 23:04:16 +08:00
Him188
b2f0424418 Remove deprecated APIs 2020-12-27 22:47:31 +08:00
Him188
392d62142b Fix tests 2020-12-27 20:36:11 +08:00
Him188
7fe0eb23b6 Improve logs 2020-12-27 18:51:26 +08:00
Him188
e38fb5c1d0 Improve logging on login and init failure 2020-12-27 18:44:57 +08:00
Him188
ec6e23d450 Introduce EventChannel.registerListenerHost and deprecate ListenerHost.registerEvents 2020-12-27 15:57:27 +08:00
Him188
de4bbafbd4 Unified FriendInfoImpl and MemberInfoImpl 2020-12-27 15:28:54 +08:00
Him188
1152fe9357 Print more details on Friend.checkIsFriendImpl and FriendInfo.checkIsInfoImpl 2020-12-27 15:13:08 +08:00
Him188
ac95ef4472 Move EventChannel kotlin function reference extensions to separate file 2020-12-27 15:05:30 +08:00
Him188
7df0c96004 Add Java friendly functional event subscribers to EventChannel 2020-12-27 14:47:09 +08:00
Him188
96c7b51094 Check passwordMd5 on BotAccount init 2020-12-27 14:24:13 +08:00
Him188
eacdfed97a Fix serialization 2020-12-26 23:42:44 +08:00
Him188
5196cc410a Bot.otherClients now does not include self, close #770 2020-12-26 22:22:06 +08:00