Rip out fedsockets from the release branch
This commit is contained in:
		
							parent
							
								
									274c8e6fab
								
							
						
					
					
						commit
						fb0e340363
					
				
					 4 changed files with 3 additions and 25 deletions
				
			
		|  | @ -27,7 +27,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). | |||
| ### Added | ||||
| - Media preview proxy (requires `ffmpeg` and `ImageMagick` to be installed and media proxy to be enabled; see `:media_preview_proxy` config for more details). | ||||
| - Pleroma API: Importing the mutes users from CSV files. | ||||
| - Experimental websocket-based federation between Pleroma instances. | ||||
| 
 | ||||
| <details> | ||||
|   <summary>API Changes</summary> | ||||
|  |  | |||
|  | @ -130,7 +130,9 @@ | |||
|     dispatch: [ | ||||
|       {:_, | ||||
|        [ | ||||
|          {"/api/fedsocket/v1", Pleroma.Web.FedSockets.IncomingHandler, []}, | ||||
|          # FedSockets are commented out of the dispatch table on stable because they can't even | ||||
|          # fail properly when they are disabled. They will hang the connection instead of returning a 404. | ||||
|          #         {"/api/fedsocket/v1", Pleroma.Web.FedSockets.IncomingHandler, []}, | ||||
|          {"/api/v1/streaming", Pleroma.Web.MastodonAPI.WebsocketHandler, []}, | ||||
|          {"/websocket", Phoenix.Endpoint.CowboyWebSocket, | ||||
|           {Phoenix.Transports.WebSocket, | ||||
|  |  | |||
|  | @ -273,19 +273,6 @@ | |||
|       } | ||||
|     ] | ||||
|   }, | ||||
|   %{ | ||||
|     group: :pleroma, | ||||
|     key: :fed_sockets, | ||||
|     type: :group, | ||||
|     description: "Websocket based federation", | ||||
|     children: [ | ||||
|       %{ | ||||
|         key: :enabled, | ||||
|         type: :boolean, | ||||
|         description: "Enable FedSockets" | ||||
|       } | ||||
|     ] | ||||
|   }, | ||||
|   %{ | ||||
|     group: :pleroma, | ||||
|     key: Pleroma.Emails.Mailer, | ||||
|  |  | |||
|  | @ -219,16 +219,6 @@ config :pleroma, :mrf_user_allowlist, %{ | |||
| * `total_user_limit`: the number of scheduled activities a user is allowed to create in total (Default: `300`) | ||||
| * `enabled`: whether scheduled activities are sent to the job queue to be executed | ||||
| 
 | ||||
| ## FedSockets | ||||
| FedSockets is an experimental feature allowing for Pleroma backends to federate using a persistant websocket connection as opposed to making each federation a seperate http connection. This feature is currently off by default. It is configurable throught he following options. | ||||
| 
 | ||||
| ### :fedsockets | ||||
| * `enabled`: Enables FedSockets for this instance. `false` by default. | ||||
| * `connection_duration`: Time an idle websocket is kept open. | ||||
| * `rejection_duration`: Failures to connect via FedSockets will not be retried for this period of time. | ||||
| * `fed_socket_fetches` and `fed_socket_rejections`: Settings passed to `cachex` for the fetch registry, and rejection stacks. See `Pleroma.Web.FedSockets` for more details. | ||||
| 
 | ||||
| 
 | ||||
| ## Frontends | ||||
| 
 | ||||
| ### :frontend_configurations | ||||
|  |  | |||
		Loading…
	
		Reference in a new issue
	
	 rinpatch
						rinpatch