Fix desegregation changes to make the bridge work again

This commit is contained in:
Tulir Asokan
2018-08-30 01:10:26 +03:00
parent 347854dc8c
commit 22cdf519f2
9 changed files with 89 additions and 50 deletions

View File

@ -74,13 +74,16 @@ type Puppet struct {
}
func (puppet *Puppet) Scan(row Scannable) *Puppet {
err := row.Scan(&puppet.JID, &puppet.Displayname, &puppet.Avatar)
var displayname, avatar sql.NullString
err := row.Scan(&puppet.JID, &displayname, &avatar)
if err != nil {
if err != sql.ErrNoRows {
puppet.log.Errorln("Database scan failed:", err)
}
return nil
}
puppet.Displayname = displayname.String
puppet.Avatar = avatar.String
return puppet
}