Added safeguards on (un)?following.

steveklabnik · steveklabnik · commit 6e6265d824cf · 2010-08-14T21:16:07.000-04:00
User pages now only show one un?following link. And give a message if
you're already un?following someone and you try it again.
diff --git a/controllers/hacker.rb b/controllers/hacker.rb
@@ -18,6 +18,13 @@
 	#find the hacker with the given name
 	@hacker = Hacker.first(:username => params[:name])
 
+	#make sure we're not following them already
+	if current_user.following? @hacker
+		flash[:notice] = "You're already following #{params[:name]}."
+		redirect "/hackers/#{current_user.username}"
+		return
+	end
+
 	#follow them!
 	current_user.follow! @hacker
 
@@ -36,8 +43,15 @@
 
 	#find the hacker with the given name
 	@hacker = Hacker.first(:username => params[:name])
-
-	#follow them!
+	
+	#make sure we're not following them already
+	unless current_user.following? @hacker
+		flash[:notice] = "You're already not following #{params[:name]}."
+		redirect "/hackers/#{current_user.username}"
+		return
+	end
+
+	#unfollow them!
 	current_user.unfollow! @hacker
 
 	#set a message
diff --git a/models/hacker.rb b/models/hacker.rb
@@ -75,22 +75,28 @@ def gravatar_url
 		"http://www.gravatar.com/avatar/#{MD5::md5(email.downcase)}"
 	end
 
-	#this function makes the hacker follow the followee
+	#this method makes the hacker follow the followee
 	def follow! followee
 		following << followee
 		save
 		followee.followers << self
 		followee.save
 	end
 	
-	#this function makes the hacker unfollow the followee
+	#this method makes the hacker unfollow the followee
 	def unfollow! followee
 		following_ids.delete(followee.id)
 		save
 		followee.followers_ids.delete(id)
 		followee.save
 	end
 
+	#this method returns true if we're following the given Hacker, and
+	#false otherwise
+	def following? hacker
+		following.include? hacker
+	end
+
 	private 
 
 	#we're going to use the SHA1 encryption method for now.
diff --git a/views/hackers/show.haml b/views/hackers/show.haml
@@ -6,5 +6,7 @@
 
 - if logged_in? && @hacker.username != current_user.username
 	%a{:href => "/messages/new/to/#{@hacker.username}" }= "Send #{@hacker.username} a message"
-	%a{:href => "/hackers/#{@hacker.username}/follow"} Follow #{@hacker.username}
-	%a{:href => "/hackers/#{@hacker.username}/unfollow"} Unfollow #{@hacker.username}
+	- if current_user.following? @hacker
+		%a{:href => "/hackers/#{@hacker.username}/unfollow"} Unfollow #{@hacker.username}
+	- else
+		%a{:href => "/hackers/#{@hacker.username}/follow"} Follow #{@hacker.username}
