Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								fee7d3d2e3 
								
							 
						 
						
							
							
								
								Merge branch 'allow_appservice_registration' into 'master'  
							
							... 
							
							
							
							Always allow appservices to register new users
See merge request famedly/conduit!105  
							
						 
						
							2021-06-21 10:15:48 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									phesch 
								
							 
						 
						
							
							
							
							
								
							
							
								637d9d3b6f 
								
							 
						 
						
							
							
								
								Always allow appservices to register new users  
							
							
							
						 
						
							2021-06-19 16:12:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonas Platte 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								808741bcb6 
								
							 
						 
						
							
							
								
								Remove unnecessary Option-wrapping and successive unwrapping  
							
							
							
						 
						
							2021-06-17 20:44:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonas Platte 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b291e76572 
								
							 
						 
						
							
							
								
								Use try operator for Option more  
							
							
							
						 
						
							2021-06-17 20:37:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonas Platte 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f3e630c064 
								
							 
						 
						
							
							
								
								Fix lots of clippy lints  
							
							
							
						 
						
							2021-06-17 20:34:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonas Platte 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								af2ce5803e 
								
							 
						 
						
							
							
								
								Remove pointless double deserialization  
							
							
							
						 
						
							2021-06-17 20:29:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonas Platte 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7fa54e4411 
								
							 
						 
						
							
							
								
								Use Ruma-provided default power levels for shorter code  
							
							
							
						 
						
							2021-06-17 20:14:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonas Platte 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f6046871f4 
								
							 
						 
						
							
							
								
								Upgrade Ruma  
							
							
							
						 
						
							2021-06-17 20:12:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								67f9592b17 
								
							 
						 
						
							
							
								
								feat: /event_auth  
							
							
							
						 
						
							2021-06-14 11:36:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								77a23f8969 
								
							 
						 
						
							
							
								
								improvement: filter our room directory  
							
							... 
							
							
							
							Fixes  #35  
						
							2021-06-14 11:26:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3c9ea55938 
								
							 
						 
						
							
							
								
								feat: /state  
							
							
							
						 
						
							2021-06-14 11:01:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e8f6708927 
								
							 
						 
						
							
							
								
								improvement: show more users in our user directory  
							
							
							
						 
						
							2021-06-12 18:40:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cd4bc520d8 
								
							 
						 
						
							
							
								
								improvement: feature flags for sled, rocksdb  
							
							
							
						 
						
							2021-06-12 15:13:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									hamidreza kalbasi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2078af59d8 
								
							 
						 
						
							
							
								
								fix fmt problems  
							
							
							
						 
						
							2021-06-09 22:22:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									hamidreza kalbasi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2385bd1cfd 
								
							 
						 
						
							
							
								
								add migrations  
							
							
							
						 
						
							2021-06-09 22:22:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									hamidreza kalbasi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								affa124864 
								
							 
						 
						
							
							
								
								create media folder in init  
							
							
							
						 
						
							2021-06-09 22:22:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									hamidreza kalbasi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ff841b73c5 
								
							 
						 
						
							
							
								
								use .keys() and remove unneccery .to_vec()  
							
							
							
						 
						
							2021-06-09 22:22:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									hamidreza kalbasi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								804105479c 
								
							 
						 
						
							
							
								
								fix fmt and clippy warnings  
							
							
							
						 
						
							2021-06-09 22:22:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									hamidreza kalbasi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								972caacdc2 
								
							 
						 
						
							
							
								
								put media in filesystem  
							
							
							
						 
						
							2021-06-09 22:22:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d0ee823254 
								
							 
						 
						
							
							
								
								feat: swappable database backend  
							
							
							
						 
						
							2021-06-09 22:21:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e1e529d818 
								
							 
						 
						
							
							
								
								fix: don't apply push rules for users of other homeservers  
							
							
							
						 
						
							2021-05-30 22:01:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								88cf043f94 
								
							 
						 
						
							
							
								
								fix: deactivate accounts that should be deactivated  
							
							
							
						 
						
							2021-05-30 21:56:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								59dd3676d5 
								
							 
						 
						
							
							
								
								fix: putting global account data works now  
							
							
							
						 
						
							2021-05-29 10:53:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								deacdf6f58 
								
							 
						 
						
							
							
								
								fix: is_direct for locally invited users  
							
							
							
						 
						
							2021-05-28 22:53:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5b5cc0574e 
								
							 
						 
						
							
							
								
								feat: implement /claim, handle to-device events  
							
							
							
						 
						
							2021-05-28 13:46:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Gabriel Souza Franco 
								
							 
						 
						
							
							
							
							
								
							
							
								7db59c550f 
								
							 
						 
						
							
							
								
								fix: also return successful PDUs in /send/:txnId  
							
							
							
						 
						
							2021-05-27 18:10:48 -03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								daa1fc90a7 
								
							 
						 
						
							
							
								
								fix: state resolution bugs  
							
							
							
						 
						
							2021-05-27 10:48:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									phesch 
								
							 
						 
						
							
							
							
							
								
							
							
								ddcf1a715b 
								
							 
						 
						
							
							
								
								Fix redacted_because field being sent as a string  
							
							
							
						 
						
							2021-05-26 17:38:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								aacf6289db 
								
							 
						 
						
							
							
								
								improvement: increase default max concurrent requests  
							
							
							
						 
						
							2021-05-24 18:00:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								57ecd81534 
								
							 
						 
						
							
							
								
								fix: logs for ruma crate  
							
							
							
						 
						
							2021-05-24 13:22:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e5c7119516 
								
							 
						 
						
							
							
								
								feat: forward federation errors to the client  
							
							
							
						 
						
							2021-05-23 16:46:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1939e62814 
								
							 
						 
						
							
							
								
								fmt  
							
							
							
						 
						
							2021-05-23 11:11:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c1b2b468b8 
								
							 
						 
						
							
							
								
								fix: bad except in ruma wrapper  
							
							
							
						 
						
							2021-05-22 21:33:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								90cd11d850 
								
							 
						 
						
							
							
								
								fix: Forbidden instead of InvalidParam when joining  
							
							
							
						 
						
							2021-05-22 18:50:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9b77eb7bb7 
								
							 
						 
						
							
							
								
								fix: too many syncs  
							
							
							
						 
						
							2021-05-22 11:31:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1b42770ab5 
								
							 
						 
						
							
							
								
								improvement: warning for small max_request_size values  
							
							
							
						 
						
							2021-05-22 10:34:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3e2f742f30 
								
							 
						 
						
							
							
								
								fix: room version warnings and other bugs when joining rooms  
							
							
							
						 
						
							2021-05-21 22:22:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								989d843c40 
								
							 
						 
						
							
							
								
								fix: unauthorized pdus will be responded to with FORBIDDEN  
							
							
							
						 
						
							2021-05-21 18:12:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								09157b2096 
								
							 
						 
						
							
							
								
								improvement: federation get_keys and optimize signingkey storage  
							
							... 
							
							
							
							- get encryption keys over federation
