Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
Mirai
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
Mirai
Commits
6dca4419
Commit
6dca4419
authored
Nov 06, 2019
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add platform details
parent
770b137a
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
21 additions
and
25 deletions
+21
-25
mirai-core/src/androidMain/kotlin/net/mamoe/mirai/MiraiEnvironment.kt
...rc/androidMain/kotlin/net/mamoe/mirai/MiraiEnvironment.kt
+3
-1
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt
+1
-1
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/MiraiEnvironment.kt
...src/commonMain/kotlin/net.mamoe.mirai/MiraiEnvironment.kt
+8
-1
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/Event.kt
...core/src/commonMain/kotlin/net.mamoe.mirai/event/Event.kt
+2
-16
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/TIMBotNetworkHandler.kt
....mamoe.mirai/network/protocol/tim/TIMBotNetworkHandler.kt
+1
-1
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/Packet.kt
...lin/net.mamoe.mirai/network/protocol/tim/packet/Packet.kt
+3
-2
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/MiraiEnvironmentJvm.kt
...src/jvmMain/kotlin/net/mamoe/mirai/MiraiEnvironmentJvm.kt
+3
-3
No files found.
mirai-core/src/androidMain/kotlin/net/mamoe/mirai/MiraiEnvironment.kt
View file @
6dca4419
package
net.mamoe.mirai
actual
object
MiraiEnvironment
\ No newline at end of file
actual
object
MiraiEnvironment
{
actual
val
platform
:
Platform
get
()
=
Platform
.
ANDROID
}
\ No newline at end of file
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt
View file @
6dca4419
...
...
@@ -74,7 +74,7 @@ class Bot(val account: BotAccount, val logger: MiraiLogger) {
configuration
:
BotNetworkConfiguration
,
cause
:
Throwable
?
=
null
):
LoginResult
{
logger
.
warning
(
"Rei
nitializing BotNetworkHandler"
)
logger
.
info
(
"I
nitializing BotNetworkHandler"
)
try
{
network
.
close
(
cause
)
}
catch
(
e
:
Exception
)
{
...
...
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/MiraiEnvironment.kt
View file @
6dca4419
package
net.mamoe.mirai
expect
object
MiraiEnvironment
\ No newline at end of file
expect
object
MiraiEnvironment
{
val
platform
:
Platform
}
enum
class
Platform
{
ANDROID
,
JVM
}
\ No newline at end of file
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/Event.kt
View file @
6dca4419
...
...
@@ -3,9 +3,7 @@
package
net.mamoe.mirai.event
import
kotlinx.coroutines.*
import
net.mamoe.mirai.contact.Contact
import
net.mamoe.mirai.event.internal.broadcastInternal
import
net.mamoe.mirai.network.BotNetworkHandler
import
net.mamoe.mirai.utils.DefaultLogger
import
net.mamoe.mirai.utils.MiraiLogger
import
kotlin.coroutines.CoroutineContext
...
...
@@ -31,7 +29,7 @@ abstract class Event {
}
else
throw
UnsupportedOperationException
()
/**
* 取消事件. 事件需实现 [Cancellable] 才可以被取消
, 否则调用这个方法将会得到 [UnsupportedOperationException]
* 取消事件. 事件需实现 [Cancellable] 才可以被取消
*
* @throws UnsupportedOperationException 如果事件没有实现 [Cancellable]
*/
...
...
@@ -48,7 +46,7 @@ abstract class Event {
internal
object
EventLogger
:
MiraiLogger
by
DefaultLogger
(
"Event"
)
val
EventDebuggingFlag
:
Boolean
by
lazy
{
private
val
EventDebuggingFlag
:
Boolean
by
lazy
{
false
}
...
...
@@ -83,20 +81,8 @@ suspend fun <E : Event> E.broadcast(context: CoroutineContext = EmptyCoroutineCo
}
}
/**
* 事件协程调度器.
*
* JVM: 共享 [Dispatchers.Default]
*/
internal
expect
val
EventDispatcher
:
CoroutineDispatcher
/**
* 事件协程作用域.
* 所有的事件 [broadcast] 过程均在此作用域下运行.
*
* 然而, 若在事件处理过程中使用到 [Contact.sendMessage] 等会 [发送数据包][BotNetworkHandler.sendPacket] 的方法,
* 发送过程将会通过 [withContext] 将协程切换到 [BotNetworkHandler] 作用域下执行.
*/
object
EventScope
:
CoroutineScope
{
override
val
coroutineContext
:
CoroutineContext
=
EventDispatcher
+
CoroutineExceptionHandler
{
_
,
e
->
...
...
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/TIMBotNetworkHandler.kt
View file @
6dca4419
...
...
@@ -329,7 +329,7 @@ internal class TIMBotNetworkHandler internal constructor(override val bot: Bot)
else
->
{
error
(
"No decrypter found"
)
}
}
as
D
}
as
?
D
?:
error
(
"Internal error: could not cast decrypter found for factory to class Decrypter"
)
suspend
fun
onPacketReceived
(
packet
:
Any
)
{
//complex function, but it doesn't matter
when
(
packet
)
{
...
...
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/Packet.kt
View file @
6dca4419
...
...
@@ -158,6 +158,8 @@ enum class KnownPacketId(override inline val value: UShort, override inline val
override
fun
toString
():
String
=
factory
.
let
{
it
::
class
.
simpleName
}
?:
this
.
name
}
// endregion
object
IgnoredPacket
:
Packet
sealed
class
EventPacket
{
...
...
@@ -195,7 +197,7 @@ sealed class EventPacket {
)
:
Packet
@CorrespondingEvent
(
GroupMessageEvent
::
class
)
class
GroupMessage
:
Packet
{
class
GroupMessage
:
Packet
{
// TODO: 2019/11/6 改为 data class
var
groupNumber
:
UInt
=
0
u
internal
set
var
qq
:
UInt
=
0
u
...
...
@@ -231,7 +233,6 @@ object UnknownPacket : Packet {
*/
object
NoPacket
:
Packet
// endregion
// region Internal utils
...
...
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/MiraiEnvironmentJvm.kt
View file @
6dca4419
...
...
@@ -2,6 +2,6 @@
package
net.mamoe.mirai
actual
typealias
MiraiEnvironment
=
MiraiEnvironmentJvm
object
MiraiEnvironmentJvm
\ No newline at end of file
actual
object
MiraiEnvironment
{
actual
val
platform
:
Platform
get
()
=
Platform
.
JVM
}
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment