Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								e48c7aac4d 
								
							
								 
							
						 
						
							
							
								
								Add transactional API to history purge  
							
							 
							
							... 
							
							
							
							Make the purge request return quickly, and allow scripts to poll for updates. 
							
						 
						
							2018-03-12 16:22:55 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								f8bfcd7e0d 
								
							
								 
							
						 
						
							
							
								
								Provide a means to pass a timestamp to purge_history  
							
							 
							
							
							
						 
						
							2018-03-05 14:37:23 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								784f036306 
								
							
								 
							
						 
						
							
							
								
								Move RoomMemberHandler out of Handlers  
							
							 
							
							
							
						 
						
							2018-03-01 14:36:50 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								92c52df702 
								
							
								 
							
						 
						
							
							
								
								Make store_file use store_into_file  
							
							 
							
							
							
						 
						
							2018-02-14 17:55:18 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								c0c9327fe0 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2854  from matrix-org/erikj/event_create_worker  
							
							 
							
							... 
							
							
							
							Create a worker for event creation 
							
						 
						
							2018-02-13 18:07:10 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								8fd1a32456 
								
							
								 
							
						 
						
							
							
								
								Fix typos in purge api & doc  
							
							 
							
							... 
							
							
							
							* It's supposed to be purge_local_events, not ..._history
* Fix the doc to have valid json 
							
						 
						
							2018-02-13 13:09:39 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								1026690cd2 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2857  from matrix-org/erikj/upload_store  
							
							 
							
							... 
							
							
							
							Tell storage providers about new file so they can upload 
							
						 
						
							2018-02-12 13:52:58 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								10b34dbb9a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2858  from matrix-org/rav/purge_updates  
							
							 
							
							... 
							
							
							
							delete_local_events for purge_room_history 
							
						 
						
							2018-02-09 14:11:00 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								74fcbf741b 
								
							
								 
							
						 
						
							
							
								
								delete_local_events for purge_history  
							
							 
							
							... 
							
							
							
							Add a flag which makes the purger delete local events 
							
						 
						
							2018-02-09 13:07:41 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								5fa571a91b 
								
							
								 
							
						 
						
							
							
								
								Tell storage providers about new file so they can upload  
							
							 
							
							
							
						 
						
							2018-02-07 13:35:08 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								8ec2e638be 
								
							
								 
							
						 
						
							
							
								
								Add event_creator worker  
							
							 
							
							
							
						 
						
							2018-02-07 10:32:32 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3e1e69ccaf 
								
							
								 
							
						 
						
							
							
								
								Update copyright  
							
							 
							
							
							
						 
						
							2018-02-06 16:40:38 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3fa362502c 
								
							
								 
							
						 
						
							
							
								
								Update places where we create events  
							
							 
							
							
							
						 
						
							2018-02-05 16:01:48 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								1f881e0746 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2791  from matrix-org/erikj/media_storage_refactor  
							
							 
							
							... 
							
							
							
							Ensure media is in local cache before thumbnailing 
							
						 
						
							2018-02-05 11:28:52 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								9c9356512e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2845  from matrix-org/rav/urlcache_error_handling  
							
							 
							
							... 
							
							
							
							Handle url_previews with no content-type 
							
						 
						
							2018-02-02 15:27:52 +01:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
								
								
							
							
								
							
								6e87b34f7b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into travis/admin-list-media  
							
							 
							
							
							
						 
						
							2018-02-01 18:05:47 -07:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								d5352cbba8 
								
							
								 
							
						 
						
							
							
								
								Handle url_previews with no content-type  
							
							 
							
							... 
							
							
							
							avoid failing with an exception if the remote server doesn't give us a
