a8ce159be4 
								
							
								 
							
						 
						
							
							
								
								Replace some ujson with simplejson to make it work  
							
							
							
						 
						
							2018-03-16 00:27:09 +00:00  
				
					
						
							
							
								 
						
							
							
								eaaabc6c4f 
								
							
								 
							
						 
						
							
							
								
								replace 'except:' with 'except Exception:'  
							
							... 
							
							
							
							what could possibly go wrong 
							
						 
						
							2017-10-23 15:52:32 +01:00  
				
					
						
							
							
								 
						
							
							
								b5feaa5a49 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/groups_merged  
							
							
							
						 
						
							2017-09-19 11:07:45 +01:00  
				
					
						
							
							
								 
						
							
							
								53cc8ad35a 
								
							
								 
							
						 
						
							
							
								
								Send down device list change notif when member leaves/rejoins room  
							
							
							
						 
						
							2017-09-07 15:08:39 +01:00  
				
					
						
							
							
								 
						
							
							
								09552f9d9c 
								
							
								 
							
						 
						
							
							
								
								Reduce spammy log line in synchrotrons  
							
							
							
						 
						
							2017-08-02 17:29:51 +01:00  
				
					
						
							
							
								 
						
							
							
								c544188ee3 
								
							
								 
							
						 
						
							
							
								
								Add groups to sync stream  
							
							
							
						 
						
							2017-07-20 16:36:42 +01:00  
				
					
						
							
							
								 
						
							
							
								85b9f76f1d 
								
							
								 
							
						 
						
							
							
								
								split out reducing stuff; just make encode_* static  
							
							
							
						 
						
							2017-07-11 13:14:35 +02:00  
				
					
						
							
							
								 
						
							
							
								2f82de18ee 
								
							
								 
							
						 
						
							
							
								
								fix test  
							
							
							
						 
						
							2017-07-10 17:34:58 +02:00  
				
					
						
							
							
								 
						
							
							
								6e16aca8b0 
								
							
								 
							
						 
						
							
							
								
								encode sync-response statically; omit empty objects from sync-response  
							
							
							
						 
						
							2017-07-10 16:42:17 +02:00  
				
					
						
							
							
								 
						
							
							
								b4f59c7e27 
								
							
								 
							
						 
						
							
							
								
								Add count of one time keys to sync stream  
							
							
							
						 
						
							2017-05-19 15:47:55 +01:00  
				
					
						
							
							
								 
						
							
							
								627e6ea2b0 
								
							
								 
							
						 
						
							
							
								
								Fixed implementation errors  
							
							... 
							
							
							
							* Added HS as property in SyncRestServlet