- optimize signing key storage
- rate limit parsing of bad events
- rate limit signature fetching
- dependency bumps 
							
						 
						
							2021-05-21 13:25:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ae41bc5067 
								
							 
						 
						
							
							
								
								fix: run state res with old current state again  
							
							... 
							
							
							
							I'm a bit torn on the "auth check based on the current state of the
room". It can mean multiple things:
1. The state of the room before the homeserver looked at the event at
all. But that means if a message event from a user arrives, but we
didn't see their join event before, we soft fail the message (even
though we would find the join event when going through the auth events
of the event and doing state res)
2. The state of the room after doing state-res with the event and our
previous room state. We need to do this state resolution to find the new
room state anyway, so we could just use the new room state for the auth
check. The problem is that if the incoming event is a membership leave
event, the new room state does not allow another leave event. This is
obviously the wrong option.
3. The state of the room after doing state-res with the state **before**
the event and our previous room state. This will mean a lot more
calculations because we have to run state-res again
We used 2. before and now use 1. again 
							
						 
						
							2021-05-17 10:58:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8f27e6123b 
								
							 
						 
						
							
							
								
								feat: send read receipts over federation  
							
							... 
							
							
							
							currently they will only be sent if a PDU has to be sent as well 
							
						 
						
							2021-05-17 10:25:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								24793891e0 
								
							 
						 
						
							
							
								
								feat: implement GET /presence  
							
							
							
						 
						
							2021-05-14 11:05:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								37b4a1cd0d 
								
							 
						 
						
							
							
								
								Merge branch 'dbg_clippy' into 'master'  
							
							... 
							
							
							
							Add dbg_macro check
See merge request famedly/conduit!75  
							
						 
						
							2021-05-12 18:44:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f62258ba35 
								
							 
						 
						
							
							
								
								improvement: bug fixes and refactors  
							
							... 
							
							
							
							- power level content override adds to the default event instead of
