Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Remove unused methods (#1730)

Browse source 
* Remove unused method #set_counters_maps from api controller

* Remove unused method #set_account_counters_maps from api controller

* Remove unused method Account#followers_domains

* Remove unused User.prolific scope

* Add mastodon:users:admins task to list all admin emails

* Use interpolated query style in Account.triadic_closures

* Coverage for Account.triadic_closures
This commit is contained in:
Matt Jankowski 2017-04-17 19:21:55 -04:00 • committed by Eugen
parent 0e0347ea3c
commit 16d50f60d1
5 changed files with 29 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/models/account.rb
View file

@ -108,10 +108,6 @@ class Account < ApplicationRecord
follow_requests.where(target_account: other_account).exists?
end
def followers_domains
followers.reorder('').select('DISTINCT accounts.domain').map(&:domain)
end
def local?
domain.nil?
end
@ -231,18 +227,20 @@ class Account < ApplicationRecord
WITH first_degree AS (
SELECT target_account_id
FROM follows
WHERE account_id = ?
WHERE account_id = :account_id
)
SELECT accounts.*
FROM follows
INNER JOIN accounts ON follows.target_account_id = accounts.id
WHERE account_id IN (SELECT * FROM first_degree) AND target_account_id NOT IN (SELECT * FROM first_degree) AND target_account_id <> ?
WHERE account_id IN (SELECT * FROM first_degree) AND target_account_id NOT IN (SELECT * FROM first_degree) AND target_account_id <> :account_id
GROUP BY target_account_id, accounts.id
ORDER BY count(account_id) DESC
LIMIT ?
LIMIT :limit
SQL
Account.find_by_sql([sql, account.id, account.id, limit])
find_by_sql(
[sql, { account_id: account.id, limit: limit }]
)
end
def search_for(terms, limit = 10)

1
app/models/user.rb
View file

@ -15,7 +15,6 @@ class User < ApplicationRecord
validates :locale, inclusion: I18n.available_locales.map(&:to_s), unless: 'locale.nil?'
validates :email, email: true
scope :prolific, -> { joins('inner join statuses on statuses.account_id = users.account_id').select('users.*, count(statuses.id) as statuses_count').group('users.id').order('statuses_count desc') }
scope :recent, -> { order('id desc') }
scope :admins, -> { where(admin: true) }
scope :confirmed, -> { where.not(confirmed_at: nil) }