Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Remove subscription_expires_at leftover from OStatus (#15857)

Browse source
This commit is contained in:
Claire 2021-03-12 05:25:24 +01:00 • committed by GitHub
parent f2ca6c7a17
commit 5cc45d22d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/models/account.rb
View file

@ -27,7 +27,6 @@
# header_file_size :integer
# header_updated_at :datetime
# avatar_remote_url :string
# subscription_expires_at :datetime
# locked :boolean default(FALSE), not null
# header_remote_url :string default(""), not null
# last_webfingered_at :datetime
@ -55,6 +54,8 @@
#
class Account < ApplicationRecord
self.ignored_columns = %w(subscription_expires_at)
USERNAME_RE = /[a-z0-9_]+([a-z0-9_\.-]+[a-z0-9_]+)?/i
MENTION_RE = /(?<=^|[^\/[:word:]])@((#{USERNAME_RE})(?:@[[:word:]\.\-]+[a-z0-9]+)?)/i
@ -93,7 +94,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) }
@ -190,10 +190,6 @@ class Account < ApplicationRecord
"acct:#{local_username_and_domain}"
end
def subscribed?
subscription_expires_at.present?
end
def searchable?
!(suspended? || moved?)
end