From 9b6f3bc7423008fa2d66d88227675b5c1c11db48 Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Thu, 22 Oct 2015 16:38:03 +0100
Subject: [PATCH 1/2] Support filtering events represented as dicts.

This is useful because the emphemeral events such as presence and
typing are represented as dicts inside synapse.
---
 synapse/api/filtering.py | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/synapse/api/filtering.py b/synapse/api/filtering.py
index 60b6648e0d..522b151c35 100644
--- a/synapse/api/filtering.py
+++ b/synapse/api/filtering.py
@@ -183,10 +183,29 @@ class Filter(object):
         Returns:
             bool: True if the event matches
         """
+        if isinstance(event, dict):
+            return self.check_fields(
+                event.get("room_id", None),
+                event.get("sender", None),
+                event.get("type", None),
+            )
+        else:
+            return self.check_fields(
+                event.room_id,
+                event.sender,
+                event.type,
+            )
+
+    def check_fields(self, room_id, sender, event_type):
+        """Checks whether the filter matches the given event fields.
+
+        Returns:
+            bool: True if the event fields match
+        """
         literal_keys = {
-            "rooms": lambda v: event.room_id == v,
-            "senders": lambda v: event.sender == v,
-            "types": lambda v: _matches_wildcard(event.type, v)
+            "rooms": lambda v: room_id == v,
+            "senders": lambda v: sender == v,
+            "types": lambda v: _matches_wildcard(event_type, v)
         }
 
         for name, match_func in literal_keys.items():

From 4e05aab4f7daa79d3a521f3477f6ade10157350b Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Thu, 22 Oct 2015 17:08:59 +0100
Subject: [PATCH 2/2] Don't assume that the event has a room_id or sender

---
 synapse/api/filtering.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/synapse/api/filtering.py b/synapse/api/filtering.py
index 522b151c35..765d1bc9d5 100644
--- a/synapse/api/filtering.py
+++ b/synapse/api/filtering.py
@@ -191,8 +191,8 @@ class Filter(object):
             )
         else:
             return self.check_fields(
-                event.room_id,
-                event.sender,
+                getattr(event, "room_id", None),
+                getattr(event, "sender", None),
                 event.type,
             )