From 7b125259d62efde8c751476065c3d26b82235ae7 Mon Sep 17 00:00:00 2001 From: wdvxdr Date: Fri, 12 Nov 2021 23:43:22 +0800 Subject: [PATCH] style: sort imports --- client/builders.go | 7 +++---- client/c2c_processor.go | 8 ++++---- client/face.go | 3 +-- client/group_file.go | 6 ++---- client/group_info.go | 3 +-- client/group_msg.go | 7 +++---- client/guild.go | 5 +++-- client/guild_eventflow.go | 5 +++-- client/guild_msg.go | 18 ++++++++---------- client/image.go | 8 +++----- client/multimsg.go | 6 +++--- client/network.go | 3 +-- client/offline_file.go | 2 +- client/online_push.go | 3 +-- client/private_msg.go | 3 +-- client/ptt.go | 6 ++---- client/qidian.go | 3 +-- client/recall.go | 2 +- client/richmsg.go | 10 +++++----- client/security.go | 5 +++-- client/sync.go | 5 ++--- client/system_msg.go | 2 +- client/translate.go | 4 ++-- client/web.go | 8 ++++---- 24 files changed, 59 insertions(+), 73 deletions(-) diff --git a/client/builders.go b/client/builders.go index 3d15ed90..3451a5bb 100644 --- a/client/builders.go +++ b/client/builders.go @@ -7,10 +7,6 @@ import ( "math/rand" "time" - "github.com/Mrs4s/MiraiGo/internal/crypto" - "github.com/Mrs4s/MiraiGo/internal/packets" - "github.com/Mrs4s/MiraiGo/internal/tlv" - "google.golang.org/protobuf/proto" "github.com/Mrs4s/MiraiGo/binary" @@ -22,6 +18,9 @@ import ( "github.com/Mrs4s/MiraiGo/client/pb/profilecard" "github.com/Mrs4s/MiraiGo/client/pb/qweb" "github.com/Mrs4s/MiraiGo/client/pb/structmsg" + "github.com/Mrs4s/MiraiGo/internal/crypto" + "github.com/Mrs4s/MiraiGo/internal/packets" + "github.com/Mrs4s/MiraiGo/internal/tlv" "github.com/Mrs4s/MiraiGo/message" ) diff --git a/client/c2c_processor.go b/client/c2c_processor.go index 5888a767..2d25df9e 100644 --- a/client/c2c_processor.go +++ b/client/c2c_processor.go @@ -7,12 +7,12 @@ import ( "sync/atomic" "time" - "github.com/Mrs4s/MiraiGo/binary" - - "github.com/Mrs4s/MiraiGo/client/pb" - "github.com/Mrs4s/MiraiGo/client/pb/msg" "github.com/pkg/errors" "google.golang.org/protobuf/proto" + + "github.com/Mrs4s/MiraiGo/binary" + "github.com/Mrs4s/MiraiGo/client/pb" + "github.com/Mrs4s/MiraiGo/client/pb/msg" ) type ( diff --git a/client/face.go b/client/face.go index 4ce76729..0905748f 100644 --- a/client/face.go +++ b/client/face.go @@ -3,12 +3,11 @@ package client import ( "fmt" - "github.com/Mrs4s/MiraiGo/internal/packets" - "github.com/pkg/errors" "google.golang.org/protobuf/proto" "github.com/Mrs4s/MiraiGo/client/pb/faceroam" + "github.com/Mrs4s/MiraiGo/internal/packets" ) type CustomFace struct { diff --git a/client/group_file.go b/client/group_file.go index 9c63a29f..e838ea98 100644 --- a/client/group_file.go +++ b/client/group_file.go @@ -9,14 +9,12 @@ import ( "os" "runtime/debug" - "github.com/Mrs4s/MiraiGo/internal/packets" - - "google.golang.org/protobuf/proto" - "github.com/pkg/errors" + "google.golang.org/protobuf/proto" "github.com/Mrs4s/MiraiGo/client/pb/exciting" "github.com/Mrs4s/MiraiGo/client/pb/oidb" + "github.com/Mrs4s/MiraiGo/internal/packets" "github.com/Mrs4s/MiraiGo/utils" ) diff --git a/client/group_info.go b/client/group_info.go index 13e1119a..3a59a45b 100644 --- a/client/group_info.go +++ b/client/group_info.go @@ -9,8 +9,6 @@ import ( "strings" "sync" - "github.com/Mrs4s/MiraiGo/internal/packets" - "github.com/pkg/errors" "google.golang.org/protobuf/proto" @@ -18,6 +16,7 @@ import ( "github.com/Mrs4s/MiraiGo/binary/jce" "github.com/Mrs4s/MiraiGo/client/pb/oidb" "github.com/Mrs4s/MiraiGo/client/pb/profilecard" + "github.com/Mrs4s/MiraiGo/internal/packets" "github.com/Mrs4s/MiraiGo/utils" ) diff --git a/client/group_msg.go b/client/group_msg.go index b0ce7388..aa1677c9 100644 --- a/client/group_msg.go +++ b/client/group_msg.go @@ -11,17 +11,16 @@ import ( "strings" "time" - "github.com/Mrs4s/MiraiGo/internal/packets" + "github.com/pkg/errors" + "google.golang.org/protobuf/proto" "github.com/Mrs4s/MiraiGo/client/pb/longmsg" "github.com/Mrs4s/MiraiGo/client/pb/msg" "github.com/Mrs4s/MiraiGo/client/pb/multimsg" "github.com/Mrs4s/MiraiGo/client/pb/oidb" + "github.com/Mrs4s/MiraiGo/internal/packets" "github.com/Mrs4s/MiraiGo/message" "github.com/Mrs4s/MiraiGo/utils" - - "github.com/pkg/errors" - "google.golang.org/protobuf/proto" ) func init() { diff --git a/client/guild.go b/client/guild.go index a3a05c20..a8ff5392 100644 --- a/client/guild.go +++ b/client/guild.go @@ -4,12 +4,13 @@ import ( "fmt" "time" + "github.com/pkg/errors" + "google.golang.org/protobuf/proto" + "github.com/Mrs4s/MiraiGo/binary" "github.com/Mrs4s/MiraiGo/client/pb/channel" "github.com/Mrs4s/MiraiGo/internal/packets" "github.com/Mrs4s/MiraiGo/utils" - "github.com/pkg/errors" - "google.golang.org/protobuf/proto" ) type ( diff --git a/client/guild_eventflow.go b/client/guild_eventflow.go index 8e5aac62..a3d7853c 100644 --- a/client/guild_eventflow.go +++ b/client/guild_eventflow.go @@ -4,11 +4,12 @@ import ( "sync" "time" + "github.com/pkg/errors" + "google.golang.org/protobuf/proto" + "github.com/Mrs4s/MiraiGo/client/pb/channel" "github.com/Mrs4s/MiraiGo/client/pb/msg" "github.com/Mrs4s/MiraiGo/internal/packets" - "github.com/pkg/errors" - "google.golang.org/protobuf/proto" ) func init() { diff --git a/client/guild_msg.go b/client/guild_msg.go index ca5bfb87..33de18e6 100644 --- a/client/guild_msg.go +++ b/client/guild_msg.go @@ -9,18 +9,16 @@ import ( "math/rand" "strconv" - "github.com/Mrs4s/MiraiGo/binary" - "github.com/Mrs4s/MiraiGo/utils" - - "github.com/Mrs4s/MiraiGo/client/pb/cmd0x388" - "github.com/Mrs4s/MiraiGo/internal/packets" - "github.com/pkg/errors" - - "github.com/Mrs4s/MiraiGo/client/pb/channel" - "github.com/Mrs4s/MiraiGo/client/pb/msg" - "github.com/Mrs4s/MiraiGo/message" "google.golang.org/protobuf/proto" + + "github.com/Mrs4s/MiraiGo/binary" + "github.com/Mrs4s/MiraiGo/client/pb/channel" + "github.com/Mrs4s/MiraiGo/client/pb/cmd0x388" + "github.com/Mrs4s/MiraiGo/client/pb/msg" + "github.com/Mrs4s/MiraiGo/internal/packets" + "github.com/Mrs4s/MiraiGo/message" + "github.com/Mrs4s/MiraiGo/utils" ) type ( diff --git a/client/image.go b/client/image.go index 3fd205bb..22478324 100644 --- a/client/image.go +++ b/client/image.go @@ -12,16 +12,14 @@ import ( "strings" "time" - "github.com/Mrs4s/MiraiGo/internal/packets" - - "github.com/Mrs4s/MiraiGo/client/pb/highway" - "github.com/Mrs4s/MiraiGo/client/pb/oidb" - "github.com/pkg/errors" "google.golang.org/protobuf/proto" "github.com/Mrs4s/MiraiGo/binary" "github.com/Mrs4s/MiraiGo/client/pb/cmd0x388" + "github.com/Mrs4s/MiraiGo/client/pb/highway" + "github.com/Mrs4s/MiraiGo/client/pb/oidb" + "github.com/Mrs4s/MiraiGo/internal/packets" "github.com/Mrs4s/MiraiGo/message" "github.com/Mrs4s/MiraiGo/utils" ) diff --git a/client/multimsg.go b/client/multimsg.go index 07425af3..e3152fee 100644 --- a/client/multimsg.go +++ b/client/multimsg.go @@ -3,15 +3,15 @@ package client import ( "fmt" - "github.com/Mrs4s/MiraiGo/internal/packets" + "github.com/pkg/errors" + "google.golang.org/protobuf/proto" "github.com/Mrs4s/MiraiGo/binary" "github.com/Mrs4s/MiraiGo/client/pb/longmsg" "github.com/Mrs4s/MiraiGo/client/pb/msg" "github.com/Mrs4s/MiraiGo/client/pb/multimsg" + "github.com/Mrs4s/MiraiGo/internal/packets" "github.com/Mrs4s/MiraiGo/utils" - "github.com/pkg/errors" - "google.golang.org/protobuf/proto" ) func init() { diff --git a/client/network.go b/client/network.go index 2e82737c..e414852c 100644 --- a/client/network.go +++ b/client/network.go @@ -8,10 +8,9 @@ import ( "sync/atomic" "time" - "github.com/Mrs4s/MiraiGo/internal/packets" - "github.com/pkg/errors" + "github.com/Mrs4s/MiraiGo/internal/packets" "github.com/Mrs4s/MiraiGo/message" "github.com/Mrs4s/MiraiGo/utils" ) diff --git a/client/offline_file.go b/client/offline_file.go index 8478b2b7..83f01879 100644 --- a/client/offline_file.go +++ b/client/offline_file.go @@ -1,11 +1,11 @@ package client import ( - "github.com/Mrs4s/MiraiGo/internal/packets" "github.com/pkg/errors" "google.golang.org/protobuf/proto" "github.com/Mrs4s/MiraiGo/client/pb/cmd0x346" + "github.com/Mrs4s/MiraiGo/internal/packets" ) func init() { diff --git a/client/online_push.go b/client/online_push.go index 1eec697f..3ae81598 100644 --- a/client/online_push.go +++ b/client/online_push.go @@ -5,14 +5,13 @@ import ( "strconv" "time" - "github.com/Mrs4s/MiraiGo/client/pb/msgtype0x210" - "github.com/pkg/errors" "google.golang.org/protobuf/proto" "github.com/Mrs4s/MiraiGo/binary" "github.com/Mrs4s/MiraiGo/binary/jce" "github.com/Mrs4s/MiraiGo/client/pb" + "github.com/Mrs4s/MiraiGo/client/pb/msgtype0x210" "github.com/Mrs4s/MiraiGo/client/pb/notify" ) diff --git a/client/private_msg.go b/client/private_msg.go index 2cb69f9e..6153afc0 100644 --- a/client/private_msg.go +++ b/client/private_msg.go @@ -5,12 +5,11 @@ import ( "sync/atomic" "time" - "github.com/Mrs4s/MiraiGo/internal/packets" - "github.com/pkg/errors" "google.golang.org/protobuf/proto" "github.com/Mrs4s/MiraiGo/client/pb/msg" + "github.com/Mrs4s/MiraiGo/internal/packets" "github.com/Mrs4s/MiraiGo/message" ) diff --git a/client/ptt.go b/client/ptt.go index bb5b1810..6f8756b6 100644 --- a/client/ptt.go +++ b/client/ptt.go @@ -6,17 +6,15 @@ import ( "io" "os" - "github.com/Mrs4s/MiraiGo/internal/packets" - - "github.com/Mrs4s/MiraiGo/client/pb/cmd0x388" - "github.com/pkg/errors" "google.golang.org/protobuf/proto" "github.com/Mrs4s/MiraiGo/binary" "github.com/Mrs4s/MiraiGo/client/pb/cmd0x346" + "github.com/Mrs4s/MiraiGo/client/pb/cmd0x388" "github.com/Mrs4s/MiraiGo/client/pb/msg" "github.com/Mrs4s/MiraiGo/client/pb/pttcenter" + "github.com/Mrs4s/MiraiGo/internal/packets" "github.com/Mrs4s/MiraiGo/message" "github.com/Mrs4s/MiraiGo/utils" ) diff --git a/client/qidian.go b/client/qidian.go index 8df47bf9..1f229b77 100644 --- a/client/qidian.go +++ b/client/qidian.go @@ -7,8 +7,6 @@ import ( "io" "net/http" - "github.com/Mrs4s/MiraiGo/internal/packets" - "github.com/pkg/errors" "google.golang.org/protobuf/proto" @@ -16,6 +14,7 @@ import ( "github.com/Mrs4s/MiraiGo/client/pb/cmd0x3f6" "github.com/Mrs4s/MiraiGo/client/pb/cmd0x6ff" "github.com/Mrs4s/MiraiGo/client/pb/msg" + "github.com/Mrs4s/MiraiGo/internal/packets" "github.com/Mrs4s/MiraiGo/utils" ) diff --git a/client/recall.go b/client/recall.go index 4bae7ae1..115cc7ce 100644 --- a/client/recall.go +++ b/client/recall.go @@ -1,11 +1,11 @@ package client import ( - "github.com/Mrs4s/MiraiGo/internal/packets" "github.com/pkg/errors" "google.golang.org/protobuf/proto" "github.com/Mrs4s/MiraiGo/client/pb/msg" + "github.com/Mrs4s/MiraiGo/internal/packets" "github.com/Mrs4s/MiraiGo/message" ) diff --git a/client/richmsg.go b/client/richmsg.go index 1424d3f6..3b9794e8 100644 --- a/client/richmsg.go +++ b/client/richmsg.go @@ -4,13 +4,13 @@ import ( "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" "github.com/pkg/errors" "google.golang.org/protobuf/proto" + + "github.com/Mrs4s/MiraiGo/client/pb/oidb" + "github.com/Mrs4s/MiraiGo/internal/packets" + "github.com/Mrs4s/MiraiGo/message" + "github.com/Mrs4s/MiraiGo/utils" ) type musicTypeInfo struct { diff --git a/client/security.go b/client/security.go index b3600f97..17278e05 100644 --- a/client/security.go +++ b/client/security.go @@ -1,10 +1,11 @@ package client import ( - "github.com/Mrs4s/MiraiGo/client/pb/oidb" - "github.com/Mrs4s/MiraiGo/internal/packets" "github.com/pkg/errors" "google.golang.org/protobuf/proto" + + "github.com/Mrs4s/MiraiGo/client/pb/oidb" + "github.com/Mrs4s/MiraiGo/internal/packets" ) func init() { diff --git a/client/sync.go b/client/sync.go index 40f438de..177c8416 100644 --- a/client/sync.go +++ b/client/sync.go @@ -6,16 +6,15 @@ import ( "sync/atomic" "time" - "github.com/Mrs4s/MiraiGo/internal/packets" - + "github.com/pkg/errors" "google.golang.org/protobuf/proto" "github.com/Mrs4s/MiraiGo/binary/jce" "github.com/Mrs4s/MiraiGo/client/pb/msf" "github.com/Mrs4s/MiraiGo/client/pb/msg" "github.com/Mrs4s/MiraiGo/client/pb/oidb" + "github.com/Mrs4s/MiraiGo/internal/packets" "github.com/Mrs4s/MiraiGo/message" - "github.com/pkg/errors" ) func init() { diff --git a/client/system_msg.go b/client/system_msg.go index b87ed18e..e70012be 100644 --- a/client/system_msg.go +++ b/client/system_msg.go @@ -1,10 +1,10 @@ package client import ( - "github.com/Mrs4s/MiraiGo/internal/packets" "google.golang.org/protobuf/proto" "github.com/Mrs4s/MiraiGo/client/pb/structmsg" + "github.com/Mrs4s/MiraiGo/internal/packets" ) type ( diff --git a/client/translate.go b/client/translate.go index b0df9380..e005a189 100644 --- a/client/translate.go +++ b/client/translate.go @@ -1,11 +1,11 @@ package client import ( - "github.com/Mrs4s/MiraiGo/internal/packets" + "github.com/pkg/errors" "google.golang.org/protobuf/proto" "github.com/Mrs4s/MiraiGo/client/pb/oidb" - "github.com/pkg/errors" + "github.com/Mrs4s/MiraiGo/internal/packets" ) func (c *QQClient) buildTranslatePacket(src, dst, text string) (uint16, []byte) { diff --git a/client/web.go b/client/web.go index 439d3ab8..132c9611 100644 --- a/client/web.go +++ b/client/web.go @@ -6,12 +6,12 @@ import ( "fmt" "strings" - "github.com/Mrs4s/MiraiGo/internal/packets" - - "github.com/Mrs4s/MiraiGo/client/pb/web" - "github.com/Mrs4s/MiraiGo/utils" "github.com/pkg/errors" "google.golang.org/protobuf/proto" + + "github.com/Mrs4s/MiraiGo/client/pb/web" + "github.com/Mrs4s/MiraiGo/internal/packets" + "github.com/Mrs4s/MiraiGo/utils" ) type UnidirectionalFriendInfo struct {