Fix error when unfollowing somebody who wasn't followed in the first place

diff --git a/app/models/account.rb b/app/models/account.rb
index c92bb157478540c7d650ee9014d78b0e38fc1c30..524d05f867a00adad74e4857468d1192f9b7dd5c 100644 (file)
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -36,7 +36,8 @@ class Account < ActiveRecord::Base
   end
 
   def unfollow!(other_account)
-    self.active_relationships.find_by(target_account: other_account).destroy
+    follow = self.active_relationships.find_by(target_account: other_account)
+    follow.destroy unless follow.nil?
   end
 
   def following?(other_account)