Erik Johnston
							
						 
						
							 
							
							
							
								
							
								80fd2b574c 
								
							
								 
							
						 
						
							
							
								
								Don't talk to yourself when backfilling  
							
							 
							
							
							
						 
						
							2015-05-12 16:19:46 +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
							
						 
						
							 
							
							
							
								
							
								07a1223156 
								
							
								 
							
						 
						
							
							
								
								s/backfil/backfill/  
							
							 
							
							
							
						 
						
							2015-05-12 14:09:54 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0d31ad5101 
								
							
								 
							
						 
						
							
							
								
								Typos everywhere  
							
							 
							
							
							
						 
						
							2015-05-12 14:02:01 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a0dfffb33c 
								
							
								 
							
						 
						
							
							
								
								And another typo.  
							
							 
							
							
							
						 
						
							2015-05-12 14:00:31 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6e5ac4a28f 
								
							
								 
							
						 
						
							
							
								
								Err, gatherResults doesn't take a dict...  
							
							 
							
							
							
						 
						
							2015-05-12 13:58:14 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								95dedb866f 
								
							
								 
							
						 
						
							
							
								
								Unwrap defer.gatherResults failures  
							
							 
							
							
							
						 
						
							2015-05-12 13:14:29 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								367382b575 
								
							
								 
							
						 
						
							
							
								
								Handle the case where the other side is unreachable when backfilling  
							
							 
							
							
							
						 
						
							2015-05-12 10:35:45 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								84e6b4001f 
								
							
								 
							
						 
						
							
							
								
								Initial hack at wiring together pagination and backfill  
							
							 
							
							
							
						 
						
							2015-05-11 18:01:31 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2236ef6c92 
								
							
								 
							
						 
						
							
							
								
								Fix up leak. Add warnings.  
							
							 
							
							
							
						 
						
							2015-05-08 19:53:34 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2d386d7038 
								
							
								 
							
						 
						
							
							
								
								That wasn't a deferred  
							
							 
							
							
							
						 
						
							2015-05-01 14:41:25 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4ac2823b3c 
								
							
								 
							
						 
						
							
							
								
								Remove inlineCallbacks from non-generator  
							
							 
							
							
							
						 
						
							2015-05-01 14:41:25 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								42c12c04f6 
								
							
								 
							
						 
						
							
							
								
								Remove some run_on_reactors  
							
							 
							
							
							
						 
						
							2015-05-01 14:41:25 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a43b40449b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into mysql  
							
							 
							
							
							
						 
						
							2015-04-08 16:46:56 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								19234cc6c3 
								
							
								 
							
						 
						
							
							
								
								typo  
							
							 
							
							
							
						 
						
							2015-04-08 14:10:06 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e8f1521605 
								
							
								 
							
						 
						
							
							
								
								Don't yield on notifying all listeners  
							
							 
							
							
							
						 
						
							2015-04-08 14:08:30 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								278149f533 
								
							
								 
							
						 
						
							
							
								
								Sanitize TransactionStore  
							
							 
							
							
							
						 
						
							2015-03-23 13:43:21 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								bb24609158 
								
							
								 
							
						 
						
							
							
								
								Clean out event_forward_extremities table when the server rejoins the room  
							
							 
							
							
							
						 
						
							2015-03-18 11:19:47 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b2e6ee5b43 
								
							
								 
							
						 
						
							
							
								
								Remove concept of context.auth_events, instead use context.current_state  
							
							 
							
							
							
						 
						
							2015-03-16 13:06:23 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e25e0f4da9 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into batched_get_pdu  
							
							 
							
							
							
						 
						
							2015-02-23 14:36:00 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								db215b7e00 
								
							
								 
							
						 
						
							
							
								
								Implement and use new batched get missing pdu  
							
							 
							
							
							
						 
						
							2015-02-23 13:58:02 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2bafeca270 
								
							
								 
							
						 
						
							
							
								
								Add missing comma so that it generates a dict and not a set  
							
							 
							
							
							
						 
						
							2015-02-20 14:08:42 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0ac2a79faa 
								
							
								 
							
						 
						
							
							
								
								Initial stab at implementing a batched get_missing_pdus request  
							
							 
							
							
							
						 
						
							2015-02-19 17:24:14 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								47281f8fa4 
								
							
								 
							
						 
						
							
							
								
								Change some debug logging to info  
							
							 
							
							
							
						 
						
							2015-02-17 13:14:11 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b99a33f283 
								
							
								 
							
						 
						
							
							
								
								resolve_events expect lists, not dicts  
							
							 
							
							
							
						 
						
							2015-02-15 20:20:51 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b11a6e1c3c 
								
							
								 
							
						 
						
							
							
								
								Fix wrong variable name  
							
							 
							
							
							
						 
						
							2015-02-13 15:37:18 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e441c10a73 
								
							
								 
							
						 
						
							
							
								
								pyflakes  
							
							 
							
							
							
						 
						
							2015-02-13 14:23:39 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								8c652a2b5f 
								
							
								 
							
						 
						
							
							
								
								When we see a difference in current state, actually use state conflict resolution algorithm  
							
							 
							
							
							
						 
						
							2015-02-13 14:20:05 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								76935078d1 
								
							
								 
							
						 
						
							
							
								
								Remove more debug logging  
							
							 
							
							
							
						 
						
							2015-02-11 16:51:22 +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
							
						 
						
							 
							
							
							
								
							
								cc0532a4bf 
								
							
								 
							
						 
						
							
							
								
								Explicitly list the RejectedReasons that we can prove  
							
							 
							
							
							
						 
						
							2015-02-06 15:16:26 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e890ce223c 
								
							
								 
							
						 
						
							
							
								
								Don't query auth if the only difference is events that were rejected due to auth.  
							
							 
							
							
							
						 
						
							2015-02-06 14:16:50 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c78b5fb1f1 
								
							
								 
							
						 
						
							
							
								
								Make seen_ids a set  
							
							 
							
							
							
						 
						
							2015-02-06 13:52:16 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3737329d9b 
								
							
								 
							
						 
						
							
							
								
								Handle the fact the list.remove raises if element doesn't exist  
							
							 
							
							
							
						 
						
							2015-02-06 10:53:18 +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  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d45e2302ed 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'signature_failures' of github.com:matrix-org/synapse into federation_client_retries  
							
							 
							
							
							
						 
						
							2015-02-04 16:30:15 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ae46f10fc5 
								
							
								 
							
						 
						
							
							
								
								Apply sanity to the transport client interface. Convert 'make_join' and 'send_join' to accept iterables of destinations  
							
							 
							
							
							
						 
						
							2015-02-04 16:28:12 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								650e32d455 
								
							
								 
							
						 
						
							
							
								
								Change context.auth_events to what the auth_events would be bases on context.current_state, rather than based on the auth_events from the event.  
							
							 
							
							
							
						 
						
							2015-02-04 14:06:46 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c0462dbf15 
								
							
								 
							
						 
						
							
							
								
								Rearrange persist_event so that do all the queries that need to be done before returning early if we have already persisted that event.  
							
							 
							
							
							
						 
						
							2015-02-04 10:16:51 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								7dd1c5c542 
								
							
								 
							
						 
						
							
							
								
								Neaten the handling of state and auth_chain up a bit  
							
							 
							
							
							
						 
						
							2015-02-03 16:12:04 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6efd4d1649 
								
							
								 
							
						 
						
							
							
								
								Don't completely die if get auth_chain or querying auth_chain requests fail  
							
							 
							
							
							
						 
						
							2015-02-03 13:57:54 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								77a076bd25 
								
							
								 
							
						 
						
							
							
								
								Set combinations is | and not +  
							
							 
							
							
							
						 
						
							2015-02-03 13:35:17 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								fed29251d7 
								
							
								 
							
						 
						
							
							
								
								Spelling  
							
							 
							
							
							
						 
						
							2015-02-03 13:23:58 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								06c34bfbae 
								
							
								 
							
						 
						
							
							
								
								Give exception better message  
							
							 
							
							
							
						 
						
							2015-02-03 11:23:44 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4ff2273b30 
								
							
								 
							
						 
						
							
							
								
								Add FIXME note.  
							
							 
							
							
							
						 
						
							2015-02-03 11:23:26 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								51969f9e5f 
								
							
								 
							
						 
						
							
							
								
								Return rejected events if asked for it over federation.  
							
							 
							
							
							
						 
						
							2015-02-03 10:40:14 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e7ca813dd4 
								
							
								 
							
						 
						
							
							
								
								Try to ensure we don't persist an event we have already persisted. In persist_event check if we already have the event, if so then update instead of replacing so that we don't cause a bump of the stream_ordering.  
							
							 
							
							
							
						 
						
							2015-02-03 10:39:41 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4c0da49d7c 
								
							
								 
							
						 
						
							
							
								
								Resign events when we return them via /query_auth/  
							
							 
							
							
							
						 
						
							2015-01-30 22:53:13 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2cd29dbdd9 
								
							
								 
							
						 
						
							
							
								
								Fix bug where accepting invite over federation didn't work. Add logging.  
							
							 
							
							
							
						 
						
							2015-01-30 16:51:58 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b724a809c4 
								
							
								 
							
						 
						
							
							
								
								Only auth_events with event if event in event.auth_events  
							
							 
							
							
							
						 
						
							2015-01-30 15:57:53 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a70a801184 
								
							
								 
							
						 
						
							
							
								
								Fix bug where we superfluously asked for current state. Change API of /query_auth/ so that we don't duplicate events in the response.  
							
							 
							
							
							
						 
						
							2015-01-30 13:34:01 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0c2d245fdf 
								
							
								 
							
						 
						
							
							
								
								Update the current state of an event if we update auth events.  
							
							 
							
							
							
						 
						
							2015-01-30 11:08:52 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c1d860870b 
								
							
								 
							
						 
						
							
							
								
								Fix regression where we no longer correctly handled the case of gaps in our event graph  
							
							 
							
							
							
						 
						
							2015-01-30 10:48:47 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								78015948a7 
								
							
								 
							
						 
						
							
							
								
								Initial implementation of auth conflict resolution  
							
							 
							
							
							
						 
						
							2015-01-29 16:52:33 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0ef5bfd6a9 
								
							
								 
							
						 
						
							
							
								
								Start implementing auth conflict res  
							
							 
							
							
							
						 
						
							2015-01-28 16:16:53 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								5759bec43c 
								
							
								 
							
						 
						
							
							
								
								Replace hs.parse_userid with UserID.from_string  
							
							 
							
							
							
						 
						
							2015-01-23 11:47:15 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								5fed042640 
								
							
								 
							
						 
						
							
							
								
								Finish renaming "context" to "room_id" in federation codebase  
							
							 
							
							
							
						 
						
							2015-01-16 19:01:03 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								333836ff92 
								
							
								 
							
						 
						
							
							
								
								PEP8 and pyflakes warnings  
							
							 
							
							
							
						 
						
							2015-01-07 16:18:12 +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
							
						 
						
							 
							
							
							
								
							
								adb04b1e57 
								
							
								 
							
						 
						
							
							
								
								Update copyright notices  
							
							 
							
							
							
						 
						
							2015-01-06 13:21:39 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								041ac476a5 
								
							
								 
							
						 
						
							
							
								
								Supply auth_chain along with current state in '/state/', fetch auth events from a remote server if we are missing some of them  
							
							 
							
							
							
						 
						
							2014-12-18 18:47:13 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								dea5d4b03b 
								
							
								 
							
						 
						
							
							
								
								Don't yield on sending the event accross federation.  
							
							 
							
							
							
						 
						
							2014-12-18 11:29:46 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								21cab3a7ec 
								
							
								 
							
						 
						
							
							
								
								Fix where we pulled in event.state_events from hotfixes branch  
							
							 
							
							
							
						 
						
							2014-12-16 19:16:15 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2215faa361 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'hotfixes-v0.5.4a' of github.com:matrix-org/synapse into release-v0.6.0  
							
							 
							
							
							
						 
						
							2014-12-16 19:11:13 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3defd5b3ee 
								
							
								 
							
						 
						
							
							
								
								Add FIXME  
							
							 
							
							
							
						 
						
							2014-12-16 19:07:20 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								96779d2490 
								
							
								 
							
						 
						
							
							
								
								Fix bug where we did not send the full auth chain to people that joined over federation  
							
							 
							
							
							
						 
						
							2014-12-16 18:57:36 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2d7716d4d0 
								
							
								 
							
						 
						
							
							
								
								Make error messages slightly more helpful  
							
							 
							
							
							
						 
						
							2014-12-16 18:41:48 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								c3eae8a88c 
								
							
								 
							
						 
						
							
							
								
								Construct the EventContext in the state handler rather than constructing one and then immediately calling state_handler.annotate_context_with_state  
							
							 
							
							
							
						 
						
							2014-12-16 15:59:17 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								3c7857e49b 
								
							
								 
							
						 
						
							
							
								
								clean up coding style a bit  
							
							 
							
							
							
						 
						
							2014-12-16 15:24:03 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3c77d13aa5 
								
							
								 
							
						 
						
							
							
								
								Kill off synapse.api.events.*  
							
							 
							
							
							
						 
						
							2014-12-16 11:29:05 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6a1da99fab 
								
							
								 
							
						 
						
							
							
								
								Add fixme to raising of AuthError in federation land  
							
							 
							
							
							
						 
						
							2014-12-16 09:35:31 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d3eb12c7b8 
								
							
								 
							
						 
						
							
							
								
								Fix federation test  
							
							 
							
							
							
						 
						
							2014-12-11 17:01:27 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0b04369238 
								
							
								 
							
						 
						
							
							
								
								Fix public room joining by making sure replaces_state never points to itself.  
							
							 
							
							
							
						 
						
							2014-12-11 15:56:06 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								1d2a0040cf 
								
							
								 
							
						 
						
							
							
								
								Fix bug where we clobbered old state group values  
							
							 
							
							
							
						 
						
							2014-12-10 15:55:03 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								aae8a37e63 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor  
							
							 
							
							
							
						 
						
							2014-12-10 13:18:40 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								02db1fd2e7 
								
							
								 
							
						 
						
							
							
								
								Fix AttributeError  
							
							 
							
							
							
						 
						
							2014-12-10 12:00:05 +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
							
						 
						
							 
							
							
							
								
							
								5eca288d28 
								
							
								 
							
						 
						
							
							
								
								Fix joining from an invite  
							
							 
							
							
							
						 
						
							2014-12-09 14:47:27 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								8529fba02d 
								
							
								 
							
						 
						
							
							
								
								fix a million stupid bugs and make it actually work  
							
							 
							
							
							
						 
						
							2014-12-08 19:34:51 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								609c31e8df 
								
							
								 
							
						 
						
							
							
								
								More bug fixes  
							
							 
							
							
							
						 
						
							2014-12-08 17:50:56 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d044121168 
								
							
								 
							
						 
						
							
							
								
								Various typos and bug fixes.  
							
							 
							
							
							
						 
						
							2014-12-08 09:08:26 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								9c43b258ec 
								
							
								 
							
						 
						
							
							
								
								actually reset retry schedule if we can successfuly talk to it  
							
							 
							
							
							
						 
						
							2014-12-08 00:17:12 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6630e1b579 
								
							
								 
							
						 
						
							
							
								
								Start making more things use EventContext rather than event.*  
							
							 
							
							
							
						 
						
							2014-12-05 16:20:48 +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
							
						 
						
							 
							
							
							
								
							
								027542e2e5 
								
							
								 
							
						 
						
							
							
								
								Fix bugs when joining a remote room that has dodgy event graphs. This should also fix the number of times a HS will trigger a GET /event/  
							
							 
							
							
							
						 
						
							2014-11-27 16:02:26 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0294fba042 
								
							
								 
							
						 
						
							
							
								
								on_receive_pdu takes more args  
							
							 
							
							
							
						 
						
							2014-11-27 14:46:33 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								07699b5871 
								
							
								 
							
						 
						
							
							
								
								Change the way we get missing auth and state events  
							
							 
							
							
							
						 
						
							2014-11-27 14:31:43 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b8849c8cbf 
								
							
								 
							
						 
						
							
							
								
								Re-sign events when we return them via federation as a temporary hack to work around the problem where we reconstruct events differently than when they were signed  
							
							 
							
							
							
						 
						
							2014-11-27 13:53:31 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								858e87ab0d 
								
							
								 
							
						 
						
							
							
								
								Add a workaround for bug where some initial join events don't reference creation events in their auth_events  
							
							 
							
							
							
						 
						
							2014-11-26 16:29:03 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6c485c282d 
								
							
								 
							
						 
						
							
							
								
								Catch exceptions when trying to add an entry to rooms tables  
							
							 
							
							
							
						 
						
							2014-11-26 16:06:20 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3598c11c8d 
								
							
								 
							
						 
						
							
							
								
								Correctly handle the case where we get an event for an unknown room, which turns out we are actually in  
							
							 
							
							
							
						 
						
							2014-11-26 10:41:08 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								64fc859dac 
								
							
								 
							
						 
						
							
							
								
								Fix bugs in invite/join dances.  
							
							 
							
							... 
							
							
							
							We now do more implement more of the auth on the events so that we
don't reject valid events. 
							
						 
						
							2014-11-25 17:59:49 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4bd0ab76c6 
								
							
								 
							
						 
						
							
							
								
								We don't always want to Auth get_persisted_pdu  
							
							 
							
							
							
						 
						
							2014-11-24 12:56:17 +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  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								2eaf689f71 
								
							
								 
							
						 
						
							
							
								
								These lines aren't doing anything  
							
							 
							
							
							
						 
						
							2014-11-17 10:41:35 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								cb4b6c844a 
								
							
								 
							
						 
						
							
							
								
								Merge PDUs and Events into one object  
							
							 
							
							
							
						 
						
							2014-11-14 21:25:02 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								8c2b5ea7c4 
								
							
								 
							
						 
						
							
							
								
								Fix PDU and event signatures  
							
							 
							
							
							
						 
						
							2014-11-14 19:11:04 +00:00