Mirror/Erupe
1
0
Fork 0
mirror of https://github.com/Mezeporta/Erupe.git synced 2025-12-16 08:55:31 +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

14
server/channelserver/chat_commands.go
View File

@@ -7,7 +7,7 @@ import (
"erupe-ce/internal/constant"
"erupe-ce/network/mhfpacket"
"erupe-ce/utils/byteframe"
"erupe-ce/utils/db"
"erupe-ce/utils/database"
"erupe-ce/utils/mhfcid"
"erupe-ce/utils/mhfcourse"
"fmt"
@@ -52,7 +52,7 @@ func executeCommand(s *Session, input string) error {
}
func ban(s *Session, args []string) error {
db, err := db.GetDB()
db, err := database.GetDB()
if err != nil {
s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
}
@@ -103,7 +103,7 @@ func ban(s *Session, args []string) error {
}
func timer(s *Session, _ []string) error {
db, err := db.GetDB()
db, err := database.GetDB()
if err != nil {
s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
}
@@ -119,7 +119,7 @@ func timer(s *Session, _ []string) error {
}
func psn(s *Session, args []string) error {
db, err := db.GetDB()
db, err := database.GetDB()
if err != nil {
s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
}
@@ -219,7 +219,7 @@ func kqf(s *Session, args []string) error {
}
func rights(s *Session, args []string) error {
db, err := db.GetDB()
db, err := database.GetDB()
if err != nil {
s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
}
@@ -239,7 +239,7 @@ func rights(s *Session, args []string) error {
}
func course(s *Session, args []string) error {
db, err := db.GetDB()
db, err := database.GetDB()
if err != nil {
s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
}
@@ -366,7 +366,7 @@ func teleport(s *Session, args []string) error {
}
func discord(s *Session, _ []string) error {
db, err := db.GetDB()
db, err := database.GetDB()
if err != nil {
s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
}

10
server/channelserver/handlers.go
View File

@@ -6,7 +6,7 @@ import (
"erupe-ce/internal/model"
"erupe-ce/internal/service"
"erupe-ce/internal/system"
"erupe-ce/utils/db"
"erupe-ce/utils/database"
"erupe-ce/utils/gametime"
"erupe-ce/utils/mhfcourse"
"erupe-ce/utils/mhfitem"
@@ -38,7 +38,7 @@ func stubEnumerateNoResults(s *Session, ackHandle uint32) {
}
func updateRights(s *Session) {
db, err := db.GetDB()
db, err := database.GetDB()
if err != nil {
s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
}
@@ -143,7 +143,7 @@ func handleMsgSysLogout(s *Session, db *sqlx.DB, p mhfpacket.MHFPacket) {
}
func logoutPlayer(s *Session) {
db, err := db.GetDB()
db, err := database.GetDB()
if err != nil {
s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
}
@@ -788,7 +788,7 @@ func handleMsgMhfEnumerateOrder(s *Session, db *sqlx.DB, p mhfpacket.MHFPacket)
func handleMsgMhfGetExtraInfo(s *Session, db *sqlx.DB, p mhfpacket.MHFPacket) {}
func userGetItems(s *Session) []mhfitem.MHFItemStack {
db, err := db.GetDB()
db, err := database.GetDB()
if err != nil {
s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
}
@@ -882,7 +882,7 @@ func handleMsgMhfExchangeWeeklyStamp(s *Session, db *sqlx.DB, p mhfpacket.MHFPac
}
func getGoocooData(s *Session, cid uint32) [][]byte {
db, err := db.GetDB()
db, err := database.GetDB()
if err != nil {
s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
}

4
server/channelserver/handlers_cafe.go
View File

@@ -3,7 +3,7 @@ package channelserver
import (
"erupe-ce/internal/model"
"erupe-ce/utils/byteframe"
"erupe-ce/utils/db"
"erupe-ce/utils/database"
"erupe-ce/utils/gametime"
"erupe-ce/utils/mhfcourse"
@@ -206,7 +206,7 @@ func handleMsgMhfPostCafeDurationBonusReceived(s *Session, db *sqlx.DB, p mhfpac
}
func addPointNetcafe(s *Session, p int) error {
db, err := db.GetDB()
db, err := database.GetDB()
if err != nil {
s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
}

4
server/channelserver/handlers_distitem.go
View File

@@ -6,7 +6,7 @@ import (
"erupe-ce/internal/service"
"erupe-ce/network/mhfpacket"
"erupe-ce/utils/byteframe"
"erupe-ce/utils/db"
"erupe-ce/utils/database"
ps "erupe-ce/utils/pascalstring"
"fmt"
@@ -108,7 +108,7 @@ func handleMsgMhfEnumerateDistItem(s *Session, db *sqlx.DB, p mhfpacket.MHFPacke
}
func getDistributionItems(s *Session, i uint32) []model.DistributionItem {
db, err := db.GetDB()
db, err := database.GetDB()
if err != nil {
s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
}

6
server/channelserver/handlers_diva.go
View File

@@ -3,7 +3,7 @@ package channelserver
import (
"encoding/hex"
config "erupe-ce/config"
"erupe-ce/utils/db"
"erupe-ce/utils/database"
"erupe-ce/utils/gametime"
"erupe-ce/utils/stringsupport"
"fmt"
@@ -16,7 +16,7 @@ import (
)
func cleanupDiva(s *Session) {
db, err := db.GetDB()
db, err := database.GetDB()
if err != nil {
s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
}
@@ -24,7 +24,7 @@ func cleanupDiva(s *Session) {
}
func generateDivaTimestamps(s *Session, start uint32, debug bool) []uint32 {
db, err := db.GetDB()
db, err := database.GetDB()
if err != nil {
s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
}

6
server/channelserver/handlers_festa.go
View File

@@ -8,7 +8,7 @@ import (
"erupe-ce/network/mhfpacket"
"erupe-ce/utils/byteframe"
"erupe-ce/utils/db"
"erupe-ce/utils/database"
"erupe-ce/utils/gametime"
ps "erupe-ce/utils/pascalstring"
@@ -105,7 +105,7 @@ func handleMsgMhfEnumerateRanking(s *Session, db *sqlx.DB, p mhfpacket.MHFPacket
}
func cleanupFesta(s *Session) {
db, err := db.GetDB()
db, err := database.GetDB()
if err != nil {
s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
}
@@ -117,7 +117,7 @@ func cleanupFesta(s *Session) {
}
func generateFestaTimestamps(s *Session, start uint32, debug bool) []uint32 {
db, err := db.GetDB()
db, err := database.GetDB()
if err != nil {
s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
}

6
server/channelserver/handlers_guild.go
View File

@@ -6,7 +6,7 @@ import (
"erupe-ce/internal/model"
"erupe-ce/internal/service"
"erupe-ce/utils/db"
"erupe-ce/utils/database"
"erupe-ce/utils/gametime"
"erupe-ce/utils/mhfitem"
@@ -209,7 +209,7 @@ func handleChangePugi(s *Session, outfit uint8, guild *service.Guild, num int) {
}
func handleDonateRP(s *Session, amount uint16, guild *service.Guild, _type int) []byte {
db, err := db.GetDB()
db, err := database.GetDB()
if err != nil {
s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
}
@@ -977,7 +977,7 @@ func HandleMsgMhfGetGuildTargetMemberNum(s *Session, db *sqlx.DB, p mhfpacket.MH
}
func guildGetItems(s *Session, guildID uint32) []mhfitem.MHFItemStack {
db, err := db.GetDB()
db, err := database.GetDB()
if err != nil {
s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
}

12
server/channelserver/handlers_house.go
View File

@@ -6,7 +6,7 @@ import (
"erupe-ce/internal/service"
"erupe-ce/network/mhfpacket"
"erupe-ce/utils/byteframe"
"erupe-ce/utils/db"
"erupe-ce/utils/database"
"erupe-ce/utils/mhfitem"
ps "erupe-ce/utils/pascalstring"
"erupe-ce/utils/stringsupport"
@@ -367,7 +367,7 @@ func handleMsgMhfAcquireTitle(s *Session, db *sqlx.DB, p mhfpacket.MHFPacket) {
func handleMsgMhfResetTitle(s *Session, db *sqlx.DB, p mhfpacket.MHFPacket) {}
func initializeWarehouse(s *Session) {
db, err := db.GetDB()
db, err := database.GetDB()
if err != nil {
s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
}
@@ -440,7 +440,7 @@ func handleMsgMhfOperateWarehouse(s *Session, db *sqlx.DB, p mhfpacket.MHFPacket
}
func addWarehouseItem(s *Session, item mhfitem.MHFItemStack) {
db, err := db.GetDB()
db, err := database.GetDB()
if err != nil {
s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
}
@@ -451,7 +451,7 @@ func addWarehouseItem(s *Session, item mhfitem.MHFItemStack) {
}
func addWarehouseEquipment(s *Session, equipment mhfitem.MHFEquipment) {
db, err := db.GetDB()
db, err := database.GetDB()
if err != nil {
s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
}
@@ -462,7 +462,7 @@ func addWarehouseEquipment(s *Session, equipment mhfitem.MHFEquipment) {
}
func warehouseGetItems(s *Session, index uint8) []mhfitem.MHFItemStack {
db, err := db.GetDB()
db, err := database.GetDB()
if err != nil {
s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
}
@@ -482,7 +482,7 @@ func warehouseGetItems(s *Session, index uint8) []mhfitem.MHFItemStack {
}
func warehouseGetEquipment(s *Session, index uint8) []mhfitem.MHFEquipment {
db, err := db.GetDB()
db, err := database.GetDB()
if err != nil {
s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
}

4
server/channelserver/handlers_mercenary.go
View File

@@ -10,7 +10,7 @@ import (
"fmt"
"erupe-ce/utils/byteframe"
"erupe-ce/utils/db"
"erupe-ce/utils/database"
"erupe-ce/utils/gametime"
"erupe-ce/utils/stringsupport"
"io"
@@ -332,7 +332,7 @@ func handleMsgMhfEnumerateAiroulist(s *Session, db *sqlx.DB, p mhfpacket.MHFPack
}
func getGuildAirouList(s *Session) []model.Airou {
db, err := db.GetDB()
db, err := database.GetDB()
if err != nil {
s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
}

12
server/channelserver/handlers_shop_gacha.go
View File

@@ -5,7 +5,7 @@ import (
"erupe-ce/internal/model"
"erupe-ce/network/mhfpacket"
"erupe-ce/utils/byteframe"
"erupe-ce/utils/db"
"erupe-ce/utils/database"
"erupe-ce/utils/gametime"
ps "erupe-ce/utils/pascalstring"
"fmt"
@@ -46,7 +46,7 @@ func writeShopItems(bf *byteframe.ByteFrame, items []model.ShopItem) {
}
func getShopItems(s *Session, shopType uint8, shopID uint32) []model.ShopItem {
db, err := db.GetDB()
db, err := database.GetDB()
if err != nil {
s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
}
@@ -276,7 +276,7 @@ func handleMsgMhfUseGachaPoint(s *Session, db *sqlx.DB, p mhfpacket.MHFPacket) {
func spendGachaCoin(s *Session, quantity uint16) {
db, err := db.GetDB()
db, err := database.GetDB()
if err != nil {
s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
}
@@ -291,7 +291,7 @@ func spendGachaCoin(s *Session, quantity uint16) {
}
func transactGacha(s *Session, gachaID uint32, rollID uint8) (error, int) {
db, err := db.GetDB()
db, err := database.GetDB()
if err != nil {
s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
}
@@ -326,7 +326,7 @@ func transactGacha(s *Session, gachaID uint32, rollID uint8) (error, int) {
}
func getGuaranteedItems(s *Session, gachaID uint32, rollID uint8) []model.GachaItem {
db, err := db.GetDB()
db, err := database.GetDB()
if err != nil {
s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
}
@@ -344,7 +344,7 @@ func getGuaranteedItems(s *Session, gachaID uint32, rollID uint8) []model.GachaI
}
func addGachaItem(s *Session, items []model.GachaItem) {
db, err := db.GetDB()
db, err := database.GetDB()
if err != nil {
s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
}

4
server/channelserver/sys_channel_server.go
View File

@@ -9,7 +9,7 @@ import (
"erupe-ce/config"
"erupe-ce/internal/system"
"erupe-ce/server/discordbot"
"erupe-ce/utils/db"
"erupe-ce/utils/database"
"erupe-ce/utils/gametime"
"erupe-ce/utils/logger"
@@ -209,7 +209,7 @@ func (server *ChannelServer) FindSessionByCharID(charID uint32) *Session {
func (server *ChannelServer) DisconnectUser(uid uint32) {
var cid uint32
var cids []uint32
db, err := db.GetDB()
db, err := database.GetDB()
if err != nil {
server.logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
}

4
server/channelserver/sys_discord.go
View File

@@ -1,7 +1,7 @@
package channelserver
import (
"erupe-ce/utils/db"
"erupe-ce/utils/database"
"fmt"
"sort"
"strings"
@@ -71,7 +71,7 @@ func getCharacterList(server *ChannelServer) string {
// onInteraction handles slash commands
func (server *ChannelServer) onInteraction(ds *discordgo.Session, i *discordgo.InteractionCreate) {
db, err := db.GetDB()
db, err := database.GetDB()
if err != nil {
server.logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
}

6
server/channelserver/sys_session.go
View File

@@ -10,7 +10,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/gametime"
"erupe-ce/utils/logger"
"erupe-ce/utils/mhfcourse"
@@ -196,7 +196,7 @@ func (s *Session) handlePacketGroup(pktGroup []byte) {
fmt.Printf("\n!!! [%s] %s NOT IMPLEMENTED !!! \n\n\n", s.Name, opcode)
return
}
database, err := db.GetDB()
database, err := database.GetDB()
if err != nil {
s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
}
@@ -314,7 +314,7 @@ func (s *Session) GetSemaphoreID() uint32 {
func (s *Session) isOp() bool {
var op bool
db, err := db.GetDB()
db, err := database.GetDB()
if err != nil {
s.Logger.Fatal(fmt.Sprintf("Failed to get database instance: %s", err))
}