about summary refs log tree commit diff
path: root/lib
diff options
context:
space:
mode:
authorNick Schonning <nschonni@gmail.com>2023-02-08 04:38:07 -0500
committerGitHub <noreply@github.com>2023-02-08 10:38:07 +0100
commit11557d1c5a4ecb44cf602eabf0c9bd2882514b3a (patch)
tree88715a67db7139ec104892900ecf425d276b72f3 /lib
parent0d1f192c54ab65a4a1c938553e5d87be65a966e8 (diff)
Apply Rubocop Rails/RootPublicPath (#23447)
Diffstat (limited to 'lib')
-rw-r--r--lib/mastodon/premailer_webpack_strategy.rb2
-rw-r--r--lib/tasks/assets.rake2
-rw-r--r--lib/tasks/branding.rake4
-rw-r--r--lib/tasks/emojis.rake6
4 files changed, 7 insertions, 7 deletions
diff --git a/lib/mastodon/premailer_webpack_strategy.rb b/lib/mastodon/premailer_webpack_strategy.rb
index 56ef09c1a..4356b7285 100644
--- a/lib/mastodon/premailer_webpack_strategy.rb
+++ b/lib/mastodon/premailer_webpack_strategy.rb
@@ -13,7 +13,7 @@ module PremailerWebpackStrategy
             HTTP.get(url).to_s
           else
             url = url[1..-1] if url.start_with?('/')
-            File.read(Rails.root.join('public', url))
+            File.read(Rails.public_path.join(url))
           end
 
     css.gsub(/url\(\//, "url(#{asset_host}/")
diff --git a/lib/tasks/assets.rake b/lib/tasks/assets.rake
index b642510a1..1d2270572 100644
--- a/lib/tasks/assets.rake
+++ b/lib/tasks/assets.rake
@@ -8,7 +8,7 @@ end
 namespace :assets do
   desc 'Generate static pages'
   task generate_static_pages: :environment do
-    render_static_page 'errors/500', layout: 'error', dest: Rails.root.join('public', 'assets', '500.html')
+    render_static_page 'errors/500', layout: 'error', dest: Rails.public_path.join('assets', '500.html')
   end
 end
 
diff --git a/lib/tasks/branding.rake b/lib/tasks/branding.rake
index 2eec7c9e1..d1c1c9ded 100644
--- a/lib/tasks/branding.rake
+++ b/lib/tasks/branding.rake
@@ -54,7 +54,7 @@ namespace :branding do
       rsvg_convert.run(size: size, input: favicon_source, output: output_path)
     end
 
-    convert.run(input: favicons, output: Rails.root.join('public', 'favicon.ico'))
+    convert.run(input: favicons, output: Rails.public_path.join('favicon.ico'))
 
     apple_icon_sizes.each do |size|
       rsvg_convert.run(size: size, input: app_icon_source, output: output_dest.join("apple-touch-icon-#{size}x#{size}.png"))
@@ -69,7 +69,7 @@ namespace :branding do
   task generate_app_badge: :environment do
     rsvg_convert = Terrapin::CommandLine.new('rsvg-convert', '--stylesheet :stylesheet -w :size -h :size --keep-aspect-ratio :input -o :output')
     badge_source = Rails.root.join('app', 'javascript', 'images', 'logo-symbol-icon.svg')
-    output_dest  = Rails.root.join('public')
+    output_dest  = Rails.public_path
     stylesheet   = Rails.root.join('lib', 'assets', 'wordmark.light.css')
 
     rsvg_convert.run(stylesheet: stylesheet, input: badge_source, size: 192, output: output_dest.join('badge.png'))
diff --git a/lib/tasks/emojis.rake b/lib/tasks/emojis.rake
index 473aee9cc..02d772b48 100644
--- a/lib/tasks/emojis.rake
+++ b/lib/tasks/emojis.rake
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 def gen_border(codepoint, color)
-  input = Rails.root.join('public', 'emoji', "#{codepoint}.svg")
-  dest = Rails.root.join('public', 'emoji', "#{codepoint}_border.svg")
+  input = Rails.public_path.join('emoji', "#{codepoint}.svg")
+  dest = Rails.public_path.join('emoji', "#{codepoint}_border.svg")
   doc = File.open(input) { |f| Nokogiri::XML(f) }
   svg = doc.at_css('svg')
   if svg.key?('viewBox')
@@ -69,7 +69,7 @@ namespace :emojis do
       end
     end
 
-    existence_maps = grouped_codes.map { |c| c.index_with { |cc| File.exist?(Rails.root.join('public', 'emoji', "#{codepoints_to_filename(cc)}.svg")) } }
+    existence_maps = grouped_codes.map { |c| c.index_with { |cc| File.exist?(Rails.public_path.join('emoji', "#{codepoints_to_filename(cc)}.svg")) } }
     map = {}
 
     existence_maps.each do |group|