diff --git a/client/builders.go b/client/builders.go index c8c564ea..46c0e80e 100644 --- a/client/builders.go +++ b/client/builders.go @@ -4,11 +4,12 @@ import ( "crypto/md5" "encoding/hex" "fmt" + "math/rand" + "time" + "github.com/Mrs4s/MiraiGo/internal/crypto" packets2 "github.com/Mrs4s/MiraiGo/internal/packets" tlv2 "github.com/Mrs4s/MiraiGo/internal/tlv" - "math/rand" - "time" "google.golang.org/protobuf/proto" diff --git a/client/client.go b/client/client.go index f9aa63a5..a9045232 100644 --- a/client/client.go +++ b/client/client.go @@ -3,8 +3,6 @@ package client import ( "crypto/md5" "fmt" - "github.com/Mrs4s/MiraiGo/internal/crypto" - packets2 "github.com/Mrs4s/MiraiGo/internal/packets" "math" "math/rand" "net" @@ -13,6 +11,9 @@ import ( "sync/atomic" "time" + "github.com/Mrs4s/MiraiGo/internal/crypto" + packets2 "github.com/Mrs4s/MiraiGo/internal/packets" + "github.com/pkg/errors" "github.com/Mrs4s/MiraiGo/binary" diff --git a/client/face.go b/client/face.go index aac68874..4ce76729 100644 --- a/client/face.go +++ b/client/face.go @@ -2,6 +2,7 @@ package client import ( "fmt" + "github.com/Mrs4s/MiraiGo/internal/packets" "github.com/pkg/errors" diff --git a/client/group_file.go b/client/group_file.go index 9a906cf0..9c63a29f 100644 --- a/client/group_file.go +++ b/client/group_file.go @@ -4,12 +4,13 @@ import ( "crypto/sha1" "encoding/hex" "fmt" - "github.com/Mrs4s/MiraiGo/internal/packets" "io" "math/rand" "os" "runtime/debug" + "github.com/Mrs4s/MiraiGo/internal/packets" + "google.golang.org/protobuf/proto" "github.com/pkg/errors" diff --git a/client/group_info.go b/client/group_info.go index 3945fbac..13e1119a 100644 --- a/client/group_info.go +++ b/client/group_info.go @@ -3,13 +3,14 @@ package client import ( "encoding/json" "fmt" - "github.com/Mrs4s/MiraiGo/internal/packets" "math/rand" "net/url" "sort" "strings" "sync" + "github.com/Mrs4s/MiraiGo/internal/packets" + "github.com/pkg/errors" "google.golang.org/protobuf/proto" diff --git a/client/group_msg.go b/client/group_msg.go index deb81038..b0ce7388 100644 --- a/client/group_msg.go +++ b/client/group_msg.go @@ -5,13 +5,14 @@ import ( "encoding/base64" "encoding/json" "fmt" - "github.com/Mrs4s/MiraiGo/internal/packets" "math" "math/rand" "strconv" "strings" "time" + "github.com/Mrs4s/MiraiGo/internal/packets" + "github.com/Mrs4s/MiraiGo/client/pb/longmsg" "github.com/Mrs4s/MiraiGo/client/pb/msg" "github.com/Mrs4s/MiraiGo/client/pb/multimsg" diff --git a/client/image.go b/client/image.go index 095c29fd..1d612834 100644 --- a/client/image.go +++ b/client/image.go @@ -4,7 +4,6 @@ import ( "bytes" "encoding/hex" "fmt" - "github.com/Mrs4s/MiraiGo/internal/packets" "image" _ "image/gif" "io" @@ -13,6 +12,8 @@ import ( "strings" "time" + "github.com/Mrs4s/MiraiGo/internal/packets" + "github.com/Mrs4s/MiraiGo/client/pb/highway" "github.com/Mrs4s/MiraiGo/client/pb/oidb" diff --git a/client/multimsg.go b/client/multimsg.go index 4beb1db5..07425af3 100644 --- a/client/multimsg.go +++ b/client/multimsg.go @@ -2,6 +2,7 @@ package client import ( "fmt" + "github.com/Mrs4s/MiraiGo/internal/packets" "github.com/Mrs4s/MiraiGo/binary" diff --git a/client/network.go b/client/network.go index a6819e2f..994756b3 100644 --- a/client/network.go +++ b/client/network.go @@ -1,7 +1,6 @@ package client import ( - "github.com/Mrs4s/MiraiGo/internal/packets" "net" "runtime/debug" "strings" @@ -9,6 +8,8 @@ import ( "sync/atomic" "time" + "github.com/Mrs4s/MiraiGo/internal/packets" + "github.com/pkg/errors" "github.com/Mrs4s/MiraiGo/message" diff --git a/client/private_msg.go b/client/private_msg.go index ed099fda..2cb69f9e 100644 --- a/client/private_msg.go +++ b/client/private_msg.go @@ -1,11 +1,12 @@ package client import ( - "github.com/Mrs4s/MiraiGo/internal/packets" "math/rand" "sync/atomic" "time" + "github.com/Mrs4s/MiraiGo/internal/packets" + "github.com/pkg/errors" "google.golang.org/protobuf/proto" diff --git a/client/ptt.go b/client/ptt.go index 05095e6d..bb5b1810 100644 --- a/client/ptt.go +++ b/client/ptt.go @@ -3,10 +3,11 @@ package client import ( "crypto/md5" "encoding/hex" - "github.com/Mrs4s/MiraiGo/internal/packets" "io" "os" + "github.com/Mrs4s/MiraiGo/internal/packets" + "github.com/Mrs4s/MiraiGo/client/pb/cmd0x388" "github.com/pkg/errors" diff --git a/client/qidian.go b/client/qidian.go index 13896921..8df47bf9 100644 --- a/client/qidian.go +++ b/client/qidian.go @@ -4,10 +4,11 @@ package client import ( "bytes" "fmt" - "github.com/Mrs4s/MiraiGo/internal/packets" "io" "net/http" + "github.com/Mrs4s/MiraiGo/internal/packets" + "github.com/pkg/errors" "google.golang.org/protobuf/proto" diff --git a/client/richmsg.go b/client/richmsg.go index 69a56a18..1424d3f6 100644 --- a/client/richmsg.go +++ b/client/richmsg.go @@ -1,10 +1,11 @@ package client import ( - "github.com/Mrs4s/MiraiGo/internal/packets" "math/rand" "time" + "github.com/Mrs4s/MiraiGo/internal/packets" + "github.com/Mrs4s/MiraiGo/client/pb/oidb" "github.com/Mrs4s/MiraiGo/message" "github.com/Mrs4s/MiraiGo/utils" diff --git a/client/sync.go b/client/sync.go index 1c13c6be..40f438de 100644 --- a/client/sync.go +++ b/client/sync.go @@ -1,12 +1,13 @@ package client import ( - "github.com/Mrs4s/MiraiGo/internal/packets" "math/rand" "sync" "sync/atomic" "time" + "github.com/Mrs4s/MiraiGo/internal/packets" + "google.golang.org/protobuf/proto" "github.com/Mrs4s/MiraiGo/binary/jce" diff --git a/client/web.go b/client/web.go index d44c02e2..439d3ab8 100644 --- a/client/web.go +++ b/client/web.go @@ -4,9 +4,10 @@ import ( "encoding/base64" "encoding/json" "fmt" - "github.com/Mrs4s/MiraiGo/internal/packets" "strings" + "github.com/Mrs4s/MiraiGo/internal/packets" + "github.com/Mrs4s/MiraiGo/client/pb/web" "github.com/Mrs4s/MiraiGo/utils" "github.com/pkg/errors"