Content-Type header.
Also, clean up the exception handling a bit. 
							
						 
						
							2018-02-02 00:53:46 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								9a72b70630 
								
							
								 
							
						 
						
							
							
								
								fix thinko on 3pid whitelisting  
							
							 
							
							
							
						 
						
							2018-01-24 11:07:47 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
								
								
							
							
								
							
								d32385336f 
								
									
								
							
								 
							
						 
						
							
							
								
								add ?ts massaging for ASes ( #2754 )  
							
							 
							
							... 
							
							
							
							blindly implement ?ts for AS. untested 
							
						 
						
							2018-01-23 09:59:06 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
								
								
							
							
								
							
								ab9f844aaf 
								
									
								
							
								 
							
						 
						
							
							
								
								Add federation_domain_whitelist option ( #2820 )  
							
							 
							
							... 
							
							
							
							Add federation_domain_whitelist
gives a way to restrict which domains your HS is allowed to federate with.
useful mainly for gracefully preventing a private but internet-connected HS from trying to federate to the wider public Matrix network 
							
						 
						
							2018-01-22 19:11:18 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
								
								
							
							
								
							
								d84f65255e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2813  from matrix-org/matthew/registrations_require_3pid  
							
							 
							
							... 
							
							
							
							add registrations_require_3pid and allow_local_3pids 
							
						 
						
							2018-01-22 13:57:22 +00:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								5552ed9a7f 
								
							
								 
							
						 
						
							
							
								
								Add an admin route to get all the media in a room  
							
							 
							
							... 
							
							
							
							This is intended to be used by administrators to monitor the media that is passing through their server, if they wish.
Signed-off-by: Travis Ralston <travpc@gmail.com> 
							
						 
						
							2018-01-20 22:37:53 -07:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								49fce04624 
								
							
								 
							
						 
						
							
							
								
								fix typo (thanks sytest)  
							
							 
							
							
							
						 
						
							2018-01-19 19:55:38 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								b0d9e633ee 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2814  from matrix-org/rav/fix_urlcache_thumbs  
							
							 
							
							... 
							
							
							
							Use the right path for url_preview thumbnails 
							
						 
						
							2018-01-19 18:57:15 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								ad7ec63d08 
								
							
								 
							
						 
						
							
							
								
								Use the right path for url_preview thumbnails  
							
							 
							
							... 
							
							
							
							This was introduced by #2627 : we were overwriting the original media for url
previews with the thumbnails :/
(fixes https://github.com/vector-im/riot-web/issues/6012 , hopefully) 
							
						 
						
							2018-01-19 18:29:39 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								62d7d66ae5 
								
							
								 
							
						 
						
							
							
								
								oops, check all login types  
							
							 
							
							
							
						 
						
							2018-01-19 18:23:56 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								293380bef7 
								
							
								 
							
						 
						
							
							
								
								trailing commas  
							
							 
							
							
							
						 
						
							2018-01-19 15:38:53 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								447f4f0d5f 
								
							
								 
							
						 
						
							
							
								
								rewrite based on PR feedback:  
							
							 
							
							... 
							
							
							
							* [ ] split config options into allowed_local_3pids and registrations_require_3pid
 * [ ] simplify and comment logic for picking registration flows
 * [ ] fix docstring and move check_3pid_allowed into a new util module
 * [ ] use check_3pid_allowed everywhere
@erikjohnston PTAL 
							
						 
						
							2018-01-19 15:33:55 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								9d332e0f79 
								
							
								 
							
						 
						
							
							
								
								fix up v1, and improve errors  
							
							 
							
							
							
						 
						
							2018-01-19 00:53:58 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								0af58f14ee 
								
							
								 
							
						 
						
							
							
								
								fix pep8  
							
							 
							
							
							
						 
						
							2018-01-19 00:33:51 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								28a6ccb49c 
								
							
								 
							
						 
						
							
							
								
								add registrations_require_3pid  
							
							 
							
							... 
							
							
							
							lets homeservers specify a whitelist for 3PIDs that users are allowed to associate with.
Typically useful for stopping people from registering with non-work emails 
							
						 
						
							2018-01-19 00:19:58 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								cd871a3057 
								
							
								 
							
						 
						
							
							
								
								Fix storage provider bug introduced when renamed to store_local  
							
							 
							
							
							
						 
						
							2018-01-18 18:37:59 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								8ff6726c0d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2812  from matrix-org/erikj/media_storage_provider_config  
							
							 
							
							... 
							
							
							
							Make storage providers configurable 
							
						 
						
							2018-01-18 18:33:57 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3fe2bae857 
								
							
								 
							
						 
						
							
							
								
								Missing staticmethod  
							
							 
							
							
							
						 
						
							2018-01-18 17:11:45 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								aae77da73f 
								
							
								 
							
						 
						
							
							
								
								Fixup comments  
							
							 
							
							
							
						 
						
							2018-01-18 17:11:29 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								9a89dae8c5 
								
							
								 
							
						 
						
							
							
								
								Fix typo in thumbnail resource causing access times to be incorrect  
							
							 
							
							
							
						 
						
							2018-01-18 15:06:24 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0af5dc63a8 
								
							
								 
							
						 
						
							
							
								
								Make storage providers more configurable  
							
							 
							
							
							
						 
						
							2018-01-18 14:07:21 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2cf6a7bc20 
								
							
								 
							
						 
						
							
							
								
								Use better file consumer  
							
							 
							
							
							
						 
						
							2018-01-18 12:00:46 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4a53f3a3e8 
								
							
								 
							
						 
						
							
							
								
								Ensure media is in local cache before thumbnailing  
							
							 
							
							
							
						 
						
							2018-01-18 12:00:46 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								300edc2348 
								
							
								 
							
						 
						
							
							
								
								Update last access time when thumbnails are viewed  
							
							 
							
							
							
						 
						
							2018-01-17 10:24:43 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								05f98a2224 
								
							
								 
							
						 
						
							
							
								
								Keep track of last access time for local media  
							
							 
							
							
							
						 
						
							2018-01-17 10:24:43 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d728c47142 
								
							
								 
							
						 
						
							
							
								
								Add docstring  
							
							 
							
							
							
						 
						
							2018-01-17 10:06:14 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d863f68cab 
								
							
								 
							
						 
						
							
							
								
								Use local vars  
							
							 
							
							
							
						 
						
							2018-01-16 16:24:15 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6368e5c0ab 
								
							
								 
							
						 
						
							
							
								
								Change _generate_thumbnails to take media_type  
							
							 
							
							
							
						 
						
							2018-01-16 16:17:38 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0a90d9ede4 
								
							
								 
							
						 
						
							
							
								
								Move setting of file_id up to caller  
							
							 
							
							
							
						 
						
							2018-01-16 16:03:05 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								5dfc83704b 
								
							
								 
							
						 
						
							
							
								
								Fix typo  
							
							 
							
							
							
						 
						
							2018-01-16 14:32:56 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								307f88dfb6 
								
							
								 
							
						 
						
							
							
								
								Fix up log lines  
							
							 
							
							
							
						 
						
							2018-01-16 13:53:52 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								9795b9ebb1 
								
							
								 
							
						 
						
							
							
								
								Correctly use server_name/file_id when generating/fetching remote thumbnails  
							
							 
							
							
							
						 
						
							2018-01-16 12:02:06 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c5b589f2e8 
								
							
								 
							
						 
						
							
							
								
								Log when we respond with 404  
							
							 
							
							
							
						 
						
							2018-01-16 12:01:40 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a4c5e4a645 
								
							
								 
							
						 
						
							
							
								
								Fix thumbnailing remote files  
							
							 
							
							
							
						 
						
							2018-01-16 11:37:50 +00:00