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

Compare commits

base: LibertaCasa:394d6ca2fa34f924b1790ad66da42cf374829315
Branches Tags
LibertaCasa:master
LibertaCasa:container
LibertaCasa:systemd
...
compare: LibertaCasa:b6187e007792836c3c29d6925a3fa97cb23791bf
Branches Tags
LibertaCasa:master
LibertaCasa:container
LibertaCasa:systemd

2 Commits
394d6ca2fa ... b6187e0077

Author SHA1 Message Date
Pratyush Desai
b6187e0077 Merge pull request 'Change host lookup to be optional' (#23) from dbhost into master 
Reviewed-on: #23
 2024-10-03 18:00:59 +02:00
Georg Pfuetzenreuter
accf16c92a
Change host lookup to be optional 
Some parts of the logic do not make use of the host column in the
players table, allow the field to be empty and do not query for an empty
value (which might return bogus entries) if no value is passed to the
lookup function.
This additionally avoids the need for the hardcoded initial host when
configuring the bot player.

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
 2024-10-02 22:30:06 +02:00
2 changed files with 6 additions and 2 deletions
Show Stats Expand all files Collapse all files

6
wat/db.go
View File

@ -65,8 +65,12 @@ func NewWatDb() *WatDb {
func (w *WatDb) User(nick, host string, create bool) Player {
var player Player
query := "nick = ?"
if host != "" {
query = query + " or host = ?"
}
// 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())
// No user, make another
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 {
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){
//"wat": g.megaWat,
"steroid": g.Steroid,