From 5a05961bde37d32048165c3e3b086cd7a925b108 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Fri, 12 Oct 2018 21:18:15 -0500
Subject: [PATCH 1/8] related tags: factor partials out from post, upload edit
 forms.

---
 app/views/posts/partials/show/_edit.html.erb | 12 ++----------
 app/views/related_tags/_buttons.html.erb     |  5 +++++
 app/views/related_tags/_container.html.erb   |  5 +++++
 app/views/uploads/new.html.erb               | 12 ++----------
 4 files changed, 14 insertions(+), 20 deletions(-)
 create mode 100644 app/views/related_tags/_buttons.html.erb
 create mode 100644 app/views/related_tags/_container.html.erb

diff --git a/app/views/posts/partials/show/_edit.html.erb b/app/views/posts/partials/show/_edit.html.erb
index c838e2ecd..c2123c752 100644
--- a/app/views/posts/partials/show/_edit.html.erb
+++ b/app/views/posts/partials/show/_edit.html.erb
@@ -82,20 +82,12 @@
       <span id="open-edit-dialog" class="ui-icon ui-icon-arrow-1-ne" title="detach" style="display: none;" data-shortcut="shift+e"/>
     </div>
 
-    <%= button_tag "Related tags", :id => "related-tags-button", :type => "button", :class => "ui-button ui-widget ui-corner-all sub gradient" %>
-
-    <% TagCategory.related_button_list.each do |category| %>
-      <%= button_tag "#{TagCategory.related_button_mapping[category]}", :id => "related-#{category}-button", :type => "button", :class => "ui-button ui-widget ui-corner-all sub gradient" %>
-    <% end %>
+    <%= render "related_tags/buttons" %>
   </div>
 
   <div class="input">
     <%= submit_tag "Submit", :class => "ui-button ui-widget ui-corner-all" %>
   </div>
 
-  <div id="related-tags-container">
-    <h1>Related Tags <a href="#" id="toggle-related-tags-link" style="display: none;">&laquo;</a></h1>
-    <div id="related-tags" class="related-tags">
-    </div>
-  </div>
+  <%= render "related_tags/container" %>
 <% end %>
diff --git a/app/views/related_tags/_buttons.html.erb b/app/views/related_tags/_buttons.html.erb
new file mode 100644
index 000000000..ce9e7e787
--- /dev/null
+++ b/app/views/related_tags/_buttons.html.erb
@@ -0,0 +1,5 @@
+<%= button_tag "Related tags", :id => "related-tags-button", :type => "button", :class => "ui-button ui-widget ui-corner-all sub gradient" %>
+
+<% TagCategory.related_button_list.each do |category| %>
+  <%= button_tag "#{TagCategory.related_button_mapping[category]}", :id => "related-#{category}-button", :type => "button", :class => "ui-button ui-widget ui-corner-all sub gradient" %>
+<% end %>
diff --git a/app/views/related_tags/_container.html.erb b/app/views/related_tags/_container.html.erb
new file mode 100644
index 000000000..0a4f2c2cd
--- /dev/null
+++ b/app/views/related_tags/_container.html.erb
@@ -0,0 +1,5 @@
+<div id="related-tags-container">
+  <h1>Related Tags <a href="#" id="toggle-related-tags-link" style="display: none;">&laquo;</a></h1>
+  <div id="related-tags" class="related-tags">
+  </div>
+</div>
diff --git a/app/views/uploads/new.html.erb b/app/views/uploads/new.html.erb
index 314735a67..09e3d52e2 100644
--- a/app/views/uploads/new.html.erb
+++ b/app/views/uploads/new.html.erb
@@ -97,22 +97,14 @@
             <span id="open-edit-dialog" class="ui-icon ui-icon-arrow-1-ne" title="detach" style="display: none;" data-shortcut="shift+e"/>
           </div>
 
-          <%= button_tag "Related tags", :id => "related-tags-button", :type => "button", :class => "ui-button ui-widget ui-corner-all sub gradient" %>
-
-          <% TagCategory.related_button_list.each do |category| %>
-            <%= button_tag "#{TagCategory.related_button_mapping[category]}", :id => "related-#{category}-button", :type => "button", :class => "ui-button ui-widget ui-corner-all sub gradient" %>
-          <% end %>
+          <%= render "related_tags/buttons" %>
         </div>
 
         <div class="input">
           <%= submit_tag "Submit", :id => "submit-button", :class => "large ui-button ui-widget ui-corner-all gradient", data: {disable_with: false} %>
         </div>
 
-        <div id="related-tags-container">
-          <h1>Related Tags <a href="#" id="toggle-related-tags-link" style="display: none;">&laquo;</a></h1>
-          <div id="related-tags" class="related-tags">
-          </div>
-        </div>
+        <%= render "related_tags/container" %>
       <% end %>
     <% else %>
       <h2 style="margin-bottom: 1em;">You <%= CurrentUser.user.upload_limited_reason %></h2>

From 4e2944ee062343934fc1b5a51dccdcabfc81629a Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Fri, 12 Oct 2018 21:18:15 -0500
Subject: [PATCH 2/8] related tags: build html server-side instead of
 client-side.

---
 app/controllers/artist_urls_controller.rb     |   2 +-
 app/controllers/related_tags_controller.rb    |   5 +-
 app/javascript/src/javascripts/posts.js.erb   |  18 +-
 .../src/javascripts/related_tag.js.erb        | 273 +++---------------
 .../src/styles/specific/related_tags.scss     |   6 +-
 app/logical/related_tag_query.rb              |  30 +-
 app/views/artist_urls/update.js.erb           |   1 +
 app/views/related_tags/_buttons.html.erb      |   4 +-
 app/views/related_tags/_container.html.erb    |  12 +-
 app/views/related_tags/_related_tags.html.erb |  40 +++
 app/views/related_tags/_tag_column.html.erb   |   8 +
 app/views/related_tags/show.js.erb            |   2 +
 app/views/sources/show.js.erb                 |   4 +-
 13 files changed, 134 insertions(+), 271 deletions(-)
 create mode 100644 app/views/artist_urls/update.js.erb
 create mode 100644 app/views/related_tags/_related_tags.html.erb
 create mode 100644 app/views/related_tags/_tag_column.html.erb
 create mode 100644 app/views/related_tags/show.js.erb

diff --git a/app/controllers/artist_urls_controller.rb b/app/controllers/artist_urls_controller.rb
index cd3c97e54..2b2ba419e 100644
--- a/app/controllers/artist_urls_controller.rb
+++ b/app/controllers/artist_urls_controller.rb
@@ -1,5 +1,5 @@
 class ArtistUrlsController < ApplicationController
-  respond_to :json, :xml, :html
+  respond_to :js, :json, :xml, :html
   before_action :member_only, except: [:index]
 
   def index
diff --git a/app/controllers/related_tags_controller.rb b/app/controllers/related_tags_controller.rb
index 8acd30756..6697aa81b 100644
--- a/app/controllers/related_tags_controller.rb
+++ b/app/controllers/related_tags_controller.rb
@@ -1,10 +1,9 @@
 class RelatedTagsController < ApplicationController
-  respond_to :json
-  respond_to :html, :only=>[:show]
+  respond_to :json, :xml, :js, :html, except: [:update]
   before_action :require_reportbooru_key, only: [:update]
 
   def show
-    @query = RelatedTagQuery.new(params[:query].to_s.downcase, params[:category])
+    @query = RelatedTagQuery.new(params[:query], category: params[:category], translated_tags: params[:translated_tags], artists: params[:artists])
     respond_with(@query) do |format|
       format.json do
         render :json => @query.to_json
diff --git a/app/javascript/src/javascripts/posts.js.erb b/app/javascript/src/javascripts/posts.js.erb
index 795c23e87..777c99fdb 100644
--- a/app/javascript/src/javascripts/posts.js.erb
+++ b/app/javascript/src/javascripts/posts.js.erb
@@ -2,7 +2,6 @@
 
 import Utility from './utility'
 import Hammer from 'hammerjs'
-import RelatedTag from './related_tag.js.erb'
 import Cookie from './cookie'
 import Note from './notes'
 import SavedSearch from './saved_searches'
@@ -85,11 +84,6 @@ Post.initialize_edit_dialog = function() {
     Post.open_edit_dialog();
     e.preventDefault();
   });
