From 7f8abc1f04968c3b3ae57519e3c98865609e5213 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Wed, 15 Jun 2022 15:27:12 +0300
Subject: [PATCH] Fix scanning reaction rows

---
 database/reaction.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/database/reaction.go b/database/reaction.go
index e681918..71584db 100644
--- a/database/reaction.go
+++ b/database/reaction.go
@@ -81,7 +81,8 @@ type Reaction struct {
 }
 
 func (r *Reaction) Scan(row dbutil.Scannable) *Reaction {
-	err := row.Scan(&r.Channel.ChannelID, &r.Channel.Receiver, &r.MessageID, &r.Sender, &r.EmojiName, &r.ThreadID, &r.MXID)
+	var threadID sql.NullString
+	err := row.Scan(&r.Channel.ChannelID, &r.Channel.Receiver, &r.MessageID, &r.Sender, &r.EmojiName, &threadID, &r.MXID)
 	if err != nil {
 		if !errors.Is(err, sql.ErrNoRows) {
 			r.log.Errorln("Database scan failed:", err)
@@ -89,6 +90,7 @@ func (r *Reaction) Scan(row dbutil.Scannable) *Reaction {
 		}
 		return nil
 	}
+	r.ThreadID = threadID.String
 
 	return r
 }