Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4429e720ae 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of github.com:matrix-org/synapse into develop  
							
							 
							
							
							
						 
						
							2015-05-22 10:33:00 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								53447e9cd3 
								
							
								 
							
						 
						
							
							
								
								Add caches for things requested by the pushers  
							
							 
							
							
							
						 
						
							2015-05-21 16:41:39 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								0c894e1ebd 
								
							
								 
							
						 
						
							
							
								
								Throw error when creating room if alias contains whitespace #SYN-335  
							
							 
							
							
							
						 
						
							2015-05-14 13:11:28 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								a6fb2aa2a5 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #144  from matrix-org/erikj/logging_context  
							
							 
							
							... 
							
							
							
							Preserving logging contexts 
							
						 
						
							2015-05-12 15:23:50 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								95dedb866f 
								
							
								 
							
						 
						
							
							
								
								Unwrap defer.gatherResults failures  
							
							 
							
							
							
						 
						
							2015-05-12 13:14:29 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4df11b5039 
								
							
								 
							
						 
						
							
							
								
								Make get_current_token accept a direction parameter, which tells whether the source whether we want a token for going 'forwards' or 'backwards'  
							
							 
							
							
							
						 
						
							2015-05-12 10:28:10 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								da4ed08739 
								
							
								 
							
						 
						
							
							
								
								One too many lens  
							
							 
							
							
							
						 
						
							2015-05-01 13:29:38 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								9060dc6b59 
								
							
								 
							
						 
						
							
							
								
								Change public room list to use defer.gatherResults  
							
							 
							
							
							
						 
						
							2015-05-01 13:28:36 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								327ca883ec 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into postgres  
							
							 
							
							
							
						 
						
							2015-04-28 13:39:42 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6f8e2d517e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into postgres  
							
							 
							
							
							
						 
						
							2015-04-27 14:41:40 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								48b6ee2b67 
								
							
								 
							
						 
						
							
							
								
								Create an 'invite' powerlevel when making new rooms  
							
							 
							
							
							
						 
						
							2015-04-21 21:07:35 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								24d21887ed 
								
							
								 
							
						 
						
							
							
								
								SYN-350: Don't ratelimit the individual events generated during room creation  
							
							 
							
							
							
						 
						
							2015-04-21 14:14:19 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								9a7f496298 
								
							
								 
							
						 
						
							
							
								
								Sanitize RoomMemberStore  
							
							 
							
							
							
						 
						
							2015-03-23 15:29:04 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								8e28db5cc9 
								
							
								 
							
						 
						
							
							
								
								Change room handlers get_rooms_for_user to get_joined_rooms_for_user. This uses the a storage api that is cached.  
							
							 
							
							
							
						 
						
							2015-03-09 16:43:09 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								dcec7175dc 
								
							
								 
							
						 
						
							
							
								
								Finish impl to get new events for AS. ASes should now be able to poll /events  
							
							 
							
							
							
						 
						
							2015-02-26 16:23:01 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								2d20466f9a 
								
							
								 
							
						 
						
							
							
								
								Add stub functions and work out execution flow to implement AS event stream polling.  
							
							 
							
							
							
						 
						
							2015-02-25 15:00:59 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ed877d6585 
								
							
								 
							
						 
						
							
							
								
								Remove debug logging  
							
							 
							
							
							
						 
						
							2015-02-11 16:50:46 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ddb816cf60 
								
							
								 
							
						 
						
							
							
								
								Don't unfreeze when using FreezeEvent.get_dict, as we are using a JSONEncoder that understands FrozenDict  
							
							 
							
							
							
						 
						
							2015-02-11 15:44:28 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e1515c3e91 
								
							
								 
							
						 
						
							
							
								
								Pass through list of room hosts from room alias query to federation so that it can retry against different room hosts  
							
							 
							
							
							
						 
						
							2015-02-05 13:44:42 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								7f6f3f9d62 
								
							
								 
							
						 
						
							
							
								
								Pass the current time to serialize event, rather than passing an  
							
							 
							
							... 
							
							
							
							HS and getting a clock from it and calling time_msec on the clock.
Remove the serialize_event method from the HS since it is no longer
needed. 
							
						 
						
							2015-01-26 16:11:28 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								1c06c48ce2 
								
							
								 
							
						 
						
							
							
								
								Replace hs.parse_roomid with RoomID.from_string  
							
							 
							
							
							
						 
						
							2015-01-23 11:55:12 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								5759bec43c 
								
							
								 
							
						 
						
							
							
								
								Replace hs.parse_userid with UserID.from_string  
							
							 
							
							
							
						 
						
							2015-01-23 11:47:15 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								333836ff92 
								
							
								 
							
						 
						
							
							
								
								PEP8 and pyflakes warnings  
							
							 
							
							
							
						 
						
							2015-01-07 16:18:12 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								4c68460392 
								
							
								 
							
						 
						
							
							
								
								SYN-154: Tweak how the m.room.create check is done.  
							
							 
							
							... 
							
							
							
							Don't perform the check in auth.is_host_in_room but instead do it in _do_join
and also assert that there are no m.room.members in the room before doing so. 
							
						 
						
							2015-01-07 16:09:00 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								9cb4f75d53 
								
							
								 
							
						 
						
							
							
								
								SYN-154: Better error messages when joining an unknown room by ID.  
							
							 
							
							... 
							
							
							
							The simple fix doesn't work here because room creation also involves
