diff --git a/app/controllers/saved_searches_controller.rb b/app/controllers/saved_searches_controller.rb index 40fd3e2d5..32337ec91 100644 --- a/app/controllers/saved_searches_controller.rb +++ b/app/controllers/saved_searches_controller.rb @@ -1,5 +1,4 @@ class SavedSearchesController < ApplicationController - before_action :check_availability respond_to :html, :xml, :json, :js def index @@ -39,12 +38,6 @@ class SavedSearchesController < ApplicationController CurrentUser.user.saved_searches end - def check_availability - if !SavedSearch.enabled? - raise NotImplementedError.new("Saved searches are not available.") - end - end - def saved_search_params params.fetch(:saved_search, {}).permit(%i[query label_string disable_labels]) end diff --git a/app/logical/post_query_builder.rb b/app/logical/post_query_builder.rb index 84906269d..d28d05407 100644 --- a/app/logical/post_query_builder.rb +++ b/app/logical/post_query_builder.rb @@ -69,17 +69,15 @@ class PostQueryBuilder end def add_saved_search_relation(saved_searches, relation) - if SavedSearch.enabled? - saved_searches.each do |saved_search| - if saved_search == "all" - post_ids = SavedSearch.post_ids_for(CurrentUser.id) - else - post_ids = SavedSearch.post_ids_for(CurrentUser.id, label: saved_search) - end - - post_ids = [0] if post_ids.empty? - relation = relation.where("posts.id": post_ids) + saved_searches.each do |saved_search| + if saved_search == "all" + post_ids = SavedSearch.post_ids_for(CurrentUser.id) + else + post_ids = SavedSearch.post_ids_for(CurrentUser.id, label: saved_search) end + + post_ids = [0] if post_ids.empty? + relation = relation.where("posts.id": post_ids) end relation diff --git a/app/models/saved_search.rb b/app/models/saved_search.rb index 6c48cecc3..c83d357dc 100644 --- a/app/models/saved_search.rb +++ b/app/models/saved_search.rb @@ -2,10 +2,6 @@ class SavedSearch < ApplicationRecord REDIS_EXPIRY = 1.hour QUERY_LIMIT = 1000 - def self.enabled? - Danbooru.config.redis_url.present? - end - concerning :Redis do extend Memoist diff --git a/app/models/tag_alias.rb b/app/models/tag_alias.rb index 40424c1af..ad3fe6b90 100644 --- a/app/models/tag_alias.rb +++ b/app/models/tag_alias.rb @@ -95,11 +95,9 @@ class TagAlias < TagRelationship def move_saved_searches escaped = Regexp.escape(antecedent_name) - if SavedSearch.enabled? - SavedSearch.where("query like ?", "%#{antecedent_name}%").find_each do |ss| - ss.query = ss.query.sub(/(?:^| )#{escaped}(?:$| )/, " #{consequent_name} ").strip.gsub(/ /, " ") - ss.save - end + SavedSearch.where("query like ?", "%#{antecedent_name}%").find_each do |ss| + ss.query = ss.query.sub(/(?:^| )#{escaped}(?:$| )/, " #{consequent_name} ").strip.gsub(/ /, " ") + ss.save end end diff --git a/app/views/posts/partials/index/_options.html.erb b/app/views/posts/partials/index/_options.html.erb index d6e8b1fbf..bd0b653c6 100644 --- a/app/views/posts/partials/index/_options.html.erb +++ b/app/views/posts/partials/index/_options.html.erb @@ -1,7 +1,7 @@

Options

diff --git a/app/views/saved_searches/_interface.html.erb b/app/views/saved_searches/_interface.html.erb index 2687767ec..422db5381 100644 --- a/app/views/saved_searches/_interface.html.erb +++ b/app/views/saved_searches/_interface.html.erb @@ -1,10 +1,8 @@ -<% if SavedSearch.enabled? %> - diff --git a/test/functional/saved_searches_controller_test.rb b/test/functional/saved_searches_controller_test.rb index acd9c6b21..52c5fe30c 100644 --- a/test/functional/saved_searches_controller_test.rb +++ b/test/functional/saved_searches_controller_test.rb @@ -3,7 +3,6 @@ require 'test_helper' class SavedSearchesControllerTest < ActionDispatch::IntegrationTest context "The saved searches controller" do setup do - SavedSearch.stubs(:enabled?).returns(true) @user = create(:user) as_user do @saved_search = create(:saved_search, user: @user) diff --git a/test/test_helper.rb b/test/test_helper.rb index 7790ea0e7..739db00d9 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -61,7 +61,6 @@ class ActiveSupport::TestCase include ReportbooruHelper include DownloadTestHelper include IqdbTestHelper - include SavedSearchTestHelper include UploadTestHelper include TestHelpers diff --git a/test/test_helpers/saved_search_test_helper.rb b/test/test_helpers/saved_search_test_helper.rb deleted file mode 100644 index ff924732a..000000000 --- a/test/test_helpers/saved_search_test_helper.rb +++ /dev/null @@ -1,5 +0,0 @@ -module SavedSearchTestHelper - def mock_saved_search_service! - SavedSearch.stubs(:enabled?).returns(true) - end -end diff --git a/test/unit/post_test.rb b/test/unit/post_test.rb index 94ce84970..d94ebc64f 100644 --- a/test/unit/post_test.rb +++ b/test/unit/post_test.rb @@ -2256,7 +2256,6 @@ class PostTest < ActiveSupport::TestCase context "saved searches" do setup do - SavedSearch.stubs(:enabled?).returns(true) @post1 = FactoryBot.create(:post, tag_string: "aaa") @post2 = FactoryBot.create(:post, tag_string: "bbb") FactoryBot.create(:saved_search, query: "aaa", labels: ["zzz"], user: CurrentUser.user) diff --git a/test/unit/tag_alias_test.rb b/test/unit/tag_alias_test.rb index 069ddaa77..a2cf40c26 100644 --- a/test/unit/tag_alias_test.rb +++ b/test/unit/tag_alias_test.rb @@ -126,10 +126,6 @@ class TagAliasTest < ActiveSupport::TestCase end context "saved searches" do - setup do - SavedSearch.stubs(:enabled?).returns(true) - end - should "move saved searches" do tag1 = FactoryBot.create(:tag, :name => "...") tag2 = FactoryBot.create(:tag, :name => "bbb")