From ec653dce717c87e2882fcb0245db773c6205f6cc Mon Sep 17 00:00:00 2001 From: evazion Date: Mon, 6 Feb 2017 02:23:51 -0600 Subject: [PATCH 1/9] app/presenters: remove unused forum_post/note/post_version presenters. --- app/models/forum_topic.rb | 4 ---- app/models/note.rb | 4 ---- app/models/post_version.rb | 4 ---- app/presenters/forum_topic_presenter.rb | 8 -------- app/presenters/note_presenter.rb | 9 --------- app/presenters/post_version_presenter.rb | 20 -------------------- 6 files changed, 49 deletions(-) delete mode 100644 app/presenters/forum_topic_presenter.rb delete mode 100644 app/presenters/note_presenter.rb delete mode 100644 app/presenters/post_version_presenter.rb diff --git a/app/models/forum_topic.rb b/app/models/forum_topic.rb index e63756190..d19a90c06 100644 --- a/app/models/forum_topic.rb +++ b/app/models/forum_topic.rb @@ -158,10 +158,6 @@ class ForumTopic < ActiveRecord::Base (response_count / Danbooru.config.posts_per_page.to_f).ceil end - def presenter(forum_posts) - @presenter ||= ForumTopicPresenter.new(self, forum_posts) - end - def as_json(options = {}) if CurrentUser.user.level < min_level options[:only] = [:id] diff --git a/app/models/note.rb b/app/models/note.rb index 54468aa40..06150fa0b 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -89,10 +89,6 @@ class Note < ActiveRecord::Base extend SearchMethods include ApiMethods - def presenter - @presenter ||= NotePresenter.new(self) - end - def initialize_creator self.creator_id = CurrentUser.id end diff --git a/app/models/post_version.rb b/app/models/post_version.rb index dc4a9f40b..e3c1be962 100644 --- a/app/models/post_version.rb +++ b/app/models/post_version.rb @@ -56,10 +56,6 @@ class PostVersion < ActiveRecord::Base @tag_array ||= tags.scan(/\S+/) end - def presenter - PostVersionPresenter.new(self) - end - def reload @tag_array = nil super diff --git a/app/presenters/forum_topic_presenter.rb b/app/presenters/forum_topic_presenter.rb deleted file mode 100644 index fd38877d5..000000000 --- a/app/presenters/forum_topic_presenter.rb +++ /dev/null @@ -1,8 +0,0 @@ -class ForumTopicPresenter < Presenter - attr_reader :forum_topic, :forum_posts - - def initialize(forum_topic, forum_posts) - @forum_posts = forum_posts - @forum_topic = forum_topic - end -end diff --git a/app/presenters/note_presenter.rb b/app/presenters/note_presenter.rb deleted file mode 100644 index f30297982..000000000 --- a/app/presenters/note_presenter.rb +++ /dev/null @@ -1,9 +0,0 @@ -class NotePresenter - def initialize(note) - @note = note - end - - def formatted_body - note.body.gsub(/(.+?)<\/tn>/m, '

\1

').gsub(/\n/, '
') - end -end diff --git a/app/presenters/post_version_presenter.rb b/app/presenters/post_version_presenter.rb deleted file mode 100644 index 714da7a5e..000000000 --- a/app/presenters/post_version_presenter.rb +++ /dev/null @@ -1,20 +0,0 @@ -class PostVersionPresenter < Presenter - attr_reader :post_version - - def initialize(post_version) - @post_version = post_version - end - - def changes - html = [] - html << post_version.tag_array - html << "source:#{h(post_version.source)}" if post_version.source - html << "rating:#{h(post_version.rating)}" if post_version.rating - html << "parent:#{post_version.parent_id}" if post_version.parent_id - html.join(" ").html_safe - end - - def updater_name - User.id_to_name(post_version.updater_id) - end -end From 4ded9c6b2a8a3f23d53223e7a4f90752ac915f17 Mon Sep 17 00:00:00 2001 From: evazion Date: Mon, 6 Feb 2017 17:41:10 -0600 Subject: [PATCH 2/9] app/helpers: remove unused helpers. --- app/helpers/bans_helper.rb | 2 -- app/helpers/comment_votes_helper.rb | 2 -- app/helpers/comments_helper.rb | 2 -- app/helpers/favorites_helper.rb | 2 -- app/helpers/forum_posts_helper.rb | 2 -- app/helpers/forum_topic_visits_helper.rb | 2 -- app/helpers/janitor_trials_helper.rb | 2 -- app/helpers/news_updates_helper.rb | 2 -- app/helpers/notes_helper.rb | 2 -- app/helpers/post_votes_helper.rb | 2 -- app/helpers/related_tags_helper.rb | 2 -- app/helpers/sessions_helper.rb | 2 -- app/helpers/tag_aliases_helper.rb | 2 -- app/helpers/tag_implications_helper.rb | 2 -- app/helpers/tag_subscriptions_helper.rb | 2 -- app/helpers/unapprovals_helper.rb | 2 -- app/helpers/uploads_helper.rb | 2 -- app/helpers/user_feedback_helper.rb | 2 -- 18 files changed, 36 deletions(-) delete mode 100644 app/helpers/bans_helper.rb delete mode 100644 app/helpers/comment_votes_helper.rb delete mode 100644 app/helpers/comments_helper.rb delete mode 100644 app/helpers/favorites_helper.rb delete mode 100644 app/helpers/forum_posts_helper.rb delete mode 100644 app/helpers/forum_topic_visits_helper.rb delete mode 100644 app/helpers/janitor_trials_helper.rb delete mode 100644 app/helpers/news_updates_helper.rb delete mode 100644 app/helpers/notes_helper.rb delete mode 100644 app/helpers/post_votes_helper.rb delete mode 100644 app/helpers/related_tags_helper.rb delete mode 100644 app/helpers/sessions_helper.rb delete mode 100644 app/helpers/tag_aliases_helper.rb delete mode 100644 app/helpers/tag_implications_helper.rb delete mode 100644 app/helpers/tag_subscriptions_helper.rb delete mode 100644 app/helpers/unapprovals_helper.rb delete mode 100644 app/helpers/uploads_helper.rb delete mode 100644 app/helpers/user_feedback_helper.rb diff --git a/app/helpers/bans_helper.rb b/app/helpers/bans_helper.rb deleted file mode 100644 index f867b03af..000000000 --- a/app/helpers/bans_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module BansHelper -end diff --git a/app/helpers/comment_votes_helper.rb b/app/helpers/comment_votes_helper.rb deleted file mode 100644 index 3a6d375a0..000000000 --- a/app/helpers/comment_votes_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module CommentVotesHelper -end diff --git a/app/helpers/comments_helper.rb b/app/helpers/comments_helper.rb deleted file mode 100644 index 0ec9ca5f2..000000000 --- a/app/helpers/comments_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module CommentsHelper -end diff --git a/app/helpers/favorites_helper.rb b/app/helpers/favorites_helper.rb deleted file mode 100644 index 4e9a95009..000000000 --- a/app/helpers/favorites_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module FavoritesHelper -end diff --git a/app/helpers/forum_posts_helper.rb b/app/helpers/forum_posts_helper.rb deleted file mode 100644 index 1352dcea1..000000000 --- a/app/helpers/forum_posts_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module ForumPostsHelper -end diff --git a/app/helpers/forum_topic_visits_helper.rb b/app/helpers/forum_topic_visits_helper.rb deleted file mode 100644 index adddd224a..000000000 --- a/app/helpers/forum_topic_visits_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module ForumTopicVisitsHelper -end diff --git a/app/helpers/janitor_trials_helper.rb b/app/helpers/janitor_trials_helper.rb deleted file mode 100644 index dc24fa5fb..000000000 --- a/app/helpers/janitor_trials_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module JanitorTrialsHelper -end diff --git a/app/helpers/news_updates_helper.rb b/app/helpers/news_updates_helper.rb deleted file mode 100644 index ad303a632..000000000 --- a/app/helpers/news_updates_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module NewsUpdatesHelper -end diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb deleted file mode 100644 index 8078f7303..000000000 --- a/app/helpers/notes_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module NotesHelper -end diff --git a/app/helpers/post_votes_helper.rb b/app/helpers/post_votes_helper.rb deleted file mode 100644 index 096e58950..000000000 --- a/app/helpers/post_votes_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module PostVotesHelper -end diff --git a/app/helpers/related_tags_helper.rb b/app/helpers/related_tags_helper.rb deleted file mode 100644 index 52d56005a..000000000 --- a/app/helpers/related_tags_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module RelatedTagsHelper -end diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb deleted file mode 100644 index 309f8b2eb..000000000 --- a/app/helpers/sessions_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module SessionsHelper -end diff --git a/app/helpers/tag_aliases_helper.rb b/app/helpers/tag_aliases_helper.rb deleted file mode 100644 index 7c9f51cf7..000000000 --- a/app/helpers/tag_aliases_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module TagAliasesHelper -end diff --git a/app/helpers/tag_implications_helper.rb b/app/helpers/tag_implications_helper.rb deleted file mode 100644 index 58b4f55f9..000000000 --- a/app/helpers/tag_implications_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module TagImplicationsHelper -end diff --git a/app/helpers/tag_subscriptions_helper.rb b/app/helpers/tag_subscriptions_helper.rb deleted file mode 100644 index b54ee4908..000000000 --- a/app/helpers/tag_subscriptions_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module TagSubscriptionsHelper -end diff --git a/app/helpers/unapprovals_helper.rb b/app/helpers/unapprovals_helper.rb deleted file mode 100644 index 34aa85164..000000000 --- a/app/helpers/unapprovals_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module UnapprovalsHelper -end diff --git a/app/helpers/uploads_helper.rb b/app/helpers/uploads_helper.rb deleted file mode 100644 index f4f8250f5..000000000 --- a/app/helpers/uploads_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module UploadsHelper -end diff --git a/app/helpers/user_feedback_helper.rb b/app/helpers/user_feedback_helper.rb deleted file mode 100644 index adea341b4..000000000 --- a/app/helpers/user_feedback_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module UserFeedbackHelper -end From 38355b4839e42414c892d09bfaadcbfe24e19fba Mon Sep 17 00:00:00 2001 From: evazion Date: Mon, 6 Feb 2017 02:37:43 -0600 Subject: [PATCH 3/9] posts_helper.rb: remove unused resize_image_links. Unused since 1ef7ef4. --- app/helpers/posts_helper.rb | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/app/helpers/posts_helper.rb b/app/helpers/posts_helper.rb index 5b13fdd98..3c1f997f4 100644 --- a/app/helpers/posts_helper.rb +++ b/app/helpers/posts_helper.rb @@ -40,24 +40,6 @@ module PostsHelper render("users/common_searches", user: user, sig: sig) end - def resize_image_links(post, user) - links = [] - - if post.has_large? - links << link_to("L", post.large_file_url, :id => "large-file-link") - end - - if post.has_large? - links << link_to("O", post.file_url, :id => "original-file-link") - end - - if links.any? - content_tag("span", raw("Resize: " + links.join(" "))) - else - nil - end - end - def post_source_tag(post) if post.source =~ %r!\Ahttp://img\d+\.pixiv\.net/img/([^\/]+)/!i text = "pixiv/#{wordbreakify($1)}".html_safe From 7e1f63de6a5935e25c888b33c602628d020c6fb3 Mon Sep 17 00:00:00 2001 From: evazion Date: Sun, 5 Feb 2017 16:42:39 -0600 Subject: [PATCH 4/9] landings_controller.rb: remove unused /landing route. Broken since PopularPostExplorer was removed in 7269ec0. --- .../stylesheets/specific/landing.css.scss | 44 ------------------- app/controllers/landings_controller.rb | 6 --- app/helpers/landings_helper.rb | 2 - config/routes.rb | 1 - 4 files changed, 53 deletions(-) delete mode 100644 app/assets/stylesheets/specific/landing.css.scss delete mode 100644 app/controllers/landings_controller.rb delete mode 100644 app/helpers/landings_helper.rb diff --git a/app/assets/stylesheets/specific/landing.css.scss b/app/assets/stylesheets/specific/landing.css.scss deleted file mode 100644 index d9de06b11..000000000 --- a/app/assets/stylesheets/specific/landing.css.scss +++ /dev/null @@ -1,44 +0,0 @@ -div#c-landings { - div#a-show { - padding-top: 4em; - width: 960px; - margin: auto; - - h1 { - text-align: center; - font-size: 4em; - } - - p.slogan { - text-align: center; - font-size: 1.5em; - font-weight: bold; - } - - div.column { - width: 480px; - vertical-align: top; - float: left; - background-color: #000; - } - - div.landing-post { - overflow: hidden; - } - - div.landing-post:hover img { - opacity: 0.25; - } - - div.landing-post:hover div.data { - opacity: 1.0; - } - - div.landing-post div.data { - position: absolute; - color: white; - padding: 5px; - cursor: pointer; - } - } -} \ No newline at end of file diff --git a/app/controllers/landings_controller.rb b/app/controllers/landings_controller.rb deleted file mode 100644 index b5cee9f90..000000000 --- a/app/controllers/landings_controller.rb +++ /dev/null @@ -1,6 +0,0 @@ -class LandingsController < ApplicationController - def show - @explorer = PopularPostExplorer.new - render :layout => "blank" - end -end diff --git a/app/helpers/landings_helper.rb b/app/helpers/landings_helper.rb deleted file mode 100644 index 121afc025..000000000 --- a/app/helpers/landings_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module LandingsHelper -end diff --git a/config/routes.rb b/config/routes.rb index 1deeef348..8f8150134 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -160,7 +160,6 @@ Rails.application.routes.draw do end end resources :jobs - resource :landing resources :mod_actions resources :news_updates resources :notes do From 23038de470e518523aaac15d33f78a73a6b204b9 Mon Sep 17 00:00:00 2001 From: evazion Date: Sun, 5 Feb 2017 18:23:47 -0600 Subject: [PATCH 5/9] posts_controller.rb: remove unused /posts/home action. Unused since a4911e3. --- app/controllers/posts_controller.rb | 8 -------- config/routes.rb | 1 - 2 files changed, 9 deletions(-) diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb index 95b35a4f3..0ddecd2f0 100644 --- a/app/controllers/posts_controller.rb +++ b/app/controllers/posts_controller.rb @@ -83,14 +83,6 @@ class PostsController < ApplicationController end end - def home - if CurrentUser.user.is_anonymous? - redirect_to intro_explore_posts_path - else - redirect_to posts_path(:tags => params[:tags]) - end - end - def random count = Post.fast_count(params[:tags], :statement_timeout => CurrentUser.user.statement_timeout) @post = Post.tag_match(params[:tags]).random diff --git a/config/routes.rb b/config/routes.rb index 8f8150134..387f0b572 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -196,7 +196,6 @@ Rails.application.routes.draw do end resource :votes, :controller => "post_votes", :only => [:create, :destroy] collection do - get :home get :random end member do From 74b8ebe5807f29f21ae77b7b8ea324c68cc5c715 Mon Sep 17 00:00:00 2001 From: evazion Date: Sun, 5 Feb 2017 16:44:44 -0600 Subject: [PATCH 6/9] tag.rb: remove unused find_suggestions, increment_view_count. find_suggestions unused since ca3e9bb. --- app/models/tag.rb | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/app/models/tag.rb b/app/models/tag.rb index 10d3754f2..445c001f2 100644 --- a/app/models/tag.rb +++ b/app/models/tag.rb @@ -79,12 +79,6 @@ class Tag < ActiveRecord::Base end end - module ViewCountMethods - def increment_view_count(name) - Cache.incr("tvc:#{Cache.sanitize(name)}") - end - end - module CategoryMethods module ClassMethods def categories @@ -694,20 +688,6 @@ class Tag < ActiveRecord::Base end end - module SuggestionMethods - def find_suggestions(query) - query_tokens = query.split(/_/) - - if query_tokens.size == 2 - search_for = query_tokens.reverse.join("_").to_escaped_for_sql_like - else - search_for = "%" + query.to_escaped_for_sql_like + "%" - end - - Tag.where(["name LIKE ? ESCAPE E'\\\\' AND post_count > 0 AND name <> ?", search_for, query]).order("post_count DESC").limit(6).select("name").map(&:name).sort - end - end - module SearchMethods def name_matches(name) where("tags.name LIKE ? ESCAPE E'\\\\'", name.mb_chars.downcase.to_escaped_for_sql_like) @@ -789,12 +769,10 @@ class Tag < ActiveRecord::Base include ApiMethods include CountMethods - extend ViewCountMethods include CategoryMethods extend StatisticsMethods extend NameMethods extend ParseMethods include RelationMethods - extend SuggestionMethods extend SearchMethods end From b5bf9b8678fed303b76ce248cb4c25e160f7dbbd Mon Sep 17 00:00:00 2001 From: evazion Date: Mon, 6 Feb 2017 06:10:33 -0600 Subject: [PATCH 7/9] post.rb: remove assorted unused methods. --- .../moderator/post/queues_controller.rb | 2 +- app/models/post.rb | 63 ------------------- 2 files changed, 1 insertion(+), 64 deletions(-) diff --git a/app/controllers/moderator/post/queues_controller.rb b/app/controllers/moderator/post/queues_controller.rb index 9e32d6aa5..06b80dd18 100644 --- a/app/controllers/moderator/post/queues_controller.rb +++ b/app/controllers/moderator/post/queues_controller.rb @@ -15,7 +15,7 @@ module Moderator end ::Post.without_timeout do - @posts = ::Post.order("posts.id asc").pending_or_flagged.available_for_moderation(params[:hidden]).search(:tag_match => params[:query]).paginate(params[:page], :limit => per_page) + @posts = ::Post.order("posts.id asc").pending_or_flagged.available_for_moderation(params[:hidden]).tag_match(params[:query]).paginate(params[:page], :limit => per_page) @posts.each # hack to force rails to eager load end respond_with(@posts) diff --git a/app/models/post.rb b/app/models/post.rb index 390bea960..70b191e9e 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -531,10 +531,6 @@ class Post < ActiveRecord::Base @tag_array_was ||= Tag.scan_tags(tag_string_was) end - def increment_tag_post_counts - Tag.where(:name => tag_array).update_all("post_count = post_count + 1") if tag_array.any? - end - def decrement_tag_post_counts Tag.where(:name => tag_array).update_all("post_count = post_count - 1") if tag_array.any? end @@ -1476,10 +1472,6 @@ class Post < ActiveRecord::Base end module NoteMethods - def last_noted_at_as_integer - last_noted_at.to_i - end - def has_notes? last_noted_at.present? end @@ -1616,10 +1608,6 @@ class Post < ActiveRecord::Base where("is_deleted = ?", true) end - def commented_before(date) - where("last_commented_at < ?", date).order("last_commented_at DESC") - end - def has_notes where("last_noted_at is not null") end @@ -1636,10 +1624,6 @@ class Post < ActiveRecord::Base end end - def hidden_from_moderation - where("id IN (SELECT pd.post_id FROM post_disapprovals pd WHERE pd.user_id = ?)", CurrentUser.id) - end - def raw_tag_match(tag) where("posts.tag_index @@ to_tsquery('danbooru', E?)", tag.to_escaped_for_tsquery) end @@ -1656,53 +1640,6 @@ class Post < ActiveRecord::Base PostQueryBuilder.new(query).build end end - - def positive - where("score > 1") - end - - def negative - where("score < -1") - end - - def updater_name_matches(name) - where("updater_id = (select _.id from users _ where lower(_.name) = ?)", name.mb_chars.downcase) - end - - def after_id(num) - if num.present? - where("id > ?", num.to_i).reorder("id asc") - else - where("true") - end - end - - def before_id(num) - if num.present? - where("id < ?", num.to_i).reorder("id desc") - else - where("true") - end - end - - def search(params) - q = where("true") - return q if params.blank? - - if params[:before_id].present? - q = q.before_id(params[:before_id].to_i) - end - - if params[:after_id].present? - q = q.after_id(params[:after_id].to_i) - end - - if params[:tag_match].present? - q = q.tag_match(params[:tag_match]) - end - - q - end end module PixivMethods From cf54cd14805bf9f80ae7c7177887c28fd5ed478c Mon Sep 17 00:00:00 2001 From: evazion Date: Mon, 6 Feb 2017 17:43:08 -0600 Subject: [PATCH 8/9] core_extensions.rb: remove unused String#to_escaped_js. --- config/initializers/core_extensions.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/config/initializers/core_extensions.rb b/config/initializers/core_extensions.rb index fcd3d4b0e..a19ed3011 100644 --- a/config/initializers/core_extensions.rb +++ b/config/initializers/core_extensions.rb @@ -12,10 +12,6 @@ module Danbooru def to_escaped_for_tsquery "'#{gsub(/\0/, '').gsub(/'/, '\0\0').gsub(/\\/, '\0\0\0\0')}'" end - - def to_escaped_js - return self.gsub(/\\/, '\0\0').gsub(/['"]/) {|m| "\\#{m}"}.gsub(/\r\n|\r|\n/, '\\n') - end end end end From 951e6d4b5f83aaac17fb87bd3e8282d0c58d227d Mon Sep 17 00:00:00 2001 From: evazion Date: Mon, 6 Feb 2017 17:41:37 -0600 Subject: [PATCH 9/9] Remove unused `arbitrary_sql_order_clause`. Unused since f87c71c. --- app/logical/post_sets/base.rb | 14 -------------- config/initializers/active_record_extensions.rb | 16 ---------------- 2 files changed, 30 deletions(-) diff --git a/app/logical/post_sets/base.rb b/app/logical/post_sets/base.rb index f9dc04ff9..1c965be70 100644 --- a/app/logical/post_sets/base.rb +++ b/app/logical/post_sets/base.rb @@ -39,19 +39,5 @@ module PostSets def presenter raise NotImplementedError end - - def arbitrary_sql_order_clause(ids, table_name) - if ids.empty? - return "#{table_name}.id desc" - end - - conditions = [] - - ids.each_with_index do |x, n| - conditions << "when #{x} then #{n}" - end - - "case #{table_name}.id " + conditions.join(" ") + " end" - end end end diff --git a/config/initializers/active_record_extensions.rb b/config/initializers/active_record_extensions.rb index 602ae6b88..360f558b0 100644 --- a/config/initializers/active_record_extensions.rb +++ b/config/initializers/active_record_extensions.rb @@ -33,22 +33,6 @@ module Danbooru connection.__send__(method_name, sanitize_sql_array([sql, *params])) end end - - def arbitrary_sql_order_clause(ids, table_name = nil) - table_name = self.class.table_name if table_name.nil? - - if ids.empty? - return "#{table_name}.id desc" - end - - conditions = [] - - ids.each_with_index do |x, n| - conditions << "when #{x} then #{n}" - end - - "case #{table_name}.id " + conditions.join(" ") + " end" - end end end end