Mirror/Erupe
1
0
Fork 0
mirror of https://github.com/Mezeporta/Erupe.git synced 2025-12-15 08:25:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

rename db to database

Browse Source
This commit is contained in:
wish
2024-10-28 23:05:14 +11:00
parent d5bb0ac337
commit 67a5dc412c
26 changed files with 113 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/service/character.go
View File

@@ -6,7 +6,7 @@ import (
"erupe-ce/config"
"erupe-ce/server/channelserver/compression/nullcomp"
"erupe-ce/utils/bfutil"
"erupe-ce/utils/db"
"erupe-ce/utils/database"
"erupe-ce/utils/logger"
"erupe-ce/utils/stringsupport"
"fmt"
@@ -120,7 +120,7 @@ func getPointers() map[SavePointer]int {
}
func GetCharacterSaveData(charID uint32) (*CharacterSaveData, error) {
db, err := db.GetDB()
db, err := database.GetDB()
logger := logger.Get()
if err != nil {
logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
@@ -169,7 +169,7 @@ type SessionCharacter interface {
}
func (save *CharacterSaveData) Save(s SessionCharacter) {
db, err := db.GetDB()
db, err := database.GetDB()
logger := logger.Get()
if err != nil {

28
internal/service/guild.go
View File

@@ -7,7 +7,7 @@ import (
"errors"
"erupe-ce/config"
"erupe-ce/internal/model"
"erupe-ce/utils/db"
"erupe-ce/utils/database"
"erupe-ce/utils/logger"
"fmt"
"time"
@@ -106,7 +106,7 @@ func (g *Guild) Rank() uint16 {
}
func (guild *Guild) Save() error {
db, err := db.GetDB()
db, err := database.GetDB()
logger := logger.Get()
if err != nil {
@@ -127,7 +127,7 @@ func (guild *Guild) Save() error {
}
func (guild *Guild) CreateApplication(charID uint32, applicationType model.GuildApplicationType, transaction *sql.Tx, actorId uint32) error {
db, err := db.GetDB()
db, err := database.GetDB()
logger := logger.Get()
if err != nil {
@@ -158,7 +158,7 @@ func (guild *Guild) CreateApplication(charID uint32, applicationType model.Guild
}
func (guild *Guild) Disband(charID uint32) error {
db, err := db.GetDB()
db, err := database.GetDB()
logger := logger.Get()
if err != nil {
@@ -224,7 +224,7 @@ func (guild *Guild) Disband(charID uint32) error {
}
func (guild *Guild) RemoveCharacter(charID uint32) error {
db, err := db.GetDB()
db, err := database.GetDB()
logger := logger.Get()
if err != nil {
@@ -247,7 +247,7 @@ func (guild *Guild) RemoveCharacter(charID uint32) error {
}
func (guild *Guild) AcceptApplication(charID uint32) error {
db, err := db.GetDB()
db, err := database.GetDB()
logger := logger.Get()
if err != nil {
@@ -298,7 +298,7 @@ func (guild *Guild) AcceptApplication(charID uint32) error {
// This is relying on the fact that invitation ID is also character ID right now
// if invitation ID changes, this will break.
func (guild *Guild) CancelInvitation(charID uint32) error {
db, err := db.GetDB()
db, err := database.GetDB()
logger := logger.Get()
if err != nil {
@@ -323,7 +323,7 @@ func (guild *Guild) CancelInvitation(charID uint32) error {
}
func (guild *Guild) RejectApplication(charID uint32) error {
db, err := db.GetDB()
db, err := database.GetDB()
logger := logger.Get()
if err != nil {
@@ -348,7 +348,7 @@ func (guild *Guild) RejectApplication(charID uint32) error {
}
func (guild *Guild) ArrangeCharacters(charIDs []uint32) error {
db, err := db.GetDB()
db, err := database.GetDB()
logger := logger.Get()
if err != nil {
@@ -386,7 +386,7 @@ func (guild *Guild) ArrangeCharacters(charIDs []uint32) error {
}
func (guild *Guild) GetApplicationForCharID(charID uint32, applicationType model.GuildApplicationType) (*model.GuildApplication, error) {
db, err := db.GetDB()
db, err := database.GetDB()
logger := logger.Get()
if err != nil {
@@ -418,7 +418,7 @@ func (guild *Guild) GetApplicationForCharID(charID uint32, applicationType model
}
func (guild *Guild) HasApplicationForCharID(charID uint32) (bool, error) {
db, err := db.GetDB()
db, err := database.GetDB()
logger := logger.Get()
if err != nil {
@@ -487,7 +487,7 @@ SELECT
`
func CreateGuild(guildName string, charID uint32) (int32, error) {
db, err := db.GetDB()
db, err := database.GetDB()
logger := logger.Get()
if err != nil {
@@ -557,7 +557,7 @@ func CreateGuild(guildName string, charID uint32) (int32, error) {
}
func GetGuildInfoByID(guildID uint32) (*Guild, error) {
db, err := db.GetDB()
db, err := database.GetDB()
logger := logger.Get()
if err != nil {
@@ -586,7 +586,7 @@ func GetGuildInfoByID(guildID uint32) (*Guild, error) {
}
func GetGuildInfoByCharacterId(charID uint32) (*Guild, error) {
db, err := db.GetDB()
db, err := database.GetDB()
logger := logger.Get()
if err != nil {

4
internal/service/guild_alliance.go
View File

@@ -1,7 +1,7 @@
package service
import (
"erupe-ce/utils/db"
"erupe-ce/utils/database"
"erupe-ce/utils/logger"
"fmt"
"time"
@@ -43,7 +43,7 @@ FROM guild_alliances ga
`
func GetAllianceData(AllianceID uint32) (*GuildAlliance, error) {
db, err := db.GetDB()
db, err := database.GetDB()
logger := logger.Get()
if err != nil {

8
internal/service/guild_member.go
View File

@@ -1,7 +1,7 @@
package service
import (
"erupe-ce/utils/db"
"erupe-ce/utils/database"
"erupe-ce/utils/logger"
"fmt"
"time"
@@ -48,7 +48,7 @@ func (gm *GuildMember) IsSubLeader() bool {
}
func (gm *GuildMember) Save() error {
db, err := db.GetDB()
db, err := database.GetDB()
logger := logger.Get()
if err != nil {
@@ -95,7 +95,7 @@ SELECT * FROM (
`
func GetGuildMembers(guildID uint32, applicants bool) ([]*GuildMember, error) {
db, err := db.GetDB()
db, err := database.GetDB()
logger := logger.Get()
if err != nil {
@@ -129,7 +129,7 @@ func GetGuildMembers(guildID uint32, applicants bool) ([]*GuildMember, error) {
}
func GetCharacterGuildData(charID uint32) (*GuildMember, error) {
db, err := db.GetDB()
db, err := database.GetDB()
logger := logger.Get()
if err != nil {

12
internal/service/mail.go
View File

@@ -6,7 +6,7 @@ import (
"erupe-ce/network/binpacket"
"erupe-ce/network/mhfpacket"
"erupe-ce/utils/byteframe"
"erupe-ce/utils/db"
"erupe-ce/utils/database"
"erupe-ce/utils/logger"
"fmt"
@@ -34,7 +34,7 @@ type Mail struct {
}
func (m *Mail) Send(transaction *sql.Tx) error {
db, err := db.GetDB()
db, err := database.GetDB()
logger := logger.Get()
if err != nil {
@@ -71,7 +71,7 @@ func (m *Mail) Send(transaction *sql.Tx) error {
}
func (m *Mail) MarkRead() error {
db, err := db.GetDB()
db, err := database.GetDB()
logger := logger.Get()
if err != nil {
logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
@@ -93,7 +93,7 @@ func (m *Mail) MarkRead() error {
}
func GetMailListForCharacter(charID uint32) ([]Mail, error) {
db, err := db.GetDB()
db, err := database.GetDB()
logger := logger.Get()
if err != nil {
logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
@@ -146,7 +146,7 @@ func GetMailListForCharacter(charID uint32) ([]Mail, error) {
}
func GetMailByID(ID int) (*Mail, error) {
db, err := db.GetDB()
db, err := database.GetDB()
logger := logger.Get()
if err != nil {
@@ -217,7 +217,7 @@ func SendMailNotification(s SessionMail, m *Mail, recipient SessionMail) {
}
func getCharacterName(charID uint32) string {
db, err := db.GetDB()
db, err := database.GetDB()
logger := logger.Get()
if err != nil {