Conflicts: - app/controllers/admin/base_controller.rb Some refactoring made upstream, no real conflict. - app/javascript/mastodon/features/compose/components/compose_form.js Updated using upstream's code but using maxChars instead of the hardcoded length of 500 characters per toot. - app/javascript/styles/mastodon/components.scss Upstream redesigned the onboarding modal. Not sure why we had a conflict there.
		
			
				
	
	
		
			49 lines
		
	
	
		
			907 B
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			49 lines
		
	
	
		
			907 B
		
	
	
	
		
			Ruby
		
	
	
	
	
	
| # frozen_string_literal: true
 | |
| 
 | |
| class DirectoriesController < ApplicationController
 | |
|   layout 'public'
 | |
| 
 | |
|   before_action :check_enabled
 | |
|   before_action :set_instance_presenter
 | |
|   before_action :set_tag, only: :show
 | |
|   before_action :set_tags
 | |
|   before_action :set_accounts
 | |
|   before_action :set_pack
 | |
| 
 | |
|   def index
 | |
|     render :index
 | |
|   end
 | |
| 
 | |
|   def show
 | |
|     render :index
 | |
|   end
 | |
| 
 | |
|   private
 | |
| 
 | |
|   def set_pack
 | |
|     use_pack 'share'
 | |
|   end
 | |
| 
 | |
|   def check_enabled
 | |
|     return not_found unless Setting.profile_directory
 | |
|   end
 | |
| 
 | |
|   def set_tag
 | |
|     @tag = Tag.discoverable.find_by!(name: params[:id].downcase)
 | |
|   end
 | |
| 
 | |
|   def set_tags
 | |
|     @tags = Tag.discoverable.limit(30)
 | |
|   end
 | |
| 
 | |
|   def set_accounts
 | |
|     @accounts = Account.discoverable.page(params[:page]).per(30).tap do |query|
 | |
|       query.merge!(Account.tagged_with(@tag.id)) if @tag
 | |
|     end
 | |
|   end
 | |
| 
 | |
|   def set_instance_presenter
 | |
|     @instance_presenter = InstancePresenter.new
 | |
|   end
 | |
| end
 |