Skip to content

Commit 6c6699a

Browse files
github-actions[bot]github-actions[bot]
authored
chore(lint): 改进代码样式 (FloatTech#1143)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent e292b69 commit 6c6699a

File tree

4 files changed

+44
-41
lines changed

4 files changed

+44
-41
lines changed

‎plugin/minecraftobserver/minecraftobserver.go‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ package minecraftobserver
33

44
import (
55
"fmt"
6+
"strings"
7+
"time"
8+
69
ctrl "github.com/FloatTech/zbpctrl"
710
"github.com/FloatTech/zbputils/control"
811
zbpCtxExt "github.com/FloatTech/zbputils/ctxext"
912
zero "github.com/wdvxdr1123/ZeroBot"
1013
"github.com/wdvxdr1123/ZeroBot/message"
11-
"strings"
12-
"time"
1314
)
1415

1516
const (
@@ -55,7 +56,7 @@ func init() {
5556
}
5657
msg = append(msg, message.Text(textMsg))
5758
if id := ctx.Send(msg); id.ID() == 0 {
58-
//logrus.Errorln(logPrefix + "Send failed")
59+
// logrus.Errorln(logPrefix + "Send failed")
5960
return
6061
}
6162
})
@@ -81,7 +82,7 @@ func init() {
8182
return
8283
}
8384
if sid := ctx.Send(message.Text(fmt.Sprintf("服务器 %s 订阅添加成功", addr))); sid.ID() == 0 {
84-
//logrus.Errorln(logPrefix + "Send failed")
85+
// logrus.Errorln(logPrefix + "Send failed")
8586
return
8687
}
8788
// 成功后立即发送一次状态
@@ -92,7 +93,7 @@ func init() {
9293
}
9394
msg = append(msg, message.Text(textMsg))
9495
if id := ctx.Send(msg); id.ID() == 0 {
95-
//logrus.Errorln(logPrefix + "Send failed")
96+
// logrus.Errorln(logPrefix + "Send failed")
9697
return
9798
}
9899
})
@@ -125,7 +126,7 @@ func init() {
125126
stringBuilder.WriteString(fmt.Sprintf("服务器地址: %s\n", v.ServerAddr))
126127
}
127128
if sid := ctx.Send(message.Text(stringBuilder.String())); sid.ID() == 0 {
128-
//logrus.Errorln(logPrefix + "Send failed")
129+
// logrus.Errorln(logPrefix + "Send failed")
129130
return
130131
}
131132
})
@@ -187,7 +188,7 @@ func init() {
187188
ctx.SendPrivateMessage(su, message.Text(logPrefix, "获取订阅列表失败..."))
188189
return
189190
}
190-
//logrus.Debugln(logPrefix+"global get ", len(serverList), " subscribe(s)")
191+
// logrus.Debugln(logPrefix+"global get ", len(serverList), " subscribe(s)")
191192
serverMap := make(map[string][]serverSubscribe)
192193
for _, v := range serverList {
193194
serverMap[v.ServerAddr] = append(serverMap[v.ServerAddr], v)
@@ -197,12 +198,12 @@ func init() {
197198
// 查询当前存储的状态
198199
storedStatus, sErr := dbInstance.getServerStatus(subAddr)
199200
if sErr != nil {
200-
//logrus.Errorln(logPrefix+fmt.Sprintf("getServerStatus ServerAddr(%s) error: ", subAddr), sErr)
201+
// logrus.Errorln(logPrefix+fmt.Sprintf("getServerStatus ServerAddr(%s) error: ", subAddr), sErr)
201202
continue
202203
}
203204
isChanged, changedNotifyMsg, sErr := singleServerScan(storedStatus)
204205
if sErr != nil {
205-
//logrus.Errorln(logPrefix+"singleServerScan error: ", sErr)
206+
// logrus.Errorln(logPrefix+"singleServerScan error: ", sErr)
206207
continue
207208
}
208209
if !isChanged {
@@ -236,12 +237,12 @@ func singleServerScan(oldSubStatus *serverStatus) (changed bool, notifyMsg messa
236237
// 获取服务器状态 & 检查是否需要更新
237238
rawServerStatus, err := getMinecraftServerStatus(oldSubStatus.ServerAddr)
238239
if err != nil {
239-
//logrus.Warnln(logPrefix+"getMinecraftServerStatus error: ", err)
240+
// logrus.Warnln(logPrefix+"getMinecraftServerStatus error: ", err)
240241
err = nil
241242
// 计数器没有超限，增加计数器并跳过
242243
if cnt, ts := addPingServerUnreachableCounter(oldSubStatus.ServerAddr, time.Now()); cnt < pingServerUnreachableCounterThreshold &&
243-
time.Now().Sub(ts) < pingServerUnreachableCounterTimeThreshold {
244-
//logrus.Warnln(logPrefix+"server ", oldSubStatus.ServerAddr, " unreachable, counter: ", cnt, " ts:", ts)
244+
time.Since(ts) < pingServerUnreachableCounterTimeThreshold {
245+
// logrus.Warnln(logPrefix+"server ", oldSubStatus.ServerAddr, " unreachable, counter: ", cnt, " ts:", ts)
245246
return
246247
}
247248
// 不可达计数器已经超限，则更新服务器状态
@@ -252,17 +253,17 @@ func singleServerScan(oldSubStatus *serverStatus) (changed bool, notifyMsg messa
252253
newSubStatus = rawServerStatus.genServerSubscribeSchema(oldSubStatus.ServerAddr, oldSubStatus.ID)
253254
}
254255
if newSubStatus == nil {
255-
//logrus.Errorln(logPrefix + "newSubStatus is nil")
256+
// logrus.Errorln(logPrefix + "newSubStatus is nil")
256257
return
257258
}
258259
// 检查是否有订阅信息变化
259260
if oldSubStatus.isServerStatusSpecChanged(newSubStatus) {
260-
//logrus.Warnf(logPrefix+"server subscribe spec changed: (%+v) -> (%+v)", oldSubStatus, newSubStatus)
261+
// logrus.Warnf(logPrefix+"server subscribe spec changed: (%+v) -> (%+v)", oldSubStatus, newSubStatus)
261262
changed = true
262263
// 更新数据库
263264
err = dbInstance.updateServerStatus(newSubStatus)
264265
if err != nil {
265-
//logrus.Errorln(logPrefix+"updateServerSubscribeStatus error: ", err)
266+
// logrus.Errorln(logPrefix+"updateServerSubscribeStatus error: ", err)
266267
return
267268
}
268269
// 纯文本信息

‎plugin/minecraftobserver/model.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ import (
44
"crypto/md5"
55
"encoding/hex"
66
"fmt"
7+
"strings"
8+
"time"
9+
710
"github.com/Tnze/go-mc/chat"
811
"github.com/google/uuid"
912
"github.com/wdvxdr1123/ZeroBot/utils/helper"
10-
"strings"
11-
"time"
1213
)
1314

1415
// ====================
@@ -147,7 +148,7 @@ type serverPingAndListResp struct {
147148
// and prepended with "data:image/png;base64,".
148149
type icon string
149150

150-
//func (i icon) toImage() (icon image.Image, err error) {
151+
// func (i icon) toImage() (icon image.Image, err error) {
151152
// const prefix = "data:image/png;base64,"
152153
// if !strings.HasPrefix(string(i), prefix) {
153154
// return nil, errors.Errorf("server icon should prepended with %s", prefix)
@@ -237,13 +238,13 @@ func formatSubStatusChangeText(oldStatus, newStatus *serverStatus) string {
237238
// 状态由不可达变为可达，反之
238239
if oldStatus.PingDelay == pingDelayUnreachable && newStatus.PingDelay != pingDelayUnreachable {
239240
msgBuilder.WriteString("\n-----[Ping延迟]-----\n")
240-
msgBuilder.WriteString(fmt.Sprintf("[旧]\n超时\n"))
241+
msgBuilder.WriteString("[旧]\n超时\n")
241242
msgBuilder.WriteString(fmt.Sprintf("[新]\n%v毫秒\n", newStatus.PingDelay))
242243
}
243244
if oldStatus.PingDelay != pingDelayUnreachable && newStatus.PingDelay == pingDelayUnreachable {
244245
msgBuilder.WriteString("\n-----[Ping延迟]-----\n")
245246
msgBuilder.WriteString(fmt.Sprintf("[旧]\n%v毫秒\n", oldStatus.PingDelay))
246-
msgBuilder.WriteString(fmt.Sprintf("[新]\n超时\n"))
247+
msgBuilder.WriteString("[新]\n超时\n")
247248
}
248249
return msgBuilder.String()
249250
}

‎plugin/minecraftobserver/ping.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ package minecraftobserver
22

33
import (
44
"encoding/json"
5+
"time"
6+
57
"github.com/RomiChan/syncx"
68
"github.com/Tnze/go-mc/bot"
7-
"time"
89
)
910

1011
var (
@@ -49,12 +50,12 @@ func getMinecraftServerStatus(addr string) (*serverPingAndListResp, error) {
4950
var s serverPingAndListResp
5051
resp, delay, err := bot.PingAndListTimeout(addr, time.Second*5)
5152
if err != nil {
52-
//logrus.Errorln(logPrefix+"PingAndList error: ", err)
53+
// logrus.Errorln(logPrefix+"PingAndList error: ", err)
5354
return nil, err
5455
}
5556
err = json.Unmarshal(resp, &s)
5657
if err != nil {
57-
//logrus.Errorln(logPrefix+"Parse json response fail: ", err)
58+
// logrus.Errorln(logPrefix+"Parse json response fail: ", err)
5859
return nil, err
5960
}
6061
s.Delay = delay

‎plugin/minecraftobserver/store.go‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ package minecraftobserver
22

33
import (
44
"errors"
5+
"os"
6+
"sync"
7+
"time"
8+
59
fcext "github.com/FloatTech/floatbox/ctxext"
610
"github.com/jinzhu/gorm"
711
zero "github.com/wdvxdr1123/ZeroBot"
812
"github.com/wdvxdr1123/ZeroBot/message"
9-
"os"
10-
"sync"
11-
"time"
1213
)
1314

1415
const (
@@ -43,7 +44,7 @@ func initializeDB(dbpath string) error {
4344
}
4445
gdb, err := gorm.Open("sqlite3", dbpath)
4546
if err != nil {
46-
//logrus.Errorln(logPrefix+"initializeDB ERROR: ", err)
47+
// logrus.Errorln(logPrefix+"initializeDB ERROR: ", err)
4748
return err
4849
}
4950
gdb.AutoMigrate(&serverStatus{}, &serverSubscribe{})
@@ -60,10 +61,9 @@ var (
6061
dbInstance *db
6162
// 开启并检查数据库链接
6263
getDB = fcext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
63-
var err error
64-
err = initializeDB(engine.DataFolder() + dbPath)
64+
var err error = initializeDB(engine.DataFolder() + dbPath)
6565
if err != nil {
66-
//logrus.Errorln(logPrefix+"initializeDB ERROR: ", err)
66+
// logrus.Errorln(logPrefix+"initializeDB ERROR: ", err)
6767
ctx.SendChain(message.Text("[mc-ob] ERROR: ", err))
6868
return false
6969
}
@@ -81,7 +81,7 @@ func (d *db) getServerStatus(addr string) (*serverStatus, error) {
8181
}
8282
var ss serverStatus
8383
if err := d.sdb.Model(&ss).Where("server_addr = ?", addr).First(&ss).Error; err != nil {
84-
//logrus.Errorln(logPrefix+"getServerStatus ERROR: ", err)
84+
// logrus.Errorln(logPrefix+"getServerStatus ERROR: ", err)
8585
return nil, err
8686
}
8787
return &ss, nil
@@ -100,7 +100,7 @@ func (d *db) updateServerStatus(ss *serverStatus) (err error) {
100100
ss.LastUpdate = time.Now().Unix()
101101
ss2 := ss.deepCopy()
102102
if err = d.sdb.Where(&serverStatus{ServerAddr: ss.ServerAddr}).Assign(ss2).FirstOrCreate(ss).Debug().Error; err != nil {
103-
//logrus.Errorln(logPrefix, fmt.Sprintf("updateServerStatus %v ERROR: %v", ss, err))
103+
// logrus.Errorln(logPrefix, fmt.Sprintf("updateServerStatus %v ERROR: %v", ss, err))
104104
return
105105
}
106106
return
@@ -116,7 +116,7 @@ func (d *db) delServerStatus(addr string) (err error) {
116116
d.statusLock.Lock()
117117
defer d.statusLock.Unlock()
118118
if err = d.sdb.Where("server_addr = ?", addr).Delete(&serverStatus{}).Error; err != nil {
119-
//logrus.Errorln(logPrefix+"deleteSubscribe ERROR: ", err)
119+
// logrus.Errorln(logPrefix+"deleteSubscribe ERROR: ", err)
120120
return
121121
}
122122
return
@@ -128,7 +128,7 @@ func (d *db) newSubscribe(addr string, targetID, targetType int64) (err error) {
128128
return errDBConn
129129
}
130130
if targetID == 0 || (targetType != 1 && targetType != 2) {
131-
//logrus.Errorln(logPrefix+"newSubscribe ERROR: 参数错误 ", targetID, " ", targetType)
131+
// logrus.Errorln(logPrefix+"newSubscribe ERROR: 参数错误 ", targetID, " ", targetType)
132132
return errParam
133133
}
134134
d.subscribeLock.Lock()
@@ -137,7 +137,7 @@ func (d *db) newSubscribe(addr string, targetID, targetType int64) (err error) {
137137
existedRec := &serverSubscribe{}
138138
err = d.sdb.Model(&serverSubscribe{}).Where("server_addr = ? and target_id = ? and target_type = ?", addr, targetID, targetType).First(existedRec).Error
139139
if err != nil && !gorm.IsRecordNotFoundError(err) {
140-
//logrus.Errorln(logPrefix+"newSubscribe ERROR: ", err)
140+
// logrus.Errorln(logPrefix+"newSubscribe ERROR: ", err)
141141
return
142142
}
143143
if existedRec.ID != 0 {
@@ -150,7 +150,7 @@ func (d *db) newSubscribe(addr string, targetID, targetType int64) (err error) {
150150
LastUpdate: time.Now().Unix(),
151151
}
152152
if err = d.sdb.Model(&ss).Create(ss).Error; err != nil {
153-
//logrus.Errorln(logPrefix+"newSubscribe ERROR: ", err)
153+
// logrus.Errorln(logPrefix+"newSubscribe ERROR: ", err)
154154
return
155155
}
156156
return
@@ -171,20 +171,20 @@ func (d *db) deleteSubscribe(addr string, targetID int64, targetType int64) (err
171171
if gorm.IsRecordNotFoundError(err) {
172172
return errors.New("未找到订阅")
173173
}
174-
//logrus.Errorln(logPrefix+"deleteSubscribe ERROR: ", err)
174+
// logrus.Errorln(logPrefix+"deleteSubscribe ERROR: ", err)
175175
return
176176
}
177177

178178
if err = d.sdb.Where("server_addr = ? and target_id = ? and target_type = ?", addr, targetID, targetType).Delete(&serverSubscribe{}).Error; err != nil {
179-
//logrus.Errorln(logPrefix+"deleteSubscribe ERROR: ", err)
179+
// logrus.Errorln(logPrefix+"deleteSubscribe ERROR: ", err)
180180
return
181181
}
182182

183183
// 扫描是否还有订阅，如果没有则删除服务器状态
184184
var cnt int
185185
err = d.sdb.Model(&serverSubscribe{}).Where("server_addr = ?", addr).Count(&cnt).Error
186186
if err != nil {
187-
//logrus.Errorln(logPrefix+"deleteSubscribe ERROR: ", err)
187+
// logrus.Errorln(logPrefix+"deleteSubscribe ERROR: ", err)
188188
return
189189
}
190190
if cnt == 0 {
@@ -200,7 +200,7 @@ func (d *db) getAllSubscribes() (subs []serverSubscribe, err error) {
200200
}
201201
subs = []serverSubscribe{}
202202
if err = d.sdb.Find(&subs).Error; err != nil {
203-
//logrus.Errorln(logPrefix+"getAllSubscribes ERROR: ", err)
203+
// logrus.Errorln(logPrefix+"getAllSubscribes ERROR: ", err)
204204
return
205205
}
206206
return
@@ -213,7 +213,7 @@ func (d *db) getSubscribesByTarget(targetID, targetType int64) (subs []serverSub
213213
}
214214
subs = []serverSubscribe{}
215215
if err = d.sdb.Model(&serverSubscribe{}).Where("target_id = ? and target_type = ?", targetID, targetType).Find(&subs).Error; err != nil {
216-
//logrus.Errorln(logPrefix+"getSubscribesByTarget ERROR: ", err)
216+
// logrus.Errorln(logPrefix+"getSubscribesByTarget ERROR: ", err)
217217
return
218218
}
219219
return

0 commit comments

Comments
 (0)