Merge pull request #12 from krombel/fixUserManagementRoom
parse management room from database as well
This commit is contained in:
commit
4e03361df6
@ -93,9 +93,9 @@ type User struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (user *User) Scan(row Scannable) *User {
|
func (user *User) Scan(row Scannable) *User {
|
||||||
var managementRoom, clientID, clientToken, serverToken, jid sql.NullString
|
var jid, clientID, clientToken, serverToken sql.NullString
|
||||||
var encKey, macKey []byte
|
var encKey, macKey []byte
|
||||||
err := row.Scan(&user.MXID, &jid, &managementRoom, &clientID, &clientToken, &serverToken, &encKey, &macKey)
|
err := row.Scan(&user.MXID, &jid, &user.ManagementRoom, &clientID, &clientToken, &serverToken, &encKey, &macKey)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if err != sql.ErrNoRows {
|
if err != sql.ErrNoRows {
|
||||||
user.log.Errorln("Database scan failed:", err)
|
user.log.Errorln("Database scan failed:", err)
|
||||||
|
Loading…
Reference in New Issue
Block a user