replacing it
- sending code refactored to make edus possible
- remove presence events when restarting conduit
- remove room_id field from read receipts over /sync
- handle incoming read receipts
- fix array bounds bug in server_server.rs 
							
						 
						
							2021-05-12 20:15:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonas Platte 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								af6fea3d4e 
								
							 
						 
						
							
							
								
								Refactor some canonical JSON code  
							
							
							
						 
						
							2021-05-08 02:13:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonas Platte 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a0457000ff 
								
							 
						 
						
							
							
								
								Upgrade Ruma  
							
							
							
						 
						
							2021-05-08 01:54:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonathan de Jong 
								
							 
						 
						
							
							
							
							
								
							
							
								268ad3441c 
								
							 
						 
						
							
							
								
								add dbg_macro check  
							
							
							
						 
						
							2021-05-05 16:14:49 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cf94b8e712 
								
							 
						 
						
							
							
								
								improvement: uiaa works like in synapse  
							
							
							
						 
						
							2021-05-04 19:05:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonas Platte 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e1c4e5c73e 
								
							 
						 
						
							
							
								
								Return only event content in account_data endpoints, not the entire event  
							
							
							
						 
						
							2021-04-29 21:28:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonas Platte 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8bfaf09f37 
								
							 
						 
						
							
							
								
								Clean up reqwest::Response to http::Response conversion  
							
							
							
						 
						
							2021-04-29 21:28:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonas Platte 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c28eba1e5b 
								
							 
						 
						
							
							
								
								Bump ruma  
							
							
							
						 
						
							2021-04-29 21:05:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonas Platte 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								08ca573df0 
								
							 
						 
						
							
							
								
								Remove explicit setting of content-type header  
							
							... 
							
							
							
							`try_into_http_request` takes care of this already. 
							
						 
						
							2021-04-29 20:50:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonas Platte 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								61c522dcc0 
								
							 
						 
						
							
							
								
								Fix formatting  
							
							
							
						 
						
							2021-04-29 20:50:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonas Platte 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b76af682a6 
								
							 
						 
						
							
							
								
								Fix clippy warnings  
							
							
							
						 
						
							2021-04-29 20:50:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3c3062a316 
								
							 
						 
						
							
							
								
								improvement: optimize room directory  
							
							
							
						 
						
							2021-04-28 17:56:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonas Platte 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2e1d7d12ca 
								
							 
						 
						
							
							
								
								Refactor usage of CanonicalJsonValue  
							
							
							
						 
						
							2021-04-26 19:03:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonas Platte 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c2b72773d5 
								
							 
						 
						
							
							
								
								Fix clippy warning  
							
							
							
						 
						
							2021-04-26 19:02:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								58463bba93 
								
							 
						 
						
							
							
								
								feat: send invites over federation  
							
							
							
						 
						
							2021-04-25 14:10:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3dfc245633 
								
							 
						 
						
							
							
								
								fix: send transaction retry code  
							
							
							
						 
						
							2021-04-24 18:26:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2fc1ec2ad5 
								
							 
						 
						
							
							
								
								fix: logging  
							
							
							
						 
						
							2021-04-24 13:34:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								226045ea4b 
								
							 
						 
						
							
							
								
								improvement: warning on misconfigured reverse proxy  
							
							
							
						 
						
							2021-04-24 12:29:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonas Platte 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								026af6b1a6 
								
							 
						 
						
							
							
								
								Improve formatting of ruma_wrapper.rs  
							
							
							
						 
						
							2021-04-24 12:22:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonas Platte 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d8b484beed 
								
							 
						 
						
							
							
								
								Upgrade ruma  
							
							
							
						 
						
							2021-04-24 12:22:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonas Platte 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e72fd44bb5 
								
							 
						 
						
							
							
								
								Refactor send_request for appservices  
							
							
							
						 
						
							2021-04-24 12:18:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonas Platte 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7067d7acae 
								
							 
						 
						
							
							
								
								Refactor Responder implementation for RumaResponse  
							
							
							
						 
						
							2021-04-24 12:18:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								23f81bfaf7 
								
							 
						 
						
							
							
								
								chore: update dependencies  
							
							
							
						 
						
							2021-04-24 12:18:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bb234ca002 
								
							 
						 
						
							
							
								
								fix: only show one typing event per user  
							
							
							
						 
						
							2021-04-24 12:17:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6e84d317b2 
								
							 
						 
						
							
							
								
								improvement: update ruma  
							
							
							
						 
						
							2021-04-24 12:17:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1f84013b2a 
								
							 
						 
						
							
							
								
								feat: verify signatures for incoming requests  
							
							
							
						 
						
							2021-04-24 12:17:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								8c72909bb8 
								
							 
						 
						
							
							
								
								Merge branch 'tls-name' into 'master'  
							
							... 
							
							
							
							Validate TLS certificates according to Matrix spec
