From da2b6dda6a2fc9e4706ad3dfdff68a8762e73df5 Mon Sep 17 00:00:00 2001 From: kibigo! Date: Thu, 22 Jun 2017 21:10:02 -0700 Subject: [PATCH] This is a better way of detecting frontends --- app/controllers/home_controller.rb | 2 +- config/initializers/frontends.rb | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 config/initializers/frontends.rb diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index a526e25ece..ad2b8273f0 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -9,7 +9,7 @@ class HomeController < ApplicationController @web_settings = Web::Setting.find_by(user: current_user)&.data || {} @admin = Account.find_local(Setting.site_contact_username) @streaming_api_base_url = Rails.configuration.x.streaming_api_base_url - @frontend = (params[:frontend] and Rails.root.join('app', 'javascript', 'packs', 'frontends', '#{params[:frontend]}.js')) ? params[:frontend] : 'mastodon' + @frontend = (params[:frontend] and Rails.configuration.x.available_frontends.include? params[:frontend] + '.js') ? params[:frontend] : 'mastodon' end private diff --git a/config/initializers/frontends.rb b/config/initializers/frontends.rb new file mode 100644 index 0000000000..2cb68cc61a --- /dev/null +++ b/config/initializers/frontends.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +Rails.application.configure do + frontends = [] + Rails.root.join('app', 'javascript', 'packs', 'frontends').each_child(false) { |f| frontends.push f.to_s } + config.x.available_frontends = frontends +end