LibertaCasa/watbot
9
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Change host lookup to be optional #23

Merged
pratyush merged 1 commits from dbhost into master 2024-10-03 18:01:00 +02:00
Conversation 0 Commits 1 Files Changed 2 +6 -2
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit accf16c92a - Show all commits

6
wat/db.go
View File

@ -65,8 +65,12 @@ func NewWatDb() *WatDb {
func (w *WatDb) User(nick, host string, create bool) Player { func (w *WatDb) User(nick, host string, create bool) Player {
var player Player var player Player
query := "nick = ?"
if host != "" {
query = query + " or host = ?"
}
// Try and get a user // Try and get a user
if err := w.db.First(&player, "nick = ? or host = ?", nick, host).Error; err != nil && create { if err := w.db.First(&player, query, nick, host).Error; err != nil && create {
fmt.Printf("Creating user: %s\n", err.Error()) fmt.Printf("Creating user: %s\n", err.Error())
// No user, make another // No user, make another
player.Nick = nick player.Nick = nick

2
wat/game.go
View File

@ -28,7 +28,7 @@ var unconscious = "wat, your hands fumble and fail you. try resting, weakling."
func NewWatGame(bot *WatBot, db *WatDb) *WatGame { func NewWatGame(bot *WatBot, db *WatDb) *WatGame {
g := WatGame{bot, db, Player{}, nil, nil, nil, nil, map[string]int{}} g := WatGame{bot, db, Player{}, nil, nil, nil, nil, map[string]int{}}
g.me = g.db.User(bot.Nick, "amia8t89xfp8y.liberta.casa", true) g.me = g.db.User(bot.Nick, "", true)
g.commands = map[string](func(*Player, []string) string){ g.commands = map[string](func(*Player, []string) string){
//"wat": g.megaWat, //"wat": g.megaWat,
"steroid": g.Steroid, "steroid": g.Steroid,