diff options
author | ThibG <thib@sitedethib.com> | 2019-11-04 13:02:01 +0100 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-11-04 13:02:01 +0100 |
commit | 65e13cfacf0d1a862fbc4da44ad84b1522b01b34 (patch) | |
tree | 916e5fc1d96c29e34cce6d0f3297e75fc6d33d7f /app/models/account.rb | |
parent | 1a12943924c8b49180c6daf44459130a219cdf5c (diff) |
Add abilityto add oneself to lists (#12271)
* Add ability to add oneself to lists * Change search results to include oneself when searching through followers * Mark follow relation as optional in ListAccount
Diffstat (limited to 'app/models/account.rb')
-rw-r--r-- | app/models/account.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index 05936def3..cae82da16 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -429,6 +429,8 @@ class Account < ApplicationRecord SELECT target_account_id FROM follows WHERE account_id = ? + UNION ALL + SELECT ? ) SELECT accounts.*, @@ -444,7 +446,7 @@ class Account < ApplicationRecord LIMIT ? OFFSET ? SQL - records = find_by_sql([sql, account.id, account.id, account.id, limit, offset]) + records = find_by_sql([sql, account.id, account.id, account.id, account.id, limit, offset]) else sql = <<-SQL.squish SELECT |