See merge request famedly/conduit!60  
							
						 
						
							2021-04-23 05:22:07 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2f440e644d 
								
							 
						 
						
							
							
								
								fix: clippy  
							
							
							
						 
						
							2021-04-21 10:59:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								71ed1b295a 
								
							 
						 
						
							
							
								
								feat: /devices route  
							
							
							
						 
						
							2021-04-21 10:51:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e815486030 
								
							 
						 
						
							
							
								
								fix: don't allow inviting other users (not implemented yet)  
							
							
							
						 
						
							2021-04-21 10:00:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Gabriel Souza Franco 
								
							 
						 
						
							
							
							
							
								
							
							
								ed253e236c 
								
							 
						 
						
							
							
								
								chore: document FedDest, fix tests  
							
							
							
						 
						
							2021-04-21 00:35:44 -03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d4e0ba245b 
								
							 
						 
						
							
							
								
								fix: bug when fetching events over federation  
							
							
							
						 
						
							2021-04-19 11:55:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								eedac4fd96 
								
							 
						 
						
							
							
								
								feat: make_join, send_join and /directory  
							
							
							
						 
						
							2021-04-16 18:18:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Gabriel Souza Franco 
								
							 
						 
						
							
							
							
							
								
							
							
								7faa021ff5 
								
							 
						 
						
							
							
								
								chore: code formatting and cleanup  
							
							
							
						 
						
							2021-04-16 12:18:22 -03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Gabriel Souza Franco 
								
							 
						 
						
							
							
							
							
								
							
							
								e73de2317e 
								
							 
						 
						
							
							
								
								fix: verify tls cert for non-conformant servers  
							
							
							
						 
						
							2021-04-16 00:36:35 -03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Gabriel Souza Franco 
								
							 
						 
						
							
							
							
							
								
							
							
								b4c001de2f 
								
							 
						 
						
							
							
								
								chore: cleanup string-based code in find_actual_destination  
							
							
							
						 
						
							2021-04-16 00:27:26 -03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Gabriel Souza Franco 
								
							 
						 
						
							
							
							
							
								
							
							
								0b56589dce 
								
							 
						 
						
							
							
								
								feat: add handling of tls cert for delegated hosts  
							
							
							
						 
						
							2021-04-15 22:07:27 -03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bc98425dfe 
								
							 
						 
						
							
							
								
								improvement: use invite state as hints to what servers to ask for joining  
							
							
							
						 
						
							2021-04-14 14:46:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								001d8dc257 
								
							 
						 
						
							
							
								
								fix: don't do expensive operation on local /send  
							
							
							
						 
						
							2021-04-14 12:55:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c1953efa6b 
								
							 
						 
						
							
							
								
								chore: code cleanup  
							
							
							
						 
						
							2021-04-14 10:43:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								abddfc2d2a 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'famedly/master' into develop  
							
							
							
						 
						
							2021-04-14 10:26:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5951294638 
								
							 
						 
						
							
							
								
								feat: join cursed rooms  
							
							... 
							
							
							
							this removes several restrictions and tries to continue verifying a pdu