* Fixed set_timeline_upper_limit function implementat¡ion 
							
						 
						
							2017-05-15 14:51:43 +02:00  
				
					
						
							
							
								 
						
							
							
								9da4316ca5 
								
							
								 
							
						 
						
							
							
								
								Configurable maximum number of events requested by /sync and /messages ( #2220 )  
							
							... 
							
							
							
							Set the limit on the returned events in the timeline in the get and sync
operations. The default value is -1, means no upper limit.
For example, using `filter_timeline_limit: 5000`:
POST /_matrix/client/r0/user/user:id/filter
{
room: {
    timeline: {
      limit: 1000000000000000000
    }
}
}
GET /_matrix/client/r0/user/user:id/filter/filter:id
{
room: {
    timeline: {
      limit: 5000
    }
}
}
The server cuts down the room.timeline.limit. 
							
						 
						
							2017-05-13 18:17:54 +02:00  
				
					
						
							
							
								 
						
							
							
								46826bb078 
								
							
								 
							
						 
						
							
							
								
								Comment and remove spurious logging  
							
							
							
						 
						
							2017-04-27 17:25:44 +01:00  
				
					
						
							
							
								 
						
							
							
								34e682d385 
								
							
								 
							
						 
						
							
							
								
								Fix invite state to always include all events  
							
							
							
						 
						
							2017-04-26 16:18:08 +01:00  
				
					
						
							
							
								 
						
							
							
								a297155a97 
								
							
								 
							
						 
						
							
							
								
								Remove unused import  
							
							
							
						 
						
							2017-03-15 14:49:25 +00:00  
				
					
						
							
							
								 
						
							
							
								6c82de5100 
								
							
								 
							
						 
						
							
							
								
								Format presence events on the edges instead of reformatting them multiple times  
							
							
							
						 
						
							2017-03-15 14:27:34 +00:00  
				
					
						
							
							
								 
						
							
							
								2367c5568c 
								
							
								 
							
						 
						
							
							
								
								Add basic implementation of local device list changes  
							
							
							
						 
						
							2017-01-25 14:27:27 +00:00  
				
					
						
							
							
								 
						
							
							
								cea4e4e7b2 
								
							
								 
							
						 
						
							
							
								
								Glue only_event_fields into the sync rest servlet  
							
							
							
						 
						
							2016-11-22 10:14:05 +00:00  
				
					
						
							
							
								 
						
							
							
								e993925279 
								
							
								 
							
						 
						
							
							
								
								Add store-and-forward direct-to-device messaging  
							
							
							
						 
						
							2016-08-25 17:35:37 +01:00  
				
					
						
							
							
								 
						
							
							
								2510db3e76 
								
							
								 
							
						 
						
							
							
								
								Don't change status_msg on /sync  
							
							
							
						 
						
							2016-08-10 12:59:59 +01:00  
				
					
						
							
							
								 
						
							
							
								f68eea808a 
								
							
								 
							
						 
						
							
							
								
								Move SyncHandler out of the Handlers object  
							
							
							
						 
						
							2016-05-16 20:19:26 +01:00  
				
					
						
							
							
								 
						
							
							
								3b86ecfa79 
								
							
								 
							
						 
						
							
							
								
								Move the presence handler out of the Handlers object  
							
							
							
						 
						
							2016-05-16 18:56:37 +01:00  
				
					
						
							
							
								 
						
							
							
								2a37467fa1 
								
							
								 
							
						 
						
							
							
								
								Use google style doc strings.  
							
							... 
							
							
							
							pycharm supports them so there is no need to use the other format.
Might as well convert the existing strings to reduce the risk of
people accidentally cargo culting the wrong doc string format. 
							
						 
						
							2016-04-01 16:12:07 +01:00  
				
					
						
							
							
								 
						
							
							
								191c7bef6b 
								
							
								 
							
						 
						
							
							
								
								Deduplicate identical /sync requests  
							
							
							
						 
						
							2016-03-24 17:47:31 +00:00  
				
					
						
							
							
								 
						
							
							
								e5999bfb1a 
								
							
								 
							
						 
						
							
							
								
								Initial cut  
							
							
							
						 
						
							2016-02-17 15:40:50 +00:00  
				
					
						
							
							
								 
						
							
							
								a1b7902944 
								
							
								 
							
						 
						
							
							
								
								Add some paranoia logging  
							
							
							
						 
						
							2016-02-11 09:22:37 +00:00  
				
					
						
							
							
								 
						
							
							
								fa48020a52 
								
							
								 
							
						 
						
							
							
								
								Move state calculations from rest to handler  
							
							
							
						 
						
							2016-02-01 15:59:40 +00:00  
				
					
						
							
							
								 
						
							
							
								4021f95261 
								
							
								 
							
						 
						
							
							
								
								Move logic from rest/ to handlers/  
							
							
							
						 
						
							2016-01-25 10:10:44 +00:00  
				
					
						
							
							
								 
						
							
							
								975903ae17 
								
							
								 
							
						 
						
							
							
								
								Sanitize filters  
							
							
							
						 
						
							2016-01-22 10:41:30 +00:00  
				
					
						
							
							
								 
						
							
							
								73ca8e5834 
								
							
								 
							
						 
						
							
							
								
								Whine if we give a from param to /sync  
							
							
							
						 
						
							2016-01-20 15:42:57 +00:00  
				
					
						
							
							
								 
						
							
							
								ac2842ff1e 
								
							
								 
							
						 
						
							
							
								
								Only compute unread notifications for rooms we send down stream  
							
							
							
						 
						
							2016-01-19 17:19:53 +00:00  
				
					
						
							
							
								 
						
							
							
								3adcc4c86a 
								
							
								 
							
						 
						
							
							
								
								Return highlight_count in /sync  
							
							
							
						 
						
							2016-01-19 11:35:50 +00:00  
				
					
						
							
							
								 
						
							
							
								42aa1f3f33 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #478  from matrix-org/daniel/userobject  
							
							... 
							
							
							
							Introduce a User object
I'm sick of passing around more and more things as tuple items around
the whole world, and needing to edit every call site every time there is
more information about a user. So pass them around together as an
object.
This object has incredibly poorly named fields because we have a
convention that `user` indicates a UserID object, and `user_id`
indicates a string. I tried to clean up the whole repo to fix this, but
gave up. So instead, I introduce a second convention. A user_object is a
User, and a user_id_object is a UserId. I may have cried a little bit. 
							
						 
						
							2016-01-11 17:50:22 +00:00  
				
					
						
							
							
								 
						
							
							
								2110e35fd6 
								
							
								 
							
						 
						
							
							
								
								Introduce a Requester object  
							
							... 
							
							
							
							This tracks data about the entity which made the request. This is
instead of passing around a tuple, which requires call-site
modifications every time a new piece of optional context is passed
around.
I tried to introduce a User object. I gave up. 
							
						 
						
							2016-01-11 17:48:45 +00:00  
				
					
						
							
							
								 
						
							
							
								c232780081 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #456  from matrix-org/store_event_actions  
							
							... 
							
							
							
							Send unread notification counts 
							
						 
						
							2016-01-08 14:47:15 +00:00  
				
					
						
							
							
								 
						
							
							
								6c28ac260c 
								
							
								 
							
						 
						
							
							
								
								copyrights  
							
							
							
						 
						
							2016-01-07 04:26:29 +00:00  
				
					
						
							
							
								 
						
							
							
								442fcc02f7 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into store_event_actions  
							
							
							
						 
						
							2016-01-06 17:28:55 +00:00  
				
					
						
							
							
								 
						
							
							
								392773ccb2 
								
							
								 
							
						 
						
							
							
								
								Guest users must be joined to a room to see it in /sync  
							
							
							
						 
						
							2016-01-06 16:44:13 +00:00  
				
					
						
							
							
								 
						
							
							
								c77e7e60fc 
								
							
								 
							
						 
						
							
							
								
								Only joined rooms have unread_notif_count  
							
							
							
						 
						
							2016-01-04 15:49:06 +00:00  
				
					
						
							
							
								 
						
							
							
								140a50f641 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into store_event_actions  
							
							
							
						 
						
							2015-12-22 17:23:35 +00:00  
				
					
						
							
							
								 
						
							
							
								45a9e0ae0c 
								
							
								 
							
						 
						
							
							
								
								Allow guest access if the user provides a list of rooms in the filter  
							
							
							
						 
						
							2015-12-22 10:25:46 +00:00  
				
					
						
							
							
								 
						
							
							
								c061b47c57 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into store_event_actions  
							
							
							
						 
						
							2015-12-21 15:30:26 +00:00  
				
					
						
							
							
								 
						
							
							
								64b6606824 
								
							
								 
							
						 
						
							
							
								
								Remove accidentally committed debug logging  
							
							
							
						 
						
							2015-12-21 15:22:03 +00:00  
				
					
						
							
							
								 
						
							
							
								42ad49f5b7 
								
							
								 
							
						 
						
							
							
								
								still very WIP, but now sends unread_notifications_count in the room object on sync (only actually corrrect in a full sync: hardcoded to 0 in incremental syncs).  
							
							
							
						 
						
							2015-12-16 18:42:09 +00:00  
				
					
						
							
							
								 
						
							
							
								3ddf0b9722 
								
							
								 
							
						 
						
							
							
								
								Fix spacing  
							
							
							
						 
						
							2015-12-14 15:20:59 +00:00  
				
					
						
							
							
								 
						
							
							
								2acae8300f 
								
							
								 
							
						 
						
							
							
								
								Fix logging to lie less  
							
							
							
						 
						
							2015-12-14 15:19:37 +00:00  
				
					
						
							
							
								 
						
							
							
								28c5181dfe 
								
							
								 
							
						 
						
							
							
								
								Add commentary for fix in PR#442  
							
							
							
						 
						
							2015-12-14 14:50:51 +00:00  
				
					
						
							
							
								 
						
							
							
								070e28e203 
								
							
								 
							
						 
						
							
							
								
								Combine the prev content tests  
							
							
							
						 
						
							2015-12-14 14:34:04 +00:00  
				
					
						
							
							
								 
						
							
							
								834924248f 
								
							
								 
							
						 
						
							
							
								
								Check whether prev_content or prev_sender is set before trying to rollback state  
							
							
							
						 
						
							2015-12-14 14:09:21 +00:00  
				
					
						
							
							
								 
						
							
							
								e4bfe50e8f 
								
							
								 
							
						 
						
							
							
								
								Allow filter JSON object in the filter query parameter in /sync  
							
							... 
							
							
							
							Documented by matrix-org/matrix-doc#224  
							
						 
						
							2015-12-09 12:56:50 +00:00