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

e239fc30 · Eugen Rochko · d0229754 · e239fc30
Commit e239fc30 authored 9 years ago by Eugen Rochko
Hide whitespace changes
Inline Side-by-side

Showing

with 2 additions and 1 deletion
+2 -1
--- 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)