From 76a7594a97e1d34746f4efe5f97cc6185c3470b5 Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Mon, 7 Feb 2011 18:57:33 -0500
Subject: [PATCH] implemented favorites on post/show page

---
 app/controllers/favorites_controller.rb       |  10 +--
 app/models/post.rb                            |   2 +-
 app/models/upload.rb                          |   7 +-
 .../comments/partials/new/_form.html.erb      |  15 ++--
 app/views/layouts/default.html.erb            |   4 +-
 app/views/posts/index.html.erb                |   2 +-
 .../posts/partials/show/_options.html.erb     |   4 +-
 app/views/posts/show.html.erb                 |   3 +-
 app/views/sessions/new.html.erb               |   6 +-
 app/views/uploads/update.js.erb               |   1 +
 app/views/uploads/update.js.rjs               |   1 -
 public/images/wait.gif                        | Bin 0 -> 2586 bytes
 public/javascripts/compiled/default.js        |  70 +++++++++++++++++-
 public/javascripts/src/app/comments.js        |   1 -
 public/javascripts/src/app/favorites.js       |  69 +++++++++++++++++
 script/custom/compile_javascripts             |   1 +
 16 files changed, 164 insertions(+), 32 deletions(-)
 create mode 100644 app/views/uploads/update.js.erb
 delete mode 100644 app/views/uploads/update.js.rjs
 create mode 100644 public/images/wait.gif
 create mode 100644 public/javascripts/src/app/favorites.js

diff --git a/app/controllers/favorites_controller.rb b/app/controllers/favorites_controller.rb
index d315237f1..8a155f5a2 100644
--- a/app/controllers/favorites_controller.rb
+++ b/app/controllers/favorites_controller.rb
@@ -8,18 +8,12 @@ class FavoritesController < ApplicationController
   end
   
   def create
-    @favorite = Favorite.create(
-      :user_id => CurrentUser.id,
-      :post_id => params[:id]
-    )
+    Post.find(params[:id]).add_favorite(CurrentUser.user)
     render :nothing => true
   end
   
   def destroy
-    Favorite.destroy(
-      :user_id => CurrentUser.id,
-      :post_id => params[:id]
-    )
+    Post.find(params[:id]).remove_favorite(CurrentUser.user)
     render :nothing => true
   end
 end
diff --git a/app/models/post.rb b/app/models/post.rb
index 2a61fe666..77a15b021 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -30,7 +30,7 @@ class Post < ActiveRecord::Base
   scope :commented_before, lambda {|date| where("last_commented_at < ?", date).order("last_commented_at DESC")}
   scope :available_for_moderation, lambda {where(["id NOT IN (SELECT pd.post_id FROM post_disapprovals pd WHERE pd.user_id = ?)", CurrentUser.id])}
   scope :hidden_from_moderation, lambda {where(["id IN (SELECT pd.post_id FROM post_disapprovals pd WHERE pd.user_id = ?)", CurrentUser.id])}
-  scope :before_id, lambda {|id| where(["posts.id < ?", id])}
+  scope :before_id, lambda {|id| id.present? ? where(["posts.id < ?", id]) : where("TRUE")}
   scope :tag_match, lambda {|query| Post.tag_match_helper(query)}
   
   module FileMethods
diff --git a/app/models/upload.rb b/app/models/upload.rb
index 4bf28a256..7b2ccce4e 100644
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -96,11 +96,8 @@ class Upload < ActiveRecord::Base
     
     def merge_tags(post)
       post.tag_string += " #{tag_string}"
-      post.updater_id = uploader_id
-      post.updater_ip_addr = uploader_ip_addr
       post.save
       update_attribute(:status, "duplicate: #{post.id}")
-      raise
     end
   end
   
@@ -259,8 +256,8 @@ class Upload < ActiveRecord::Base
 
       self.file_path = temp_file_path
 
-      if file.local_path
-        FileUtils.cp(file.local_path, file_path)
+      if file.tempfile
+        FileUtils.cp(file.tempfile.path, file_path)
       else
         File.open(file_path, 'wb') do |out| 
           out.write(file.read)
