From 8f0e4398ebf35bc6775f01345cecfdfa570c9d49 Mon Sep 17 00:00:00 2001
From: BrokenEagle <BrokenEagle98@gmail.com>
Date: Tue, 2 Jan 2018 18:53:51 -0800
Subject: [PATCH] Fix metatags being treated as normal tags

- Add parent metatag defaults any and none
- Add missing user-based metatags to user source
- Remove all negative metatags since the prior code strips the '-'
---
 app/assets/javascripts/autocomplete.js.erb | 43 +++++++++++++++-------
 1 file changed, 30 insertions(+), 13 deletions(-)

diff --git a/app/assets/javascripts/autocomplete.js.erb b/app/assets/javascripts/autocomplete.js.erb
index 71f823251..3ed2b660c 100644
--- a/app/assets/javascripts/autocomplete.js.erb
+++ b/app/assets/javascripts/autocomplete.js.erb
@@ -95,9 +95,7 @@
     var $fields_single = $('[data-autocomplete="tag"]');
 
     var prefixes = "-|~|" + "<%= TagCategory.mapping.keys.map {|category| category + ':'}.join('|') %>";
-    var metatags = "order|-status|status|-rating|rating|-locked|locked|child|filetype|-filetype|" +
-      "-user|user|-approver|approver|commenter|comm|noter|noteupdater|artcomm|-fav|fav|ordfav|" +
-      "-pool|pool|ordpool|favgroup|-search|search";
+    var metatags = "<%= Tag::METATAGS %>";
 
     $fields_multiple.autocomplete({
       delay: 100,
@@ -150,16 +148,34 @@
         }
 
         switch(metatag) {
+        case "md5":
+        case "width":
+        case "height":
+        case "mpixels":
+        case "ratio":
+        case "score":
+        case "favcount":
+        case "filesize":
+        case "source":
+        case "id":
+        case "date":
+        case "age":
+        case "limit":
+        case "tagcount":
+        case "pixiv_id":
+        case "pixiv":
+        <% TagCategory.short_name_list.each do |category| %>
+          case "<%= category %>tags":
+        <% end %>
+          return;
+
         case "order":
         case "status":
-        case "-status":
         case "rating":
-        case "-rating":
         case "locked":
-        case "-locked":
         case "child":
+        case "parent":
         case "filetype":
-        case "-filetype":
           Danbooru.Autocomplete.static_metatag_source(term, resp, metatag);
           return;
         }
@@ -170,30 +186,28 @@
 
         switch(metatag) {
         case "user":
-        case "-user":
         case "approver":
-        case "-approver":
         case "commenter":
         case "comm":
         case "noter":
         case "noteupdater":
         case "artcomm":
         case "fav":
-        case "-fav":
         case "ordfav":
+        case "appealer":
+        case "flagger":
+        case "upvote":
+        case "downvote":
           Danbooru.Autocomplete.user_source(term, resp, metatag);
           break;
         case "pool":
-        case "-pool":
         case "ordpool":
           Danbooru.Autocomplete.pool_source(term, resp, metatag);
           break;
         case "favgroup":
-        case "-favgroup":
           Danbooru.Autocomplete.favorite_group_source(term, resp, metatag);
           break;
         case "search":
-        case "-search":
           Danbooru.Autocomplete.saved_search_source(term, resp);
           break;
         default:
@@ -341,6 +355,9 @@
     child: [
       "any", "none"
     ],
+    parent: [
+      "any", "none"
+    ],
     filetype: [
       "jpg", "png", "gif", "swf", "zip", "webm", "mp4"
     ],