Revert "Add upload limits to /api/v1/instance"
This reverts commit db27c0dd8b18763ff2abb124ee8d641a4580cdaa.
This commit is contained in:
		
							parent
							
								
									ee6da62cdb
								
							
						
					
					
						commit
						1255ec888d
					
				
					 3 changed files with 11 additions and 2 deletions
				
			
		| 
						 | 
				
			
			@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 | 
			
		|||
- Mastodon API: Account entities now include `follow_requests_count` (planned Mastodon 3.x addition)
 | 
			
		||||
- Pleroma API: `GET /api/v1/pleroma/accounts/:id/scrobbles` to get a list of recently scrobbled items
 | 
			
		||||
- Pleroma API: `POST /api/v1/pleroma/scrobble` to scrobble a media item
 | 
			
		||||
- Mastodon API: Add `upload_limit`, `avatar_upload_limit`, `background_upload_limit`, and `banner_upload_limit` to `/api/v1/instance`
 | 
			
		||||
 | 
			
		||||
### Changed
 | 
			
		||||
- **Breaking:** Elixir >=1.8 is now required (was >= 1.7)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -51,7 +51,11 @@ def masto_instance(conn, _params) do
 | 
			
		|||
      registrations: Pleroma.Config.get([:instance, :registrations_open]),
 | 
			
		||||
      # Extra (not present in Mastodon):
 | 
			
		||||
      max_toot_chars: Keyword.get(instance, :limit),
 | 
			
		||||
      poll_limits: Keyword.get(instance, :poll_limits)
 | 
			
		||||
      poll_limits: Keyword.get(instance, :poll_limits),
 | 
			
		||||
      upload_limit: Keyword.get(instance, :upload_limit),
 | 
			
		||||
      avatar_upload_limit: Keyword.get(instance, :avatar_upload_limit),
 | 
			
		||||
      background_upload_limit: Keyword.get(instance, :background_upload_limit),
 | 
			
		||||
      banner_upload_limit: Keyword.get(instance, :banner_upload_limit)
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    json(conn, response)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -135,7 +135,11 @@ test "get instance information", %{conn: conn} do
 | 
			
		|||
             "thumbnail" => _,
 | 
			
		||||
             "languages" => _,
 | 
			
		||||
             "registrations" => _,
 | 
			
		||||
             "poll_limits" => _
 | 
			
		||||
             "poll_limits" => _,
 | 
			
		||||
             "upload_limit" => _,
 | 
			
		||||
             "avatar_upload_limit" => _,
 | 
			
		||||
             "background_upload_limit" => _,
 | 
			
		||||
             "banner_upload_limit" => _
 | 
			
		||||
           } = result
 | 
			
		||||
 | 
			
		||||
    assert email == from_config_email
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue