mirror of
https://github.com/Mezeporta/Erupe.git
synced 2026-03-22 07:32:32 +01:00
fix(lint): fixing more complex formatters problems.
This commit is contained in:
@@ -120,7 +120,7 @@ func (s *Server) getFriendsForCharacters(chars []character) []members {
|
||||
friends := make([]members, 0)
|
||||
for _, char := range chars {
|
||||
friendsCSV := ""
|
||||
err := s.db.QueryRow("SELECT friends FROM characters WHERE id=$1", char.ID).Scan(&friendsCSV)
|
||||
_ = s.db.QueryRow("SELECT friends FROM characters WHERE id=$1", char.ID).Scan(&friendsCSV)
|
||||
friendsSlice := strings.Split(friendsCSV, ",")
|
||||
friendQuery := "SELECT id, name FROM characters WHERE id="
|
||||
for i := 0; i < len(friendsSlice); i++ {
|
||||
@@ -130,7 +130,7 @@ func (s *Server) getFriendsForCharacters(chars []character) []members {
|
||||
}
|
||||
}
|
||||
charFriends := make([]members, 0)
|
||||
err = s.db.Select(&charFriends, friendQuery)
|
||||
err := s.db.Select(&charFriends, friendQuery)
|
||||
if err != nil {
|
||||
continue
|
||||
}
|
||||
@@ -173,6 +173,9 @@ func (s *Server) deleteCharacter(cid int, token string, tokenID uint32) error {
|
||||
}
|
||||
var isNew bool
|
||||
err := s.db.QueryRow("SELECT is_new_character FROM characters WHERE id = $1", cid).Scan(&isNew)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if isNew {
|
||||
_, err = s.db.Exec("DELETE FROM characters WHERE id = $1", cid)
|
||||
} else {
|
||||
@@ -184,19 +187,6 @@ func (s *Server) deleteCharacter(cid int, token string, tokenID uint32) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// Unused
|
||||
func (s *Server) checkToken(uid uint32) (bool, error) {
|
||||
var exists int
|
||||
err := s.db.QueryRow("SELECT count(*) FROM sign_sessions WHERE user_id = $1", uid).Scan(&exists)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
if exists > 0 {
|
||||
return true, nil
|
||||
}
|
||||
return false, nil
|
||||
}
|
||||
|
||||
func (s *Server) registerUidToken(uid uint32) (uint32, string, error) {
|
||||
_token := token.Generate(16)
|
||||
var tid uint32
|
||||
|
||||
@@ -24,7 +24,6 @@ type Server struct {
|
||||
sync.Mutex
|
||||
logger *zap.Logger
|
||||
erupeConfig *_config.Config
|
||||
sessions map[int]*Session
|
||||
db *sqlx.DB
|
||||
listener net.Listener
|
||||
isShuttingDown bool
|
||||
|
||||
Reference in New Issue
Block a user