From f91812f3e91728d423114215d7b99dba06c2ed80 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Sun, 25 Aug 2019 21:53:09 +0300 Subject: [PATCH] Fix membership db scan error message --- database/statestore.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/database/statestore.go b/database/statestore.go index 9c80c84..1161330 100644 --- a/database/statestore.go +++ b/database/statestore.go @@ -91,8 +91,11 @@ func (store *SQLStateStore) GetRoomMemberships(roomID string) map[string]mautrix func (store *SQLStateStore) GetMembership(roomID, userID string) mautrix.Membership { row := store.db.QueryRow("SELECT membership FROM mx_user_profile WHERE room_id=$1 AND user_id=$2", roomID, userID) membership := mautrix.MembershipLeave - if row != nil && row.Scan(&membership) != nil { - store.log.Warnln("Failed to scan membership of %s in %s: %v", userID, roomID, membership) + if row != nil { + err := row.Scan(&membership) + if err != nil { + store.log.Warnfln("Failed to scan membership of %s in %s: %v", userID, roomID, err) + } } return membership }