event if some auth events fail (it drops/ignores bad pdus) 
							
						 
						
							2021-04-14 09:39:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8b40e0a85f 
								
							 
						 
						
							
							
								
								improvement: fetch signing keys in parallel when joining a room  
							
							
							
						 
						
							2021-04-13 22:54:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5049d0e01b 
								
							 
						 
						
							
							
								
								improvement: check signatures on join  
							
							
							
						 
						
							2021-04-13 18:17:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b4f79b77ba 
								
							 
						 
						
							
							
								
								feat: reject invites over federation  
							
							
							
						 
						
							2021-04-13 17:41:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								662a0cf1df 
								
							 
						 
						
							
							
								
								improvement: better and more efficient message count calculation  
							
							
							
						 
						
							2021-04-12 12:40:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1dc85895a7 
								
							 
						 
						
							
							
								
								fix: show warning for invalid user ids  
							
							
							
						 
						
							2021-04-12 10:12:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a961732f5f 
								
							 
						 
						
							
							
								
								fix: overflow  
							
							
							
						 
						
							2021-04-11 21:35:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a8231eef25 
								
							 
						 
						
							
							
								
								fix: alias parsing  
							
							
							
						 
						
							2021-04-11 21:29:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8773e5013d 
								
							 
						 
						
							
							
								
								feat: incoming invites over federation  
							
							
							
						 
						
							2021-04-11 21:04:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b0ea692706 
								
							 
						 
						
							
							
								
								fix: malformed pushrule error when event does not trigger any actions  
							
							
							
						 
						
							2021-04-11 10:50:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								588de12d79 
								
							 
						 
						
							
							
								
								fix: lost forward extremity  
							
							
							
						 
						
							2021-04-11 10:12:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								044e65afcc 
								
							 
						 
						
							
							
								
								fix: move back to sled stable  
							
							
							
						 
						
							2021-04-11 10:12:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								84f4ce73e5 
								
							 
						 
						
							
							
								
								fix: membership deserializing  
							
							
							
						 
						
							2021-04-09 21:45:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f3f95a73d0 
								
							 
						 
						
							
							
								
								improvement: /event route  
							
							
							
						 
						
							2021-04-07 15:57:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonas Platte 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dc031fff95 
								
							 
						 
						
							
							
								
								Remove redundant calls to .iter() and .into_iter()  
							
							
							
						 
						
							2021-04-06 17:38:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonas Platte 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dbe8c2ce19 
								
							 
						 
						
							
							
								
								Remove lots of redundant string allocations  
							
							
							
						 
						
							2021-04-06 17:38:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonas Platte 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fe744c856f 
								
							 
						 
						
							
							
								
								Upgrade ruma  
							
							... 
							
							
							
							… and refactor push rule code along the way. 
							
						 
						
							2021-04-06 17:38:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								db7044a950 
								
							 
						 
						
							
							
								
								sytest test  
							
							
							
						 
						
							2021-03-26 13:41:05 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cd4dc13731 
								
							 
						 
						
							
							
								
								fix: use correct room versions  
							
							
							
						 
						
							2021-03-26 13:30:17 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c213769d9f 
								
							 
						 
						
							
							
								
								improvement: refactor state res and fix a few bugs in the process  
							
							
							
						 
						
							2021-03-25 23:55:40 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								16eed1d8c2 
								
							 
						 
						
							
							
								
								chore: get rid of warnings  
							
							
							
						 
						
							2021-03-24 12:44:10 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e50f2864de 
								
							 
						 
						
							
							
								
								improvement: save state for send_join pdu  
							
							
							
						 
						
							2021-03-24 11:46:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e305889b72 
								
							 
						 
						
							
							
								
								feat: room_account_data endpoints  
							
							
							
						 
						
							2021-03-24 08:48:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1d00a8c41f 
								
							 
						 
						
							
							
								
								improvement: better logging  
							
							... 
							
							
							
							Use CONDUIT_LOG or the log setting in the config 
							
						 
						
							2021-03-23 22:06:09 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								46d8f36a2c 
								
							 
						 
						
							
							
								
								fix: media thumbnail calculation and appservice detection  
							
							
							
						 
						
							2021-03-23 21:18:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3ea7d162db 
								
							 
						 
						
							
							
								
								fix: various improvements and fixes  
							
							
							
						 
						
							2021-03-23 12:59:27 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								363c629faf 
								
							 
						 
						
							
							
								
								fix: signature key fetching, optimize push sending  
							
							
							
						 
						
							2021-03-22 14:04:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d4c76f4654 
								
							 
						 
						
							
							
								
								chore: update ruma  
							
							
							
						 
						
							2021-03-18 19:38:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f775c76d8a 
								
							 
						 
						
							
							
								
								chore: get rid of warnings  
							
							
							
						 
						
							2021-03-18 18:33:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Gabriel Souza Franco 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7b3fe88345 
								
							 
						 
						
							
							
								
								Send proper Host header in federation requests  
							
							
							
						 
						
							2021-03-18 17:59:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5cb15551f3 
								
							 
						 
						
							
							
								
								improvement: use db compression  
							
							
							
						 
						
							2021-03-18 13:13:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a0fa0ee7a0 
								
							 
						 
						
							
							
								
								fix: join appservice room with alias  
							
							
							
						 
						
							2021-03-18 12:03:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a77fcd106e 
								
							 
						 
						
							
							
								
								feat: implement /state_ids and fix federation stuff  
							
							
							
						 
						
							2021-03-18 00:11:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								100307c936 
								
							 
						 
						
							
							
								
								improvement: optimize state storage  
							
							
							
						 
						
							2021-03-17 22:31:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								44425a903a 
								
							 
						 
						
							
							
								
								fix: multiple federation/pusher fixes  
							
							
							
						 
						
							2021-03-16 18:00:46 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								21f785d530 
								
							 
						 
						
							
							
								
								Merge branch 'correct-sendtxn' into pushers  
							
							
							
						 
						
							2021-03-15 09:56:04 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6da40225bb 
								
							 
						 
						
							
							
								
								improvement: make state res actually work  
							
							
							
						 
						
							2021-03-13 16:30:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								643109309b 
								
							 
						 
						
							
							
								
								Merge branch 'incoming-pdu' into 'master'  
							
							... 
							
							
							
							fix: don't accept incoming pdus if we know about them already
Closes  #70 
See merge request famedly/conduit!33  
							
						 
						
							2021-03-04 14:38:07 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rudi Floren 
								
							 
						 
						
							
							
							
							
								
							
							
								4027cbd01d 
								
							 
						 
						
							
							
								
								Fix various clippy errors  
							
							
							
						 
						
							2021-03-04 15:27:25 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rudi Floren 
								
							 
						 
						
							
							
							
							
								
							
							
								6309506a48 
								
							 
						 
						
							
							
								
								Allow suspicious_else_formatting  
							
							... 
							
							
							
							This is probably unfixable because it is caused by macros 
							
						 
						
							2021-03-04 15:26:34 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								0d55964d24 
								
							 
						 
						
							
							
								
								Run nightly cargo fmt  
							
							
							
						 
						
							2021-03-04 08:45:23 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								d0df8b495c 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into correct-sendtxn  
							
							
							
						 
						
							2021-03-04 08:39:16 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								e239014fa3 
								
							 
						 
						
							
							
								
								Query for the correct server  
							
							
							
						 
						
							2021-03-04 08:02:41 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1ce00f90fe 
								
							 
						 
						
							
							
								
								fix: don't accept incoming pdus if we know about them already  
							
							
							
						 
						
							2021-03-04 13:37:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								bd6507eafb 
								
							 
						 
						
							
							
								
								Merge branch 'valkum-master-patch-25423' into 'master'  
							
							... 
							
							
							
							Make clippy happy (needless-return, etc.)
