2015-01-27 15:28:56 +01:00
|
|
|
# -*- coding: utf-8 -*-
|
2016-01-07 05:26:29 +01:00
|
|
|
# Copyright 2015, 2016 OpenMarket Ltd
|
2015-01-27 15:28:56 +01:00
|
|
|
#
|
|
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
# you may not use this file except in compliance with the License.
|
|
|
|
# You may obtain a copy of the License at
|
|
|
|
#
|
|
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
#
|
|
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
# 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.
|
2019-01-06 22:43:26 +01:00
|
|
|
from six import text_type
|
|
|
|
|
2017-03-23 15:42:07 +01:00
|
|
|
import jsonschema
|
2018-07-09 08:09:20 +02:00
|
|
|
from canonicaljson import json
|
2017-03-23 15:42:41 +01:00
|
|
|
from jsonschema import FormatChecker
|
2017-03-23 15:42:07 +01:00
|
|
|
|
2018-07-09 08:09:20 +02:00
|
|
|
from twisted.internet import defer
|
|
|
|
|
|
|
|
from synapse.api.errors import SynapseError
|
|
|
|
from synapse.storage.presence import UserPresenceState
|
|
|
|
from synapse.types import RoomID, UserID
|
|
|
|
|
2017-03-23 15:42:07 +01:00
|
|
|
FILTER_SCHEMA = {
|
|
|
|
"additionalProperties": False,
|
|
|
|
"type": "object",
|
|
|
|
"properties": {
|
2019-06-20 11:32:02 +02:00
|
|
|
"limit": {"type": "number"},
|
|
|
|
"senders": {"$ref": "#/definitions/user_id_array"},
|
|
|
|
"not_senders": {"$ref": "#/definitions/user_id_array"},
|
2017-03-23 15:42:07 +01:00
|
|
|
# TODO: We don't limit event type values but we probably should...
|
|
|
|
# check types are valid event types
|
2019-06-20 11:32:02 +02:00
|
|
|
"types": {"type": "array", "items": {"type": "string"}},
|
|
|
|
"not_types": {"type": "array", "items": {"type": "string"}},
|
|
|
|
},
|
2017-03-23 15:42:07 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
ROOM_FILTER_SCHEMA = {
|
|
|
|
"additionalProperties": False,
|
|
|
|
"type": "object",
|
|
|
|
"properties": {
|
2019-06-20 11:32:02 +02:00
|
|
|
"not_rooms": {"$ref": "#/definitions/room_id_array"},
|
|
|
|
"rooms": {"$ref": "#/definitions/room_id_array"},
|
|
|
|
"ephemeral": {"$ref": "#/definitions/room_event_filter"},
|
|
|
|
"include_leave": {"type": "boolean"},
|
|
|
|
"state": {"$ref": "#/definitions/room_event_filter"},
|
|
|
|
"timeline": {"$ref": "#/definitions/room_event_filter"},
|
|
|
|
"account_data": {"$ref": "#/definitions/room_event_filter"},
|
|
|
|
},
|
2017-03-23 15:42:07 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
ROOM_EVENT_FILTER_SCHEMA = {
|
|
|
|
"additionalProperties": False,
|
|
|
|
"type": "object",
|
|
|
|
"properties": {
|
2019-06-20 11:32:02 +02:00
|
|
|
"limit": {"type": "number"},
|
|
|
|
"senders": {"$ref": "#/definitions/user_id_array"},
|
|
|
|
"not_senders": {"$ref": "#/definitions/user_id_array"},
|
|
|
|
"types": {"type": "array", "items": {"type": "string"}},
|
|
|
|
"not_types": {"type": "array", "items": {"type": "string"}},
|
|
|
|
"rooms": {"$ref": "#/definitions/room_id_array"},
|
|
|
|
"not_rooms": {"$ref": "#/definitions/room_id_array"},
|
|
|
|
"contains_url": {"type": "boolean"},
|
|
|
|
"lazy_load_members": {"type": "boolean"},
|
|
|
|
"include_redundant_members": {"type": "boolean"},
|
|
|
|
},
|
2017-03-23 15:42:07 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
USER_ID_ARRAY_SCHEMA = {
|
|
|
|
"type": "array",
|
2019-06-20 11:32:02 +02:00
|
|
|
"items": {"type": "string", "format": "matrix_user_id"},
|
2017-03-23 15:42:41 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
ROOM_ID_ARRAY_SCHEMA = {
|
|
|
|
"type": "array",
|
2019-06-20 11:32:02 +02:00
|
|
|
"items": {"type": "string", "format": "matrix_room_id"},
|
2017-03-23 15:42:07 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
USER_FILTER_SCHEMA = {
|
|
|
|
"$schema": "http://json-schema.org/draft-04/schema#",
|
|
|
|
"description": "schema for a Sync filter",
|
|
|
|
"type": "object",
|
|
|
|
"definitions": {
|
2017-03-23 15:42:41 +01:00
|
|
|
"room_id_array": ROOM_ID_ARRAY_SCHEMA,
|
2017-03-23 15:42:07 +01:00
|
|
|
"user_id_array": USER_ID_ARRAY_SCHEMA,
|
|
|
|
"filter": FILTER_SCHEMA,
|
|
|
|
"room_filter": ROOM_FILTER_SCHEMA,
|
2019-06-20 11:32:02 +02:00
|
|
|
"room_event_filter": ROOM_EVENT_FILTER_SCHEMA,
|
2017-03-23 15:42:07 +01:00
|
|
|
},
|
|
|
|
"properties": {
|
2019-06-20 11:32:02 +02:00
|
|
|
"presence": {"$ref": "#/definitions/filter"},
|
|
|
|
"account_data": {"$ref": "#/definitions/filter"},
|
|
|
|
"room": {"$ref": "#/definitions/room_filter"},
|
|
|
|
"event_format": {"type": "string", "enum": ["client", "federation"]},
|
2017-03-23 15:42:07 +01:00
|
|
|
"event_fields": {
|
|
|
|
"type": "array",
|
|
|
|
"items": {
|
|
|
|
"type": "string",
|
|
|
|
# Don't allow '\\' in event field filters. This makes matching
|
|
|
|
# events a lot easier as we can then use a negative lookbehind
|
|
|
|
# assertion to split '\.' If we allowed \\ then it would
|
|
|
|
# incorrectly split '\\.' See synapse.events.utils.serialize_event
|
2018-10-24 11:41:45 +02:00
|
|
|
#
|
|
|
|
# Note that because this is a regular expression, we have to escape
|
|
|
|
# each backslash in the pattern.
|
2019-06-20 11:32:02 +02:00
|
|
|
"pattern": r"^((?!\\\\).)*$",
|
|
|
|
},
|
|
|
|
},
|
2017-03-23 15:42:07 +01:00
|
|
|
},
|
2019-06-20 11:32:02 +02:00
|
|
|
"additionalProperties": False,
|
2017-03-23 15:42:07 +01:00
|
|
|
}
|
2016-01-28 18:19:51 +01:00
|
|
|
|
2015-01-27 15:28:56 +01:00
|
|
|
|
2019-06-20 11:32:02 +02:00
|
|
|
@FormatChecker.cls_checks("matrix_room_id")
|
2017-03-23 15:42:41 +01:00
|
|
|
def matrix_room_id_validator(room_id_str):
|
|
|
|
return RoomID.from_string(room_id_str)
|
|
|
|
|
|
|
|
|
2019-06-20 11:32:02 +02:00
|
|
|
@FormatChecker.cls_checks("matrix_user_id")
|
2017-03-23 15:42:41 +01:00
|
|
|
def matrix_user_id_validator(user_id_str):
|
|
|
|
return UserID.from_string(user_id_str)
|
|
|
|
|
|
|
|
|
2015-01-27 15:28:56 +01:00
|
|
|
class Filtering(object):
|
|
|
|
def __init__(self, hs):
|
|
|
|
super(Filtering, self).__init__()
|
2015-01-27 18:48:13 +01:00
|
|
|
self.store = hs.get_datastore()
|
2015-01-27 15:28:56 +01:00
|
|
|
|
2016-05-03 17:01:24 +02:00
|
|
|
@defer.inlineCallbacks
|
2015-01-27 15:28:56 +01:00
|
|
|
def get_user_filter(self, user_localpart, filter_id):
|
2016-05-03 17:01:24 +02:00
|
|
|
result = yield self.store.get_user_filter(user_localpart, filter_id)
|
2019-07-23 15:00:55 +02:00
|
|
|
return FilterCollection(result)
|
2015-01-27 15:28:56 +01:00
|
|
|
|
2015-01-28 17:45:18 +01:00
|
|
|
def add_user_filter(self, user_localpart, user_filter):
|
2016-01-22 11:41:30 +01:00
|
|
|
self.check_valid_filter(user_filter)
|
2015-01-28 17:45:18 +01:00
|
|
|
return self.store.add_user_filter(user_localpart, user_filter)
|
2015-01-27 17:17:56 +01:00
|
|
|
|
|
|
|
# TODO(paul): surely we should probably add a delete_user_filter or
|
|
|
|
# replace_user_filter at some point? There's no REST API specified for
|
|
|
|
# them however
|
2015-01-28 17:45:18 +01:00
|
|
|
|
2016-01-22 11:41:30 +01:00
|
|
|
def check_valid_filter(self, user_filter_json):
|
2015-01-28 17:45:18 +01:00
|
|
|
"""Check if the provided filter is valid.
|
|
|
|
|
|
|
|
This inspects all definitions contained within the filter.
|
|
|
|
|
|
|
|
Args:
|
2015-01-29 18:41:48 +01:00
|
|
|
user_filter_json(dict): The filter
|
2015-01-28 17:45:18 +01:00
|
|
|
Raises:
|
|
|
|
SynapseError: If the filter is not valid.
|
|
|
|
"""
|
|
|
|
# NB: Filters are the complete json blobs. "Definitions" are an
|
|
|
|
# individual top-level key e.g. public_user_data. Filters are made of
|
|
|
|
# many definitions.
|
2017-03-23 15:42:07 +01:00
|
|
|
try:
|
2019-06-20 11:32:02 +02:00
|
|
|
jsonschema.validate(
|
|
|
|
user_filter_json, USER_FILTER_SCHEMA, format_checker=FormatChecker()
|
|
|
|
)
|
2017-03-23 15:42:07 +01:00
|
|
|
except jsonschema.ValidationError as e:
|
2018-09-27 13:38:50 +02:00
|
|
|
raise SynapseError(400, str(e))
|
2015-01-28 17:45:18 +01:00
|
|
|
|
2015-01-29 18:41:48 +01:00
|
|
|
|
2015-10-20 16:33:25 +02:00
|
|
|
class FilterCollection(object):
|
2015-01-29 18:41:48 +01:00
|
|
|
def __init__(self, filter_json):
|
2016-01-22 11:41:30 +01:00
|
|
|
self._filter_json = filter_json
|
2015-01-29 18:41:48 +01:00
|
|
|
|
2016-01-22 11:41:30 +01:00
|
|
|
room_filter_json = self._filter_json.get("room", {})
|
2015-10-20 16:33:25 +02:00
|
|
|
|
2019-06-20 11:32:02 +02:00
|
|
|
self._room_filter = Filter(
|
|
|
|
{k: v for k, v in room_filter_json.items() if k in ("rooms", "not_rooms")}
|
|
|
|
)
|
2015-10-20 16:33:25 +02:00
|
|
|
|
2016-01-22 11:41:30 +01:00
|
|
|
self._room_timeline_filter = Filter(room_filter_json.get("timeline", {}))
|
|
|
|
self._room_state_filter = Filter(room_filter_json.get("state", {}))
|
|
|
|
self._room_ephemeral_filter = Filter(room_filter_json.get("ephemeral", {}))
|
|
|
|
self._room_account_data = Filter(room_filter_json.get("account_data", {}))
|
|
|
|
self._presence_filter = Filter(filter_json.get("presence", {}))
|
|
|
|
self._account_data = Filter(filter_json.get("account_data", {}))
|
2015-12-01 19:41:32 +01:00
|
|
|
|
2019-06-20 11:32:02 +02:00
|
|
|
self.include_leave = filter_json.get("room", {}).get("include_leave", False)
|
2016-11-22 11:14:05 +01:00
|
|
|
self.event_fields = filter_json.get("event_fields", [])
|
2018-09-04 16:18:25 +02:00
|
|
|
self.event_format = filter_json.get("event_format", "client")
|
2015-12-04 18:32:09 +01:00
|
|
|
|
2016-01-28 18:19:51 +01:00
|
|
|
def __repr__(self):
|
|
|
|
return "<FilterCollection %s>" % (json.dumps(self._filter_json),)
|
|
|
|
|
2016-01-22 11:41:30 +01:00
|
|
|
def get_filter_json(self):
|
|
|
|
return self._filter_json
|
|
|
|
|
2015-10-13 15:12:43 +02:00
|
|
|
def timeline_limit(self):
|
2016-01-22 11:41:30 +01:00
|
|
|
return self._room_timeline_filter.limit()
|
2015-01-29 18:41:48 +01:00
|
|
|
|
2015-10-13 15:12:43 +02:00
|
|
|
def presence_limit(self):
|
2016-01-22 11:41:30 +01:00
|
|
|
return self._presence_filter.limit()
|
2015-10-13 15:12:43 +02:00
|
|
|
|
|
|
|
def ephemeral_limit(self):
|
2016-01-22 11:41:30 +01:00
|
|
|
return self._room_ephemeral_filter.limit()
|
2015-10-13 15:12:43 +02:00
|
|
|
|
2018-03-19 02:15:13 +01:00
|
|
|
def lazy_load_members(self):
|
|
|
|
return self._room_state_filter.lazy_load_members()
|
|
|
|
|
2018-07-26 23:51:30 +02:00
|
|
|
def include_redundant_members(self):
|
|
|
|
return self._room_state_filter.include_redundant_members()
|
|
|
|
|
2015-10-13 15:12:43 +02:00
|
|
|
def filter_presence(self, events):
|
2016-01-22 11:41:30 +01:00
|
|
|
return self._presence_filter.filter(events)
|
2015-01-29 18:41:48 +01:00
|
|
|
|
2015-12-01 19:41:32 +01:00
|
|
|
def filter_account_data(self, events):
|
2016-01-22 11:41:30 +01:00
|
|
|
return self._account_data.filter(events)
|
2015-12-01 19:41:32 +01:00
|
|
|
|
2015-01-29 18:41:48 +01:00
|
|
|
def filter_room_state(self, events):
|
2016-01-22 11:41:30 +01:00
|
|
|
return self._room_state_filter.filter(self._room_filter.filter(events))
|
2015-01-29 18:41:48 +01:00
|
|
|
|
2015-10-13 15:12:43 +02:00
|
|
|
def filter_room_timeline(self, events):
|
2016-01-22 11:41:30 +01:00
|
|
|
return self._room_timeline_filter.filter(self._room_filter.filter(events))
|
2015-01-29 18:41:48 +01:00
|
|
|
|
|
|
|
def filter_room_ephemeral(self, events):
|
2016-01-22 11:41:30 +01:00
|
|
|
return self._room_ephemeral_filter.filter(self._room_filter.filter(events))
|
2015-10-13 15:12:43 +02:00
|
|
|
|
2015-11-18 16:31:04 +01:00
|
|
|
def filter_room_account_data(self, events):
|
2016-01-22 11:41:30 +01:00
|
|
|
return self._room_account_data.filter(self._room_filter.filter(events))
|
2015-11-02 17:23:15 +01:00
|
|
|
|
2016-11-22 17:38:35 +01:00
|
|
|
def blocks_all_presence(self):
|
|
|
|
return (
|
2019-06-20 11:32:02 +02:00
|
|
|
self._presence_filter.filters_all_types()
|
|
|
|
or self._presence_filter.filters_all_senders()
|
2016-11-22 17:38:35 +01:00
|
|
|
)
|
|
|
|
|
|
|
|
def blocks_all_room_ephemeral(self):
|
|
|
|
return (
|
2019-06-20 11:32:02 +02:00
|
|
|
self._room_ephemeral_filter.filters_all_types()
|
|
|
|
or self._room_ephemeral_filter.filters_all_senders()
|
|
|
|
or self._room_ephemeral_filter.filters_all_rooms()
|
2016-11-22 17:38:35 +01:00
|
|
|
)
|
|
|
|
|
|
|
|
def blocks_all_room_timeline(self):
|
|
|
|
return (
|
2019-06-20 11:32:02 +02:00
|
|
|
self._room_timeline_filter.filters_all_types()
|
|
|
|
or self._room_timeline_filter.filters_all_senders()
|
|
|
|
or self._room_timeline_filter.filters_all_rooms()
|
2016-11-22 17:38:35 +01:00
|
|
|
)
|
|
|
|
|
2015-01-29 18:41:48 +01:00
|
|
|
|
2015-10-20 16:33:25 +02:00
|
|
|
class Filter(object):
|
|
|
|
def __init__(self, filter_json):
|
|
|
|
self.filter_json = filter_json
|
2015-01-29 18:41:48 +01:00
|
|
|
|
2016-07-14 16:15:52 +02:00
|
|
|
self.types = self.filter_json.get("types", None)
|
|
|
|
self.not_types = self.filter_json.get("not_types", [])
|
|
|
|
|
|
|
|
self.rooms = self.filter_json.get("rooms", None)
|
|
|
|
self.not_rooms = self.filter_json.get("not_rooms", [])
|
|
|
|
|
|
|
|
self.senders = self.filter_json.get("senders", None)
|
|
|
|
self.not_senders = self.filter_json.get("not_senders", [])
|
|
|
|
|
|
|
|
self.contains_url = self.filter_json.get("contains_url", None)
|
|
|
|
|
2016-11-22 17:38:35 +01:00
|
|
|
def filters_all_types(self):
|
|
|
|
return "*" in self.not_types
|
|
|
|
|
|
|
|
def filters_all_senders(self):
|
|
|
|
return "*" in self.not_senders
|
|
|
|
|
|
|
|
def filters_all_rooms(self):
|
|
|
|
return "*" in self.not_rooms
|
|
|
|
|
2015-10-20 16:33:25 +02:00
|
|
|
def check(self, event):
|
2015-10-20 16:47:42 +02:00
|
|
|
"""Checks whether the filter matches the given event.
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
bool: True if the event matches
|
|
|
|
"""
|
2017-03-15 15:50:33 +01:00
|
|
|
# We usually get the full "events" as dictionaries coming through,
|
|
|
|
# except for presence which actually gets passed around as its own
|
|
|
|
# namedtuple type.
|
2017-03-15 15:27:34 +01:00
|
|
|
if isinstance(event, UserPresenceState):
|
|
|
|
sender = event.user_id
|
|
|
|
room_id = None
|
|
|
|
ev_type = "m.presence"
|
2019-01-06 22:43:26 +01:00
|
|
|
contains_url = False
|
2017-03-15 15:27:34 +01:00
|
|
|
else:
|
|
|
|
sender = event.get("sender", None)
|
|
|
|
if not sender:
|
2017-03-15 17:01:01 +01:00
|
|
|
# Presence events had their 'sender' in content.user_id, but are
|
|
|
|
# now handled above. We don't know if anything else uses this
|
|
|
|
# form. TODO: Check this and probably remove it.
|
2017-03-15 15:27:34 +01:00
|
|
|
content = event.get("content")
|
|
|
|
# account_data has been allowed to have non-dict content, so
|
|
|
|
# check type first
|
|
|
|
if isinstance(content, dict):
|
|
|
|
sender = content.get("user_id")
|
|
|
|
|
|
|
|
room_id = event.get("room_id", None)
|
|
|
|
ev_type = event.get("type", None)
|
2019-01-06 22:43:26 +01:00
|
|
|
|
|
|
|
content = event.get("content", {})
|
|
|
|
# check if there is a string url field in the content for filtering purposes
|
|
|
|
contains_url = isinstance(content.get("url"), text_type)
|
2016-01-25 11:10:44 +01:00
|
|
|
|
2019-06-20 11:32:02 +02:00
|
|
|
return self.check_fields(room_id, sender, ev_type, contains_url)
|
2015-10-22 17:38:03 +02:00
|
|
|
|
2016-07-14 16:15:52 +02:00
|
|
|
def check_fields(self, room_id, sender, event_type, contains_url):
|
2015-10-22 17:38:03 +02:00
|
|
|
"""Checks whether the filter matches the given event fields.
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
bool: True if the event fields match
|
|
|
|
"""
|
2015-10-20 16:33:25 +02:00
|
|
|
literal_keys = {
|
2015-10-22 17:38:03 +02:00
|
|
|
"rooms": lambda v: room_id == v,
|
|
|
|
"senders": lambda v: sender == v,
|
2019-06-20 11:32:02 +02:00
|
|
|
"types": lambda v: _matches_wildcard(event_type, v),
|
2015-10-20 16:33:25 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
for name, match_func in literal_keys.items():
|
|
|
|
not_name = "not_%s" % (name,)
|
2016-07-14 16:15:52 +02:00
|
|
|
disallowed_values = getattr(self, not_name)
|
2015-10-20 16:33:25 +02:00
|
|
|
if any(map(match_func, disallowed_values)):
|
2015-01-29 18:41:48 +01:00
|
|
|
return False
|
|
|
|
|
2016-07-14 16:15:52 +02:00
|
|
|
allowed_values = getattr(self, name)
|
2015-10-20 16:33:25 +02:00
|
|
|
if allowed_values is not None:
|
|
|
|
if not any(map(match_func, allowed_values)):
|
2015-01-29 18:41:48 +01:00
|
|
|
return False
|
2016-07-14 16:15:52 +02:00
|
|
|
|
|
|
|
contains_url_filter = self.filter_json.get("contains_url")
|
|
|
|
if contains_url_filter is not None:
|
|
|
|
if contains_url_filter != contains_url:
|
|
|
|
return False
|
2015-01-29 18:41:48 +01:00
|
|
|
|
|
|
|
return True
|
|
|
|
|
2015-10-21 11:09:26 +02:00
|
|
|
def filter_rooms(self, room_ids):
|
|
|
|
"""Apply the 'rooms' filter to a given list of rooms.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
room_ids (list): A list of room_ids.
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
list: A list of room_ids that match the filter
|
|
|
|
"""
|
|
|
|
room_ids = set(room_ids)
|
|
|
|
|
|
|
|
disallowed_rooms = set(self.filter_json.get("not_rooms", []))
|
|
|
|
room_ids -= disallowed_rooms
|
|
|
|
|
|
|
|
allowed_rooms = self.filter_json.get("rooms", None)
|
|
|
|
if allowed_rooms is not None:
|
|
|
|
room_ids &= set(allowed_rooms)
|
|
|
|
|
|
|
|
return room_ids
|
|
|
|
|
2015-10-20 16:33:25 +02:00
|
|
|
def filter(self, events):
|
2018-05-31 11:03:47 +02:00
|
|
|
return list(filter(self.check, events))
|
2015-10-20 16:33:25 +02:00
|
|
|
|
|
|
|
def limit(self):
|
|
|
|
return self.filter_json.get("limit", 10)
|
|
|
|
|
2018-03-19 02:15:13 +01:00
|
|
|
def lazy_load_members(self):
|
|
|
|
return self.filter_json.get("lazy_load_members", False)
|
|
|
|
|
2018-07-26 23:51:30 +02:00
|
|
|
def include_redundant_members(self):
|
|
|
|
return self.filter_json.get("include_redundant_members", False)
|
|
|
|
|
2019-01-22 12:12:48 +01:00
|
|
|
def with_room_ids(self, room_ids):
|
|
|
|
"""Returns a new filter with the given room IDs appended.
|
|
|
|
|
|
|
|
Args:
|
2019-01-24 18:21:35 +01:00
|
|
|
room_ids (iterable[unicode]): The room_ids to add
|
2019-01-22 12:12:48 +01:00
|
|
|
|
|
|
|
Returns:
|
|
|
|
filter: A new filter including the given rooms and the old
|
|
|
|
filter's rooms.
|
|
|
|
"""
|
2019-01-22 13:06:36 +01:00
|
|
|
newFilter = Filter(self.filter_json)
|
2019-01-22 12:12:48 +01:00
|
|
|
newFilter.rooms += room_ids
|
|
|
|
return newFilter
|
2019-01-18 11:04:47 +01:00
|
|
|
|
2015-10-20 16:33:25 +02:00
|
|
|
|
|
|
|
def _matches_wildcard(actual_value, filter_value):
|
|
|
|
if filter_value.endswith("*"):
|
|
|
|
type_prefix = filter_value[:-1]
|
|
|
|
return actual_value.startswith(type_prefix)
|
|
|
|
else:
|
|
|
|
return actual_value == filter_value
|
2016-01-22 11:41:30 +01:00
|
|
|
|
|
|
|
|
|
|
|
DEFAULT_FILTER_COLLECTION = FilterCollection({})
|