diff --git a/app/views/comments/partials/new/_form.html.erb b/app/views/comments/partials/new/_form.html.erb
index 776b24c3b..8a1188a24 100644
--- a/app/views/comments/partials/new/_form.html.erb
+++ b/app/views/comments/partials/new/_form.html.erb
@@ -1,9 +1,10 @@
 <div class="comment-preview dtext">
-  <%= form_tag(comments_path, :remote => true) do %>
-    <%= hidden_field "comment", "post_id", :value => post.id %>
-    <%= text_area "comment", "body", :size => "60x7" %>
-    <br>
-    <%= submit_tag "Post" %>
-    <%= submit_tag "Preview" %>
-  <% end %>
 </div>
+
+<%= form_tag(comments_path) do %>
+  <%= hidden_field "comment", "post_id", :value => post.id %>
+  <%= text_area "comment", "body", :size => "60x7" %>
+  <br>
+  <%= submit_tag "Post" %>
+  <%= submit_tag "Preview" %>
+<% end %>
diff --git a/app/views/layouts/default.html.erb b/app/views/layouts/default.html.erb
index d1ab79d21..5b3d94866 100644
--- a/app/views/layouts/default.html.erb
+++ b/app/views/layouts/default.html.erb
@@ -1,10 +1,12 @@
 <!doctype html>
 <html>
 <head>
-  <title><%= @page_title %></title>
+  <title><%= yield :page_title %></title>
   <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
   <link rel="top" title="<%= Danbooru.config.app_name %>" href="/">
   <%= csrf_meta_tag %>
+  <meta name="current-user-name" content="<%= CurrentUser.name %>">
+  <meta name="current-user-id" content="<%= CurrentUser.id %>">
   <% unless CurrentUser.user.blacklisted_tags.blank? %>
     <meta name="blacklisted-tags" content="<%= CurrentUser.user.blacklisted_tags %>">
   <% end %>
diff --git a/app/views/posts/index.html.erb b/app/views/posts/index.html.erb
index 969d83622..0bfc23295 100644
--- a/app/views/posts/index.html.erb
+++ b/app/views/posts/index.html.erb
@@ -62,7 +62,7 @@
     </section>
     
     <% content_for(:page_title) do %>
-      / <%= @post_set.tags %>
+      /<%= @post_set.tags %>
     <% end %>
 
     <%= render :partial => "posts/partials/common/secondary_links" %>    
diff --git a/app/views/posts/partials/show/_options.html.erb b/app/views/posts/partials/show/_options.html.erb
index 8d3b3642d..aa304e004 100644
--- a/app/views/posts/partials/show/_options.html.erb
+++ b/app/views/posts/partials/show/_options.html.erb
@@ -1,7 +1,7 @@
 <ul>
   <%= resize_image_links(post, CurrentUser.user) %>
-  <li><%= link_to "Favorite", "#" %></li>
-  <li><%= link_to "Unfavorite", "#" %></li>
+  <li><%= link_to "Favorite", "#", :id => "add-to-favorites" %> <img src="/images/wait.gif" style="display: none;" id="add-to-favorites-wait"></li>
+  <li><%= link_to "Unfavorite", "#", :id => "remove-from-favorites" %> <img src="/images/wait.gif" style="display: none;" id="remove-from-favorites-wait"></li>
   <li><%= link_to "Translate", "#" %></li>
   <li><%= link_to "Unapprove", "#" %></li>
   <% if CurrentUser.user.is_janitor? %>
diff --git a/app/views/posts/show.html.erb b/app/views/posts/show.html.erb
index cc89a5cd8..b0bb669f4 100644
--- a/app/views/posts/show.html.erb
+++ b/app/views/posts/show.html.erb
@@ -55,13 +55,14 @@
 </div>
 
 <% content_for(:page_title) do %>
-  / <%= @post.tag_string %>
+  /p/<%= @post.tag_string %>
 <% end %>
 
 <% content_for(:html_header) do %>
   <meta name="tags" content="<%= @post.tag_string %>">
   <meta name="favorites" content="<%= @post.fav_string %>">
   <meta name="pools" content="<%= @post.pool_string %>">
+  <meta name="post-id" content="<%= @post.id %>">
 <% end %>
 
 <%= render :partial => "posts/partials/common/secondary_links" %>
diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index 4299196b1..5e85716a6 100644
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -1,7 +1,7 @@
 <div id="sessions">
   <div id="new">
     <section>