See merge request famedly/conduit!23  
							
						 
						
							2021-03-04 12:35:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rudi Floren 
								
							 
						 
						
							
							
							
							
								
							
							
								231c6032f4 
								
							 
						 
						
							
							
								
								Make clippy happy (needless-return, etc.)  
							
							
							
						 
						
							2021-03-04 12:35:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								3e274d7d2c 
								
							 
						 
						
							
							
								
								Merge branch 'valkum/conduit-update_rocket' into 'master'  
							
							... 
							
							
							
							update dependencies
See merge request famedly/conduit!32  
							
						 
						
							2021-03-04 12:32:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								105f893cf3 
								
							 
						 
						
							
							
								
								chore: bump other dependencies to make it work  
							
							
							
						 
						
							2021-03-04 12:29:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								437cb5783a 
								
							 
						 
						
							
							
								
								fix: apply the same appservice sending rules to events coming from federation  
							
							... 
							
							
							
							currently this code is duplicated from database/rooms.rs, when we
refactor server_server.rs we should deduplicate it 
							
						 
						
							2021-03-04 11:34:38 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rudi Floren 
								
							 
						 
						
							
							
							
							
								
							
							
								f4039902d8 
								
							 
						 
						
							
							
								
								Bump Rocket to current HEAD  
							
							
							
						 
						
							2021-03-03 22:42:10 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f2ec2be821 
								
							 
						 
						
							
							
								
								fix: don't always query aliases of appservices  
							
							... 
							
							
							
							only do so if the alias matches the regex in the registration file 
							
						 
						
							2021-03-03 21:53:32 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								1a198e7336 
								
							 
						 
						
							
							
								
								Merge branch 'jaeger' into 'master'  
							
							... 
							
							
							
							feat: opentelemetry/jaeger support
See merge request famedly/conduit!28  
							
						 
						
							2021-03-02 14:14:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4155a47db1 
								
							 
						 
						
							
							
								
								feat: opentelemetry/jaeger support  
							
							
							
						 
						
							2021-03-02 15:08:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f7713fdf2e 
								
							 
						 
						
							
							
								
								fix: sending code got stuck sometimes  
							
							
							
						 
						
							2021-03-02 14:58:46 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								278751eb23 
								
							 
						 
						
							
							
								
								improvement: use transaction ids for federation requests  
							
							
							
						 
						
							2021-03-02 14:36:48 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dd68031b69 
								
							 
						 
						
							
							
								
								improvement: implement /receipt  
							
							
							
						 
						
							2021-03-02 14:33:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								79c9de98cd 
								
							 
						 
						
							
							
								
								Add trusted_servers, filter servers to query keys by trusted_servers  
							
							
							
						 
						
							2021-03-01 09:17:53 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								c9f4ff5cf8 
								
							 
						 
						
							
							
								
								Ask multiple servers for keys when not known or sending server failed  
							
							
							
						 
						
							2021-03-01 08:23:28 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								f3253f2033 
								
							 
						 
						
							
							
								
								Move comments about Rooms trees to doc comments  
							
							
							
						 
						
							2021-02-28 18:53:17 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								0dd8a15c49 
								
							 
						 
						
							
							
								
								Fix leaves not being replaced by correct eventId in membership  
							
							... 
							
							
							
							Update ruma 
							
						 
						
							2021-02-27 16:09:22 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								0cc6448dbe 
								
							 
						 
						
							
							
								
								Temp disable rust_2018_idioms for CI  
							
							
							
						 
						
							2021-02-23 17:21:01 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								8f283510aa 
								
							 
						 
						
							
							
								
								Fix unused import clippy warning  
							
							
							
						 
						
							2021-02-23 17:21:01 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								48601142f8 
								
							 
						 
						
							
							
								
								Use auth_cache to avoid db, save state for every event when joining  
							
							
							
						 
						
							2021-02-23 17:21:01 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								74d530ae0e 
								
							 
						 
						
							
							
								
								Address review issues, fix forward extremity calc  
							
							... 
							
							
							
							Keep track of all prev_events since if we know that an event is a
prev_event it is referenced and does not qualify as a forward extremity. 
							
						 
						
							2021-02-23 17:21:01 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								591769d5f3 
								
							 
						 
						
							
							
								
								Fiter PDU's before main incoming PDU loop  
							
							
							
						 
						
							2021-02-23 17:21:01 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								64374b4679 
								
							 
						 
						
							
							
								
								Use eventId when saving outliers  
							
							
							
						 
						
							2021-02-23 17:21:01 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								e09be2f7ee 
								
							 
						 
						
							
							
								
								Add incoming event to the current room state then resolve  
							
							... 
							
							
							
							All state snapshots that are used in the resolve call are state after
