Merge branches 'develop' and 't3chguy/fix_contains-url_filtering' of github.com:matrix-org/synapse into t3chguy/fix_contains-url_filtering

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

synapse/api/filtering.py

@@ -12,6 +12,9 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
+import six
+import ujson as json
 import jsonschema
 from canonicaljson import json
 from jsonschema import FormatChecker
@@ -364,7 +367,10 @@ class Filter(object):
 
             room_id = event.get("room_id", None)
             ev_type = event.get("type", None)
-            is_url = "url" in event.get("content", {})
+
+            content = event.get("content", {})
+            # check if there is a string url field in the content for filtering purposes
+            is_url = isinstance(content.get("url"), six.text_type)
 
         return self.check_fields(
             room_id,