* Redesign public profiles * Responsive design * Change public profile status filtering defaults and add options - No longer displays private/direct toots even if you are permitted access - By default omits replies - "With replies" option - "Media only" option * Redesign account grid cards * Fix style issues
		
			
				
	
	
		
			70 lines
		
	
	
		
			2.0 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			70 lines
		
	
	
		
			2.0 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
| # frozen_string_literal: true
 | |
| 
 | |
| class AccountsController < ApplicationController
 | |
|   include AccountControllerConcern
 | |
|   include SignatureVerification
 | |
| 
 | |
|   def show
 | |
|     respond_to do |format|
 | |
|       format.html do
 | |
|         if current_account && @account.blocking?(current_account)
 | |
|           @statuses = []
 | |
|           return
 | |
|         end
 | |
| 
 | |
|         @statuses = filtered_statuses.paginate_by_max_id(20, params[:max_id], params[:since_id])
 | |
|         @statuses = cache_collection(@statuses, Status)
 | |
|         @next_url = next_url unless @statuses.empty?
 | |
|       end
 | |
| 
 | |
|       format.atom do
 | |
|         @entries = @account.stream_entries.where(hidden: false).with_includes.paginate_by_max_id(20, params[:max_id], params[:since_id])
 | |
|         render xml: OStatus::AtomSerializer.render(OStatus::AtomSerializer.new.feed(@account, @entries.to_a))
 | |
|       end
 | |
| 
 | |
|       format.json do
 | |
|         render json: @account, serializer: ActivityPub::ActorSerializer, adapter: ActivityPub::Adapter, content_type: 'application/activity+json'
 | |
|       end
 | |
|     end
 | |
|   end
 | |
| 
 | |
|   private
 | |
| 
 | |
|   def filtered_statuses
 | |
|     default_statuses.tap do |statuses|
 | |
|       statuses.merge!(only_media_scope) if request.path.ends_with?('/media')
 | |
|       statuses.merge!(no_replies_scope) unless request.path.ends_with?('/with_replies')
 | |
|     end
 | |
|   end
 | |
| 
 | |
|   def default_statuses
 | |
|     @account.statuses.where(visibility: [:public, :unlisted])
 | |
|   end
 | |
| 
 | |
|   def only_media_scope
 | |
|     Status.where(id: account_media_status_ids)
 | |
|   end
 | |
| 
 | |
|   def account_media_status_ids
 | |
|     @account.media_attachments.attached.reorder(nil).select(:status_id).distinct
 | |
|   end
 | |
| 
 | |
|   def no_replies_scope
 | |
|     Status.without_replies
 | |
|   end
 | |
| 
 | |
|   def set_account
 | |
|     @account = Account.find_local!(params[:username])
 | |
|   end
 | |
| 
 | |
|   def next_url
 | |
|     if request.path.ends_with?('/media')
 | |
|       short_account_media_url(@account, max_id: @statuses.last.id)
 | |
|     elsif request.path.ends_with?('/with_replies')
 | |
|       short_account_with_replies_url(@account, max_id: @statuses.last.id)
 | |
|     else
 | |
|       short_account_url(@account, max_id: @statuses.last.id)
 | |
|     end
 | |
|   end
 | |
| end
 |