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
5,181 Commits 68 Branches 330 Tags 107 MiB
ce95d8fdce
Commit Graph

2469 Commits

Author SHA1 Message Date
Him188
ce95d8fdce Fix RemoteFile.resolveById, fix #1177 2021-04-09 07:47:51 +08:00
Him188
d4ee81c79a Fix potential memory leak with struct ByteReadPacket 2021-04-08 22:42:24 +08:00
Him188
951ddc3138 Declare type explicitly for IDE inference issue 2021-04-08 18:07:21 +08:00
Him188
45c6adf956 Declare type explicitly for IDE inference issue 2021-04-08 13:15:24 +08:00
Him188
344c54531d Declare type explicitly for IDE inference issue 2021-04-08 13:13:23 +08:00
Him188
7be14f809c Fix build warnings 2021-04-08 12:44:58 +08:00
Him188
7feeaee1ca
Refining Messages without suspension (#1167) 
* Introduce `RefinableMessage.tryRefine` to refine without suspension.

* Extract `RefinableMessage` to separate file

* Always use `Bot` on `List<MsgComm.Msg>.toMessageChain`

* Introduce `MessageRefiner` and ensure MessageChain refined after transformation. Fix #1156, fix #1157

* Add basic tests

* Refine forward message contents

* Refine long message contents

* Move refinement from message internals to MiraiImpl public APIs

* Comment out unused `toMessageChainOffline`

* refinement tests part

* refinement tests part

* Full tests and minor internal improv.s

* Fix tests

* Fix compile
 2021-04-08 11:59:16 +08:00
Hoshino Tented
a085ab26c8
fix #1155 (#1170) 
* fix #1155

* fix unmute

* add durationSeconds check for mute

* fix stupid code

* fix me
 2021-04-07 17:34:45 +08:00
sandtechnology
5d1395a78c
Fix key refresh failed when refresh again and update dumped data (#1169) 
* Fix key refresh failed when logged with fast login

* Update dumped data and remove outdated t511 list

* Fix key refresh again

* Fix naming and support multi bot case

* Remove useless code

* Fix key refresh again, remove useless default value (ksid)
 2021-04-07 12:12:13 +08:00
Him188
bb5c85965a Simple test: MockBot 2021-04-07 00:59:08 +08:00
Karlatemp
b227f719a2
Fix kt compiler errors (#1159) 
* Fix kt compiler errors

* Revert "Fix compiler bug, fix #1136"

This reverts commit 39f6c168

* Fix log style

Co-authored-by: Him188 <Him188@mamoe.net>
 2021-04-05 22:41:26 +08:00
AdoptOSS
21e8852e0f
buildscript: fix task not found errors when android sdk not available (#1161) 
* buildscript: fix task not found errors when android sdk not available

* fix: this shadowed by run

* cleanup: code style

* improve: avoid breaking index map
 2021-04-05 22:35:38 +08:00
Him188
7521e6d17f
Rename RichMessageOrigin to MessageOrigin (#1116) 
* Rename `RichMessageOrigin` to `MessageOrigin`

* apiDump

* Change `MessageOrigin.origin` parameter type from `RichMessage` to `SingleMessage`;
Rename `RichMessageKind` to `MessageOriginKind`

* Make MessageOriginKind serializable and update docs

* Ensure binary compatibility with <2.6 and provide migration helpers

* apiDump
 2021-04-04 00:31:33 +08:00
Him188
39f6c1680c Fix compiler bug, fix #1136 2021-04-04 00:00:32 +08:00
Him188
caf9eb06ad Fix package name of StrangerImpl 2021-04-03 23:17:00 +08:00
Him188
50e60cc4fe Use system property mirai.unknown.image.type.logging to enable logging on unknown image type, helps #1111 2021-04-03 23:07:41 +08:00
Him188
cccdb3cdf2
Update docs for messages (#1142) 
* Update docs for messages

* Update docs for messages

* Update docs for messages

* Update docs for messages

* Update docs/Messages.md

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

* Update mirai-core-api/src/commonMain/kotlin/message/data/Message.kt

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

* Update docs for messages

* Update docs for messages

* Revert inappropriate changes

* Fix doc

Co-authored-by: Karlatemp <karlatemp@vip.qq.com>
 2021-04-03 22:39:55 +08:00
Him188
ea1f43b9c5
Fast login (#1154) 
* wtlogin10

* Fast login Packet Implement (#1125)

* Correct group syncing logic again, Fix #1120

* Implement fast login packet, thanks to MiraiGo

* Delete duplicated tlv

* Refresh Token when exchanging and solve connection dropping issue (#1128)

* Correct group syncing logic again, Fix #1120

* Implement fast login packet, thanks to MiraiGo

* Delete duplicated tlv

* Schedule token exchanging every 10 minutes, solve connection dropping issue

* Refresh Token when exchanging, and correct token expire time

* Remove useless params for doFastLogin

* Fix missed register and tgt update (#1131)

* Correct group syncing logic again, Fix #1120

* Implement fast login packet, thanks to MiraiGo

* Delete duplicated tlv

* Schedule token exchanging every 10 minutes, solve connection dropping issue

* Refresh Token when exchanging, and correct token expire time

* Remove useless params for doFastLogin

* Fix missed register and tgt update

* Add login lock

* Add login lock

* Remove key refresh

* Remove heartbeat period override

* Login: Update tlv and solve constant connection dropping issue (#1150)

* Correct group syncing logic again, Fix #1120

* Implement fast login packet, thanks to MiraiGo

* Delete duplicated tlv

* Schedule token exchanging every 10 minutes, solve connection dropping issue

* Refresh Token when exchanging, and correct token expire time

* Remove useless params for doFastLogin

* Fix missed register and tgt update

* Update tlv, add tlv11d and tlv11a decoding

* Add stat heartbeat, solve constant connection dropping issue

* Update apidump for new configuration

* Add comment for statHeartbeatPeriodMillis

* Change old naming

* Add since version

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

Co-authored-by: sandtechnology <20417547+sandtechnology@users.noreply.github.com>
 2021-04-03 22:31:14 +08:00
Karlatemp
f6fd4de14b
Postpone error reporting in parsing in NewContact (#1147) 
* Add `ParseErrorPacket` for postpone error report

* Continue to parse even if an error occurs
 2021-04-03 22:17:49 +08:00
Karlatemp
6e914f6941
Fix forward display (#1148) 2021-04-03 22:12:14 +08:00
Him188
3f807353b3 Remove UNSUPPORTED_MERGED_MESSAGE_PLAIN, fix #1119 2021-03-30 12:16:08 +08:00
Him188
cea4d23d7f Create OtherClientInfo from known information, fix #1109 2021-03-30 12:14:20 +08:00
Him188
fc70bb9ed8 Remove type definition to help compatibility with Kotlin 1.5 2021-03-29 23:59:03 +08:00
sandtechnology
70bbfcf786
Correct group syncing logic again, Fix #1120 (#1123) 2021-03-28 22:48:38 +08:00
Him188
de170325c9 Merge branch 'fix_1118_empty_listFiles' into dev 2021-03-28 19:32:44 +08:00
Him188
174ca300d6 Fix empty listFiles for child directories, fix #1118 2021-03-27 15:39:46 +08:00
Him188
430c2c59ad
Support UnsupportedMessage (#1112) 
* Support UnsupportedMessage

* Fix serialize

* `UnsupportedMessage.contentToString`: use `struct.contentHashCode()`

Co-authored-by: Karlatemp <karlatemp@vip.qq.com>
 2021-03-26 23:54:17 +08:00
Him188
c47535289a
Merge pull request #1115 from mamoe/transform_special_messages 
Move Dice to MarketFace conversion from `SendMessageHandler.transformSpecialMessages`...
 2021-03-26 20:36:21 +08:00
Him188
8d25025d24 Support decode Dice sent by TIM PC clients 2021-03-26 20:34:32 +08:00
Him188
efc6eda312 Move Dice to MarketFace conversion from SendMessageHandler.transformSpecialMessages to MessageChain.toRichTextElems to enable conversions for ForwardMessage 2021-03-26 19:54:11 +08:00
Karlatemp
a5e85f443e
Try fix forward message display (#1052) 
fix https://github.com/mamoe/mirai/issues/1052#issuecomment-805600071
 2021-03-25 00:01:04 +08:00
Him188
9f52a26fbd Fix FileMessage mirai code 2021-03-20 22:31:12 +08:00
Him188
5f02c35e66 Merge remote-tracking branch 'mirai/dev' into dev 2021-03-20 15:33:48 +08:00
Him188
af58c163d2 - Add FileMessage.internalId hence support serialization 
- Add FileMessage.Serializer
- Add FileMessage.create and IMirai.createFileMessage to construct manually
- Mark FileMessage as stable
- Move TestMiraiCode from mirai-core-api to mirai-core

fix #1082
 2021-03-20 15:33:08 +08:00
Karlatemp
f9353b6aef
Compiled code verify (#1080) 
* Compiled code verify

* Run `verifyCompiledClasses` in `check` task

* Redesign verification

Co-authored-by: Bo Zhang <bo@gradle.com>

* Disable console verify

* Decoupling

Co-authored-by: Bo Zhang <bo@gradle.com>
 2021-03-20 13:34:04 +08:00
Karlatemp
3152e24523
Fix operations of RemoteFile (#1104) 
* Fix operations of RemoteFile

* apiDump

* Remove duplicate method

* Don't setup fileId
 2021-03-18 12:30:06 +08:00
Karlatemp
d4532f948c
Fix duplicated MemberJoinEvent broadcast; fix #1090 2021-03-11 22:32:22 +08:00
Karlatemp
27e0f572d3
Record unlogged events 2021-03-11 18:21:21 +08:00
Him188
e256ec06d3
Support file operations (#1069) 
* Proto structs for group file

* RemoteFile fundamental abstraction and proto structs

* Configure JVM target for mirai-console-intellij

* Add Group.filesRoot

* Fix build

* Implement a FileSystem for RemoteFile resolution

* Fix RemoteFile FileSystem and implement resolve and listFiles

* Implement file info query and file download

* Support uploading group file

* Support file feeds

* 2.5-M2-dev-1

* Fix tests

* 2.5-M2-dev-2

* Add uuid-based resolving, support getting file details

* Support FileMessage receive

* Support sending FileMessage

* 2.5-M2-dev-3

* Add DownloadInfo.id

* Improve RemoteFile.delete

* Support move, delete, rename, mkdir. Simplify listFiles

* - Rename RemoteFile.write to .upload.
- Prefer id matching
- Improve move

* Add permission checks

* Improve permission checks

* Rearrange functions and add constant ROOT_PATH

* Introduce FileSupported, add extensions

* Introduce ProgressionCallback

* Fix docs and uploadFileAndSend

* Remove empty FileHighway.kt

* Add test testNormalize

* Add RemoteFile.contact, change RemoteFile.uploadAndSend return type to MessageReceipt

* Move @JvmBlockingBridge to file

* Change FileMessage.toRemoteFile parameter type Group to FileSupported

* Add impl notes #1082
 2021-03-08 18:34:45 +08:00
Karlatemp
716b8c6129
Reinitialize network before connect server 2021-03-06 21:58:57 +08:00
Karlatemp
038ea831ac
Improve logging 
- replace magic codes in sender nick and other components
 2021-03-06 18:43:02 +08:00
sandtechnology
fa59459041
Correct group syncing and add friend syncing logic, Fix #1058 (#1060) 
* Correct group syncing and add friend syncing logic, Fix #1058

* Simple method naming

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

* Replace with runBlocking

* Return events instead of broadcasting it

* Use suspend instead of runBlocking

* Make transformers suspend

Co-authored-by: Karlatemp <karlatemp@vip.qq.com>
 2021-03-05 14:12:17 +08:00
Him188
17a5d3821f Fix error message when sending message 2021-03-04 14:50:44 +08:00
Him188
ad04cd35a4 Throw BotIsBeingMutedException on errorCode 120 when sending message 2021-03-04 14:49:53 +08:00
Him188
2b6eddd0d7 Revert "Avoid using kotlin.time.Duration API in a binary-sensitive way, fix #1066" 
...since 2.5 targets Kotlin 1.4.30

This reverts commit cedb239f
 2021-03-03 09:27:37 +08:00
Him188
a8f3bc876d Merge remote-tracking branch 'mirai/dev' into dev 2021-03-03 08:06:00 +08:00
Him188
cedb239fc3 Avoid using kotlin.time.Duration API in a binary-sensitive way, fix #1066 2021-03-03 08:04:57 +08:00
Karlatemp
047a3b344e
Try fix display of ForwardMessage on iOS; #1052 2021-03-02 23:10:38 +08:00
Him188
cafd13478f Fix member permission detection in OnlinePushPbPushGroupMsg, fix #1050 2021-02-27 14:36:18 +08:00
Him188
aaab3ae109 Merge branch 'dev' into android_target 
# Conflicts:
#	build.gradle.kts
 2021-02-25 10:39:51 +08:00