From e28a9555353b6284603542b36fd9c4b5480c7dde Mon Sep 17 00:00:00 2001 From: evazion Date: Tue, 7 Jan 2020 19:35:57 -0600 Subject: [PATCH] config: remove unneeded config options. --- app/views/posts/partials/show/_notices.html.erb | 5 +++-- config/danbooru_default_config.rb | 11 ----------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/app/views/posts/partials/show/_notices.html.erb b/app/views/posts/partials/show/_notices.html.erb index 0abd1e76e..fdae42eb5 100644 --- a/app/views/posts/partials/show/_notices.html.erb +++ b/app/views/posts/partials/show/_notices.html.erb @@ -23,8 +23,9 @@ <%= render "post_disapprovals/counts", :disapprovals => post.disapprovals, :post => post %> - <% if CurrentUser.id == post.uploader_id && Danbooru.config.upload_feedback_topic.present? %> -

If you don't understand why your uploads keep getting deleted, you should ask on the <%= link_to "forum", forum_topic_path(Danbooru.config.upload_feedback_topic) %> for advice.

+ <% if CurrentUser.id == post.uploader_id %> +

If you don't understand why your upload was deleted, you can ask for + advice in the Upload Feedback Thread on the forum.

<% end %> <% end %> diff --git a/config/danbooru_default_config.rb b/config/danbooru_default_config.rb index 9cb4b0e44..e3ac485b2 100644 --- a/config/danbooru_default_config.rb +++ b/config/danbooru_default_config.rb @@ -53,10 +53,6 @@ module Danbooru "DanbooruBot" end - def upload_feedback_topic - ForumTopic.where(title: "Upload Feedback Thread").first - end - # The ID of the "Curated" pool. If present, this pool will be updated daily with curated posts. def curated_pool_id nil @@ -192,13 +188,6 @@ module Danbooru Socket.gethostname end - # Names of all Danbooru servers which serve out of the same common database. - # Used in conjunction with load balancing to distribute files from one server to - # the others. This should match whatever gethostname returns on the other servers. - def all_server_hosts - [server_host] - end - # The method to use for storing image files. def storage_manager # Store files on the local filesystem.