From 44dd185506eeddf5b14d0b5b18a2678d18095054 Mon Sep 17 00:00:00 2001 From: Shota Gvinepadze Date: Thu, 10 Nov 2022 11:30:49 +0400 Subject: [PATCH] Fix bad merge (#21632) --- store/sqlstore/thread_store.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/store/sqlstore/thread_store.go b/store/sqlstore/thread_store.go index 9e4e47835f..502be5e354 100644 --- a/store/sqlstore/thread_store.go +++ b/store/sqlstore/thread_store.go @@ -561,7 +561,7 @@ func (s *SqlThreadStore) MarkAllAsReadByTeam(userId, teamId string) error { query = query. Where("Threads.PostId = ThreadMemberships.PostId"). Where(sq.Eq{"ThreadMemberships.UserId": userId}). - Where(sq.Or{sq.Eq{"Threads.TeamId": teamId}, sq.Eq{"Threads.TeamId": ""}}). + Where(sq.Or{sq.Eq{"Threads.ThreadTeamId": teamId}, sq.Eq{"Threads.ThreadTeamId": ""}}). Set("LastViewed", timestamp). Set("UnreadMentions", 0). Set("LastUpdated", timestamp)