From 6c969b6c9d99edaf430afb2b9aef2cc4c6b9b06f Mon Sep 17 00:00:00 2001
From: Till Faelligen <2353100+S7evinK@users.noreply.github.com>
Date: Thu, 15 Sep 2022 13:42:33 +0200
Subject: [PATCH] Fix wrong returned state

---
 internal/fulltext/bleve.go      |  3 ++-
 syncapi/consumers/roomserver.go | 13 +++++++++----
 syncapi/routing/search.go       | 22 ++++++++++------------
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/internal/fulltext/bleve.go b/internal/fulltext/bleve.go
index b07c0e51d..da8932f5c 100644
--- a/internal/fulltext/bleve.go
+++ b/internal/fulltext/bleve.go
@@ -22,8 +22,9 @@ import (
 
 	"github.com/blevesearch/bleve/v2"
 	"github.com/blevesearch/bleve/v2/mapping"
-	"github.com/matrix-org/dendrite/setup/config"
 	"github.com/matrix-org/gomatrixserverlib"
+
+	"github.com/matrix-org/dendrite/setup/config"
 )
 
 // Search contains all existing bleve.Index
diff --git a/syncapi/consumers/roomserver.go b/syncapi/consumers/roomserver.go
index af3b37b6c..63c6a3268 100644
--- a/syncapi/consumers/roomserver.go
+++ b/syncapi/consumers/roomserver.go
@@ -21,6 +21,11 @@ import (
 	"fmt"
 
 	"github.com/getsentry/sentry-go"
+	"github.com/matrix-org/gomatrixserverlib"
+	"github.com/nats-io/nats.go"
+	log "github.com/sirupsen/logrus"
+	"github.com/tidwall/gjson"
+
 	"github.com/matrix-org/dendrite/internal/fulltext"
 	"github.com/matrix-org/dendrite/roomserver/api"
 	"github.com/matrix-org/dendrite/setup/config"
@@ -30,10 +35,6 @@ import (
 	"github.com/matrix-org/dendrite/syncapi/producers"
 	"github.com/matrix-org/dendrite/syncapi/storage"
 	"github.com/matrix-org/dendrite/syncapi/types"
-	"github.com/matrix-org/gomatrixserverlib"
-	"github.com/nats-io/nats.go"
-	log "github.com/sirupsen/logrus"
-	"github.com/tidwall/gjson"
 )
 
 // OutputRoomEventConsumer consumes events that originated in the room server.
@@ -474,6 +475,9 @@ func (s *OutputRoomEventConsumer) updateStateEvent(event *gomatrixserverlib.Head
 }
 
 func (s *OutputRoomEventConsumer) writeFTS(ev *gomatrixserverlib.HeaderedEvent, pduPosition types.StreamPosition) error {
+	if !s.cfg.Fulltext.Enabled {
+		return nil
+	}
 	e := fulltext.IndexElement{
 		EventID:        ev.EventID(),
 		RoomID:         ev.RoomID(),
@@ -493,6 +497,7 @@ func (s *OutputRoomEventConsumer) writeFTS(ev *gomatrixserverlib.HeaderedEvent,
 		if err := s.fts.Delete(ev.Redacts()); err != nil {
 			return fmt.Errorf("failed to delete entry from fulltext index: %w", err)
 		}
+		return nil
 	default:
 		return nil
 	}
diff --git a/syncapi/routing/search.go b/syncapi/routing/search.go
index 7ec3479b8..4b048e2c2 100644
--- a/syncapi/routing/search.go
+++ b/syncapi/routing/search.go
@@ -159,8 +159,7 @@ func Search(req *http.Request, device *api.Device, syncDB storage.Database, fts
 		})
 	}
 
-	gotStateForRooms := make(map[string]struct{})
-	var allStates []gomatrixserverlib.ClientEvent
+	stateForRooms := make(map[string][]gomatrixserverlib.ClientEvent)
 	for _, event := range evs {
 		eventsBefore, eventsAfter, err := contextEvents(ctx, syncDB, event, roomFilter, searchReq)
 		if err != nil {
@@ -208,15 +207,14 @@ func Search(req *http.Request, device *api.Device, syncDB storage.Database, fts
 		roomGroup := groups[event.RoomID()]
 		roomGroup.Results = append(roomGroup.Results, event.EventID())
 		groups[event.RoomID()] = roomGroup
-		if _, ok := gotStateForRooms[event.RoomID()]; searchReq.SearchCategories.RoomEvents.IncludeState && !ok {
+		if _, ok := stateForRooms[event.RoomID()]; searchReq.SearchCategories.RoomEvents.IncludeState && !ok {
 			stateFilter := gomatrixserverlib.DefaultStateFilter()
 			state, err := syncDB.CurrentState(ctx, event.RoomID(), &stateFilter, nil)
 			if err != nil {
 				logrus.WithError(err).Error("unable to get current state")
 				return jsonerror.InternalServerError()
 			}
-			gotStateForRooms[event.RoomID()] = struct{}{}
-			allStates = append(allStates, gomatrixserverlib.HeaderedToClientEvents(state, gomatrixserverlib.FormatSync)...)
+			stateForRooms[event.RoomID()] = gomatrixserverlib.HeaderedToClientEvents(state, gomatrixserverlib.FormatSync)
 		}
 	}
 
@@ -233,7 +231,7 @@ func Search(req *http.Request, device *api.Device, syncDB storage.Database, fts
 				Results:    results,
 				NextBatch:  &nb,
 				Highlights: strings.Split(searchReq.SearchCategories.RoomEvents.SearchTerm, " "),
-				State:      allStates,
+				State:      stateForRooms,
 			},
 		},
 	}
@@ -329,12 +327,12 @@ type ProfileInfo struct {
 }
 
 type RoomEvents struct {
-	Count      int                             `json:"count"`
-	Groups     Groups                          `json:"groups"`
-	Highlights []string                        `json:"highlights"`
-	NextBatch  *string                         `json:"next_batch,omitempty"`
-	Results    []Result                        `json:"results"`
-	State      []gomatrixserverlib.ClientEvent `json:"state,omitempty"`
+	Count      int                                        `json:"count"`
+	Groups     Groups                                     `json:"groups"`
+	Highlights []string                                   `json:"highlights"`
+	NextBatch  *string                                    `json:"next_batch,omitempty"`
+	Results    []Result                                   `json:"results"`
+	State      map[string][]gomatrixserverlib.ClientEvent `json:"state,omitempty"`
 }
 type SearchCategories struct {
 	RoomEvents RoomEvents `json:"room_events"`