Northern_Lights/ZeroBot-Plugin
0
0
Fork 0
mirror of https://github.com/FloatTech/ZeroBot-Plugin.git synced 2026-03-01 18:40:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore(lint): 改进代码样式 (#1143)

Browse Source 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
This commit is contained in:
github-actions[bot]
2025-03-25 12:33:02 +09:00
committed by GitHub
parent e292b69ee5
commit 6c6699a5d6
4 changed files with 44 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
plugin/minecraftobserver/minecraftobserver.go
View File

@@ -3,13 +3,14 @@ package minecraftobserver
import (
"fmt"
"strings"
"time"
ctrl "github.com/FloatTech/zbpctrl"
"github.com/FloatTech/zbputils/control"
zbpCtxExt "github.com/FloatTech/zbputils/ctxext"
zero "github.com/wdvxdr1123/ZeroBot"
"github.com/wdvxdr1123/ZeroBot/message"
"strings"
"time"
)
const (
@@ -55,7 +56,7 @@ func init() {
}
msg = append(msg, message.Text(textMsg))
if id := ctx.Send(msg); id.ID() == 0 {
//logrus.Errorln(logPrefix + "Send failed")
// logrus.Errorln(logPrefix + "Send failed")
return
}
})
@@ -81,7 +82,7 @@ func init() {
return
}
if sid := ctx.Send(message.Text(fmt.Sprintf("服务器 %s 订阅添加成功", addr))); sid.ID() == 0 {
//logrus.Errorln(logPrefix + "Send failed")
// logrus.Errorln(logPrefix + "Send failed")
return
}
// 成功后立即发送一次状态
@@ -92,7 +93,7 @@ func init() {
}
msg = append(msg, message.Text(textMsg))
if id := ctx.Send(msg); id.ID() == 0 {
//logrus.Errorln(logPrefix + "Send failed")
// logrus.Errorln(logPrefix + "Send failed")
return
}
})
@@ -125,7 +126,7 @@ func init() {
stringBuilder.WriteString(fmt.Sprintf("服务器地址: %s\n", v.ServerAddr))
}
if sid := ctx.Send(message.Text(stringBuilder.String())); sid.ID() == 0 {
//logrus.Errorln(logPrefix + "Send failed")
// logrus.Errorln(logPrefix + "Send failed")
return
}
})
@@ -187,7 +188,7 @@ func init() {
ctx.SendPrivateMessage(su, message.Text(logPrefix, "获取订阅列表失败..."))
return
}
//logrus.Debugln(logPrefix+"global get ", len(serverList), " subscribe(s)")
// logrus.Debugln(logPrefix+"global get ", len(serverList), " subscribe(s)")
serverMap := make(map[string][]serverSubscribe)
for _, v := range serverList {
serverMap[v.ServerAddr] = append(serverMap[v.ServerAddr], v)
@@ -197,12 +198,12 @@ func init() {
// 查询当前存储的状态
storedStatus, sErr := dbInstance.getServerStatus(subAddr)
if sErr != nil {
//logrus.Errorln(logPrefix+fmt.Sprintf("getServerStatus ServerAddr(%s) error: ", subAddr), sErr)
// logrus.Errorln(logPrefix+fmt.Sprintf("getServerStatus ServerAddr(%s) error: ", subAddr), sErr)
continue
}
isChanged, changedNotifyMsg, sErr := singleServerScan(storedStatus)
if sErr != nil {
//logrus.Errorln(logPrefix+"singleServerScan error: ", sErr)
// logrus.Errorln(logPrefix+"singleServerScan error: ", sErr)
continue
}
if !isChanged {
@@ -236,12 +237,12 @@ func singleServerScan(oldSubStatus *serverStatus) (changed bool, notifyMsg messa
// 获取服务器状态 & 检查是否需要更新
rawServerStatus, err := getMinecraftServerStatus(oldSubStatus.ServerAddr)
if err != nil {
//logrus.Warnln(logPrefix+"getMinecraftServerStatus error: ", err)
// logrus.Warnln(logPrefix+"getMinecraftServerStatus error: ", err)
err = nil
// 计数器没有超限，增加计数器并跳过
if cnt, ts := addPingServerUnreachableCounter(oldSubStatus.ServerAddr, time.Now()); cnt < pingServerUnreachableCounterThreshold &&
time.Now().Sub(ts) < pingServerUnreachableCounterTimeThreshold {
//logrus.Warnln(logPrefix+"server ", oldSubStatus.ServerAddr, " unreachable, counter: ", cnt, " ts:", ts)
time.Since(ts) < pingServerUnreachableCounterTimeThreshold {
// logrus.Warnln(logPrefix+"server ", oldSubStatus.ServerAddr, " unreachable, counter: ", cnt, " ts:", ts)
return
}
// 不可达计数器已经超限，则更新服务器状态
@@ -252,17 +253,17 @@ func singleServerScan(oldSubStatus *serverStatus) (changed bool, notifyMsg messa
newSubStatus = rawServerStatus.genServerSubscribeSchema(oldSubStatus.ServerAddr, oldSubStatus.ID)
}
if newSubStatus == nil {
//logrus.Errorln(logPrefix + "newSubStatus is nil")
// logrus.Errorln(logPrefix + "newSubStatus is nil")
return
}
// 检查是否有订阅信息变化
if oldSubStatus.isServerStatusSpecChanged(newSubStatus) {
//logrus.Warnf(logPrefix+"server subscribe spec changed: (%+v) -> (%+v)", oldSubStatus, newSubStatus)
// logrus.Warnf(logPrefix+"server subscribe spec changed: (%+v) -> (%+v)", oldSubStatus, newSubStatus)
changed = true
// 更新数据库
err = dbInstance.updateServerStatus(newSubStatus)
if err != nil {
//logrus.Errorln(logPrefix+"updateServerSubscribeStatus error: ", err)
// logrus.Errorln(logPrefix+"updateServerSubscribeStatus error: ", err)
return
}
// 纯文本信息