-      <h2>Login</h2>
+      <h2>Sign In</h2>
       <%= form_tag(session_path) do %>
         <table width="100%">
           <tfoot>
@@ -33,12 +33,12 @@
       <ul>
         <li><%= link_to "I don't have an account", new_user_path %></li>
         <li><%= link_to "I forgot my password", reset_password_path %></li>
-        <li><%= link_to "I forgot my login", login_reminder_path %></li>
+        <li><%= link_to "I forgot my user name", login_reminder_path %></li>
       </ul>
     </aside>    
   </div>
 </div>
 
 <% content_for(:page_title) do %>
- / login
+ /sign in
 <% end %>
diff --git a/app/views/uploads/update.js.erb b/app/views/uploads/update.js.erb
new file mode 100644
index 000000000..0dcd5d9e3
--- /dev/null
+++ b/app/views/uploads/update.js.erb
@@ -0,0 +1 @@
+location.reload()
\ No newline at end of file
diff --git a/app/views/uploads/update.js.rjs b/app/views/uploads/update.js.rjs
deleted file mode 100644
index 869438706..000000000
--- a/app/views/uploads/update.js.rjs
+++ /dev/null
@@ -1 +0,0 @@
-page.reload
diff --git a/public/images/wait.gif b/public/images/wait.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a0e37d53d9608fe52c91c6242044db0a502cb73f
GIT binary patch
literal 2586
zcmZ?wbhEHb<Y!=IIK;rPWz&{Bx9+@o_vXy0Gk5OY`Sb4&0~jd&=k{|A33hf2a5d61
zU}j`sU{L(Y!okMCz@P(C0MgFDEEnN&RcMi>8H0ptguv^&4uUz3j8!wzO2xK$_+Qz>
ziK(S|%Csq0E?s%^?hVA^KfnH*Idx{swk^nZgUp9v7PSp60YO48H(CO$7z|>L8)UR)
zwj?^uV4ip&&4SBdmDiNk%xQi~OjxWcDJwa0?8uvUZ<Z`ta_82aKfnIeRMmiN+l1XV
z7L5%p!Bd1>BBoA~VlasDSSkB7v8Byv3dh0&92q@KHPafeL`(E8UEF~sD4JuUVjw<x
z^X^SgSI?PKXa4;96B8G+XV)IAUSrX?ppY^}Dk);>Bqaui7{`^Osf8^KN>dsa9AMO#
zw5*A()g=<AWj0neYu2rS#9K*O3COa4e{Ae*KrXm<=gYS*u+W3jESdoe7xYLbMNFQg
z$lws;0kTZyKq7~#l7u0X++%_Hj6ohE+-}J)C6us)ql}ykBn02Qdy|rs0<ld+Nd=E>
zt?0Hf9EaN0wIp+ahhm^u&#_B}F4zK+g^6X#v?&n3`S|&4*|g=)zdtN&EO)>jJ9Fv`
z)K4&qMZ=(V0?2R86F`1*U8%XWsHI(TN^8OaR*gx^8pXQ60hx?7)@0;lrc9f1=G>V#
zuRsYhB`M|0w=XJ6Dj@&fy94nl%pwrYqIp3f<(gF1jj5Nk7y@D(S8B2>lsQnS<0Yx#
zJ*!D6vTB7E*lUqky#|f8dv{98O7`sA^X1zYNSr-+^aPSJ;kgfF7Xt%}_J%nD*PK{x
zs(xW`C{lG^q<MUy1Y3d*i=}|Kl+1j?o~JXlgt}N4Z{%R<=D-qhF;Ov)WCHTYuRlFq
zJ$rWTiHQRzRHUp9v5bL%fkl0Sg!2?Hj~lZ?7##{59n2L@6inc9V$<!aS*SGOmcSCB
zRMp0F>xCJy*kxm7vt-edE7z_-a^0U_i1divZ<-qfLazxq-e|qRbyy&VEg|Dnp@!#-
z8a0DeS~Gf_D)nAEdf0=Kqz;ZGIc3rmh_@ig@XDntDoQGl$o%u~&z5al;NAlHOs7D?
zc#6@%h|sPm4yPD~0+lWY0VW}q4xt$i3)Z}5(!ZX#NNZY4(!m8fvaT$c-fLoEVrgk>
z0a*x6j1W5+7#Nu4EYdCuEz(r;>SW5uS*`25fbrmm*t-*Qvv%Ps0YPbwB)4k@OkK2!
za~WT9n?lP135EidQ%wp9t69_pG(0xcJ&c%_xfhgq4@=@ob0o$~f#Q}`9E-#jby>A<
z;$TZiIcUJ5u!BWSK<8vYJ-gww=c~_6KE<*4p$N8kAw9(fEM1c2v`8rVgu@91MwQSB
ztQ=Y#oGhmv@;R>H$SY%Nb%|`ezYJH31Ep@_bCXU1=N2uclBvR7k4`nII6J8_OptlA
zQQ(P#j$4+-LBYPKoD$5P3zQCpa5eg2NdwKGh$E@6P%l`z<yF99sg@q4mQ6g4GesE!
z8Xhc~(pbT8{9~(f&9YXP$Sxe7Be@h*yP%NrN?`Fafk|4eNjwP?1sNQsv?@+%DqM10
zyzl8uA)(YnDeToG$;G?+g(V=XRtbbSdL;5FOafWe0kTTwz{l3)%4IDskrKS_f;dVE
zP@I7q9K=;z5WBQQFzpItc^EOzR54J@=jeeztZAR*I$14X>5^9hi=|q8I2{-ABuoJL
ztWjx7Q_+$G@IdTSq)J;uJz(jQRSJuy6`XQBv5-Sy5-)?nln$pUElCWY+gXw;mo<X|
xak&7tKqS2hWuQ0(WS2mfWb;Ih2NPr&0-87jg*<1~J*?n4K9dieHWZl{tO1O_y|w@V

literal 0
HcmV?d00001

diff --git a/public/javascripts/compiled/default.js b/public/javascripts/compiled/default.js
index 18f6dffcb..e1e22dd2b 100644
--- a/public/javascripts/compiled/default.js
+++ b/public/javascripts/compiled/default.js
@@ -1071,7 +1071,6 @@ $(document).ready(function() {
           body: $(e.target).closest("form").find("textarea").val()
         },
         success: function(data, text_status, xhr) {
-          console.log($(this).closest("div.new-comment").find("div.comment-preview"));
           $(this).closest("div.new-comment").find("div.comment-preview").show().html(data);
         },
         type: "post"
@@ -1110,3 +1109,72 @@ $(document).ready(function() {
     $("#p2").hide();
   }
 });
+(function() {
+  Danbooru.Favorite = {};
+  
+  Danbooru.Favorite.initialize_all = function() {
+    this.initialize_add_to_favorites();
+    this.initialize_remove_from_favorites();
+    this.hide_or_remove_add_to_favorites_link();
+  }
+  
+  Danbooru.Favorite.hide_or_remove_add_to_favorites_link = function() {
+    var favorites = $("meta[name=favorites]").attr("content");
+    var current_user = $("meta[name=current-user-id]").attr("content");
+    var regexp = new RegExp("\\bfav:" + current_user + "\\b");
+    if (favorites.match(regexp)) {
+      $("a#add-to-favorites").hide();
+    } else {
+      $("a#remove-from-favorites").hide();      
+    }
+  }
+  
+  Danbooru.Favorite.initialize_add_to_favorites = function() {
+    $("a#add-to-favorites").click(function(e) {
+      e.stopPropagation();
+      
+      $.ajax({
+        url: "/favorites",
+        data: {
+          id: $("meta[name=post-id]").attr("content")
+        },
+        beforeSend: function() {
+          $("img#add-to-favorites-wait").show();
+        },
+        success: function(data, text_status, xhr) {
+          $("a#add-to-favorites").hide();
+          $("a#remove-from-favorites").show();
+          $("img#add-to-favorites-wait").hide();
+        },
+        type: "post"
+      });
+      
+      return false;
+    });
+  }
+  
+  Danbooru.Favorite.initialize_remove_from_favorites = function() {
+    $("a#remove-from-favorites").click(function(e) {
+      e.stopPropagation();
+      
+      $.ajax({
+        url: "/favorites/" + $("meta[name=post-id]").attr("content"),
+        beforeSend: function() {
+          $("img#remove-from-favorites-wait").show();
+        },
+        success: function(data, text_status, xhr) {
+          $("a#add-to-favorites").show();
+          $("a#remove-from-favorites").hide();
+          $("img#remove-from-favorites-wait").hide();
+        },
+        type: "delete"
+      });
+      
+      return false;
+    });
+  }
+})();
+
+$(document).ready(function() {
+  Danbooru.Favorite.initialize_all();
+});
diff --git a/public/javascripts/src/app/comments.js b/public/javascripts/src/app/comments.js
index e0f35b9a9..fc2b1e0a4 100644
--- a/public/javascripts/src/app/comments.js
+++ b/public/javascripts/src/app/comments.js
@@ -27,7 +27,6 @@
           body: $(e.target).closest("form").find("textarea").val()
         },
         success: function(data, text_status, xhr) {
-          console.log($(this).closest("div.new-comment").find("div.comment-preview"));
           $(this).closest("div.new-comment").find("div.comment-preview").show().html(data);
         },
         type: "post"
diff --git a/public/javascripts/src/app/favorites.js b/public/javascripts/src/app/favorites.js
new file mode 100644
index 000000000..06060d80f
--- /dev/null
+++ b/public/javascripts/src/app/favorites.js
@@ -0,0 +1,69 @@
+(function() {
+  Danbooru.Favorite = {};
+  
+  Danbooru.Favorite.initialize_all = function() {
+    this.initialize_add_to_favorites();
+    this.initialize_remove_from_favorites();
+    this.hide_or_remove_add_to_favorites_link();
+  }
+  
+  Danbooru.Favorite.hide_or_remove_add_to_favorites_link = function() {
+    var favorites = $("meta[name=favorites]").attr("content");
+    var current_user = $("meta[name=current-user-id]").attr("content");
+    var regexp = new RegExp("\\bfav:" + current_user + "\\b");
+    if (favorites.match(regexp)) {
+      $("a#add-to-favorites").hide();
+    } else {
+      $("a#remove-from-favorites").hide();      
+    }
+  }
+  
+  Danbooru.Favorite.initialize_add_to_favorites = function() {
+    $("a#add-to-favorites").click(function(e) {
+      e.stopPropagation();
+      
+      $.ajax({
+        url: "/favorites",
+        data: {
+          id: $("meta[name=post-id]").attr("content")
+        },
+        beforeSend: function() {
+          $("img#add-to-favorites-wait").show();
+        },
+        success: function(data, text_status, xhr) {
+          $("a#add-to-favorites").hide();
+          $("a#remove-from-favorites").show();
+          $("img#add-to-favorites-wait").hide();
+        },
+        type: "post"
+      });
+      
+      return false;
+    });
+  }
+  
+  Danbooru.Favorite.initialize_remove_from_favorites = function() {
+    $("a#remove-from-favorites").click(function(e) {
+      e.stopPropagation();
+      
+      $.ajax({
+        url: "/favorites/" + $("meta[name=post-id]").attr("content"),
+        beforeSend: function() {
+          $("img#remove-from-favorites-wait").show();
+        },
+        success: function(data, text_status, xhr) {
+          $("a#add-to-favorites").show();
+          $("a#remove-from-favorites").hide();
+          $("img#remove-from-favorites-wait").hide();
+        },
+        type: "delete"
+      });
+      
+      return false;
+    });
+  }
+})();
+
+$(document).ready(function() {
+  Danbooru.Favorite.initialize_all();
+});
diff --git a/script/custom/compile_javascripts b/script/custom/compile_javascripts
index ea3be09b1..e66ffc628 100755
--- a/script/custom/compile_javascripts
+++ b/script/custom/compile_javascripts
@@ -12,3 +12,4 @@ cat public/javascripts/src/app/posts.js >> public/javascripts/compiled/default.j
 cat public/javascripts/src/app/comments.js >> public/javascripts/compiled/default.js
 cat public/javascripts/src/app/uploads.js >> public/javascripts/compiled/default.js
 cat public/javascripts/src/app/users.js >> public/javascripts/compiled/default.js
+cat public/javascripts/src/app/favorites.js >> public/javascripts/compiled/default.js