Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								8ea509a935 
								
									
								
							
								 
							
						 
						
							
							
								
								Update synapse/api/filtering.py  
							
							 
							
							... 
							
							
							
							Co-Authored-By: anoadragon453 <1342360+anoadragon453@users.noreply.github.com> 
							
						 
						
							2019-01-24 17:21:35 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								c433f61091 
								
							
								 
							
						 
						
							
							
								
								Ensure new filter is actually created  
							
							 
							
							
							
						 
						
							2019-01-22 12:06:36 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								c9bfb058d8 
								
							
								 
							
						 
						
							
							
								
								Fix a bug with single-room search searching all rooms  
							
							 
							
							... 
							
							
							
							* Create a new method for getting predecessor rooms
* Remove formatting change 
							
						 
						
							2019-01-22 12:00:41 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								df3a661e4a 
								
							
								 
							
						 
						
							
							
								
								Search for messages across predecessor rooms  
							
							 
							
							... 
							
							
							
							Signed-off-by: Andrew Morgan <andrew@amorgan.xyz> 
							
						 
						
							2019-01-18 11:19:20 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								a27e501b09 
								
							
								 
							
						 
						
							
							
								
								fix the check for whether `is_url` to match all the other ones in codebase ( #3405 )  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-01-06 21:43:25 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								7e07d25ed6 
								
							
								 
							
						 
						
							
							
								
								Allow backslashes in event field filters  
							
							 
							
							... 
							
							
							
							Fixes a bug introduced in https://github.com/matrix-org/synapse/pull/1783  which
meant that single backslashes were not allowed in event field filters.
The intention here is to allow single-backslashes, but disallow
double-backslashes. 
							
						 
						
							2018-10-24 11:11:24 +01:00  
						
					 
				
					
						
							
							
								 
								Schnuffle
							
						 
						
							 
							
							
							
								
							
								dc5db01ff2 
								
							
								 
							
						 
						
							
							
								
								Replaced all occurences of e.message with str(e)  
							
							 
							
							... 
							
							
							
							Signed-off-by: Schnuffle  <schnuffle@github.com> 
							
						 
						
							2018-09-27 13:38:50 +02:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								87c18d12ee 
								
							
								 
							
						 
						
							
							
								
								Implement 'event_format' filter param in /sync  
							
							 
							
							... 
							
							
							
							This has been specced and part-implemented; let's implement it for /sync (but
no other endpoints yet :/). 
							
						 
						
							2018-09-04 15:20:09 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
								
								
							
							
								
							
								a75231b507 
								
									
								
							
								 
							
						 
						
							
							
								
								Deduplicate redundant lazy-loaded members ( #3331 )  
							
							 
							
							... 
							
							
							
							* attempt at deduplicating lazy-loaded members
as per the proposal; we can deduplicate redundant lazy-loaded members
which are sent in the same sync sequence. we do this heuristically
rather than requiring the client to somehow tell us which members it
has chosen to cache, by instead caching the last N members sent to
a client, and not sending them again.  For now we hardcode N to 100.
Each cache for a given (user,device) tuple is in turn cached for up to
X minutes (to avoid the caches building up).  For now we hardcode X to 30.
* add include_redundant_members filter option & make it work
* remove stale todo
* add tests for _get_some_state_from_cache
* incorporate review 
							
						 
						
							2018-07-26 22:51:30 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								be3adfc331 
								
							
								 
							
						 
						
							
							
								
								merge develop pydoc for _get_state_for_groups  
							
							 
							
							
							
						 
						
							2018-07-19 11:26:04 +01:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
							
								
							
								49af402019 
								
							
								 
							
						 
						
							
							
								
								run isort  
							
							 
							
							
							
						 
						
							2018-07-09 16:09:20 +10:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								6350bf925e 
								
									
								
							
								 
							
						 
						
							
							
								
								Attempt to be more performant on PyPy ( #3462 )  
							
							 
							
							
							
						 
						
							2018-06-28 14:49:57 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								28f09fcdd5 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into matthew/filter_members  
							
							 
							
							
							
						 
						
							2018-06-04 00:09:17 +03:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								c936a52a9e 
								
									
								
							
								 
							
						 
						
							
							
								
								Consistently use six's iteritems and wrap lazy keys/values in list() if they're not meant to be lazy ( #3307 )  
							
							 
							
							
							
						 
						
							2018-05-31 19:03:47 +10:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								9bbb9f5556 
								
							
								 
							
						 
						
							
							
								
								add lazy_load_members to the filter json schema  
							
							 
							
							
							
						 
						
							2018-05-29 04:26:10 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								7a6df013cc 
								
							
								 
							
						 
						
							
							
								
								merge develop  
							
							 
							
							
							
						 
						
							2018-05-29 00:25:22 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								b2f2282947 
								
							
								 
							
						 
						
							
							
								
								make lazy_load_members configurable in filters  
							
							 
							
							
							
						 
						
							2018-03-19 01:15:13 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								926ba76e23 
								
							
								 
							
						 
						
							
							
								
								Replace ujson with simplejson  
							
							 
							
							
							
						 
						
							2018-03-15 23:43:31 +00:00  
						
					 
				
					
						
							
							
								 
								pik
							
						 
						
							 
							
							
							
								
							
								566641a0b5 
								
							
								 
							
						 
						
							
							
								
								use jsonschema.FormatChecker for RoomID and UserID strings  
							
							 
							
							... 
							
							
							
							* use a valid filter in rest/client/v2_alpha test
Signed-off-by: pik <alexander.maznev@gmail.com> 
							
						 
						
							2017-03-23 11:42:41 -03:00  
						
					 
				
					
						
							
							
								 
								pik
							
						 
						
							 
							
							
							
								
							
								acafcf1c5b 
								
							
								 
							
						 
						
							
							
								
								Add valid filter tests, flake8, fix typo  
							
							 
							
							... 
							
							
							
							Signed-off-by: pik <alexander.maznev@gmail.com> 
							
						 
						
							2017-03-23 11:42:10 -03:00  
						
					 
				
					
						
							
							
								 
								pik
							
						 
						
							 
							
							
							
								
							
								e56c79c114 
								
							
								 
							
						 
						
							
							
								
								check_valid_filter using JSONSchema  
							
							 
							
							... 
							
							
							
							* add invalid filter tests
Signed-off-by: pik <alexander.maznev@gmail.com> 
							
						 
						
							2017-03-23 11:42:07 -03:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a8f96c63aa 
								
							
								 
							
						 
						
							
							
								
								Comment  
							
							 
							
							
							
						 
						
							2017-03-15 16:01:01 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e892457a03 
								
							
								 
							
						 
						
							
							
								
								Comment  
							
							 
							
							
							
						 
						
							2017-03-15 15:01:39 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6c82de5100 
								
							
								 
							
						 
						
							
							
								
								Format presence events on the edges instead of reformatting them multiple times  
							
							 
							
							
							
						 
						
							2017-03-15 14:27:34 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								83bcdcee61 
								
							
								 
							
						 
						
							
							
								
								Return early on /sync code paths if a '*' filter is used  
							
							 
							
							... 
							
							
							
							This is currently very conservative in that it only does this if there is no
`since` token. This limits the risk to clients likely to be doing one-off
syncs (like bridges), but does mean that normal human clients won't benefit
from the time savings here. If the savings are large enough, I would consider
generalising this to just check the filter. 
							
						 
						
							2016-11-22 16:38:35 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								cea4e4e7b2 
								
							
								 
							
						 
						
							
							
								
								Glue only_event_fields into the sync rest servlet  
							
							 
							
							
							
						 
						
							2016-11-22 10:14:05 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								f97511a1f3 
								
							
								 
							
						 
						
							
							
								
								Move event_fields filtering to serialize_event  
							
							 
							
							... 
							
							
							
							Also make it an inclusive not exclusive filter, as the spec demands. 
							
						 
						
							2016-11-21 17:42:16 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								e90fcd9edd 
								
							
								 
							
						 
						
							
							
								
								Add filter_event_fields and filter_field to FilterCollection  
							
							 
							
							
							
						 
						
							2016-11-21 15:18:18 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e5142f65a6 
								
							
								 
							
						 
						
							
							
								
								Add 'contains_url' to filter  
							
							 
							
							
							
						 
						
							2016-07-14 15:35:48 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a438a6d2bc 
								
							
								 
							
						 
						
							
							
								
								Implement basic ignore user  
							
							 
							
							
							
						 
						
							2016-05-04 10:16:46 +01:00  
						
					 
				
					
						
							
							
								 
								Patrik Oldsberg
							
						 
						
							 
							
							
							
								
							
								536f949a1a 
								
							
								 
							
						 
						
							
							
								
								api/filtering: don't assume that event content will always be a dict  
							
							 
							
							... 
							
							
							
							Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com> 
							
						 
						
							2016-02-17 12:59:41 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								35981c8b71 
								
							
								 
							
						 
						
							
							
								
								Fix test  
							
							 
							
							
							
						 
						
							2016-01-28 17:20:05 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								8c6012a4af 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							 
							
							
							
						 
						
							2016-01-25 13:12:35 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4021f95261 
								
							
								 
							
						 
						
							
							
								
								Move logic from rest/ to handlers/  
							
							 
							
							
							
						 
						
							2016-01-25 10:10:44 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								975903ae17 
								
							
								 
							
						 
						
							
							
								
								Sanitize filters  
							
							 
							
							
							
						 
						
							2016-01-22 10:41:30 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								6c28ac260c 
								
							
								 
							
						 
						
							
							
								
								copyrights  
							
							 
							
							
							
						 
						
							2016-01-07 04:26:29 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								392773ccb2 
								
							
								 
							
						 
						
							
							
								
								Guest users must be joined to a room to see it in /sync  
							
							 
							
							
							
						 
						
							2016-01-06 16:44:13 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								c058625959 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into markjh/guest_access  
							
							 
							
							... 
							
							
							
							Conflicts:
	synapse/api/filtering.py 
							
						 
						
							2015-12-22 13:58:18 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								b9b4466d0d 
								
							
								 
							
						 
						
							
							
								
								Add top level filters for filtering by room id  
							
							 
							
							... 
							
							
							
							Documented by matrix-org/matrix-doc#246  
							
						 
						
							2015-12-22 11:40:32 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								45a9e0ae0c 
								
							
								 
							
						 
						
							
							
								
								Allow guest access if the user provides a list of rooms in the filter  
							
							 
							
							
							
						 
						
							2015-12-22 10:25:46 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								489a4cd1cf 
								
							
								 
							
						 
						
							
							
								
								Add top level filtering by room id  
							
							 
							
							
							
						 
						
							2015-12-21 21:10:41 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								660dee94af 
								
							
								 
							
						 
						
							
							
								
								Only include the archived rooms if a include_leave flag in set in the filter  
							
							 
							
							
							
						 
						
							2015-12-04 17:32:09 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								95f30ecd1f 
								
							
								 
							
						 
						
							
							
								
								Add API for setting account_data globaly or on a per room basis  
							
							 
							
							
							
						 
						
							2015-12-01 18:41:32 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								1c960fbb80 
								
							
								 
							
						 
						
							
							
								
								s/private_user_data/account_data/  
							
							 
							
							
							
						 
						
							2015-11-18 15:31:04 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								285d056629 
								
							
								 
							
						 
						
							
							
								
								Remove fields that are both unspecified and unused from the filter checks, check the right top level definitions in the filter  
							
							 
							
							
							
						 
						
							2015-11-04 15:47:19 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								57be722c46 
								
							
								 
							
						 
						
							
							
								
								Include room tags in v2 /sync  
							
							 
							
							
							
						 
						
							2015-11-02 16:23:15 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								b051781ddb 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #325  from matrix-org/markjh/filter_dicts  
							
							 
							
							... 
							
							
							
							Support filtering events represented as dicts. 
							
						 
						
							2015-10-22 17:14:52 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								4e05aab4f7 
								
							
								 
							
						 
						
							
							
								
								Don't assume that the event has a room_id or sender  
							
							 
							
							
							
						 
						
							2015-10-22 17:08:59 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								9b6f3bc742 
								
							
								 
							
						 
						
							
							
								
								Support filtering events represented as dicts.  
							
							 
							
							... 
							
							
							
							This is useful because the emphemeral events such as presence and
typing are represented as dicts inside synapse. 
							
						 
						
							2015-10-22 16:38:03 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								5c41224a89 
								
							
								 
							
						 
						
							
							
								
								Filter room ids before hitting the database  
							
							 
							
							
							
						 
						
							2015-10-21 10:09:26 +01:00