-
-  $("#toggle-related-tags-link").on("click.danbooru", function(e) {
-    RelatedTag.toggle();
-    e.preventDefault();
-  });
 }
 
 Post.open_edit_dialog = function() {
@@ -102,14 +96,11 @@ Post.open_edit_dialog = function() {
   $("#share").hide();
   $("#post-sections li").removeClass("active");
   $("#post-edit-link").parent("li").addClass("active");
-  $("#related-tags-container").show();
 
   var $tag_string = $("#post_tag_string,#upload_tag_string");
   $("div.input").has($tag_string).prevAll().hide();
   $("#open-edit-dialog").hide();
 
-  $("#toggle-related-tags-link").show().click();
-
   var dialog = $("<div/>").attr("id", "edit-dialog");
   $("#form").appendTo(dialog);
   dialog.dialog({
@@ -161,17 +152,19 @@ Post.open_edit_dialog = function() {
 
   $tag_string.css({"resize": "none", "width": "100%"});
   $tag_string.focus().selectEnd().height($tag_string[0].scrollHeight);
+
+  $(document).trigger("danbooru:show-post-edit-form");
+  $(document).trigger("danbooru:open-post-edit-dialog");
 }
 
 Post.close_edit_dialog = function(e, ui) {
   $("#form").appendTo($("#c-posts #edit,#c-uploads #a-new"));
   $("#edit-dialog").remove();
-  RelatedTag.show();
-  $("#toggle-related-tags-link").hide();
   var $tag_string = $("#post_tag_string,#upload_tag_string");
   $("div.input").has($tag_string).prevAll().show();
   $("#open-edit-dialog").show();
   $tag_string.css({"resize": "", "width": ""});
+  $(document).trigger("danbooru:close-post-edit-dialog");
 }
 
 Post.initialize_similar = function() {
@@ -439,9 +432,8 @@ Post.initialize_post_sections = function() {
       $("#comments").hide();
       $("#share").hide();
       $("#post_tag_string").focus().selectEnd().height($("#post_tag_string")[0].scrollHeight);
-      $("#related-tags-button").trigger("click");
-      $("#fetch-data-manual").trigger("click");
       $("#recommended").hide();
+      $(document).trigger("danbooru:show-post-edit-form");
     } else if (e.target.hash === "#recommended") {
       $("#comments").hide();
       $("#edit").hide();
diff --git a/app/javascript/src/javascripts/related_tag.js.erb b/app/javascript/src/javascripts/related_tag.js.erb
index 85980c60e..85b749722 100644
--- a/app/javascript/src/javascripts/related_tag.js.erb
+++ b/app/javascript/src/javascripts/related_tag.js.erb
@@ -1,22 +1,18 @@
-import Upload from './uploads';
 import Utility from './utility';
-import Cookie from './cookie';
 
 let RelatedTag = {};
 
 RelatedTag.initialize_all = function() {
-  if ($("#c-posts #a-show").length || $("#c-uploads #a-new").length) {
-    this.initialize_buttons();
-    $("#upload_tag_string,#post_tag_string").on("keyup.danbooru.relatedTags", RelatedTag.update_selected);
-    $("#related-tags-container").on("click.danbooru", "#artist-related-tags-column a.del", RelatedTag.disable_artist_url)
-  }
-}
-
-RelatedTag.initialize_buttons = function() {
-  this.common_bind("#related-tags-button", "");
-  <% TagCategory.related_button_list.each do |category| %>
-    RelatedTag.common_bind("#related-<%= category %>-button", "<%= category %>"); // eslint-disable-line indent
-  <% end %>
+  RelatedTag.artists = [];
+  RelatedTag.translated_tags  = [];
+  $(document).on("click.danbooru", ".related-tags-button", RelatedTag.on_click_related_tags_button);
+  $(document).on("click.danbooru", ".related-tags a.search-tag", RelatedTag.toggle_tag);
+  $(document).on("click.danbooru", "#show-related-tags-link, #hide-related-tags-link", RelatedTag.toggle);
+  $(document).on("keyup.danbooru.relatedTags", "#upload_tag_string, #post_tag_string", RelatedTag.update_selected);
+  $(document).on("danbooru:update-source-data", RelatedTag.on_update_source_data);
+  $(document).on("danbooru:show-post-edit-form", RelatedTag.on_show_post_edit_form);
+  $(document).on("danbooru:open-post-edit-dialog", RelatedTag.on_open_post_edit_dialog);
+  $(document).on("danbooru:close-post-edit-dialog", RelatedTag.on_close_post_edit_dialog);
 }
 
 RelatedTag.tags_include = function(name) {
@@ -24,20 +20,40 @@ RelatedTag.tags_include = function(name) {
   return $.inArray(name.toLowerCase(), current) > -1;
 }
 
-RelatedTag.common_bind = function(button_name, category) {
-  $(button_name).on("click.danbooru", function(e) {
-    var $dest = $("#related-tags");
-    $dest.empty();
-    RelatedTag.build_recent_and_frequent($dest);
-    $dest.append("<em>Loading...</em>");
-    $.get("/related_tag.json", {
-      "query": RelatedTag.current_tag(),
-      "category": category
-    }, RelatedTag.process_response);
-    e.preventDefault();
+RelatedTag.update_related_tags = function (category = "") {
+  $.get("/related_tag.js", {
+    "query": RelatedTag.current_tag(),
+    "category": category,
+    "translated_tags": RelatedTag.translated_tags.join(" "),
+    "artists": RelatedTag.artists.join(" "),
   });
 }
 
+RelatedTag.on_open_post_edit_dialog = function(event) {
+  $("#related-tags-container").removeClass("visible").addClass("hidden");
+}
+
+RelatedTag.on_close_post_edit_dialog = function(event) {
+  $("#related-tags-container").removeClass("hidden").addClass("visible");
+}
+
+RelatedTag.on_show_post_edit_form = function(event) {
+  RelatedTag.update_related_tags();
+  $("#fetch-data-manual").click();
+}
+
+RelatedTag.on_click_related_tags_button = function (event) {
+  const category = $(event.target).data("category");
+  RelatedTag.update_related_tags(category);
+  $("#related-tags-container").removeClass("hidden").addClass("visible");
+}
+
+RelatedTag.on_update_source_data = function (event, source) {
+  Danbooru.RelatedTag.artists = source.artists.map(artist => artist.name);
+  Danbooru.RelatedTag.translated_tags = source.translated_tags.map(tag => tag[0]);
+  RelatedTag.update_related_tags();
+}
+
 RelatedTag.current_tag = function() {
   // 1. abc def |  -> def
   // 2. abc def|   -> def
@@ -86,11 +102,6 @@ RelatedTag.current_tag = function() {
   return string.slice(a, b);
 }
 
-RelatedTag.process_response = function(data) {
-  RelatedTag.recent_search = data;
-  RelatedTag.build_all();
-}
-
 RelatedTag.update_selected = function(e) {
   var current_tags = $("#upload_tag_string,#post_tag_string").val().toLowerCase().match(/\S+/g) || [];
   var $all_tags = $("#related-tags a");
@@ -103,165 +114,6 @@ RelatedTag.update_selected = function(e) {
   });
 }
 
-RelatedTag.build_all = function() {
-  if (RelatedTag.recent_search === null || RelatedTag.recent_search === undefined) {
-    return;
-  }
-
-  RelatedTag.show();
-
-  var query = RelatedTag.recent_search.query;
-  var related_tags = RelatedTag.recent_search.tags;
-  var wiki_page_tags = RelatedTag.recent_search.wiki_page_tags;
-  var other_wikis = RelatedTag.recent_search.other_wikis;
-  var $dest = $("#related-tags");
-  $dest.empty();
-
-  this.build_recent_and_frequent($dest);
-
-  $dest.append(this.build_html(query, related_tags, "general"));
-  this.build_translated($dest);
-  if (wiki_page_tags.length) {
-    $dest.append(RelatedTag.build_html("wiki:" + query, wiki_page_tags, "wiki"));
-  }
-  $.each(other_wikis, function(i, wiki) {
-    $dest.append(RelatedTag.build_html("wiki:" + wiki.title, wiki.wiki_page_tags, "otherwiki" + i.toString()));
-  });
-  if (RelatedTag.recent_artists) {
-    var tags = [];
-    if (RelatedTag.recent_artists.length === 0) {
-      tags.push([" none", 0]);
-    } else if (RelatedTag.recent_artists.length === 1) {
-      tags.push([RelatedTag.recent_artists[0].name, 1]);
-      if (RelatedTag.recent_artists[0].is_banned === true) {
-        tags.push(["BANNED_ARTIST", "banned"]);
-      }
-      $.each(RelatedTag.recent_artists[0].sorted_urls, function(i, url) {
-        var x = url.url;
-        if (!url.is_active) {
-          x = "-" + x;
-        }
-        tags.push([" " + x, 0]);
-      });
-    } else if (RelatedTag.recent_artists.length >= 10) {
-      tags.push([" none", 0]);
-    } else {
-      $.each(RelatedTag.recent_artists, function(i, artist) {
-        tags.push([artist.name, 1]);
-      });
-    }
-    $dest.append(RelatedTag.build_html("artist", tags, "artist", true));
-  }
-}
-
-RelatedTag.build_recent_and_frequent = function($dest) {
-  var recent_tags = Cookie.get("recent_tags_with_categories");
-  var favorite_tags = Cookie.get("favorite_tags_with_categories");
-  if (recent_tags.length) {
-    $dest.append(this.build_html("recent", this.other_tags(recent_tags), "recent"));
-  }
-  if (favorite_tags.length) {
-    $dest.append(this.build_html("frequent", this.other_tags(favorite_tags), "frequent"));
-  }
-}
-
-RelatedTag.other_tags = function(string) {
-  if (string && string.length) {
-    return $.map(string.match(/\S+ \d+/g), function(x, i) {
-      var submatch = x.match(/(\S+) (\d+)/);
-      return [[submatch[1], submatch[2]]];
-    });
-  } else {
-    return [];
-  }
-}
-
-RelatedTag.build_translated = function($dest) {
-  if (RelatedTag.translated_tags && RelatedTag.translated_tags.length) {
-    $dest.append(this.build_html("Translated Tags", RelatedTag.translated_tags, "translated"));
-  }
-}
-
-RelatedTag.build_html = function(query, related_tags, name, is_wide_column) {
-  if (query === null || query === "") {
-    return "";
-  }
-
-  query = query.replace(/_/g, " ");
-  var header = $("<em/>");
-
-  var match = query.match(/^wiki:(.+)/);
-  if (match) {
-    header.html($("<a/>").attr("href", "/wiki_pages?title=" + encodeURIComponent(match[1])).attr("target", "_blank").text(query));
-  } else {
-    header.text(query);
-  }
-
-  var $div = $("<div/>");
-  $div.attr("id", name + "-related-tags-column");
-  $div.addClass("tag-column");
-  if (is_wide_column) {
-    $div.addClass("wide-column");
-  }
-  var $ul = $("<ul/>");
-  $ul.append(
-    $("<li/>").append(
-      header
-    )
-  );
-
-  $.each(related_tags, function(i, tag) {
-    if (tag[0][0] !== " ") {
-      var $link = $("<a/>");
-      $link.text(tag[0].replace(/_/g, " "));
-      $link.addClass("tag-type-" + tag[1]);
-      $link.attr("href", "/posts?tags=" + encodeURIComponent(tag[0]));
-      $link.on("click.danbooru", RelatedTag.toggle_tag);
-      if (RelatedTag.tags_include(tag[0])) {
-        $link.addClass("selected");
-      }
-      $ul.append(
-        $("<li/>").append($link)
-      );
-    } else {
-      var text = tag[0];
-      var desc = "";
-      if (text.match(/^ -http/)) {
-        text = text.substring(1, 1000);
-        desc = text.replace(/^-https?:\/\//, "");
-        if (desc.length > 30) {
-          desc = desc.substring(0, 30) + "...";
-        }
-        $ul.append(
-          $("<li>").append(
-            $("<del>").text(desc)
-          )
-        );
-      } else if (text.match(/^ http/)) {
-        text = text.substring(1, 1000);
-        desc = text.replace(/^https?:\/\//, "");
-        if (desc.length > 30) {
-          desc = desc.substring(0, 30) + "...";
-        }
-        $ul.append(
-          $("<li>").append([
-            $("<a>").text(desc).attr("href", text).attr("target", "_blank"),
-            " ",
-            $("<a>").attr("href", text).addClass("del").append(
-              $("<i>").addClass("fas fa-minus-circle")
-            )
-          ])
-        );
-      } else {
-        $ul.append($("<li/>").text(text));
-      }
-    }
-  });
-
-  $div.append($ul);
-  return $div;
-}
-
 RelatedTag.toggle_tag = function(e) {
   var $field = $("#upload_tag_string,#post_tag_string");
   var tag = $(e.target).html().replace(/ /g, "_").replace(/&gt;/g, ">").replace(/&lt;/g, "<").replace(/&amp;/g, "&");
@@ -281,46 +133,9 @@ RelatedTag.toggle_tag = function(e) {
   e.preventDefault();
 }
 
-RelatedTag.toggle = function() {
-  if ($("#related-tags").is(":visible")) {
-    RelatedTag.hide();
-  } else {
-    RelatedTag.show();
-    $("#related-tags-button").trigger("click");
-    $("#find-artist-button").trigger("click");
-  }
-}
-
-RelatedTag.show = function() {
-  $("#related-tags").show()
-  $("#toggle-related-tags-link").text("«");
-  $("#edit-dialog").height("auto");
-}
-
-RelatedTag.hide = function() {
-  $("#related-tags").hide();
-  $("#toggle-related-tags-link").text("»");
-}
-
-RelatedTag.disable_artist_url = function(e) {
-  var url = e.currentTarget.href;
-  $.each(RelatedTag.recent_artists[0].sorted_urls, function(k, v) {
-    if (v.normalized_url === url || v.url === url) {
-      if (!confirm("This will mark the URL as inactive. Continue?")) {
-        return;
-      }
-
-      $.ajax("/artist_urls/" + v.id, {
-        method: "PUT",
-        data: {
-          artist_url: {
-            is_active: false
-          }
-        }
-      }).done(Upload.fetch_data_manual);
-    }
-  });
-  return false;
+RelatedTag.toggle = function(e) {
+  $("#related-tags-container").toggleClass("visible hidden");
+  e.preventDefault();
 }
 
 $(function() {
diff --git a/app/javascript/src/styles/specific/related_tags.scss b/app/javascript/src/styles/specific/related_tags.scss
index 245cac83c..4b79288a2 100644
--- a/app/javascript/src/styles/specific/related_tags.scss
+++ b/app/javascript/src/styles/specific/related_tags.scss
@@ -3,8 +3,10 @@
 div#related-tags-container {
   padding-right: 2em;
 
-  h1 {
-    font-size: $h3_size;
+  &.visible a#show-related-tags-link,
+  &.hidden a#hide-related-tags-link,
+  &.hidden div.related-tags {
+    display: none;
   }
 }
 
diff --git a/app/logical/related_tag_query.rb b/app/logical/related_tag_query.rb
index eb33a31d0..aab5dec39 100644
--- a/app/logical/related_tag_query.rb
+++ b/app/logical/related_tag_query.rb
@@ -1,9 +1,16 @@
 class RelatedTagQuery
-  attr_reader :query, :category
+  attr_reader :query, :category, :translated_tags, :artists
 
-  def initialize(query, category = nil)
-    @query = TagAlias.to_aliased(query.strip).join(" ")
+  def initialize(query, category: nil, translated_tags: nil, artists: nil);
+    @query = TagAlias.to_aliased(query.to_s.downcase.strip).join(" ")
     @category = category
+    @translated_tags = translated_tags.to_s.split
+    @artists = Artist.where(name: artists.to_s.split)
+    @artists = [Artist.find_by(name: "banned_artist")] + @artists if @artists.any?(&:is_banned?)
+  end
+
+  def pretty_name
+    query.tr("_", " ")
   end
 
   def tags
@@ -27,17 +34,12 @@ class RelatedTagQuery
   end
 
   def other_wiki_category_tags
-    if Tag.category_for(query) != Tag.categories.copyright
-      return []
-    end
-    listtags = (wiki_page.try(:tags) || []).select {|name| name =~ /^list_of_/i }
-    results = listtags.map do |name|
-      listlinks = WikiPage.titled(name).first.try(:tags) || []
-      if listlinks.length > 0
-        {"title" => name, "wiki_page_tags" => map_with_category_data(listlinks)}
-      end
-    end
-    results.reject {|list| list.nil?}
+    return [] unless Tag.category_for(query) == Tag.categories.copyright
+
+    other_wikis = wiki_page&.tags.to_a.grep(/^list_of_/i)
+    other_wikis = other_wikis.map { |name| WikiPage.titled(name).first }
+    other_wikis = other_wikis.select { |wiki| wiki.tags.present? }
+    other_wikis
   end
 
   def tags_for_html
diff --git a/app/views/artist_urls/update.js.erb b/app/views/artist_urls/update.js.erb
new file mode 100644
index 000000000..cd1fe1b32
--- /dev/null
+++ b/app/views/artist_urls/update.js.erb
@@ -0,0 +1 @@
+Danbooru.Upload.fetch_data_manual();
diff --git a/app/views/related_tags/_buttons.html.erb b/app/views/related_tags/_buttons.html.erb
index ce9e7e787..badddebaa 100644
--- a/app/views/related_tags/_buttons.html.erb
+++ b/app/views/related_tags/_buttons.html.erb
@@ -1,5 +1,5 @@
-<%= button_tag "Related tags", :id => "related-tags-button", :type => "button", :class => "ui-button ui-widget ui-corner-all sub gradient" %>
+<%= button_tag "Related tags", type: :button, id: "related-tags-button", class: "related-tags-button ui-button ui-widget ui-corner-all sub gradient" %>
 
 <% TagCategory.related_button_list.each do |category| %>
-  <%= button_tag "#{TagCategory.related_button_mapping[category]}", :id => "related-#{category}-button", :type => "button", :class => "ui-button ui-widget ui-corner-all sub gradient" %>
+  <%= button_tag TagCategory.related_button_mapping[category], type: :button, "data-category": category, class: "related-tags-button ui-button ui-widget ui-corner-all sub gradient" %>
 <% end %>
diff --git a/app/views/related_tags/_container.html.erb b/app/views/related_tags/_container.html.erb
index 0a4f2c2cd..085843ce0 100644
--- a/app/views/related_tags/_container.html.erb
+++ b/app/views/related_tags/_container.html.erb
@@ -1,5 +1,9 @@
-<div id="related-tags-container">
-  <h1>Related Tags <a href="#" id="toggle-related-tags-link" style="display: none;">&laquo;</a></h1>
-  <div id="related-tags" class="related-tags">
-  </div>
+<div id="related-tags-container" class="visible">
+  <h3>
+    Related Tags
+    <a href="#" id="show-related-tags-link">»</a>
+    <a href="#" id="hide-related-tags-link">«</a>
+  </h3>
+
+  <%= render "related_tags/related_tags" %>
 </div>
diff --git a/app/views/related_tags/_related_tags.html.erb b/app/views/related_tags/_related_tags.html.erb
new file mode 100644
index 000000000..66c208060
--- /dev/null
+++ b/app/views/related_tags/_related_tags.html.erb
@@ -0,0 +1,40 @@
+<%# related_tags %>
+
+<div id="related-tags" class="related-tags">
+  <% if local_assigns[:related_tags] %>
+    <%= render "tag_column", tags: cookies[:recent_tags].to_s.split, title: "Recent" %>
+    <%= render "tag_column", tags: cookies[:favorite_tags].to_s.split, title: "Frequent" %>
+    <%= render "tag_column", tags: related_tags.tags, class: "general-related-tags-column", title: related_tags.pretty_name %>
+    <%= render "tag_column", tags: related_tags.translated_tags, title: "Translated Tags" %>
+    <%= render "tag_column", tags: related_tags.wiki_page_tags, class: "wiki-related-tags-column", title: link_to("wiki:#{related_tags.pretty_name}", show_or_new_wiki_pages_path(title: related_tags.query)) %>
+
+    <% related_tags.other_wiki_category_tags.each do |wiki| %>
+      <%= render "tag_column", tags: wiki.tags, class: "other-wiki-related-tags-column", title: link_to("wiki:#{wiki.pretty_title}", show_or_new_wiki_pages_path(title: wiki.title)) %>
+    <% end %>
+
+    <div class="tag-column wide-column artist-related-tags-column">
+      <h6>Artist</h6>
+
+      <% if related_tags.artists.size == 0 %>
+        none
+      <% else %>
+        <% related_tags.artists.each do |artist| %>
+          <%= TagSetPresenter.new([artist.name]).tag_list_html(name_only: true) %>
+
+          <ul>
+            <% artist.sorted_urls.each do |url| %>
+              <li>
+                <% if url.is_active %>
+                  <%= external_link_to url.url, truncate: 30 %>
+                  <%= link_to tag.i(class: "fas fa-minus-circle"), artist_url_path(id: url.id, artist_url: { is_active: false }), remote: true, method: :put, "data-confirm": "This will mark the URL as inactive. Continue?" %>
+                <% else %>
+                  <del><%= truncate(url.url, length: 30) %></del>
+                <% end %>
+              </li>
+            <% end %>
+          </ul>
+        <% end %>
+      <% end %>
+    </div>
+  <% end %>
+</div>
diff --git a/app/views/related_tags/_tag_column.html.erb b/app/views/related_tags/_tag_column.html.erb
new file mode 100644
index 000000000..fc8735177
--- /dev/null
+++ b/app/views/related_tags/_tag_column.html.erb
@@ -0,0 +1,8 @@
+<%# tags, title, class (optional) %>
+
+<% if tags.present? %>
+  <div class="tag-column <%= local_assigns[:class] || "#{title.parameterize}-related-tags-column" %>">
+    <h6><%= title %></h6>
+    <%= TagSetPresenter.new(tags).tag_list_html(name_only: true) %>
+  </div>
+<% end %>
diff --git a/app/views/related_tags/show.js.erb b/app/views/related_tags/show.js.erb
new file mode 100644
index 000000000..16b576469
--- /dev/null
+++ b/app/views/related_tags/show.js.erb
@@ -0,0 +1,2 @@
+$("div#related-tags").replaceWith("<%= j render "related_tags", related_tags: @query %>");
+Danbooru.RelatedTag.update_selected();
diff --git a/app/views/sources/show.js.erb b/app/views/sources/show.js.erb
index 518fa65ca..e28aec967 100644
--- a/app/views/sources/show.js.erb
+++ b/app/views/sources/show.js.erb
@@ -1,8 +1,6 @@
 $("#source-info").replaceWith("<%= j render "info", source: @source %>");
 
-Danbooru.RelatedTag.recent_artists = <%= raw @source.artists.to_json(include: :sorted_urls) %>;
-Danbooru.RelatedTag.translated_tags = <%= raw @source.translated_tags.to_json %>;
-Danbooru.RelatedTag.build_all();
+$(document).trigger("danbooru:update-source-data", <%= raw @source.to_json %>);
 
 if ($("#c-uploads #a-new").length) {
   $("#upload_artist_commentary_title").val(<%= raw @source.dtext_artist_commentary_title.to_json %>);

From ae52b487e8a87f067af3b87f76c15f16075ff93c Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Fri, 12 Oct 2018 21:18:15 -0500
Subject: [PATCH 3/8] related tags: eliminate favorite_tags cookie (#3955).

---
 app/controllers/related_tags_controller.rb    | 2 +-
 app/controllers/users_controller.rb           | 2 --
 app/logical/related_tag_query.rb              | 9 +++++++--
 app/logical/session_loader.rb                 | 9 ---------
 app/views/related_tags/_related_tags.html.erb | 2 +-
 5 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/app/controllers/related_tags_controller.rb b/app/controllers/related_tags_controller.rb
index 6697aa81b..bf820b55e 100644
--- a/app/controllers/related_tags_controller.rb
+++ b/app/controllers/related_tags_controller.rb
@@ -3,7 +3,7 @@ class RelatedTagsController < ApplicationController
   before_action :require_reportbooru_key, only: [:update]
 
   def show
-    @query = RelatedTagQuery.new(params[:query], category: params[:category], translated_tags: params[:translated_tags], artists: params[:artists])
+    @query = RelatedTagQuery.new(params[:query], category: params[:category], translated_tags: params[:translated_tags], artists: params[:artists], user: CurrentUser.user)
     respond_with(@query) do |format|
       format.json do
         render :json => @query.to_json
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index f796cec7d..d23892c4f 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -65,8 +65,6 @@ class UsersController < ApplicationController
     @user = User.find(params[:id])
     check_privilege(@user)
     @user.update(user_params(:update))
-    cookies.delete(:favorite_tags)
-    cookies.delete(:favorite_tags_with_categories)
     if @user.errors.any?
       flash[:notice] = @user.errors.full_messages.join("; ")
     else
diff --git a/app/logical/related_tag_query.rb b/app/logical/related_tag_query.rb
index aab5dec39..1464c23bf 100644
--- a/app/logical/related_tag_query.rb
+++ b/app/logical/related_tag_query.rb
@@ -1,7 +1,8 @@
 class RelatedTagQuery
-  attr_reader :query, :category, :translated_tags, :artists
+  attr_reader :query, :category, :translated_tags, :artists, :user
 
-  def initialize(query, category: nil, translated_tags: nil, artists: nil);
+  def initialize(query, category: nil, translated_tags: nil, artists: nil, user: nil)
+    @user = user
     @query = TagAlias.to_aliased(query.to_s.downcase.strip).join(" ")
     @category = category
     @translated_tags = translated_tags.to_s.split
@@ -25,6 +26,10 @@ class RelatedTagQuery
     end
   end
 
+  def favorite_tags
+    user&.favorite_tags.to_s.split
+  end
+
   def wiki_page_tags
     results = wiki_page.try(:tags) || []
     results.reject! do |name|
diff --git a/app/logical/session_loader.rb b/app/logical/session_loader.rb
index 2e9ec2257..a2903b0d8 100644
--- a/app/logical/session_loader.rb
+++ b/app/logical/session_loader.rb
@@ -28,7 +28,6 @@ class SessionLoader
     update_last_logged_in_at
     update_last_ip_addr
     set_time_zone
-    store_favorite_tags_in_cookies
     CurrentUser.user.unban! if CurrentUser.user.ban_expired?
   end
 
@@ -92,14 +91,6 @@ private
     cookies[:password_hash] && cookies.signed[:user_name] && User.authenticate_cookie_hash(cookies.signed[:user_name], cookies[:password_hash])
   end
 
-  def store_favorite_tags_in_cookies
-    if (cookies[:favorite_tags].blank? || cookies[:favorite_tags_with_categories].blank?) && CurrentUser.user.favorite_tags.present?
-      favorite_tags = CurrentUser.user.favorite_tags.slice(0, 1024)
-      cookies[:favorite_tags] = favorite_tags
-      cookies[:favorite_tags_with_categories] = Tag.categories_for(favorite_tags.split(/[[:space:]]+/)).to_a.flatten.join(" ")
-    end
-  end
-
   def update_last_logged_in_at
     return if CurrentUser.is_anonymous?
     return if CurrentUser.last_logged_in_at && CurrentUser.last_logged_in_at > 1.week.ago
diff --git a/app/views/related_tags/_related_tags.html.erb b/app/views/related_tags/_related_tags.html.erb
index 66c208060..7ebb38e94 100644
--- a/app/views/related_tags/_related_tags.html.erb
+++ b/app/views/related_tags/_related_tags.html.erb
@@ -3,7 +3,7 @@
 <div id="related-tags" class="related-tags">
   <% if local_assigns[:related_tags] %>
     <%= render "tag_column", tags: cookies[:recent_tags].to_s.split, title: "Recent" %>
-    <%= render "tag_column", tags: cookies[:favorite_tags].to_s.split, title: "Frequent" %>
+    <%= render "tag_column", tags: related_tags.favorite_tags, title: "Frequent" %>
     <%= render "tag_column", tags: related_tags.tags, class: "general-related-tags-column", title: related_tags.pretty_name %>
     <%= render "tag_column", tags: related_tags.translated_tags, title: "Translated Tags" %>
     <%= render "tag_column", tags: related_tags.wiki_page_tags, class: "wiki-related-tags-column", title: link_to("wiki:#{related_tags.pretty_name}", show_or_new_wiki_pages_path(title: related_tags.query)) %>

From d536f7550521c49312fb7b785e5c73c8c8f35d6b Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Fri, 12 Oct 2018 21:18:15 -0500
Subject: [PATCH 4/8] related tags: eliminate recent_tags cookie (#3955).

---
 app/controllers/posts_controller.rb           | 10 ----------
 app/controllers/uploads_controller.rb         | 10 ----------
 app/logical/related_tag_query.rb              | 11 +++++++++++
 app/views/related_tags/_related_tags.html.erb |  2 +-
 4 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 3e9fd8e62..5fca85ba8 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -46,7 +46,6 @@ class PostsController < ApplicationController
     @post = Post.find(params[:id])
 
     @post.update(post_params) if @post.visible?
-    save_recent_tags
     respond_with_post_after_update(@post)
   end
 
@@ -96,15 +95,6 @@ private
     params[:tags] || (params[:post] && params[:post][:tags])
   end
 
-  def save_recent_tags
-    if @post
-      tags = Tag.scan_tags(@post.tag_string)
-      tags = (TagAlias.to_aliased(tags) + Tag.scan_tags(cookies[:recent_tags])).uniq.slice(0, 30)
-      cookies[:recent_tags] = tags.join(" ")
-      cookies[:recent_tags_with_categories] = Tag.categories_for(tags).to_a.flatten.join(" ")
-    end
-  end
-
   def respond_with_post_after_update(post)
     respond_with(post) do |format|
       format.html do
diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb
index 5af7fa47e..e70bb60e8 100644
--- a/app/controllers/uploads_controller.rb
+++ b/app/controllers/uploads_controller.rb
@@ -58,21 +58,11 @@ class UploadsController < ApplicationController
       flash[:notice] = @service.warnings.join(".\n \n")
     end
 
-    save_recent_tags
     respond_with(@upload)
   end
 
   private
 
-  def save_recent_tags
-    if @upload
-      tags = Tag.scan_tags(@upload.tag_string)
-      tags = (TagAlias.to_aliased(tags) + Tag.scan_tags(cookies[:recent_tags])).compact.uniq.slice(0, 30)
-      cookies[:recent_tags] = tags.join(" ")
-      cookies[:recent_tags_with_categories] = Tag.categories_for(tags).to_a.flatten.join(" ")
-    end
-  end
-
   def upload_params
     permitted_params = %i[
       file source tag_string rating status parent_id artist_commentary_title
diff --git a/app/logical/related_tag_query.rb b/app/logical/related_tag_query.rb
index 1464c23bf..57f3f0717 100644
--- a/app/logical/related_tag_query.rb
+++ b/app/logical/related_tag_query.rb
@@ -26,6 +26,17 @@ class RelatedTagQuery
     end
   end
 
+  # Returns the top 20 most frequently added tags within the last 20 edits made by the user in the last hour.
+  def recent_tags(since: 1.hour.ago, max_edits: 20, max_tags: 20)
+    return [] unless user.present? && PostArchive.enabled?
+
+    versions = PostArchive.where(updater_id: user.id).where("updated_at > ?", since).order(id: :desc).limit(max_edits)
+    tags = versions.flat_map { |v| v.diff[:added_tags] }
+    tags = tags.reject { |tag| Tag.is_metatag?(tag) }
+    tags = tags.group_by(&:itself).transform_values(&:size).sort_by { |tag, count| [-count, tag] }.map(&:first)
+    tags.take(max_tags)
+  end
+
   def favorite_tags
     user&.favorite_tags.to_s.split
   end
diff --git a/app/views/related_tags/_related_tags.html.erb b/app/views/related_tags/_related_tags.html.erb
index 7ebb38e94..d04fca311 100644
--- a/app/views/related_tags/_related_tags.html.erb
+++ b/app/views/related_tags/_related_tags.html.erb
@@ -2,7 +2,7 @@
 
 <div id="related-tags" class="related-tags">
   <% if local_assigns[:related_tags] %>
-    <%= render "tag_column", tags: cookies[:recent_tags].to_s.split, title: "Recent" %>
+    <%= render "tag_column", tags: related_tags.recent_tags, title: "Recent" %>
     <%= render "tag_column", tags: related_tags.favorite_tags, title: "Frequent" %>
     <%= render "tag_column", tags: related_tags.tags, class: "general-related-tags-column", title: related_tags.pretty_name %>
     <%= render "tag_column", tags: related_tags.translated_tags, title: "Translated Tags" %>

From 6223f89a99543e1375d9381a585d2e1fc0691db0 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Mon, 15 Oct 2018 13:10:08 -0500
Subject: [PATCH 5/8] related tags: refactor /related_tags.js to avoid updating
 unchanged columns.

Refactor the /related_tags.js call so that when the "Related tags"
button is clicked, it only replaces the columns that actually changed,
not the entire related tags section.

This avoids rebuilding the Recent / Frequent / Translated Tags / Artist
columns every time the "Related tags" button is clicked.
---
 app/controllers/related_tags_controller.rb    |  2 +-
 .../src/javascripts/related_tag.js.erb        | 25 +++---------
 app/logical/related_tag_query.rb              |  9 ++---
 app/views/posts/partials/show/_edit.html.erb  |  2 +-
 app/views/related_tags/_container.html.erb    |  6 ++-
 app/views/related_tags/_current_tags.html.erb | 10 +++++
 app/views/related_tags/_related_tags.html.erb | 40 -------------------
 app/views/related_tags/_source_tags.html.erb  | 34 ++++++++++++++++
 app/views/related_tags/_tag_column.html.erb   |  8 ++--
 app/views/related_tags/_user_tags.html.erb    |  6 +++
 app/views/related_tags/show.js.erb            |  7 +++-
 app/views/sources/show.js.erb                 |  5 ++-
 app/views/uploads/new.html.erb                |  2 +-
 13 files changed, 81 insertions(+), 75 deletions(-)
 create mode 100644 app/views/related_tags/_current_tags.html.erb
 delete mode 100644 app/views/related_tags/_related_tags.html.erb
 create mode 100644 app/views/related_tags/_source_tags.html.erb
 create mode 100644 app/views/related_tags/_user_tags.html.erb

diff --git a/app/controllers/related_tags_controller.rb b/app/controllers/related_tags_controller.rb
index bf820b55e..438c4f455 100644
--- a/app/controllers/related_tags_controller.rb
+++ b/app/controllers/related_tags_controller.rb
@@ -3,7 +3,7 @@ class RelatedTagsController < ApplicationController
   before_action :require_reportbooru_key, only: [:update]
 
   def show
-    @query = RelatedTagQuery.new(params[:query], category: params[:category], translated_tags: params[:translated_tags], artists: params[:artists], user: CurrentUser.user)
+    @query = RelatedTagQuery.new(query: params[:query], category: params[:category], user: CurrentUser.user)
     respond_with(@query) do |format|
       format.json do
         render :json => @query.to_json
diff --git a/app/javascript/src/javascripts/related_tag.js.erb b/app/javascript/src/javascripts/related_tag.js.erb
index 85b749722..d52ae428f 100644
--- a/app/javascript/src/javascripts/related_tag.js.erb
+++ b/app/javascript/src/javascripts/related_tag.js.erb
@@ -3,8 +3,6 @@ import Utility from './utility';
 let RelatedTag = {};
 
 RelatedTag.initialize_all = function() {
-  RelatedTag.artists = [];
-  RelatedTag.translated_tags  = [];
   $(document).on("click.danbooru", ".related-tags-button", RelatedTag.on_click_related_tags_button);
   $(document).on("click.danbooru", ".related-tags a.search-tag", RelatedTag.toggle_tag);
   $(document).on("click.danbooru", "#show-related-tags-link, #hide-related-tags-link", RelatedTag.toggle);
@@ -20,15 +18,6 @@ RelatedTag.tags_include = function(name) {
   return $.inArray(name.toLowerCase(), current) > -1;
 }
 
-RelatedTag.update_related_tags = function (category = "") {
-  $.get("/related_tag.js", {
-    "query": RelatedTag.current_tag(),
-    "category": category,
-    "translated_tags": RelatedTag.translated_tags.join(" "),
-    "artists": RelatedTag.artists.join(" "),
-  });
-}
-
 RelatedTag.on_open_post_edit_dialog = function(event) {
   $("#related-tags-container").removeClass("visible").addClass("hidden");
 }
@@ -38,20 +27,18 @@ RelatedTag.on_close_post_edit_dialog = function(event) {
 }
 
 RelatedTag.on_show_post_edit_form = function(event) {
-  RelatedTag.update_related_tags();
+  $.get("/related_tag.js", { user_tags: true });
   $("#fetch-data-manual").click();
 }
 
 RelatedTag.on_click_related_tags_button = function (event) {
-  const category = $(event.target).data("category");
-  RelatedTag.update_related_tags(category);
-  $("#related-tags-container").removeClass("hidden").addClass("visible");
+  $.get("/related_tag.js", { query: RelatedTag.current_tag(), category: $(event.target).data("category") });
+  RelatedTag.show();
 }
 
-RelatedTag.on_update_source_data = function (event, source) {
-  Danbooru.RelatedTag.artists = source.artists.map(artist => artist.name);
-  Danbooru.RelatedTag.translated_tags = source.translated_tags.map(tag => tag[0]);
-  RelatedTag.update_related_tags();
+RelatedTag.on_update_source_data = function (event, { source, related_tags_html }) {
+  $(".source-related-tags-columns").replaceWith(related_tags_html);
+  RelatedTag.update_selected();
 }
 
 RelatedTag.current_tag = function() {
diff --git a/app/logical/related_tag_query.rb b/app/logical/related_tag_query.rb
index 57f3f0717..81f58f87c 100644
--- a/app/logical/related_tag_query.rb
+++ b/app/logical/related_tag_query.rb
@@ -1,13 +1,10 @@
 class RelatedTagQuery
-  attr_reader :query, :category, :translated_tags, :artists, :user
+  attr_reader :query, :category, :user
 
-  def initialize(query, category: nil, translated_tags: nil, artists: nil, user: nil)
+  def initialize(query: nil, category: nil, user: nil)
     @user = user
     @query = TagAlias.to_aliased(query.to_s.downcase.strip).join(" ")
     @category = category
-    @translated_tags = translated_tags.to_s.split
-    @artists = Artist.where(name: artists.to_s.split)
-    @artists = [Artist.find_by(name: "banned_artist")] + @artists if @artists.any?(&:is_banned?)
   end
 
   def pretty_name
@@ -31,7 +28,7 @@ class RelatedTagQuery
     return [] unless user.present? && PostArchive.enabled?
 
     versions = PostArchive.where(updater_id: user.id).where("updated_at > ?", since).order(id: :desc).limit(max_edits)
-    tags = versions.flat_map { |v| v.diff[:added_tags] }
+    tags = versions.flat_map(&:added_tags)
     tags = tags.reject { |tag| Tag.is_metatag?(tag) }
     tags = tags.group_by(&:itself).transform_values(&:size).sort_by { |tag, count| [-count, tag] }.map(&:first)
     tags.take(max_tags)
diff --git a/app/views/posts/partials/show/_edit.html.erb b/app/views/posts/partials/show/_edit.html.erb
index c2123c752..ab4fef581 100644
--- a/app/views/posts/partials/show/_edit.html.erb
+++ b/app/views/posts/partials/show/_edit.html.erb
@@ -89,5 +89,5 @@
     <%= submit_tag "Submit", :class => "ui-button ui-widget ui-corner-all" %>
   </div>
 
-  <%= render "related_tags/container" %>
+  <%= render "related_tags/container", related_tags: nil %>
 <% end %>
diff --git a/app/views/related_tags/_container.html.erb b/app/views/related_tags/_container.html.erb
index 085843ce0..61c2cc80c 100644
--- a/app/views/related_tags/_container.html.erb
+++ b/app/views/related_tags/_container.html.erb
@@ -5,5 +5,9 @@
     <a href="#" id="hide-related-tags-link">«</a>
   </h3>
 
-  <%= render "related_tags/related_tags" %>
+  <div id="related-tags" class="related-tags">
+    <%= render "related_tags/user_tags", related_tags: nil %>
+    <%= render "related_tags/current_tags", related_tags: nil %>
+    <%= render "related_tags/source_tags", source: nil %>
+  </div>
 </div>
diff --git a/app/views/related_tags/_current_tags.html.erb b/app/views/related_tags/_current_tags.html.erb
new file mode 100644
index 000000000..b11d7e655
--- /dev/null
+++ b/app/views/related_tags/_current_tags.html.erb
@@ -0,0 +1,10 @@
+<div class="current-related-tags-columns">
+  <% if related_tags.present? %>
+    <%= render "related_tags/tag_column", tags: related_tags.tags, class: "general-related-tags-column", title: related_tags.pretty_name %>
+    <%= render "related_tags/tag_column", tags: related_tags.wiki_page_tags, class: "wiki-related-tags-column", title: link_to("wiki:#{related_tags.pretty_name}", show_or_new_wiki_pages_path(title: related_tags.query)) %>
+
+    <% related_tags.other_wiki_category_tags.each do |wiki| %>
+      <%= render "related_tags/tag_column", tags: wiki.tags, class: "other-wiki-related-tags-column", title: link_to("wiki:#{wiki.pretty_title}", show_or_new_wiki_pages_path(title: wiki.title)) %>
+    <% end %>
+  <% end %>
+</div>
diff --git a/app/views/related_tags/_related_tags.html.erb b/app/views/related_tags/_related_tags.html.erb
deleted file mode 100644
index d04fca311..000000000
--- a/app/views/related_tags/_related_tags.html.erb
+++ /dev/null
@@ -1,40 +0,0 @@
-<%# related_tags %>
-
-<div id="related-tags" class="related-tags">
-  <% if local_assigns[:related_tags] %>
-    <%= render "tag_column", tags: related_tags.recent_tags, title: "Recent" %>
-    <%= render "tag_column", tags: related_tags.favorite_tags, title: "Frequent" %>
-    <%= render "tag_column", tags: related_tags.tags, class: "general-related-tags-column", title: related_tags.pretty_name %>
-    <%= render "tag_column", tags: related_tags.translated_tags, title: "Translated Tags" %>
-    <%= render "tag_column", tags: related_tags.wiki_page_tags, class: "wiki-related-tags-column", title: link_to("wiki:#{related_tags.pretty_name}", show_or_new_wiki_pages_path(title: related_tags.query)) %>
-
-    <% related_tags.other_wiki_category_tags.each do |wiki| %>
-      <%= render "tag_column", tags: wiki.tags, class: "other-wiki-related-tags-column", title: link_to("wiki:#{wiki.pretty_title}", show_or_new_wiki_pages_path(title: wiki.title)) %>
-    <% end %>
-
-    <div class="tag-column wide-column artist-related-tags-column">
-      <h6>Artist</h6>
-
-      <% if related_tags.artists.size == 0 %>
-        none
-      <% else %>
-        <% related_tags.artists.each do |artist| %>
-          <%= TagSetPresenter.new([artist.name]).tag_list_html(name_only: true) %>
-
-          <ul>
-            <% artist.sorted_urls.each do |url| %>
-              <li>
-                <% if url.is_active %>
-                  <%= external_link_to url.url, truncate: 30 %>
-                  <%= link_to tag.i(class: "fas fa-minus-circle"), artist_url_path(id: url.id, artist_url: { is_active: false }), remote: true, method: :put, "data-confirm": "This will mark the URL as inactive. Continue?" %>
-                <% else %>
-                  <del><%= truncate(url.url, length: 30) %></del>
-                <% end %>
-              </li>
-            <% end %>
-          </ul>
-        <% end %>
-      <% end %>
-    </div>
-  <% end %>
-</div>
diff --git a/app/views/related_tags/_source_tags.html.erb b/app/views/related_tags/_source_tags.html.erb
new file mode 100644
index 000000000..a49308932
--- /dev/null
+++ b/app/views/related_tags/_source_tags.html.erb
@@ -0,0 +1,34 @@
+<div class="source-related-tags-columns">
+  <% if source.present? %>
+    <%= render "related_tags/tag_column", tags: source.translated_tags.map(&:first), title: "Translated Tags" %>
+
+    <div class="tag-column wide-column artist-related-tags-column">
+      <h6>Artist</h6>
+
+      <% if source.artists.any?(&:is_banned?) %>
+        <%= TagSetPresenter.new(["banned_artist"]).tag_list_html(name_only: true) %>
+      <% end %>
+
+      <% if source.artists.size == 0 %>
+        none
+      <% else %>
+        <% source.artists.each do |artist| %>
+          <%= TagSetPresenter.new([artist.name]).tag_list_html(name_only: true) %>
+
+          <ul>
+            <% artist.sorted_urls.each do |url| %>
+              <li>
+                <% if url.is_active %>
+                  <%= external_link_to url.url, truncate: 30 %>
+                  <%= link_to tag.i(class: "fas fa-minus-circle"), artist_url_path(id: url.id, artist_url: { is_active: false }), remote: true, method: :put, "data-confirm": "This will mark the URL as inactive. Continue?" %>
+                <% else %>
+                  <del><%= truncate(url.url, length: 30) %></del>
+                <% end %>
+              </li>
+            <% end %>
+          </ul>
+        <% end %>
+      <% end %>
+    </div>
+  <% end %>
+</div>
diff --git a/app/views/related_tags/_tag_column.html.erb b/app/views/related_tags/_tag_column.html.erb
index fc8735177..168781db4 100644
--- a/app/views/related_tags/_tag_column.html.erb
+++ b/app/views/related_tags/_tag_column.html.erb
@@ -1,8 +1,8 @@
 <%# tags, title, class (optional) %>
 
-<% if tags.present? %>
-  <div class="tag-column <%= local_assigns[:class] || "#{title.parameterize}-related-tags-column" %>">
+<div class="tag-column <%= local_assigns[:class] || "#{title.parameterize}-related-tags-column" %>">
+  <% if tags.present? %>
     <h6><%= title %></h6>
     <%= TagSetPresenter.new(tags).tag_list_html(name_only: true) %>
-  </div>
-<% end %>
+  <% end %>
+</div>
diff --git a/app/views/related_tags/_user_tags.html.erb b/app/views/related_tags/_user_tags.html.erb
new file mode 100644
index 000000000..3963ea41e
--- /dev/null
+++ b/app/views/related_tags/_user_tags.html.erb
@@ -0,0 +1,6 @@
+<div class="user-related-tags-columns">
+  <% if related_tags.present? %>
+    <%= render "related_tags/tag_column", tags: related_tags.recent_tags, title: "Recent" %>
+    <%= render "related_tags/tag_column", tags: related_tags.favorite_tags, title: "Frequent" %>
+  <% end %>
+</div>
diff --git a/app/views/related_tags/show.js.erb b/app/views/related_tags/show.js.erb
index 16b576469..1f75c76d9 100644
--- a/app/views/related_tags/show.js.erb
+++ b/app/views/related_tags/show.js.erb
@@ -1,2 +1,7 @@
-$("div#related-tags").replaceWith("<%= j render "related_tags", related_tags: @query %>");
+<% if params[:user_tags] %>
+  $(".user-related-tags-columns").replaceWith("<%= j render "user_tags", related_tags: @query %>");
+<% else %>
+  $(".current-related-tags-columns").replaceWith("<%= j render "current_tags", related_tags: @query %>");
+<% end %>
+
 Danbooru.RelatedTag.update_selected();
diff --git a/app/views/sources/show.js.erb b/app/views/sources/show.js.erb
index e28aec967..d421516c9 100644
--- a/app/views/sources/show.js.erb
+++ b/app/views/sources/show.js.erb
@@ -1,6 +1,9 @@
 $("#source-info").replaceWith("<%= j render "info", source: @source %>");
 
-$(document).trigger("danbooru:update-source-data", <%= raw @source.to_json %>);
+$(document).trigger("danbooru:update-source-data", {
+  source: <%= raw @source.to_json %>,
+  related_tags_html: "<%= j render "related_tags/source_tags", source: @source %>",
+});
 
 if ($("#c-uploads #a-new").length) {
   $("#upload_artist_commentary_title").val(<%= raw @source.dtext_artist_commentary_title.to_json %>);
diff --git a/app/views/uploads/new.html.erb b/app/views/uploads/new.html.erb
index 09e3d52e2..8af463050 100644
--- a/app/views/uploads/new.html.erb
+++ b/app/views/uploads/new.html.erb
@@ -104,7 +104,7 @@
           <%= submit_tag "Submit", :id => "submit-button", :class => "large ui-button ui-widget ui-corner-all gradient", data: {disable_with: false} %>
         </div>
 
-        <%= render "related_tags/container" %>
+        <%= render "related_tags/container", related_tags: nil %>
       <% end %>
     <% else %>
       <h2 style="margin-bottom: 1em;">You <%= CurrentUser.user.upload_limited_reason %></h2>

From 33ca02892727bffac832196923a068b471cabaee Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Mon, 15 Oct 2018 15:42:00 -0500
Subject: [PATCH 6/8] related tags: fix initialization logic for
 recent/frequent/translated/artist columns.

Initialize the recent tags, frequent tags, translated tags, and artist
tags columns only once, when the related tags section is first shown.

The related tags section is shown automatically when the 'Edit' tab is
opened, or by default on the uploads page.

This fixes the /related_tags.js and /source.js calls being triggered
every time the tag edit dialog box or the 'Edit' tab was opened.
---
 app/javascript/src/javascripts/posts.js.erb   |  3 +-
 .../src/javascripts/related_tag.js.erb        | 53 +++++++++++--------
 app/javascript/src/javascripts/uploads.js     |  8 +--
 3 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/app/javascript/src/javascripts/posts.js.erb b/app/javascript/src/javascripts/posts.js.erb
index 777c99fdb..70c3dabad 100644
--- a/app/javascript/src/javascripts/posts.js.erb
+++ b/app/javascript/src/javascripts/posts.js.erb
@@ -153,7 +153,6 @@ Post.open_edit_dialog = function() {
   $tag_string.css({"resize": "none", "width": "100%"});
   $tag_string.focus().selectEnd().height($tag_string[0].scrollHeight);
 
-  $(document).trigger("danbooru:show-post-edit-form");
   $(document).trigger("danbooru:open-post-edit-dialog");
 }
 
@@ -433,7 +432,7 @@ Post.initialize_post_sections = function() {
       $("#share").hide();
       $("#post_tag_string").focus().selectEnd().height($("#post_tag_string")[0].scrollHeight);
       $("#recommended").hide();
-      $(document).trigger("danbooru:show-post-edit-form");
+      $(document).trigger("danbooru:open-post-edit-tab");
     } else if (e.target.hash === "#recommended") {
       $("#comments").hide();
       $("#edit").hide();
diff --git a/app/javascript/src/javascripts/related_tag.js.erb b/app/javascript/src/javascripts/related_tag.js.erb
index d52ae428f..95a22694e 100644
--- a/app/javascript/src/javascripts/related_tag.js.erb
+++ b/app/javascript/src/javascripts/related_tag.js.erb
@@ -1,3 +1,4 @@
+import Uploads from './uploads';
 import Utility from './utility';
 
 let RelatedTag = {};
@@ -5,30 +6,27 @@ let RelatedTag = {};
 RelatedTag.initialize_all = function() {
   $(document).on("click.danbooru", ".related-tags-button", RelatedTag.on_click_related_tags_button);
   $(document).on("click.danbooru", ".related-tags a.search-tag", RelatedTag.toggle_tag);
-  $(document).on("click.danbooru", "#show-related-tags-link, #hide-related-tags-link", RelatedTag.toggle);
+  $(document).on("click.danbooru", "#show-related-tags-link", RelatedTag.show);
+  $(document).on("click.danbooru", "#hide-related-tags-link", RelatedTag.hide);
   $(document).on("keyup.danbooru.relatedTags", "#upload_tag_string, #post_tag_string", RelatedTag.update_selected);
+
   $(document).on("danbooru:update-source-data", RelatedTag.on_update_source_data);
-  $(document).on("danbooru:show-post-edit-form", RelatedTag.on_show_post_edit_form);
-  $(document).on("danbooru:open-post-edit-dialog", RelatedTag.on_open_post_edit_dialog);
-  $(document).on("danbooru:close-post-edit-dialog", RelatedTag.on_close_post_edit_dialog);
+  $(document).on("danbooru:open-post-edit-dialog", RelatedTag.hide);
+  $(document).on("danbooru:close-post-edit-dialog", RelatedTag.show);
+
+  // Initialize the recent/favorite/translated/artist tag columns once, the first time the related tags are shown.
+  $(document).one("danbooru:show-related-tags", RelatedTag.initialize_recent_and_favorite_tags);
+  $(document).one("danbooru:show-related-tags", Uploads.fetch_data_manual);
+
+  // Show the related tags automatically when the "Edit" tab is opened, or by default on the uploads page.
+  $(document).on("danbooru:open-post-edit-tab", RelatedTag.show);
+  if ($("#c-uploads #a-new").length) {
+    RelatedTag.show();
+  }
 }
 
-RelatedTag.tags_include = function(name) {
-  var current = $("#upload_tag_string,#post_tag_string").val().toLowerCase().match(/\S+/g) || [];
-  return $.inArray(name.toLowerCase(), current) > -1;
-}
-
-RelatedTag.on_open_post_edit_dialog = function(event) {
-  $("#related-tags-container").removeClass("visible").addClass("hidden");
-}
-
-RelatedTag.on_close_post_edit_dialog = function(event) {
-  $("#related-tags-container").removeClass("hidden").addClass("visible");
-}
-
-RelatedTag.on_show_post_edit_form = function(event) {
+RelatedTag.initialize_recent_and_favorite_tags = function(event) {
   $.get("/related_tag.js", { user_tags: true });
-  $("#fetch-data-manual").click();
 }
 
 RelatedTag.on_click_related_tags_button = function (event) {
@@ -101,6 +99,11 @@ RelatedTag.update_selected = function(e) {
   });
 }
 
+RelatedTag.tags_include = function(name) {
+  var current = $("#upload_tag_string,#post_tag_string").val().toLowerCase().match(/\S+/g) || [];
+  return $.inArray(name.toLowerCase(), current) > -1;
+}
+
 RelatedTag.toggle_tag = function(e) {
   var $field = $("#upload_tag_string,#post_tag_string");
   var tag = $(e.target).html().replace(/ /g, "_").replace(/&gt;/g, ">").replace(/&lt;/g, "<").replace(/&amp;/g, "&");
@@ -120,9 +123,15 @@ RelatedTag.toggle_tag = function(e) {
   e.preventDefault();
 }
 
-RelatedTag.toggle = function(e) {
-  $("#related-tags-container").toggleClass("visible hidden");
-  e.preventDefault();
+RelatedTag.show = function(e) {
+  $(document).trigger("danbooru:show-related-tags");
+  $("#related-tags-container").removeClass("hidden").addClass("visible");
+  return false;
+}
+
+RelatedTag.hide = function(e) {
+  $("#related-tags-container").removeClass("visible").addClass("hidden");
+  return false;
 }
 
 $(function() {
diff --git a/app/javascript/src/javascripts/uploads.js b/app/javascript/src/javascripts/uploads.js
index 3b96bdd7d..904318aa1 100644
--- a/app/javascript/src/javascripts/uploads.js
+++ b/app/javascript/src/javascripts/uploads.js
@@ -5,6 +5,7 @@ let Upload = {};
 Upload.initialize_all = function() {
   if ($("#c-uploads,#c-posts").length) {
     this.initialize_enter_on_tags();
+    $("#upload_source").on("change.danbooru", Upload.fetch_data_manual);
     $(document).on("click.danbooru", "#fetch-data-manual", Upload.fetch_data_manual);
   }
 
@@ -14,10 +15,8 @@ Upload.initialize_all = function() {
     } else {
       $("#image").on("load.danbooru error.danbooru", this.initialize_image);
     }
-    this.initialize_info_bookmarklet();
     this.initialize_similar();
     this.initialize_submit();
-    $(() => $("#related-tags-button").click()); // delay so we don't click until button is bound (#3895).
 
     $("#toggle-artist-commentary").on("click.danbooru", function(e) {
       Upload.toggle_commentary();
@@ -77,11 +76,6 @@ Upload.initialize_similar = function() {
   });
 }
 
-Upload.initialize_info_bookmarklet = function() {
-  $("#upload_source").on("change.danbooru", Upload.fetch_data_manual);
-  $("#fetch-data-manual").click();
-}
-
 Upload.update_scale = function() {
   var $image = $("#image");
   var ratio = $image.data("scale-factor");

From b166c8116a2572a05a6624cbbce0ca6857219245 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Mon, 15 Oct 2018 15:49:34 -0500
Subject: [PATCH 7/8] related tags: fix unnecessary .erb extensions, remove
 unused ids.

---
 app/javascript/packs/application.js                             | 2 +-
 .../src/javascripts/{related_tag.js.erb => related_tag.js}      | 2 +-
 app/views/artist_urls/{update.js.erb => update.js}              | 0
 app/views/related_tags/_buttons.html.erb                        | 2 +-
 app/views/related_tags/_container.html.erb                      | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename app/javascript/src/javascripts/{related_tag.js.erb => related_tag.js} (98%)
 rename app/views/artist_urls/{update.js.erb => update.js} (100%)

diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
index b0332e120..8ae221bf9 100644
--- a/app/javascript/packs/application.js
+++ b/app/javascript/packs/application.js
@@ -38,7 +38,7 @@ export { default as Note } from '../src/javascripts/notes.js';
 export { default as Post } from '../src/javascripts/posts.js.erb';
 export { default as PostModeMenu } from '../src/javascripts/post_mode_menu.js';
 export { default as PostTooltip } from '../src/javascripts/post_tooltips.js';
-export { default as RelatedTag } from '../src/javascripts/related_tag.js.erb';
+export { default as RelatedTag } from '../src/javascripts/related_tag.js';
 export { default as Shortcuts } from '../src/javascripts/shortcuts.js';
 export { default as Upload } from '../src/javascripts/uploads.js';
 export { default as Utility } from '../src/javascripts/utility.js';
diff --git a/app/javascript/src/javascripts/related_tag.js.erb b/app/javascript/src/javascripts/related_tag.js
similarity index 98%
rename from app/javascript/src/javascripts/related_tag.js.erb
rename to app/javascript/src/javascripts/related_tag.js
index 95a22694e..1076c90f9 100644
--- a/app/javascript/src/javascripts/related_tag.js.erb
+++ b/app/javascript/src/javascripts/related_tag.js
@@ -89,7 +89,7 @@ RelatedTag.current_tag = function() {
 
 RelatedTag.update_selected = function(e) {
   var current_tags = $("#upload_tag_string,#post_tag_string").val().toLowerCase().match(/\S+/g) || [];
-  var $all_tags = $("#related-tags a");
+  var $all_tags = $(".related-tags a.search-tag");
   $all_tags.removeClass("selected");
 
   $all_tags.each(function(i, tag) {
diff --git a/app/views/artist_urls/update.js.erb b/app/views/artist_urls/update.js
similarity index 100%
rename from app/views/artist_urls/update.js.erb
rename to app/views/artist_urls/update.js
diff --git a/app/views/related_tags/_buttons.html.erb b/app/views/related_tags/_buttons.html.erb
index badddebaa..e2b4667f9 100644
--- a/app/views/related_tags/_buttons.html.erb
+++ b/app/views/related_tags/_buttons.html.erb
@@ -1,4 +1,4 @@
-<%= button_tag "Related tags", type: :button, id: "related-tags-button", class: "related-tags-button ui-button ui-widget ui-corner-all sub gradient" %>
+<%= button_tag "Related tags", type: :button, class: "related-tags-button ui-button ui-widget ui-corner-all sub gradient" %>
 
 <% TagCategory.related_button_list.each do |category| %>
   <%= button_tag TagCategory.related_button_mapping[category], type: :button, "data-category": category, class: "related-tags-button ui-button ui-widget ui-corner-all sub gradient" %>
diff --git a/app/views/related_tags/_container.html.erb b/app/views/related_tags/_container.html.erb
index 61c2cc80c..0add7c117 100644
--- a/app/views/related_tags/_container.html.erb
+++ b/app/views/related_tags/_container.html.erb
@@ -5,7 +5,7 @@
     <a href="#" id="hide-related-tags-link">«</a>
   </h3>
 
-  <div id="related-tags" class="related-tags">
+  <div class="related-tags">
     <%= render "related_tags/user_tags", related_tags: nil %>
     <%= render "related_tags/current_tags", related_tags: nil %>
     <%= render "related_tags/source_tags", source: nil %>

From 6d293dfde25bc8b579370846f5af4a213a9fbc12 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Tue, 16 Oct 2018 12:44:49 -0500
Subject: [PATCH 8/8] related tags: fix style issues.

---
 app/javascript/src/javascripts/related_tag.js | 12 +++++++++---
 app/views/posts/partials/show/_edit.html.erb  |  2 +-
 app/views/related_tags/_source_tags.html.erb  |  8 ++++----
 app/views/uploads/new.html.erb                |  2 +-
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/app/javascript/src/javascripts/related_tag.js b/app/javascript/src/javascripts/related_tag.js
index 1076c90f9..2b34c5d17 100644
--- a/app/javascript/src/javascripts/related_tag.js
+++ b/app/javascript/src/javascripts/related_tag.js
@@ -34,7 +34,7 @@ RelatedTag.on_click_related_tags_button = function (event) {
   RelatedTag.show();
 }
 
-RelatedTag.on_update_source_data = function (event, { source, related_tags_html }) {
+RelatedTag.on_update_source_data = function (event, { related_tags_html }) {
   $(".source-related-tags-columns").replaceWith(related_tags_html);
   RelatedTag.update_selected();
 }
@@ -126,12 +126,18 @@ RelatedTag.toggle_tag = function(e) {
 RelatedTag.show = function(e) {
   $(document).trigger("danbooru:show-related-tags");
   $("#related-tags-container").removeClass("hidden").addClass("visible");
-  return false;
+
+  if (e) {
+    e.preventDefault();
+  }
 }
 
 RelatedTag.hide = function(e) {
   $("#related-tags-container").removeClass("visible").addClass("hidden");
-  return false;
+
+  if (e) {
+    e.preventDefault();
+  }
 }
 
 $(function() {
diff --git a/app/views/posts/partials/show/_edit.html.erb b/app/views/posts/partials/show/_edit.html.erb
index ab4fef581..c2123c752 100644
--- a/app/views/posts/partials/show/_edit.html.erb
+++ b/app/views/posts/partials/show/_edit.html.erb
@@ -89,5 +89,5 @@
     <%= submit_tag "Submit", :class => "ui-button ui-widget ui-corner-all" %>
   </div>
 
-  <%= render "related_tags/container", related_tags: nil %>
+  <%= render "related_tags/container" %>
 <% end %>
diff --git a/app/views/related_tags/_source_tags.html.erb b/app/views/related_tags/_source_tags.html.erb
index a49308932..13b2a0cea 100644
--- a/app/views/related_tags/_source_tags.html.erb
+++ b/app/views/related_tags/_source_tags.html.erb
@@ -5,13 +5,13 @@
     <div class="tag-column wide-column artist-related-tags-column">
       <h6>Artist</h6>
 
-      <% if source.artists.any?(&:is_banned?) %>
-        <%= TagSetPresenter.new(["banned_artist"]).tag_list_html(name_only: true) %>
-      <% end %>
-
       <% if source.artists.size == 0 %>
         none
       <% else %>
+        <% if source.artists.any?(&:is_banned?) %>
+          <%= TagSetPresenter.new(["banned_artist"]).tag_list_html(name_only: true) %>
+        <% end %>
+
         <% source.artists.each do |artist| %>
           <%= TagSetPresenter.new([artist.name]).tag_list_html(name_only: true) %>
 
diff --git a/app/views/uploads/new.html.erb b/app/views/uploads/new.html.erb
index 8af463050..09e3d52e2 100644
--- a/app/views/uploads/new.html.erb
+++ b/app/views/uploads/new.html.erb
@@ -104,7 +104,7 @@
           <%= submit_tag "Submit", :id => "submit-button", :class => "large ui-button ui-widget ui-corner-all gradient", data: {disable_with: false} %>
         </div>
 
-        <%= render "related_tags/container", related_tags: nil %>
+        <%= render "related_tags/container" %>
       <% end %>
     <% else %>
       <h2 style="margin-bottom: 1em;">You <%= CurrentUser.user.upload_limited_reason %></h2>