jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

config: fix references to Danbooru.config.app_name.

Browse Source 
Danbooru.config.app_name is either Safebooru or Danbooru. Fix some
places where it should always be Danbooru.
This commit is contained in:
evazion
2019-12-06 00:53:39 -06:00
parent 06078ef172
commit 0c483cad15
5 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/user_upgrades_helper.rb
View File

@@ -8,7 +8,7 @@ module UserUpgradesHelper
<script <script
src="https://checkout.stripe.com/checkout.js" class="stripe-button" src="https://checkout.stripe.com/checkout.js" class="stripe-button"
data-key="#{Danbooru.config.stripe_publishable_key}" data-key="#{Danbooru.config.stripe_publishable_key}"
data-name="#{Danbooru.config.app_name}" data-name="#{Danbooru.config.canonical_app_name}"
data-description="#{desc}" data-description="#{desc}"
data-label="#{desc}" data-label="#{desc}"
data-amount="#{cost}"> data-amount="#{cost}">

2
app/logical/cloudflare_service.rb
View File

@@ -17,7 +17,7 @@ class CloudflareService
Danbooru.config.httparty_options.deep_merge(headers: { Danbooru.config.httparty_options.deep_merge(headers: {
"Authorization" => "Bearer #{api_token}", "Authorization" => "Bearer #{api_token}",
"Content-Type" => "application/json", "Content-Type" => "application/json",
"User-Agent" => "#{Danbooru.config.app_name}/#{Rails.application.config.x.git_hash}" "User-Agent" => "#{Danbooru.config.canonical_app_name}/#{Rails.application.config.x.git_hash}"
}) })
end end

2
app/views/posts/partials/index/_posts.html.erb
View File

@@ -14,7 +14,7 @@
<% end %> <% end %>
<% if post_set.safe_posts.present? %> <% if post_set.safe_posts.present? %>
<%= post_set.safe_posts.size %> post(s) on this page were hidden by safe mode (<%= Danbooru.config.app_name %>). Go to <%= link_to "Danbooru", "https://danbooru.donmai.us" %> or disable safe mode to view (<%= link_to_wiki "learn more", "help:user_settings" %>).<br> <%= post_set.safe_posts.size %> post(s) on this page were hidden by safe mode. Go to <%= link_to "Danbooru", "https://danbooru.donmai.us" %> or disable safe mode to view them (<%= link_to_wiki "learn more", "help:user_settings" %>).<br>
<% end %> <% end %>
</div> </div>
<% end %> <% end %>

2
app/views/posts/partials/show/_embedded.html.erb
View File

@@ -3,7 +3,7 @@
<% elsif post.levelblocked? -%> <% elsif post.levelblocked? -%>
<p><%= link_to("You need a gold account to see this image", new_user_upgrade_path) %>.</p> <p><%= link_to("You need a gold account to see this image", new_user_upgrade_path) %>.</p>
<% elsif post.safeblocked? -%> <% elsif post.safeblocked? -%>
<p>This image is unavailable on safe mode (<%= Danbooru.config.app_name %>). Go to <%= link_to("Danbooru", "https://danbooru.donmai.us") %> or disable safe mode to view (<%= link_to_wiki "learn more", "help:user_settings" %>).</p> <p>This image is unavailable on <%= Danbooru.config.app_name %>. Go to <%= link_to("Danbooru", "https://danbooru.donmai.us") %> or disable safe mode to view (<%= link_to_wiki "learn more", "help:user_settings" %>).</p>
<% elsif post.is_flash? -%> <% elsif post.is_flash? -%>
<%= render("posts/partials/show/flash", post: post) -%> <%= render("posts/partials/show/flash", post: post) -%>
<% elsif post.is_video? -%> <% elsif post.is_video? -%>

6
config/danbooru_default_config.rb
View File

@@ -9,6 +9,10 @@ module Danbooru
end end
end end
def canonical_app_name
"Danbooru"
end
def description def description
"Find good anime art fast" "Find good anime art fast"
end end
@@ -451,7 +455,7 @@ module Danbooru
# services will fail if you don't set a valid User-Agent. # services will fail if you don't set a valid User-Agent.
def http_headers def http_headers
{ {
"User-Agent" => "#{Danbooru.config.app_name}/#{Rails.application.config.x.git_hash}", "User-Agent" => "#{Danbooru.config.canonical_app_name}/#{Rails.application.config.x.git_hash}",
} }
end end