From 790a5634f462917a608e6e1d9080f17244c65c10 Mon Sep 17 00:00:00 2001
From: Brendan Abolivier <contact@brendanabolivier.com>
Date: Mon, 24 Jul 2017 14:48:46 +0100
Subject: [PATCH] Fix depth and previous events not being set

---
 .../matrix-org/dendrite/clientapi/readers/profile.go |  3 +++
 .../dendrite/syncapi/storage/syncserver.go           | 12 ------------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/github.com/matrix-org/dendrite/clientapi/readers/profile.go b/src/github.com/matrix-org/dendrite/clientapi/readers/profile.go
index 7d521729a..a449c38d8 100644
--- a/src/github.com/matrix-org/dendrite/clientapi/readers/profile.go
+++ b/src/github.com/matrix-org/dendrite/clientapi/readers/profile.go
@@ -299,6 +299,9 @@ func buildMembershipEvents(
 			return nil, err
 		}
 
+		builder.Depth = queryRes.Depth
+		builder.PrevEvents = queryRes.LatestEvents
+
 		authEvents := gomatrixserverlib.NewAuthEvents(nil)
 
 		for i := range queryRes.StateEvents {
diff --git a/src/github.com/matrix-org/dendrite/syncapi/storage/syncserver.go b/src/github.com/matrix-org/dendrite/syncapi/storage/syncserver.go
index b5283f073..9f6935ead 100644
--- a/src/github.com/matrix-org/dendrite/syncapi/storage/syncserver.go
+++ b/src/github.com/matrix-org/dendrite/syncapi/storage/syncserver.go
@@ -100,18 +100,6 @@ func (d *SyncServerDatabase) WriteEvent(
 		}
 		streamPos = types.StreamPosition(pos)
 
-		if len(addStateEvents) == 0 {
-			// If the event is a m.room.member event, and has unsigned content,
-			// we need to save it as it is very likely to be a membership update
-			// (e.g. if a user updates their profile)
-			if ev.Type() == "m.room.member" && len(ev.Unsigned()) > 0 {
-				addStateEvents = append(addStateEvents, *ev)
-			} else if len(removeStateEventIDs) == 0 {
-				// Nothing to do, the event may have just been a message event.
-				return nil
-			}
-		}
-
 		return d.updateRoomState(txn, removeStateEventIDs, addStateEvents, streamPos)
 	})
 	return