snapshots, they have the event inserted. 
							
						 
						
							2021-02-23 17:21:01 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								6661de50ab 
								
							 
						 
						
							
							
								
								Fix and integrate outlier tree, build forks after adding event to DB  
							
							
							
						 
						
							2021-02-23 17:21:01 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								6fd3e1d1dd 
								
							 
						 
						
							
							
								
								Append state event that pass resolution to DB, update to tokio 1.1  
							
							
							
						 
						
							2021-02-23 17:21:01 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								e0453e2348 
								
							 
						 
						
							
							
								
								Cleanup dbg prints and error messages  
							
							
							
						 
						
							2021-02-23 17:21:01 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								68f60933e6 
								
							 
						 
						
							
							
								
								Resolved state is set as the current room state on incoming events  
							
							
							
						 
						
							2021-02-23 17:21:01 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								05a4c0b325 
								
							 
						 
						
							
							
								
								Finish forward extremity gathering, use resolved state as new snapshot  
							
							
							
						 
						
							2021-02-23 17:21:01 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								602edfd849 
								
							 
						 
						
							
							
								
								feature: push rule settings  
							
							
							
						 
						
							2021-02-23 17:21:01 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								88c60605b4 
								
							 
						 
						
							
							
								
								Add ability to update room leaves with multiple eventIds  
							
							... 
							
							
							
							Tokio seems a bit broken with Rocket... 
							
						 
						
							2021-02-23 17:21:01 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								66af1ff695 
								
							 
						 
						
							
							
								
								Update ruma and rocket to latest git rev and tokio to 1.0  
							
							... 
							
							
							
							Ruma updated the event signing validation code and there was a dep
resolving failure with serde rocket and tokio so I updated rocket latest and
tokio 1.0 to fix. 
							
						 
						
							2021-02-23 17:20:52 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								835cf80acd 
								
							 
						 
						
							
							
								
								fix: pushers  
							
							
							
						 
						
							2021-02-11 13:17:21 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								7309b2fba9 
								
							 
						 
						
							
							
								
								WIP gather and update forward extremities  
							
							
							
						 
						
							2021-02-09 15:25:30 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								94da569119 
								
							 
						 
						
							
							
								
								Fixing the incoming events algorithm (review with time)  
							
							
							
						 
						
							2021-02-09 15:25:22 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								db0aee3318 
								
							 
						 
						
							
							
								
								Use the auth_events for step 6, WIP forward_extremity_ids fn  
							
							
							
						 
						
							2021-02-09 15:25:10 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								4b2eb5ab82 
								
							 
						 
						
							
							
								
								Fix ALL clippy warnings  
							
							
							
						 
						
							2021-02-09 15:25:00 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								4cf530c55b 
								
							 
						 
						
							
							
								
								Abstract event validation/fetching, add outlier and signing key DB trees  
							
							... 
							
							
							
							Fixed the miss named commented out keys in conduit-example.toml. 
							
						 
						
							2021-02-09 15:24:09 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								52392628e9 
								
							 
						 
						
							
							
								
								Convert uses of Box<ServerName> to a ref  
							
							
							
						 
						
							2021-02-09 15:22:22 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								d108a735a4 
								
							 
						 
						
							
							
								
								State resolution outline for /send  
							
							
							
						 
						
							2021-02-09 15:22:12 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								d0b8d0f5fd 
								
							 
						 
						
							
							
								
								Fix signature/hash checks, fetch recursive auth events  
							
							
							
						 
						
							2021-02-09 15:22:02 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								168ae8dca0 
								
							 
						 
						
							
							
								
								Fill event_map with all events that will be needed for resolution  
							
							
							
						 
						
							2021-02-09 15:21:51 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								8de0d9f9ce 
								
							 
						 
						
							
							
								
								Remove StateStore trait from state-res collect events needed  
							
							
							
						 
						
							2021-02-09 15:21:41 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								cdeb1236a2 
								
							 
						 
						
							
							
								
								Fix clippy warnings remove unused imports  
							
							
							
						 
						
							2021-02-09 15:21:14 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								63af3d3da0 
								
							 
						 
						
							
							
								
								Step 5 in /send just fetches state from incoming server  
							
							
							
						 
						
							2021-02-09 15:20:07 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								4b9976aa74 
								
							 
						 
						
							
							
								
								Update state-res, use the new Event trait  
							
							... 
							
							
							
							This also bumps ruma to latest and removes js_int infavor of the ruma
re-export 
							
						 
						
							2021-02-09 15:19:47 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								4a92a29b56 
								
							 
						 
						
							
							
								
								State resolution outline for /send  
							
							
							
						 
						
							2021-02-09 15:18:47 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d49911c5e0 
								
							 
						 
						
							
							
								
								Add 'm.login.token' authentication  
							
							
							
						 
						
							2021-02-07 17:38:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								3588dcd6d0 
								
							 
						 
						
							
							
								
								Merge branch 'deviceid-login' into 'master'  
							
							... 
							
							
							
							Handle optional device_id field during login
