base/app/helpers/activities_helper.rb in social_stream-1.1.12 vs base/app/helpers/activities_helper.rb in social_stream-2.0.0.beta1

@@ -1,29 +1,14 @@
 module ActivitiesHelper
-  # Link to 'like' or 'unlike' depending on the like status of the activity to current_subject
+  # Link to 'like' or 'unlike' depending if current_subject already unlikes or likes
+  # the object respectively
   #
   # @param [Object]
   # @return [String]
-  def link_like(object)
-    params = link_like_params(object)
-    link_to params[0],params[1],params[2]
-  end
-
-  def link_like_params(object)
-    params = Array.new
-    if !user_signed_in?
-      params << image_tag("btn/nolike.png", :class => "menu_icon")+t('activity.like')
-      params << new_user_session_path
-      params << {:class => "verb_like",:id => "like_" + dom_id(object)}
-    else
-      if (object.liked_by?(current_subject))
-        params << image_tag("btn/like.png", :class => "menu_icon")+t('activity.unlike')
-        params << [object, :like]
-        params << {:class => "verb_like",:id => "like_" + dom_id(object),:method => :delete, :remote => true}
-      else
-        params << image_tag("btn/nolike.png", :class => "menu_icon")+t('activity.like')
-        params << [object, :like]
-        params << {:class => "verb_like",:id => "like_" + dom_id(object),:method => :post, :remote => true}
+  def like_status object
+    [ 'like', 'unlike' ].tap do |s|
+      if user_signed_in? && object.liked_by?(current_subject)
+        s.reverse!
       end
     end
   end
 
   # Build a new post based on the current_subject. Useful for authorization queries