unknown room IDs. The check relies on the presence of m.room.create for
rooms being created, whereas bogus room IDs have no state events at all. 
							
						 
						
							2015-01-07 15:21:48 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								5e23a19204 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #28  from matrix-org/erikj-perf  
							
							 
							
							... 
							
							
							
							Database performance improvements. 
							
						 
						
							2015-01-06 13:33:40 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								adb04b1e57 
								
							
								 
							
						 
						
							
							
								
								Update copyright notices  
							
							 
							
							
							
						 
						
							2015-01-06 13:21:39 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								f0128f9600 
								
							
								 
							
						 
						
							
							
								
								Add RoomMemberStore.get_users_in_room, so that we can get the list of joined users without having to retrieve the full events  
							
							 
							
							
							
						 
						
							2015-01-06 10:55:43 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								efd27ff01b 
								
							
								 
							
						 
						
							
							
								
								Set a state_key for the topic and room name, otherwise they won't be treated as room state  
							
							 
							
							
							
						 
						
							2014-12-19 15:31:27 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								1e7f83b91d 
								
							
								 
							
						 
						
							
							
								
								Set display name when joining via alias  
							
							 
							
							
							
						 
						
							2014-12-19 12:31:46 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								5739e6c606 
								
							
								 
							
						 
						
							
							
								
								s/user_id/sender/  
							
							 
							
							
							
						 
						
							2014-12-19 11:43:46 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3c77d13aa5 
								
							
								 
							
						 
						
							
							
								
								Kill off synapse.api.events.*  
							
							 
							
							
							
						 
						
							2014-12-16 11:29:05 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								cf6e5f1dbf 
								
							
								 
							
						 
						
							
							
								
								Rename MessageHandler.handle_event. Add a few comments.  
							
							 
							
							
							
						 
						
							2014-12-15 17:01:12 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								65cdf4e724 
								
							
								 
							
						 
						
							
							
								
								Get current member state from current_state snapshot. Fix leave test.  
							
							 
							
							
							
						 
						
							2014-12-15 15:03:27 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								57e0e619f3 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor  
							
							 
							
							... 
							
							
							
							Conflicts:
	tests/handlers/test_room.py 
							
						 
						
							2014-12-15 14:45:59 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								f25764943c 
								
							
								 
							
						 
						
							
							
								
								Add a 'user_left_room' distributor signal analogous to 'user_joined_room'  
							
							 
							
							
							
						 
						
							2014-12-11 18:27:01 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4c682143c8 
								
							
								 
							
						 
						
							
							
								
								.from_string() no longer takes a HS  
							
							 
							
							
							
						 
						
							2014-12-10 18:00:49 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								95aa903ffa 
								
							
								 
							
						 
						
							
							
								
								Try and figure out how and why signatures are being changed.  
							
							 
							
							
							
						 
						
							2014-12-10 11:37:47 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								008303b245 
								
							
								 
							
						 
						
							
							
								
								PEP8  
							
							 
							
							
							
						 
						
							2014-12-09 14:49:11 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								5eca288d28 
								
							
								 
							
						 
						
							
							
								
								Fix joining from an invite  
							
							 
							
							
							
						 
						
							2014-12-09 14:47:27 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								609c31e8df 
								
							
								 
							
						 
						
							
							
								
								More bug fixes  
							
							 
							
							
							
						 
						
							2014-12-08 17:50:56 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ee3df06183 
								
							
								 
							
						 
						
							
							
								
								More bug fixes  
							
							 
							
							
							
						 
						
							2014-12-08 14:50:48 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e8323b9e34 
								
							
								 
							
						 
						
							
							
								
								More bug fixes  
							
							 
							
							
							
						 
						
							2014-12-08 10:16:18 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c31dba86ec 
								
							
								 
							
						 
						
							
							
								
								Convert rest and handlers to use new event structure  
							
							 
							
							
							
						 
						
							2014-12-04 15:50:01 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								5d7c9ab789 
								
							
								 
							
						 
						
							
							
								
								Begin converting things to use the new Event structure  
							
							 
							
							
							
						 
						
							2014-12-04 11:27:59 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6941a19715 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor  
							
							 
							
							
							
						 
						
							2014-12-03 11:56:49 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								307f94dcbe 
								
							
								 
							
						 
						
							
							
								
								Squash room_ids list to a set() to remove duplicates - with TODO marker as I have no idea /why/ the dups are happening in the first place  
							
							 
							
							
							
						 
						
							2014-12-02 20:51:12 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								9d53228158 
								
							
								 
							
						 
						
							
							
								
								Change DomainSpecificString so that it doesn't use a HomeServer object  
							
							 
							
							
							
						 
						
							2014-12-02 10:42:28 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								db9ce032a4 
								
							
								 
							
						 
						
							
							
								
								Fix pep8 codestyle warnings  
							
							 
							
							
							
						 
						
							2014-11-20 17:26:36 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								32090aee16 
								
							
								 
							
						 
						
							
							
								
								Add a few missing yields, Move deferred lists inside PreserveLoggingContext because they don't interact well with the logging contexts  
							
							 
							
							
							
						 
						
							2014-11-20 16:24:00 +00:00