See merge request famedly/conduit!16  
							
						 
						
							2021-02-07 12:28:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ea1e4625d1 
								
							 
						 
						
							
							
								
								fix: default config options  
							
							
							
						 
						
							2021-02-07 13:20:00 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6924dfc8ea 
								
							 
						 
						
							
							
								
								improvement: better appservice compatibility and optimizations  
							
							
							
						 
						
							2021-02-06 15:28:30 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fd3fb3a7ed 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'famedly/master' into appservices  
							
							
							
						 
						
							2021-02-03 12:54:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								e4dc7ea8ac 
								
							 
						 
						
							
							
								
								Prevent admin room from recursively spamming itself and user -> user  
							
							
							
						 
						
							2021-01-30 11:52:48 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								73124629b7 
								
							 
						 
						
							
							
								
								Add general rules matching for pusher, calc unread msgs  
							
							
							
						 
						
							2021-01-29 21:48:35 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								2d69e81699 
								
							 
						 
						
							
							
								
								WIP: send out push notification, impl pusher routes  
							
							... 
							
							
							
							It seems in order to test this I may also have to impl the email 3pid
route? I need to call the set_pusher route somehow. 
							
						 
						
							2021-01-29 21:48:09 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								a0ecd76e21 
								
							 
						 
						
							
							
								
								Run cargo fmt using nightly  
							
							
							
						 
						
							2021-01-29 21:48:09 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								56b816a2be 
								
							 
						 
						
							
							
								
								Fix and integrate outlier tree, build forks after adding event to DB  
							
							
							
						 
						
							2021-01-29 21:45:33 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								cd0c5c0566 
								
							 
						 
						
							
							
								
								Append state event that pass resolution to DB, update to tokio 1.1  
							
							
							
						 
						
							2021-01-29 11:20:33 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								b8b40ce38b 
								
							 
						 
						
							
							
								
								Cleanup dbg prints and error messages  
							
							
							
						 
						
							2021-01-28 15:50:45 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								894b6ef037 
								
							 
						 
						
							
							
								
								Resolved state is set as the current room state on incoming events  
							
							
							
						 
						
							2021-01-28 15:33:41 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								265fab843a 
								
							 
						 
						
							
							
								
								feature: push rule settings  
							
							
							
						 
						
							2021-01-28 20:47:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								35c1904b37 
								
							 
						 
						
							
							
								
								Finish forward extremity gathering, use resolved state as new snapshot  
							
							
							
						 
						
							2021-01-24 20:18:40 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a119d858f3 
								
							 
						 
						
							
							
								
								feature: push rule settings  
							
							
							
						 
						
							2021-01-24 16:07:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								a897608025 
								
							 
						 
						
							
							
								
								Roll back tokio and rocket update since ruma's request is at 0.2 tokio  
							
							
							
						 
						
							2021-01-18 19:59:08 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								3a6f264450 
								
							 
						 
						
							
							
								
								Add ability to update room leaves with multiple eventIds  
							
							... 
							
							
							
							Tokio seems a bit broken with Rocket... 
							
						 
						
							2021-01-18 19:41:38 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								00436a32b0 
								
							 
						 
						
							
							
								
								Update ruma and rocket to latest git rev and tokio to 1.0  
							
							... 
							
							
							
							Ruma updated the event signing validation code and there was a dep
resolving failure with serde rocket and tokio so I updated rocket latest and
tokio 1.0 to fix. 
							
						 
						
							2021-01-18 19:36:44 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								c65bde41e0 
								
							 
						 
						
							
							
								
								WIP gather and update forward extremities  
							
							
							
						 
						
							2021-01-18 19:08:59 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devon Hudson 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								762255fa8d 
								
							 
						 
						
							
							
								
								Simplify device creation logic during login  
							
							
							
						 
						
							2021-01-17 08:39:47 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devon Hudson 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								890187e004 
								
							 
						 
						
							
							
								
								improvement: Handle optional device_id field during login  
							
							... 
							
							
							
							remove debug logging 
							
						 
						
							2021-01-16 22:19:48 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devon Hudson 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ebb38cd330 
								
							 
						 
						
							
							
								
								improvement: respect logout_devices param on password change  
							
							... 
							
							
							
							Move logout devices comment next to relevant loop
remove unnecessary log 
							
						 
						
							2021-01-16 15:14:50 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								b1ae2bbeb2 
								
							 
						 
						
							
							
								
								Fixing the incoming events algorithm (review with time)  
							
							
							
						 
						
							2021-01-16 16:37:20 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								96dc6be14b 
								
							 
						 
						
							
							
								
								Use the auth_events for step 6, WIP forward_extremity_ids fn  
							
							
							
						 
						
							2021-01-15 15:46:47 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								5a8041969d 
								
							 
						 
						
							
							
								
								Fix ALL clippy warnings  
							
							
							
						 
						
							2021-01-15 11:05:57 -05:00