From 7ade3b683115aec515c535fa392a3661e34089ed Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Sun, 30 Apr 2017 01:29:21 -0500
Subject: [PATCH] Fix #2352: return raw usernames in API instead of pretty
 names.

---
 app/assets/javascripts/blacklists.js | 2 +-
 app/assets/javascripts/posts.js      | 2 +-
 app/models/artist_version.rb         | 2 +-
 app/models/note.rb                   | 2 +-
 app/models/post.rb                   | 2 +-
 app/models/wiki_page.rb              | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/blacklists.js b/app/assets/javascripts/blacklists.js
index 72c48785e..878a2306d 100644
--- a/app/assets/javascripts/blacklists.js
+++ b/app/assets/javascripts/blacklists.js
@@ -147,7 +147,7 @@
     var tags = String($post.attr("data-tags")).match(/\S+/g) || [];
     tags = tags.concat(String($post.attr("data-pools")).match(/\S+/g) || []);
     tags.push("rating:" + $post.data("rating"));
-    tags.push("user:" + $post.attr("data-uploader").toLowerCase().replace(/ /g, "_"));
+    tags.push("user:" + $post.attr("data-uploader").toLowerCase());
     $.each(String($post.data("flags")).match(/\S+/g) || [], function(i, v) {
       tags.push("status:" + v);
     });
diff --git a/app/assets/javascripts/posts.js b/app/assets/javascripts/posts.js
index 2ba3c2320..9177546aa 100644
--- a/app/assets/javascripts/posts.js
+++ b/app/assets/javascripts/posts.js
@@ -288,7 +288,7 @@
     } else {
       score = " score:" + $post.data("score");
     }
-    $img.attr("title", $post.attr("data-tags") + " user:" + $post.attr("data-uploader") + " rating:" + $post.data("rating") + score);
+    $img.attr("title", $post.attr("data-tags") + " user:" + $post.attr("data-uploader").replace(/_/g, " ") + " rating:" + $post.data("rating") + score);
   }
 
   Danbooru.Post.initialize_post_image_resize_links = function() {
diff --git a/app/models/artist_version.rb b/app/models/artist_version.rb
index e12fa78ca..c602c3294 100644
--- a/app/models/artist_version.rb
+++ b/app/models/artist_version.rb
@@ -109,6 +109,6 @@ class ArtistVersion < ActiveRecord::Base
   end
 
   def updater_name
-    User.id_to_name(updater_id).tr("_", " ")
+    User.id_to_name(updater_id)
   end
 end
diff --git a/app/models/note.rb b/app/models/note.rb
index 06f4dd32f..299498ab8 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -124,7 +124,7 @@ class Note < ActiveRecord::Base
   end
 
   def creator_name
-    User.id_to_name(creator_id).tr("_", " ")
+    User.id_to_name(creator_id)
   end
 
   def update_post
diff --git a/app/models/post.rb b/app/models/post.rb
index 9906baff8..2313328c4 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -1000,7 +1000,7 @@ class Post < ActiveRecord::Base
     end
 
     def uploader_name
-      User.id_to_name(uploader_id).tr("_", " ")
+      User.id_to_name(uploader_id)
     end
   end
 
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index 34da591bb..a838cf067 100644
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -166,7 +166,7 @@ class WikiPage < ActiveRecord::Base
   end
 
   def creator_name
-    User.id_to_name(creator_id).tr("_", " ")
+    User.id_to_name(creator_id)
   end
 
   def category_name