diff options
author | ThibG <thib@sitedethib.com> | 2019-11-07 13:41:56 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-07 13:41:56 +0100 |
commit | dd2ec970dbe39f09d3da32d6a8f524aaad68a9d6 (patch) | |
tree | 0d3596a944cd4ddc27c8c3989f039f640730f70c /app/models/list_account.rb | |
parent | 00793a86bc52e4cb37318e42ea4ceb37a896c727 (diff) | |
parent | f63dad52943c757489975e0c39e771b6bc96e5ba (diff) |
Merge pull request #1242 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/list_account.rb')
-rw-r--r-- | app/models/list_account.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/list_account.rb b/app/models/list_account.rb index 87b498224..785923c4c 100644 --- a/app/models/list_account.rb +++ b/app/models/list_account.rb @@ -6,13 +6,13 @@ # id :bigint(8) not null, primary key # list_id :bigint(8) not null # account_id :bigint(8) not null -# follow_id :bigint(8) not null +# follow_id :bigint(8) # class ListAccount < ApplicationRecord belongs_to :list belongs_to :account - belongs_to :follow + belongs_to :follow, optional: true validates :account_id, uniqueness: { scope: :list_id } @@ -21,6 +21,6 @@ class ListAccount < ApplicationRecord private def set_follow - self.follow = Follow.find_by(account_id: list.account_id, target_account_id: account.id) + self.follow = Follow.find_by!(account_id: list.account_id, target_account_id: account.id) unless list.account_id == account.id end end |