Merge remote-tracking branch 'origin/master'

2025-01-21 17:34:45 +08:00 · 2019-08-18 20:14:16 +08:00 · 2019-08-18 20:14:16 +08:00 · dc3d8063b7
commit dc3d8063b7
parent 0b6f4a271d ceef31610b
27 changed files with 65 additions and 35 deletions
--- a/mirai-core/src/main/java/net/mamoe/mirai/MiraiMain.java
+++ b/mirai-core/src/main/java/net/mamoe/mirai/MiraiMain.java
@ -1,11 +1,8 @@
 package net.mamoe.mirai;


-import net.mamoe.mirai.event.MiraiEventHook;
-import net.mamoe.mirai.event.events.server.ServerDisableEvent;
-
 /**
- * @author Him188moe @ Mirai Project
+ * @author Him188moe
 */
 public final class MiraiMain {
    private static MiraiServer server;
--- a/mirai-core/src/main/java/net/mamoe/mirai/contact/Contact.kt
+++ b/mirai-core/src/main/java/net/mamoe/mirai/contact/Contact.kt
@ -3,7 +3,7 @@ package net.mamoe.mirai.contact
 /**
 * A contact is a QQ account or a QQ Group.
 *
- * @author Him188moe @ Mirai Project
+ * @author Him188moe
 */
 abstract class Contact(val number: Int) {

--- a/mirai-core/src/main/java/net/mamoe/mirai/contact/Lazy.kt
+++ b/mirai-core/src/main/java/net/mamoe/mirai/contact/Lazy.kt
@ -7,6 +7,10 @@ fun Int.asGroup(): Group = Instances.groups.stream().filter { t: Group? -> t?.nu

 fun String.withImage(id: String, type: String) = "{$id}.$type"

+fun String.withAt(qq: Int) = qq.asQQ().at()
+
+fun String.withAt(qq: QQ) = qq.at()
+
 object Instances {
    var qqs = arrayListOf<QQ>()
    var groups = arrayListOf<Group>()
--- a/mirai-core/src/main/java/net/mamoe/mirai/contact/QQ.kt
+++ b/mirai-core/src/main/java/net/mamoe/mirai/contact/QQ.kt
@ -1,7 +1,7 @@
 package net.mamoe.mirai.contact

 /**
- * @author Him188moe @ Mirai Project
+ * @author Him188moe
 */
 class QQ(number: Int) : Contact(number) {
    init {
--- a/mirai-core/src/main/java/net/mamoe/mirai/event/events/robot/RobotEvents.kt
+++ b/mirai-core/src/main/java/net/mamoe/mirai/event/events/robot/RobotEvents.kt
@ -4,7 +4,7 @@ import net.mamoe.mirai.event.events.MiraiEvent
 import net.mamoe.mirai.network.Robot

 /**
- * @author Him188moe @ Mirai Project
+ * @author Him188moe
 */
 class RobotLoginEvent(val robot: Robot) : MiraiEvent()

--- a/mirai-core/src/main/java/net/mamoe/mirai/network/Protocol.kt
+++ b/mirai-core/src/main/java/net/mamoe/mirai/network/Protocol.kt
@ -5,7 +5,7 @@ import java.util.*
 import java.util.stream.Collectors

 /**
- * @author Him188moe @ Mirai Project
+ * @author Him188moe
 */
 interface Protocol {
    companion object {
--- a/mirai-core/src/main/java/net/mamoe/mirai/network/Robot.kt
+++ b/mirai-core/src/main/java/net/mamoe/mirai/network/Robot.kt
@ -25,7 +25,7 @@ import java.net.InetSocketAddress
 /**
 * [number] is a QQ number.
 *
- * @author Him188moe @ Mirai Project
+ * @author Him188moe
 */
 class Robot(val number: Int, private val password: String) {
    private var sequence: Int = 0
--- a/mirai-core/src/main/java/net/mamoe/mirai/network/packet/Packet.java
+++ b/mirai-core/src/main/java/net/mamoe/mirai/network/packet/Packet.java
@ -1,7 +1,7 @@
 package net.mamoe.mirai.network.packet;

 /**
- * @author Him188moe @ Mirai Project
+ * @author Him188moe
 */
 public interface Packet {

--- a/mirai-core/src/main/java/net/mamoe/mirai/network/packet/PacketId.java
+++ b/mirai-core/src/main/java/net/mamoe/mirai/network/packet/PacketId.java
@ -6,7 +6,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;

 /**
- * @author Him188moe @ Mirai Project
+ * @author Him188moe
 */
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
--- a/mirai-core/src/main/java/net/mamoe/mirai/network/packet/PacketUtil.java
+++ b/mirai-core/src/main/java/net/mamoe/mirai/network/packet/PacketUtil.java
@ -1,7 +1,7 @@
 package net.mamoe.mirai.network.packet;

 /**
- * @author Him188moe @ Mirai Project
+ * @author Him188moe
 */
 public final class PacketUtil {

--- a/mirai-core/src/main/java/net/mamoe/mirai/network/packet/client/ClientPacket.kt
+++ b/mirai-core/src/main/java/net/mamoe/mirai/network/packet/client/ClientPacket.kt
@ -11,7 +11,7 @@ import java.net.InetAddress
 import java.security.MessageDigest

 /**
- * @author Him188moe @ Mirai Project
+ * @author Him188moe
 */
@ExperimentalUnsignedTypes
 abstract class ClientPacket : ByteArrayDataOutputStream(), Packet {
--- a/mirai-core/src/main/java/net/mamoe/mirai/network/packet/client/ClientSendMessagePacket.kt
+++ b/mirai-core/src/main/java/net/mamoe/mirai/network/packet/client/ClientSendMessagePacket.kt
@ -1,7 +1,7 @@
 package net.mamoe.mirai.network.packet.client

 /**
- * @author Him188moe @ Mirai Project
+ * @author Him188moe
 */
@ExperimentalUnsignedTypes
 class ClientSendMessagePacket : ClientPacket() {
--- a/mirai-core/src/main/java/net/mamoe/mirai/network/packet/client/login/ClientLoginPacket.kt
+++ b/mirai-core/src/main/java/net/mamoe/mirai/network/packet/client/login/ClientLoginPacket.kt
@ -11,7 +11,7 @@ import net.mamoe.mirai.util.hexToBytes
 /**
 * Password submission (0836_622)
 *
- * @author Him188moe @ Mirai Project
+ * @author Him188moe
 */
@PacketId("08 36 31 03")
@ExperimentalUnsignedTypes
@ -120,7 +120,7 @@ class ClientLoginSucceedConfirmationPacket(
 }

 /**
- * @author Him188moe @ Mirai Project
+ * @author Him188moe
 */
@ExperimentalUnsignedTypes
 private fun ClientPacket.writePart1(qq: Int, password: String, loginTime: Int, loginIP: String, tgtgtKey: ByteArray, token0825: ByteArray) {
--- a/mirai-core/src/main/java/net/mamoe/mirai/network/packet/client/login/ClientLoginVerificationCodePacket.kt
+++ b/mirai-core/src/main/java/net/mamoe/mirai/network/packet/client/login/ClientLoginVerificationCodePacket.kt
@ -10,7 +10,7 @@ import net.mamoe.mirai.util.ByteArrayDataOutputStream
 import net.mamoe.mirai.util.TEACryptor

 /**
- * @author Him188moe @ Mirai Project
+ * @author Him188moe
 */
@PacketId("00 BA 31 01")
@ExperimentalUnsignedTypes
--- a/mirai-core/src/main/java/net/mamoe/mirai/network/packet/client/login/ClientServerRedirectionPacket.kt
+++ b/mirai-core/src/main/java/net/mamoe/mirai/network/packet/client/login/ClientServerRedirectionPacket.kt
@ -13,7 +13,7 @@ import java.io.IOException
 /**
 * Server redirection (0825 response)
 *
- * @author Him188moe @ Mirai Project
+ * @author Him188moe
 */
@ExperimentalUnsignedTypes
@PacketId("08 25 31 02")
@ -24,7 +24,7 @@ class ClientServerRedirectionPacket(private val serverIP: String, private val qq
        this.writeHex(Protocol.fixVer)
        this.writeHex(Protocol.redirectionKey)

-        //TEA 加密
+
        this.write(TEACryptor.encrypt(object : ClientPacket() {
            @Throws(IOException::class)
            override fun encode() {
--- a/mirai-core/src/main/java/net/mamoe/mirai/network/packet/client/touch/ClientHeartbeatPacket.kt
+++ b/mirai-core/src/main/java/net/mamoe/mirai/network/packet/client/touch/ClientHeartbeatPacket.kt
@ -10,7 +10,7 @@ import net.mamoe.mirai.util.TEACryptor
 import java.io.IOException

 /**
- * @author Him188moe @ Mirai Project
+ * @author Him188moe
 */
@ExperimentalUnsignedTypes
@PacketId("00 58")//todo check
--- a/mirai-core/src/main/java/net/mamoe/mirai/network/packet/client/touch/ClientTouchPacket.kt
+++ b/mirai-core/src/main/java/net/mamoe/mirai/network/packet/client/touch/ClientTouchPacket.kt
@ -16,7 +16,7 @@ import java.io.IOException
 *
 * @see net.mamoe.mirai.network.packet.server.ServerTouchResponsePacket
 *
- * @author Him188moe @ Mirai Project
+ * @author Him188moe
 */
@ExperimentalUnsignedTypes
@PacketId("08 25 31 01")
@ -35,7 +35,7 @@ class ClientTouchPacket : ClientPacket() {
        this.writeHex(Protocol._0825key)


-        //TEA 加密
+
        this.write(TEACryptor.CRYPTOR_0825KEY.encrypt(object : ByteArrayDataOutputStream() {
            @Throws(IOException::class)
            override fun toByteArray(): ByteArray {
--- a/mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/ServerPacket.kt
+++ b/mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/ServerPacket.kt
@ -10,7 +10,7 @@ import net.mamoe.mirai.util.toHexString
 import java.io.DataInputStream

 /**
- * @author Him188moe @ Mirai Project
+ * @author Him188moe
 */
 abstract class ServerPacket(val input: DataInputStream) : Packet {

@ -92,3 +92,32 @@ fun DataInputStream.readVarString(length:Int): String{


 fun ByteArray.dataInputStream(): DataInputStream = DataInputStream(this.inputStream())
+
+/**
+ * Reset and skip(position)
+ */
+infix fun <N : Number> DataInputStream.goto(position: N): DataInputStream {
+    this.reset()
+    this.skip(position.toLong());
+    return this
+}
+
+fun <N : Number> DataInputStream.readNBytes(position: N, length: Int): ByteArray {
+    this.goto(position)
+    return this.readNBytes(length)
+}
+
+fun <N : Number> DataInputStream.readInt(position: N): Int {
+    this.goto(position)
+    return this.readInt();
+}
+
+fun <N : Number> DataInputStream.readByte(position: N): Byte {
+    this.goto(position)
+    return this.readByte();
+}
+
+fun <N : Number> DataInputStream.readShort(position: N): Short {
+    this.goto(position)
+    return this.readShort();
+}
--- a/mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/login/ServerLoginResponseFailedPacket.kt
+++ b/mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/login/ServerLoginResponseFailedPacket.kt
@ -4,7 +4,7 @@ import net.mamoe.mirai.network.packet.server.ServerPacket
 import java.io.DataInputStream

 /**
- * @author Him188moe @ Mirai Project
+ * @author Him188moe
 */
 class ServerLoginResponseFailedPacket(val state: State, input: DataInputStream) : ServerPacket(input) {
    enum class State {
--- a/mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/login/ServerLoginResponseResendPacket.kt
+++ b/mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/login/ServerLoginResponseResendPacket.kt
@ -5,7 +5,7 @@ import net.mamoe.mirai.network.packet.server.ServerPacket
 import java.io.DataInputStream

 /**
- * @author Him188moe @ Mirai Project
+ * @author Him188moe
 */
@PacketId("08 36 31 03")
 class ServerLoginResponseResendPacket(input: DataInputStream, val flag: Flag) : ServerPacket(input) {
--- a/mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/login/ServerLoginResponseSuccessPacket.kt
+++ b/mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/login/ServerLoginResponseSuccessPacket.kt
@ -11,8 +11,8 @@ import net.mamoe.mirai.util.toHexString
 import java.io.DataInputStream

 /**
- * @author Him188moe @ Mirai Project
- * @author NaturalHG @ Mirai Project
+ * @author Him188moe
+ * @author NaturalHG
 */
 class ServerLoginResponseSuccessPacket(input: DataInputStream, val packetDataLength: Int) : ServerPacket(input) {
    lateinit var _0828_rec_decr_key: ByteArray//16 bytes|
--- a/mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/login/ServerLoginResponseVerificationCodePacket.kt
+++ b/mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/login/ServerLoginResponseVerificationCodePacket.kt
@ -4,7 +4,7 @@ import net.mamoe.mirai.network.packet.server.ServerPacket
 import java.io.DataInputStream

 /**
- * @author Him188moe @ Mirai Project
+ * @author Him188moe
 */
 class ServerLoginResponseVerificationCodePacket(input: DataInputStream) : ServerPacket(input) {
    var verifyCodeLength: Int = 0
--- a/mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/security/ServerSessionKeyResponsePacketEncrypted.kt
+++ b/mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/security/ServerSessionKeyResponsePacketEncrypted.kt
@ -8,7 +8,7 @@ import java.io.DataInputStream
 /**
 * Dispose_0828
 *
- * @author Him188moe @ Mirai Project
+ * @author Him188moe
 */
 class ServerSessionKeyResponsePacket(inputStream: DataInputStream) : ServerPacket(inputStream) {
    lateinit var sessionKey: ByteArray
@ -39,7 +39,7 @@ class ServerSessionKeyResponsePacket(inputStream: DataInputStream) : ServerPacke
 /**
 * Encrypted using []0828_rec_decr_key], decrypting in Robot
 *
- * @author Him188moe @ Mirai Project
+ * @author Him188moe
 */
 class ServerSessionKeyResponsePacketEncrypted(inputStream: DataInputStream) : ServerPacket(inputStream) {
    override fun decode() {
--- a/mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/touch/ServerTouchResponsePacket.kt
+++ b/mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/touch/ServerTouchResponsePacket.kt
@ -11,7 +11,7 @@ import java.io.DataInputStream
 * @see net.mamoe.mirai.network.packet.client.login.ClientServerRedirectionPacket
 * @see net.mamoe.mirai.network.packet.client.login.ClientPasswordSubmissionPacket
 *
- * @author Him188moe @ Mirai Project
+ * @author Him188moe
 */
 class ServerTouchResponsePacket(private val type: Type, inputStream: DataInputStream) : ServerPacket(inputStream) {
    var serverIP: String? = null;
--- a/mirai-core/src/main/java/net/mamoe/mirai/util/Utils.kt
+++ b/mirai-core/src/main/java/net/mamoe/mirai/util/Utils.kt
@ -7,7 +7,7 @@ import java.util.*
 import java.util.zip.CRC32

 /**
- * @author Him188moe @ Mirai Project
+ * @author Him188moe
 */
 object Utils {
    fun toHexString(byteArray: ByteArray, separator: String = " "): String = byteArray.joinToString(separator) {
--- a/mirai-core/src/test/java/NetworkTest.java
+++ b/mirai-core/src/test/java/NetworkTest.java
@ -1,5 +1,5 @@
 /**
- * @author Him188moe @ Mirai Project
+ * @author Him188moe
 */
 public class NetworkTest {
    public static void main(String[] args) {
--- a/mirai-native/src/main/java/net/mamoe/mirai/util/TeaEncryption.java
+++ b/mirai-native/src/main/java/net/mamoe/mirai/util/TeaEncryption.java
@ -1,7 +1,7 @@
 package net.mamoe.mirai.util;

 /**
- * @author Him188moe @ Mirai Project
+ * @author Him188moe
 */
 public final class TeaEncryption {