Drop activity_type override for uploads
Afaict this was never used, but keeping this (in theory) possible
hinders detecting which objects are actually media uploads and
which proper ActivityPub objects.
It was originally added as part of upload support itself in
02d3dc6869 without being used
and `git log -S:activity_type` and `git log -Sactivity_type:`
don't find any other commits using this.
			
			
This commit is contained in:
		
							parent
							
								
									0c2b33458d
								
							
						
					
					
						commit
						fbd961c747
					
				
					 1 changed files with 1 additions and 3 deletions
				
			
		| 
						 | 
				
			
			@ -13,7 +13,6 @@ defmodule Pleroma.Upload do
 | 
			
		|||
  * `:uploader`: override uploader
 | 
			
		||||
  * `:filters`: override filters
 | 
			
		||||
  * `:size_limit`: override size limit
 | 
			
		||||
  * `:activity_type`: override activity type
 | 
			
		||||
 | 
			
		||||
  The `%Pleroma.Upload{}` struct: all documented fields are meant to be overwritten in filters:
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -48,7 +47,6 @@ defmodule Pleroma.Upload do
 | 
			
		|||
  @type option ::
 | 
			
		||||
          {:type, :avatar | :banner | :background}
 | 
			
		||||
          | {:description, String.t()}
 | 
			
		||||
          | {:activity_type, String.t()}
 | 
			
		||||
          | {:size_limit, nil | non_neg_integer()}
 | 
			
		||||
          | {:uploader, module()}
 | 
			
		||||
          | {:filters, [module()]}
 | 
			
		||||
| 
						 | 
				
			
			@ -143,7 +141,7 @@ defp get_opts(opts) do
 | 
			
		|||
      end
 | 
			
		||||
 | 
			
		||||
    %{
 | 
			
		||||
      activity_type: Keyword.get(opts, :activity_type, activity_type),
 | 
			
		||||
      activity_type: activity_type,
 | 
			
		||||
      size_limit: Keyword.get(opts, :size_limit, size_limit),
 | 
			
		||||
      uploader: Keyword.get(opts, :uploader, Pleroma.Config.get([__MODULE__, :uploader])),
 | 
			
		||||
      filters:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue