瀏覽代碼

Fix membership db scan error message

Tulir Asokan 5 年之前
父節點
當前提交
f91812f3e9
共有 1 個文件被更改,包括 5 次插入2 次删除
  1. 5 2
      database/statestore.go

+ 5 - 2
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
 }