diff options
| author | multiple creatures <dev@multiple-creature.party> | 2019-05-09 12:09:04 -0500 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2019-05-21 03:16:23 -0500 |
| commit | 0782dc390525c5d1db66ea53e1208689c7d0bfcb (patch) | |
| tree | c6068c14c3f70e9e26a6575572767c4fbbf35172 /app/models/account.rb | |
| parent | cb311a274ce32381dbd16fa03874d8dad133d00b (diff) | |
Drop remaining OStatus and PuSH code, as well as related database items.
Diffstat (limited to 'app/models/account.rb')
| -rw-r--r-- | app/models/account.rb | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index e8f9f0ee9..0b647a965 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -10,8 +10,6 @@ # private_key :text # public_key :text default(""), not null # remote_url :string default(""), not null -# salmon_url :string default(""), not null -# hub_url :string default(""), not null # created_at :datetime not null # updated_at :datetime not null # note :text default(""), not null @@ -27,7 +25,8 @@ # header_file_size :integer # header_updated_at :datetime # avatar_remote_url :string -# subscription_expires_at :datetime +# silenced :boolean default(FALSE), not null +# suspended :boolean default(FALSE), not null # locked :boolean default(FALSE), not null # header_remote_url :string default(""), not null # last_webfingered_at :datetime @@ -90,7 +89,6 @@ class Account < ApplicationRecord scope :remote, -> { where.not(domain: nil) } scope :local, -> { where(domain: nil) } - scope :expiring, ->(time) { remote.where.not(subscription_expires_at: nil).where('subscription_expires_at < ?', time) } scope :partitioned, -> { order(Arel.sql('row_number() over (partition by domain)')) } scope :silenced, -> { where.not(silenced_at: nil) } scope :suspended, -> { where.not(suspended_at: nil) } @@ -171,10 +169,6 @@ class Account < ApplicationRecord "acct:#{local_username_and_domain}" end - def subscribed? - subscription_expires_at.present? - end - def possibly_stale? last_webfingered_at.nil? || last_webfingered_at <= 1.day.ago end |