smarter updates on saved searches on tag batch changes #2674

app/logical/moderator/tag_batch_change.rb

@@ -20,9 +20,11 @@ module Moderator
             post.update_attributes(:tag_string => tags)
           end
 
-          escaped = Regexp.escape(antecedent)
-          SavedSearch.where("tag_query like ?", "%#{antecedent}%").find_each do |ss|
-            ss.tag_query = ss.tag_query.sub(/(?:^| )#{escaped}(?:$| )/, " #{consequent} ").strip.gsub(/  /, " ")
+          tags = Tag.scan_tags(antecedent, :strip_metatags => true)
+          conds = tags.map {|x| "tag_query like ?"}.join(" AND ")
+          conds = [conds, *tags.map {|x| "%#{x}%"}]
+          SavedSearch.where(*conds).find_each do |ss|
+            ss.tag_query = (ss.tag_query_array - tags + antecedent).uniq.join(" ")
             ss.save
           end
 

app/models/saved_search.rb

@@ -152,4 +152,8 @@ class SavedSearch < ActiveRecord::Base
       user.update_attribute(:has_saved_searches, false)
     end
   end
+
+  def tag_query_array
+    Tag.scan_tags(tag_query)
+  end
 end

app/models/tag.rb

@@ -236,10 +236,14 @@ class Tag < ActiveRecord::Base
       list + tagstr.gsub(/-?source:".*?"/, "").scan(/\S+/).uniq
     end
 
-    def scan_tags(tags)
+    def scan_tags(tags, options = {})
       tagstr = normalize(tags)
       list = tagstr.scan(/source:".*?"/) || []
-      list + tagstr.gsub(/source:".*?"/, "").gsub(/[%,]/, "").scan(/\S+/).uniq
+      list += tagstr.gsub(/source:".*?"/, "").gsub(/[%,]/, "").scan(/\S+/).uniq
+      if options[:strip_metatags]
+        list = list.map {|x| x.sub(/^[-~]/, "")}
+      end
+      list
     end
 
     def parse_cast(object, type)