Merge branch 'develop' of github.com:matrix-org/synapse into upgrade_script

synapse/handlers/presence.py

@@ -139,9 +139,7 @@ class PresenceHandler(BaseHandler):
         if user in self._user_cachemap:
             return self._user_cachemap[user]
         else:
-            statuscache = UserPresenceCache()
-            statuscache.update({"presence": PresenceState.OFFLINE}, user)
-            return statuscache
+            return UserPresenceCache()
 
     def registered_user(self, user):
         self.store.create_presence(user.localpart)
@@ -873,7 +871,7 @@ class UserPresenceCache(object):
     Includes the update timestamp.
     """
     def __init__(self):
-        self.state = {}
+        self.state = {"presence": PresenceState.OFFLINE}
         self.serial = None
 
     def update(self, state, serial):

synapse/handlers/profile.py

@@ -202,7 +202,6 @@ class ProfileHandler(BaseHandler):
 
             content = {
                 "membership": j.content["membership"],
-                "prev": j.content["membership"],
             }
 
             yield self.distributor.fire(

synapse/handlers/room.py

@@ -364,9 +364,6 @@ class RoomMemberHandler(BaseHandler):
             target_user_id, event.room_id
         )
 
-        if prev_state:
-            event.content["prev"] = prev_state.membership
-
         room_id = event.room_id
 
         # If we're trying to join a room then we have to do this differently

tests/handlers/test_presence.py

@@ -1200,7 +1200,10 @@ class PresencePollingTestCase(unittest.TestCase):
                 path=ANY,
                 data=_expect_edu("remote", "m.presence",
                     content={
-                        "push": [ {"user_id": "@clementine:test" }],
+                        "push": [ {
+                            "user_id": "@clementine:test",
+                            "presence": OFFLINE,
+                        }],
                     },
                 ),
                 json_data_callback=ANY,
@@ -1229,7 +1232,10 @@ class PresencePollingTestCase(unittest.TestCase):
                 path=ANY,
                 data=_expect_edu("remote", "m.presence",
                     content={
-                        "push": [ {"user_id": "@fig:test" }],
+                        "push": [ {
+                            "user_id": "@fig:test",
+                            "presence": OFFLINE,
+                        }],
                     },
                 ),
                 json_data_callback=ANY,

tests/rest/test_rooms.py

@@ -840,7 +840,6 @@ class RoomMemberStateTestCase(RestTestCase):
 
         expected_response = {
             "membership": Membership.JOIN,
-            "prev": Membership.JOIN,
         }
         self.assertEquals(expected_response, response)