make it work

matrix-org · Mar 13, 2018 · ccca028 · ccca028
1 parent f0f9a06
commit ccca028
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
@@ -498,7 +498,7 @@ def compute_state_delta(self, room_id, batch, sync_config, since_token, now_toke
                     if filter_members:
                         member_state_ids = {
                             t: state_ids[t]
-                            for t in state_ids if t[0] == EventTypes.member
+                            for t in state_ids if t[0] == EventTypes.Member
                         }
 
                 else:
@@ -511,7 +511,7 @@ def compute_state_delta(self, room_id, batch, sync_config, since_token, now_toke
                     if filter_members:
                         member_state_ids = {
                             t: state_ids[t]
-                            for t in state_ids if t[0] == EventTypes.member
+                            for t in state_ids if t[0] == EventTypes.Member
                         }
 
                 timeline_state = {
@@ -542,7 +542,7 @@ def compute_state_delta(self, room_id, batch, sync_config, since_token, now_toke
                 if filter_members:
                     member_state_ids = {
                         t: state_at_timeline_start[t]
-                        for t in state_ids if t[0] == EventTypes.member
+                        for t in state_ids if t[0] == EventTypes.Member
                     }
 
                 timeline_state = {

diff --git a/synapse/storage/state.py b/synapse/storage/state.py
@@ -257,10 +257,11 @@ def _get_state_groups_from_groups_txn(self, txn, groups, types=None):
                 if include_other_types:
                     # XXX: check whether this slows postgres down like a list of
                     # ORs does too?
+                    unique_types = set([ t for (t, _) in types ])
                     clause_to_args.append(
                         (
-                            "AND type <> ? " * len(types),
-                            [t for (t, _) in types]
+                            "AND type <> ? " * len(unique_types),
+                            list(unique_types)
                         )
                     )
             else:
@@ -293,10 +294,11 @@ def _get_state_groups_from_groups_txn(self, txn, groups, types=None):
                         where_args.extend([typ[0], typ[1]])
 
                 if include_other_types:
+                    unique_types = set([ t for (t, _) in types ])                    
                     where_clauses.append(
-                        "(" + " AND ".join(["type <> ?"] * len(types)) + ")"
+                        "(" + " AND ".join(["type <> ?"] * len(unique_types)) + ")"
                     )
-                    where_args.extend(t for (t, _) in types)
+                    where_args.extend(list(unique_types))
 
                 where_clause = "AND (%s)" % (" OR ".join(where_clauses))
             else: