Northern_Lights/ZeroBot-Plugin
1
0
Fork 0
mirror of https://github.com/FloatTech/ZeroBot-Plugin.git synced 2026-02-11 17:50:25 +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

36
plugin/minecraftobserver/store.go
View File

@@ -2,13 +2,14 @@ package minecraftobserver
import (
"errors"
"os"
"sync"
"time"
fcext "github.com/FloatTech/floatbox/ctxext"
"github.com/jinzhu/gorm"
zero "github.com/wdvxdr1123/ZeroBot"
"github.com/wdvxdr1123/ZeroBot/message"
"os"
"sync"
"time"
)
const (
@@ -43,7 +44,7 @@ func initializeDB(dbpath string) error {
}
gdb, err := gorm.Open("sqlite3", dbpath)
if err != nil {
//logrus.Errorln(logPrefix+"initializeDB ERROR: ", err)
// logrus.Errorln(logPrefix+"initializeDB ERROR: ", err)
return err
}
gdb.AutoMigrate(&serverStatus{}, &serverSubscribe{})
@@ -60,10 +61,9 @@ var (
dbInstance *db
// 开启并检查数据库链接
getDB = fcext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
var err error
err = initializeDB(engine.DataFolder() + dbPath)
var err error = initializeDB(engine.DataFolder() + dbPath)
if err != nil {
//logrus.Errorln(logPrefix+"initializeDB ERROR: ", err)
// logrus.Errorln(logPrefix+"initializeDB ERROR: ", err)
ctx.SendChain(message.Text("[mc-ob] ERROR: ", err))
return false
}
@@ -81,7 +81,7 @@ func (d *db) getServerStatus(addr string) (*serverStatus, error) {
}
var ss serverStatus
if err := d.sdb.Model(&ss).Where("server_addr = ?", addr).First(&ss).Error; err != nil {
//logrus.Errorln(logPrefix+"getServerStatus ERROR: ", err)
// logrus.Errorln(logPrefix+"getServerStatus ERROR: ", err)
return nil, err
}
return &ss, nil
@@ -100,7 +100,7 @@ func (d *db) updateServerStatus(ss *serverStatus) (err error) {
ss.LastUpdate = time.Now().Unix()
ss2 := ss.deepCopy()
if err = d.sdb.Where(&serverStatus{ServerAddr: ss.ServerAddr}).Assign(ss2).FirstOrCreate(ss).Debug().Error; err != nil {
//logrus.Errorln(logPrefix, fmt.Sprintf("updateServerStatus %v ERROR: %v", ss, err))
// logrus.Errorln(logPrefix, fmt.Sprintf("updateServerStatus %v ERROR: %v", ss, err))
return
}
return
@@ -116,7 +116,7 @@ func (d *db) delServerStatus(addr string) (err error) {
d.statusLock.Lock()
defer d.statusLock.Unlock()
if err = d.sdb.Where("server_addr = ?", addr).Delete(&serverStatus{}).Error; err != nil {
//logrus.Errorln(logPrefix+"deleteSubscribe ERROR: ", err)
// logrus.Errorln(logPrefix+"deleteSubscribe ERROR: ", err)
return
}
return
@@ -128,7 +128,7 @@ func (d *db) newSubscribe(addr string, targetID, targetType int64) (err error) {
return errDBConn
}
if targetID == 0 || (targetType != 1 && targetType != 2) {
//logrus.Errorln(logPrefix+"newSubscribe ERROR: 参数错误 ", targetID, " ", targetType)
// logrus.Errorln(logPrefix+"newSubscribe ERROR: 参数错误 ", targetID, " ", targetType)
return errParam
}
d.subscribeLock.Lock()
@@ -137,7 +137,7 @@ func (d *db) newSubscribe(addr string, targetID, targetType int64) (err error) {
existedRec := &serverSubscribe{}
err = d.sdb.Model(&serverSubscribe{}).Where("server_addr = ? and target_id = ? and target_type = ?", addr, targetID, targetType).First(existedRec).Error
if err != nil && !gorm.IsRecordNotFoundError(err) {
//logrus.Errorln(logPrefix+"newSubscribe ERROR: ", err)
// logrus.Errorln(logPrefix+"newSubscribe ERROR: ", err)
return
}
if existedRec.ID != 0 {
@@ -150,7 +150,7 @@ func (d *db) newSubscribe(addr string, targetID, targetType int64) (err error) {
LastUpdate: time.Now().Unix(),
}
if err = d.sdb.Model(&ss).Create(ss).Error; err != nil {
//logrus.Errorln(logPrefix+"newSubscribe ERROR: ", err)
// logrus.Errorln(logPrefix+"newSubscribe ERROR: ", err)
return
}
return
@@ -171,12 +171,12 @@ func (d *db) deleteSubscribe(addr string, targetID int64, targetType int64) (err
if gorm.IsRecordNotFoundError(err) {
return errors.New("未找到订阅")
}
//logrus.Errorln(logPrefix+"deleteSubscribe ERROR: ", err)
// logrus.Errorln(logPrefix+"deleteSubscribe ERROR: ", err)
return
}
if err = d.sdb.Where("server_addr = ? and target_id = ? and target_type = ?", addr, targetID, targetType).Delete(&serverSubscribe{}).Error; err != nil {
//logrus.Errorln(logPrefix+"deleteSubscribe ERROR: ", err)
// logrus.Errorln(logPrefix+"deleteSubscribe ERROR: ", err)
return
}
@@ -184,7 +184,7 @@ func (d *db) deleteSubscribe(addr string, targetID int64, targetType int64) (err
var cnt int
err = d.sdb.Model(&serverSubscribe{}).Where("server_addr = ?", addr).Count(&cnt).Error
if err != nil {
//logrus.Errorln(logPrefix+"deleteSubscribe ERROR: ", err)
// logrus.Errorln(logPrefix+"deleteSubscribe ERROR: ", err)
return
}
if cnt == 0 {
@@ -200,7 +200,7 @@ func (d *db) getAllSubscribes() (subs []serverSubscribe, err error) {
}
subs = []serverSubscribe{}
if err = d.sdb.Find(&subs).Error; err != nil {
//logrus.Errorln(logPrefix+"getAllSubscribes ERROR: ", err)
// logrus.Errorln(logPrefix+"getAllSubscribes ERROR: ", err)
return
}
return
@@ -213,7 +213,7 @@ func (d *db) getSubscribesByTarget(targetID, targetType int64) (subs []serverSub
}
subs = []serverSubscribe{}
if err = d.sdb.Model(&serverSubscribe{}).Where("target_id = ? and target_type = ?", targetID, targetType).Find(&subs).Error; err != nil {
//logrus.Errorln(logPrefix+"getSubscribesByTarget ERROR: ", err)
// logrus.Errorln(logPrefix+"getSubscribesByTarget ERROR: ", err)
return
}
return