Mirror/Erupe
1
0
Fork 0
mirror of https://github.com/Mezeporta/Erupe.git synced 2025-12-14 16:04:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

clean up guild queries

Browse Source
This commit is contained in:
wish
2022-10-04 20:23:13 +11:00
parent 8f9648d9d8
commit a5b47310d1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/channelserver/handlers_guild.go
View File

@@ -164,7 +164,7 @@ func (guild *Guild) Save(s *Session) error {
func (guild *Guild) CreateApplication(s *Session, charID uint32, applicationType GuildApplicationType, transaction *sql.Tx) error { func (guild *Guild) CreateApplication(s *Session, charID uint32, applicationType GuildApplicationType, transaction *sql.Tx) error {
sql := ` query := `
INSERT INTO guild_applications (guild_id, character_id, actor_id, application_type) INSERT INTO guild_applications (guild_id, character_id, actor_id, application_type)
VALUES ($1, $2, $3, $4) VALUES ($1, $2, $3, $4)
` `
@@ -172,9 +172,9 @@ func (guild *Guild) CreateApplication(s *Session, charID uint32, applicationType
var err error var err error
if transaction == nil { if transaction == nil {
_, err = s.server.db.Exec(sql, guild.ID, charID, s.charID, applicationType) _, err = s.server.db.Exec(query, guild.ID, charID, s.charID, applicationType)
} else { } else {
_, err = transaction.Exec(sql, guild.ID, charID, s.charID, applicationType) _, err = transaction.Exec(query, guild.ID, charID, s.charID, applicationType)
} }
if err != nil { if err != nil {
@@ -222,7 +222,7 @@ func (guild *Guild) Disband(s *Session) error {
return err return err
} }
_, err = transaction.Exec("UPDATE guild_alliances SET sub1_id=NULL WHERE sub1_id=$1", guild.ID) _, err = transaction.Exec("UPDATE guild_alliances SET sub1_id=sub2_id, sub2_id=NULL WHERE sub1_id=$1", guild.ID)
if err != nil { if err != nil {
s.logger.Error("failed to remove guild from alliance", zap.Error(err), zap.Uint32("guildID", guild.ID)) s.logger.Error("failed to remove guild from alliance", zap.Error(err), zap.Uint32("guildID", guild.ID))