zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 10 Releases Wiki Activity

Merge pull request #435 from krainboltgreene/patch-1 

Using "rails style" order arguments
This commit is contained in:
Eugen 2017-01-08 02:58:19 +01:00 committed by GitHub
parent 7a0a13ab53 e5d9009d71
commit 4447c4c7c8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/account.rb
View File

@ -62,8 +62,8 @@ class Account < ApplicationRecord
scope :expiring, ->(time) { where(subscription_expires_at: nil).or(where('subscription_expires_at < ?', time)).remote.with_followers } scope :expiring, ->(time) { where(subscription_expires_at: nil).or(where('subscription_expires_at < ?', time)).remote.with_followers }
scope :silenced, -> { where(silenced: true) } scope :silenced, -> { where(silenced: true) }
scope :suspended, -> { where(suspended: true) } scope :suspended, -> { where(suspended: true) }
scope :recent, -> { reorder('id desc') } scope :recent, -> { reorder(id: :desc) }
scope :alphabetic, -> { order('domain ASC, username ASC') } scope :alphabetic, -> { order(domain: :asc, username: :asc) }
def follow!(other_account) def follow!(other_account)
active_relationships.where(target_account: other_account).first_or_create!(target_account: other_account) active_relationships.where(target_account: other_account).first_or_create!(target_account: other_account)